gentoo resync : 23.03.2018

5 files changed, 230 insertions, 9 deletions

diff --git a/net-dns/dnsmasq/Manifest b/net-dns/dnsmasq/Manifest
index 22128565863f..e9755ebc2c93 100644
--- a/net-dns/dnsmasq/Manifest
+++ b/net-dns/dnsmasq/Manifest
@@ -1,9 +1,12 @@
-AUX dnsmasq-init-dhcp-r1 570 BLAKE2B 44a38df6709bde287aa554703a6d6c64b79a65971ec6920955487afaf816be37fb9d4201169329258d6ccb8920e2da1fd807c89cc609b5da0fbbaec912065f1e SHA512 d0ac774f48aae8a24b9e45c7bcc139fbb3efa0d181bbdd6010e66b62ce546a91deeaee2ca207d367e65748d160c92b54223bf012b26179ae48bd8b3812a0b9d9
 AUX dnsmasq-init-dhcp-r2 592 BLAKE2B ddd81a3a30fd2496208e6301b14dc08f9e4f94b183de8091dfa96dc79a109d1fe62c6f5362193749bf2727fa141fd7ad7794b19e3049e6836437568825d3ff03 SHA512 25620b563a8489a3c1715f17ff4e36695ec08878515c3b2aebab723e8747d38cfbd07c1850f6fef0421653f88032096a839ef6e42fe0c20cc008cfe67bf6c9ea
-AUX dnsmasq-init-r2 457 BLAKE2B 29b6844617774b6aa31c596839e4a29a85a24b322716385f1c62c0dbe4a0f5b96b27609a81d9cb073079a21eebc20fac1c1fedb3bc938a5a5a64a974a770632c SHA512 8cf3092fcc095c307009d12a150883386bd1b0dcdc9cac0c5d1a24df80405bdba89497c88a1e2ac1e1259d3684bc6a6089f477a4f735fb8d0f4edcc29d6e9a06
+AUX dnsmasq-init-dhcp-r3 721 BLAKE2B 94a7542419e2c931149edbd5a5167c7fcbe0233e48f3ed854dfe26090b596c4f2549e37d2680bfceb1c6d21f475012f81a2102bde85e7cd609979e555dbcfa3d SHA512 f7a64fb84a7877b5ec629f9ed92419799913b8f2f73594c510aedc083d72c5c1862da7e5aed4485102c3b89ca7217bcca88e7cdde82f5a65d4cd4bb19017c2fe
 AUX dnsmasq-init-r3 481 BLAKE2B 8ae305209c9005387da1e5a4b0f44370744e803a5a8ecc609c815998a63f9e586e361d1ac5159bb3701d3721d860ec0cbc8770e1971cefe808ffb18da6ab77a2 SHA512 23f292dbf479479ef9d23c0c23ccb2735995f97d37156df3a3818a69ce938ffc2ec7be636771f960038a2e876521f144cc2f2a6fd154de94ff309b50f0cbfa44
+AUX dnsmasq-init-r4 613 BLAKE2B 7ea82e879f8770c3f4b764a9044ef585cc6e91de793c56733a6af1d9e138ca6e55813ad1720a70d0a5a61f6815d094574ae04f9761b2e2846c6267c6a4e97780 SHA512 72ae659a62c61495dc575fa590cbf1352c4bd4f374a6e0a56fce9c641c163b882d8b8097d27605d102e47df49eb68c456baf7b11009a7bb7db98e99429bd80a6
 AUX dnsmasq.confd-r1 170 BLAKE2B 84d5cdb15236c9e1c83fa53d0e401df90e86c6687cc88f9ebba3e2a0987cad2ccf9bb82ac7b1fcd77a81fa6058a3cd3276fb8a8a76e13983628e92be95b39af1 SHA512 9a401bfc408bf1638645c61b8ca734bea0a09ef79fb36648ec7ef21666257234254bbe6c73c82cc23aa1779ddcdda0e6baa2c041866f16dfb9c4e0ba9133eab8
