gentoo resync : 28.04.2019

7 files changed, 310 insertions, 360 deletions

diff --git a/net-misc/dhcpcd/Manifest b/net-misc/dhcpcd/Manifest
index 978776eab893..f092272a7910 100644
--- a/net-misc/dhcpcd/Manifest
+++ b/net-misc/dhcpcd/Manifest
@@ -1,15 +1,11 @@
 AUX dhcpcd-7.1.1-disable_inet6_fix.patch 609 BLAKE2B f69a5465f8750cba0a57b151b70c178e11576d4645d6fdc6c3f943cd2c98131af0742c48505624fb24d9a940dd523f98cb66bae51e38820c49aa9fdc6084bbfc SHA512 66fcf76affa35f2174e7bc0dd9964a67fde07144aedea30dfcd4f7280b841db344872da56a10d7d2474542c840e75d5323f994989bb96b803076e7e3d37d228d
+AUX dhcpcd-7.1.1-overflows.patch 5390 BLAKE2B 4c06a34b2cc5c1753b643987818a1e5d8b2deedacf90e80d9822a03bcf67d25d9f25adcdf6342792073811a428786789edc2b11c97f03df8fd48b697581b4b90 SHA512 2ea96d9faf1abd35345cf10c84f772a2fc56da33e0f0df93346536b1487d840c1d692a7c5118ebb504c30c8ffc0ac9c7792da0287e31584c10f0e9d11c5ffb1a
 AUX dhcpcd.initd 328 BLAKE2B 72ef6bb16e4f80b440890112cd399eca1057ae42ddc96ee1a29482a048682dd34e065bb68876329ecfe2f1db4c084e320f4185b3029b89c2328d6ab27a1a7e80 SHA512 6d3220155f2d9ed3e3a00afd378eeb70d435e19804201f8bb35498f1f7f3dfdaeaa2f4a01a18f5e96b457d9c173bc6a206b3e67ebf6d95da7e7b350dcd153fde
 AUX dhcpcd.service 227 BLAKE2B e24aa85c15d0211856b02508b681f7e3c1f8b8b1743f31ced9600c2c33da04b61f2166cad7696776ae81ce1be5701cae2691f6dfd86aaf8679f20e459e87c7e5 SHA512 4a030dc291fa7deba9c1f33d61dafdda710247ef7f3743c28e46b767a190e359e468433147bda23c82fae9c93ec31cd68905bfdb51cb8c2d9176ea789b31b14e
-DIST dhcpcd-6.11.3.tar.xz 194892 BLAKE2B 08253879221f2cbccf69caf06ccbde960103fdf4de194f746572f4fa10497ab23dc1a41b6a849fe75f68a1d7a653e5358a7976581da0a92c8f19e2627b921440 SHA512 249185532cb239124f847c28e6bfb3e8a85e818e05a07eb0c6ac6843fbbab8afa8d6ebce4032b3537ccfb7fafb306dd0dc51c0e97f337f12f5071ba499686a70
-DIST dhcpcd-7.0.1.tar.xz 207908 BLAKE2B 1a9350a0c4a9eb1eb6f5a7be78beb4a5fecd802ee90a4649ab17db69eabc75a913b9f3db97ea6260bcad3516b9613c20f74d9d68a7ac98b508458e5cd30cf15f SHA512 d2a9b053aa663dd1ed38a10a73ee3377a3a076c9638bdda9331a4c161c2ba87f5f68f366ac8e1f1015404f617b74261a03a97ac7cdfd642b4a41b87b54984c34
-DIST dhcpcd-7.0.8.tar.xz 210752 BLAKE2B ad8ba622589cc1c8c4bb332470c59527e03c817729f43a5b55b4f53f8ed60f35faaffbff24416f8596e78df8deb304f0598e27d890e9601d36c81250fda99942 SHA512 82cd845eb35670788b8f31b973945460f4c5f1a0a3025e3a452b79230dc30704e129d97140e6aec6d0281e0c89c333c0ce0af03c4767b2e5e66547ed3e071953
-DIST dhcpcd-7.1.0.tar.xz 211496 BLAKE2B ca919723f8f205ad24e28751024ff68cb4d1e86d056d47b1390a8e81cbb62d61e6a09d50d95756968d43383420e479846a4527095532d2761e26c6f4d780988b SHA512 28d2b5ff8cb372df6432becdbfeedaea945608b14374b6af8938936efdaa73d8d8f1cb3f37d2f440137c2f6988f72ed8de6d1bda43d65d4fe22efdd0a1662c24
 DIST dhcpcd-7.1.1.tar.xz 211788 BLAKE2B 984ec97ffdcb15883f57f9e2a699a7c8f006b2630e7651ab9d55e7a980045f8891f09d9f7be420969203a59671d097a1ed76621fe4a62ff26a5020fc8becfe69 SHA512 8791e718d65ef8ae23a16b98e82824860fa91914e6eb0a42cdbbca28236c1c38005ada44214bde33aac57152fe675debebdb5d141b67dcfc82012996d8337bb4
