gentoo resync : 03.01.2018

2 files changed, 150 insertions, 0 deletions

diff --git a/net-misc/dhcpcd/Manifest b/net-misc/dhcpcd/Manifest
index 7e1117e98a39..4de21c2d1989 100644
--- a/net-misc/dhcpcd/Manifest
+++ b/net-misc/dhcpcd/Manifest
@@ -10,10 +10,12 @@ DIST dhcpcd-7.0.0-rc1.tar.xz 204496 BLAKE2B 59ecfbcd4a6713359d6bd46e451c8241cbb0
 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
+DIST dhcpcd-7.0.0.tar.xz 207924 BLAKE2B bd24f22b4852596ef4a076d1ab15ac4411dd676ba8cbfdb4b1ba29ffe1bff2d18be40369c1f8804bc01988bb30b89ee1030ea95ddb48fbfc04ca06372b317d9d SHA512 f2ab1fcb2dad0c93da757c15d0b772b40cc15c8e59161d91684f06961cf7b515473d7c3fc5973b7755ac525e6851abdf8a5f27760bb5d28fe17e90ff0feaf904
 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
 EBUILD dhcpcd-6.11.5.ebuild 3301 BLAKE2B be68ab1e9be217239ebe705382497f124a386b3973234c375809603b809c7ee2349f36274ce4d2b61d2af6a5b9abc5b10e4d850c94aed94cc1fc78e3100df7e0 SHA512 de0c7852d42908d9a2f5a77db39d145b6711c1378d5db7e458469f9db7fae68eb23653eb56dccfcab042055ae30170d9bf93e062085bfcbaad58fca206a993db
+EBUILD dhcpcd-7.0.0.ebuild 4459 BLAKE2B aec875a2fc8b5b3f07937316b1501c62eb9827a94967430698d05c9996378db300ed8c780e67f8996ea26af829938d8d144818232670989dc711b52788548e28 SHA512 ec114f3f6c41c763d7f7db6235589b4ab5eb4fd72f354f8a847c564bbe3a879cc29525151d9d1e973cb63f4184128b1c4a903400af309c4058650c2b0887a7be
 EBUILD dhcpcd-7.0.0_beta3.ebuild 4459 BLAKE2B a0d24d88f0cfa933bbcf0d6073d0095e9f3ba36f7a82af8e63c1bc9137b50aea75b752817c8f145e25fb01be129056c2de835dd5fe13a94cd3833cd7216b2af7 SHA512 1f630ae795fd011cc96d7a5cb254989c72d94a81b579d00b6bb63fe59e27a54a8aaeed8ee94721acae5511c09617abc48d23d583eba2229cd8b435f214fa3f6c
 EBUILD dhcpcd-7.0.0_rc1.ebuild 4459 BLAKE2B a0d24d88f0cfa933bbcf0d6073d0095e9f3ba36f7a82af8e63c1bc9137b50aea75b752817c8f145e25fb01be129056c2de835dd5fe13a94cd3833cd7216b2af7 SHA512 1f630ae795fd011cc96d7a5cb254989c72d94a81b579d00b6bb63fe59e27a54a8aaeed8ee94721acae5511c09617abc48d23d583eba2229cd8b435f214fa3f6c
 EBUILD dhcpcd-7.0.0_rc2.ebuild 4459 BLAKE2B a0d24d88f0cfa933bbcf0d6073d0095e9f3ba36f7a82af8e63c1bc9137b50aea75b752817c8f145e25fb01be129056c2de835dd5fe13a94cd3833cd7216b2af7 SHA512 1f630ae795fd011cc96d7a5cb254989c72d94a81b579d00b6bb63fe59e27a54a8aaeed8ee94721acae5511c09617abc48d23d583eba2229cd8b435f214fa3f6c
diff --git a/net-misc/dhcpcd/dhcpcd-7.0.0.ebuild b/net-misc/dhcpcd/dhcpcd-7.0.0.ebuild
new file mode 100644
index 000000000000..8bc9fd1b0461
--- /dev/null
+++ b/net-misc/dhcpcd/dhcpcd-7.0.0.ebuild
@@ -0,0 +1,148 @@
+# 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="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
+}