gentoo resync : 09.12.2017

2 files changed, 158 insertions, 8 deletions

diff --git a/net-misc/dhcpcd/Manifest b/net-misc/dhcpcd/Manifest
index 13e79d0f7e04..7e1117e98a39 100644
--- a/net-misc/dhcpcd/Manifest
+++ b/net-misc/dhcpcd/Manifest
@@ -1,14 +1,15 @@
 AUX dhcpcd-6.11.1-arp-conflict.patch 1765 BLAKE2B a137044bc06a29e23bbebd383337f2166acb0a312ca866f31c7e5b70c15350cbbfe8653b703b6738e4e2ac05700cfbc493f868633561ada6b6de7a90659f862d SHA512 f0b7f53f30d178a4536113fb01efe177db73f609cf1cbba2fe603a619c7417067ad070318c50c363a30f4c87315aac27118ad088cdbeed3575fb640c9632ad95
 AUX dhcpcd.initd 328 BLAKE2B 72ef6bb16e4f80b440890112cd399eca1057ae42ddc96ee1a29482a048682dd34e065bb68876329ecfe2f1db4c084e320f4185b3029b89c2328d6ab27a1a7e80 SHA512 6d3220155f2d9ed3e3a00afd378eeb70d435e19804201f8bb35498f1f7f3dfdaeaa2f4a01a18f5e96b457d9c173bc6a206b3e67ebf6d95da7e7b350dcd153fde
 AUX dhcpcd.service 227 BLAKE2B e24aa85c15d0211856b02508b681f7e3c1f8b8b1743f31ced9600c2c33da04b61f2166cad7696776ae81ce1be5701cae2691f6dfd86aaf8679f20e459e87c7e5 SHA512 4a030dc291fa7deba9c1f33d61dafdda710247ef7f3743c28e46b767a190e359e468433147bda23c82fae9c93ec31cd68905bfdb51cb8c2d9176ea789b31b14e
