Gentoo Archives: gentoo-commits

From: "William Hubbs (williamh)" <williamh@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in net-misc/dhcpcd: dhcpcd-5.2.12-r1.ebuild dhcpcd-5.2.12.ebuild ChangeLog dhcpcd-5.5.2.ebuild
Date: Fri, 03 Feb 2012 16:21:46
Message-Id: 20120203162135.37AB12004B@flycatcher.gentoo.org
1 williamh 12/02/03 16:21:35
2
3 Modified: dhcpcd-5.2.12-r1.ebuild dhcpcd-5.2.12.ebuild
4 ChangeLog
5 Added: dhcpcd-5.5.2.ebuild
6 Log:
7 version bump for bug #401403 and repoman fixes.
8
9 (Portage version: 2.2.0_alpha84/cvs/Linux i686)
10
11 Revision Changes Path
12 1.7 net-misc/dhcpcd/dhcpcd-5.2.12-r1.ebuild
13
14 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-misc/dhcpcd/dhcpcd-5.2.12-r1.ebuild?rev=1.7&view=markup
15 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-misc/dhcpcd/dhcpcd-5.2.12-r1.ebuild?rev=1.7&content-type=text/plain
16 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-misc/dhcpcd/dhcpcd-5.2.12-r1.ebuild?r1=1.6&r2=1.7
17
18 Index: dhcpcd-5.2.12-r1.ebuild
19 ===================================================================
20 RCS file: /var/cvsroot/gentoo-x86/net-misc/dhcpcd/dhcpcd-5.2.12-r1.ebuild,v
21 retrieving revision 1.6
22 retrieving revision 1.7
23 diff -u -r1.6 -r1.7
24 --- dhcpcd-5.2.12-r1.ebuild 3 Jan 2012 21:13:45 -0000 1.6
25 +++ dhcpcd-5.2.12-r1.ebuild 3 Feb 2012 16:21:34 -0000 1.7
26 @@ -1,6 +1,6 @@
27 # Copyright 1999-2012 Gentoo Foundation
28 # Distributed under the terms of the GNU General Public License v2
29 -# $Header: /var/cvsroot/gentoo-x86/net-misc/dhcpcd/dhcpcd-5.2.12-r1.ebuild,v 1.6 2012/01/03 21:13:45 swift Exp $
30 +# $Header: /var/cvsroot/gentoo-x86/net-misc/dhcpcd/dhcpcd-5.2.12-r1.ebuild,v 1.7 2012/02/03 16:21:34 williamh Exp $
31
32 EAPI=4
33
34 @@ -22,7 +22,7 @@
35 IUSE="+zeroconf elibc_glibc"
36
37 DEPEND=""
38 -RDEPEND="!<sys-apps/openrc-0.6.0"
39 +RDEPEND=""
40
41 src_prepare() {
42 if ! use zeroconf; then
43
44
45
46 1.10 net-misc/dhcpcd/dhcpcd-5.2.12.ebuild
47
48 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-misc/dhcpcd/dhcpcd-5.2.12.ebuild?rev=1.10&view=markup
49 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-misc/dhcpcd/dhcpcd-5.2.12.ebuild?rev=1.10&content-type=text/plain
50 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-misc/dhcpcd/dhcpcd-5.2.12.ebuild?r1=1.9&r2=1.10
51
52 Index: dhcpcd-5.2.12.ebuild
53 ===================================================================
54 RCS file: /var/cvsroot/gentoo-x86/net-misc/dhcpcd/dhcpcd-5.2.12.ebuild,v
55 retrieving revision 1.9
56 retrieving revision 1.10
57 diff -u -r1.9 -r1.10
58 --- dhcpcd-5.2.12.ebuild 15 Apr 2011 21:39:14 -0000 1.9
59 +++ dhcpcd-5.2.12.ebuild 3 Feb 2012 16:21:34 -0000 1.10
60 @@ -1,6 +1,6 @@
61 -# Copyright 1999-2011 Gentoo Foundation
62 +# Copyright 1999-2012 Gentoo Foundation
63 # Distributed under the terms of the GNU General Public License v2
64 -# $Header: /var/cvsroot/gentoo-x86/net-misc/dhcpcd/dhcpcd-5.2.12.ebuild,v 1.9 2011/04/15 21:39:14 ulm Exp $
65 +# $Header: /var/cvsroot/gentoo-x86/net-misc/dhcpcd/dhcpcd-5.2.12.ebuild,v 1.10 2012/02/03 16:21:34 williamh Exp $
66
67 EAPI=1
68
69 @@ -22,7 +22,7 @@
70 IUSE="+zeroconf elibc_glibc"
71
72 DEPEND=""
73 -RDEPEND="!<sys-apps/openrc-0.6.0"
74 +RDEPEND=""
75
76 src_unpack() {
77 unpack ${A}
78
79
80
81 1.327 net-misc/dhcpcd/ChangeLog
82
83 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-misc/dhcpcd/ChangeLog?rev=1.327&view=markup
84 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-misc/dhcpcd/ChangeLog?rev=1.327&content-type=text/plain
85 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-misc/dhcpcd/ChangeLog?r1=1.326&r2=1.327
86
87 Index: ChangeLog
88 ===================================================================
89 RCS file: /var/cvsroot/gentoo-x86/net-misc/dhcpcd/ChangeLog,v
90 retrieving revision 1.326
91 retrieving revision 1.327
92 diff -u -r1.326 -r1.327
93 --- ChangeLog 3 Jan 2012 21:13:45 -0000 1.326
94 +++ ChangeLog 3 Feb 2012 16:21:34 -0000 1.327
95 @@ -1,6 +1,12 @@
96 # ChangeLog for net-misc/dhcpcd
97 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
98 -# $Header: /var/cvsroot/gentoo-x86/net-misc/dhcpcd/ChangeLog,v 1.326 2012/01/03 21:13:45 swift Exp $
99 +# $Header: /var/cvsroot/gentoo-x86/net-misc/dhcpcd/ChangeLog,v 1.327 2012/02/03 16:21:34 williamh Exp $
100 +
101 +*dhcpcd-5.5.2 (03 Feb 2012)
102 +
103 + 03 Feb 2012; William Hubbs <williamh@g.o> dhcpcd-5.2.12.ebuild,
104 + dhcpcd-5.2.12-r1.ebuild, +dhcpcd-5.5.2.ebuild:
105 + version bump for bug #401403 and repoman fixes.
106
107 03 Jan 2012; <swift@g.o> dhcpcd-5.2.12-r1.ebuild:
108 Sorry, selinux-dhcp is for the server, dhcpcd is a client which is part of
109
110
111
112 1.1 net-misc/dhcpcd/dhcpcd-5.5.2.ebuild
113
114 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-misc/dhcpcd/dhcpcd-5.5.2.ebuild?rev=1.1&view=markup
115 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-misc/dhcpcd/dhcpcd-5.5.2.ebuild?rev=1.1&content-type=text/plain
116
117 Index: dhcpcd-5.5.2.ebuild
118 ===================================================================
119 # Copyright 1999-2012 Gentoo Foundation
120 # Distributed under the terms of the GNU General Public License v2
121 # $Header: /var/cvsroot/gentoo-x86/net-misc/dhcpcd/dhcpcd-5.5.2.ebuild,v 1.1 2012/02/03 16:21:35 williamh Exp $
122
123 EAPI=4
124
125 inherit eutils systemd
126
127 MY_P="${P/_alpha/-alpha}"
128 MY_P="${MY_P/_beta/-beta}"
129 MY_P="${MY_P/_rc/-rc}"
130 S="${WORKDIR}/${MY_P}"
131
132 DESCRIPTION="A fully featured, yet light weight RFC2131 compliant DHCP client"
133 HOMEPAGE="http://roy.marples.name/projects/dhcpcd/"
134 SRC_URI="http://roy.marples.name/downloads/${PN}/${MY_P}.tar.bz2"
135 LICENSE="BSD-2"
136
137 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd ~x86-linux"
138
139 SLOT="0"
140 IUSE="+zeroconf elibc_glibc"
141
142 DEPEND=""
143 RDEPEND=""
144
145 src_prepare() {
146 if ! use zeroconf; then
147 elog "Disabling zeroconf support"
148 {
149 echo
150 echo "# dhcpcd ebuild requested no zeroconf"
151 echo "noipv4ll"
152 } >> dhcpcd.conf
153 fi
154 }
155
156 src_configure() {
157 local hooks="--with-hook=ntp.conf"
158 use elibc_glibc && hooks="${hooks} --with-hook=yp.conf"
159 econf \
160 --prefix="${EPREFIX}" \
161 --libexecdir="${EPREFIX}/lib/dhcpcd" \
162 --dbdir="${EPREFIX}/var/lib/dhcpcd" \
163 --localstatedir="${EPREFIX}/var" \
164 ${hooks}
165 }
166
167 src_install() {
168 default
169 newinitd "${FILESDIR}"/${PN}.initd ${PN}
170 systemd_dounit "${FILESDIR}"/${PN}.service
171 }
172
173 pkg_postinst() {
174 # Upgrade the duid file to the new format if needed
175 local old_duid="${ROOT}"/var/lib/dhcpcd/dhcpcd.duid
176 local new_duid="${ROOT}"/etc/dhcpcd.duid
177 if [ -e "${old_duid}" ] && ! grep -q '..:..:..:..:..:..' "${old_duid}"; then
178 sed -i -e 's/\(..\)/\1:/g; s/:$//g' "${old_duid}"
179 fi
180
181 # Move the duid to /etc, a more sensible location
182 if [ -e "${old_duid}" -a ! -e "${new_duid}" ]; then
183 cp -p "${old_duid}" "${new_duid}"
184 fi
185
186 if use zeroconf; then
187 elog "You have installed dhcpcd with zeroconf support."
188 elog "This means that it will always obtain an IP address even if no"
189 elog "DHCP server can be contacted, which will break any existing"
190 elog "failover support you may have configured in your net configuration."
191 elog "This behaviour can be controlled with the -L flag."
192 elog "See the dhcpcd man page for more details."
193 fi
194
195 elog
196 elog "Users upgrading from 4.0 series should pay attention to removal"
197 elog "of compat useflag. This changes behavior of dhcp in wide manner:"
198 elog "dhcpcd no longer sends a default ClientID for ethernet interfaces."
199 elog "This is so we can re-use the address the kernel DHCP client found."
200 elog "To retain the old behaviour of sending a default ClientID based on the"
201 elog "hardware address for interface, simply add the keyword clientid"
202 elog "to dhcpcd.conf or use commandline parameter -I ''"
203 elog
204 elog "Also, users upgrading from 4.0 series should be aware that"
205 elog "the -N, -R and -Y command line options no longer exist."
206 elog "These are controled now by nohook options in dhcpcd.conf."
207
208 # Mea culpa, feel free to remove that after some time --mgorny.
209 if [[ -e "${ROOT}"/etc/systemd/system/network.target.wants/${PN}.service ]]
210 then
211 ebegin "Moving ${PN}.service to multi-user.target"
212 mv "${ROOT}"/etc/systemd/system/network.target.wants/${PN}.service \
213 "${ROOT}"/etc/systemd/system/multi-user.target.wants/
214 eend ${?} \
215 "Please try to re-enable dhcpcd.service"
216 fi
217 }