1 |
commit: 3c91f508259ab1c13405a62af0ee59cd13a98af0 |
2 |
Author: Lars Wendler <polynomial-c <AT> gentoo <DOT> org> |
3 |
AuthorDate: Sat Sep 14 10:07:37 2019 +0000 |
4 |
Commit: Lars Wendler <polynomial-c <AT> gentoo <DOT> org> |
5 |
CommitDate: Sat Sep 14 10:07:37 2019 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3c91f508 |
7 |
|
8 |
net-misc/dhcpcd: Removed "vulnerable" versions |
9 |
|
10 |
Package-Manager: Portage-2.3.76, Repoman-2.3.17 |
11 |
Signed-off-by: Lars Wendler <polynomial-c <AT> gentoo.org> |
12 |
|
13 |
net-misc/dhcpcd/Manifest | 2 - |
14 |
net-misc/dhcpcd/dhcpcd-8.0.3.ebuild | 144 ------------------------------------ |
15 |
net-misc/dhcpcd/dhcpcd-8.0.4.ebuild | 144 ------------------------------------ |
16 |
3 files changed, 290 deletions(-) |
17 |
|
18 |
diff --git a/net-misc/dhcpcd/Manifest b/net-misc/dhcpcd/Manifest |
19 |
index a6eadaa2dc4..3ca50074960 100644 |
20 |
--- a/net-misc/dhcpcd/Manifest |
21 |
+++ b/net-misc/dhcpcd/Manifest |
22 |
@@ -1,4 +1,2 @@ |
23 |
DIST dhcpcd-7.2.3.tar.xz 213552 BLAKE2B 5f89e11424b85702b05da6207ec346480c029de1416cc8892471de428ca0a4395a8915700e2237bfa2b133648973bc2a7c7d15aa2d0ba492f96fbf3908d7f613 SHA512 271cca422fad10eaf842acfd5b590c0ad537f5f23ee919a3928d8ad98463ab03bde21c0bc08741ea9618ee31095160a7c00066155eae2c74b17c49af65ba566f |
24 |
-DIST dhcpcd-8.0.3.tar.xz 223104 BLAKE2B ca1b35e0fc0f8b345d2a55e380aa4e10b864f18f4b5368659875ef5efc955fac442b0505b0192578d83fa8c3b304942e50aa082d753e98dc3cd44237100f106c SHA512 0a740286181e1b24e7ac5157f60727c2a3abd81080235efc8ba86628bb8e2aa877b8d9348055c16cdae1a819f443afbf452907a25152bb936a6dc72f3a179944 |
25 |
-DIST dhcpcd-8.0.4.tar.xz 224236 BLAKE2B ae1bc71fef58526482d5c0b34f66d68ad4baf84979da2fa90d51ec1831ccdc2a2d77dc1a09b52b8fa58deed42ff7c6af49a165afba50decae0085788bcbb10c2 SHA512 d5ea895b841a1afcabd50013800f567c0a9c077cd409ec18c5442b3da6bac814db5e9ae4a4218076eb5119bd7ccb732d3f58e22dcbba38ede26ee668f9733ec4 |
26 |
DIST dhcpcd-8.0.6.tar.xz 224552 BLAKE2B 5d0fab5977597ce182a2de56c8c4d085d3595a8f1209fc76788b707af0fffd4285a958cebfe7bab6c04ae7a2ba94c466d689dc9c3a71708c1baabd328b2bbf3e SHA512 19a568800a4e510a250de7cc111700b364c68bfe3907f1ac2cda81aacd079cb9ac87731cbabbf8f1e85e055a11c7ba88e419f6c4d7b33f8842dfaeadc7d1e193 |
27 |
|
28 |
diff --git a/net-misc/dhcpcd/dhcpcd-8.0.3.ebuild b/net-misc/dhcpcd/dhcpcd-8.0.3.ebuild |
29 |
deleted file mode 100644 |
30 |
index d8940210a7b..00000000000 |
31 |
--- a/net-misc/dhcpcd/dhcpcd-8.0.3.ebuild |
32 |
+++ /dev/null |
33 |
@@ -1,144 +0,0 @@ |
34 |
-# Copyright 1999-2019 Gentoo Authors |
35 |
-# Distributed under the terms of the GNU General Public License v2 |
36 |
- |
37 |
-EAPI=7 |
38 |
- |
39 |
-inherit systemd toolchain-funcs |
40 |
- |
41 |
-if [[ ${PV} == "9999" ]]; then |
42 |
- inherit git-r3 |
43 |
- EGIT_REPO_URI="https://roy.marples.name/git/dhcpcd.git" |
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 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux" |
50 |
- S="${WORKDIR}/${MY_P}" |
51 |
-fi |
52 |
- |
53 |
-DESCRIPTION="A fully featured, yet light weight RFC2131 compliant DHCP client" |
54 |
-HOMEPAGE="https://roy.marples.name/projects/dhcpcd" |
55 |
-LICENSE="BSD-2" |
56 |
-SLOT="0" |
57 |
-IUSE="elibc_glibc +embedded ipv6 kernel_linux +udev" |
58 |
- |
59 |
-COMMON_DEPEND="udev? ( virtual/udev )" |
60 |
-DEPEND="${COMMON_DEPEND}" |
61 |
-RDEPEND="${COMMON_DEPEND}" |
62 |
- |
63 |
-src_configure() { |
64 |
- local myeconfargs=( |
65 |
- --dbdir="${EPREFIX}/var/lib/dhcpcd" |
66 |
- --libexecdir="${EPREFIX}/lib/dhcpcd" |
67 |
- --localstatedir="${EPREFIX}/var" |
68 |
- --prefix="${EPREFIX}" |
69 |
- --with-hook=ntp.conf |
70 |
- $(use_enable embedded) |
71 |
- $(use_enable ipv6) |
72 |
- $(usex elibc_glibc '--with-hook=yp.conf' '') |
73 |
- $(usex kernel_linux '--rundir=${EPREFIX}/run' '') |
74 |
- $(usex udev '' '--without-dev --without-udev') |
75 |
- CC="$(tc-getCC)" |
76 |
- ) |
77 |
- econf "${myeconfargs[@]}" |
78 |
-} |
79 |
- |
80 |
-src_install() { |
81 |
- default |
82 |
- keepdir /var/lib/dhcpcd |
83 |
- newinitd "${FILESDIR}"/${PN}.initd ${PN} |
84 |
- systemd_dounit "${FILESDIR}"/${PN}.service |
85 |
-} |
86 |
- |
87 |
-pkg_postinst() { |
88 |
- local dbdir="${EROOT}"/var/lib/dhcpcd old_files=() |
89 |
- |
90 |
- local old_old_duid="${EROOT}"/var/lib/dhcpcd/dhcpcd.duid |
91 |
- local old_duid="${EROOT}"/etc/dhcpcd.duid |
92 |
- local new_duid="${dbdir}"/duid |
93 |
- if [[ -e "${old_old_duid}" ]] ; then |
94 |
- # Upgrade the duid file to the new format if needed |
95 |
- if ! grep -q '..:..:..:..:..:..' "${old_old_duid}"; then |
96 |
- sed -i -e 's/\(..\)/\1:/g; s/:$//g' "${old_old_duid}" |
97 |
- fi |
98 |
- |
99 |
- # Move the duid to /etc, a more sensible location |
100 |
- if [[ ! -e "${old_duid}" ]] ; then |
101 |
- cp -p "${old_old_duid}" "${new_duid}" |
102 |
- fi |
103 |
- old_files+=( "${old_old_duid}" ) |
104 |
- fi |
105 |
- |
106 |
- # dhcpcd-7 moves the files out of /etc |
107 |
- if [[ -e "${old_duid}" ]] ; then |
108 |
- if [[ ! -e "${new_duid}" ]] ; then |
109 |
- cp -p "${old_duid}" "${new_duid}" |
110 |
- fi |
111 |
- old_files+=( "${old_duid}" ) |
112 |
- fi |
113 |
- local old_secret="${EROOT}"/etc/dhcpcd.secret |
114 |
- local new_secret="${dbdir}"/secret |
115 |
- if [[ -e "${old_secret}" ]] ; then |
116 |
- if [[ ! -e "${new_secret}" ]] ; then |
117 |
- cp -p "${old_secret}" "${new_secret}" |
118 |
- fi |
119 |
- old_files+=( "${old_secret}" ) |
120 |
- fi |
121 |
- |
122 |
- # dhcpcd-7 renames some files in /var/lib/dhcpcd |
123 |
- local old_rdm="${dbdir}"/dhcpcd-rdm.monotonic |
124 |
- local new_rdm="${dbdir}"/rdm_monotonic |
125 |
- if [[ -e "${old_rdm}" ]] ; then |
126 |
- if [[ ! -e "${new_rdm}" ]] ; then |
127 |
- cp -p "${old_rdm}" "${new_rdm}" |
128 |
- fi |
129 |
- old_files+=( "${old_rdm}" ) |
130 |
- fi |
131 |
- local lease= |
132 |
- for lease in "${dbdir}"/dhcpcd-*.lease*; do |
133 |
- [[ -f "${lease}" ]] || continue |
134 |
- old_files+=( "${lease}" ) |
135 |
- local new_lease=$(basename "${lease}" | sed -e "s/dhcpcd-//") |
136 |
- [[ -e "${dbdir}/${new_lease}" ]] && continue |
137 |
- cp "${lease}" "${dbdir}/${new_lease}" |
138 |
- done |
139 |
- |
140 |
- # Warn about removing stale files |
141 |
- if [[ -n "${old_files[@]}" ]] ; then |
142 |
- elog |
143 |
- elog "dhcpcd-7 has copied dhcpcd.duid and dhcpcd.secret from" |
144 |
- elog "${EROOT}/etc to ${dbdir}" |
145 |
- elog "and copied leases in ${dbdir} to new files with the dhcpcd-" |
146 |
- elog "prefix dropped." |
147 |
- elog |
148 |
- elog "You should remove these files if you don't plan on reverting" |
149 |
- elog "to an older version:" |
150 |
- local old_file= |
151 |
- for old_file in ${old_files[@]}; do |
152 |
- elog " ${old_file}" |
153 |
- done |
154 |
- fi |
155 |
- |
156 |
- if [ -z "${REPLACING_VERSIONS}" ]; then |
157 |
- elog |
158 |
- elog "dhcpcd has zeroconf support active by default." |
159 |
- elog "This means it will always obtain an IP address even if no" |
160 |
- elog "DHCP server can be contacted, which will break any existing" |
161 |
- elog "failover support you may have configured in your net configuration." |
162 |
- elog "This behaviour can be controlled with the noipv4ll configuration" |
163 |
- elog "file option or the -L command line switch." |
164 |
- elog "See the dhcpcd and dhcpcd.conf man pages for more details." |
165 |
- |
166 |
- elog |
167 |
- elog "Dhcpcd has duid enabled by default, and this may cause issues" |
168 |
- elog "with some dhcp servers. For more information, see" |
169 |
- elog "https://bugs.gentoo.org/show_bug.cgi?id=477356" |
170 |
- fi |
171 |
- |
172 |
- if ! has_version net-dns/bind-tools; then |
173 |
- elog |
174 |
- elog "If you activate the lookup-hostname hook to look up your hostname" |
175 |
- elog "using the dns, you need to install net-dns/bind-tools." |
176 |
- fi |
177 |
-} |
178 |
|
179 |
diff --git a/net-misc/dhcpcd/dhcpcd-8.0.4.ebuild b/net-misc/dhcpcd/dhcpcd-8.0.4.ebuild |
180 |
deleted file mode 100644 |
181 |
index d8940210a7b..00000000000 |
182 |
--- a/net-misc/dhcpcd/dhcpcd-8.0.4.ebuild |
183 |
+++ /dev/null |
184 |
@@ -1,144 +0,0 @@ |
185 |
-# Copyright 1999-2019 Gentoo Authors |
186 |
-# Distributed under the terms of the GNU General Public License v2 |
187 |
- |
188 |
-EAPI=7 |
189 |
- |
190 |
-inherit systemd toolchain-funcs |
191 |
- |
192 |
-if [[ ${PV} == "9999" ]]; then |
193 |
- inherit git-r3 |
194 |
- EGIT_REPO_URI="https://roy.marples.name/git/dhcpcd.git" |
195 |
-else |
196 |
- MY_P="${P/_alpha/-alpha}" |
197 |
- MY_P="${MY_P/_beta/-beta}" |
198 |
- MY_P="${MY_P/_rc/-rc}" |
199 |
- SRC_URI="https://roy.marples.name/downloads/${PN}/${MY_P}.tar.xz" |
200 |
- KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux" |
201 |
- S="${WORKDIR}/${MY_P}" |
202 |
-fi |
203 |
- |
204 |
-DESCRIPTION="A fully featured, yet light weight RFC2131 compliant DHCP client" |
205 |
-HOMEPAGE="https://roy.marples.name/projects/dhcpcd" |
206 |
-LICENSE="BSD-2" |
207 |
-SLOT="0" |
208 |
-IUSE="elibc_glibc +embedded ipv6 kernel_linux +udev" |
209 |
- |
210 |
-COMMON_DEPEND="udev? ( virtual/udev )" |
211 |
-DEPEND="${COMMON_DEPEND}" |
212 |
-RDEPEND="${COMMON_DEPEND}" |
213 |
- |
214 |
-src_configure() { |
215 |
- local myeconfargs=( |
216 |
- --dbdir="${EPREFIX}/var/lib/dhcpcd" |
217 |
- --libexecdir="${EPREFIX}/lib/dhcpcd" |
218 |
- --localstatedir="${EPREFIX}/var" |
219 |
- --prefix="${EPREFIX}" |
220 |
- --with-hook=ntp.conf |
221 |
- $(use_enable embedded) |
222 |
- $(use_enable ipv6) |
223 |
- $(usex elibc_glibc '--with-hook=yp.conf' '') |
224 |
- $(usex kernel_linux '--rundir=${EPREFIX}/run' '') |
225 |
- $(usex udev '' '--without-dev --without-udev') |
226 |
- CC="$(tc-getCC)" |
227 |
- ) |
228 |
- econf "${myeconfargs[@]}" |
229 |
-} |
230 |
- |
231 |
-src_install() { |
232 |
- default |
233 |
- keepdir /var/lib/dhcpcd |
234 |
- newinitd "${FILESDIR}"/${PN}.initd ${PN} |
235 |
- systemd_dounit "${FILESDIR}"/${PN}.service |
236 |
-} |
237 |
- |
238 |
-pkg_postinst() { |
239 |
- local dbdir="${EROOT}"/var/lib/dhcpcd old_files=() |
240 |
- |
241 |
- local old_old_duid="${EROOT}"/var/lib/dhcpcd/dhcpcd.duid |
242 |
- local old_duid="${EROOT}"/etc/dhcpcd.duid |
243 |
- local new_duid="${dbdir}"/duid |
244 |
- if [[ -e "${old_old_duid}" ]] ; then |
245 |
- # Upgrade the duid file to the new format if needed |
246 |
- if ! grep -q '..:..:..:..:..:..' "${old_old_duid}"; then |
247 |
- sed -i -e 's/\(..\)/\1:/g; s/:$//g' "${old_old_duid}" |
248 |
- fi |
249 |
- |
250 |
- # Move the duid to /etc, a more sensible location |
251 |
- if [[ ! -e "${old_duid}" ]] ; then |
252 |
- cp -p "${old_old_duid}" "${new_duid}" |
253 |
- fi |
254 |
- old_files+=( "${old_old_duid}" ) |
255 |
- fi |
256 |
- |
257 |
- # dhcpcd-7 moves the files out of /etc |
258 |
- if [[ -e "${old_duid}" ]] ; then |
259 |
- if [[ ! -e "${new_duid}" ]] ; then |
260 |
- cp -p "${old_duid}" "${new_duid}" |
261 |
- fi |
262 |
- old_files+=( "${old_duid}" ) |
263 |
- fi |
264 |
- local old_secret="${EROOT}"/etc/dhcpcd.secret |
265 |
- local new_secret="${dbdir}"/secret |
266 |
- if [[ -e "${old_secret}" ]] ; then |
267 |
- if [[ ! -e "${new_secret}" ]] ; then |
268 |
- cp -p "${old_secret}" "${new_secret}" |
269 |
- fi |
270 |
- old_files+=( "${old_secret}" ) |
271 |
- fi |
272 |
- |
273 |
- # dhcpcd-7 renames some files in /var/lib/dhcpcd |
274 |
- local old_rdm="${dbdir}"/dhcpcd-rdm.monotonic |
275 |
- local new_rdm="${dbdir}"/rdm_monotonic |
276 |
- if [[ -e "${old_rdm}" ]] ; then |
277 |
- if [[ ! -e "${new_rdm}" ]] ; then |
278 |
- cp -p "${old_rdm}" "${new_rdm}" |
279 |
- fi |
280 |
- old_files+=( "${old_rdm}" ) |
281 |
- fi |
282 |
- local lease= |
283 |
- for lease in "${dbdir}"/dhcpcd-*.lease*; do |
284 |
- [[ -f "${lease}" ]] || continue |
285 |
- old_files+=( "${lease}" ) |
286 |
- local new_lease=$(basename "${lease}" | sed -e "s/dhcpcd-//") |
287 |
- [[ -e "${dbdir}/${new_lease}" ]] && continue |
288 |
- cp "${lease}" "${dbdir}/${new_lease}" |
289 |
- done |
290 |
- |
291 |
- # Warn about removing stale files |
292 |
- if [[ -n "${old_files[@]}" ]] ; then |
293 |
- elog |
294 |
- elog "dhcpcd-7 has copied dhcpcd.duid and dhcpcd.secret from" |
295 |
- elog "${EROOT}/etc to ${dbdir}" |
296 |
- elog "and copied leases in ${dbdir} to new files with the dhcpcd-" |
297 |
- elog "prefix dropped." |
298 |
- elog |
299 |
- elog "You should remove these files if you don't plan on reverting" |
300 |
- elog "to an older version:" |
301 |
- local old_file= |
302 |
- for old_file in ${old_files[@]}; do |
303 |
- elog " ${old_file}" |
304 |
- done |
305 |
- fi |
306 |
- |
307 |
- if [ -z "${REPLACING_VERSIONS}" ]; then |
308 |
- elog |
309 |
- elog "dhcpcd has zeroconf support active by default." |
310 |
- elog "This means it will always obtain an IP address even if no" |
311 |
- elog "DHCP server can be contacted, which will break any existing" |
312 |
- elog "failover support you may have configured in your net configuration." |
313 |
- elog "This behaviour can be controlled with the noipv4ll configuration" |
314 |
- elog "file option or the -L command line switch." |
315 |
- elog "See the dhcpcd and dhcpcd.conf man pages for more details." |
316 |
- |
317 |
- elog |
318 |
- elog "Dhcpcd has duid enabled by default, and this may cause issues" |
319 |
- elog "with some dhcp servers. For more information, see" |
320 |
- elog "https://bugs.gentoo.org/show_bug.cgi?id=477356" |
321 |
- fi |
322 |
- |
323 |
- if ! has_version net-dns/bind-tools; then |
324 |
- elog |
325 |
- elog "If you activate the lookup-hostname hook to look up your hostname" |
326 |
- elog "using the dns, you need to install net-dns/bind-tools." |
327 |
- fi |
328 |
-} |