-DIST dhcpcd-6.10.1.tar.xz 180112 SHA256 284abf8c3be0580bbac5eaca95359346ab0d78d4072317b6ce87cc68f2e8ae7b SHA512 f323c155cff47f21dde181c216408b79f10e6ed923aa3d1f3482feff47a1e88e02193ec82f831da4ef63d3703ca1837715c36a47cf3f5d09f117f6eb53bfcf67 WHIRLPOOL 805e8a1b4dad400825197dae7918a2172093d152986d5d97f4d1993f2c27cf3fbe097a5dc4f7a5292e98676b5d7fad6079ed64e4bffabeb7ccf9d91f4db80de9
-DIST dhcpcd-6.11.1.tar.xz 190956 SHA256 5c823d607ed1d7513d16ec51c54e21657f1324899e0ba333a497682d88a8c6ee SHA512 50ef755b13a96fe484623d9f2dbd91407fbea5ca728fd05dbf4259a61611a07cf3ffad7e8d20ecd513dbef80602074809abd1f5177daaa51ceccc2af5c88269f WHIRLPOOL a32350beee83184fc9d0dec5cd65f265a83aa95177b8ff700fcce2aaf2ac6c2600c322e3d8c65f1d2e9d3a2cbe71bc00b3a6efbf045fa9c805b76a3a1fca0de5
-DIST dhcpcd-6.11.3.tar.xz 194892 SHA256 5abd12c4df2947d608f60a35227f9bf8ae8ab9de06ce975cdab1144d8f229b06 SHA512 249185532cb239124f847c28e6bfb3e8a85e818e05a07eb0c6ac6843fbbab8afa8d6ebce4032b3537ccfb7fafb306dd0dc51c0e97f337f12f5071ba499686a70 WHIRLPOOL 66eebad0ceabf07324f41b7c5861b13f233d6cf3fb4f7c82804b6391594595cda8c981cec088aa75242a04614a7228be7400171d32c68ee6be354bf976a237d5
-DIST dhcpcd-6.11.5.tar.xz 198080 SHA256 6f9674dc7e27e936cc787175404a6171618675ecfb6903ab9887b1b66a87d69e SHA512 a23d5dde66567c4addbc86c8b3fbf2c5d4dba3b463659729778a310306ab0e949be8998154ef15401ac2d289bde2f090d44492bba6a1becd2f01890d4efe7051 WHIRLPOOL 1b4bdd56112db20a0c6b0c843549f7c9cd8c534a9353df026d2c63a4b4bfd624f7fbc68282e04fd4f4c7c257d996e5019d3aa624f01b532074311d63b151164f
-DIST dhcpcd-7.0.0-beta3.tar.xz 203440 SHA256 ba8af748d0d1aa8daa8ba6813c1cf395f517bb51fe4274309170af9d2f1a89ef SHA512 b71154fa2596826e23820df984992e8786a6b89588648db60e9340a383b67fdb555307e9a47b7c33097ed4191fdb911e443c6bf9fc76b0194770e66e2de64b95 WHIRLPOOL 211564a4c218853bf3c6f219ffa36ef3d14fe3cc355bb5931bb98d5461717d0145145511540ab93ad4dcf99640c48ddcb1d82fc56361c329764c0756c12881a6
-DIST dhcpcd-7.0.0-rc1.tar.xz 204496 SHA256 8d4134596f1c8a647d94291fea0ed6f39dad648a4822472b481dfe48407b1cd3 SHA512 536ed4c09638a7a0fb16ad6a4a16fd74242ffbe2fe53e183c6756d2c62c94ce02869c95e828fbf3aa49aca06a129ab710195bf3d1dc9c9b52ac550ec51f68a1e WHIRLPOOL ec6898bbba3f4f2f42f9b8f16dd60f8b4b64170e4ad6c7e1326a80afd32241ad6b3ea941bfeb4e7113bd26ecb597fa04aebd1e1626c214ee10e48011251b065f
-DIST dhcpcd-7.0.0-rc2.tar.xz 206108 SHA256 ddae2ccf7c41a3ea5508e8adb2b7b9bbcd2b8a1ebe20871982243e513e83101a SHA512 a3e596c605c8ffe9f87f7113522f460d24a639b54dcc31182c70c3d0589d34d8c1cc765d5dfcfc6fd026697846866f7aa5714ef0d0d9eb049404973ef21f8ec7 WHIRLPOOL 46da14e26fb62320051e3457476d506847fa5630b898d01af14c7726175cfa9fcb01f505af5fe1668a89a2972f9ae40d46aad2918065c3f994c064a9b17dcb05
-DIST dhcpcd-7.0.0-rc3.tar.xz 207164 SHA256 14ba0873e6b67a8c85ed5bfb1428bbe887259d0477703e49d629e1a5d9e6300f SHA512 982c4c65ea45391e31170b592ce680c6cf5f4069b00decff3a299db23cede3e2521c66df7754a7a2379d5688f113553fe34e2fde825d6d9b83836a9e6d69fba9 WHIRLPOOL aeafeb61c783a0e3b99748ed465fe823678d1eb8f1068544e49e9d7dc3da31abad49944cb9aca8c3f469d960df26910ccfd3900cf683935d87d9b9026efbe5a7
+DIST dhcpcd-6.10.1.tar.xz 180112 BLAKE2B aa339c1d60cf2752cdfd0e75f788e9af193cc40a1968f5bb79583695cddbf1b0a3722e7add56759ef76326a25a3ff8cd861d59aecad3ba1ec2ba336031f5e60b SHA512 f323c155cff47f21dde181c216408b79f10e6ed923aa3d1f3482feff47a1e88e02193ec82f831da4ef63d3703ca1837715c36a47cf3f5d09f117f6eb53bfcf67
+DIST dhcpcd-6.11.1.tar.xz 190956 BLAKE2B 65f816e436b9a8370d459328997cadb82d1f70e3844cd6c7c52df52a58bf22d0b87b9480813f506b40ea85cef77c0f667ce97299819424e24cf186a41fdf69c9 SHA512 50ef755b13a96fe484623d9f2dbd91407fbea5ca728fd05dbf4259a61611a07cf3ffad7e8d20ecd513dbef80602074809abd1f5177daaa51ceccc2af5c88269f
+DIST dhcpcd-6.11.3.tar.xz 194892 BLAKE2B 08253879221f2cbccf69caf06ccbde960103fdf4de194f746572f4fa10497ab23dc1a41b6a849fe75f68a1d7a653e5358a7976581da0a92c8f19e2627b921440 SHA512 249185532cb239124f847c28e6bfb3e8a85e818e05a07eb0c6ac6843fbbab8afa8d6ebce4032b3537ccfb7fafb306dd0dc51c0e97f337f12f5071ba499686a70
+DIST dhcpcd-6.11.5.tar.xz 198080 BLAKE2B 3172fcb1c09c3bb7fcf4896c6e9896744a8f4f6ae0292bfedb3a96ce435a774b42fdc1a1e9d288edc786c544c17c21fd7d3c8c6e6a6832acdad7e1f5edfa8c0b SHA512 a23d5dde66567c4addbc86c8b3fbf2c5d4dba3b463659729778a310306ab0e949be8998154ef15401ac2d289bde2f090d44492bba6a1becd2f01890d4efe7051
+DIST dhcpcd-7.0.0-beta3.tar.xz 203440 BLAKE2B 0b78ed09c487673d094c6f83de9497818fa50f57995348e6ecedd1537364b950b747270380e6d70e20905f9836b4fe2bfebc81c52e135f7110f6d376bf809447 SHA512 b71154fa2596826e23820df984992e8786a6b89588648db60e9340a383b67fdb555307e9a47b7c33097ed4191fdb911e443c6bf9fc76b0194770e66e2de64b95
+DIST dhcpcd-7.0.0-rc1.tar.xz 204496 BLAKE2B 59ecfbcd4a6713359d6bd46e451c8241cbb0069bf0ed736ae4c87898517efafe9bec0cfa5b491e6e6b4a9419e44f2488a2286a4496b568a2d3c3170ac6c2c91e SHA512 536ed4c09638a7a0fb16ad6a4a16fd74242ffbe2fe53e183c6756d2c62c94ce02869c95e828fbf3aa49aca06a129ab710195bf3d1dc9c9b52ac550ec51f68a1e
+DIST dhcpcd-7.0.0-rc2.tar.xz 206108 BLAKE2B e30acadab1e8084b0800b67f4609fa5c7fe4d11d8baee19d23247f00156ba710f7f820fd9af507d8710982f1ef94472daf6b8070193ba67ad1911f8ee7d22faa SHA512 a3e596c605c8ffe9f87f7113522f460d24a639b54dcc31182c70c3d0589d34d8c1cc765d5dfcfc6fd026697846866f7aa5714ef0d0d9eb049404973ef21f8ec7
+DIST dhcpcd-7.0.0-rc3.tar.xz 207164 BLAKE2B 2e8cb676979606dba22c5f304650679e5325cc691d8a3c2dd62a1776373df4a7c21d5e85ee8106299b2f73def4bb2862bbe8d396b37dcab9c1dcff93634a0b78 SHA512 982c4c65ea45391e31170b592ce680c6cf5f4069b00decff3a299db23cede3e2521c66df7754a7a2379d5688f113553fe34e2fde825d6d9b83836a9e6d69fba9
+DIST dhcpcd-7.0.0-rc4.tar.xz 207596 BLAKE2B 2ce28e6f171b0bcc0b5c9e2ba0e5c92c70e7e97a516ce170d24c77a9d9981662acc914cefa5cad1bda14d7129088c313069ebe956d3e79098f70c3a31e53499f SHA512 e4bbb7d52021b84510d2a4e634b6fb979c126a6828de55053df0d3c6aae67a5c9be3da008bd7c8606be3d6aa28b00bafed3188473adcf2f3bc1bbfe9b1f4adc3
 EBUILD dhcpcd-6.10.1.ebuild 3324 BLAKE2B 7624e8f495516be6385d28b82b6bfeaff8b761c45fcce6e26169e6c5c1630d6772459e09cdf0a53c779cb33e24d886355dfd6e572b9145ee8633202038513628 SHA512 474bad588f8a25a8af13426175509d774af3b91c6ef919af59faedd0d5efbe7e0b9bbff01fa5f9ec6514e84dda61b5f94a37487344544dab281cbc3ee90125aa
 EBUILD dhcpcd-6.11.1-r1.ebuild 3341 BLAKE2B c6129726343344281ec17c23c8f979d339ff8d774ff1fa37eb13cf496e8bec36950fa43b558be1a38ee493818ee7992a65002c4712e5523db51d4e4c00b63536 SHA512 ccadcb290e5c2a5440b497880d4a31e1d6f97484f67b1ba5b67e68f9734c5a8504c7d96a172330debba9cdf7156c2f6f953cf81cbf375b8e687c5225a6c69000
 EBUILD dhcpcd-6.11.3.ebuild 3289 BLAKE2B b586f03933ba2582caefbe2e6dd3c5a66611830ae9bd35b89e065503e56a5bceaf5002b7c277c555e99028acd7311858a9e392ac2846b2096b3e201ceb5054c0 SHA512 8f59ca94b55d15f29a175fd9cdf5b3bba57d9e06980c11f030dfae4ee0f0630e791b5efeb4480117865aa680b0631843a1479cd077fd0c63508ae14977dd30c0
