1 |
commit: 6d085720407f032e08f01c9e4bb3f576dc3d461c |
2 |
Author: William Hubbs <william.hubbs <AT> sony <DOT> com> |
3 |
AuthorDate: Tue Jul 30 19:39:00 2019 +0000 |
4 |
Commit: William Hubbs <williamh <AT> gentoo <DOT> org> |
5 |
CommitDate: Tue Jul 30 19:41:14 2019 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6d085720 |
7 |
|
8 |
net-misc/dhcpcd: remove broken 8.0.1 release |
9 |
|
10 |
Copyright: Sony Interactive Entertainment Inc. |
11 |
Package-Manager: Portage-2.3.69, Repoman-2.3.16 |
12 |
Signed-off-by: William Hubbs <williamh <AT> gentoo.org> |
13 |
|
14 |
net-misc/dhcpcd/Manifest | 1 - |
15 |
net-misc/dhcpcd/dhcpcd-8.0.1-r1.ebuild | 149 --------------------- |
16 |
.../files/dhcpcd-8.0.1-delete_tmpfiles.patch | 34 ----- |
17 |
...dhcpcd-8.0.1-fix_check_for_open_memstream.patch | 27 ---- |
18 |
4 files changed, 211 deletions(-) |
19 |
|
20 |
diff --git a/net-misc/dhcpcd/Manifest b/net-misc/dhcpcd/Manifest |
21 |
index d1db7a60e3a..d2ab3bc59dd 100644 |
22 |
--- a/net-misc/dhcpcd/Manifest |
23 |
+++ b/net-misc/dhcpcd/Manifest |
24 |
@@ -1,3 +1,2 @@ |
25 |
DIST dhcpcd-7.2.3.tar.xz 213552 BLAKE2B 5f89e11424b85702b05da6207ec346480c029de1416cc8892471de428ca0a4395a8915700e2237bfa2b133648973bc2a7c7d15aa2d0ba492f96fbf3908d7f613 SHA512 271cca422fad10eaf842acfd5b590c0ad537f5f23ee919a3928d8ad98463ab03bde21c0bc08741ea9618ee31095160a7c00066155eae2c74b17c49af65ba566f |
26 |
-DIST dhcpcd-8.0.1.tar.xz 221716 BLAKE2B 597831ed9a965170d0dc9ffdaa8ab34e209b14fa6183ed7a0b915f545d654db32d0994eb9e6f12953f5b81220abfc186ac72da1cd3e60f8b0cdee21da4be56dd SHA512 2931345fb50b63a49ee97b290dbb236895dd13a19ce17bf40b50797cf93ea959272de698718593f882ba0c35e2f733b5476135759f46bd04a8e8f11e81ba9f3f |
27 |
DIST dhcpcd-8.0.2.tar.xz 222408 BLAKE2B fb27a33cd64c7aeedb28e05c885c860618d923ac857895b9fdc7daa608f433587bea1e6630fd9897426b371a45b8a336e1edaa804d76eda6e9fc2adc1411aed2 SHA512 a6e3aa66800adc8b209324bae02a6e373e2623735bf0695ffec4a7c972d65c3498f55e4da62f93df0bc6cddb4bee8ab667b3743b5b25cd5f4cc9da4d1f8e15c4 |
28 |
|
29 |
diff --git a/net-misc/dhcpcd/dhcpcd-8.0.1-r1.ebuild b/net-misc/dhcpcd/dhcpcd-8.0.1-r1.ebuild |
30 |
deleted file mode 100644 |
31 |
index 2c0d5a53ff0..00000000000 |
32 |
--- a/net-misc/dhcpcd/dhcpcd-8.0.1-r1.ebuild |
33 |
+++ /dev/null |
34 |
@@ -1,149 +0,0 @@ |
35 |
-# Copyright 1999-2019 Gentoo Authors |
36 |
-# Distributed under the terms of the GNU General Public License v2 |
37 |
- |
38 |
-EAPI=7 |
39 |
- |
40 |
-inherit systemd toolchain-funcs |
41 |
- |
42 |
-if [[ ${PV} == "9999" ]]; then |
43 |
- inherit git-r3 |
44 |
- EGIT_REPO_URI="https://roy.marples.name/git/dhcpcd.git" |
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 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux" |
51 |
- S="${WORKDIR}/${MY_P}" |
52 |
-fi |
53 |
- |
54 |
-DESCRIPTION="A fully featured, yet light weight RFC2131 compliant DHCP client" |
55 |
-HOMEPAGE="https://roy.marples.name/projects/dhcpcd" |
56 |
-LICENSE="BSD-2" |
57 |
-SLOT="0" |
58 |
-IUSE="elibc_glibc +embedded ipv6 kernel_linux +udev" |
59 |
- |
60 |
-COMMON_DEPEND="udev? ( virtual/udev )" |
61 |
-DEPEND="${COMMON_DEPEND}" |
62 |
-RDEPEND="${COMMON_DEPEND}" |
63 |
- |
64 |
-PATCHES=( |
65 |
- "${FILESDIR}/${P}-delete_tmpfiles.patch" |
66 |
- "${FILESDIR}/${P}-fix_check_for_open_memstream.patch" |
67 |
-) |
68 |
- |
69 |
-src_configure() { |
70 |
- local myeconfargs=( |
71 |
- --dbdir="${EPREFIX}/var/lib/dhcpcd" |
72 |
- --libexecdir="${EPREFIX}/lib/dhcpcd" |
73 |
- --localstatedir="${EPREFIX}/var" |
74 |
- --prefix="${EPREFIX}" |
75 |
- --with-hook=ntp.conf |
76 |
- $(use_enable embedded) |
77 |
- $(use_enable ipv6) |
78 |
- $(usex elibc_glibc '--with-hook=yp.conf' '') |
79 |
- $(usex kernel_linux '--rundir=${EPREFIX}/run' '') |
80 |
- $(usex udev '' '--without-dev --without-udev') |
81 |
- CC="$(tc-getCC)" |
82 |
- ) |
83 |
- econf "${myeconfargs[@]}" |
84 |
-} |
85 |
- |
86 |
-src_install() { |
87 |
- default |
88 |
- keepdir /var/lib/dhcpcd |
89 |
- newinitd "${FILESDIR}"/${PN}.initd ${PN} |
90 |
- systemd_dounit "${FILESDIR}"/${PN}.service |
91 |
-} |
92 |
- |
93 |
-pkg_postinst() { |
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_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_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_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_rdm}" ) |
136 |
- fi |
137 |
- local lease= |
138 |
- for lease in "${dbdir}"/dhcpcd-*.lease*; do |
139 |
- [[ -f "${lease}" ]] || continue |
140 |
- 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/files/dhcpcd-8.0.1-delete_tmpfiles.patch b/net-misc/dhcpcd/files/dhcpcd-8.0.1-delete_tmpfiles.patch |
186 |
deleted file mode 100644 |
187 |
index 0bc625ac11d..00000000000 |
188 |
--- a/net-misc/dhcpcd/files/dhcpcd-8.0.1-delete_tmpfiles.patch |
189 |
+++ /dev/null |
190 |
@@ -1,34 +0,0 @@ |
191 |
-From 79846b358f6ea8d0a6027ee0ba38342a730065b0 Mon Sep 17 00:00:00 2001 |
192 |
-From: Roy Marples <roy@×××××××.name> |
193 |
-Date: Sun, 28 Jul 2019 11:49:17 +0100 |
194 |
-Subject: script: ensure that tmp files are removed |
195 |
- |
196 |
-fopen creates a new stream which will use a new fd. |
197 |
-Why using fdopen, the new stream will use the same fd, so when |
198 |
-it's closed the tmp file will really unlink. |
199 |
---- |
200 |
- src/script.c | 7 ++++--- |
201 |
- 1 file changed, 4 insertions(+), 3 deletions(-) |
202 |
- |
203 |
-diff --git a/src/script.c b/src/script.c |
204 |
-index 1863a661..74aef1b1 100644 |
205 |
---- a/src/script.c |
206 |
-+++ b/src/script.c |
207 |
-@@ -213,10 +213,11 @@ make_env(const struct interface *ifp, const char *reason) |
208 |
- if (tmpfd == -1) |
209 |
- goto eexit; |
210 |
- unlink(tmpfile); |
211 |
-- fp = fopen(tmpfile, "w+"); |
212 |
-- close(tmpfd); |
213 |
-- if (fp == NULL) |
214 |
-+ fp = fdopen(tmpfd, "w+"); |
215 |
-+ if (fp == NULL) { |
216 |
-+ close(tmpfd); |
217 |
- goto eexit; |
218 |
-+ } |
219 |
- #endif |
220 |
- |
221 |
- #ifdef INET |
222 |
--- |
223 |
-cgit v1.2.1 |
224 |
- |
225 |
|
226 |
diff --git a/net-misc/dhcpcd/files/dhcpcd-8.0.1-fix_check_for_open_memstream.patch b/net-misc/dhcpcd/files/dhcpcd-8.0.1-fix_check_for_open_memstream.patch |
227 |
deleted file mode 100644 |
228 |
index 89ed2afa987..00000000000 |
229 |
--- a/net-misc/dhcpcd/files/dhcpcd-8.0.1-fix_check_for_open_memstream.patch |
230 |
+++ /dev/null |
231 |
@@ -1,27 +0,0 @@ |
232 |
-From fa7f0d1e0a57bfaca49e1cfdc3d292ef1d68001a Mon Sep 17 00:00:00 2001 |
233 |
-From: Roy Marples <roy@×××××××.name> |
234 |
-Date: Sun, 28 Jul 2019 12:53:03 +0100 |
235 |
-Subject: configure: Fix test for open_memstream |
236 |
- |
237 |
-glibc-2.19 needs the return value testing.... |
238 |
---- |
239 |
- configure | 3 +-- |
240 |
- 1 file changed, 1 insertion(+), 2 deletions(-) |
241 |
- |
242 |
-diff --git a/configure b/configure |
243 |
-index d25eec56..50058520 100755 |
244 |
---- a/configure |
245 |
-+++ b/configure |
246 |
-@@ -747,8 +747,7 @@ if [ -z "$OPEN_MEMSTREAM" ]; then |
247 |
- cat <<EOF >_open_memstream.c |
248 |
- #include <stdio.h> |
249 |
- int main(void) { |
250 |
-- open_memstream(NULL, NULL); |
251 |
-- return 0; |
252 |
-+ return open_memstream(NULL, NULL) != NULL ? 0 : 1; |
253 |
- } |
254 |
- EOF |
255 |
- if $XCC _open_memstream.c -o _open_memstream 2>&3; then |
256 |
--- |
257 |
-cgit v1.2.1 |
258 |
- |