summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDirkjan Ochtman <djc@gentoo.org>2014-07-21 09:29:28 +0000
committerDirkjan Ochtman <djc@gentoo.org>2014-07-21 09:29:28 +0000
commit542a84f939efec9110a582128e47524396ef8a2c (patch)
tree7276f13eab7136dd7e826ec1abd1a9a27f4eba44 /net-misc
parentsys-fs/aufs3: Bump to latest aufs3 (diff)
downloadgentoo-2-542a84f939efec9110a582128e47524396ef8a2c.tar.gz
gentoo-2-542a84f939efec9110a582128e47524396ef8a2c.tar.bz2
gentoo-2-542a84f939efec9110a582128e47524396ef8a2c.zip
Make pkcs11 USE depend on ssl flag (fixes bug 517660)
(Portage version: 2.2.10/cvs/Linux x86_64, signed Manifest commit with key 30380381)
Diffstat (limited to 'net-misc')
-rw-r--r--net-misc/openvpn/ChangeLog6
-rw-r--r--net-misc/openvpn/openvpn-2.3.3.ebuild3
-rw-r--r--net-misc/openvpn/openvpn-2.3.4-r1.ebuild3
-rw-r--r--net-misc/openvpn/openvpn-2.3.4.ebuild3
4 files changed, 11 insertions, 4 deletions
diff --git a/net-misc/openvpn/ChangeLog b/net-misc/openvpn/ChangeLog
index 4e76a7b917d1..ebdfd9e3d68a 100644
--- a/net-misc/openvpn/ChangeLog
+++ b/net-misc/openvpn/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for net-misc/openvpn
# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/openvpn/ChangeLog,v 1.292 2014/07/20 15:27:44 klausman Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/openvpn/ChangeLog,v 1.293 2014/07/21 09:29:28 djc Exp $
+
+ 21 Jul 2014; Dirkjan Ochtman <djc@gentoo.org> openvpn-2.3.3.ebuild,
+ openvpn-2.3.4-r1.ebuild, openvpn-2.3.4.ebuild:
+ Make pkcs11 USE depend on ssl flag (fixes bug 517660)
20 Jul 2014; Tobias Klausmann <klausman@gentoo.org> openvpn-2.3.3.ebuild:
Stable on alpha, bug #511668
diff --git a/net-misc/openvpn/openvpn-2.3.3.ebuild b/net-misc/openvpn/openvpn-2.3.3.ebuild
index f05e375a1a49..f7b9611efe81 100644
--- a/net-misc/openvpn/openvpn-2.3.3.ebuild
+++ b/net-misc/openvpn/openvpn-2.3.3.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/openvpn/openvpn-2.3.3.ebuild,v 1.5 2014/07/20 15:27:44 klausman Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/openvpn/openvpn-2.3.3.ebuild,v 1.6 2014/07/21 09:29:28 djc Exp $
EAPI=4
@@ -17,6 +17,7 @@ IUSE="examples down-root iproute2 pam passwordsave pkcs11 +plugins +polarssl sel
REQUIRED_USE="static? ( !plugins !pkcs11 )
polarssl? ( ssl )
+ pkcs11? ( ssl )
!plugins? ( !pam !down-root )"
DEPEND="
diff --git a/net-misc/openvpn/openvpn-2.3.4-r1.ebuild b/net-misc/openvpn/openvpn-2.3.4-r1.ebuild
index 415af783d0f7..3dc0834d685b 100644
--- a/net-misc/openvpn/openvpn-2.3.4-r1.ebuild
+++ b/net-misc/openvpn/openvpn-2.3.4-r1.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/openvpn/openvpn-2.3.4-r1.ebuild,v 1.1 2014/07/03 07:34:48 pva Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/openvpn/openvpn-2.3.4-r1.ebuild,v 1.2 2014/07/21 09:29:28 djc Exp $
EAPI=4
@@ -17,6 +17,7 @@ IUSE="examples down-root iproute2 pam passwordsave pkcs11 +plugins +polarssl sel
REQUIRED_USE="static? ( !plugins !pkcs11 )
polarssl? ( ssl )
+ pkcs11? ( ssl )
!plugins? ( !pam !down-root )"
DEPEND="
diff --git a/net-misc/openvpn/openvpn-2.3.4.ebuild b/net-misc/openvpn/openvpn-2.3.4.ebuild
index f7a8315b4e44..29dc4c0fa5f4 100644
--- a/net-misc/openvpn/openvpn-2.3.4.ebuild
+++ b/net-misc/openvpn/openvpn-2.3.4.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/openvpn/openvpn-2.3.4.ebuild,v 1.1 2014/05/15 07:12:52 djc Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/openvpn/openvpn-2.3.4.ebuild,v 1.2 2014/07/21 09:29:28 djc Exp $
EAPI=4
@@ -17,6 +17,7 @@ IUSE="examples down-root iproute2 pam passwordsave pkcs11 +plugins +polarssl sel
REQUIRED_USE="static? ( !plugins !pkcs11 )
polarssl? ( ssl )
+ pkcs11? ( ssl )
!plugins? ( !pam !down-root )"
DEPEND="