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