gentoo resync : 25.04.2020

6 files changed, 41 insertions, 107 deletions

diff --git a/net-misc/dhcpcd/Manifest b/net-misc/dhcpcd/Manifest
index 8f923227a789..f5e130e0a366 100644
--- a/net-misc/dhcpcd/Manifest
+++ b/net-misc/dhcpcd/Manifest
@@ -1,17 +1,16 @@
-AUX dhcpcd-9.0.0-no_ipv6_build_fix.patch 2670 BLAKE2B c35b0abcd0d20f9f142df2a33ab4bfa600b9bca184c598ec05e8d89553a573a20368404b387316384f625e45e136150c8cfc583ffb8392ae59c54cd296cd2a95 SHA512 f4bf108d63a88a9ab10525a1201bcd9dc95d1346d0e1be5b2c3a0cf9fddcc58f3aec69bec184e63e75edb2a82374682df630b4af29fdca188ac11830ea2452be
 AUX dhcpcd.initd 328 BLAKE2B 72ef6bb16e4f80b440890112cd399eca1057ae42ddc96ee1a29482a048682dd34e065bb68876329ecfe2f1db4c084e320f4185b3029b89c2328d6ab27a1a7e80 SHA512 6d3220155f2d9ed3e3a00afd378eeb70d435e19804201f8bb35498f1f7f3dfdaeaa2f4a01a18f5e96b457d9c173bc6a206b3e67ebf6d95da7e7b350dcd153fde
 AUX dhcpcd.service 227 BLAKE2B e24aa85c15d0211856b02508b681f7e3c1f8b8b1743f31ced9600c2c33da04b61f2166cad7696776ae81ce1be5701cae2691f6dfd86aaf8679f20e459e87c7e5 SHA512 4a030dc291fa7deba9c1f33d61dafdda710247ef7f3743c28e46b767a190e359e468433147bda23c82fae9c93ec31cd68905bfdb51cb8c2d9176ea789b31b14e
 DIST dhcpcd-7.2.3.tar.xz 213552 BLAKE2B 5f89e11424b85702b05da6207ec346480c029de1416cc8892471de428ca0a4395a8915700e2237bfa2b133648973bc2a7c7d15aa2d0ba492f96fbf3908d7f613 SHA512 271cca422fad10eaf842acfd5b590c0ad537f5f23ee919a3928d8ad98463ab03bde21c0bc08741ea9618ee31095160a7c00066155eae2c74b17c49af65ba566f
 DIST dhcpcd-7.2.5.tar.xz 214124 BLAKE2B 7a5f32b66187afcaa2bb4a1cbcc0d704a28a27ff6d1f9fea409bab242ebf4d263d81590cb4a4959c9f1119966795e26fa582ed16a525c1e46a72dd0905868074 SHA512 ee0c70f3996f6a06031c2f663a4bdf4f147d637c31e54bb94fcb9d86282c33ad7b0f5569abe09acd7698efbb34c35afb228fe0825e4a95ad6a42832d1838ca72
-DIST dhcpcd-8.0.6.tar.xz 224552 BLAKE2B 5d0fab5977597ce182a2de56c8c4d085d3595a8f1209fc76788b707af0fffd4285a958cebfe7bab6c04ae7a2ba94c466d689dc9c3a71708c1baabd328b2bbf3e SHA512 19a568800a4e510a250de7cc111700b364c68bfe3907f1ac2cda81aacd079cb9ac87731cbabbf8f1e85e055a11c7ba88e419f6c4d7b33f8842dfaeadc7d1e193
-DIST dhcpcd-8.1.6.tar.xz 229224 BLAKE2B ad3d024b5a62feb3c9cb39ada0323d336af831cb9892dc50b93c672e6ae2a5607526122a9a5f63a00915a182ea7e7a0ae6b19bbb965bd1fa9ca58cbcac81cd66 SHA512 f4d7ea5f4c139a2735e795e13be68f6edac89d86d97589c2cdd67f89b890a093675dcc207c681332e2163b1094da8ce75bda2ee614c19bafd01410d9fadf19df
 DIST dhcpcd-8.1.7.tar.xz 230308 BLAKE2B 636daad77885b7f00f34c73413db4a0269bca844c33b630b5302cfcd9f5b2068ed95872dd92f3b8db25e7b2ca0a28a8053e1975a7ee50fd5403f8d58e97dff17 SHA512 ea58ef3db8254d677820c44b2842ef2f3697b2d90fcbd89b2ecfcbac87e705047cac17053bbe076a3f6d2775903c8e75eac38089d25c097e2f24a045c24977e8
