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: Thu, 04 Jun 2020 18:30:34
Message-Id: 1591295403.b114c068489ac42b7029d7e5c03336210cc2bca1.polynomial-c@gentoo
1 commit: b114c068489ac42b7029d7e5c03336210cc2bca1
2 Author: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
3 AuthorDate: Thu Jun 4 18:25:28 2020 +0000
4 Commit: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
5 CommitDate: Thu Jun 4 18:30:03 2020 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b114c068
7
8 net-misc/dhcpcd: Removed old
9
10 Package-Manager: Portage-2.3.100, Repoman-2.3.22
11 Signed-off-by: Lars Wendler <polynomial-c <AT> gentoo.org>
12
13 net-misc/dhcpcd/Manifest | 4 -
14 net-misc/dhcpcd/dhcpcd-7.2.3.ebuild | 144 ------------------------------
15 net-misc/dhcpcd/dhcpcd-7.2.5.ebuild | 144 ------------------------------
16 net-misc/dhcpcd/dhcpcd-8.1.7.ebuild | 144 ------------------------------
17 net-misc/dhcpcd/dhcpcd-9.0.1.ebuild | 173 ------------------------------------
18 5 files changed, 609 deletions(-)
19
20 diff --git a/net-misc/dhcpcd/Manifest b/net-misc/dhcpcd/Manifest
21 index b10a0ca38e3..9e596f87306 100644
22 --- a/net-misc/dhcpcd/Manifest
23 +++ b/net-misc/dhcpcd/Manifest
24 @@ -1,7 +1,3 @@
25 -DIST dhcpcd-7.2.3.tar.xz 213552 BLAKE2B 5f89e11424b85702b05da6207ec346480c029de1416cc8892471de428ca0a4395a8915700e2237bfa2b133648973bc2a7c7d15aa2d0ba492f96fbf3908d7f613 SHA512 271cca422fad10eaf842acfd5b590c0ad537f5f23ee919a3928d8ad98463ab03bde21c0bc08741ea9618ee31095160a7c00066155eae2c74b17c49af65ba566f
26 -DIST dhcpcd-7.2.5.tar.xz 214124 BLAKE2B 7a5f32b66187afcaa2bb4a1cbcc0d704a28a27ff6d1f9fea409bab242ebf4d263d81590cb4a4959c9f1119966795e26fa582ed16a525c1e46a72dd0905868074 SHA512 ee0c70f3996f6a06031c2f663a4bdf4f147d637c31e54bb94fcb9d86282c33ad7b0f5569abe09acd7698efbb34c35afb228fe0825e4a95ad6a42832d1838ca72
27 -DIST dhcpcd-8.1.7.tar.xz 230308 BLAKE2B 636daad77885b7f00f34c73413db4a0269bca844c33b630b5302cfcd9f5b2068ed95872dd92f3b8db25e7b2ca0a28a8053e1975a7ee50fd5403f8d58e97dff17 SHA512 ea58ef3db8254d677820c44b2842ef2f3697b2d90fcbd89b2ecfcbac87e705047cac17053bbe076a3f6d2775903c8e75eac38089d25c097e2f24a045c24977e8
28 DIST dhcpcd-8.1.9.tar.xz 230288 BLAKE2B 5606ddfce37c67ac3d60257104fcf15bd7da65021b2c1261a45958b628cd066ccd9bc6b60bbb42f8280fcbbf9d4b1c7666b993c37f150b27ef2a0527a0fd5b96 SHA512 40ac106ffca60b32362aacdfae0fa3a2993a3eed72bf452322412a912f594aaade1c24b862233455033158a6e453ec75d6d14fa52df6b4c5ae435dd6ceb29f2a
29 -DIST dhcpcd-9.0.1.tar.xz 244816 BLAKE2B 1cb346f7578dadb237d05056a8f6e39b30da831e253e6629c5c19e6a70f7b6d8ffcb6db37d0f720fda28577e8cb4227cbca8a08fac0c977098f66b2a430d9ffe SHA512 dea153c9a2f4a9d9c983bf50d8c18b544d7dbe1a2972ccc8eb33bbbc8b09178b39bdb9a38cc293db7861024509ccd475e11d84004bc4cd45947786f5e10db0a3
30 DIST dhcpcd-9.0.2.tar.xz 244800 BLAKE2B d0c355141aa1e57715c30b2902eed7e2821f2c08fdc97497c9dc271689faf2ca22e3f50f17e6c7ae8fe4434d5c216572a42e1abf789287495e6db44f671d5085 SHA512 2a606bff2e96d1da5d3642ac68341c14b378d9a905cba364ab42eba1285604f8be56b9efeff3eee18d89b71f0f9f3b05cb7b88e8fce568baf1c0d1e5d3becb5f
31 DIST dhcpcd-9.1.1.tar.xz 246084 BLAKE2B 35acaabb32e6a5b227071376e8a0387cadb776ee94a8b7f92c181440ef72bf60e9867e901347a139e4ce036c85913fa85e61d3c401c8a9f57e81dff76465ccab SHA512 7b1eb052293218e9b52f7ff40768eaa9db832979ffa8e4ba4724ce98bac9e9c809505b40aaebd4cf13192d0b30f2e963d34ca3b9c1e05458e86e11d06e1cbed8
32
33 diff --git a/net-misc/dhcpcd/dhcpcd-7.2.3.ebuild b/net-misc/dhcpcd/dhcpcd-7.2.3.ebuild
34 deleted file mode 100644
35 index 54861a24f9c..00000000000
36 --- a/net-misc/dhcpcd/dhcpcd-7.2.3.ebuild
37 +++ /dev/null
38 @@ -1,144 +0,0 @@
39 -# Copyright 1999-2020 Gentoo Authors
40 -# Distributed under the terms of the GNU General Public License v2
41 -
42 -EAPI=7
43 -
44 -inherit systemd toolchain-funcs
45 -
46 -if [[ ${PV} == "9999" ]]; then
47 - inherit git-r3
48 - EGIT_REPO_URI="https://roy.marples.name/git/dhcpcd.git"
49 -else
50 - MY_P="${P/_alpha/-alpha}"
51 - MY_P="${MY_P/_beta/-beta}"
52 - MY_P="${MY_P/_rc/-rc}"
53 - SRC_URI="https://roy.marples.name/downloads/${PN}/${MY_P}.tar.xz"
54 - KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~amd64-linux ~x86-linux"
55 - S="${WORKDIR}/${MY_P}"
56 -fi
57 -
58 -DESCRIPTION="A fully featured, yet light weight RFC2131 compliant DHCP client"
59 -HOMEPAGE="https://roy.marples.name/projects/dhcpcd"
60 -LICENSE="BSD-2"
61 -SLOT="0"
62 -IUSE="elibc_glibc +embedded ipv6 kernel_linux +udev"
63 -
64 -COMMON_DEPEND="udev? ( virtual/udev )"
65 -DEPEND="${COMMON_DEPEND}"
66 -RDEPEND="${COMMON_DEPEND}"
67 -
68 -src_configure() {
69 - local myeconfargs=(
70 - --dbdir="${EPREFIX}/var/lib/dhcpcd"
71 - --libexecdir="${EPREFIX}/lib/dhcpcd"
72 - --localstatedir="${EPREFIX}/var"
73 - --prefix="${EPREFIX}"
74 - --with-hook=ntp.conf
75 - $(use_enable embedded)
76 - $(use_enable ipv6)
77 - $(usex elibc_glibc '--with-hook=yp.conf' '')
78 - $(usex kernel_linux '--rundir=${EPREFIX}/run' '')
79 - $(usex udev '' '--without-dev --without-udev')
80 - CC="$(tc-getCC)"
81 - )
82 - econf "${myeconfargs[@]}"
83 -}
84 -
85 -src_install() {
86 - default
87 - keepdir /var/lib/dhcpcd
88 - newinitd "${FILESDIR}"/${PN}.initd ${PN}
89 - systemd_dounit "${FILESDIR}"/${PN}.service
90 -}
91 -
92 -pkg_postinst() {
93 - local dbdir="${EROOT}"/var/lib/dhcpcd old_files=()
94 -
95 - local old_old_duid="${EROOT}"/var/lib/dhcpcd/dhcpcd.duid
96 - local old_duid="${EROOT}"/etc/dhcpcd.duid
97 - local new_duid="${dbdir}"/duid
98 - if [[ -e "${old_old_duid}" ]] ; then
99 - # Upgrade the duid file to the new format if needed
100 - if ! grep -q '..:..:..:..:..:..' "${old_old_duid}"; then
101 - sed -i -e 's/\(..\)/\1:/g; s/:$//g' "${old_old_duid}"
102 - fi
103 -
104 - # Move the duid to /etc, a more sensible location
105 - if [[ ! -e "${old_duid}" ]] ; then
106 - cp -p "${old_old_duid}" "${new_duid}"
107 - fi
108 - old_files+=( "${old_old_duid}" )
109 - fi
110 -
111 - # dhcpcd-7 moves the files out of /etc
112 - if [[ -e "${old_duid}" ]] ; then
113 - if [[ ! -e "${new_duid}" ]] ; then
114 - cp -p "${old_duid}" "${new_duid}"
115 - fi
116 - old_files+=( "${old_duid}" )
117 - fi
118 - local old_secret="${EROOT}"/etc/dhcpcd.secret
119 - local new_secret="${dbdir}"/secret
120 - if [[ -e "${old_secret}" ]] ; then
121 - if [[ ! -e "${new_secret}" ]] ; then
122 - cp -p "${old_secret}" "${new_secret}"
123 - fi
124 - old_files+=( "${old_secret}" )
125 - fi
126 -
127 - # dhcpcd-7 renames some files in /var/lib/dhcpcd
128 - local old_rdm="${dbdir}"/dhcpcd-rdm.monotonic
129 - local new_rdm="${dbdir}"/rdm_monotonic
130 - if [[ -e "${old_rdm}" ]] ; then
131 - if [[ ! -e "${new_rdm}" ]] ; then
132 - cp -p "${old_rdm}" "${new_rdm}"
133 - fi
134 - old_files+=( "${old_rdm}" )
135 - fi
136 - local lease=
137 - for lease in "${dbdir}"/dhcpcd-*.lease*; do
138 - [[ -f "${lease}" ]] || continue
139 - old_files+=( "${lease}" )
140 - local new_lease=$(basename "${lease}" | sed -e "s/dhcpcd-//")
141 - [[ -e "${dbdir}/${new_lease}" ]] && continue
142 - cp "${lease}" "${dbdir}/${new_lease}"
143 - done
144 -
145 - # Warn about removing stale files
146 - if [[ -n "${old_files[@]}" ]] ; then
147 - elog
148 - elog "dhcpcd-7 has copied dhcpcd.duid and dhcpcd.secret from"
149 - elog "${EROOT}/etc to ${dbdir}"
150 - elog "and copied leases in ${dbdir} to new files with the dhcpcd-"
151 - elog "prefix dropped."
152 - elog
153 - elog "You should remove these files if you don't plan on reverting"
154 - elog "to an older version:"
155 - local old_file=
156 - for old_file in ${old_files[@]}; do
157 - elog " ${old_file}"
158 - done
159 - fi
160 -
161 - if [ -z "${REPLACING_VERSIONS}" ]; then
162 - elog
163 - elog "dhcpcd has zeroconf support active by default."
164 - elog "This means it will always obtain an IP address even if no"
165 - elog "DHCP server can be contacted, which will break any existing"
166 - elog "failover support you may have configured in your net configuration."
167 - elog "This behaviour can be controlled with the noipv4ll configuration"
168 - elog "file option or the -L command line switch."
169 - elog "See the dhcpcd and dhcpcd.conf man pages for more details."
170 -
171 - elog
172 - elog "Dhcpcd has duid enabled by default, and this may cause issues"
173 - elog "with some dhcp servers. For more information, see"
174 - elog "https://bugs.gentoo.org/show_bug.cgi?id=477356"
175 - fi
176 -
177 - if ! has_version net-dns/bind-tools; then
178 - elog
179 - elog "If you activate the lookup-hostname hook to look up your hostname"
180 - elog "using the dns, you need to install net-dns/bind-tools."
181 - fi
182 -}
183
184 diff --git a/net-misc/dhcpcd/dhcpcd-7.2.5.ebuild b/net-misc/dhcpcd/dhcpcd-7.2.5.ebuild
185 deleted file mode 100644
186 index 504876b53cf..00000000000
187 --- a/net-misc/dhcpcd/dhcpcd-7.2.5.ebuild
188 +++ /dev/null
189 @@ -1,144 +0,0 @@
190 -# Copyright 1999-2020 Gentoo Authors
191 -# Distributed under the terms of the GNU General Public License v2
192 -
193 -EAPI=7
194 -
195 -inherit systemd toolchain-funcs
196 -
197 -if [[ ${PV} == "9999" ]]; then
198 - inherit git-r3
199 - EGIT_REPO_URI="https://roy.marples.name/git/dhcpcd.git"
200 -else
201 - MY_P="${P/_alpha/-alpha}"
202 - MY_P="${MY_P/_beta/-beta}"
203 - MY_P="${MY_P/_rc/-rc}"
204 - SRC_URI="https://roy.marples.name/downloads/${PN}/${MY_P}.tar.xz"
205 - KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
206 - S="${WORKDIR}/${MY_P}"
207 -fi
208 -
209 -DESCRIPTION="A fully featured, yet light weight RFC2131 compliant DHCP client"
210 -HOMEPAGE="https://roy.marples.name/projects/dhcpcd"
211 -LICENSE="BSD-2"
212 -SLOT="0"
213 -IUSE="elibc_glibc +embedded ipv6 kernel_linux +udev"
214 -
215 -COMMON_DEPEND="udev? ( virtual/udev )"
216 -DEPEND="${COMMON_DEPEND}"
217 -RDEPEND="${COMMON_DEPEND}"
218 -
219 -src_configure() {
220 - local myeconfargs=(
221 - --dbdir="${EPREFIX}/var/lib/dhcpcd"
222 - --libexecdir="${EPREFIX}/lib/dhcpcd"
223 - --localstatedir="${EPREFIX}/var"
224 - --prefix="${EPREFIX}"
225 - --with-hook=ntp.conf
226 - $(use_enable embedded)
227 - $(use_enable ipv6)
228 - $(usex elibc_glibc '--with-hook=yp.conf' '')
229 - $(usex kernel_linux '--rundir=${EPREFIX}/run' '')
230 - $(usex udev '' '--without-dev --without-udev')
231 - CC="$(tc-getCC)"
232 - )
233 - econf "${myeconfargs[@]}"
234 -}
235 -
236 -src_install() {
237 - default
238 - keepdir /var/lib/dhcpcd
239 - newinitd "${FILESDIR}"/${PN}.initd ${PN}
240 - systemd_dounit "${FILESDIR}"/${PN}.service
241 -}
242 -
243 -pkg_postinst() {
244 - local dbdir="${EROOT}"/var/lib/dhcpcd old_files=()
245 -
246 - local old_old_duid="${EROOT}"/var/lib/dhcpcd/dhcpcd.duid
247 - local old_duid="${EROOT}"/etc/dhcpcd.duid
248 - local new_duid="${dbdir}"/duid
249 - if [[ -e "${old_old_duid}" ]] ; then
250 - # Upgrade the duid file to the new format if needed
251 - if ! grep -q '..:..:..:..:..:..' "${old_old_duid}"; then
252 - sed -i -e 's/\(..\)/\1:/g; s/:$//g' "${old_old_duid}"
253 - fi
254 -
255 - # Move the duid to /etc, a more sensible location
256 - if [[ ! -e "${old_duid}" ]] ; then
257 - cp -p "${old_old_duid}" "${new_duid}"
258 - fi
259 - old_files+=( "${old_old_duid}" )
260 - fi
261 -
262 - # dhcpcd-7 moves the files out of /etc
263 - if [[ -e "${old_duid}" ]] ; then
264 - if [[ ! -e "${new_duid}" ]] ; then
265 - cp -p "${old_duid}" "${new_duid}"
266 - fi
267 - old_files+=( "${old_duid}" )
268 - fi
269 - local old_secret="${EROOT}"/etc/dhcpcd.secret
270 - local new_secret="${dbdir}"/secret
271 - if [[ -e "${old_secret}" ]] ; then
272 - if [[ ! -e "${new_secret}" ]] ; then
273 - cp -p "${old_secret}" "${new_secret}"
274 - fi
275 - old_files+=( "${old_secret}" )
276 - fi
277 -
278 - # dhcpcd-7 renames some files in /var/lib/dhcpcd
279 - local old_rdm="${dbdir}"/dhcpcd-rdm.monotonic
280 - local new_rdm="${dbdir}"/rdm_monotonic
281 - if [[ -e "${old_rdm}" ]] ; then
282 - if [[ ! -e "${new_rdm}" ]] ; then
283 - cp -p "${old_rdm}" "${new_rdm}"
284 - fi
285 - old_files+=( "${old_rdm}" )
286 - fi
287 - local lease=
288 - for lease in "${dbdir}"/dhcpcd-*.lease*; do
289 - [[ -f "${lease}" ]] || continue
290 - old_files+=( "${lease}" )
291 - local new_lease=$(basename "${lease}" | sed -e "s/dhcpcd-//")
292 - [[ -e "${dbdir}/${new_lease}" ]] && continue
293 - cp "${lease}" "${dbdir}/${new_lease}"
294 - done
295 -
296 - # Warn about removing stale files
297 - if [[ -n "${old_files[@]}" ]] ; then
298 - elog
299 - elog "dhcpcd-7 has copied dhcpcd.duid and dhcpcd.secret from"
300 - elog "${EROOT}/etc to ${dbdir}"
301 - elog "and copied leases in ${dbdir} to new files with the dhcpcd-"
302 - elog "prefix dropped."
303 - elog
304 - elog "You should remove these files if you don't plan on reverting"
305 - elog "to an older version:"
306 - local old_file=
307 - for old_file in ${old_files[@]}; do
308 - elog " ${old_file}"
309 - done
310 - fi
311 -
312 - if [ -z "${REPLACING_VERSIONS}" ]; then
313 - elog
314 - elog "dhcpcd has zeroconf support active by default."
315 - elog "This means it will always obtain an IP address even if no"
316 - elog "DHCP server can be contacted, which will break any existing"
317 - elog "failover support you may have configured in your net configuration."
318 - elog "This behaviour can be controlled with the noipv4ll configuration"
319 - elog "file option or the -L command line switch."
320 - elog "See the dhcpcd and dhcpcd.conf man pages for more details."
321 -
322 - elog
323 - elog "Dhcpcd has duid enabled by default, and this may cause issues"
324 - elog "with some dhcp servers. For more information, see"
325 - elog "https://bugs.gentoo.org/show_bug.cgi?id=477356"
326 - fi
327 -
328 - if ! has_version net-dns/bind-tools; then
329 - elog
330 - elog "If you activate the lookup-hostname hook to look up your hostname"
331 - elog "using the dns, you need to install net-dns/bind-tools."
332 - fi
333 -}
334
335 diff --git a/net-misc/dhcpcd/dhcpcd-8.1.7.ebuild b/net-misc/dhcpcd/dhcpcd-8.1.7.ebuild
336 deleted file mode 100644
337 index 504876b53cf..00000000000
338 --- a/net-misc/dhcpcd/dhcpcd-8.1.7.ebuild
339 +++ /dev/null
340 @@ -1,144 +0,0 @@
341 -# Copyright 1999-2020 Gentoo Authors
342 -# Distributed under the terms of the GNU General Public License v2
343 -
344 -EAPI=7
345 -
346 -inherit systemd toolchain-funcs
347 -
348 -if [[ ${PV} == "9999" ]]; then
349 - inherit git-r3
350 - EGIT_REPO_URI="https://roy.marples.name/git/dhcpcd.git"
351 -else
352 - MY_P="${P/_alpha/-alpha}"
353 - MY_P="${MY_P/_beta/-beta}"
354 - MY_P="${MY_P/_rc/-rc}"
355 - SRC_URI="https://roy.marples.name/downloads/${PN}/${MY_P}.tar.xz"
356 - KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
357 - S="${WORKDIR}/${MY_P}"
358 -fi
359 -
360 -DESCRIPTION="A fully featured, yet light weight RFC2131 compliant DHCP client"
361 -HOMEPAGE="https://roy.marples.name/projects/dhcpcd"
362 -LICENSE="BSD-2"
363 -SLOT="0"
364 -IUSE="elibc_glibc +embedded ipv6 kernel_linux +udev"
365 -
366 -COMMON_DEPEND="udev? ( virtual/udev )"
367 -DEPEND="${COMMON_DEPEND}"
368 -RDEPEND="${COMMON_DEPEND}"
369 -
370 -src_configure() {
371 - local myeconfargs=(
372 - --dbdir="${EPREFIX}/var/lib/dhcpcd"
373 - --libexecdir="${EPREFIX}/lib/dhcpcd"
374 - --localstatedir="${EPREFIX}/var"
375 - --prefix="${EPREFIX}"
376 - --with-hook=ntp.conf
377 - $(use_enable embedded)
378 - $(use_enable ipv6)
379 - $(usex elibc_glibc '--with-hook=yp.conf' '')
380 - $(usex kernel_linux '--rundir=${EPREFIX}/run' '')
381 - $(usex udev '' '--without-dev --without-udev')
382 - CC="$(tc-getCC)"
383 - )
384 - econf "${myeconfargs[@]}"
385 -}
386 -
387 -src_install() {
388 - default
389 - keepdir /var/lib/dhcpcd
390 - newinitd "${FILESDIR}"/${PN}.initd ${PN}
391 - systemd_dounit "${FILESDIR}"/${PN}.service
392 -}
393 -
394 -pkg_postinst() {
395 - local dbdir="${EROOT}"/var/lib/dhcpcd old_files=()
396 -
397 - local old_old_duid="${EROOT}"/var/lib/dhcpcd/dhcpcd.duid
398 - local old_duid="${EROOT}"/etc/dhcpcd.duid
399 - local new_duid="${dbdir}"/duid
400 - if [[ -e "${old_old_duid}" ]] ; then
401 - # Upgrade the duid file to the new format if needed
402 - if ! grep -q '..:..:..:..:..:..' "${old_old_duid}"; then
403 - sed -i -e 's/\(..\)/\1:/g; s/:$//g' "${old_old_duid}"
404 - fi
405 -
406 - # Move the duid to /etc, a more sensible location
407 - if [[ ! -e "${old_duid}" ]] ; then
408 - cp -p "${old_old_duid}" "${new_duid}"
409 - fi
410 - old_files+=( "${old_old_duid}" )
411 - fi
412 -
413 - # dhcpcd-7 moves the files out of /etc
414 - if [[ -e "${old_duid}" ]] ; then
415 - if [[ ! -e "${new_duid}" ]] ; then
416 - cp -p "${old_duid}" "${new_duid}"
417 - fi
418 - old_files+=( "${old_duid}" )
419 - fi
420 - local old_secret="${EROOT}"/etc/dhcpcd.secret
421 - local new_secret="${dbdir}"/secret
422 - if [[ -e "${old_secret}" ]] ; then
423 - if [[ ! -e "${new_secret}" ]] ; then
424 - cp -p "${old_secret}" "${new_secret}"
425 - fi
426 - old_files+=( "${old_secret}" )
427 - fi
428 -
429 - # dhcpcd-7 renames some files in /var/lib/dhcpcd
430 - local old_rdm="${dbdir}"/dhcpcd-rdm.monotonic
431 - local new_rdm="${dbdir}"/rdm_monotonic
432 - if [[ -e "${old_rdm}" ]] ; then
433 - if [[ ! -e "${new_rdm}" ]] ; then
434 - cp -p "${old_rdm}" "${new_rdm}"
435 - fi
436 - old_files+=( "${old_rdm}" )
437 - fi
438 - local lease=
439 - for lease in "${dbdir}"/dhcpcd-*.lease*; do
440 - [[ -f "${lease}" ]] || continue
441 - old_files+=( "${lease}" )
442 - local new_lease=$(basename "${lease}" | sed -e "s/dhcpcd-//")
443 - [[ -e "${dbdir}/${new_lease}" ]] && continue
444 - cp "${lease}" "${dbdir}/${new_lease}"
445 - done
446 -
447 - # Warn about removing stale files
448 - if [[ -n "${old_files[@]}" ]] ; then
449 - elog
450 - elog "dhcpcd-7 has copied dhcpcd.duid and dhcpcd.secret from"
451 - elog "${EROOT}/etc to ${dbdir}"
452 - elog "and copied leases in ${dbdir} to new files with the dhcpcd-"
453 - elog "prefix dropped."
454 - elog
455 - elog "You should remove these files if you don't plan on reverting"
456 - elog "to an older version:"
457 - local old_file=
458 - for old_file in ${old_files[@]}; do
459 - elog " ${old_file}"
460 - done
461 - fi
462 -
463 - if [ -z "${REPLACING_VERSIONS}" ]; then
464 - elog
465 - elog "dhcpcd has zeroconf support active by default."
466 - elog "This means it will always obtain an IP address even if no"
467 - elog "DHCP server can be contacted, which will break any existing"
468 - elog "failover support you may have configured in your net configuration."
469 - elog "This behaviour can be controlled with the noipv4ll configuration"
470 - elog "file option or the -L command line switch."
471 - elog "See the dhcpcd and dhcpcd.conf man pages for more details."
472 -
473 - elog
474 - elog "Dhcpcd has duid enabled by default, and this may cause issues"
475 - elog "with some dhcp servers. For more information, see"
476 - elog "https://bugs.gentoo.org/show_bug.cgi?id=477356"
477 - fi
478 -
479 - if ! has_version net-dns/bind-tools; then
480 - elog
481 - elog "If you activate the lookup-hostname hook to look up your hostname"
482 - elog "using the dns, you need to install net-dns/bind-tools."
483 - fi
484 -}
485
486 diff --git a/net-misc/dhcpcd/dhcpcd-9.0.1.ebuild b/net-misc/dhcpcd/dhcpcd-9.0.1.ebuild
487 deleted file mode 100644
488 index 9656eabee92..00000000000
489 --- a/net-misc/dhcpcd/dhcpcd-9.0.1.ebuild
490 +++ /dev/null
491 @@ -1,173 +0,0 @@
492 -# Copyright 1999-2020 Gentoo Authors
493 -# Distributed under the terms of the GNU General Public License v2
494 -
495 -EAPI=7
496 -
497 -inherit systemd toolchain-funcs
498 -
499 -if [[ ${PV} == "9999" ]]; then
500 - inherit git-r3
501 - EGIT_REPO_URI="https://roy.marples.name/cgit/dhcpcd.git"
502 -else
503 - MY_P="${P/_alpha/-alpha}"
504 - MY_P="${MY_P/_beta/-beta}"
505 - MY_P="${MY_P/_rc/-rc}"
506 - SRC_URI="https://roy.marples.name/downloads/${PN}/${MY_P}.tar.xz"
507 - KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
508 - S="${WORKDIR}/${MY_P}"
509 -fi
510 -
511 -DESCRIPTION="A fully featured, yet light weight RFC2131 compliant DHCP client"
512 -HOMEPAGE="https://roy.marples.name/projects/dhcpcd"
513 -LICENSE="BSD-2"
514 -SLOT="0"
515 -IUSE="debug elibc_glibc +embedded ipv6 kernel_linux +privsep +udev"
516 -
517 -COMMON_DEPEND="udev? ( virtual/udev )"
518 -DEPEND="${COMMON_DEPEND}"
519 -RDEPEND="
520 - ${COMMON_DEPEND}
521 - privsep? (
522 - acct-group/dhcpcd
523 - acct-user/dhcpcd
524 - )
525 -"
526 -
527 -src_configure() {
528 - local myeconfargs=(
529 - --dbdir="${EPREFIX}/var/lib/dhcpcd"
530 - --libexecdir="${EPREFIX}/lib/dhcpcd"
531 - --localstatedir="${EPREFIX}/var"
532 - --prefix="${EPREFIX}"
533 - --with-hook=ntp.conf
534 - $(use_enable debug)
535 - $(use_enable embedded)
536 - $(use_enable ipv6)
537 - $(use_enable privsep)
538 - $(usex elibc_glibc '--with-hook=yp.conf' '')
539 - $(usex kernel_linux '--rundir=${EPREFIX}/run' '')
540 - $(usex privsep '--privsepuser=dhcpcd' '')
541 - $(usex udev '' '--without-dev --without-udev')
542 - CC="$(tc-getCC)"
543 - )
544 - econf "${myeconfargs[@]}"
545 -}
546 -
547 -src_install() {
548 - default
549 - keepdir /var/lib/dhcpcd
550 - newinitd "${FILESDIR}"/${PN}.initd ${PN}
551 - systemd_dounit "${FILESDIR}"/${PN}.service
552 -}
553 -
554 -pkg_postinst() {
555 - local dbdir="${EROOT}"/var/lib/dhcpcd old_files=()
556 -
557 - local old_old_duid="${EROOT}"/var/lib/dhcpcd/dhcpcd.duid
558 - local old_duid="${EROOT}"/etc/dhcpcd.duid
559 - local new_duid="${dbdir}"/duid
560 - if [[ -e "${old_old_duid}" ]] ; then
561 - # Upgrade the duid file to the new format if needed
562 - if ! grep -q '..:..:..:..:..:..' "${old_old_duid}"; then
563 - sed -i -e 's/\(..\)/\1:/g; s/:$//g' "${old_old_duid}"
564 - fi
565 -
566 - # Move the duid to /etc, a more sensible location
567 - if [[ ! -e "${old_duid}" ]] ; then
568 - cp -p "${old_old_duid}" "${new_duid}"
569 - fi
570 - old_files+=( "${old_old_duid}" )
571 - fi
572 -
573 - # dhcpcd-7 moves the files out of /etc
574 - if [[ -e "${old_duid}" ]] ; then
575 - if [[ ! -e "${new_duid}" ]] ; then
576 - cp -p "${old_duid}" "${new_duid}"
577 - fi
578 - old_files+=( "${old_duid}" )
579 - fi
580 - local old_secret="${EROOT}"/etc/dhcpcd.secret
581 - local new_secret="${dbdir}"/secret
582 - if [[ -e "${old_secret}" ]] ; then
583 - if [[ ! -e "${new_secret}" ]] ; then
584 - cp -p "${old_secret}" "${new_secret}"
585 - fi
586 - old_files+=( "${old_secret}" )
587 - fi
588 -
589 - # dhcpcd-7 renames some files in /var/lib/dhcpcd
590 - local old_rdm="${dbdir}"/dhcpcd-rdm.monotonic
591 - local new_rdm="${dbdir}"/rdm_monotonic
592 - if [[ -e "${old_rdm}" ]] ; then
593 - if [[ ! -e "${new_rdm}" ]] ; then
594 - cp -p "${old_rdm}" "${new_rdm}"
595 - fi
596 - old_files+=( "${old_rdm}" )
597 - fi
598 - local lease=
599 - for lease in "${dbdir}"/dhcpcd-*.lease*; do
600 - [[ -f "${lease}" ]] || continue
601 - old_files+=( "${lease}" )
602 - local new_lease=$(basename "${lease}" | sed -e "s/dhcpcd-//")
603 - [[ -e "${dbdir}/${new_lease}" ]] && continue
604 - cp "${lease}" "${dbdir}/${new_lease}"
605 - done
606 -
607 - # dhcpcd-9 introduced privesep support in a chroot
608 - if use privsep ; then
609 - local dhcpcd_libdir="/var/lib/dhcpcd"
610 - local chroot_base="${EROOT}/var/chroot/dhcpcd"
611 - local chroot_dir="${chroot_base}${dhcpcd_libdir}"
612 - local chroot_retval=0
613 - # Set up proper chroot.
614 - if [[ ! -e "${chroot_dir}" ]] ; then
615 - mkdir -p "${chroot_dir}" || chroot_retval=1
616 - cp -a "${EROOT}${dhcpcd_libdir}" "${chroot_dir}" || chroot_retval=1
617 - chown -R dhcpcd:dhcpcd "${chroot_dir}" || chroot_retval=1
618 - elif [[ ! -d "${chroot_dir}" ]] ; then
619 - ewarn "${chroot_dir} is not a directory!"
620 - ewarn "Did not set up ${PN} chroot!"
621 - fi
622 - if [[ "${chroot_retval}" -ne 0 ]] ; then
623 - ewarn "There were issues setting up ${PN} chroot."
624 - fi
625 - fi
626 -
627 - # Warn about removing stale files
628 - if [[ -n "${old_files[@]}" ]] ; then
629 - elog
630 - elog "dhcpcd-7 has copied dhcpcd.duid and dhcpcd.secret from"
631 - elog "${EROOT}/etc to ${dbdir}"
632 - elog "and copied leases in ${dbdir} to new files with the dhcpcd-"
633 - elog "prefix dropped."
634 - elog
635 - elog "You should remove these files if you don't plan on reverting"
636 - elog "to an older version:"
637 - local old_file=
638 - for old_file in ${old_files[@]}; do
639 - elog " ${old_file}"
640 - done
641 - fi
642 -
643 - if [ -z "${REPLACING_VERSIONS}" ]; then
644 - elog
645 - elog "dhcpcd has zeroconf support active by default."
646 - elog "This means it will always obtain an IP address even if no"
647 - elog "DHCP server can be contacted, which will break any existing"
648 - elog "failover support you may have configured in your net configuration."
649 - elog "This behaviour can be controlled with the noipv4ll configuration"
650 - elog "file option or the -L command line switch."
651 - elog "See the dhcpcd and dhcpcd.conf man pages for more details."
652 -
653 - elog
654 - elog "Dhcpcd has duid enabled by default, and this may cause issues"
655 - elog "with some dhcp servers. For more information, see"
656 - elog "https://bugs.gentoo.org/show_bug.cgi?id=477356"
657 - fi
658 -
659 - if ! has_version net-dns/bind-tools; then
660 - elog
661 - elog "If you activate the lookup-hostname hook to look up your hostname"
662 - elog "using the dns, you need to install net-dns/bind-tools."
663 - fi
664 -}