-EBUILD dhcpcd-6.11.3.ebuild 3267 BLAKE2B 439fae2ecd18b8c32319fbda22fa419f288bc977b8541f07a27c43f908bfe0867addf4b949c8e9f9e4163ca6f366f2083949f9b4d895d4e4bfc858d23cc3f514 SHA512 8c650ccff0f4ffb6ee9a17046b18c7f4c0e849e25b73d3d3abea66cd423a77e1c80c830f639d2ce74bc9c7566f8d6cea968feeb52ccdd6e20a5975f08f6a4b75
-EBUILD dhcpcd-7.0.1.ebuild 4437 BLAKE2B c27f5d78441c62e481f4439fbebe8454838e6e1e577b239848d6d484754e12da270674ec15ed0de27645508687160077155f0e639254b8fa2da6a92578bd619b SHA512 93e79e9148afd868ec9d0c8134d538b19d2f894056beda42bacc9a6d2ae57989e862e109fd3525e78149a6f7a83e6898972af9c2b0e21892d33aac01079946e7
-EBUILD dhcpcd-7.0.8.ebuild 4472 BLAKE2B 30ae32d7990eee683eae3e7c5a88499f46251935c3b95bbcd3309b0f18fdd522eda8cf82425bb7609669ee250be1e3f61bca8b560c6650a5e2f0e5420ef42404 SHA512 c7e575473851b1205bab968a57ebe6a4d16872fdef66a2f837c7a1521c191f803aa491b0f99d7b51d5ded8db2901ddccdb10d97ffb23dd0ab81c5d44c3c43ae1
-EBUILD dhcpcd-7.1.0.ebuild 4469 BLAKE2B 584d2050407bb0bf6bf6e20ca29213dd0305ea774eb6b67afec190dd111890848fe8376cd73b1c956ec50360c85325be5d01e2f32139394fa5b5fbc057eb2fd5 SHA512 356e8dac57a1f8229dd7c68d7cc7164b21178592400170251a11c3a52098e78ba1c24d36e5c5bd672d7c550a2be86d355efb5e757c07e0617ac194f511011014
-EBUILD dhcpcd-7.1.1-r1.ebuild 4556 BLAKE2B 1709406335981be840a2d88f173514f62e8e5c020c5ff1b85cc0d629a4bd92597268327cd07f85364d09a35ec3eb2ce70b42ae9b990d0f18b73fc34b918ba0e6 SHA512 368b40840f0ae970a62b451335b8951e1e4de4665ad3c41c2ac65dade56a429c27ab27dd17b29e1415bef73f7ee6c64c737d3587baa3cae5d79f92eb80d7cb79
+DIST dhcpcd-7.2.1.tar.xz 213652 BLAKE2B cae5a68ecf285825e6376c8b5bef5f3aba3bb8a393ba4298d8e990d665dd948369f24f688cdb85006df535b7f9b412c795d8eb7817a92e8d9992bdc7b7757a1e SHA512 11c3ef6d3ee49e147aa44725aa1ac0cddff70a268908439fe91990e135175d063e3d65ab587e1780e4f6f0739cf33873a58ffea0a3130d1bfb5598f9f11ec5a3
+EBUILD dhcpcd-7.1.1-r1.ebuild 4546 BLAKE2B 25c5c3e6d7e711b616bb5a9027d92a9606c5e91ccc42fe7494cefe8abc30bdca7387171f3c09a44cfb863a304e9bf64f9afb203d7194b59ef32f6aca5a0a8543 SHA512 2ec21f7e6dfc864d11c90ef2ef99509311823eeae91008a3f10c34fa193c4d06cd7fe370403a1eb0eeb06bd75fdc1966abb54e2ee759b0648af683db5bdc16db
+EBUILD dhcpcd-7.1.1-r2.ebuild 4596 BLAKE2B b111c89b4d71b3142aeb86b58798f14107c1587190a74e904bef20f45a3eb79ee79561a1cbc60b13beaf0d62da97787db0c282b924e2b48c2ba1c3202ee8c393 SHA512 fbcea64846212f3c79557a6a4d4b5db513295a18065742aafd6b11c18b33e7df9a0934c4158485cbf46fd8da88bff7d5aea44abc274be11587a3e3efe5554532
+EBUILD dhcpcd-7.2.1.ebuild 4493 BLAKE2B c327b61bba6c17aa24689b793f929e588d079bcf6385aed24614ac39864f28119841efa86631802589a4f8f66abb9f29f6970cd1904bfefa41c9bf94ae73ed8d SHA512 0d7ce59d11435e7703a12ec2de957a532d2ccb8ef8e579ceb57af6615c37537bb47b7fb393c34a1cf2f174d5119036e9f1706dab331cc35ada64af3f79bb8ac5
 EBUILD dhcpcd-9999.ebuild 4493 BLAKE2B c327b61bba6c17aa24689b793f929e588d079bcf6385aed24614ac39864f28119841efa86631802589a4f8f66abb9f29f6970cd1904bfefa41c9bf94ae73ed8d SHA512 0d7ce59d11435e7703a12ec2de957a532d2ccb8ef8e579ceb57af6615c37537bb47b7fb393c34a1cf2f174d5119036e9f1706dab331cc35ada64af3f79bb8ac5
 MISC metadata.xml 569 BLAKE2B 0507986b52ed21277e159089c7f4736602917c44f0577d62e7501d728c348b49ecf3a2c92842c8e32a59402ad2c2e4e5c3fba510e227aca738a3d763b62689fe SHA512 9083c03d22c5753f54d9525ac954df8df0cceaed07c05c14367ea2b8598e7d7ab64711c810dc89a46be8d76cba6b9aa14fa389f0d686ed12792c0bfcbabc266a