-DIST dhcpcd-9.0.0.tar.xz 245336 BLAKE2B e206ba6f8e8c890247e308e5e181abf3eec2f5abc0f4b8fa05b220529018d16c806cb8ae29525b9bf7e39b465377016b55fe1c08b2f0b83d8e7a3432b6ea71b5 SHA512 5b04d9ecb75c45e7f883e29aed4862ae7fc186a6ca161353ed59ffed4dbc266e03596a26d09ae60e87806047659d6ce238b26d264b5a96b21643849343d2da0b
-EBUILD dhcpcd-7.2.3.ebuild 4384 BLAKE2B e1572ed7ff0b2a854b080a7583b2a0632b5d1c5aa018bb7d1f515f5deeff1bebaf2f0312fac7163a0e4b70cace2d859a0d214ccbb134debca4311213558bf30c SHA512 f243719ff6dae2092f5236df9e6893a9313bdee5665d3bfeb140ffd02778a16eabcf2d1516fe59cd0b4e5421e30e703f74966eb7cb8288d87a4fded126b584b0
+DIST dhcpcd-8.1.9.tar.xz 230288 BLAKE2B 5606ddfce37c67ac3d60257104fcf15bd7da65021b2c1261a45958b628cd066ccd9bc6b60bbb42f8280fcbbf9d4b1c7666b993c37f150b27ef2a0527a0fd5b96 SHA512 40ac106ffca60b32362aacdfae0fa3a2993a3eed72bf452322412a912f594aaade1c24b862233455033158a6e453ec75d6d14fa52df6b4c5ae435dd6ceb29f2a
+DIST dhcpcd-9.0.1.tar.xz 244816 BLAKE2B 1cb346f7578dadb237d05056a8f6e39b30da831e253e6629c5c19e6a70f7b6d8ffcb6db37d0f720fda28577e8cb4227cbca8a08fac0c977098f66b2a430d9ffe SHA512 dea153c9a2f4a9d9c983bf50d8c18b544d7dbe1a2972ccc8eb33bbbc8b09178b39bdb9a38cc293db7861024509ccd475e11d84004bc4cd45947786f5e10db0a3
+DIST dhcpcd-9.0.2.tar.xz 244800 BLAKE2B d0c355141aa1e57715c30b2902eed7e2821f2c08fdc97497c9dc271689faf2ca22e3f50f17e6c7ae8fe4434d5c216572a42e1abf789287495e6db44f671d5085 SHA512 2a606bff2e96d1da5d3642ac68341c14b378d9a905cba364ab42eba1285604f8be56b9efeff3eee18d89b71f0f9f3b05cb7b88e8fce568baf1c0d1e5d3becb5f
+EBUILD dhcpcd-7.2.3.ebuild 4385 BLAKE2B 858612ce43483bb8a1c04f6dd81847ffe8519dcfba2fdaddc6bbb6e370a3734ac8349bdc12af2f1594779280c28e20c390ca25a97a28df6dbdee45aebbfa7fe7 SHA512 f69f3beea8ec74c02b2ea5d9a3653c9d7edf8e947721b243ff8c5df54e68aa352346080fc1f6db36eae8b851c93eefc978d6345153c0b96ffc4cada0bf685021
 EBUILD dhcpcd-7.2.5.ebuild 4394 BLAKE2B 4e6c828497b44ffd2e25f7985b5f0144209d7c1ff7ed07b995a09cce5bc04ddebecc49fd0f1faa569fb52d069ab8d80c30595e3c2570a7af272e7162b335b6f0 SHA512 79ed085c66bc51e87e2ee4f327b5604a571cc3daf6a41fe949baa37c9245749c37d1e054a070c72da2d7da7b0ad7e5bb1c5f92834be7d6f79216dff268783780
