| 1 |
fauli 11/01/04 08:52:52 |
| 2 |
|
| 3 |
Modified: metadata.xml ChangeLog vpnc-0.5.3_p451.ebuild |
| 4 |
Log: |
| 5 |
revert USE flag logic, so GnuTLS is used as default for hybrid auth and OpenSSL only on request |
| 6 |
|
| 7 |
(Portage version: 2.1.9.25/cvs/Linux i686) |
| 8 |
|
| 9 |
Revision Changes Path |
| 10 |
1.8 net-misc/vpnc/metadata.xml |
| 11 |
|
| 12 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-misc/vpnc/metadata.xml?rev=1.8&view=markup |
| 13 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-misc/vpnc/metadata.xml?rev=1.8&content-type=text/plain |
| 14 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-misc/vpnc/metadata.xml?r1=1.7&r2=1.8 |
| 15 |
|
| 16 |
Index: metadata.xml |
| 17 |
=================================================================== |
| 18 |
RCS file: /var/cvsroot/gentoo-x86/net-misc/vpnc/metadata.xml,v |
| 19 |
retrieving revision 1.7 |
| 20 |
retrieving revision 1.8 |
| 21 |
diff -u -r1.7 -r1.8 |
| 22 |
--- metadata.xml 31 May 2009 13:35:27 -0000 1.7 |
| 23 |
+++ metadata.xml 4 Jan 2011 08:52:52 -0000 1.8 |
| 24 |
@@ -7,6 +7,7 @@ |
| 25 |
<name>Christian Faulhammer</name> |
| 26 |
</maintainer> |
| 27 |
<use> |
| 28 |
+ <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> |
| 29 |
<flag name="hybrid-auth">Enable hybrid authentication (certificates), only if not redistributed as compiled binary</flag> |
| 30 |
<flag name="resolvconf">Enable support for DNS managing framework <pkg>net-dns/openresolv</pkg></flag> |
| 31 |
</use> |
| 32 |
|
| 33 |
|
| 34 |
|
| 35 |
1.92 net-misc/vpnc/ChangeLog |
| 36 |
|
| 37 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-misc/vpnc/ChangeLog?rev=1.92&view=markup |
| 38 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-misc/vpnc/ChangeLog?rev=1.92&content-type=text/plain |
| 39 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-misc/vpnc/ChangeLog?r1=1.91&r2=1.92 |
| 40 |
|
| 41 |
Index: ChangeLog |
| 42 |
=================================================================== |
| 43 |
RCS file: /var/cvsroot/gentoo-x86/net-misc/vpnc/ChangeLog,v |
| 44 |
retrieving revision 1.91 |
| 45 |
retrieving revision 1.92 |
| 46 |
diff -u -r1.91 -r1.92 |
| 47 |
--- ChangeLog 3 Jan 2011 15:24:06 -0000 1.91 |
| 48 |
+++ ChangeLog 4 Jan 2011 08:52:52 -0000 1.92 |
| 49 |
@@ -1,6 +1,11 @@ |
| 50 |
# ChangeLog for net-misc/vpnc |
| 51 |
# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 |
| 52 |
-# $Header: /var/cvsroot/gentoo-x86/net-misc/vpnc/ChangeLog,v 1.91 2011/01/03 15:24:06 fauli Exp $ |
| 53 |
+# $Header: /var/cvsroot/gentoo-x86/net-misc/vpnc/ChangeLog,v 1.92 2011/01/04 08:52:52 fauli Exp $ |
| 54 |
+ |
| 55 |
+ 04 Jan 2011; Christian Faulhammer <fauli@g.o> |
| 56 |
+ vpnc-0.5.3_p451.ebuild: |
| 57 |
+ revert USE flag logic, so GnuTLS is used as default for hybrid auth and |
| 58 |
+ OpenSSL only on request |
| 59 |
|
| 60 |
*vpnc-0.5.3_p451 (03 Jan 2011) |
| 61 |
|
| 62 |
|
| 63 |
|
| 64 |
|
| 65 |
1.2 net-misc/vpnc/vpnc-0.5.3_p451.ebuild |
| 66 |
|
| 67 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-misc/vpnc/vpnc-0.5.3_p451.ebuild?rev=1.2&view=markup |
| 68 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-misc/vpnc/vpnc-0.5.3_p451.ebuild?rev=1.2&content-type=text/plain |
| 69 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-misc/vpnc/vpnc-0.5.3_p451.ebuild?r1=1.1&r2=1.2 |
| 70 |
|
| 71 |
Index: vpnc-0.5.3_p451.ebuild |
| 72 |
=================================================================== |
| 73 |
RCS file: /var/cvsroot/gentoo-x86/net-misc/vpnc/vpnc-0.5.3_p451.ebuild,v |
| 74 |
retrieving revision 1.1 |
| 75 |
retrieving revision 1.2 |
| 76 |
diff -u -r1.1 -r1.2 |
| 77 |
--- vpnc-0.5.3_p451.ebuild 3 Jan 2011 15:24:06 -0000 1.1 |
| 78 |
+++ vpnc-0.5.3_p451.ebuild 4 Jan 2011 08:52:52 -0000 1.2 |
| 79 |
@@ -1,6 +1,6 @@ |
| 80 |
# Copyright 1999-2011 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_p451.ebuild,v 1.1 2011/01/03 15:24:06 fauli Exp $ |
| 83 |
+# $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 $ |
| 84 |
|
| 85 |
EAPI=3 |
| 86 |
|
| 87 |
@@ -15,13 +15,12 @@ |
| 88 |
LICENSE="GPL-2 BSD" |
| 89 |
SLOT="0" |
| 90 |
KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~sparc ~x86" |
| 91 |
-IUSE="resolvconf gnutls bindist" |
| 92 |
+IUSE="resolvconf openssl bindist" |
| 93 |
|
| 94 |
DEPEND=">=dev-libs/libgcrypt-1.1.91 |
| 95 |
>=sys-apps/iproute2-2.6.19.20061214 |
| 96 |
- gnutls? ( net-libs/gnutls ) |
| 97 |
bindist? ( net-libs/gnutls ) |
| 98 |
- !gnutls? ( |
| 99 |
+ openssl? ( |
| 100 |
!bindist? ( dev-libs/openssl ) |
| 101 |
)" |
| 102 |
|
| 103 |
@@ -29,7 +28,7 @@ |
| 104 |
resolvconf? ( net-dns/openresolv )" |
| 105 |
|
| 106 |
src_prepare() { |
| 107 |
- if ! use gnutls && ! use bindist; then |
| 108 |
+ if use openssl && ! use bindist; then |
| 109 |
sed -i -e 's/#OPENSSL_GPL_VIOLATION=yes/OPENSSL_GPL_VIOLATION=yes/' "${S}"/Makefile \ |
| 110 |
|| die |
| 111 |
ewarn "Building SSL support with OpenSSL instead of GnuTLS. This means that" |
Archives