diff --git a/net-misc/dhcpcd/dhcpcd-6.11.3.ebuild b/net-misc/dhcpcd/dhcpcd-6.11.3.ebuild
deleted file mode 100644
index c355512e259f..000000000000
--- a/net-misc/dhcpcd/dhcpcd-6.11.3.ebuild
+++ /dev/null
@@ -1,114 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-if [[ ${PV} == "9999" ]]; then
-	FOSSIL_URI="http://roy.marples.name/projects/dhcpcd"
-else
-	MY_P="${P/_alpha/-alpha}"
-	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 ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux"
-	S="${WORKDIR}/${MY_P}"
-fi
-
-inherit eutils systemd toolchain-funcs
-
-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"
-
-COMMON_DEPEND="udev? ( virtual/udev )"
-DEPEND="${COMMON_DEPEND}"
-RDEPEND="${COMMON_DEPEND}"
-
-if [[ ${PV} == "9999" ]]; then
-	DEPEND+=" dev-vcs/fossil"
-
-	src_unpack()
-	{
-		local distdir=${PORTAGE_ACTUAL_DISTDIR:-${DISTDIR}}
-		local repo=${distdir}/fossil/${PN}.fossil
-
-		addwrite "${distdir}"
-
-		if [[ -e "${repo}" ]]; then
-			fossil pull "${FOSSIL_URI}" -R "${repo}" || die
-		else
-			mkdir -p "${distdir}/fossil" || die
-			fossil clone "${FOSSIL_URI}" "${repo}" || die
-		fi
-
-		mkdir -p "${S}" || die
-		cd "${S}" || die
-		fossil open "${repo}" || die
-	}
-fi
-
-src_configure()
-{
-	local dev hooks rundir
-	use udev || dev="--without-dev --without-udev"
-	hooks="--with-hook=ntp.conf"
-	use elibc_glibc && hooks="${hooks} --with-hook=yp.conf"
-	use kernel_linux && rundir="--rundir=${EPREFIX}/run"
-	econf \
-		--prefix="${EPREFIX}" \
-		--libexecdir="${EPREFIX}/lib/dhcpcd" \
-		--dbdir="${EPREFIX}/var/lib/dhcpcd" \
-		--localstatedir="${EPREFIX}/var" \
-		${rundir} \
-		$(use_enable embedded) \
-		$(use_enable ipv6) \
-		${dev} \
-		CC="$(tc-getCC)" \
-		${hooks}
-}
-
-src_install()
-{
-	default
-	newinitd "${FILESDIR}"/${PN}.initd ${PN}
-	systemd_dounit "${FILESDIR}"/${PN}.service
-}
-
-pkg_postinst()
-{
-	# Upgrade the duid file to the new format if needed
-	local old_duid="${ROOT}"/var/lib/dhcpcd/dhcpcd.duid
-	local new_duid="${ROOT}"/etc/dhcpcd.duid
-	if [ -e "${old_duid}" ] && ! grep -q '..:..:..:..:..:..' "${old_duid}"; then
-		sed -i -e 's/\(..\)/\1:/g; s/:$//g' "${old_duid}"
-	fi
-
-	# Move the duid to /etc, a more sensible location
-	if [ -e "${old_duid}" -a ! -e "${new_duid}" ]; then
-		cp -p "${old_duid}" "${new_duid}"
-	fi
-
-	if [ -z "$REPLACING_VERSIONS" ]; then
-		elog
-	 elog "dhcpcd has zeroconf support active by default."
-		elog "This means it will always obtain an IP address even if no"
-		elog "DHCP server can be contacted, which will break any existing"
-		elog "failover support you may have configured in your net configuration."
-		elog "This behaviour can be controlled with the noipv4ll configuration"
-		elog "file option or the -L command line switch."
-		elog "See the dhcpcd and dhcpcd.conf man pages for more details."
-
-		elog
-		elog "Dhcpcd has duid enabled by default, and this may cause issues"
-		elog "with some dhcp servers. For more information, see"
-		elog "https://bugs.gentoo.org/show_bug.cgi?id=477356"
-	fi
-
-	if ! has_version net-dns/bind-tools; then
-		elog
-		elog "If you activate the lookup-hostname hook to look up your hostname"
-		elog "using the dns, you need to install net-dns/bind-tools."
-	fi
-}
diff --git a/net-misc/dhcpcd/dhcpcd-7.0.1.ebuild b/net-misc/dhcpcd/dhcpcd-7.0.1.ebuild
deleted file mode 100644
index b7938c558521..000000000000
--- a/net-misc/dhcpcd/dhcpcd-7.0.1.ebuild
+++ /dev/null
@@ -1,148 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-if [[ ${PV} == "9999" ]]; then
-	EGIT_REPO_URI="https://roy.marples.name/git/dhcpcd.git"
-	inherit git-r3
-else
-	MY_P="${P/_alpha/-alpha}"
-	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 ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux"
-	S="${WORKDIR}/${MY_P}"
-fi
-
-inherit eutils systemd toolchain-funcs
-
-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"
-
-COMMON_DEPEND="udev? ( virtual/udev )"
-DEPEND="${COMMON_DEPEND}"
-RDEPEND="${COMMON_DEPEND}"
-
-src_configure()
-{
-	local dev hooks rundir
-	use udev || dev="--without-dev --without-udev"
-	hooks="--with-hook=ntp.conf"
-	use elibc_glibc && hooks="${hooks} --with-hook=yp.conf"
-	use kernel_linux && rundir="--rundir=${EPREFIX}/run"
-	econf \
-		--prefix="${EPREFIX}" \
-		--libexecdir="${EPREFIX}/lib/dhcpcd" \
-		--dbdir="${EPREFIX}/var/lib/dhcpcd" \
-		--localstatedir="${EPREFIX}/var" \
-		${rundir} \
-		$(use_enable embedded) \
-		$(use_enable ipv6) \
-		${dev} \
-		CC="$(tc-getCC)" \
-		${hooks}
-}
-
-src_install()
-{
-	default
-	newinitd "${FILESDIR}"/${PN}.initd ${PN}
-	systemd_dounit "${FILESDIR}"/${PN}.service
-}
-
-pkg_postinst()
-{
-	local dbdir="${EROOT%/}"/var/lib/dhcpcd old_files=
-
-	local old_old_duid="${EROOT%/}"/var/lib/dhcpcd/dhcpcd.duid
-	local old_duid="${EROOT%/}"/etc/dhcpcd.duid
-	local new_duid="${dbdir}"/duid
-	if [ -e "${old_old_duid}" ]; then
-		# Upgrade the duid file to the new format if needed
-		if ! grep -q '..:..:..:..:..:..' "${old_old_duid}"; then
-			sed -i -e 's/\(..\)/\1:/g; s/:$//g' "${old_old_duid}"
-		fi
-
-		# Move the duid to /etc, a more sensible location
-		if [ ! -e "${old_duid}" ]; then
-			cp -p "${old_old_duid}" "${new_duid}"
-		fi
-		old_files="${old_files} ${old_old_duid}"
-	fi
-
-	# dhcpcd-7 moves the files out of /etc
-	if [ -e "${old_duid}" ]; then
-		if [ ! -e "${new_duid}" ]; then
-			cp -p "${old_duid}" "${new_duid}"
-		fi
-		old_files="${old_files} ${old_duid}"
-	fi
-	local old_secret="${EROOT%/}"/etc/dhcpcd.secret
-	local new_secret="${dbdir}"/secret
-	if [ -e "${old_secret}" ]; then
-		if [ ! -e "${new_secret}" ]; then
-			cp -p "${old_secret}" "${new_secret}"
-		fi
-		old_files="${old_files} ${old_secret}"
-	fi
-
-	# dhcpcd-7 renames some files in /var/lib/dhcpcd
-	local old_rdm="${dbdir}"/dhcpcd-rdm.monotonic
-	local new_rdm="${dbdir}"/rdm_monotonic
-	if [ -e "${old_rdm}" ]; then
-		if [ ! -e "${new_rdm}" ]; then
-			cp -p "${old_rdm}" "${new_rdm}"
-		fi
-		old_files="${old_files} ${old_rdm}"
-	fi
-	local lease=
-	for lease in "${dbdir}"/dhcpcd-*.lease*; do
-		[ -f "$lease" ] || continue
-		old_files="${old_files} ${lease}"
-		local new_lease=$(basename "$lease" | sed -e "s/dhcpcd-//")
-		[ -e "${dbdir}/${new_lease}" ] && continue
-		cp "${lease}" "${dbdir}/${new_lease}"
-	done
-
-	# Warn about removing stale files
-	if [ -n "${old_files}" ]; then
-		elog
-		elog "dhcpcd-7 has copied dhcpcd.duid and dhcpcd.secret from"
-		elog "${EROOT%/}/etc to ${dbdir}"
-		elog "and copied leases in ${dbdir} to new files with the dhcpcd-"
-		elog "prefix dropped."
-		elog
-		elog "You should remove these files if you don't plan on reverting"
-		elog "to an older version:"
-		local old_file=
-		for old_file in ${old_files}; do
-			elog "	${old_file}"
-		done
-	fi
-
-	if [ -z "$REPLACING_VERSIONS" ]; then
-		elog
-		elog "dhcpcd has zeroconf support active by default."
-		elog "This means it will always obtain an IP address even if no"
-		elog "DHCP server can be contacted, which will break any existing"
-		elog "failover support you may have configured in your net configuration."
-		elog "This behaviour can be controlled with the noipv4ll configuration"
-		elog "file option or the -L command line switch."
-		elog "See the dhcpcd and dhcpcd.conf man pages for more details."
-
-		elog
-		elog "Dhcpcd has duid enabled by default, and this may cause issues"
-		elog "with some dhcp servers. For more information, see"
-		elog "https://bugs.gentoo.org/show_bug.cgi?id=477356"
-	fi
-
-	if ! has_version net-dns/bind-tools; then
-		elog
-		elog "If you activate the lookup-hostname hook to look up your hostname"
-		elog "using the dns, you need to install net-dns/bind-tools."
-	fi
-}
diff --git a/net-misc/dhcpcd/dhcpcd-7.1.1-r1.ebuild b/net-misc/dhcpcd/dhcpcd-7.1.1-r1.ebuild
index 3e592d1c3cd5..9c02a7a0ea5a 100644
--- a/net-misc/dhcpcd/dhcpcd-7.1.1-r1.ebuild
+++ b/net-misc/dhcpcd/dhcpcd-7.1.1-r1.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 ~mips ~ppc ~ppc64 ~s390 ~sh sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux"
+	KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux"
 	S="${WORKDIR}/${MY_P}"
 fi
 