-EBUILD dhcpcd-8.0.6.ebuild 4394 BLAKE2B 4e6c828497b44ffd2e25f7985b5f0144209d7c1ff7ed07b995a09cce5bc04ddebecc49fd0f1faa569fb52d069ab8d80c30595e3c2570a7af272e7162b335b6f0 SHA512 79ed085c66bc51e87e2ee4f327b5604a571cc3daf6a41fe949baa37c9245749c37d1e054a070c72da2d7da7b0ad7e5bb1c5f92834be7d6f79216dff268783780
-EBUILD dhcpcd-8.1.6.ebuild 4394 BLAKE2B 4e6c828497b44ffd2e25f7985b5f0144209d7c1ff7ed07b995a09cce5bc04ddebecc49fd0f1faa569fb52d069ab8d80c30595e3c2570a7af272e7162b335b6f0 SHA512 79ed085c66bc51e87e2ee4f327b5604a571cc3daf6a41fe949baa37c9245749c37d1e054a070c72da2d7da7b0ad7e5bb1c5f92834be7d6f79216dff268783780
 EBUILD dhcpcd-8.1.7.ebuild 4394 BLAKE2B 4e6c828497b44ffd2e25f7985b5f0144209d7c1ff7ed07b995a09cce5bc04ddebecc49fd0f1faa569fb52d069ab8d80c30595e3c2570a7af272e7162b335b6f0 SHA512 79ed085c66bc51e87e2ee4f327b5604a571cc3daf6a41fe949baa37c9245749c37d1e054a070c72da2d7da7b0ad7e5bb1c5f92834be7d6f79216dff268783780
-EBUILD dhcpcd-9.0.0.ebuild 5335 BLAKE2B 792e26c5df03845cb0251395977bcbe16803817bade78bcb7c8949e6730607f8bb76aef4fa14f98a5579fb6a705e2f6beb43135a3bcdcc84464ea5e971b205c2 SHA512 7c4b27d692d5e9c5e1b2979cdbaab4bf721911eeb5b44da899eb700c212e1ceb4669cfc8bd1675f4489a12aa64b45ba41e77cd7182b30cda3d1487b76cef6729
+EBUILD dhcpcd-8.1.9.ebuild 4387 BLAKE2B 15b4845928419d3bf8abc9ec5ea57952388374bb7a28d40ed67e47225376c942e7c710fba4b2947bc13c68244164a1212ae12ef2b09dff1f9d607b2b077cbcb4 SHA512 0e847fdece1b953ec7d0c4aae67e6124c508fbedda378d38f09233227aa1941bd44dd5629aa398db0fda49cfbf78e216eed8663d28d892e904a8504e768a0c74
+EBUILD dhcpcd-9.0.1.ebuild 5279 BLAKE2B 9d18fbf073399faf0325d8d16a46c14595546a68a65b2959c3a61082985d685bfccf9808a8b9fec020e3de2c3b4e73f1478db59bd773967e4012ceb31b30d03a SHA512 779769068a9128d816c3f00aa1fb11d232d6532a77e105fc8b483aa7eb090ecb7d86f30051b57eee549cfeb723c6bea409a1213ad552ac66102edaac41c5467a
+EBUILD dhcpcd-9.0.2.ebuild 5279 BLAKE2B 9d18fbf073399faf0325d8d16a46c14595546a68a65b2959c3a61082985d685bfccf9808a8b9fec020e3de2c3b4e73f1478db59bd773967e4012ceb31b30d03a SHA512 779769068a9128d816c3f00aa1fb11d232d6532a77e105fc8b483aa7eb090ecb7d86f30051b57eee549cfeb723c6bea409a1213ad552ac66102edaac41c5467a
 EBUILD dhcpcd-9999.ebuild 5279 BLAKE2B 9d18fbf073399faf0325d8d16a46c14595546a68a65b2959c3a61082985d685bfccf9808a8b9fec020e3de2c3b4e73f1478db59bd773967e4012ceb31b30d03a SHA512 779769068a9128d816c3f00aa1fb11d232d6532a77e105fc8b483aa7eb090ecb7d86f30051b57eee549cfeb723c6bea409a1213ad552ac66102edaac41c5467a
 MISC metadata.xml 661 BLAKE2B 079dd7ae7da62777750cda972982faec3a7040018c57a40b33874b20bbfcdf60a00487f38daaba2fcf10c2325c6d582d70983f5bb6fca64f309eaa81c615de93 SHA512 3b2db0737e02439895ee5d7fc06b9344c64282d4014ef1f7cc8ce19f93e8744aa929f85fba8f04c0a865f477a5066dfa083b568546665e870137c2989999e5e0
