1 |
commit: 282bec3de0804ffb7a479c57d52f85678ab61169 |
2 |
Author: William Hubbs <williamh <AT> gentoo <DOT> org> |
3 |
AuthorDate: Tue Feb 6 17:47:38 2018 +0000 |
4 |
Commit: William Hubbs <williamh <AT> gentoo <DOT> org> |
5 |
CommitDate: Tue Feb 6 17:47:38 2018 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=282bec3d |
7 |
|
8 |
net-misc/dhcpcd: remove _rc and _beta releases |
9 |
|
10 |
Package-Manager: Portage-2.3.19, Repoman-2.3.6 |
11 |
|
12 |
net-misc/dhcpcd/Manifest | 5 - |
13 |
net-misc/dhcpcd/dhcpcd-7.0.0_beta3.ebuild | 148 ------------------------------ |
14 |
net-misc/dhcpcd/dhcpcd-7.0.0_rc1.ebuild | 148 ------------------------------ |
15 |
net-misc/dhcpcd/dhcpcd-7.0.0_rc2.ebuild | 148 ------------------------------ |
16 |
net-misc/dhcpcd/dhcpcd-7.0.0_rc3.ebuild | 148 ------------------------------ |
17 |
net-misc/dhcpcd/dhcpcd-7.0.0_rc4.ebuild | 148 ------------------------------ |
18 |
6 files changed, 745 deletions(-) |
19 |
|
20 |
diff --git a/net-misc/dhcpcd/Manifest b/net-misc/dhcpcd/Manifest |
21 |
index 801544a0235..ed33fe96142 100644 |
22 |
--- a/net-misc/dhcpcd/Manifest |
23 |
+++ b/net-misc/dhcpcd/Manifest |
24 |
@@ -2,10 +2,5 @@ DIST dhcpcd-6.10.1.tar.xz 180112 BLAKE2B aa339c1d60cf2752cdfd0e75f788e9af193cc40 |
25 |
DIST dhcpcd-6.11.1.tar.xz 190956 BLAKE2B 65f816e436b9a8370d459328997cadb82d1f70e3844cd6c7c52df52a58bf22d0b87b9480813f506b40ea85cef77c0f667ce97299819424e24cf186a41fdf69c9 SHA512 50ef755b13a96fe484623d9f2dbd91407fbea5ca728fd05dbf4259a61611a07cf3ffad7e8d20ecd513dbef80602074809abd1f5177daaa51ceccc2af5c88269f |
26 |
DIST dhcpcd-6.11.3.tar.xz 194892 BLAKE2B 08253879221f2cbccf69caf06ccbde960103fdf4de194f746572f4fa10497ab23dc1a41b6a849fe75f68a1d7a653e5358a7976581da0a92c8f19e2627b921440 SHA512 249185532cb239124f847c28e6bfb3e8a85e818e05a07eb0c6ac6843fbbab8afa8d6ebce4032b3537ccfb7fafb306dd0dc51c0e97f337f12f5071ba499686a70 |
27 |
DIST dhcpcd-6.11.5.tar.xz 198080 BLAKE2B 3172fcb1c09c3bb7fcf4896c6e9896744a8f4f6ae0292bfedb3a96ce435a774b42fdc1a1e9d288edc786c544c17c21fd7d3c8c6e6a6832acdad7e1f5edfa8c0b SHA512 a23d5dde66567c4addbc86c8b3fbf2c5d4dba3b463659729778a310306ab0e949be8998154ef15401ac2d289bde2f090d44492bba6a1becd2f01890d4efe7051 |
28 |
-DIST dhcpcd-7.0.0-beta3.tar.xz 203440 BLAKE2B 0b78ed09c487673d094c6f83de9497818fa50f57995348e6ecedd1537364b950b747270380e6d70e20905f9836b4fe2bfebc81c52e135f7110f6d376bf809447 SHA512 b71154fa2596826e23820df984992e8786a6b89588648db60e9340a383b67fdb555307e9a47b7c33097ed4191fdb911e443c6bf9fc76b0194770e66e2de64b95 |
29 |
-DIST dhcpcd-7.0.0-rc1.tar.xz 204496 BLAKE2B 59ecfbcd4a6713359d6bd46e451c8241cbb0069bf0ed736ae4c87898517efafe9bec0cfa5b491e6e6b4a9419e44f2488a2286a4496b568a2d3c3170ac6c2c91e SHA512 536ed4c09638a7a0fb16ad6a4a16fd74242ffbe2fe53e183c6756d2c62c94ce02869c95e828fbf3aa49aca06a129ab710195bf3d1dc9c9b52ac550ec51f68a1e |
30 |
-DIST dhcpcd-7.0.0-rc2.tar.xz 206108 BLAKE2B e30acadab1e8084b0800b67f4609fa5c7fe4d11d8baee19d23247f00156ba710f7f820fd9af507d8710982f1ef94472daf6b8070193ba67ad1911f8ee7d22faa SHA512 a3e596c605c8ffe9f87f7113522f460d24a639b54dcc31182c70c3d0589d34d8c1cc765d5dfcfc6fd026697846866f7aa5714ef0d0d9eb049404973ef21f8ec7 |
31 |
-DIST dhcpcd-7.0.0-rc3.tar.xz 207164 BLAKE2B 2e8cb676979606dba22c5f304650679e5325cc691d8a3c2dd62a1776373df4a7c21d5e85ee8106299b2f73def4bb2862bbe8d396b37dcab9c1dcff93634a0b78 SHA512 982c4c65ea45391e31170b592ce680c6cf5f4069b00decff3a299db23cede3e2521c66df7754a7a2379d5688f113553fe34e2fde825d6d9b83836a9e6d69fba9 |
32 |
-DIST dhcpcd-7.0.0-rc4.tar.xz 207596 BLAKE2B 2ce28e6f171b0bcc0b5c9e2ba0e5c92c70e7e97a516ce170d24c77a9d9981662acc914cefa5cad1bda14d7129088c313069ebe956d3e79098f70c3a31e53499f SHA512 e4bbb7d52021b84510d2a4e634b6fb979c126a6828de55053df0d3c6aae67a5c9be3da008bd7c8606be3d6aa28b00bafed3188473adcf2f3bc1bbfe9b1f4adc3 |
33 |
DIST dhcpcd-7.0.0.tar.xz 207924 BLAKE2B bd24f22b4852596ef4a076d1ab15ac4411dd676ba8cbfdb4b1ba29ffe1bff2d18be40369c1f8804bc01988bb30b89ee1030ea95ddb48fbfc04ca06372b317d9d SHA512 f2ab1fcb2dad0c93da757c15d0b772b40cc15c8e59161d91684f06961cf7b515473d7c3fc5973b7755ac525e6851abdf8a5f27760bb5d28fe17e90ff0feaf904 |
34 |
DIST dhcpcd-7.0.1.tar.xz 207908 BLAKE2B 1a9350a0c4a9eb1eb6f5a7be78beb4a5fecd802ee90a4649ab17db69eabc75a913b9f3db97ea6260bcad3516b9613c20f74d9d68a7ac98b508458e5cd30cf15f SHA512 d2a9b053aa663dd1ed38a10a73ee3377a3a076c9638bdda9331a4c161c2ba87f5f68f366ac8e1f1015404f617b74261a03a97ac7cdfd642b4a41b87b54984c34 |
35 |
|
36 |
diff --git a/net-misc/dhcpcd/dhcpcd-7.0.0_beta3.ebuild b/net-misc/dhcpcd/dhcpcd-7.0.0_beta3.ebuild |
37 |
deleted file mode 100644 |
38 |
index 2723156dac9..00000000000 |
39 |
--- a/net-misc/dhcpcd/dhcpcd-7.0.0_beta3.ebuild |
40 |
+++ /dev/null |
41 |
@@ -1,148 +0,0 @@ |
42 |
-# Copyright 1999-2018 Gentoo Foundation |
43 |
-# Distributed under the terms of the GNU General Public License v2 |
44 |
- |
45 |
-EAPI=6 |
46 |
- |
47 |
-if [[ ${PV} == "9999" ]]; then |
48 |
- EGIT_REPO_URI="git://roy.marples.name/dhcpcd" |
49 |
- inherit git-r3 |
50 |
-else |
51 |
- MY_P="${P/_alpha/-alpha}" |
52 |
- MY_P="${MY_P/_beta/-beta}" |
53 |
- MY_P="${MY_P/_rc/-rc}" |
54 |
- SRC_URI="http://roy.marples.name/downloads/${PN}/${MY_P}.tar.xz" |
55 |
- KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux" |
56 |
- S="${WORKDIR}/${MY_P}" |
57 |
-fi |
58 |
- |
59 |
-inherit eutils systemd toolchain-funcs |
60 |
- |
61 |
-DESCRIPTION="A fully featured, yet light weight RFC2131 compliant DHCP client" |
62 |
-HOMEPAGE="http://roy.marples.name/projects/dhcpcd/" |
63 |
-LICENSE="BSD-2" |
64 |
-SLOT="0" |
65 |
-IUSE="elibc_glibc +embedded ipv6 kernel_linux +udev" |
66 |
- |
67 |
-COMMON_DEPEND="udev? ( virtual/udev )" |
68 |
-DEPEND="${COMMON_DEPEND}" |
69 |
-RDEPEND="${COMMON_DEPEND}" |
70 |
- |
71 |
-src_configure() |
72 |
-{ |
73 |
- local dev hooks rundir |
74 |
- use udev || dev="--without-dev --without-udev" |
75 |
- hooks="--with-hook=ntp.conf" |
76 |
- use elibc_glibc && hooks="${hooks} --with-hook=yp.conf" |
77 |
- use kernel_linux && rundir="--rundir=${EPREFIX}/run" |
78 |
- econf \ |
79 |
- --prefix="${EPREFIX}" \ |
80 |
- --libexecdir="${EPREFIX}/lib/dhcpcd" \ |
81 |
- --dbdir="${EPREFIX}/var/lib/dhcpcd" \ |
82 |
- --localstatedir="${EPREFIX}/var" \ |
83 |
- ${rundir} \ |
84 |
- $(use_enable embedded) \ |
85 |
- $(use_enable ipv6) \ |
86 |
- ${dev} \ |
87 |
- CC="$(tc-getCC)" \ |
88 |
- ${hooks} |
89 |
-} |
90 |
- |
91 |
-src_install() |
92 |
-{ |
93 |
- default |
94 |
- newinitd "${FILESDIR}"/${PN}.initd ${PN} |
95 |
- systemd_dounit "${FILESDIR}"/${PN}.service |
96 |
-} |
97 |
- |
98 |
-pkg_postinst() |
99 |
-{ |
100 |
- local dbdir="${EROOT%/}"/var/lib/dhcpcd old_files= |
101 |
- |
102 |
- local old_old_duid="${EROOT%/}"/var/lib/dhcpcd/dhcpcd.duid |
103 |
- local old_duid="${EROOT%/}"/etc/dhcpcd.duid |
104 |
- local new_duid="${dbdir}"/duid |
105 |
- if [ -e "${old_old_duid}" ]; then |
106 |
- # Upgrade the duid file to the new format if needed |
107 |
- if ! grep -q '..:..:..:..:..:..' "${old_old_duid}"; then |
108 |
- sed -i -e 's/\(..\)/\1:/g; s/:$//g' "${old_old_duid}" |
109 |
- fi |
110 |
- |
111 |
- # Move the duid to /etc, a more sensible location |
112 |
- if [ ! -e "${old_duid}" ]; then |
113 |
- cp -p "${old_old_duid}" "${new_duid}" |
114 |
- fi |
115 |
- old_files="${old_files} ${old_old_duid}" |
116 |
- fi |
117 |
- |
118 |
- # dhcpcd-7 moves the files out of /etc |
119 |
- if [ -e "${old_duid}" ]; then |
120 |
- if [ ! -e "${new_duid}" ]; then |
121 |
- cp -p "${old_duid}" "${new_duid}" |
122 |
- fi |
123 |
- old_files="${old_files} ${old_duid}" |
124 |
- fi |
125 |
- local old_secret="${EROOT%/}"/etc/dhcpcd.secret |
126 |
- local new_secret="${dbdir}"/secret |
127 |
- if [ -e "${old_secret}" ]; then |
128 |
- if [ ! -e "${new_secret}" ]; then |
129 |
- cp -p "${old_secret}" "${new_secret}" |
130 |
- fi |
131 |
- old_files="${old_files} ${old_secret}" |
132 |
- fi |
133 |
- |
134 |
- # dhcpcd-7 renames some files in /var/lib/dhcpcd |
135 |
- local old_rdm="${dbdir}"/dhcpcd-rdm.monotonic |
136 |
- local new_rdm="${dbdir}"/rdm_monotonic |
137 |
- if [ -e "${old_rdm}" ]; then |
138 |
- if [ ! -e "${new_rdm}" ]; then |
139 |
- cp -p "${old_rdm}" "${new_rdm}" |
140 |
- fi |
141 |
- old_files="${old_files} ${old_rdm}" |
142 |
- fi |
143 |
- local lease= |
144 |
- for lease in "${dbdir}"/dhcpcd-*.lease*; do |
145 |
- [ -f "$lease" ] || continue |
146 |
- old_files="${old_files} ${lease}" |
147 |
- local new_lease=$(basename "$lease" | sed -e "s/dhcpcd-//") |
148 |
- [ -e "${dbdir}/${new_lease}" ] && continue |
149 |
- cp "${lease}" "${dbdir}/${new_lease}" |
150 |
- done |
151 |
- |
152 |
- # Warn about removing stale files |
153 |
- if [ -n "${old_files}" ]; then |
154 |
- elog |
155 |
- elog "dhcpcd-7 has copied dhcpcd.duid and dhcpcd.secret from" |
156 |
- elog "${EROOT%/}/etc to ${dbdir}" |
157 |
- elog "and copied leases in ${dbdir} to new files with the dhcpcd-" |
158 |
- elog "prefix dropped." |
159 |
- elog |
160 |
- elog "You should remove these files if you don't plan on reverting" |
161 |
- elog "to an older version:" |
162 |
- local old_file= |
163 |
- for old_file in ${old_files}; do |
164 |
- elog " ${old_file}" |
165 |
- done |
166 |
- fi |
167 |
- |
168 |
- if [ -z "$REPLACING_VERSIONS" ]; then |
169 |
- elog |
170 |
- elog "dhcpcd has zeroconf support active by default." |
171 |
- elog "This means it will always obtain an IP address even if no" |
172 |
- elog "DHCP server can be contacted, which will break any existing" |
173 |
- elog "failover support you may have configured in your net configuration." |
174 |
- elog "This behaviour can be controlled with the noipv4ll configuration" |
175 |
- elog "file option or the -L command line switch." |
176 |
- elog "See the dhcpcd and dhcpcd.conf man pages for more details." |
177 |
- |
178 |
- elog |
179 |
- elog "Dhcpcd has duid enabled by default, and this may cause issues" |
180 |
- elog "with some dhcp servers. For more information, see" |
181 |
- elog "https://bugs.gentoo.org/show_bug.cgi?id=477356" |
182 |
- fi |
183 |
- |
184 |
- if ! has_version net-dns/bind-tools; then |
185 |
- elog |
186 |
- elog "If you activate the lookup-hostname hook to look up your hostname" |
187 |
- elog "using the dns, you need to install net-dns/bind-tools." |
188 |
- fi |
189 |
-} |
190 |
|
191 |
diff --git a/net-misc/dhcpcd/dhcpcd-7.0.0_rc1.ebuild b/net-misc/dhcpcd/dhcpcd-7.0.0_rc1.ebuild |
192 |
deleted file mode 100644 |
193 |
index 2723156dac9..00000000000 |
194 |
--- a/net-misc/dhcpcd/dhcpcd-7.0.0_rc1.ebuild |
195 |
+++ /dev/null |
196 |
@@ -1,148 +0,0 @@ |
197 |
-# Copyright 1999-2018 Gentoo Foundation |
198 |
-# Distributed under the terms of the GNU General Public License v2 |
199 |
- |
200 |
-EAPI=6 |
201 |
- |
202 |
-if [[ ${PV} == "9999" ]]; then |
203 |
- EGIT_REPO_URI="git://roy.marples.name/dhcpcd" |
204 |
- inherit git-r3 |
205 |
-else |
206 |
- MY_P="${P/_alpha/-alpha}" |
207 |
- MY_P="${MY_P/_beta/-beta}" |
208 |
- MY_P="${MY_P/_rc/-rc}" |
209 |
- SRC_URI="http://roy.marples.name/downloads/${PN}/${MY_P}.tar.xz" |
210 |
- KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux" |
211 |
- S="${WORKDIR}/${MY_P}" |
212 |
-fi |
213 |
- |
214 |
-inherit eutils systemd toolchain-funcs |
215 |
- |
216 |
-DESCRIPTION="A fully featured, yet light weight RFC2131 compliant DHCP client" |
217 |
-HOMEPAGE="http://roy.marples.name/projects/dhcpcd/" |
218 |
-LICENSE="BSD-2" |
219 |
-SLOT="0" |
220 |
-IUSE="elibc_glibc +embedded ipv6 kernel_linux +udev" |
221 |
- |
222 |
-COMMON_DEPEND="udev? ( virtual/udev )" |
223 |
-DEPEND="${COMMON_DEPEND}" |
224 |
-RDEPEND="${COMMON_DEPEND}" |
225 |
- |
226 |
-src_configure() |
227 |
-{ |
228 |
- local dev hooks rundir |
229 |
- use udev || dev="--without-dev --without-udev" |
230 |
- hooks="--with-hook=ntp.conf" |
231 |
- use elibc_glibc && hooks="${hooks} --with-hook=yp.conf" |
232 |
- use kernel_linux && rundir="--rundir=${EPREFIX}/run" |
233 |
- econf \ |
234 |
- --prefix="${EPREFIX}" \ |
235 |
- --libexecdir="${EPREFIX}/lib/dhcpcd" \ |
236 |
- --dbdir="${EPREFIX}/var/lib/dhcpcd" \ |
237 |
- --localstatedir="${EPREFIX}/var" \ |
238 |
- ${rundir} \ |
239 |
- $(use_enable embedded) \ |
240 |
- $(use_enable ipv6) \ |
241 |
- ${dev} \ |
242 |
- CC="$(tc-getCC)" \ |
243 |
- ${hooks} |
244 |
-} |
245 |
- |
246 |
-src_install() |
247 |
-{ |
248 |
- default |
249 |
- newinitd "${FILESDIR}"/${PN}.initd ${PN} |
250 |
- systemd_dounit "${FILESDIR}"/${PN}.service |
251 |
-} |
252 |
- |
253 |
-pkg_postinst() |
254 |
-{ |
255 |
- local dbdir="${EROOT%/}"/var/lib/dhcpcd old_files= |
256 |
- |
257 |
- local old_old_duid="${EROOT%/}"/var/lib/dhcpcd/dhcpcd.duid |
258 |
- local old_duid="${EROOT%/}"/etc/dhcpcd.duid |
259 |
- local new_duid="${dbdir}"/duid |
260 |
- if [ -e "${old_old_duid}" ]; then |
261 |
- # Upgrade the duid file to the new format if needed |
262 |
- if ! grep -q '..:..:..:..:..:..' "${old_old_duid}"; then |
263 |
- sed -i -e 's/\(..\)/\1:/g; s/:$//g' "${old_old_duid}" |
264 |
- fi |
265 |
- |
266 |
- # Move the duid to /etc, a more sensible location |
267 |
- if [ ! -e "${old_duid}" ]; then |
268 |
- cp -p "${old_old_duid}" "${new_duid}" |
269 |
- fi |
270 |
- old_files="${old_files} ${old_old_duid}" |
271 |
- fi |
272 |
- |
273 |
- # dhcpcd-7 moves the files out of /etc |
274 |
- if [ -e "${old_duid}" ]; then |
275 |
- if [ ! -e "${new_duid}" ]; then |
276 |
- cp -p "${old_duid}" "${new_duid}" |
277 |
- fi |
278 |
- old_files="${old_files} ${old_duid}" |
279 |
- fi |
280 |
- local old_secret="${EROOT%/}"/etc/dhcpcd.secret |
281 |
- local new_secret="${dbdir}"/secret |
282 |
- if [ -e "${old_secret}" ]; then |
283 |
- if [ ! -e "${new_secret}" ]; then |
284 |
- cp -p "${old_secret}" "${new_secret}" |
285 |
- fi |
286 |
- old_files="${old_files} ${old_secret}" |
287 |
- fi |
288 |
- |
289 |
- # dhcpcd-7 renames some files in /var/lib/dhcpcd |
290 |
- local old_rdm="${dbdir}"/dhcpcd-rdm.monotonic |
291 |
- local new_rdm="${dbdir}"/rdm_monotonic |
292 |
- if [ -e "${old_rdm}" ]; then |
293 |
- if [ ! -e "${new_rdm}" ]; then |
294 |
- cp -p "${old_rdm}" "${new_rdm}" |
295 |
- fi |
296 |
- old_files="${old_files} ${old_rdm}" |
297 |
- fi |
298 |
- local lease= |
299 |
- for lease in "${dbdir}"/dhcpcd-*.lease*; do |
300 |
- [ -f "$lease" ] || continue |
301 |
- old_files="${old_files} ${lease}" |
302 |
- local new_lease=$(basename "$lease" | sed -e "s/dhcpcd-//") |
303 |
- [ -e "${dbdir}/${new_lease}" ] && continue |
304 |
- cp "${lease}" "${dbdir}/${new_lease}" |
305 |
- done |
306 |
- |
307 |
- # Warn about removing stale files |
308 |
- if [ -n "${old_files}" ]; then |
309 |
- elog |
310 |
- elog "dhcpcd-7 has copied dhcpcd.duid and dhcpcd.secret from" |
311 |
- elog "${EROOT%/}/etc to ${dbdir}" |
312 |
- elog "and copied leases in ${dbdir} to new files with the dhcpcd-" |
313 |
- elog "prefix dropped." |
314 |
- elog |
315 |
- elog "You should remove these files if you don't plan on reverting" |
316 |
- elog "to an older version:" |
317 |
- local old_file= |
318 |
- for old_file in ${old_files}; do |
319 |
- elog " ${old_file}" |
320 |
- done |
321 |
- fi |
322 |
- |
323 |
- if [ -z "$REPLACING_VERSIONS" ]; then |
324 |
- elog |
325 |
- elog "dhcpcd has zeroconf support active by default." |
326 |
- elog "This means it will always obtain an IP address even if no" |
327 |
- elog "DHCP server can be contacted, which will break any existing" |
328 |
- elog "failover support you may have configured in your net configuration." |
329 |
- elog "This behaviour can be controlled with the noipv4ll configuration" |
330 |
- elog "file option or the -L command line switch." |
331 |
- elog "See the dhcpcd and dhcpcd.conf man pages for more details." |
332 |
- |
333 |
- elog |
334 |
- elog "Dhcpcd has duid enabled by default, and this may cause issues" |
335 |
- elog "with some dhcp servers. For more information, see" |
336 |
- elog "https://bugs.gentoo.org/show_bug.cgi?id=477356" |
337 |
- fi |
338 |
- |
339 |
- if ! has_version net-dns/bind-tools; then |
340 |
- elog |
341 |
- elog "If you activate the lookup-hostname hook to look up your hostname" |
342 |
- elog "using the dns, you need to install net-dns/bind-tools." |
343 |
- fi |
344 |
-} |
345 |
|
346 |
diff --git a/net-misc/dhcpcd/dhcpcd-7.0.0_rc2.ebuild b/net-misc/dhcpcd/dhcpcd-7.0.0_rc2.ebuild |
347 |
deleted file mode 100644 |
348 |
index 2723156dac9..00000000000 |
349 |
--- a/net-misc/dhcpcd/dhcpcd-7.0.0_rc2.ebuild |
350 |
+++ /dev/null |
351 |
@@ -1,148 +0,0 @@ |
352 |
-# Copyright 1999-2018 Gentoo Foundation |
353 |
-# Distributed under the terms of the GNU General Public License v2 |
354 |
- |
355 |
-EAPI=6 |
356 |
- |
357 |
-if [[ ${PV} == "9999" ]]; then |
358 |
- EGIT_REPO_URI="git://roy.marples.name/dhcpcd" |
359 |
- inherit git-r3 |
360 |
-else |
361 |
- MY_P="${P/_alpha/-alpha}" |
362 |
- MY_P="${MY_P/_beta/-beta}" |
363 |
- MY_P="${MY_P/_rc/-rc}" |
364 |
- SRC_URI="http://roy.marples.name/downloads/${PN}/${MY_P}.tar.xz" |
365 |
- KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux" |
366 |
- S="${WORKDIR}/${MY_P}" |
367 |
-fi |
368 |
- |
369 |
-inherit eutils systemd toolchain-funcs |
370 |
- |
371 |
-DESCRIPTION="A fully featured, yet light weight RFC2131 compliant DHCP client" |
372 |
-HOMEPAGE="http://roy.marples.name/projects/dhcpcd/" |
373 |
-LICENSE="BSD-2" |
374 |
-SLOT="0" |
375 |
-IUSE="elibc_glibc +embedded ipv6 kernel_linux +udev" |
376 |
- |
377 |
-COMMON_DEPEND="udev? ( virtual/udev )" |
378 |
-DEPEND="${COMMON_DEPEND}" |
379 |
-RDEPEND="${COMMON_DEPEND}" |
380 |
- |
381 |
-src_configure() |
382 |
-{ |
383 |
- local dev hooks rundir |
384 |
- use udev || dev="--without-dev --without-udev" |
385 |
- hooks="--with-hook=ntp.conf" |
386 |
- use elibc_glibc && hooks="${hooks} --with-hook=yp.conf" |
387 |
- use kernel_linux && rundir="--rundir=${EPREFIX}/run" |
388 |
- econf \ |
389 |
- --prefix="${EPREFIX}" \ |
390 |
- --libexecdir="${EPREFIX}/lib/dhcpcd" \ |
391 |
- --dbdir="${EPREFIX}/var/lib/dhcpcd" \ |
392 |
- --localstatedir="${EPREFIX}/var" \ |
393 |
- ${rundir} \ |
394 |
- $(use_enable embedded) \ |
395 |
- $(use_enable ipv6) \ |
396 |
- ${dev} \ |
397 |
- CC="$(tc-getCC)" \ |
398 |
- ${hooks} |
399 |
-} |
400 |
- |
401 |
-src_install() |
402 |
-{ |
403 |
- default |
404 |
- newinitd "${FILESDIR}"/${PN}.initd ${PN} |
405 |
- systemd_dounit "${FILESDIR}"/${PN}.service |
406 |
-} |
407 |
- |
408 |
-pkg_postinst() |
409 |
-{ |
410 |
- local dbdir="${EROOT%/}"/var/lib/dhcpcd old_files= |
411 |
- |
412 |
- local old_old_duid="${EROOT%/}"/var/lib/dhcpcd/dhcpcd.duid |
413 |
- local old_duid="${EROOT%/}"/etc/dhcpcd.duid |
414 |
- local new_duid="${dbdir}"/duid |
415 |
- if [ -e "${old_old_duid}" ]; then |
416 |
- # Upgrade the duid file to the new format if needed |
417 |
- if ! grep -q '..:..:..:..:..:..' "${old_old_duid}"; then |
418 |
- sed -i -e 's/\(..\)/\1:/g; s/:$//g' "${old_old_duid}" |
419 |
- fi |
420 |
- |
421 |
- # Move the duid to /etc, a more sensible location |
422 |
- if [ ! -e "${old_duid}" ]; then |
423 |
- cp -p "${old_old_duid}" "${new_duid}" |
424 |
- fi |
425 |
- old_files="${old_files} ${old_old_duid}" |
426 |
- fi |
427 |
- |
428 |
- # dhcpcd-7 moves the files out of /etc |
429 |
- if [ -e "${old_duid}" ]; then |
430 |
- if [ ! -e "${new_duid}" ]; then |
431 |
- cp -p "${old_duid}" "${new_duid}" |
432 |
- fi |
433 |
- old_files="${old_files} ${old_duid}" |
434 |
- fi |
435 |
- local old_secret="${EROOT%/}"/etc/dhcpcd.secret |
436 |
- local new_secret="${dbdir}"/secret |
437 |
- if [ -e "${old_secret}" ]; then |
438 |
- if [ ! -e "${new_secret}" ]; then |
439 |
- cp -p "${old_secret}" "${new_secret}" |
440 |
- fi |
441 |
- old_files="${old_files} ${old_secret}" |
442 |
- fi |
443 |
- |
444 |
- # dhcpcd-7 renames some files in /var/lib/dhcpcd |
445 |
- local old_rdm="${dbdir}"/dhcpcd-rdm.monotonic |
446 |
- local new_rdm="${dbdir}"/rdm_monotonic |
447 |
- if [ -e "${old_rdm}" ]; then |
448 |
- if [ ! -e "${new_rdm}" ]; then |
449 |
- cp -p "${old_rdm}" "${new_rdm}" |
450 |
- fi |
451 |
- old_files="${old_files} ${old_rdm}" |
452 |
- fi |
453 |
- local lease= |
454 |
- for lease in "${dbdir}"/dhcpcd-*.lease*; do |
455 |
- [ -f "$lease" ] || continue |
456 |
- old_files="${old_files} ${lease}" |
457 |
- local new_lease=$(basename "$lease" | sed -e "s/dhcpcd-//") |
458 |
- [ -e "${dbdir}/${new_lease}" ] && continue |
459 |
- cp "${lease}" "${dbdir}/${new_lease}" |
460 |
- done |
461 |
- |
462 |
- # Warn about removing stale files |
463 |
- if [ -n "${old_files}" ]; then |
464 |
- elog |
465 |
- elog "dhcpcd-7 has copied dhcpcd.duid and dhcpcd.secret from" |
466 |
- elog "${EROOT%/}/etc to ${dbdir}" |
467 |
- elog "and copied leases in ${dbdir} to new files with the dhcpcd-" |
468 |
- elog "prefix dropped." |
469 |
- elog |
470 |
- elog "You should remove these files if you don't plan on reverting" |
471 |
- elog "to an older version:" |
472 |
- local old_file= |
473 |
- for old_file in ${old_files}; do |
474 |
- elog " ${old_file}" |
475 |
- done |
476 |
- fi |
477 |
- |
478 |
- if [ -z "$REPLACING_VERSIONS" ]; then |
479 |
- elog |
480 |
- elog "dhcpcd has zeroconf support active by default." |
481 |
- elog "This means it will always obtain an IP address even if no" |
482 |
- elog "DHCP server can be contacted, which will break any existing" |
483 |
- elog "failover support you may have configured in your net configuration." |
484 |
- elog "This behaviour can be controlled with the noipv4ll configuration" |
485 |
- elog "file option or the -L command line switch." |
486 |
- elog "See the dhcpcd and dhcpcd.conf man pages for more details." |
487 |
- |
488 |
- elog |
489 |
- elog "Dhcpcd has duid enabled by default, and this may cause issues" |
490 |
- elog "with some dhcp servers. For more information, see" |
491 |
- elog "https://bugs.gentoo.org/show_bug.cgi?id=477356" |
492 |
- fi |
493 |
- |
494 |
- if ! has_version net-dns/bind-tools; then |
495 |
- elog |
496 |
- elog "If you activate the lookup-hostname hook to look up your hostname" |
497 |
- elog "using the dns, you need to install net-dns/bind-tools." |
498 |
- fi |
499 |
-} |
500 |
|
501 |
diff --git a/net-misc/dhcpcd/dhcpcd-7.0.0_rc3.ebuild b/net-misc/dhcpcd/dhcpcd-7.0.0_rc3.ebuild |
502 |
deleted file mode 100644 |
503 |
index 2723156dac9..00000000000 |
504 |
--- a/net-misc/dhcpcd/dhcpcd-7.0.0_rc3.ebuild |
505 |
+++ /dev/null |
506 |
@@ -1,148 +0,0 @@ |
507 |
-# Copyright 1999-2018 Gentoo Foundation |
508 |
-# Distributed under the terms of the GNU General Public License v2 |
509 |
- |
510 |
-EAPI=6 |
511 |
- |
512 |
-if [[ ${PV} == "9999" ]]; then |
513 |
- EGIT_REPO_URI="git://roy.marples.name/dhcpcd" |
514 |
- inherit git-r3 |
515 |
-else |
516 |
- MY_P="${P/_alpha/-alpha}" |
517 |
- MY_P="${MY_P/_beta/-beta}" |
518 |
- MY_P="${MY_P/_rc/-rc}" |
519 |
- SRC_URI="http://roy.marples.name/downloads/${PN}/${MY_P}.tar.xz" |
520 |
- KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux" |
521 |
- S="${WORKDIR}/${MY_P}" |
522 |
-fi |
523 |
- |
524 |
-inherit eutils systemd toolchain-funcs |
525 |
- |
526 |
-DESCRIPTION="A fully featured, yet light weight RFC2131 compliant DHCP client" |
527 |
-HOMEPAGE="http://roy.marples.name/projects/dhcpcd/" |
528 |
-LICENSE="BSD-2" |
529 |
-SLOT="0" |
530 |
-IUSE="elibc_glibc +embedded ipv6 kernel_linux +udev" |
531 |
- |
532 |
-COMMON_DEPEND="udev? ( virtual/udev )" |
533 |
-DEPEND="${COMMON_DEPEND}" |
534 |
-RDEPEND="${COMMON_DEPEND}" |
535 |
- |
536 |
-src_configure() |
537 |
-{ |
538 |
- local dev hooks rundir |
539 |
- use udev || dev="--without-dev --without-udev" |
540 |
- hooks="--with-hook=ntp.conf" |
541 |
- use elibc_glibc && hooks="${hooks} --with-hook=yp.conf" |
542 |
- use kernel_linux && rundir="--rundir=${EPREFIX}/run" |
543 |
- econf \ |
544 |
- --prefix="${EPREFIX}" \ |
545 |
- --libexecdir="${EPREFIX}/lib/dhcpcd" \ |
546 |
- --dbdir="${EPREFIX}/var/lib/dhcpcd" \ |
547 |
- --localstatedir="${EPREFIX}/var" \ |
548 |
- ${rundir} \ |
549 |
- $(use_enable embedded) \ |
550 |
- $(use_enable ipv6) \ |
551 |
- ${dev} \ |
552 |
- CC="$(tc-getCC)" \ |
553 |
- ${hooks} |
554 |
-} |
555 |
- |
556 |
-src_install() |
557 |
-{ |
558 |
- default |
559 |
- newinitd "${FILESDIR}"/${PN}.initd ${PN} |
560 |
- systemd_dounit "${FILESDIR}"/${PN}.service |
561 |
-} |
562 |
- |
563 |
-pkg_postinst() |
564 |
-{ |
565 |
- local dbdir="${EROOT%/}"/var/lib/dhcpcd old_files= |
566 |
- |
567 |
- local old_old_duid="${EROOT%/}"/var/lib/dhcpcd/dhcpcd.duid |
568 |
- local old_duid="${EROOT%/}"/etc/dhcpcd.duid |
569 |
- local new_duid="${dbdir}"/duid |
570 |
- if [ -e "${old_old_duid}" ]; then |
571 |
- # Upgrade the duid file to the new format if needed |
572 |
- if ! grep -q '..:..:..:..:..:..' "${old_old_duid}"; then |
573 |
- sed -i -e 's/\(..\)/\1:/g; s/:$//g' "${old_old_duid}" |
574 |
- fi |
575 |
- |
576 |
- # Move the duid to /etc, a more sensible location |
577 |
- if [ ! -e "${old_duid}" ]; then |
578 |
- cp -p "${old_old_duid}" "${new_duid}" |
579 |
- fi |
580 |
- old_files="${old_files} ${old_old_duid}" |
581 |
- fi |
582 |
- |
583 |
- # dhcpcd-7 moves the files out of /etc |
584 |
- if [ -e "${old_duid}" ]; then |
585 |
- if [ ! -e "${new_duid}" ]; then |
586 |
- cp -p "${old_duid}" "${new_duid}" |
587 |
- fi |
588 |
- old_files="${old_files} ${old_duid}" |
589 |
- fi |
590 |
- local old_secret="${EROOT%/}"/etc/dhcpcd.secret |
591 |
- local new_secret="${dbdir}"/secret |
592 |
- if [ -e "${old_secret}" ]; then |
593 |
- if [ ! -e "${new_secret}" ]; then |
594 |
- cp -p "${old_secret}" "${new_secret}" |
595 |
- fi |
596 |
- old_files="${old_files} ${old_secret}" |
597 |
- fi |
598 |
- |
599 |
- # dhcpcd-7 renames some files in /var/lib/dhcpcd |
600 |
- local old_rdm="${dbdir}"/dhcpcd-rdm.monotonic |
601 |
- local new_rdm="${dbdir}"/rdm_monotonic |
602 |
- if [ -e "${old_rdm}" ]; then |
603 |
- if [ ! -e "${new_rdm}" ]; then |
604 |
- cp -p "${old_rdm}" "${new_rdm}" |
605 |
- fi |
606 |
- old_files="${old_files} ${old_rdm}" |
607 |
- fi |
608 |
- local lease= |
609 |
- for lease in "${dbdir}"/dhcpcd-*.lease*; do |
610 |
- [ -f "$lease" ] || continue |
611 |
- old_files="${old_files} ${lease}" |
612 |
- local new_lease=$(basename "$lease" | sed -e "s/dhcpcd-//") |
613 |
- [ -e "${dbdir}/${new_lease}" ] && continue |
614 |
- cp "${lease}" "${dbdir}/${new_lease}" |
615 |
- done |
616 |
- |
617 |
- # Warn about removing stale files |
618 |
- if [ -n "${old_files}" ]; then |
619 |
- elog |
620 |
- elog "dhcpcd-7 has copied dhcpcd.duid and dhcpcd.secret from" |
621 |
- elog "${EROOT%/}/etc to ${dbdir}" |
622 |
- elog "and copied leases in ${dbdir} to new files with the dhcpcd-" |
623 |
- elog "prefix dropped." |
624 |
- elog |
625 |
- elog "You should remove these files if you don't plan on reverting" |
626 |
- elog "to an older version:" |
627 |
- local old_file= |
628 |
- for old_file in ${old_files}; do |
629 |
- elog " ${old_file}" |
630 |
- done |
631 |
- fi |
632 |
- |
633 |
- if [ -z "$REPLACING_VERSIONS" ]; then |
634 |
- elog |
635 |
- elog "dhcpcd has zeroconf support active by default." |
636 |
- elog "This means it will always obtain an IP address even if no" |
637 |
- elog "DHCP server can be contacted, which will break any existing" |
638 |
- elog "failover support you may have configured in your net configuration." |
639 |
- elog "This behaviour can be controlled with the noipv4ll configuration" |
640 |
- elog "file option or the -L command line switch." |
641 |
- elog "See the dhcpcd and dhcpcd.conf man pages for more details." |
642 |
- |
643 |
- elog |
644 |
- elog "Dhcpcd has duid enabled by default, and this may cause issues" |
645 |
- elog "with some dhcp servers. For more information, see" |
646 |
- elog "https://bugs.gentoo.org/show_bug.cgi?id=477356" |
647 |
- fi |
648 |
- |
649 |
- if ! has_version net-dns/bind-tools; then |
650 |
- elog |
651 |
- elog "If you activate the lookup-hostname hook to look up your hostname" |
652 |
- elog "using the dns, you need to install net-dns/bind-tools." |
653 |
- fi |
654 |
-} |
655 |
|
656 |
diff --git a/net-misc/dhcpcd/dhcpcd-7.0.0_rc4.ebuild b/net-misc/dhcpcd/dhcpcd-7.0.0_rc4.ebuild |
657 |
deleted file mode 100644 |
658 |
index 2723156dac9..00000000000 |
659 |
--- a/net-misc/dhcpcd/dhcpcd-7.0.0_rc4.ebuild |
660 |
+++ /dev/null |
661 |
@@ -1,148 +0,0 @@ |
662 |
-# Copyright 1999-2018 Gentoo Foundation |
663 |
-# Distributed under the terms of the GNU General Public License v2 |
664 |
- |
665 |
-EAPI=6 |
666 |
- |
667 |
-if [[ ${PV} == "9999" ]]; then |
668 |
- EGIT_REPO_URI="git://roy.marples.name/dhcpcd" |
669 |
- inherit git-r3 |
670 |
-else |
671 |
- MY_P="${P/_alpha/-alpha}" |
672 |
- MY_P="${MY_P/_beta/-beta}" |
673 |
- MY_P="${MY_P/_rc/-rc}" |
674 |
- SRC_URI="http://roy.marples.name/downloads/${PN}/${MY_P}.tar.xz" |
675 |
- KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux" |
676 |
- S="${WORKDIR}/${MY_P}" |
677 |
-fi |
678 |
- |
679 |
-inherit eutils systemd toolchain-funcs |
680 |
- |
681 |
-DESCRIPTION="A fully featured, yet light weight RFC2131 compliant DHCP client" |
682 |
-HOMEPAGE="http://roy.marples.name/projects/dhcpcd/" |
683 |
-LICENSE="BSD-2" |
684 |
-SLOT="0" |
685 |
-IUSE="elibc_glibc +embedded ipv6 kernel_linux +udev" |
686 |
- |
687 |
-COMMON_DEPEND="udev? ( virtual/udev )" |
688 |
-DEPEND="${COMMON_DEPEND}" |
689 |
-RDEPEND="${COMMON_DEPEND}" |
690 |
- |
691 |
-src_configure() |
692 |
-{ |
693 |
- local dev hooks rundir |
694 |
- use udev || dev="--without-dev --without-udev" |
695 |
- hooks="--with-hook=ntp.conf" |
696 |
- use elibc_glibc && hooks="${hooks} --with-hook=yp.conf" |
697 |
- use kernel_linux && rundir="--rundir=${EPREFIX}/run" |
698 |
- econf \ |
699 |
- --prefix="${EPREFIX}" \ |
700 |
- --libexecdir="${EPREFIX}/lib/dhcpcd" \ |
701 |
- --dbdir="${EPREFIX}/var/lib/dhcpcd" \ |
702 |
- --localstatedir="${EPREFIX}/var" \ |
703 |
- ${rundir} \ |
704 |
- $(use_enable embedded) \ |
705 |
- $(use_enable ipv6) \ |
706 |
- ${dev} \ |
707 |
- CC="$(tc-getCC)" \ |
708 |
- ${hooks} |
709 |
-} |
710 |
- |
711 |
-src_install() |
712 |
-{ |
713 |
- default |
714 |
- newinitd "${FILESDIR}"/${PN}.initd ${PN} |
715 |
- systemd_dounit "${FILESDIR}"/${PN}.service |
716 |
-} |
717 |
- |
718 |
-pkg_postinst() |
719 |
-{ |
720 |
- local dbdir="${EROOT%/}"/var/lib/dhcpcd old_files= |
721 |
- |
722 |
- local old_old_duid="${EROOT%/}"/var/lib/dhcpcd/dhcpcd.duid |
723 |
- local old_duid="${EROOT%/}"/etc/dhcpcd.duid |
724 |
- local new_duid="${dbdir}"/duid |
725 |
- if [ -e "${old_old_duid}" ]; then |
726 |
- # Upgrade the duid file to the new format if needed |
727 |
- if ! grep -q '..:..:..:..:..:..' "${old_old_duid}"; then |
728 |
- sed -i -e 's/\(..\)/\1:/g; s/:$//g' "${old_old_duid}" |
729 |
- fi |
730 |
- |
731 |
- # Move the duid to /etc, a more sensible location |
732 |
- if [ ! -e "${old_duid}" ]; then |
733 |
- cp -p "${old_old_duid}" "${new_duid}" |
734 |
- fi |
735 |
- old_files="${old_files} ${old_old_duid}" |
736 |
- fi |
737 |
- |
738 |
- # dhcpcd-7 moves the files out of /etc |
739 |
- if [ -e "${old_duid}" ]; then |
740 |
- if [ ! -e "${new_duid}" ]; then |
741 |
- cp -p "${old_duid}" "${new_duid}" |
742 |
- fi |
743 |
- old_files="${old_files} ${old_duid}" |
744 |
- fi |
745 |
- local old_secret="${EROOT%/}"/etc/dhcpcd.secret |
746 |
- local new_secret="${dbdir}"/secret |
747 |
- if [ -e "${old_secret}" ]; then |
748 |
- if [ ! -e "${new_secret}" ]; then |
749 |
- cp -p "${old_secret}" "${new_secret}" |
750 |
- fi |
751 |
- old_files="${old_files} ${old_secret}" |
752 |
- fi |
753 |
- |
754 |
- # dhcpcd-7 renames some files in /var/lib/dhcpcd |
755 |
- local old_rdm="${dbdir}"/dhcpcd-rdm.monotonic |
756 |
- local new_rdm="${dbdir}"/rdm_monotonic |
757 |
- if [ -e "${old_rdm}" ]; then |
758 |
- if [ ! -e "${new_rdm}" ]; then |
759 |
- cp -p "${old_rdm}" "${new_rdm}" |
760 |
- fi |
761 |
- old_files="${old_files} ${old_rdm}" |
762 |
- fi |
763 |
- local lease= |
764 |
- for lease in "${dbdir}"/dhcpcd-*.lease*; do |
765 |
- [ -f "$lease" ] || continue |
766 |
- old_files="${old_files} ${lease}" |
767 |
- local new_lease=$(basename "$lease" | sed -e "s/dhcpcd-//") |
768 |
- [ -e "${dbdir}/${new_lease}" ] && continue |
769 |
- cp "${lease}" "${dbdir}/${new_lease}" |
770 |
- done |
771 |
- |
772 |
- # Warn about removing stale files |
773 |
- if [ -n "${old_files}" ]; then |
774 |
- elog |
775 |
- elog "dhcpcd-7 has copied dhcpcd.duid and dhcpcd.secret from" |
776 |
- elog "${EROOT%/}/etc to ${dbdir}" |
777 |
- elog "and copied leases in ${dbdir} to new files with the dhcpcd-" |
778 |
- elog "prefix dropped." |
779 |
- elog |
780 |
- elog "You should remove these files if you don't plan on reverting" |
781 |
- elog "to an older version:" |
782 |
- local old_file= |
783 |
- for old_file in ${old_files}; do |
784 |
- elog " ${old_file}" |
785 |
- done |
786 |
- fi |
787 |
- |
788 |
- if [ -z "$REPLACING_VERSIONS" ]; then |
789 |
- elog |
790 |
- elog "dhcpcd has zeroconf support active by default." |
791 |
- elog "This means it will always obtain an IP address even if no" |
792 |
- elog "DHCP server can be contacted, which will break any existing" |
793 |
- elog "failover support you may have configured in your net configuration." |
794 |
- elog "This behaviour can be controlled with the noipv4ll configuration" |
795 |
- elog "file option or the -L command line switch." |
796 |
- elog "See the dhcpcd and dhcpcd.conf man pages for more details." |
797 |
- |
798 |
- elog |
799 |
- elog "Dhcpcd has duid enabled by default, and this may cause issues" |
800 |
- elog "with some dhcp servers. For more information, see" |
801 |
- elog "https://bugs.gentoo.org/show_bug.cgi?id=477356" |
802 |
- fi |
803 |
- |
804 |
- if ! has_version net-dns/bind-tools; then |
805 |
- elog |
806 |
- elog "If you activate the lookup-hostname hook to look up your hostname" |
807 |
- elog "using the dns, you need to install net-dns/bind-tools." |
808 |
- fi |
809 |
-} |