Get Gentoo!
gentoo.org sites
gentoo.org Wiki Bugs Forums Packages
Planet Archives Sources
Infra Status

Gentoo Archives: gentoo-commits

From: "Justin Lecher (jlec)" <jlec@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in net-misc/vpnc: vpnc-0.5.3_p514.ebuild vpnc-0.5.3_p457-r1.ebuild vpnc-0.5.3_p451.ebuild ChangeLog metadata.xml vpnc-0.5.3_p457-r2.ebuild
Date: Sun, 01 Apr 2012 05:42:02
Message-Id: 20120401054152.B7D752004B@flycatcher.gentoo.org
1 jlec 12/04/01 05:41:52
2
3 Modified: vpnc-0.5.3_p514.ebuild vpnc-0.5.3_p457-r1.ebuild
4 vpnc-0.5.3_p451.ebuild ChangeLog metadata.xml
5 vpnc-0.5.3_p457-r2.ebuild
6 Log:
7 Don't use openssl but gnutls to switch the SSL implementation; default on gnutls; Move to EAPI=4
8
9 (Portage version: 2.2.0_alpha96/cvs/Linux x86_64)
10
11 Revision Changes Path
12 1.2 net-misc/vpnc/vpnc-0.5.3_p514.ebuild
13
14 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-misc/vpnc/vpnc-0.5.3_p514.ebuild?rev=1.2&view=markup
15 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-misc/vpnc/vpnc-0.5.3_p514.ebuild?rev=1.2&content-type=text/plain
16 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-misc/vpnc/vpnc-0.5.3_p514.ebuild?r1=1.1&r2=1.2
17
18 Index: vpnc-0.5.3_p514.ebuild
19 ===================================================================
20 RCS file: /var/cvsroot/gentoo-x86/net-misc/vpnc/vpnc-0.5.3_p514.ebuild,v
21 retrieving revision 1.1
22 retrieving revision 1.2
23 diff -u -r1.1 -r1.2
24 --- vpnc-0.5.3_p514.ebuild 14 Feb 2012 19:14:11 -0000 1.1
25 +++ vpnc-0.5.3_p514.ebuild 1 Apr 2012 05:41:52 -0000 1.2
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/vpnc/vpnc-0.5.3_p514.ebuild,v 1.1 2012/02/14 19:14:11 jlec Exp $
30 +# $Header: /var/cvsroot/gentoo-x86/net-misc/vpnc/vpnc-0.5.3_p514.ebuild,v 1.2 2012/04/01 05:41:52 jlec Exp $
31
32 EAPI=4
33
34 @@ -18,7 +18,7 @@
35 LICENSE="GPL-2 BSD"
36 SLOT="0"
37 KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~sparc ~x86"
38 -IUSE="resolvconf openssl bindist"
39 +IUSE="resolvconf +gnutls bindist"
40
41 DEPEND="
42 dev-lang/perl
43 @@ -26,14 +26,14 @@
44 >=sys-apps/iproute2-2.6.19.20061214[-minimal]
45 bindist? ( net-libs/gnutls )
46 !bindist? (
47 - openssl? ( dev-libs/openssl )
48 - !openssl? ( net-libs/gnutls )
49 + gnutls? ( net-libs/gnutls )
50 + !gnutls? ( dev-libs/openssl )
51 )"
52 RDEPEND="${DEPEND}
53 resolvconf? ( net-dns/openresolv )"
54
55 src_prepare() {
56 - if use openssl && ! use bindist; then
57 + if ! use gnutls && ! use bindist; then
58 sed -i -e '/^#OPENSSL_GPL_VIOLATION/s:#::g' "${S}"/Makefile || die
59 ewarn "Building SSL support with OpenSSL instead of GnuTLS. This means that"
60 ewarn "you are not allowed to re-distibute the binaries due to conflicts between BSD license and GPL,"
61
62
63
64 1.2 net-misc/vpnc/vpnc-0.5.3_p457-r1.ebuild
65
66 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-misc/vpnc/vpnc-0.5.3_p457-r1.ebuild?rev=1.2&view=markup
67 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-misc/vpnc/vpnc-0.5.3_p457-r1.ebuild?rev=1.2&content-type=text/plain
68 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-misc/vpnc/vpnc-0.5.3_p457-r1.ebuild?r1=1.1&r2=1.2
69
70 Index: vpnc-0.5.3_p457-r1.ebuild
71 ===================================================================
72 RCS file: /var/cvsroot/gentoo-x86/net-misc/vpnc/vpnc-0.5.3_p457-r1.ebuild,v
73 retrieving revision 1.1
74 retrieving revision 1.2
75 diff -u -r1.1 -r1.2
76 --- vpnc-0.5.3_p457-r1.ebuild 12 Feb 2011 23:57:06 -0000 1.1
77 +++ vpnc-0.5.3_p457-r1.ebuild 1 Apr 2012 05:41:52 -0000 1.2
78 @@ -1,8 +1,8 @@
79 -# Copyright 1999-2011 Gentoo Foundation
80 +# Copyright 1999-2012 Gentoo Foundation
81 # Distributed under the terms of the GNU General Public License v2
82 -# $Header: /var/cvsroot/gentoo-x86/net-misc/vpnc/vpnc-0.5.3_p457-r1.ebuild,v 1.1 2011/02/12 23:57:06 fauli Exp $
83 +# $Header: /var/cvsroot/gentoo-x86/net-misc/vpnc/vpnc-0.5.3_p457-r1.ebuild,v 1.2 2012/04/01 05:41:52 jlec Exp $
84
85 -EAPI=3
86 +EAPI=4
87
88 DESCRIPTION="Free client for Cisco VPN routing software"
89 HOMEPAGE="http://www.unix-ag.uni-kl.de/~massar/vpnc/"
90 @@ -15,20 +15,20 @@
91 LICENSE="GPL-2 BSD"
92 SLOT="0"
93 KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~sparc ~x86"
94 -IUSE="resolvconf openssl bindist"
95 +IUSE="resolvconf +gnutls bindist"
96
97 DEPEND=">=dev-libs/libgcrypt-1.1.91
98 >=sys-apps/iproute2-2.6.19.20061214
99 bindist? ( net-libs/gnutls )
100 - openssl? (
101 - !bindist? ( dev-libs/openssl )
102 + !bindist? (
103 + gnutls? ( net-libs/gnutls )
104 + !gnutls? ( dev-libs/openssl )
105 )"
106 -
107 RDEPEND="${DEPEND}
108 resolvconf? ( net-dns/openresolv )"
109
110 src_prepare() {
111 - if use openssl && ! use bindist; then
112 + if ! use gnutls && ! use bindist; then
113 sed -i -e 's/#OPENSSL_GPL_VIOLATION=yes/OPENSSL_GPL_VIOLATION=yes/' "${S}"/Makefile \
114 || die
115 ewarn "Building SSL support with OpenSSL instead of GnuTLS. This means that"
116 @@ -41,14 +41,14 @@
117 }
118
119 src_install() {
120 - emake PREFIX="/usr" DESTDIR="${D}" install || die
121 - dodoc README TODO VERSION || die
122 + emake PREFIX="/usr" DESTDIR="${D}" install
123 + dodoc README TODO VERSION
124 keepdir /etc/vpnc/scripts.d
125 - newinitd "${FILESDIR}/vpnc-3.init" vpnc || die
126 - newconfd "${FILESDIR}/vpnc.confd" vpnc || die
127 + newinitd "${FILESDIR}/vpnc-3.init" vpnc
128 + newconfd "${FILESDIR}/vpnc.confd" vpnc
129 sed -e "s:/usr/local:/usr:" -i "${D}"/etc/vpnc/vpnc-script || die
130 # COPYING file resides here, should not be installed
131 - rm -rf "${D}"/usr/share/doc/vpnc/
132 + rm -rf "${D}"/usr/share/doc/vpnc/ || die
133 }
134
135 pkg_postinst() {
136
137
138
139 1.3 net-misc/vpnc/vpnc-0.5.3_p451.ebuild
140
141 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-misc/vpnc/vpnc-0.5.3_p451.ebuild?rev=1.3&view=markup
142 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-misc/vpnc/vpnc-0.5.3_p451.ebuild?rev=1.3&content-type=text/plain
143 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-misc/vpnc/vpnc-0.5.3_p451.ebuild?r1=1.2&r2=1.3
144
145 Index: vpnc-0.5.3_p451.ebuild
146 ===================================================================
147 RCS file: /var/cvsroot/gentoo-x86/net-misc/vpnc/vpnc-0.5.3_p451.ebuild,v
148 retrieving revision 1.2
149 retrieving revision 1.3
150 diff -u -r1.2 -r1.3
151 --- vpnc-0.5.3_p451.ebuild 4 Jan 2011 08:52:52 -0000 1.2
152 +++ vpnc-0.5.3_p451.ebuild 1 Apr 2012 05:41:52 -0000 1.3
153 @@ -1,8 +1,8 @@
154 -# Copyright 1999-2011 Gentoo Foundation
155 +# Copyright 1999-2012 Gentoo Foundation
156 # Distributed under the terms of the GNU General Public License v2
157 -# $Header: /var/cvsroot/gentoo-x86/net-misc/vpnc/vpnc-0.5.3_p451.ebuild,v 1.2 2011/01/04 08:52:52 fauli Exp $
158 +# $Header: /var/cvsroot/gentoo-x86/net-misc/vpnc/vpnc-0.5.3_p451.ebuild,v 1.3 2012/04/01 05:41:52 jlec Exp $
159
160 -EAPI=3
161 +EAPI=4
162
163 DESCRIPTION="Free client for Cisco VPN routing software"
164 HOMEPAGE="http://www.unix-ag.uni-kl.de/~massar/vpnc/"
165 @@ -15,20 +15,20 @@
166 LICENSE="GPL-2 BSD"
167 SLOT="0"
168 KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~sparc ~x86"
169 -IUSE="resolvconf openssl bindist"
170 +IUSE="resolvconf +gnutls bindist"
171
172 DEPEND=">=dev-libs/libgcrypt-1.1.91
173 >=sys-apps/iproute2-2.6.19.20061214
174 bindist? ( net-libs/gnutls )
175 - openssl? (
176 - !bindist? ( dev-libs/openssl )
177 + !bindist? (
178 + gnutls? ( net-libs/gnutls )
179 + !gnutls? ( dev-libs/openssl )
180 )"
181 -
182 RDEPEND="${DEPEND}
183 resolvconf? ( net-dns/openresolv )"
184
185 src_prepare() {
186 - if use openssl && ! use bindist; then
187 + if ! use gnutls && ! use bindist; then
188 sed -i -e 's/#OPENSSL_GPL_VIOLATION=yes/OPENSSL_GPL_VIOLATION=yes/' "${S}"/Makefile \
189 || die
190 ewarn "Building SSL support with OpenSSL instead of GnuTLS. This means that"
191 @@ -41,14 +41,14 @@
192 }
193
194 src_install() {
195 - emake PREFIX="/usr" DESTDIR="${D}" install || die
196 - dodoc README TODO VERSION || die
197 + emake PREFIX="/usr" DESTDIR="${D}" install
198 + dodoc README TODO VERSION
199 keepdir /etc/vpnc/scripts.d
200 - newinitd "${FILESDIR}/vpnc-3.init" vpnc || die
201 - newconfd "${FILESDIR}/vpnc.confd" vpnc || die
202 + newinitd "${FILESDIR}/vpnc-3.init" vpnc
203 + newconfd "${FILESDIR}/vpnc.confd" vpnc
204 sed -e "s:/usr/local:/usr:" -i "${D}"/etc/vpnc/vpnc-script || die
205 # COPYING file resides here, should not be installed
206 - rm -rf "${D}"/usr/share/doc/vpnc/
207 + rm -rf "${D}"/usr/share/doc/vpnc/ || die
208 }
209
210 pkg_postinst() {
211
212
213
214 1.100 net-misc/vpnc/ChangeLog
215
216 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-misc/vpnc/ChangeLog?rev=1.100&view=markup
217 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-misc/vpnc/ChangeLog?rev=1.100&content-type=text/plain
218 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-misc/vpnc/ChangeLog?r1=1.99&r2=1.100
219
220 Index: ChangeLog
221 ===================================================================
222 RCS file: /var/cvsroot/gentoo-x86/net-misc/vpnc/ChangeLog,v
223 retrieving revision 1.99
224 retrieving revision 1.100
225 diff -u -r1.99 -r1.100
226 --- ChangeLog 14 Feb 2012 19:14:11 -0000 1.99
227 +++ ChangeLog 1 Apr 2012 05:41:52 -0000 1.100
228 @@ -1,6 +1,12 @@
229 # ChangeLog for net-misc/vpnc
230 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
231 -# $Header: /var/cvsroot/gentoo-x86/net-misc/vpnc/ChangeLog,v 1.99 2012/02/14 19:14:11 jlec Exp $
232 +# $Header: /var/cvsroot/gentoo-x86/net-misc/vpnc/ChangeLog,v 1.100 2012/04/01 05:41:52 jlec Exp $
233 +
234 + 01 Apr 2012; Justin Lecher <jlec@g.o> vpnc-0.5.3_p451.ebuild,
235 + vpnc-0.5.3_p457-r1.ebuild, vpnc-0.5.3_p457-r2.ebuild, vpnc-0.5.3_p514.ebuild,
236 + metadata.xml:
237 + Don't use openssl but gnutls to switch the SSL implementation; default on
238 + gnutls; Move to EAPI=4
239
240 *vpnc-0.5.3_p514 (14 Feb 2012)
241
242
243
244
245 1.13 net-misc/vpnc/metadata.xml
246
247 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-misc/vpnc/metadata.xml?rev=1.13&view=markup
248 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-misc/vpnc/metadata.xml?rev=1.13&content-type=text/plain
249 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-misc/vpnc/metadata.xml?r1=1.12&r2=1.13
250
251 Index: metadata.xml
252 ===================================================================
253 RCS file: /var/cvsroot/gentoo-x86/net-misc/vpnc/metadata.xml,v
254 retrieving revision 1.12
255 retrieving revision 1.13
256 diff -u -r1.12 -r1.13
257 --- metadata.xml 14 Feb 2012 19:14:11 -0000 1.12
258 +++ metadata.xml 1 Apr 2012 05:41:52 -0000 1.13
259 @@ -14,7 +14,6 @@
260 <name>Christian Faulhammer</name>
261 </maintainer>
262 <use>
263 - <flag name="openssl">Use <pkg>dev-libs/openssl</pkg> for hybrid-auth instead of <pkg>net-libs/gnutls, may cause license issues when redistributing</pkg>.</flag>
264 <flag name="hybrid-auth">Enable hybrid authentication (certificates), only if not redistributed as compiled binary</flag>
265 <flag name="resolvconf">Enable support for DNS managing framework <pkg>net-dns/openresolv</pkg></flag>
266 </use>
267
268
269
270 1.3 net-misc/vpnc/vpnc-0.5.3_p457-r2.ebuild
271
272 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-misc/vpnc/vpnc-0.5.3_p457-r2.ebuild?rev=1.3&view=markup
273 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-misc/vpnc/vpnc-0.5.3_p457-r2.ebuild?rev=1.3&content-type=text/plain
274 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-misc/vpnc/vpnc-0.5.3_p457-r2.ebuild?r1=1.2&r2=1.3
275
276 Index: vpnc-0.5.3_p457-r2.ebuild
277 ===================================================================
278 RCS file: /var/cvsroot/gentoo-x86/net-misc/vpnc/vpnc-0.5.3_p457-r2.ebuild,v
279 retrieving revision 1.2
280 retrieving revision 1.3
281 diff -u -r1.2 -r1.3
282 --- vpnc-0.5.3_p457-r2.ebuild 14 Feb 2012 19:14:11 -0000 1.2
283 +++ vpnc-0.5.3_p457-r2.ebuild 1 Apr 2012 05:41:52 -0000 1.3
284 @@ -1,8 +1,8 @@
285 # Copyright 1999-2012 Gentoo Foundation
286 # Distributed under the terms of the GNU General Public License v2
287 -# $Header: /var/cvsroot/gentoo-x86/net-misc/vpnc/vpnc-0.5.3_p457-r2.ebuild,v 1.2 2012/02/14 19:14:11 jlec Exp $
288 +# $Header: /var/cvsroot/gentoo-x86/net-misc/vpnc/vpnc-0.5.3_p457-r2.ebuild,v 1.3 2012/04/01 05:41:52 jlec Exp $
289
290 -EAPI=3
291 +EAPI=4
292
293 DESCRIPTION="Free client for Cisco VPN routing software"
294 HOMEPAGE="http://www.unix-ag.uni-kl.de/~massar/vpnc/"
295 @@ -16,21 +16,20 @@
296 LICENSE="GPL-2 BSD"
297 SLOT="0"
298 KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~sparc ~x86"
299 -IUSE="resolvconf openssl bindist"
300 +IUSE="resolvconf +gnutls bindist"
301
302 DEPEND=">=dev-libs/libgcrypt-1.1.91
303 >=sys-apps/iproute2-2.6.19.20061214[-minimal]
304 bindist? ( net-libs/gnutls )
305 !bindist? (
306 - openssl? ( dev-libs/openssl )
307 - !openssl? ( net-libs/gnutls )
308 + gnutls? ( net-libs/gnutls )
309 + !gnutls? ( dev-libs/openssl )
310 )"
311 -
312 RDEPEND="${DEPEND}
313 resolvconf? ( net-dns/openresolv )"
314
315 src_prepare() {
316 - if use openssl && ! use bindist; then
317 + if ! use gnutls && ! use bindist; then
318 sed -i -e 's/#OPENSSL_GPL_VIOLATION=yes/OPENSSL_GPL_VIOLATION=yes/' "${S}"/Makefile \
319 || die
320 ewarn "Building SSL support with OpenSSL instead of GnuTLS. This means that"
321 @@ -43,14 +42,14 @@
322 }
323
324 src_install() {
325 - emake PREFIX="/usr" DESTDIR="${D}" install || die
326 - dodoc README TODO VERSION || die
327 + emake PREFIX="/usr" DESTDIR="${D}" install
328 + dodoc README TODO VERSION
329 keepdir /etc/vpnc/scripts.d
330 - newinitd "${FILESDIR}/vpnc-3.init" vpnc || die
331 - newconfd "${FILESDIR}/vpnc.confd" vpnc || die
332 + newinitd "${FILESDIR}/vpnc-3.init" vpnc
333 + newconfd "${FILESDIR}/vpnc.confd" vpnc
334 sed -e "s:/usr/local:/usr:" -i "${D}"/etc/vpnc/vpnc-script || die
335 # COPYING file resides here, should not be installed
336 - rm -rf "${D}"/usr/share/doc/vpnc/
337 + rm -rf "${D}"/usr/share/doc/vpnc/ || die
338 }
339
340 pkg_postinst() {
Report Message
Find on MARC Find on Google Groups