diff --git a/net-misc/dhcpcd/dhcpcd-7.2.3.ebuild b/net-misc/dhcpcd/dhcpcd-7.2.3.ebuild
index 199319334079..54861a24f9cc 100644
--- a/net-misc/dhcpcd/dhcpcd-7.2.3.ebuild
+++ b/net-misc/dhcpcd/dhcpcd-7.2.3.ebuild
@@ -13,7 +13,7 @@ else
 	MY_P="${MY_P/_beta/-beta}"
 	MY_P="${MY_P/_rc/-rc}"
 	SRC_URI="https://roy.marples.name/downloads/${PN}/${MY_P}.tar.xz"
-	KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~amd64-linux ~x86-linux"
+	KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~amd64-linux ~x86-linux"
 	S="${WORKDIR}/${MY_P}"
 fi
 
diff --git a/net-misc/dhcpcd/dhcpcd-8.0.6.ebuild b/net-misc/dhcpcd/dhcpcd-8.1.9.ebuild
index 504876b53cf8..1133080d8aa9 100644
--- a/net-misc/dhcpcd/dhcpcd-8.0.6.ebuild
+++ b/net-misc/dhcpcd/dhcpcd-8.1.9.ebuild
@@ -13,7 +13,7 @@ else
 	MY_P="${MY_P/_beta/-beta}"
 	MY_P="${MY_P/_rc/-rc}"
 	SRC_URI="https://roy.marples.name/downloads/${PN}/${MY_P}.tar.xz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
+	KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~amd64-linux ~x86-linux"
 	S="${WORKDIR}/${MY_P}"
 fi
 
diff --git a/net-misc/dhcpcd/dhcpcd-9.0.0.ebuild b/net-misc/dhcpcd/dhcpcd-9.0.1.ebuild
index 52553bf20cc2..9656eabee928 100644
--- a/net-misc/dhcpcd/dhcpcd-9.0.0.ebuild
+++ b/net-misc/dhcpcd/dhcpcd-9.0.1.ebuild
@@ -33,8 +33,6 @@ RDEPEND="
 	)
 "
 
