1 |
commit: a83cb17acea4bd588fc7e7da43034a38eee24225 |
2 |
Author: Lars Wendler <polynomial-c <AT> gentoo <DOT> org> |
3 |
AuthorDate: Wed Sep 4 15:28:04 2019 +0000 |
4 |
Commit: Lars Wendler <polynomial-c <AT> gentoo <DOT> org> |
5 |
CommitDate: Wed Sep 4 15:28:28 2019 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a83cb17a |
7 |
|
8 |
net-misc/dhcpcd: Removed old |
9 |
|
10 |
Package-Manager: Portage-2.3.75, Repoman-2.3.17 |
11 |
Signed-off-by: Lars Wendler <polynomial-c <AT> gentoo.org> |
12 |
|
13 |
net-misc/dhcpcd/Manifest | 1 - |
14 |
net-misc/dhcpcd/dhcpcd-8.0.2-r1.ebuild | 148 --------------------- |
15 |
.../files/dhcpcd-8.0.2-string_termination.patch | 80 ----------- |
16 |
3 files changed, 229 deletions(-) |
17 |
|
18 |
diff --git a/net-misc/dhcpcd/Manifest b/net-misc/dhcpcd/Manifest |
19 |
index e6d6b91215b..3f36cb6af0a 100644 |
20 |
--- a/net-misc/dhcpcd/Manifest |
21 |
+++ b/net-misc/dhcpcd/Manifest |
22 |
@@ -1,4 +1,3 @@ |
23 |
DIST dhcpcd-7.2.3.tar.xz 213552 BLAKE2B 5f89e11424b85702b05da6207ec346480c029de1416cc8892471de428ca0a4395a8915700e2237bfa2b133648973bc2a7c7d15aa2d0ba492f96fbf3908d7f613 SHA512 271cca422fad10eaf842acfd5b590c0ad537f5f23ee919a3928d8ad98463ab03bde21c0bc08741ea9618ee31095160a7c00066155eae2c74b17c49af65ba566f |
24 |
-DIST dhcpcd-8.0.2.tar.xz 222408 BLAKE2B fb27a33cd64c7aeedb28e05c885c860618d923ac857895b9fdc7daa608f433587bea1e6630fd9897426b371a45b8a336e1edaa804d76eda6e9fc2adc1411aed2 SHA512 a6e3aa66800adc8b209324bae02a6e373e2623735bf0695ffec4a7c972d65c3498f55e4da62f93df0bc6cddb4bee8ab667b3743b5b25cd5f4cc9da4d1f8e15c4 |
25 |
DIST dhcpcd-8.0.3.tar.xz 223104 BLAKE2B ca1b35e0fc0f8b345d2a55e380aa4e10b864f18f4b5368659875ef5efc955fac442b0505b0192578d83fa8c3b304942e50aa082d753e98dc3cd44237100f106c SHA512 0a740286181e1b24e7ac5157f60727c2a3abd81080235efc8ba86628bb8e2aa877b8d9348055c16cdae1a819f443afbf452907a25152bb936a6dc72f3a179944 |
26 |
DIST dhcpcd-8.0.4.tar.xz 224236 BLAKE2B ae1bc71fef58526482d5c0b34f66d68ad4baf84979da2fa90d51ec1831ccdc2a2d77dc1a09b52b8fa58deed42ff7c6af49a165afba50decae0085788bcbb10c2 SHA512 d5ea895b841a1afcabd50013800f567c0a9c077cd409ec18c5442b3da6bac814db5e9ae4a4218076eb5119bd7ccb732d3f58e22dcbba38ede26ee668f9733ec4 |
27 |
|
28 |
diff --git a/net-misc/dhcpcd/dhcpcd-8.0.2-r1.ebuild b/net-misc/dhcpcd/dhcpcd-8.0.2-r1.ebuild |
29 |
deleted file mode 100644 |
30 |
index 1696c38dcf7..00000000000 |
31 |
--- a/net-misc/dhcpcd/dhcpcd-8.0.2-r1.ebuild |
32 |
+++ /dev/null |
33 |
@@ -1,148 +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 |
-PATCHES=( |
64 |
- "${FILESDIR}"/${P}-string_termination.patch #691426 |
65 |
-) |
66 |
- |
67 |
-src_configure() { |
68 |
- local myeconfargs=( |
69 |
- --dbdir="${EPREFIX}/var/lib/dhcpcd" |
70 |
- --libexecdir="${EPREFIX}/lib/dhcpcd" |
71 |
- --localstatedir="${EPREFIX}/var" |
72 |
- --prefix="${EPREFIX}" |
73 |
- --with-hook=ntp.conf |
74 |
- $(use_enable embedded) |
75 |
- $(use_enable ipv6) |
76 |
- $(usex elibc_glibc '--with-hook=yp.conf' '') |
77 |
- $(usex kernel_linux '--rundir=${EPREFIX}/run' '') |
78 |
- $(usex udev '' '--without-dev --without-udev') |
79 |
- CC="$(tc-getCC)" |
80 |
- ) |
81 |
- econf "${myeconfargs[@]}" |
82 |
-} |
83 |
- |
84 |
-src_install() { |
85 |
- default |
86 |
- keepdir /var/lib/dhcpcd |
87 |
- newinitd "${FILESDIR}"/${PN}.initd ${PN} |
88 |
- systemd_dounit "${FILESDIR}"/${PN}.service |
89 |
-} |
90 |
- |
91 |
-pkg_postinst() { |
92 |
- local dbdir="${EROOT}"/var/lib/dhcpcd old_files=() |
93 |
- |
94 |
- local old_old_duid="${EROOT}"/var/lib/dhcpcd/dhcpcd.duid |
95 |
- local old_duid="${EROOT}"/etc/dhcpcd.duid |
96 |
- local new_duid="${dbdir}"/duid |
97 |
- if [[ -e "${old_old_duid}" ]] ; then |
98 |
- # Upgrade the duid file to the new format if needed |
99 |
- if ! grep -q '..:..:..:..:..:..' "${old_old_duid}"; then |
100 |
- sed -i -e 's/\(..\)/\1:/g; s/:$//g' "${old_old_duid}" |
101 |
- fi |
102 |
- |
103 |
- # Move the duid to /etc, a more sensible location |
104 |
- if [[ ! -e "${old_duid}" ]] ; then |
105 |
- cp -p "${old_old_duid}" "${new_duid}" |
106 |
- fi |
107 |
- old_files+=( "${old_old_duid}" ) |
108 |
- fi |
109 |
- |
110 |
- # dhcpcd-7 moves the files out of /etc |
111 |
- if [[ -e "${old_duid}" ]] ; then |
112 |
- if [[ ! -e "${new_duid}" ]] ; then |
113 |
- cp -p "${old_duid}" "${new_duid}" |
114 |
- fi |
115 |
- old_files+=( "${old_duid}" ) |
116 |
- fi |
117 |
- local old_secret="${EROOT}"/etc/dhcpcd.secret |
118 |
- local new_secret="${dbdir}"/secret |
119 |
- if [[ -e "${old_secret}" ]] ; then |
120 |
- if [[ ! -e "${new_secret}" ]] ; then |
121 |
- cp -p "${old_secret}" "${new_secret}" |
122 |
- fi |
123 |
- old_files+=( "${old_secret}" ) |
124 |
- fi |
125 |
- |
126 |
- # dhcpcd-7 renames some files in /var/lib/dhcpcd |
127 |
- local old_rdm="${dbdir}"/dhcpcd-rdm.monotonic |
128 |
- local new_rdm="${dbdir}"/rdm_monotonic |
129 |
- if [[ -e "${old_rdm}" ]] ; then |
130 |
- if [[ ! -e "${new_rdm}" ]] ; then |
131 |
- cp -p "${old_rdm}" "${new_rdm}" |
132 |
- fi |
133 |
- old_files+=( "${old_rdm}" ) |
134 |
- fi |
135 |
- local lease= |
136 |
- for lease in "${dbdir}"/dhcpcd-*.lease*; do |
137 |
- [[ -f "${lease}" ]] || continue |
138 |
- old_files+=( "${lease}" ) |
139 |
- local new_lease=$(basename "${lease}" | sed -e "s/dhcpcd-//") |
140 |
- [[ -e "${dbdir}/${new_lease}" ]] && continue |
141 |
- cp "${lease}" "${dbdir}/${new_lease}" |
142 |
- done |
143 |
- |
144 |
- # Warn about removing stale files |
145 |
- if [[ -n "${old_files[@]}" ]] ; then |
146 |
- elog |
147 |
- elog "dhcpcd-7 has copied dhcpcd.duid and dhcpcd.secret from" |
148 |
- elog "${EROOT}/etc to ${dbdir}" |
149 |
- elog "and copied leases in ${dbdir} to new files with the dhcpcd-" |
150 |
- elog "prefix dropped." |
151 |
- elog |
152 |
- elog "You should remove these files if you don't plan on reverting" |
153 |
- elog "to an older version:" |
154 |
- local old_file= |
155 |
- for old_file in ${old_files[@]}; do |
156 |
- elog " ${old_file}" |
157 |
- done |
158 |
- fi |
159 |
- |
160 |
- if [ -z "${REPLACING_VERSIONS}" ]; then |
161 |
- elog |
162 |
- elog "dhcpcd has zeroconf support active by default." |
163 |
- elog "This means it will always obtain an IP address even if no" |
164 |
- elog "DHCP server can be contacted, which will break any existing" |
165 |
- elog "failover support you may have configured in your net configuration." |
166 |
- elog "This behaviour can be controlled with the noipv4ll configuration" |
167 |
- elog "file option or the -L command line switch." |
168 |
- elog "See the dhcpcd and dhcpcd.conf man pages for more details." |
169 |
- |
170 |
- elog |
171 |
- elog "Dhcpcd has duid enabled by default, and this may cause issues" |
172 |
- elog "with some dhcp servers. For more information, see" |
173 |
- elog "https://bugs.gentoo.org/show_bug.cgi?id=477356" |
174 |
- fi |
175 |
- |
176 |
- if ! has_version net-dns/bind-tools; then |
177 |
- elog |
178 |
- elog "If you activate the lookup-hostname hook to look up your hostname" |
179 |
- elog "using the dns, you need to install net-dns/bind-tools." |
180 |
- fi |
181 |
-} |
182 |
|
183 |
diff --git a/net-misc/dhcpcd/files/dhcpcd-8.0.2-string_termination.patch b/net-misc/dhcpcd/files/dhcpcd-8.0.2-string_termination.patch |
184 |
deleted file mode 100644 |
185 |
index a1bc19ec974..00000000000 |
186 |
--- a/net-misc/dhcpcd/files/dhcpcd-8.0.2-string_termination.patch |
187 |
+++ /dev/null |
188 |
@@ -1,80 +0,0 @@ |
189 |
-https://bugs.gentoo.org/691426 |
190 |
- |
191 |
-diff --git a/src/dhcp-common.c b/src/dhcp-common.c |
192 |
-index 08ab9493..9f556557 100644 |
193 |
---- a/src/dhcp-common.c |
194 |
-+++ b/src/dhcp-common.c |
195 |
-@@ -645,14 +645,16 @@ print_option(FILE *fp, const char *prefix, const struct dhcp_opt *opt, |
196 |
- if (fputc('=', fp) == EOF) |
197 |
- return -1; |
198 |
- if (dl == 0) |
199 |
-- return 1; |
200 |
-+ goto out; |
201 |
- |
202 |
- if (opt->type & OT_RFC1035) { |
203 |
- char domain[NS_MAXDNAME]; |
204 |
- |
205 |
- sl = decode_rfc1035(domain, sizeof(domain), data, dl); |
206 |
-- if (sl == 0 || sl == -1) |
207 |
-- return sl; |
208 |
-+ if (sl == -1) |
209 |
-+ return -1; |
210 |
-+ if (sl == 0) |
211 |
-+ goto out; |
212 |
- if (valid_domainname(domain, opt->type) == -1) |
213 |
- return -1; |
214 |
- return efprintf(fp, "%s", domain); |
215 |
-@@ -693,9 +695,7 @@ print_option(FILE *fp, const char *prefix, const struct dhcp_opt *opt, |
216 |
- return -1; |
217 |
- } |
218 |
- } |
219 |
-- if (fputc('\0', fp) == EOF) |
220 |
-- return -1; |
221 |
-- return 1; |
222 |
-+ goto out; |
223 |
- } |
224 |
- |
225 |
- t = data; |
226 |
-@@ -760,6 +760,7 @@ print_option(FILE *fp, const char *prefix, const struct dhcp_opt *opt, |
227 |
- } |
228 |
- } |
229 |
- |
230 |
-+out: |
231 |
- if (fputc('\0', fp) == EOF) |
232 |
- return -1; |
233 |
- return 1; |
234 |
-diff --git a/src/script.c b/src/script.c |
235 |
-index 74aef1b1..3dee7b08 100644 |
236 |
---- a/src/script.c |
237 |
-+++ b/src/script.c |
238 |
-@@ -33,6 +33,7 @@ |
239 |
- #include <netinet/in.h> |
240 |
- #include <arpa/inet.h> |
241 |
- |
242 |
-+#include <assert.h> |
243 |
- #include <ctype.h> |
244 |
- #include <errno.h> |
245 |
- #include <signal.h> |
246 |
-@@ -477,12 +478,21 @@ dumplease: |
247 |
- fp = NULL; |
248 |
- #endif |
249 |
- |
250 |
-+ /* Count the terminated env strings. |
251 |
-+ * assert that the terminations are correct. */ |
252 |
- nenv = 0; |
253 |
- endp = buf + buf_pos; |
254 |
- for (bufp = buf; bufp < endp; bufp++) { |
255 |
-- if (*bufp == '\0') |
256 |
-+ if (*bufp == '\0') { |
257 |
-+#ifndef NDEBUG |
258 |
-+ if (bufp + 1 < endp) |
259 |
-+ assert(*(bufp + 1) != '\0'); |
260 |
-+#endif |
261 |
- nenv++; |
262 |
-+ } |
263 |
- } |
264 |
-+ assert(*--bufp == '\0'); |
265 |
-+ |
266 |
- if (ctx->script_envlen < nenv) { |
267 |
- env = reallocarray(ctx->script_env, nenv + 1, sizeof(*env)); |
268 |
- if (env == NULL) |