diff --git a/net-misc/dhcpcd/dhcpcd-7.0.8.ebuild b/net-misc/dhcpcd/dhcpcd-7.1.1-r2.ebuild
index a146481fe88b..2421095333a1 100644
--- a/net-misc/dhcpcd/dhcpcd-7.0.8.ebuild
+++ b/net-misc/dhcpcd/dhcpcd-7.1.1-r2.ebuild
@@ -1,22 +1,22 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
+inherit systemd toolchain-funcs
+
 if [[ ${PV} == "9999" ]]; then
-	EGIT_REPO_URI="https://roy.marples.name/git/dhcpcd.git"
 	inherit git-r3
+	EGIT_REPO_URI="https://roy.marples.name/git/dhcpcd.git"
 else
 	MY_P="${P/_alpha/-alpha}"
 	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 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux"
+	KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ia64 ~mips ppc ~ppc64 ~s390 ~sh sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux"
 	S="${WORKDIR}/${MY_P}"
 fi
 
-inherit eutils systemd toolchain-funcs
-
 DESCRIPTION="A fully featured, yet light weight RFC2131 compliant DHCP client"
 HOMEPAGE="https://roy.marples.name/projects/dhcpcd"
 LICENSE="BSD-2"
@@ -27,90 +27,94 @@ COMMON_DEPEND="udev? ( virtual/udev )"
 DEPEND="${COMMON_DEPEND}"
 RDEPEND="${COMMON_DEPEND}"
 