+AUX dnsmasq.logrotate 176 BLAKE2B 4932be8c2a4ba37e0ed61361cdfae6e6cd498e5292f9002a3426c05632896a5f94a84ada168d672cb38e236cbde72b59201c970e348ba052dff655be1a9a57b4 SHA512 b59b299849487dcdfc18ab30ded0605e2df4876cb778b2d1cd03b740406a5580001028eb33f1ecf0dc910f393c58b7cad7c28801aa4641c3fa376e3dac997abf
 AUX dnsmasq.service-r1 278 BLAKE2B 3bfe6a01efd5f8338c3bb134a061f8ecbef850293c4a8fce1f7360928a374fe4c429df1f8ec2ffc093752234f9e2ccc717a887fa2557e3efd99ab6bd58f9ac0f SHA512 3571417b23071d9c3cfaf6d00363adb2cb011d04f1ed38631ddecd6eaa2c9ed37e1435a1fd32c40b0de43b0a84dd1ac8691a0a29493b391bafbb843d581bafc1
 DIST dnsmasq-2.78.tar.xz 489172 BLAKE2B 996b59181c4b582b74c91be073e62f0756d2e4c67ee36ff825b6973699f60e44959bb0451bbb8623f277e5a8378cda987a300eee6ec9398ae99284b302da2747 SHA512 9b79b84e5a768d52f90f6335ccef2c404ecd7a13e78e49f4cd0755fffc6cf34d0dc96ad4c72cad1dab3c5743a8d0d789b3e9b6e625b03c5675bb898ca61a698b
+DIST dnsmasq-2.79.tar.xz 493036 BLAKE2B 91152c52aef06def74151f6fbae9153d25261ba5e6a728cbab503c074967963e40dce39d93a0fbe4c5497c9313ac24d495cc8233934c00d4ab82aefe83b01ccd SHA512 2c06212696ab55e1584f6133872f5b196013509e4b1822d0457787b456e14341afdde887749e370a2e512124cb4138f012f4601b08690707be4acc7cf2f2876f
 EBUILD dnsmasq-2.78.ebuild 4507 BLAKE2B 15472be6911ec12f64e3f0ff322d15bde8c15857f1b01e1e9053ba476c832ae852049e558b05b54b74dde2fe60e34202835e90d68c7ec4381a5a4e268fd023d6 SHA512 b7db6c09a5a0febfa1bc0437e34b793cbd1c6f5aba8a96769e2c85fffa7aabd88eb3bb198ba5bf0263c3b113ac9f1ab608a36421ab64120e7f62fd6815ec1ca3
+EBUILD dnsmasq-2.79.ebuild 4604 BLAKE2B c7b2f199815a75df3bc69e3a883149bcf8db300b54f5dec7e744f52c41a6c26fb2af6cbcb48c5c874e9d0d652aeeb000b8d9f2751a9267c888412513b9649136 SHA512 41a01845b0f97ad79c8791c3e5b2800e41e0690dc85de060d7a92cd3e3a32efb2e14c68411ca897ca063f27ebcb5292410e87d595ed8cfbf3cbeb8ca236bde66
 MISC metadata.xml 1149 BLAKE2B 9d9b9c87dd5bf6233d4656e0de77cd9e5d75ef631731c2e9d06917ade555422a5d4dbd846bc6bc7b5ff411a7d706f35ba68bb8d5ec8f793d878bba2de86a1b44 SHA512 7fad0bb400a664a67e82173015dcc2fc95644dd6c357e787b8257a193dc14adbee8f5a04cb4422fadefdeec0d3dc5bd986f4f5b44ee420b8a104cb5a8e1b58a6
