diff options
| -rw-r--r-- | net-misc/vpnc/ChangeLog | 7 | ||||
| -rw-r--r-- | net-misc/vpnc/metadata.xml | 1 | ||||
| -rw-r--r-- | net-misc/vpnc/vpnc-0.5.3_p451.ebuild | 9 |
3 files changed, 11 insertions, 6 deletions
diff --git a/net-misc/vpnc/ChangeLog b/net-misc/vpnc/ChangeLog index ca78787fd33c..387596779148 100644 --- a/net-misc/vpnc/ChangeLog +++ b/net-misc/vpnc/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for net-misc/vpnc # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/net-misc/vpnc/ChangeLog,v 1.91 2011/01/03 15:24:06 fauli Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-misc/vpnc/ChangeLog,v 1.92 2011/01/04 08:52:52 fauli Exp $ + + 04 Jan 2011; Christian Faulhammer <fauli@gentoo.org> + vpnc-0.5.3_p451.ebuild: + revert USE flag logic, so GnuTLS is used as default for hybrid auth and + OpenSSL only on request *vpnc-0.5.3_p451 (03 Jan 2011) diff --git a/net-misc/vpnc/metadata.xml b/net-misc/vpnc/metadata.xml index f1e3da9a585e..5864d32b4ccb 100644 --- a/net-misc/vpnc/metadata.xml +++ b/net-misc/vpnc/metadata.xml @@ -7,6 +7,7 @@ <name>Christian Faulhammer</name> </maintainer> <use> + <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> <flag name="hybrid-auth">Enable hybrid authentication (certificates), only if not redistributed as compiled binary</flag> <flag name="resolvconf">Enable support for DNS managing framework <pkg>net-dns/openresolv</pkg></flag> </use> diff --git a/net-misc/vpnc/vpnc-0.5.3_p451.ebuild b/net-misc/vpnc/vpnc-0.5.3_p451.ebuild index 5b9eb8f42ac0..05f2dc341cf2 100644 --- a/net-misc/vpnc/vpnc-0.5.3_p451.ebuild +++ b/net-misc/vpnc/vpnc-0.5.3_p451.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2011 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $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 $ +# $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 $ EAPI=3 @@ -15,13 +15,12 @@ SRC_URI="mirror://gentoo/${P}.tar.bz2" LICENSE="GPL-2 BSD" SLOT="0" KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~sparc ~x86" -IUSE="resolvconf gnutls bindist" +IUSE="resolvconf openssl bindist" DEPEND=">=dev-libs/libgcrypt-1.1.91 >=sys-apps/iproute2-2.6.19.20061214 - gnutls? ( net-libs/gnutls ) bindist? ( net-libs/gnutls ) - !gnutls? ( + openssl? ( !bindist? ( dev-libs/openssl ) )" @@ -29,7 +28,7 @@ RDEPEND="${DEPEND} resolvconf? ( net-dns/openresolv )" src_prepare() { - if ! use gnutls && ! use bindist; then + if use openssl && ! use bindist; then sed -i -e 's/#OPENSSL_GPL_VIOLATION=yes/OPENSSL_GPL_VIOLATION=yes/' "${S}"/Makefile \ || die ewarn "Building SSL support with OpenSSL instead of GnuTLS. This means that" |