-PATCHES=( "${FILESDIR}/${P}-no_ipv6_build_fix.patch" )
-
 src_configure() {
 	local myeconfargs=(
 		--dbdir="${EPREFIX}/var/lib/dhcpcd"
diff --git a/net-misc/dhcpcd/dhcpcd-8.1.6.ebuild b/net-misc/dhcpcd/dhcpcd-9.0.2.ebuild
index 504876b53cf8..9656eabee928 100644
--- a/net-misc/dhcpcd/dhcpcd-8.1.6.ebuild
+++ b/net-misc/dhcpcd/dhcpcd-9.0.2.ebuild
@@ -7,7 +7,7 @@ inherit systemd toolchain-funcs
 
 if [[ ${PV} == "9999" ]]; then
 	inherit git-r3
-	EGIT_REPO_URI="https://roy.marples.name/git/dhcpcd.git"
+	EGIT_REPO_URI="https://roy.marples.name/cgit/dhcpcd.git"
 else
 	MY_P="${P/_alpha/-alpha}"
 	MY_P="${MY_P/_beta/-beta}"
@@ -21,11 +21,17 @@ DESCRIPTION="A fully featured, yet light weight RFC2131 compliant DHCP client"
 HOMEPAGE="https://roy.marples.name/projects/dhcpcd"
 LICENSE="BSD-2"
 SLOT="0"
-IUSE="elibc_glibc +embedded ipv6 kernel_linux +udev"
+IUSE="debug elibc_glibc +embedded ipv6 kernel_linux +privsep +udev"
 
 COMMON_DEPEND="udev? ( virtual/udev )"
 DEPEND="${COMMON_DEPEND}"
-RDEPEND="${COMMON_DEPEND}"
+RDEPEND="
+	${COMMON_DEPEND}
+	privsep? (
+		acct-group/dhcpcd
+		acct-user/dhcpcd
+	)
+"
 
 src_configure() {
 	local myeconfargs=(
@@ -34,10 +40,13 @@ src_configure() {
 		--localstatedir="${EPREFIX}/var"
 		--prefix="${EPREFIX}"
 		--with-hook=ntp.conf
+		$(use_enable debug)
 		$(use_enable embedded)
 		$(use_enable ipv6)
+		$(use_enable privsep)
 		$(usex elibc_glibc '--with-hook=yp.conf' '')
 		$(usex kernel_linux '--rundir=${EPREFIX}/run' '')
+		$(usex privsep '--privsepuser=dhcpcd' '')
 		$(usex udev '' '--without-dev --without-udev')
 		CC="$(tc-getCC)"
 	)
@@ -104,6 +113,26 @@ pkg_postinst() {
 		cp "${lease}" "${dbdir}/${new_lease}"
 	done
 
+	# dhcpcd-9 introduced privesep support in a chroot
+	if use privsep ; then
+		local dhcpcd_libdir="/var/lib/dhcpcd"
+		local chroot_base="${EROOT}/var/chroot/dhcpcd"
+		local chroot_dir="${chroot_base}${dhcpcd_libdir}"
+		local chroot_retval=0
+		# Set up proper chroot.
+		if [[ ! -e "${chroot_dir}" ]] ; then
+			mkdir -p "${chroot_dir}" || chroot_retval=1
+			cp -a "${EROOT}${dhcpcd_libdir}" "${chroot_dir}" || chroot_retval=1
+			chown -R dhcpcd:dhcpcd "${chroot_dir}" || chroot_retval=1
+		elif [[ ! -d "${chroot_dir}" ]] ; then
+			ewarn "${chroot_dir} is not a directory!"
+			ewarn "Did not set up ${PN} chroot!"
+		fi
+		if [[ "${chroot_retval}" -ne 0 ]] ; then
+			ewarn "There were issues setting up ${PN} chroot."
+		fi
+	fi
+
 	# Warn about removing stale files
 	if [[ -n "${old_files[@]}" ]] ; then
 		elog
diff --git a/net-misc/dhcpcd/files/dhcpcd-9.0.0-no_ipv6_build_fix.patch b/net-misc/dhcpcd/files/dhcpcd-9.0.0-no_ipv6_build_fix.patch
deleted file mode 100644
index a210982c340b..000000000000
--- a/net-misc/dhcpcd/files/dhcpcd-9.0.0-no_ipv6_build_fix.patch
+++ /dev/null
@@ -1,92 +0,0 @@
-From 12ddbee51f0e1cf4372146f8d42ea404dd07dba3 Mon Sep 17 00:00:00 2001
-From: Roy Marples <roy@marples.name>
-Date: Thu, 2 Apr 2020 19:54:19 +0000
-Subject: Fix build without INET or INET6
-
----
- src/dhcpcd.c       | 2 +-
- src/if-bsd.c       | 2 ++
- src/if-options.c   | 6 ++++++
- src/privsep-root.c | 2 ++
- 4 files changed, 11 insertions(+), 1 deletion(-)
-
-diff --git a/src/dhcpcd.c b/src/dhcpcd.c
-index 057a1fd9..9208f37c 100644
---- a/src/dhcpcd.c
-+++ b/src/dhcpcd.c
-@@ -2169,7 +2169,7 @@ printpidfile:
- 	}
- #endif
- 
--#ifdef BSD
-+#if defined(BSD) && defined(INET6)
- 	/* Disable the kernel RTADV sysctl as early as possible. */
- 	if (ctx.options & DHCPCD_IPV6 && ctx.options & DHCPCD_IPV6RS)
- 		if_disable_rtadv();
-diff --git a/src/if-bsd.c b/src/if-bsd.c
-index dbe5c359..d6c38903 100644
---- a/src/if-bsd.c
-+++ b/src/if-bsd.c
-@@ -1524,6 +1524,8 @@ if_missfilter0(struct dhcpcd_ctx *ctx, struct interface *ifp,
- #ifdef INET6
- 	if (sa->sa_family == AF_INET6)
- 		ifa_setscope(satosin6(sa), ifp->index);
-+#else
-+	UNUSED(ifp);
- #endif
- 
- 	cp = ctx->rt_missfilter + ctx->rt_missfilterlen;
-diff --git a/src/if-options.c b/src/if-options.c
-index 7850ff2e..1280cfbd 100644
---- a/src/if-options.c
-+++ b/src/if-options.c
-@@ -573,6 +573,8 @@ set_option_space(struct dhcpcd_ctx *ctx,
- 		return;
- 	}
- #endif
-+#else
-+	UNUSED(arg);
- #endif
- 
- #ifdef INET
-@@ -1275,6 +1277,7 @@ parse_option(struct dhcpcd_ctx *ctx, const char *ifname, struct if_options *ifo,
- 		memset(ifo->nomask6, 0xff, sizeof(ifo->nomask6));
- 
- 		/* Allow the bare minimum through */
-+#ifdef INET
- 		del_option_mask(ifo->nomask, DHO_SUBNETMASK);
- 		del_option_mask(ifo->nomask, DHO_CSR);
- 		del_option_mask(ifo->nomask, DHO_ROUTER);
-@@ -1286,11 +1289,14 @@ parse_option(struct dhcpcd_ctx *ctx, const char *ifname, struct if_options *ifo,
- 		del_option_mask(ifo->nomask, DHO_RENEWALTIME);
- 		del_option_mask(ifo->nomask, DHO_REBINDTIME);
- 		del_option_mask(ifo->nomask, DHO_DNSSEARCH);
-+#endif
- 
-+#ifdef INET6
- 		del_option_mask(ifo->nomask6, D6_OPTION_DNS_SERVERS);
- 		del_option_mask(ifo->nomask6, D6_OPTION_DOMAIN_LIST);
- 		del_option_mask(ifo->nomask6, D6_OPTION_SOL_MAX_RT);
- 		del_option_mask(ifo->nomask6, D6_OPTION_INF_MAX_RT);
-+#endif
- 
- 		break;
- #ifdef INET
-diff --git a/src/privsep-root.c b/src/privsep-root.c
-index f88f56dd..0f099bb7 100644
---- a/src/privsep-root.c
-+++ b/src/privsep-root.c
-@@ -435,8 +435,10 @@ ps_root_dispatchcb(void *arg, struct ps_msghdr *psm, struct msghdr *msg)
- 	struct dhcpcd_ctx *ctx = arg;
- 	ssize_t err;
- 
-+#ifdef INET
- 	err = ps_bpf_dispatch(ctx, psm, msg);
- 	if (err == -1 && errno == ENOTSUP)
-+#endif
- 		err = ps_inet_dispatch(ctx, psm, msg);
- 	return err;
- }
--- 
-cgit v1.2.3
-