@@ -17,5 +18,6 @@ EBUILD dhcpcd-7.0.0_beta3.ebuild 4459 BLAKE2B a0d24d88f0cfa933bbcf0d6073d0095e9f
 EBUILD dhcpcd-7.0.0_rc1.ebuild 4459 BLAKE2B a0d24d88f0cfa933bbcf0d6073d0095e9f3ba36f7a82af8e63c1bc9137b50aea75b752817c8f145e25fb01be129056c2de835dd5fe13a94cd3833cd7216b2af7 SHA512 1f630ae795fd011cc96d7a5cb254989c72d94a81b579d00b6bb63fe59e27a54a8aaeed8ee94721acae5511c09617abc48d23d583eba2229cd8b435f214fa3f6c
 EBUILD dhcpcd-7.0.0_rc2.ebuild 4459 BLAKE2B a0d24d88f0cfa933bbcf0d6073d0095e9f3ba36f7a82af8e63c1bc9137b50aea75b752817c8f145e25fb01be129056c2de835dd5fe13a94cd3833cd7216b2af7 SHA512 1f630ae795fd011cc96d7a5cb254989c72d94a81b579d00b6bb63fe59e27a54a8aaeed8ee94721acae5511c09617abc48d23d583eba2229cd8b435f214fa3f6c
 EBUILD dhcpcd-7.0.0_rc3.ebuild 4459 BLAKE2B a0d24d88f0cfa933bbcf0d6073d0095e9f3ba36f7a82af8e63c1bc9137b50aea75b752817c8f145e25fb01be129056c2de835dd5fe13a94cd3833cd7216b2af7 SHA512 1f630ae795fd011cc96d7a5cb254989c72d94a81b579d00b6bb63fe59e27a54a8aaeed8ee94721acae5511c09617abc48d23d583eba2229cd8b435f214fa3f6c
