commit:     a37687532c995588e8550298988b1f185f93092d
Author:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
AuthorDate: Thu Jun  7 00:40:04 2018 +0000
Commit:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
CommitDate: Thu Jun  7 00:44:15 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a3768753

net-misc/dhcpcd: bump to v7.0.5

Package-Manager: Portage-2.3.40, Repoman-2.3.9

 net-misc/dhcpcd/Manifest            |   1 +
 net-misc/dhcpcd/dhcpcd-7.0.5.ebuild | 149 ++++++++++++++++++++++++++++++++++++
 2 files changed, 150 insertions(+)

diff --git a/net-misc/dhcpcd/Manifest b/net-misc/dhcpcd/Manifest
index 304baab46d2..4ab2dd791c1 100644
--- a/net-misc/dhcpcd/Manifest
+++ b/net-misc/dhcpcd/Manifest
@@ -5,3 +5,4 @@ DIST dhcpcd-7.0.1.tar.xz 207908 BLAKE2B 
1a9350a0c4a9eb1eb6f5a7be78beb4a5fecd802e
 DIST dhcpcd-7.0.2.tar.xz 208736 BLAKE2B 
958118a7acdb6d55e06b88ec8b1fe342600e49caefc7e0e6745a20aafb9588f1c83af171c47e7b6ba1faa664290b052530271f5dd588f82db5933af315b8eea7
 SHA512 
f5b1407199163fb994519bc1b5a70ad043f00f263e3b254da5d519d1c6b689a4a5a8bcef3bf42401826984e273c2ead38249fcfe99129b87034f90de2fc46ecd
 DIST dhcpcd-7.0.3.tar.xz 208856 BLAKE2B 
d11f1845cae74470cd9982f5957911ac5fd7cc284b455254fef5c462e516018d94d56f970d758e81cd86a7f918e5cf0d3bd6d2087bda701b299436c4253220f4
 SHA512 
a2d4e8ea6a310090c2795c596c80a76f0e42dc6654ba50d2900e2af4239dbc542e857d20b2983ea97675903b85cdbd0e9212424390a62081837821bbdaf7ce83
 DIST dhcpcd-7.0.4.tar.xz 209860 BLAKE2B 
12c9524d6cd012665479a91f2966ae8123cc38bd3a47d81490f3dc0efecda2a787a0d55e883906e536c989054d25e00fa96d06d11062013d154de88882f31414
 SHA512 
32382b17a00e6ff7a80868a35424d1cc25410f012048ef099a90fbcb15a43ef6e73d2e65094ac90ccb18ecd92c6fc2c7e2116e19669ad0084ee39182b5cbd7db
+DIST dhcpcd-7.0.5.tar.xz 210088 BLAKE2B 
bd10e09eb160e09067a3cf0472417a191f05216dbae5e5b65255a6e212fdff099b178a331dc44cf420830d1aaa581629d669f491d4acb099d646a5969d621dee
 SHA512 
b9d5a1c9306ff86544f0a74a0e61f9a78a643087da8cbee2bf09155a745c6815a2078be7f7a400f31f760355eae2177c5760ce4ca55e83cee615a343671d9b41

diff --git a/net-misc/dhcpcd/dhcpcd-7.0.5.ebuild 
b/net-misc/dhcpcd/dhcpcd-7.0.5.ebuild
new file mode 100644
index 00000000000..bca59ecd5d7
--- /dev/null
+++ b/net-misc/dhcpcd/dhcpcd-7.0.5.ebuild
@@ -0,0 +1,149 @@
+# 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 ~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="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
+       keepdir /var/lib/dhcpcd
+       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
+}

Reply via email to