commit:     2c96e81fb0f7fd79f899c557e2692f25681c605b
Author:     Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
AuthorDate: Mon Oct 12 16:05:52 2020 +0000
Commit:     Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
CommitDate: Mon Oct 12 16:06:06 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2c96e81f

net-misc/dhcpcd: Bump to version 9.3.1

Package-Manager: Portage-3.0.8, Repoman-3.0.1
Signed-off-by: Lars Wendler <polynomial-c <AT> gentoo.org>

 net-misc/dhcpcd/Manifest            |   1 +
 net-misc/dhcpcd/dhcpcd-9.3.1.ebuild | 153 ++++++++++++++++++++++++++++++++++++
 2 files changed, 154 insertions(+)

diff --git a/net-misc/dhcpcd/Manifest b/net-misc/dhcpcd/Manifest
index 6c7e3aa23b1..b5398956c1b 100644
--- a/net-misc/dhcpcd/Manifest
+++ b/net-misc/dhcpcd/Manifest
@@ -1,3 +1,4 @@
 DIST dhcpcd-8.1.9.tar.xz 230288 BLAKE2B 
5606ddfce37c67ac3d60257104fcf15bd7da65021b2c1261a45958b628cd066ccd9bc6b60bbb42f8280fcbbf9d4b1c7666b993c37f150b27ef2a0527a0fd5b96
 SHA512 
40ac106ffca60b32362aacdfae0fa3a2993a3eed72bf452322412a912f594aaade1c24b862233455033158a6e453ec75d6d14fa52df6b4c5ae435dd6ceb29f2a
 DIST dhcpcd-9.2.0.tar.xz 250584 BLAKE2B 
38639358b15fbe179ee4a233c28705c62fcc3ce9ab7faafcce72a85238580c3773ac472572277138eb66df80b930875bc37bb5c1dfda38a05d381ff98ebf6712
 SHA512 
deade0f650445a86de34fa4b354ca7da11ed0be38d07e412b5602c45ac40149d6a2925980b66ff95c625184c981b02864a95ce5c3c01245bb48cd1a21d2f5aba
 DIST dhcpcd-9.3.0.tar.xz 252256 BLAKE2B 
9b131de4651c1ae72a5936d918f423bf78d097e4b9560c748712367a3ff63df3b82c2b4e392e6f7ca2577bba30a58882c17942d7eebce23fd22207b24800cbcd
 SHA512 
4ee533a5458d1800093860edabc5480b40b7909b83b829513c03eb25951f0858ded9f7a81f0b8a444810dc440dbce47bf5a6806bda055c98af6d5415e8e9f84d
+DIST dhcpcd-9.3.1.tar.xz 253288 BLAKE2B 
cba03077a05d89d4ec8dbbc9b46211672ce103af9c960efacbaa7aa4c6cc0f312ade1c09a9b4ea6e5fb360ad780594c2935c54a36dab5e6b3193a527c39f76c1
 SHA512 
d89141de92e2ee79c68c43e58bb7d604e51edbc93bcf69bdd5fba37a9fbf372d9df963ac3127b7b740856ab43ff330ce9ca6053bf4a814540c177b204e7beb80

diff --git a/net-misc/dhcpcd/dhcpcd-9.3.1.ebuild 
b/net-misc/dhcpcd/dhcpcd-9.3.1.ebuild
new file mode 100644
index 00000000000..092c6e4a1dd
--- /dev/null
+++ b/net-misc/dhcpcd/dhcpcd-9.3.1.ebuild
@@ -0,0 +1,153 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit systemd toolchain-funcs
+
+if [[ ${PV} == "9999" ]]; then
+       inherit git-r3
+       EGIT_REPO_URI="https://roy.marples.name/cgit/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 ~m68k ~mips ~ppc ~ppc64 
~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
+       S="${WORKDIR}/${MY_P}"
+fi
+
+DESCRIPTION="A fully featured, yet light weight RFC2131 compliant DHCP client"
+HOMEPAGE="https://roy.marples.name/projects/dhcpcd";
+LICENSE="BSD-2"
+SLOT="0"
+IUSE="debug elibc_glibc +embedded ipv6 kernel_linux privsep +udev"
+
+COMMON_DEPEND="udev? ( virtual/udev )"
+DEPEND="${COMMON_DEPEND}"
+RDEPEND="
+       ${COMMON_DEPEND}
+       privsep? (
+               acct-group/dhcpcd
+               acct-user/dhcpcd
+       )
+"
+
+src_configure() {
+       local myeconfargs=(
+               --dbdir="${EPREFIX}/var/lib/dhcpcd"
+               --libexecdir="${EPREFIX}/lib/dhcpcd"
+               --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' '')
+               --rundir=$(usex kernel_linux "${EPREFIX}/run/dhcpcd" 
"${EPREFIX}/var/run/dhcpcd")
+               $(usex privsep '--privsepuser=dhcpcd' '')
+               $(usex udev '' '--without-dev --without-udev')
+               CC="$(tc-getCC)"
+       )
+       econf "${myeconfargs[@]}"
+}
+
+src_install() {
+       default
+       keepdir /var/lib/dhcpcd
+       newinitd "${FILESDIR}"/dhcpcd.initd-r1 dhcpcd
+       systemd_newunit "${FILESDIR}"/dhcpcd.service-r1 dhcpcd.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_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_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_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_rdm}" )
+       fi
+       local lease=
+       for lease in "${dbdir}"/dhcpcd-*.lease*; do
+               [[ -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
+               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