1 |
commit: dacc7a97600c1e54e3741f69fe6ee2e3cef14547 |
2 |
Author: William Hubbs <williamh <AT> gentoo <DOT> org> |
3 |
AuthorDate: Tue Feb 6 18:11:15 2018 +0000 |
4 |
Commit: William Hubbs <williamh <AT> gentoo <DOT> org> |
5 |
CommitDate: Tue Feb 6 18:11:56 2018 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=dacc7a97 |
7 |
|
8 |
net-misc/dhcpcd: Remove more unstable versions |
9 |
|
10 |
Package-Manager: Portage-2.3.19, Repoman-2.3.6 |
11 |
|
12 |
net-misc/dhcpcd/Manifest | 2 - |
13 |
net-misc/dhcpcd/dhcpcd-6.10.1.ebuild | 119 -------------------------------- |
14 |
net-misc/dhcpcd/dhcpcd-6.11.1-r1.ebuild | 118 ------------------------------- |
15 |
3 files changed, 239 deletions(-) |
16 |
|
17 |
diff --git a/net-misc/dhcpcd/Manifest b/net-misc/dhcpcd/Manifest |
18 |
index ed33fe96142..c345ff5d6e6 100644 |
19 |
--- a/net-misc/dhcpcd/Manifest |
20 |
+++ b/net-misc/dhcpcd/Manifest |
21 |
@@ -1,5 +1,3 @@ |
22 |
-DIST dhcpcd-6.10.1.tar.xz 180112 BLAKE2B aa339c1d60cf2752cdfd0e75f788e9af193cc40a1968f5bb79583695cddbf1b0a3722e7add56759ef76326a25a3ff8cd861d59aecad3ba1ec2ba336031f5e60b SHA512 f323c155cff47f21dde181c216408b79f10e6ed923aa3d1f3482feff47a1e88e02193ec82f831da4ef63d3703ca1837715c36a47cf3f5d09f117f6eb53bfcf67 |
23 |
-DIST dhcpcd-6.11.1.tar.xz 190956 BLAKE2B 65f816e436b9a8370d459328997cadb82d1f70e3844cd6c7c52df52a58bf22d0b87b9480813f506b40ea85cef77c0f667ce97299819424e24cf186a41fdf69c9 SHA512 50ef755b13a96fe484623d9f2dbd91407fbea5ca728fd05dbf4259a61611a07cf3ffad7e8d20ecd513dbef80602074809abd1f5177daaa51ceccc2af5c88269f |
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.0.tar.xz 207924 BLAKE2B bd24f22b4852596ef4a076d1ab15ac4411dd676ba8cbfdb4b1ba29ffe1bff2d18be40369c1f8804bc01988bb30b89ee1030ea95ddb48fbfc04ca06372b317d9d SHA512 f2ab1fcb2dad0c93da757c15d0b772b40cc15c8e59161d91684f06961cf7b515473d7c3fc5973b7755ac525e6851abdf8a5f27760bb5d28fe17e90ff0feaf904 |
27 |
|
28 |
diff --git a/net-misc/dhcpcd/dhcpcd-6.10.1.ebuild b/net-misc/dhcpcd/dhcpcd-6.10.1.ebuild |
29 |
deleted file mode 100644 |
30 |
index ff1f4d03495..00000000000 |
31 |
--- a/net-misc/dhcpcd/dhcpcd-6.10.1.ebuild |
32 |
+++ /dev/null |
33 |
@@ -1,119 +0,0 @@ |
34 |
-# Copyright 1999-2018 Gentoo Foundation |
35 |
-# Distributed under the terms of the GNU General Public License v2 |
36 |
- |
37 |
-EAPI=5 |
38 |
- |
39 |
-if [[ ${PV} == "9999" ]]; then |
40 |
- FOSSIL_URI="http://roy.marples.name/projects/dhcpcd" |
41 |
-else |
42 |
- MY_P="${P/_alpha/-alpha}" |
43 |
- MY_P="${MY_P/_beta/-beta}" |
44 |
- MY_P="${MY_P/_rc/-rc}" |
45 |
- SRC_URI="http://roy.marples.name/downloads/${PN}/${MY_P}.tar.xz" |
46 |
- KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux" |
47 |
- S="${WORKDIR}/${MY_P}" |
48 |
-fi |
49 |
- |
50 |
-inherit eutils systemd toolchain-funcs |
51 |
- |
52 |
-DESCRIPTION="A fully featured, yet light weight RFC2131 compliant DHCP client" |
53 |
-HOMEPAGE="http://roy.marples.name/projects/dhcpcd/" |
54 |
-LICENSE="BSD-2" |
55 |
-SLOT="0" |
56 |
-IUSE="elibc_glibc +embedded ipv6 kernel_linux +udev" |
57 |
- |
58 |
-COMMON_DEPEND="udev? ( virtual/udev )" |
59 |
-DEPEND="${COMMON_DEPEND}" |
60 |
-RDEPEND="${COMMON_DEPEND}" |
61 |
- |
62 |
-if [[ ${PV} == "9999" ]]; then |
63 |
- DEPEND+=" dev-vcs/fossil" |
64 |
- |
65 |
- src_unpack() |
66 |
- { |
67 |
- local distdir=${PORTAGE_ACTUAL_DISTDIR:-${DISTDIR}} |
68 |
- local repo=${distdir}/fossil/${PN}.fossil |
69 |
- |
70 |
- addwrite "${distdir}" |
71 |
- |
72 |
- if [[ -e "${repo}" ]]; then |
73 |
- fossil pull "${FOSSIL_URI}" -R "${repo}" || die |
74 |
- else |
75 |
- mkdir -p "${distdir}/fossil" || die |
76 |
- fossil clone "${FOSSIL_URI}" "${repo}" || die |
77 |
- fi |
78 |
- |
79 |
- mkdir -p "${S}" || die |
80 |
- cd "${S}" || die |
81 |
- fossil open "${repo}" || die |
82 |
- } |
83 |
-fi |
84 |
- |
85 |
-src_prepare() |
86 |
-{ |
87 |
- epatch_user |
88 |
-} |
89 |
- |
90 |
-src_configure() |
91 |
-{ |
92 |
- local dev hooks rundir |
93 |
- use udev || dev="--without-dev --without-udev" |
94 |
- hooks="--with-hook=ntp.conf" |
95 |
- use elibc_glibc && hooks="${hooks} --with-hook=yp.conf" |
96 |
- use kernel_linux && rundir="--rundir=${EPREFIX}/run" |
97 |
- econf \ |
98 |
- --prefix="${EPREFIX}" \ |
99 |
- --libexecdir="${EPREFIX}/lib/dhcpcd" \ |
100 |
- --dbdir="${EPREFIX}/var/lib/dhcpcd" \ |
101 |
- --localstatedir="${EPREFIX}/var" \ |
102 |
- ${rundir} \ |
103 |
- $(use_enable embedded) \ |
104 |
- $(use_enable ipv6) \ |
105 |
- ${dev} \ |
106 |
- CC="$(tc-getCC)" \ |
107 |
- ${hooks} |
108 |
-} |
109 |
- |
110 |
-src_install() |
111 |
-{ |
112 |
- default |
113 |
- newinitd "${FILESDIR}"/${PN}.initd ${PN} |
114 |
- systemd_dounit "${FILESDIR}"/${PN}.service |
115 |
-} |
116 |
- |
117 |
-pkg_postinst() |
118 |
-{ |
119 |
- # Upgrade the duid file to the new format if needed |
120 |
- local old_duid="${ROOT}"/var/lib/dhcpcd/dhcpcd.duid |
121 |
- local new_duid="${ROOT}"/etc/dhcpcd.duid |
122 |
- if [ -e "${old_duid}" ] && ! grep -q '..:..:..:..:..:..' "${old_duid}"; then |
123 |
- sed -i -e 's/\(..\)/\1:/g; s/:$//g' "${old_duid}" |
124 |
- fi |
125 |
- |
126 |
- # Move the duid to /etc, a more sensible location |
127 |
- if [ -e "${old_duid}" -a ! -e "${new_duid}" ]; then |
128 |
- cp -p "${old_duid}" "${new_duid}" |
129 |
- fi |
130 |
- |
131 |
- if [ -z "$REPLACING_VERSIONS" ]; then |
132 |
- elog |
133 |
- elog "dhcpcd has zeroconf support active by default." |
134 |
- elog "This means it will always obtain an IP address even if no" |
135 |
- elog "DHCP server can be contacted, which will break any existing" |
136 |
- elog "failover support you may have configured in your net configuration." |
137 |
- elog "This behaviour can be controlled with the noipv4ll configuration" |
138 |
- elog "file option or the -L command line switch." |
139 |
- elog "See the dhcpcd and dhcpcd.conf man pages for more details." |
140 |
- |
141 |
- elog |
142 |
- elog "Dhcpcd has duid enabled by default, and this may cause issues" |
143 |
- elog "with some dhcp servers. For more information, see" |
144 |
- elog "https://bugs.gentoo.org/show_bug.cgi?id=477356" |
145 |
- fi |
146 |
- |
147 |
- if ! has_version net-dns/bind-tools; then |
148 |
- elog |
149 |
- elog "If you activate the lookup-hostname hook to look up your hostname" |
150 |
- elog "using the dns, you need to install net-dns/bind-tools." |
151 |
- fi |
152 |
-} |
153 |
|
154 |
diff --git a/net-misc/dhcpcd/dhcpcd-6.11.1-r1.ebuild b/net-misc/dhcpcd/dhcpcd-6.11.1-r1.ebuild |
155 |
deleted file mode 100644 |
156 |
index 7b184ca4475..00000000000 |
157 |
--- a/net-misc/dhcpcd/dhcpcd-6.11.1-r1.ebuild |
158 |
+++ /dev/null |
159 |
@@ -1,118 +0,0 @@ |
160 |
-# Copyright 1999-2018 Gentoo Foundation |
161 |
-# Distributed under the terms of the GNU General Public License v2 |
162 |
- |
163 |
-EAPI=6 |
164 |
- |
165 |
-if [[ ${PV} == "9999" ]]; then |
166 |
- FOSSIL_URI="http://roy.marples.name/projects/dhcpcd" |
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="http://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 ~arm-linux ~x86-linux" |
173 |
- S="${WORKDIR}/${MY_P}" |
174 |
-fi |
175 |
- |
176 |
-inherit systemd toolchain-funcs |
177 |
- |
178 |
-DESCRIPTION="A fully featured, yet light weight RFC2131 compliant DHCP client" |
179 |
-HOMEPAGE="http://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 |
-if [[ ${PV} == "9999" ]]; then |
189 |
- DEPEND+=" dev-vcs/fossil" |
190 |
- |
191 |
- src_unpack() |
192 |
- { |
193 |
- local distdir=${PORTAGE_ACTUAL_DISTDIR:-${DISTDIR}} |
194 |
- local repo=${distdir}/fossil/${PN}.fossil |
195 |
- |
196 |
- addwrite "${distdir}" |
197 |
- |
198 |
- if [[ -e "${repo}" ]]; then |
199 |
- fossil pull "${FOSSIL_URI}" -R "${repo}" || die |
200 |
- else |
201 |
- mkdir -p "${distdir}/fossil" || die |
202 |
- fossil clone "${FOSSIL_URI}" "${repo}" || die |
203 |
- fi |
204 |
- |
205 |
- mkdir -p "${S}" || die |
206 |
- cd "${S}" || die |
207 |
- fossil open "${repo}" || die |
208 |
- } |
209 |
-fi |
210 |
- |
211 |
-PATCHES=( |
212 |
-"${FILESDIR}"/${P}-arp-conflict.patch |
213 |
-) |
214 |
- |
215 |
-src_configure() |
216 |
-{ |
217 |
- local dev hooks rundir |
218 |
- use udev || dev="--without-dev --without-udev" |
219 |
- hooks="--with-hook=ntp.conf" |
220 |
- use elibc_glibc && hooks="${hooks} --with-hook=yp.conf" |
221 |
- use kernel_linux && rundir="--rundir=${EPREFIX}/run" |
222 |
- econf \ |
223 |
- --prefix="${EPREFIX}" \ |
224 |
- --libexecdir="${EPREFIX}/lib/dhcpcd" \ |
225 |
- --dbdir="${EPREFIX}/var/lib/dhcpcd" \ |
226 |
- --localstatedir="${EPREFIX}/var" \ |
227 |
- ${rundir} \ |
228 |
- $(use_enable embedded) \ |
229 |
- $(use_enable ipv6) \ |
230 |
- ${dev} \ |
231 |
- CC="$(tc-getCC)" \ |
232 |
- ${hooks} |
233 |
-} |
234 |
- |
235 |
-src_install() |
236 |
-{ |
237 |
- default |
238 |
- newinitd "${FILESDIR}"/${PN}.initd ${PN} |
239 |
- systemd_dounit "${FILESDIR}"/${PN}.service |
240 |
-} |
241 |
- |
242 |
-pkg_postinst() |
243 |
-{ |
244 |
- # Upgrade the duid file to the new format if needed |
245 |
- local old_duid="${ROOT}"/var/lib/dhcpcd/dhcpcd.duid |
246 |
- local new_duid="${ROOT}"/etc/dhcpcd.duid |
247 |
- if [ -e "${old_duid}" ] && ! grep -q '..:..:..:..:..:..' "${old_duid}"; then |
248 |
- sed -i -e 's/\(..\)/\1:/g; s/:$//g' "${old_duid}" |
249 |
- fi |
250 |
- |
251 |
- # Move the duid to /etc, a more sensible location |
252 |
- if [ -e "${old_duid}" -a ! -e "${new_duid}" ]; then |
253 |
- cp -p "${old_duid}" "${new_duid}" |
254 |
- fi |
255 |
- |
256 |
- if [ -z "$REPLACING_VERSIONS" ]; then |
257 |
- elog |
258 |
- elog "dhcpcd has zeroconf support active by default." |
259 |
- elog "This means it will always obtain an IP address even if no" |
260 |
- elog "DHCP server can be contacted, which will break any existing" |
261 |
- elog "failover support you may have configured in your net configuration." |
262 |
- elog "This behaviour can be controlled with the noipv4ll configuration" |
263 |
- elog "file option or the -L command line switch." |
264 |
- elog "See the dhcpcd and dhcpcd.conf man pages for more details." |
265 |
- |
266 |
- elog |
267 |
- elog "Dhcpcd has duid enabled by default, and this may cause issues" |
268 |
- elog "with some dhcp servers. For more information, see" |
269 |
- elog "https://bugs.gentoo.org/show_bug.cgi?id=477356" |
270 |
- fi |
271 |
- |
272 |
- if ! has_version net-dns/bind-tools; then |
273 |
- elog |
274 |
- elog "If you activate the lookup-hostname hook to look up your hostname" |
275 |
- elog "using the dns, you need to install net-dns/bind-tools." |
276 |
- fi |
277 |
-} |