1 |
commit: 8d83877ba08cda059af5d194e3eda0ce52c39261 |
2 |
Author: Lars Wendler <polynomial-c <AT> gentoo <DOT> org> |
3 |
AuthorDate: Fri Apr 26 15:07:08 2019 +0000 |
4 |
Commit: Lars Wendler <polynomial-c <AT> gentoo <DOT> org> |
5 |
CommitDate: Fri Apr 26 15:07:23 2019 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8d83877b |
7 |
|
8 |
net-misc/dhcpcd: Removed old. |
9 |
|
10 |
Package-Manager: Portage-2.3.65, Repoman-2.3.12 |
11 |
Signed-off-by: Lars Wendler <polynomial-c <AT> gentoo.org> |
12 |
|
13 |
net-misc/dhcpcd/Manifest | 3 - |
14 |
net-misc/dhcpcd/dhcpcd-7.0.1.ebuild | 148 ----------------------------------- |
15 |
net-misc/dhcpcd/dhcpcd-7.0.8.ebuild | 149 ------------------------------------ |
16 |
net-misc/dhcpcd/dhcpcd-7.2.0.ebuild | 148 ----------------------------------- |
17 |
4 files changed, 448 deletions(-) |
18 |
|
19 |
diff --git a/net-misc/dhcpcd/Manifest b/net-misc/dhcpcd/Manifest |
20 |
index 1085dcb6737..a04b408e4de 100644 |
21 |
--- a/net-misc/dhcpcd/Manifest |
22 |
+++ b/net-misc/dhcpcd/Manifest |
23 |
@@ -1,5 +1,2 @@ |
24 |
-DIST dhcpcd-7.0.1.tar.xz 207908 BLAKE2B 1a9350a0c4a9eb1eb6f5a7be78beb4a5fecd802ee90a4649ab17db69eabc75a913b9f3db97ea6260bcad3516b9613c20f74d9d68a7ac98b508458e5cd30cf15f SHA512 d2a9b053aa663dd1ed38a10a73ee3377a3a076c9638bdda9331a4c161c2ba87f5f68f366ac8e1f1015404f617b74261a03a97ac7cdfd642b4a41b87b54984c34 |
25 |
-DIST dhcpcd-7.0.8.tar.xz 210752 BLAKE2B ad8ba622589cc1c8c4bb332470c59527e03c817729f43a5b55b4f53f8ed60f35faaffbff24416f8596e78df8deb304f0598e27d890e9601d36c81250fda99942 SHA512 82cd845eb35670788b8f31b973945460f4c5f1a0a3025e3a452b79230dc30704e129d97140e6aec6d0281e0c89c333c0ce0af03c4767b2e5e66547ed3e071953 |
26 |
DIST dhcpcd-7.1.1.tar.xz 211788 BLAKE2B 984ec97ffdcb15883f57f9e2a699a7c8f006b2630e7651ab9d55e7a980045f8891f09d9f7be420969203a59671d097a1ed76621fe4a62ff26a5020fc8becfe69 SHA512 8791e718d65ef8ae23a16b98e82824860fa91914e6eb0a42cdbbca28236c1c38005ada44214bde33aac57152fe675debebdb5d141b67dcfc82012996d8337bb4 |
27 |
-DIST dhcpcd-7.2.0.tar.xz 212532 BLAKE2B c8768df8006d517d0082f08c6ceebfe5a31695485d32d477acc1c4b9bfce8541110388f186c2ef94642e0692c279fc6d89239cbd8ac07d6ed248e67721c07db5 SHA512 2ab7df53ed42cd7a274bbc9cfb9dca43a8615d9044c0e9f460c41f064ad012b436bf2fe2648dd2738e66aaefc72412cad6c59444631b650f942cba168127a79d |
28 |
DIST dhcpcd-7.2.1.tar.xz 213652 BLAKE2B cae5a68ecf285825e6376c8b5bef5f3aba3bb8a393ba4298d8e990d665dd948369f24f688cdb85006df535b7f9b412c795d8eb7817a92e8d9992bdc7b7757a1e SHA512 11c3ef6d3ee49e147aa44725aa1ac0cddff70a268908439fe91990e135175d063e3d65ab587e1780e4f6f0739cf33873a58ffea0a3130d1bfb5598f9f11ec5a3 |
29 |
|
30 |
diff --git a/net-misc/dhcpcd/dhcpcd-7.0.1.ebuild b/net-misc/dhcpcd/dhcpcd-7.0.1.ebuild |
31 |
deleted file mode 100644 |
32 |
index b7938c55852..00000000000 |
33 |
--- a/net-misc/dhcpcd/dhcpcd-7.0.1.ebuild |
34 |
+++ /dev/null |
35 |
@@ -1,148 +0,0 @@ |
36 |
-# Copyright 1999-2018 Gentoo Foundation |
37 |
-# Distributed under the terms of the GNU General Public License v2 |
38 |
- |
39 |
-EAPI=6 |
40 |
- |
41 |
-if [[ ${PV} == "9999" ]]; then |
42 |
- EGIT_REPO_URI="https://roy.marples.name/git/dhcpcd.git" |
43 |
- inherit git-r3 |
44 |
-else |
45 |
- MY_P="${P/_alpha/-alpha}" |
46 |
- MY_P="${MY_P/_beta/-beta}" |
47 |
- MY_P="${MY_P/_rc/-rc}" |
48 |
- SRC_URI="https://roy.marples.name/downloads/${PN}/${MY_P}.tar.xz" |
49 |
- KEYWORDS="alpha amd64 arm arm64 ~hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux" |
50 |
- S="${WORKDIR}/${MY_P}" |
51 |
-fi |
52 |
- |
53 |
-inherit eutils systemd toolchain-funcs |
54 |
- |
55 |
-DESCRIPTION="A fully featured, yet light weight RFC2131 compliant DHCP client" |
56 |
-HOMEPAGE="https://roy.marples.name/projects/dhcpcd" |
57 |
-LICENSE="BSD-2" |
58 |
-SLOT="0" |
59 |
-IUSE="elibc_glibc +embedded ipv6 kernel_linux +udev" |
60 |
- |
61 |
-COMMON_DEPEND="udev? ( virtual/udev )" |
62 |
-DEPEND="${COMMON_DEPEND}" |
63 |
-RDEPEND="${COMMON_DEPEND}" |
64 |
- |
65 |
-src_configure() |
66 |
-{ |
67 |
- local dev hooks rundir |
68 |
- use udev || dev="--without-dev --without-udev" |
69 |
- hooks="--with-hook=ntp.conf" |
70 |
- use elibc_glibc && hooks="${hooks} --with-hook=yp.conf" |
71 |
- use kernel_linux && rundir="--rundir=${EPREFIX}/run" |
72 |
- econf \ |
73 |
- --prefix="${EPREFIX}" \ |
74 |
- --libexecdir="${EPREFIX}/lib/dhcpcd" \ |
75 |
- --dbdir="${EPREFIX}/var/lib/dhcpcd" \ |
76 |
- --localstatedir="${EPREFIX}/var" \ |
77 |
- ${rundir} \ |
78 |
- $(use_enable embedded) \ |
79 |
- $(use_enable ipv6) \ |
80 |
- ${dev} \ |
81 |
- CC="$(tc-getCC)" \ |
82 |
- ${hooks} |
83 |
-} |
84 |
- |
85 |
-src_install() |
86 |
-{ |
87 |
- default |
88 |
- newinitd "${FILESDIR}"/${PN}.initd ${PN} |
89 |
- systemd_dounit "${FILESDIR}"/${PN}.service |
90 |
-} |
91 |
- |
92 |
-pkg_postinst() |
93 |
-{ |
94 |
- local dbdir="${EROOT%/}"/var/lib/dhcpcd old_files= |
95 |
- |
96 |
- local old_old_duid="${EROOT%/}"/var/lib/dhcpcd/dhcpcd.duid |
97 |
- local old_duid="${EROOT%/}"/etc/dhcpcd.duid |
98 |
- local new_duid="${dbdir}"/duid |
99 |
- if [ -e "${old_old_duid}" ]; then |
100 |
- # Upgrade the duid file to the new format if needed |
101 |
- if ! grep -q '..:..:..:..:..:..' "${old_old_duid}"; then |
102 |
- sed -i -e 's/\(..\)/\1:/g; s/:$//g' "${old_old_duid}" |
103 |
- fi |
104 |
- |
105 |
- # Move the duid to /etc, a more sensible location |
106 |
- if [ ! -e "${old_duid}" ]; then |
107 |
- cp -p "${old_old_duid}" "${new_duid}" |
108 |
- fi |
109 |
- old_files="${old_files} ${old_old_duid}" |
110 |
- fi |
111 |
- |
112 |
- # dhcpcd-7 moves the files out of /etc |
113 |
- if [ -e "${old_duid}" ]; then |
114 |
- if [ ! -e "${new_duid}" ]; then |
115 |
- cp -p "${old_duid}" "${new_duid}" |
116 |
- fi |
117 |
- old_files="${old_files} ${old_duid}" |
118 |
- fi |
119 |
- local old_secret="${EROOT%/}"/etc/dhcpcd.secret |
120 |
- local new_secret="${dbdir}"/secret |
121 |
- if [ -e "${old_secret}" ]; then |
122 |
- if [ ! -e "${new_secret}" ]; then |
123 |
- cp -p "${old_secret}" "${new_secret}" |
124 |
- fi |
125 |
- old_files="${old_files} ${old_secret}" |
126 |
- fi |
127 |
- |
128 |
- # dhcpcd-7 renames some files in /var/lib/dhcpcd |
129 |
- local old_rdm="${dbdir}"/dhcpcd-rdm.monotonic |
130 |
- local new_rdm="${dbdir}"/rdm_monotonic |
131 |
- if [ -e "${old_rdm}" ]; then |
132 |
- if [ ! -e "${new_rdm}" ]; then |
133 |
- cp -p "${old_rdm}" "${new_rdm}" |
134 |
- fi |
135 |
- old_files="${old_files} ${old_rdm}" |
136 |
- fi |
137 |
- local lease= |
138 |
- for lease in "${dbdir}"/dhcpcd-*.lease*; do |
139 |
- [ -f "$lease" ] || continue |
140 |
- old_files="${old_files} ${lease}" |
141 |
- local new_lease=$(basename "$lease" | sed -e "s/dhcpcd-//") |
142 |
- [ -e "${dbdir}/${new_lease}" ] && continue |
143 |
- cp "${lease}" "${dbdir}/${new_lease}" |
144 |
- done |
145 |
- |
146 |
- # Warn about removing stale files |
147 |
- if [ -n "${old_files}" ]; then |
148 |
- elog |
149 |
- elog "dhcpcd-7 has copied dhcpcd.duid and dhcpcd.secret from" |
150 |
- elog "${EROOT%/}/etc to ${dbdir}" |
151 |
- elog "and copied leases in ${dbdir} to new files with the dhcpcd-" |
152 |
- elog "prefix dropped." |
153 |
- elog |
154 |
- elog "You should remove these files if you don't plan on reverting" |
155 |
- elog "to an older version:" |
156 |
- local old_file= |
157 |
- for old_file in ${old_files}; do |
158 |
- elog " ${old_file}" |
159 |
- done |
160 |
- fi |
161 |
- |
162 |
- if [ -z "$REPLACING_VERSIONS" ]; then |
163 |
- elog |
164 |
- elog "dhcpcd has zeroconf support active by default." |
165 |
- elog "This means it will always obtain an IP address even if no" |
166 |
- elog "DHCP server can be contacted, which will break any existing" |
167 |
- elog "failover support you may have configured in your net configuration." |
168 |
- elog "This behaviour can be controlled with the noipv4ll configuration" |
169 |
- elog "file option or the -L command line switch." |
170 |
- elog "See the dhcpcd and dhcpcd.conf man pages for more details." |
171 |
- |
172 |
- elog |
173 |
- elog "Dhcpcd has duid enabled by default, and this may cause issues" |
174 |
- elog "with some dhcp servers. For more information, see" |
175 |
- elog "https://bugs.gentoo.org/show_bug.cgi?id=477356" |
176 |
- fi |
177 |
- |
178 |
- if ! has_version net-dns/bind-tools; then |
179 |
- elog |
180 |
- elog "If you activate the lookup-hostname hook to look up your hostname" |
181 |
- elog "using the dns, you need to install net-dns/bind-tools." |
182 |
- fi |
183 |
-} |
184 |
|
185 |
diff --git a/net-misc/dhcpcd/dhcpcd-7.0.8.ebuild b/net-misc/dhcpcd/dhcpcd-7.0.8.ebuild |
186 |
deleted file mode 100644 |
187 |
index a146481fe88..00000000000 |
188 |
--- a/net-misc/dhcpcd/dhcpcd-7.0.8.ebuild |
189 |
+++ /dev/null |
190 |
@@ -1,149 +0,0 @@ |
191 |
-# Copyright 1999-2018 Gentoo Foundation |
192 |
-# Distributed under the terms of the GNU General Public License v2 |
193 |
- |
194 |
-EAPI=6 |
195 |
- |
196 |
-if [[ ${PV} == "9999" ]]; then |
197 |
- EGIT_REPO_URI="https://roy.marples.name/git/dhcpcd.git" |
198 |
- inherit git-r3 |
199 |
-else |
200 |
- MY_P="${P/_alpha/-alpha}" |
201 |
- MY_P="${MY_P/_beta/-beta}" |
202 |
- MY_P="${MY_P/_rc/-rc}" |
203 |
- SRC_URI="https://roy.marples.name/downloads/${PN}/${MY_P}.tar.xz" |
204 |
- KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux" |
205 |
- S="${WORKDIR}/${MY_P}" |
206 |
-fi |
207 |
- |
208 |
-inherit eutils systemd toolchain-funcs |
209 |
- |
210 |
-DESCRIPTION="A fully featured, yet light weight RFC2131 compliant DHCP client" |
211 |
-HOMEPAGE="https://roy.marples.name/projects/dhcpcd" |
212 |
-LICENSE="BSD-2" |
213 |
-SLOT="0" |
214 |
-IUSE="elibc_glibc +embedded ipv6 kernel_linux +udev" |
215 |
- |
216 |
-COMMON_DEPEND="udev? ( virtual/udev )" |
217 |
-DEPEND="${COMMON_DEPEND}" |
218 |
-RDEPEND="${COMMON_DEPEND}" |
219 |
- |
220 |
-src_configure() |
221 |
-{ |
222 |
- local dev hooks rundir |
223 |
- use udev || dev="--without-dev --without-udev" |
224 |
- hooks="--with-hook=ntp.conf" |
225 |
- use elibc_glibc && hooks="${hooks} --with-hook=yp.conf" |
226 |
- use kernel_linux && rundir="--rundir=${EPREFIX}/run" |
227 |
- econf \ |
228 |
- --prefix="${EPREFIX}" \ |
229 |
- --libexecdir="${EPREFIX}/lib/dhcpcd" \ |
230 |
- --dbdir="${EPREFIX}/var/lib/dhcpcd" \ |
231 |
- --localstatedir="${EPREFIX}/var" \ |
232 |
- ${rundir} \ |
233 |
- $(use_enable embedded) \ |
234 |
- $(use_enable ipv6) \ |
235 |
- ${dev} \ |
236 |
- CC="$(tc-getCC)" \ |
237 |
- ${hooks} |
238 |
-} |
239 |
- |
240 |
-src_install() |
241 |
-{ |
242 |
- default |
243 |
- keepdir /var/lib/dhcpcd |
244 |
- newinitd "${FILESDIR}"/${PN}.initd ${PN} |
245 |
- systemd_dounit "${FILESDIR}"/${PN}.service |
246 |
-} |
247 |
- |
248 |
-pkg_postinst() |
249 |
-{ |
250 |
- local dbdir="${EROOT%/}"/var/lib/dhcpcd old_files= |
251 |
- |
252 |
- local old_old_duid="${EROOT%/}"/var/lib/dhcpcd/dhcpcd.duid |
253 |
- local old_duid="${EROOT%/}"/etc/dhcpcd.duid |
254 |
- local new_duid="${dbdir}"/duid |
255 |
- if [ -e "${old_old_duid}" ]; then |
256 |
- # Upgrade the duid file to the new format if needed |
257 |
- if ! grep -q '..:..:..:..:..:..' "${old_old_duid}"; then |
258 |
- sed -i -e 's/\(..\)/\1:/g; s/:$//g' "${old_old_duid}" |
259 |
- fi |
260 |
- |
261 |
- # Move the duid to /etc, a more sensible location |
262 |
- if [ ! -e "${old_duid}" ]; then |
263 |
- cp -p "${old_old_duid}" "${new_duid}" |
264 |
- fi |
265 |
- old_files="${old_files} ${old_old_duid}" |
266 |
- fi |
267 |
- |
268 |
- # dhcpcd-7 moves the files out of /etc |
269 |
- if [ -e "${old_duid}" ]; then |
270 |
- if [ ! -e "${new_duid}" ]; then |
271 |
- cp -p "${old_duid}" "${new_duid}" |
272 |
- fi |
273 |
- old_files="${old_files} ${old_duid}" |
274 |
- fi |
275 |
- local old_secret="${EROOT%/}"/etc/dhcpcd.secret |
276 |
- local new_secret="${dbdir}"/secret |
277 |
- if [ -e "${old_secret}" ]; then |
278 |
- if [ ! -e "${new_secret}" ]; then |
279 |
- cp -p "${old_secret}" "${new_secret}" |
280 |
- fi |
281 |
- old_files="${old_files} ${old_secret}" |
282 |
- fi |
283 |
- |
284 |
- # dhcpcd-7 renames some files in /var/lib/dhcpcd |
285 |
- local old_rdm="${dbdir}"/dhcpcd-rdm.monotonic |
286 |
- local new_rdm="${dbdir}"/rdm_monotonic |
287 |
- if [ -e "${old_rdm}" ]; then |
288 |
- if [ ! -e "${new_rdm}" ]; then |
289 |
- cp -p "${old_rdm}" "${new_rdm}" |
290 |
- fi |
291 |
- old_files="${old_files} ${old_rdm}" |
292 |
- fi |
293 |
- local lease= |
294 |
- for lease in "${dbdir}"/dhcpcd-*.lease*; do |
295 |
- [ -f "$lease" ] || continue |
296 |
- old_files="${old_files} ${lease}" |
297 |
- local new_lease=$(basename "$lease" | sed -e "s/dhcpcd-//") |
298 |
- [ -e "${dbdir}/${new_lease}" ] && continue |
299 |
- cp "${lease}" "${dbdir}/${new_lease}" |
300 |
- done |
301 |
- |
302 |
- # Warn about removing stale files |
303 |
- if [ -n "${old_files}" ]; then |
304 |
- elog |
305 |
- elog "dhcpcd-7 has copied dhcpcd.duid and dhcpcd.secret from" |
306 |
- elog "${EROOT%/}/etc to ${dbdir}" |
307 |
- elog "and copied leases in ${dbdir} to new files with the dhcpcd-" |
308 |
- elog "prefix dropped." |
309 |
- elog |
310 |
- elog "You should remove these files if you don't plan on reverting" |
311 |
- elog "to an older version:" |
312 |
- local old_file= |
313 |
- for old_file in ${old_files}; do |
314 |
- elog " ${old_file}" |
315 |
- done |
316 |
- fi |
317 |
- |
318 |
- if [ -z "$REPLACING_VERSIONS" ]; then |
319 |
- elog |
320 |
- elog "dhcpcd has zeroconf support active by default." |
321 |
- elog "This means it will always obtain an IP address even if no" |
322 |
- elog "DHCP server can be contacted, which will break any existing" |
323 |
- elog "failover support you may have configured in your net configuration." |
324 |
- elog "This behaviour can be controlled with the noipv4ll configuration" |
325 |
- elog "file option or the -L command line switch." |
326 |
- elog "See the dhcpcd and dhcpcd.conf man pages for more details." |
327 |
- |
328 |
- elog |
329 |
- elog "Dhcpcd has duid enabled by default, and this may cause issues" |
330 |
- elog "with some dhcp servers. For more information, see" |
331 |
- elog "https://bugs.gentoo.org/show_bug.cgi?id=477356" |
332 |
- fi |
333 |
- |
334 |
- if ! has_version net-dns/bind-tools; then |
335 |
- elog |
336 |
- elog "If you activate the lookup-hostname hook to look up your hostname" |
337 |
- elog "using the dns, you need to install net-dns/bind-tools." |
338 |
- fi |
339 |
-} |
340 |
|
341 |
diff --git a/net-misc/dhcpcd/dhcpcd-7.2.0.ebuild b/net-misc/dhcpcd/dhcpcd-7.2.0.ebuild |
342 |
deleted file mode 100644 |
343 |
index 48ba26275d0..00000000000 |
344 |
--- a/net-misc/dhcpcd/dhcpcd-7.2.0.ebuild |
345 |
+++ /dev/null |
346 |
@@ -1,148 +0,0 @@ |
347 |
-# Copyright 1999-2019 Gentoo Authors |
348 |
-# Distributed under the terms of the GNU General Public License v2 |
349 |
- |
350 |
-EAPI=6 |
351 |
- |
352 |
-inherit systemd toolchain-funcs |
353 |
- |
354 |
-if [[ ${PV} == "9999" ]]; then |
355 |
- inherit git-r3 |
356 |
- EGIT_REPO_URI="https://roy.marples.name/git/dhcpcd.git" |
357 |
-else |
358 |
- MY_P="${P/_alpha/-alpha}" |
359 |
- MY_P="${MY_P/_beta/-beta}" |
360 |
- MY_P="${MY_P/_rc/-rc}" |
361 |
- SRC_URI="https://roy.marples.name/downloads/${PN}/${MY_P}.tar.xz" |
362 |
- KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux" |
363 |
- S="${WORKDIR}/${MY_P}" |
364 |
-fi |
365 |
- |
366 |
-DESCRIPTION="A fully featured, yet light weight RFC2131 compliant DHCP client" |
367 |
-HOMEPAGE="https://roy.marples.name/projects/dhcpcd" |
368 |
-LICENSE="BSD-2" |
369 |
-SLOT="0" |
370 |
-IUSE="elibc_glibc +embedded ipv6 kernel_linux +udev" |
371 |
- |
372 |
-COMMON_DEPEND="udev? ( virtual/udev )" |
373 |
-DEPEND="${COMMON_DEPEND}" |
374 |
-RDEPEND="${COMMON_DEPEND}" |
375 |
- |
376 |
-src_configure() { |
377 |
- local dev hooks=() rundir |
378 |
- use udev || dev="--without-dev --without-udev" |
379 |
- hooks=( --with-hook=ntp.conf ) |
380 |
- use elibc_glibc && hooks+=( --with-hook=yp.conf ) |
381 |
- use kernel_linux && rundir="--rundir=${EPREFIX}/run" |
382 |
- local myeconfargs=( |
383 |
- --prefix="${EPREFIX}" |
384 |
- --libexecdir="${EPREFIX}/lib/dhcpcd" |
385 |
- --dbdir="${EPREFIX}/var/lib/dhcpcd" |
386 |
- --localstatedir="${EPREFIX}/var" |
387 |
- ${rundir} |
388 |
- $(use_enable embedded) |
389 |
- $(use_enable ipv6) |
390 |
- ${dev} |
391 |
- CC="$(tc-getCC)" |
392 |
- ${hooks[@]} |
393 |
- ) |
394 |
- econf "${myeconfargs[@]}" |
395 |
-} |
396 |
- |
397 |
-src_install() { |
398 |
- default |
399 |
- keepdir /var/lib/dhcpcd |
400 |
- newinitd "${FILESDIR}"/${PN}.initd ${PN} |
401 |
- systemd_dounit "${FILESDIR}"/${PN}.service |
402 |
-} |
403 |
- |
404 |
-pkg_postinst() { |
405 |
- local dbdir="${EROOT%/}"/var/lib/dhcpcd old_files=() |
406 |
- |
407 |
- local old_old_duid="${EROOT%/}"/var/lib/dhcpcd/dhcpcd.duid |
408 |
- local old_duid="${EROOT%/}"/etc/dhcpcd.duid |
409 |
- local new_duid="${dbdir}"/duid |
410 |
- if [[ -e "${old_old_duid}" ]] ; then |
411 |
- # Upgrade the duid file to the new format if needed |
412 |
- if ! grep -q '..:..:..:..:..:..' "${old_old_duid}"; then |
413 |
- sed -i -e 's/\(..\)/\1:/g; s/:$//g' "${old_old_duid}" |
414 |
- fi |
415 |
- |
416 |
- # Move the duid to /etc, a more sensible location |
417 |
- if [[ ! -e "${old_duid}" ]] ; then |
418 |
- cp -p "${old_old_duid}" "${new_duid}" |
419 |
- fi |
420 |
- old_files+=( "${old_old_duid}" ) |
421 |
- fi |
422 |
- |
423 |
- # dhcpcd-7 moves the files out of /etc |
424 |
- if [[ -e "${old_duid}" ]] ; then |
425 |
- if [[ ! -e "${new_duid}" ]] ; then |
426 |
- cp -p "${old_duid}" "${new_duid}" |
427 |
- fi |
428 |
- old_files+=( "${old_duid}" ) |
429 |
- fi |
430 |
- local old_secret="${EROOT%/}"/etc/dhcpcd.secret |
431 |
- local new_secret="${dbdir}"/secret |
432 |
- if [[ -e "${old_secret}" ]] ; then |
433 |
- if [[ ! -e "${new_secret}" ]] ; then |
434 |
- cp -p "${old_secret}" "${new_secret}" |
435 |
- fi |
436 |
- old_files+=( "${old_secret}" ) |
437 |
- fi |
438 |
- |
439 |
- # dhcpcd-7 renames some files in /var/lib/dhcpcd |
440 |
- local old_rdm="${dbdir}"/dhcpcd-rdm.monotonic |
441 |
- local new_rdm="${dbdir}"/rdm_monotonic |
442 |
- if [[ -e "${old_rdm}" ]] ; then |
443 |
- if [[ ! -e "${new_rdm}" ]] ; then |
444 |
- cp -p "${old_rdm}" "${new_rdm}" |
445 |
- fi |
446 |
- old_files+=( "${old_rdm}" ) |
447 |
- fi |
448 |
- local lease= |
449 |
- for lease in "${dbdir}"/dhcpcd-*.lease*; do |
450 |
- [[ -f "${lease}" ]] || continue |
451 |
- old_files+=( "${lease}" ) |
452 |
- local new_lease=$(basename "${lease}" | sed -e "s/dhcpcd-//") |
453 |
- [[ -e "${dbdir}/${new_lease}" ]] && continue |
454 |
- cp "${lease}" "${dbdir}/${new_lease}" |
455 |
- done |
456 |
- |
457 |
- # Warn about removing stale files |
458 |
- if [[ -n "${old_files[@]}" ]] ; then |
459 |
- elog |
460 |
- elog "dhcpcd-7 has copied dhcpcd.duid and dhcpcd.secret from" |
461 |
- elog "${EROOT%/}/etc to ${dbdir}" |
462 |
- elog "and copied leases in ${dbdir} to new files with the dhcpcd-" |
463 |
- elog "prefix dropped." |
464 |
- elog |
465 |
- elog "You should remove these files if you don't plan on reverting" |
466 |
- elog "to an older version:" |
467 |
- local old_file= |
468 |
- for old_file in ${old_files[@]}; do |
469 |
- elog " ${old_file}" |
470 |
- done |
471 |
- fi |
472 |
- |
473 |
- if [ -z "${REPLACING_VERSIONS}" ]; then |
474 |
- elog |
475 |
- elog "dhcpcd has zeroconf support active by default." |
476 |
- elog "This means it will always obtain an IP address even if no" |
477 |
- elog "DHCP server can be contacted, which will break any existing" |
478 |
- elog "failover support you may have configured in your net configuration." |
479 |
- elog "This behaviour can be controlled with the noipv4ll configuration" |
480 |
- elog "file option or the -L command line switch." |
481 |
- elog "See the dhcpcd and dhcpcd.conf man pages for more details." |
482 |
- |
483 |
- elog |
484 |
- elog "Dhcpcd has duid enabled by default, and this may cause issues" |
485 |
- elog "with some dhcp servers. For more information, see" |
486 |
- elog "https://bugs.gentoo.org/show_bug.cgi?id=477356" |
487 |
- fi |
488 |
- |
489 |
- if ! has_version net-dns/bind-tools; then |
490 |
- elog |
491 |
- elog "If you activate the lookup-hostname hook to look up your hostname" |
492 |
- elog "using the dns, you need to install net-dns/bind-tools." |
493 |
- fi |
494 |
-} |