diff --git a/net-dns/dnsmasq/dnsmasq-2.79.ebuild b/net-dns/dnsmasq/dnsmasq-2.79.ebuild
new file mode 100644
index 000000000000..5af2dbb6c98d
--- /dev/null
+++ b/net-dns/dnsmasq/dnsmasq-2.79.ebuild
@@ -0,0 +1,198 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit toolchain-funcs flag-o-matic user systemd
+
+DESCRIPTION="Small forwarding DNS server"
+HOMEPAGE="http://www.thekelleys.org.uk/dnsmasq/doc.html"
+SRC_URI="http://www.thekelleys.org.uk/dnsmasq/${P}.tar.xz"
+
+LICENSE="|| ( GPL-2 GPL-3 )"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd"
+
+IUSE="auth-dns conntrack dbus +dhcp dhcp-tools dnssec id idn libidn2 +inotify"
+IUSE+=" ipv6 lua nls script selinux static tftp"
+
+DM_LINGUAS=(de es fi fr id it no pl pt_BR ro)
+
+CDEPEND="dbus? ( sys-apps/dbus )
+	idn? (
+		!libidn2? ( net-dns/libidn )
+		libidn2? ( >=net-dns/libidn2-2.0 )
+	)
+	lua? ( dev-lang/lua:* )
+	conntrack? ( net-libs/libnetfilter_conntrack )
+	nls? ( sys-devel/gettext )
+"
+
+DEPEND="${CDEPEND}
+	app-arch/xz-utils
+	dnssec? (
+		dev-libs/nettle[gmp]
+		static? ( dev-libs/nettle[static-libs(+)] )
+	)
+	virtual/pkgconfig
+"
+
+RDEPEND="${CDEPEND}
+	dnssec? (
+		!static? (
+			dev-libs/nettle[gmp]
+		)
+	)
+	selinux? ( sec-policy/selinux-dnsmasq )
+"
+
+REQUIRED_USE="dhcp-tools? ( dhcp )
+	lua? ( script )
+	libidn2? ( idn )"
+
+use_have() {
+	local useflag no_only uword
+	if [[ $1 == '-n' ]]; then
+		no_only=1
+		shift
+	fi
+	useflag="${1}"
+	shift
+
+	uword="${1:-${useflag}}"
+	shift
+
+	while [[ ${uword} ]]; do
+		uword="${uword^^}"
+
+		if ! use "${useflag}"; then
+			printf -- " -DNO_%s" "${uword}"
+		elif [[ -z "${no_only}" ]]; then
+			printf -- " -DHAVE_%s" "${uword}"
+		fi
+		uword="${1}"
+		shift
+	done
+}
+
+pkg_pretend() {
+	if use static; then
+		einfo "Only sys-libs/gmp and dev-libs/nettle are statically linked."
+		use dnssec || einfo "Thus, ${P}[!dnssec,static] makes no sense; the static USE flag is ignored."
+	fi
+}
+
+pkg_setup() {
+	enewgroup dnsmasq
+	enewuser dnsmasq -1 -1 /dev/null dnsmasq
+}
+
+src_prepare() {
+	default
+
+	sed -i -r 's:lua5.[0-9]+:lua:' Makefile
+	sed -i "s:%%PREFIX%%:${EPREFIX}/usr:" dnsmasq.conf.example
+}
+
+src_configure() {
+	COPTS="$(use_have -n auth-dns auth)"
+	COPTS+="$(use_have conntrack)"
+	COPTS+="$(use_have dbus)"
+	COPTS+="$(use libidn2 || use_have idn)"
+	COPTS+="$(use_have libidn2)"
+	COPTS+="$(use_have -n inotify)"
+	COPTS+="$(use_have -n dhcp dhcp dhcp6)"
+	COPTS+="$(use_have -n ipv6 ipv6 dhcp6)"
+	COPTS+="$(use_have -n id id)"
+	COPTS+="$(use_have lua luascript)"
+	COPTS+="$(use_have -n script)"
+	COPTS+="$(use_have -n tftp)"
+	COPTS+="$(use_have dnssec)"
+	COPTS+="$(use_have static dnssec_static)"
+}
+
+src_compile() {
+	emake \
+		PREFIX=/usr \
+		MANDIR=/usr/share/man \
+		CC="$(tc-getCC)" \
+		PKG_CONFIG="$(tc-getPKG_CONFIG)" \
+		CFLAGS="${CFLAGS}" \
+		LDFLAGS="${LDFLAGS}" \
+		COPTS="${COPTS}" \
+		CONFFILE="/etc/${PN}.conf" \
+		all$(use nls && echo "-i18n")
+
+	use dhcp-tools && emake -C contrib/lease-tools \
+		PREFIX=/usr \
+		MANDIR=/usr/share/man \
+		CC="$(tc-getCC)" \
+		PKG_CONFIG="$(tc-getPKG_CONFIG)" \
+		CFLAGS="${CFLAGS}" \
+		LDFLAGS="${LDFLAGS}" \
+		all
+}
+
+src_install() {
+	local lingua puid
+	emake \
+		PREFIX=/usr \
+		MANDIR=/usr/share/man \
+		COPTS="${COPTS}" \
+		DESTDIR="${D}" \
+		install$(use nls && echo "-i18n")
+
+	for lingua in "${DM_LINGUAS[@]}"; do
+		has ${lingua} ${LINGUAS-${lingua}} \
+			|| rm -rf "${D}"/usr/share/locale/${lingua}
+	done
+	[[ -d "${D}"/usr/share/locale/ ]] && rmdir --ignore-fail-on-non-empty "${D}"/usr/share/locale/
+
+	dodoc CHANGELOG CHANGELOG.archive FAQ dnsmasq.conf.example
+	dodoc -r logo
+
+	docinto html/
+	dodoc *.html
+
+	newinitd "${FILESDIR}"/dnsmasq-init-r4 ${PN}
+	newconfd "${FILESDIR}"/dnsmasq.confd-r1 ${PN}
+
+	insinto /etc/logrotate.d
+	newins "${FILESDIR}"/dnsmasq.logrotate ${PN}
+
+	insinto /etc
+	newins dnsmasq.conf.example dnsmasq.conf
+
+	insinto /usr/share/dnsmasq
+	doins trust-anchors.conf
+
+	if use dhcp; then
+		keepdir /var/lib/misc
+		newinitd "${FILESDIR}"/dnsmasq-init-dhcp-r3 ${PN}
+	fi
+	if use dbus; then
+		insinto /etc/dbus-1/system.d
+		doins dbus/dnsmasq.conf
+	fi
+
+	if use dhcp-tools; then
+		dosbin contrib/lease-tools/{dhcp_release,dhcp_lease_time}
+		doman contrib/lease-tools/{dhcp_release,dhcp_lease_time}.1
+		if use ipv6; then
+			dosbin contrib/lease-tools/dhcp_release6
+			doman contrib/lease-tools/dhcp_release6.1
+		fi
+	fi
+
+	systemd_newunit "${FILESDIR}"/${PN}.service-r1 ${PN}.service
+}
+
+pkg_preinst() {
+	# temporary workaround to (hopefully) prevent leases file from being removed
+	[[ -f /var/lib/misc/dnsmasq.leases ]] && cp /var/lib/misc/dnsmasq.leases "${T}"
+}
+
+pkg_postinst() {
+	# temporary workaround to (hopefully) prevent leases file from being removed
+	[[ -f "${T}"/dnsmasq.leases ]] && cp "${T}"/dnsmasq.leases /var/lib/misc/dnsmasq.leases
+}
diff --git a/net-dns/dnsmasq/files/dnsmasq-init-dhcp-r1 b/net-dns/dnsmasq/files/dnsmasq-init-dhcp-r3
index b62630f7140b..5a356b22b259 100644
--- a/net-dns/dnsmasq/files/dnsmasq-init-dhcp-r1
+++ b/net-dns/dnsmasq/files/dnsmasq-init-dhcp-r3
@@ -1,8 +1,8 @@
 #!/sbin/openrc-run
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License, v2 or later
 
