diff options
| author |   Christian Faulhammer <fauli@gentoo.org> | 2012-02-23 22:57:50 +0000 |
|---|---|---|
| committer | Christian Faulhammer <fauli@gentoo.org> | 2012-02-23 22:57:50 +0000 |
| commit | 25570420f0bfa7e920704a68aada50ff2a12564d (patch) | |
| tree | d28afc3ac33fd4800ab59b00433095bd28c277f3 | |
| parent | Version bump (diff) | |
| download | gentoo-2-25570420f0bfa7e920704a68aada50ff2a12564d.tar.gz gentoo-2-25570420f0bfa7e920704a68aada50ff2a12564d.tar.bz2 gentoo-2-25570420f0bfa7e920704a68aada50ff2a12564d.zip | |
Make patch application work again, see bug 404269
(Portage version: 2.1.10.44/cvs/Linux i686)
| -rw-r--r-- | net-misc/openvpn/ChangeLog | 6 | ||||
| -rw-r--r-- | net-misc/openvpn/files/openvpn-2.1_rc20-pkcs11.patch | 4 | ||||
| -rw-r--r-- | net-misc/openvpn/files/openvpn-2.2.0-pkcs11.patch | 18 |
3 files changed, 25 insertions, 3 deletions
diff --git a/net-misc/openvpn/ChangeLog b/net-misc/openvpn/ChangeLog index 061dde865d15..8f3c1733387f 100644 --- a/net-misc/openvpn/ChangeLog +++ b/net-misc/openvpn/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for net-misc/openvpn # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/net-misc/openvpn/ChangeLog,v 1.222 2012/02/17 09:39:54 djc Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-misc/openvpn/ChangeLog,v 1.223 2012/02/23 22:57:50 fauli Exp $ + + 23 Feb 2012; Christian Faulhammer <fauli@gentoo.org> + files/openvpn-2.1_rc20-pkcs11.patch, +files/openvpn-2.2.0-pkcs11.patch: + Make patch application work again, see bug 404269 17 Feb 2012; Dirkjan Ochtman <djc@gentoo.org> openvpn-2.2.2.ebuild: Remove reference to old ipv6 use flag, bug 404137. diff --git a/net-misc/openvpn/files/openvpn-2.1_rc20-pkcs11.patch b/net-misc/openvpn/files/openvpn-2.1_rc20-pkcs11.patch index 6fe37f6810a5..cebb5927eb0f 100644 --- a/net-misc/openvpn/files/openvpn-2.1_rc20-pkcs11.patch +++ b/net-misc/openvpn/files/openvpn-2.1_rc20-pkcs11.patch @@ -1,6 +1,6 @@ diff -ru openvpn-2.1_rc20~/easy-rsa/2.0/openssl.cnf openvpn-2.1_rc20/easy-rsa/2.0/openssl.cnf ---- openvpn-2.1_rc20~/easy-rsa/2.0/openssl-1.0.0.cnf 2009-10-11 01:04:36.000000000 +0200 -+++ openvpn-2.1_rc20/easy-rsa/2.0/openssl-1.0.0.cnf 2009-10-11 01:05:53.000000000 +0200 +--- openvpn-2.1_rc20~/easy-rsa/2.0/openssl.cnf 2009-10-11 01:04:36.000000000 +0200 ++++ openvpn-2.1_rc20/easy-rsa/2.0/openssl.cnf 2009-10-11 01:05:53.000000000 +0200 @@ -283,9 +283,9 @@ #pkcs11 = pkcs11_section diff --git a/net-misc/openvpn/files/openvpn-2.2.0-pkcs11.patch b/net-misc/openvpn/files/openvpn-2.2.0-pkcs11.patch new file mode 100644 index 000000000000..6fe37f6810a5 --- /dev/null +++ b/net-misc/openvpn/files/openvpn-2.2.0-pkcs11.patch @@ -0,0 +1,18 @@ +diff -ru openvpn-2.1_rc20~/easy-rsa/2.0/openssl.cnf openvpn-2.1_rc20/easy-rsa/2.0/openssl.cnf +--- openvpn-2.1_rc20~/easy-rsa/2.0/openssl-1.0.0.cnf 2009-10-11 01:04:36.000000000 +0200 ++++ openvpn-2.1_rc20/easy-rsa/2.0/openssl-1.0.0.cnf 2009-10-11 01:05:53.000000000 +0200 +@@ -283,9 +283,9 @@ + #pkcs11 = pkcs11_section + + [ pkcs11_section ] +-engine_id = pkcs11 +-dynamic_path = /usr/lib/engines/engine_pkcs11.so +-MODULE_PATH = $ENV::PKCS11_MODULE_PATH +-PIN = $ENV::PKCS11_PIN +-init = 0 ++#engine_id = pkcs11 ++#dynamic_path = /usr/lib/engines/engine_pkcs11.so ++#MODULE_PATH = $ENV::PKCS11_MODULE_PATH ++#PIN = $ENV::PKCS11_PIN ++#init = 0 + |