-src_configure()
-{
-	local dev hooks rundir
+PATCHES=(
+	"${FILESDIR}"/${P}-disable_inet6_fix.patch #677508
+	"${FILESDIR}"/${PN}-7.1.1-overflows.patch
+)
+
+src_configure() {
+	local dev hooks=() rundir
 	use udev || dev="--without-dev --without-udev"
-	hooks="--with-hook=ntp.conf"
-	use elibc_glibc && hooks="${hooks} --with-hook=yp.conf"
+	hooks=( --with-hook=ntp.conf )
+	use elibc_glibc && hooks+=( --with-hook=yp.conf )
 	use kernel_linux && rundir="--rundir=${EPREFIX}/run"
-	econf \
-		--prefix="${EPREFIX}" \
-		--libexecdir="${EPREFIX}/lib/dhcpcd" \
-		--dbdir="${EPREFIX}/var/lib/dhcpcd" \
-		--localstatedir="${EPREFIX}/var" \
-		${rundir} \
-		$(use_enable embedded) \
-		$(use_enable ipv6) \
-		${dev} \
-		CC="$(tc-getCC)" \
-		${hooks}
+	local myeconfargs=(
+		--prefix="${EPREFIX}"
+		--libexecdir="${EPREFIX}/lib/dhcpcd"
+		--dbdir="${EPREFIX}/var/lib/dhcpcd"
+		--localstatedir="${EPREFIX}/var"
+		${rundir}
+		$(use_enable embedded)
+		$(use_enable ipv6)
+		${dev}
+		CC="$(tc-getCC)"
+		${hooks[@]}
+	)
+	econf "${myeconfargs[@]}"
 }
 
-src_install()
-{
+src_install() {
 	default
 	keepdir /var/lib/dhcpcd
 	newinitd "${FILESDIR}"/${PN}.initd ${PN}
 	systemd_dounit "${FILESDIR}"/${PN}.service
 }
 
-pkg_postinst()
-{
-	local dbdir="${EROOT%/}"/var/lib/dhcpcd old_files=
+pkg_postinst() {
+	local dbdir="${EROOT%/}"/var/lib/dhcpcd old_files=()
 
 	local old_old_duid="${EROOT%/}"/var/lib/dhcpcd/dhcpcd.duid
 	local old_duid="${EROOT%/}"/etc/dhcpcd.duid
 	local new_duid="${dbdir}"/duid
-	if [ -e "${old_old_duid}" ]; then
+	if [[ -e "${old_old_duid}" ]] ; then
 		# Upgrade the duid file to the new format if needed
 		if ! grep -q '..:..:..:..:..:..' "${old_old_duid}"; then
 			sed -i -e 's/\(..\)/\1:/g; s/:$//g' "${old_old_duid}"
 		fi
 
 		# Move the duid to /etc, a more sensible location
-		if [ ! -e "${old_duid}" ]; then
+		if [[ ! -e "${old_duid}" ]] ; then
 			cp -p "${old_old_duid}" "${new_duid}"
 		fi
-		old_files="${old_files} ${old_old_duid}"
+		old_files+=( "${old_old_duid}" )
 	fi
 
 	# dhcpcd-7 moves the files out of /etc
-	if [ -e "${old_duid}" ]; then
-		if [ ! -e "${new_duid}" ]; then
+	if [[ -e "${old_duid}" ]] ; then
+		if [[ ! -e "${new_duid}" ]] ; then
 			cp -p "${old_duid}" "${new_duid}"
 		fi
-		old_files="${old_files} ${old_duid}"
+		old_files+=( "${old_duid}" )
 	fi
 	local old_secret="${EROOT%/}"/etc/dhcpcd.secret
 	local new_secret="${dbdir}"/secret
-	if [ -e "${old_secret}" ]; then
-		if [ ! -e "${new_secret}" ]; then
+	if [[ -e "${old_secret}" ]] ; then
+		if [[ ! -e "${new_secret}" ]] ; then
 			cp -p "${old_secret}" "${new_secret}"
 		fi
-		old_files="${old_files} ${old_secret}"
+		old_files+=( "${old_secret}" )
 	fi
 
 	# dhcpcd-7 renames some files in /var/lib/dhcpcd
 	local old_rdm="${dbdir}"/dhcpcd-rdm.monotonic
 	local new_rdm="${dbdir}"/rdm_monotonic
-	if [ -e "${old_rdm}" ]; then
-		if [ ! -e "${new_rdm}" ]; then
+	if [[ -e "${old_rdm}" ]] ; then
+		if [[ ! -e "${new_rdm}" ]] ; then
 			cp -p "${old_rdm}" "${new_rdm}"
 		fi
-		old_files="${old_files} ${old_rdm}"
+		old_files+=( "${old_rdm}" )
 	fi
 	local lease=
 	for lease in "${dbdir}"/dhcpcd-*.lease*; do
-		[ -f "$lease" ] || continue
-		old_files="${old_files} ${lease}"
-		local new_lease=$(basename "$lease" | sed -e "s/dhcpcd-//")
-		[ -e "${dbdir}/${new_lease}" ] && continue
+		[[ -f "${lease}" ]] || continue
+		old_files+=( "${lease}" )
+		local new_lease=$(basename "${lease}" | sed -e "s/dhcpcd-//")
+		[[ -e "${dbdir}/${new_lease}" ]] && continue
 		cp "${lease}" "${dbdir}/${new_lease}"
 	done
 
 	# Warn about removing stale files
-	if [ -n "${old_files}" ]; then
+	if [[ -n "${old_files[@]}" ]] ; then
 		elog
 		elog "dhcpcd-7 has copied dhcpcd.duid and dhcpcd.secret from"
 		elog "${EROOT%/}/etc to ${dbdir}"
@@ -120,12 +124,12 @@ pkg_postinst()
 		elog "You should remove these files if you don't plan on reverting"
 		elog "to an older version:"
 		local old_file=
-		for old_file in ${old_files}; do
+		for old_file in ${old_files[@]}; do
 			elog "	${old_file}"
 		done
 	fi
 
-	if [ -z "$REPLACING_VERSIONS" ]; then
+	if [ -z "${REPLACING_VERSIONS}" ]; then
 		elog
 		elog "dhcpcd has zeroconf support active by default."
 		elog "This means it will always obtain an IP address even if no"
diff --git a/net-misc/dhcpcd/dhcpcd-7.1.0.ebuild b/net-misc/dhcpcd/dhcpcd-7.2.1.ebuild
index a1f2efc1cab5..48ba26275d0c 100644
--- a/net-misc/dhcpcd/dhcpcd-7.1.0.ebuild
+++ b/net-misc/dhcpcd/dhcpcd-7.2.1.ebuild
@@ -3,9 +3,11 @@
 
 EAPI=6
 
+inherit systemd toolchain-funcs
+
 if [[ ${PV} == "9999" ]]; then
-	EGIT_REPO_URI="https://roy.marples.name/git/dhcpcd.git"
 	inherit git-r3
+	EGIT_REPO_URI="https://roy.marples.name/git/dhcpcd.git"
 else
 	MY_P="${P/_alpha/-alpha}"
 	MY_P="${MY_P/_beta/-beta}"
@@ -15,8 +17,6 @@ else
 	S="${WORKDIR}/${MY_P}"
 fi
 
-inherit eutils systemd toolchain-funcs
-
 DESCRIPTION="A fully featured, yet light weight RFC2131 compliant DHCP client"
 HOMEPAGE="https://roy.marples.name/projects/dhcpcd"
 LICENSE="BSD-2"
@@ -27,90 +27,89 @@ COMMON_DEPEND="udev? ( virtual/udev )"
 DEPEND="${COMMON_DEPEND}"
 RDEPEND="${COMMON_DEPEND}"
 
-src_configure()
-{
-	local dev hooks rundir
+src_configure() {
+	local dev hooks=() rundir
 	use udev || dev="--without-dev --without-udev"
-	hooks="--with-hook=ntp.conf"
-	use elibc_glibc && hooks="${hooks} --with-hook=yp.conf"
+	hooks=( --with-hook=ntp.conf )
+	use elibc_glibc && hooks+=( --with-hook=yp.conf )
 	use kernel_linux && rundir="--rundir=${EPREFIX}/run"
-	econf \
-		--prefix="${EPREFIX}" \
-		--libexecdir="${EPREFIX}/lib/dhcpcd" \
-		--dbdir="${EPREFIX}/var/lib/dhcpcd" \
-		--localstatedir="${EPREFIX}/var" \
-		${rundir} \
-		$(use_enable embedded) \
-		$(use_enable ipv6) \
-		${dev} \
-		CC="$(tc-getCC)" \
-		${hooks}
+	local myeconfargs=(
+		--prefix="${EPREFIX}"
+		--libexecdir="${EPREFIX}/lib/dhcpcd"
+		--dbdir="${EPREFIX}/var/lib/dhcpcd"
+		--localstatedir="${EPREFIX}/var"
+		${rundir}
+		$(use_enable embedded)
+		$(use_enable ipv6)
+		${dev}
+		CC="$(tc-getCC)"
+		${hooks[@]}
+	)
+	econf "${myeconfargs[@]}"
 }
 
-src_install()
-{
+src_install() {
 	default
 	keepdir /var/lib/dhcpcd
 	newinitd "${FILESDIR}"/${PN}.initd ${PN}
 	systemd_dounit "${FILESDIR}"/${PN}.service
 }
 
-pkg_postinst()
-{
-	local dbdir="${EROOT%/}"/var/lib/dhcpcd old_files=
+pkg_postinst() {
+	local dbdir="${EROOT%/}"/var/lib/dhcpcd old_files=()
 
 	local old_old_duid="${EROOT%/}"/var/lib/dhcpcd/dhcpcd.duid
 	local old_duid="${EROOT%/}"/etc/dhcpcd.duid
 	local new_duid="${dbdir}"/duid
-	if [ -e "${old_old_duid}" ]; then
+	if [[ -e "${old_old_duid}" ]] ; then
 		# Upgrade the duid file to the new format if needed
 		if ! grep -q '..:..:..:..:..:..' "${old_old_duid}"; then
 			sed -i -e 's/\(..\)/\1:/g; s/:$//g' "${old_old_duid}"
 		fi
 
 		# Move the duid to /etc, a more sensible location
-		if [ ! -e "${old_duid}" ]; then
+		if [[ ! -e "${old_duid}" ]] ; then
 			cp -p "${old_old_duid}" "${new_duid}"
 		fi
-		old_files="${old_files} ${old_old_duid}"
+		old_files+=( "${old_old_duid}" )
 	fi
 
 	# dhcpcd-7 moves the files out of /etc
-	if [ -e "${old_duid}" ]; then
-		if [ ! -e "${new_duid}" ]; then
+	if [[ -e "${old_duid}" ]] ; then
+		if [[ ! -e "${new_duid}" ]] ; then
 			cp -p "${old_duid}" "${new_duid}"
 		fi
-		old_files="${old_files} ${old_duid}"
+		old_files+=( "${old_duid}" )
 	fi
 	local old_secret="${EROOT%/}"/etc/dhcpcd.secret
 	local new_secret="${dbdir}"/secret
-	if [ -e "${old_secret}" ]; then
-		if [ ! -e "${new_secret}" ]; then
+	if [[ -e "${old_secret}" ]] ; then
+		if [[ ! -e "${new_secret}" ]] ; then
 			cp -p "${old_secret}" "${new_secret}"
 		fi
-		old_files="${old_files} ${old_secret}"
+		old_files+=( "${old_secret}" )
 	fi
 
 	# dhcpcd-7 renames some files in /var/lib/dhcpcd
 	local old_rdm="${dbdir}"/dhcpcd-rdm.monotonic
 	local new_rdm="${dbdir}"/rdm_monotonic
-	if [ -e "${old_rdm}" ]; then
-		if [ ! -e "${new_rdm}" ]; then
+	if [[ -e "${old_rdm}" ]] ; then
+		if [[ ! -e "${new_rdm}" ]] ; then
 			cp -p "${old_rdm}" "${new_rdm}"
 		fi
-		old_files="${old_files} ${old_rdm}"
+		old_files+=( "${old_rdm}" )
 	fi
 	local lease=
 	for lease in "${dbdir}"/dhcpcd-*.lease*; do
-		[ -f "$lease" ] || continue
-		old_files="${old_files} ${lease}"
-		local new_lease=$(basename "$lease" | sed -e "s/dhcpcd-//")
-		[ -e "${dbdir}/${new_lease}" ] && continue
+		[[ -f "${lease}" ]] || continue
+		old_files+=( "${lease}" )
+		local new_lease=$(basename "${lease}" | sed -e "s/dhcpcd-//")
+		[[ -e "${dbdir}/${new_lease}" ]] && continue
 		cp "${lease}" "${dbdir}/${new_lease}"
 	done
 
 	# Warn about removing stale files
-	if [ -n "${old_files}" ]; then
+	if [[ -n "${old_files[@]}" ]] ; then
 		elog
 		elog "dhcpcd-7 has copied dhcpcd.duid and dhcpcd.secret from"
 		elog "${EROOT%/}/etc to ${dbdir}"
@@ -120,12 +119,12 @@ pkg_postinst()
 		elog "You should remove these files if you don't plan on reverting"
 		elog "to an older version:"
 		local old_file=
-		for old_file in ${old_files}; do
+		for old_file in ${old_files[@]}; do
 			elog "	${old_file}"
 		done
 	fi
 
-	if [ -z "$REPLACING_VERSIONS" ]; then
+	if [ -z "${REPLACING_VERSIONS}" ]; then
 		elog
 		elog "dhcpcd has zeroconf support active by default."
 		elog "This means it will always obtain an IP address even if no"
diff --git a/net-misc/dhcpcd/files/dhcpcd-7.1.1-overflows.patch b/net-misc/dhcpcd/files/dhcpcd-7.1.1-overflows.patch
new file mode 100644
index 000000000000..6ec780936a83
--- /dev/null
+++ b/net-misc/dhcpcd/files/dhcpcd-7.1.1-overflows.patch
@@ -0,0 +1,213 @@
+https://roy.marples.name/git/dhcpcd.git/patch/?id=23525884a346ed81c808c1ed90e3c56a8bf0cc68
+
+From 8d11b33f6c60e2db257130fa383ba76b6018bcf6 Mon Sep 17 00:00:00 2001
+From: Roy Marples <roy@marples.name>
+Date: Fri, 19 Apr 2019 09:45:02 +0100
+Subject: DHCPv6: Fix a potential buffer overflow reading NA/TA addresses
+
+Only copy upto the size of the address option rather than the
+option length.
+
+Found by Maxime Villard <max@m00nbsd.net>
+---
+ src/dhcp6.c | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/src/dhcp6.c b/src/dhcp6.c
+index 99a452b..8fc4f00 100644
+--- a/src/dhcp6.c
++++ b/src/dhcp6.c
+@@ -2029,12 +2029,12 @@ dhcp6_findna(struct interface *ifp, uint16_t ot, const uint8_t *iaid,
+ 		nd = o + ol;
+ 		l -= (size_t)(nd - d);
+ 		d = nd;
+-		if (ol < 24) {
++		if (ol < sizeof(ia)) {
+ 			errno = EINVAL;
+ 			logerrx("%s: IA Address option truncated", ifp->name);
+ 			continue;
+ 		}
+-		memcpy(&ia, o, ol);
++		memcpy(&ia, o, sizeof(ia));
+ 		ia.pltime = ntohl(ia.pltime);
+ 		ia.vltime = ntohl(ia.vltime);
+ 		/* RFC 3315 22.6 */
+-- 
+cgit v1.1
+
+
+From 4b67f6f1038fd4ad5ca7734eaaeba1b2ec4816b8 Mon Sep 17 00:00:00 2001
+From: Roy Marples <roy@marples.name>
+Date: Fri, 19 Apr 2019 21:00:19 +0100
+Subject: DHCP: Fix a potential 1 byte read overflow with DHO_OPTSOVERLOADED
+
+This fix basically moves the option length check up and also
+corrects an off by one error with it.
+
+Thanks to Maxime Villard <max@m00nbsd.net>
+---
+ src/dhcp.c | 10 ++++++----
+ 1 file changed, 6 insertions(+), 4 deletions(-)
+
+diff --git a/src/dhcp.c b/src/dhcp.c
+index f7cdefc..e13d1b4 100644
+--- a/src/dhcp.c
++++ b/src/dhcp.c
+@@ -215,6 +215,12 @@ get_option(struct dhcpcd_ctx *ctx,
+ 		}
+ 		l = *p++;
+ 
++		/* Check we can read the option data, if present */
++		if (p + l > e) {
++			errno = EINVAL;
++			return NULL;
++		}
++
+ 		if (o == DHO_OPTSOVERLOADED) {
+ 			/* Ensure we only get this option once by setting
+ 			 * the last bit as well as the value.
+@@ -249,10 +255,6 @@ get_option(struct dhcpcd_ctx *ctx,
+ 				bp += ol;
+ 			}
+ 			ol = l;
+-			if (p + ol >= e) {
+-				errno = EINVAL;
+-				return NULL;
+-			}
+ 			op = p;
+ 			bl += ol;
+ 		}
+-- 
+cgit v1.1
+
+
+From 7121040790b611ca3fbc400a1bbcd4364ef57233 Mon Sep 17 00:00:00 2001
+From: Roy Marples <roy@marples.name>
+Date: Fri, 19 Apr 2019 21:40:14 +0100
+Subject: auth: Use consttime_memequal(3) to compare hashes
+
+This stops any attacker from trying to infer secrets from latency.
+
+Thanks to Maxime Villard <max@m00nbsd.net>
+---
+ src/auth.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/auth.c b/src/auth.c
+index 9e24998..ce97051 100644
+--- a/src/auth.c
++++ b/src/auth.c
+@@ -354,7 +354,7 @@ gottoken:
+ 	}
+ 
+ 	free(mm);
+-	if (memcmp(d, &hmac_code, dlen)) {
++	if (!consttime_memequal(d, &hmac_code, dlen)) {
+ 		errno = EPERM;
+ 		return NULL;
+ 	}
+-- 
+cgit v1.1
+
+
+From cfde89ab66cb4e5957b1c4b68ad6a9449e2784da Mon Sep 17 00:00:00 2001
+From: Roy Marples <roy@marples.name>
+Date: Fri, 19 Apr 2019 21:42:07 +0100
+Subject: compat: Provide consttime_memequal if not in libc
+
+Public domain version by Matthias Drochner <drochner@netbsd.org>
+---
+ configure | 22 ++++++++++++++++++++++
+ 1 file changed, 22 insertions(+)
+
+diff --git a/configure b/configure
+index 570e65f..4f58f0f 100755
+--- a/configure
++++ b/configure
+@@ -13,6 +13,7 @@ IPV4LL=
+ INET6=
+ ARC4RANDOM=
+ CLOSEFROM=
++CONSTTIME_MEMEQUAL=
+ STRLCPY=
+ UDEV=
+ OS=
+@@ -846,6 +847,27 @@ if [ "$STRTOI" = no ]; then
+ 	echo "#include			\"compat/strtoi.h\"" >>$CONFIG_H
+ fi
+ 
++if [ -z "$CONSTTIME_MEMEQUAL" ]; then
++	printf "Testing for consttime_memequal ... "
++	cat <<EOF >_consttime_memequal.c
++#include <string.h>
++int main(void) {
++	return consttime_memequal("deadbeef", "deadbeef", 8);
++}
++EOF
++	if $XCC _consttime_memequal.c -o _consttime_memequal 2>&3; then
++		CONSTTIME_MEMEQUAL=yes
++	else
++		CONSTTIME_MEMEQUAL=no
++	fi
++	echo "$CONSTTIME_MEMEQUAL"
++	rm -f _consttime_memequal.c _consttime_memequal
++fi
++if [ "$CONSTTIME_MEMEQUAL" = no ]; then
++	echo "#include			\"compat/consttime_memequal.h\"" \
++	    >>$CONFIG_H
++fi
++
+ if [ -z "$DPRINTF" ]; then
+ 	printf "Testing for dprintf ... "
+ 	cat <<EOF >_dprintf.c
+-- 
+cgit v1.1
+
+
+From aee631aadeef4283c8a749c1caf77823304acf5e Mon Sep 17 00:00:00 2001
+From: Roy Marples <roy@marples.name>
+Date: Fri, 19 Apr 2019 21:47:37 +0100
+Subject: Really add consttime_memequal
+
+---
+ compat/consttime_memequal.h | 28 ++++++++++++++++++++++++++++
+ 1 file changed, 28 insertions(+)
+ create mode 100644 compat/consttime_memequal.h
+
+diff --git a/compat/consttime_memequal.h b/compat/consttime_memequal.h
+new file mode 100644
+index 0000000..9830648
+--- /dev/null
++++ b/compat/consttime_memequal.h
+@@ -0,0 +1,28 @@
++/*
++ * Written by Matthias Drochner <drochner@NetBSD.org>.
++ * Public domain.
++ */
++
++#ifndef CONSTTIME_MEMEQUAL_H
++#define CONSTTIME_MEMEQUAL_H
++inline static int
++consttime_memequal(const void *b1, const void *b2, size_t len)
++{
++	const unsigned char *c1 = b1, *c2 = b2;
++	unsigned int res = 0;
++
++	while (len--)
++		res |= *c1++ ^ *c2++;
++
++	/*
++	 * Map 0 to 1 and [1, 256) to 0 using only constant-time
++	 * arithmetic.
++	 *
++	 * This is not simply `!res' because although many CPUs support
++	 * branchless conditional moves and many compilers will take
++	 * advantage of them, certain compilers generate branches on
++	 * certain CPUs for `!res'.
++	 */
++	return (1 & ((res - 1) >> 8));
++}
++#endif /* CONSTTIME_MEMEQUAL_H */
+-- 
+cgit v1.1
+