Gentoo Archives: gentoo-commits

From: Lars Wendler <polynomial-c@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: net-misc/dhcpcd/
Date: Wed, 04 Sep 2019 15:28:39
Message-Id: 1567610907.686d0276e1b00a83651cf9340230e4e306fa5b55.polynomial-c@gentoo
1 commit: 686d0276e1b00a83651cf9340230e4e306fa5b55
2 Author: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
3 AuthorDate: Wed Sep 4 15:27:26 2019 +0000
4 Commit: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
5 CommitDate: Wed Sep 4 15:28:27 2019 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=686d0276
7
8 net-misc/dhcpcd: Bump to version 8.0.4
9
10 Package-Manager: Portage-2.3.75, Repoman-2.3.17
11 Signed-off-by: Lars Wendler <polynomial-c <AT> gentoo.org>
12
13 net-misc/dhcpcd/Manifest | 1 +
14 net-misc/dhcpcd/dhcpcd-8.0.4.ebuild | 144 ++++++++++++++++++++++++++++++++++++
15 2 files changed, 145 insertions(+)
16
17 diff --git a/net-misc/dhcpcd/Manifest b/net-misc/dhcpcd/Manifest
18 index 8a59fcc3aa9..e6d6b91215b 100644
19 --- a/net-misc/dhcpcd/Manifest
20 +++ b/net-misc/dhcpcd/Manifest
21 @@ -1,3 +1,4 @@
22 DIST dhcpcd-7.2.3.tar.xz 213552 BLAKE2B 5f89e11424b85702b05da6207ec346480c029de1416cc8892471de428ca0a4395a8915700e2237bfa2b133648973bc2a7c7d15aa2d0ba492f96fbf3908d7f613 SHA512 271cca422fad10eaf842acfd5b590c0ad537f5f23ee919a3928d8ad98463ab03bde21c0bc08741ea9618ee31095160a7c00066155eae2c74b17c49af65ba566f
23 DIST dhcpcd-8.0.2.tar.xz 222408 BLAKE2B fb27a33cd64c7aeedb28e05c885c860618d923ac857895b9fdc7daa608f433587bea1e6630fd9897426b371a45b8a336e1edaa804d76eda6e9fc2adc1411aed2 SHA512 a6e3aa66800adc8b209324bae02a6e373e2623735bf0695ffec4a7c972d65c3498f55e4da62f93df0bc6cddb4bee8ab667b3743b5b25cd5f4cc9da4d1f8e15c4
24 DIST dhcpcd-8.0.3.tar.xz 223104 BLAKE2B ca1b35e0fc0f8b345d2a55e380aa4e10b864f18f4b5368659875ef5efc955fac442b0505b0192578d83fa8c3b304942e50aa082d753e98dc3cd44237100f106c SHA512 0a740286181e1b24e7ac5157f60727c2a3abd81080235efc8ba86628bb8e2aa877b8d9348055c16cdae1a819f443afbf452907a25152bb936a6dc72f3a179944
25 +DIST dhcpcd-8.0.4.tar.xz 224236 BLAKE2B ae1bc71fef58526482d5c0b34f66d68ad4baf84979da2fa90d51ec1831ccdc2a2d77dc1a09b52b8fa58deed42ff7c6af49a165afba50decae0085788bcbb10c2 SHA512 d5ea895b841a1afcabd50013800f567c0a9c077cd409ec18c5442b3da6bac814db5e9ae4a4218076eb5119bd7ccb732d3f58e22dcbba38ede26ee668f9733ec4
26
27 diff --git a/net-misc/dhcpcd/dhcpcd-8.0.4.ebuild b/net-misc/dhcpcd/dhcpcd-8.0.4.ebuild
28 new file mode 100644
29 index 00000000000..d8940210a7b
30 --- /dev/null
31 +++ b/net-misc/dhcpcd/dhcpcd-8.0.4.ebuild
32 @@ -0,0 +1,144 @@
33 +# Copyright 1999-2019 Gentoo Authors
34 +# Distributed under the terms of the GNU General Public License v2
35 +
36 +EAPI=7
37 +
38 +inherit systemd toolchain-funcs
39 +
40 +if [[ ${PV} == "9999" ]]; then
41 + inherit git-r3
42 + EGIT_REPO_URI="https://roy.marples.name/git/dhcpcd.git"
43 +else
44 + MY_P="${P/_alpha/-alpha}"
45 + MY_P="${MY_P/_beta/-beta}"
46 + MY_P="${MY_P/_rc/-rc}"
47 + SRC_URI="https://roy.marples.name/downloads/${PN}/${MY_P}.tar.xz"
48 + KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux"
49 + S="${WORKDIR}/${MY_P}"
50 +fi
51 +
52 +DESCRIPTION="A fully featured, yet light weight RFC2131 compliant DHCP client"
53 +HOMEPAGE="https://roy.marples.name/projects/dhcpcd"
54 +LICENSE="BSD-2"
55 +SLOT="0"
56 +IUSE="elibc_glibc +embedded ipv6 kernel_linux +udev"
57 +
58 +COMMON_DEPEND="udev? ( virtual/udev )"
59 +DEPEND="${COMMON_DEPEND}"
60 +RDEPEND="${COMMON_DEPEND}"
61 +
62 +src_configure() {
63 + local myeconfargs=(
64 + --dbdir="${EPREFIX}/var/lib/dhcpcd"
65 + --libexecdir="${EPREFIX}/lib/dhcpcd"
66 + --localstatedir="${EPREFIX}/var"
67 + --prefix="${EPREFIX}"
68 + --with-hook=ntp.conf
69 + $(use_enable embedded)
70 + $(use_enable ipv6)
71 + $(usex elibc_glibc '--with-hook=yp.conf' '')
72 + $(usex kernel_linux '--rundir=${EPREFIX}/run' '')
73 + $(usex udev '' '--without-dev --without-udev')
74 + CC="$(tc-getCC)"
75 + )
76 + econf "${myeconfargs[@]}"
77 +}
78 +
79 +src_install() {
80 + default
81 + keepdir /var/lib/dhcpcd
82 + newinitd "${FILESDIR}"/${PN}.initd ${PN}
83 + systemd_dounit "${FILESDIR}"/${PN}.service
84 +}
85 +
86 +pkg_postinst() {
87 + local dbdir="${EROOT}"/var/lib/dhcpcd old_files=()
88 +
89 + local old_old_duid="${EROOT}"/var/lib/dhcpcd/dhcpcd.duid
90 + local old_duid="${EROOT}"/etc/dhcpcd.duid
91 + local new_duid="${dbdir}"/duid
92 + if [[ -e "${old_old_duid}" ]] ; then
93 + # Upgrade the duid file to the new format if needed
94 + if ! grep -q '..:..:..:..:..:..' "${old_old_duid}"; then
95 + sed -i -e 's/\(..\)/\1:/g; s/:$//g' "${old_old_duid}"
96 + fi
97 +
98 + # Move the duid to /etc, a more sensible location
99 + if [[ ! -e "${old_duid}" ]] ; then
100 + cp -p "${old_old_duid}" "${new_duid}"
101 + fi
102 + old_files+=( "${old_old_duid}" )
103 + fi
104 +
105 + # dhcpcd-7 moves the files out of /etc
106 + if [[ -e "${old_duid}" ]] ; then
107 + if [[ ! -e "${new_duid}" ]] ; then
108 + cp -p "${old_duid}" "${new_duid}"
109 + fi
110 + old_files+=( "${old_duid}" )
111 + fi
112 + local old_secret="${EROOT}"/etc/dhcpcd.secret
113 + local new_secret="${dbdir}"/secret
114 + if [[ -e "${old_secret}" ]] ; then
115 + if [[ ! -e "${new_secret}" ]] ; then
116 + cp -p "${old_secret}" "${new_secret}"
117 + fi
118 + old_files+=( "${old_secret}" )
119 + fi
120 +
121 + # dhcpcd-7 renames some files in /var/lib/dhcpcd
122 + local old_rdm="${dbdir}"/dhcpcd-rdm.monotonic
123 + local new_rdm="${dbdir}"/rdm_monotonic
124 + if [[ -e "${old_rdm}" ]] ; then
125 + if [[ ! -e "${new_rdm}" ]] ; then
126 + cp -p "${old_rdm}" "${new_rdm}"
127 + fi
128 + old_files+=( "${old_rdm}" )
129 + fi
130 + local lease=
131 + for lease in "${dbdir}"/dhcpcd-*.lease*; do
132 + [[ -f "${lease}" ]] || continue
133 + old_files+=( "${lease}" )
134 + local new_lease=$(basename "${lease}" | sed -e "s/dhcpcd-//")
135 + [[ -e "${dbdir}/${new_lease}" ]] && continue
136 + cp "${lease}" "${dbdir}/${new_lease}"
137 + done
138 +
139 + # Warn about removing stale files
140 + if [[ -n "${old_files[@]}" ]] ; then
141 + elog
142 + elog "dhcpcd-7 has copied dhcpcd.duid and dhcpcd.secret from"
143 + elog "${EROOT}/etc to ${dbdir}"
144 + elog "and copied leases in ${dbdir} to new files with the dhcpcd-"
145 + elog "prefix dropped."
146 + elog
147 + elog "You should remove these files if you don't plan on reverting"
148 + elog "to an older version:"
149 + local old_file=
150 + for old_file in ${old_files[@]}; do
151 + elog " ${old_file}"
152 + done
153 + fi
154 +
155 + if [ -z "${REPLACING_VERSIONS}" ]; then
156 + elog
157 + elog "dhcpcd has zeroconf support active by default."
158 + elog "This means it will always obtain an IP address even if no"
159 + elog "DHCP server can be contacted, which will break any existing"
160 + elog "failover support you may have configured in your net configuration."
161 + elog "This behaviour can be controlled with the noipv4ll configuration"
162 + elog "file option or the -L command line switch."
163 + elog "See the dhcpcd and dhcpcd.conf man pages for more details."
164 +
165 + elog
166 + elog "Dhcpcd has duid enabled by default, and this may cause issues"
167 + elog "with some dhcp servers. For more information, see"
168 + elog "https://bugs.gentoo.org/show_bug.cgi?id=477356"
169 + fi
170 +
171 + if ! has_version net-dns/bind-tools; then
172 + elog
173 + elog "If you activate the lookup-hostname hook to look up your hostname"
174 + elog "using the dns, you need to install net-dns/bind-tools."
175 + fi
176 +}