-extra_started_commands="reload"
+extra_started_commands="reload rotate"
 
 pidfile="/var/run/dnsmasq.pid"
 command="/usr/sbin/dnsmasq"
@@ -24,6 +24,12 @@ start_pre() {
 
 reload() {
 	ebegin "Reloading ${RC_SVCNAME}"
-	kill -HUP "$(cat "${pidfile}")"
+	start-stop-daemon --signal HUP --pidfile "${pidfile}"
+	eend $?
+}
+
+rotate() {
+	ebegin "Reopening ${RC_SVCNAME} log file"
+	start-stop-daemon --signal USR2 --pidfile "${pidfile}"
 	eend $?
 }
diff --git a/net-dns/dnsmasq/files/dnsmasq-init-r2 b/net-dns/dnsmasq/files/dnsmasq-init-r4
index ed487b9fd1bb..559cb1e89d47 100644
--- a/net-dns/dnsmasq/files/dnsmasq-init-r2
+++ b/net-dns/dnsmasq/files/dnsmasq-init-r4
@@ -1,8 +1,8 @@
 #!/sbin/openrc-run
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License, v2 or later
 
-extra_started_commands="reload"
+extra_started_commands="reload rotate"
 
 pidfile="/var/run/dnsmasq.pid"
 command="/usr/sbin/dnsmasq"
@@ -17,7 +17,13 @@ depend() {
 }
 
 reload() {
-	ebegin "Reloading ${SVCNAME}"
-	kill -HUP $(cat "${pidfile}")
+	ebegin "Reloading ${RC_SVCNAME}"
+	start-stop-daemon --signal HUP --pidfile "${pidfile}"
+	eend $?
+}
+
+rotate() {
+	ebegin "Reopening ${RC_SVCNAME} log file"
+	start-stop-daemon --signal USR2 --pidfile "${pidfile}"
 	eend $?
 }
diff --git a/net-dns/dnsmasq/files/dnsmasq.logrotate b/net-dns/dnsmasq/files/dnsmasq.logrotate
new file mode 100644
index 000000000000..75372feef7be
--- /dev/null
+++ b/net-dns/dnsmasq/files/dnsmasq.logrotate
@@ -0,0 +1,8 @@
+/var/log/dnsmasq.log {
+	create 640 dnsmasq root
+	notifempty
+	missingok
+	postrotate
+		test -r /var/run/dnsmasq.pid && kill -USR2 "$(head -n1 /var/run/dnsmasq.pid)"
+	endscript
+}