+EBUILD dhcpcd-7.0.0_rc4.ebuild 4459 BLAKE2B a0d24d88f0cfa933bbcf0d6073d0095e9f3ba36f7a82af8e63c1bc9137b50aea75b752817c8f145e25fb01be129056c2de835dd5fe13a94cd3833cd7216b2af7 SHA512 1f630ae795fd011cc96d7a5cb254989c72d94a81b579d00b6bb63fe59e27a54a8aaeed8ee94721acae5511c09617abc48d23d583eba2229cd8b435f214fa3f6c
 EBUILD dhcpcd-9999.ebuild 4459 BLAKE2B a0d24d88f0cfa933bbcf0d6073d0095e9f3ba36f7a82af8e63c1bc9137b50aea75b752817c8f145e25fb01be129056c2de835dd5fe13a94cd3833cd7216b2af7 SHA512 1f630ae795fd011cc96d7a5cb254989c72d94a81b579d00b6bb63fe59e27a54a8aaeed8ee94721acae5511c09617abc48d23d583eba2229cd8b435f214fa3f6c
 MISC metadata.xml 569 BLAKE2B 0507986b52ed21277e159089c7f4736602917c44f0577d62e7501d728c348b49ecf3a2c92842c8e32a59402ad2c2e4e5c3fba510e227aca738a3d763b62689fe SHA512 9083c03d22c5753f54d9525ac954df8df0cceaed07c05c14367ea2b8598e7d7ab64711c810dc89a46be8d76cba6b9aa14fa389f0d686ed12792c0bfcbabc266a
diff --git a/net-misc/dhcpcd/dhcpcd-7.0.0_rc4.ebuild b/net-misc/dhcpcd/dhcpcd-7.0.0_rc4.ebuild
new file mode 100644
index 000000000000..deffde72be07
--- /dev/null
+++ b/net-misc/dhcpcd/dhcpcd-7.0.0_rc4.ebuild
@@ -0,0 +1,148 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+if [[ ${PV} == "9999" ]]; then
+	EGIT_REPO_URI="git://roy.marples.name/dhcpcd"
+	inherit git-r3
+else
+	MY_P="${P/_alpha/-alpha}"
+	MY_P="${MY_P/_beta/-beta}"
+	MY_P="${MY_P/_rc/-rc}"
+	SRC_URI="http://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 ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-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="http://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
+}