Add a patch so we work with both LinuxPAM and OpenPAM correctly.

Package-Manager: portage-2.1.2_pre2-r7

5 files changed, 66 insertions, 17 deletions

diff --git a/net-misc/openvpn/ChangeLog b/net-misc/openvpn/ChangeLog
index a694da6a8a83..7c4630e1d772 100644
--- a/net-misc/openvpn/ChangeLog
+++ b/net-misc/openvpn/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for net-misc/openvpn
 # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/openvpn/ChangeLog,v 1.95 2006/10/05 20:56:23 corsair Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/openvpn/ChangeLog,v 1.96 2006/10/11 12:15:49 uberlord Exp $
+
+  11 Oct 2006; Roy Marples <uberlord@gentoo.org>
+  +files/openvpn-2.0.7-pam.patch, openvpn-2.0.7.ebuild,
+  openvpn-2.1_beta15.ebuild:
+  Add a patch so we work with both LinuxPAM and OpenPAM correctly.
 
   05 Oct 2006; Markus Rothe <corsair@gentoo.org> openvpn-2.1_beta15.ebuild:
   Added ~ppc64
diff --git a/net-misc/openvpn/Manifest b/net-misc/openvpn/Manifest
index 333e7efea835..51a4d9c6ff29 100644
--- a/net-misc/openvpn/Manifest
+++ b/net-misc/openvpn/Manifest
@@ -6,6 +6,10 @@ AUX openvpn-2.0.4-darwin.patch 717 RMD160 66aa5ea349329cf3e6089aa75eb7c80e0d2106
 MD5 9f0fcb64287dc55bb770ca86415e5cdd files/openvpn-2.0.4-darwin.patch 717
 RMD160 66aa5ea349329cf3e6089aa75eb7c80e0d21063b files/openvpn-2.0.4-darwin.patch 717
 SHA256 ad70b77c10bb57a07af3d512e953fc8b5a07108df5bf9795e0cb12e1ba2b2136 files/openvpn-2.0.4-darwin.patch 717
+AUX openvpn-2.0.7-pam.patch 1236 RMD160 3f9035a7005b206e1447dfd75edcb65cb5531b2d SHA1 09c362da6cea1d6f7e6ff060a4e92493a5b34cba SHA256 b5906cc1bff00ebc3dc9a58861388493aa6d2be774dbacba63c2cfcc8bfa4f92
+MD5 968e83fbca1dca7d68c60aacdb51b6be files/openvpn-2.0.7-pam.patch 1236
+RMD160 3f9035a7005b206e1447dfd75edcb65cb5531b2d files/openvpn-2.0.7-pam.patch 1236
+SHA256 b5906cc1bff00ebc3dc9a58861388493aa6d2be774dbacba63c2cfcc8bfa4f92 files/openvpn-2.0.7-pam.patch 1236
 AUX openvpn-2.1.init 4023 RMD160 d78f4303114dfa6516cd0108a1060b7d755c2c4a SHA1 9cc186562c56a578eee929d472f9cfd63434621c SHA256 1611b1fe36c0248990aae2f95adcec036198f70cb71e15e3053c762e202b0fcf
 MD5 b52427ba1e6df212d3e2a45c54f388c7 files/openvpn-2.1.init 4023
 RMD160 d78f4303114dfa6516cd0108a1060b7d755c2c4a files/openvpn-2.1.init 4023
@@ -25,18 +29,18 @@ EBUILD openvpn-2.0.6.ebuild 3861 RMD160 ab1cebb22bd90f5b9f7ad51d61e3c71ac429edd1
 MD5 997c0652659de943e575acd3f553fc51 openvpn-2.0.6.ebuild 3861
 RMD160 ab1cebb22bd90f5b9f7ad51d61e3c71ac429edd1 openvpn-2.0.6.ebuild 3861
 SHA256 9b173588e955a0b5da9a4b3a8fb2a5f95566ca210c64d0660b590139bb1879aa openvpn-2.0.6.ebuild 3861
-EBUILD openvpn-2.0.7.ebuild 3869 RMD160 4e2cf66640084682ef62ff23ec037817f70755d8 SHA1 5493e1962b94e5b0c670290f57d0b1d2ce885e3d SHA256 205068a5d8297b499273de3981d6df305074a7ccaae719b4110dd96d02c9fdb8
-MD5 a44980cd593b32cd92aca88cd6405b84 openvpn-2.0.7.ebuild 3869
-RMD160 4e2cf66640084682ef62ff23ec037817f70755d8 openvpn-2.0.7.ebuild 3869
-SHA256 205068a5d8297b499273de3981d6df305074a7ccaae719b4110dd96d02c9fdb8 openvpn-2.0.7.ebuild 3869
-EBUILD openvpn-2.1_beta15.ebuild 4141 RMD160 2b9dde05c618d64b6392d2601b10759cbccf8040 SHA1 517699c3fd4daf0f7fb0425c3ff9198cb1d458a1 SHA256 af1a481c1f29c6682c0d2e0e48c2da3bca1ed176190cc54bed2637019d92cb81
-MD5 b83faf7d25fd32846959107110574a8b openvpn-2.1_beta15.ebuild 4141
-RMD160 2b9dde05c618d64b6392d2601b10759cbccf8040 openvpn-2.1_beta15.ebuild 4141
-SHA256 af1a481c1f29c6682c0d2e0e48c2da3bca1ed176190cc54bed2637019d92cb81 openvpn-2.1_beta15.ebuild 4141
-MISC ChangeLog 14547 RMD160 5948b8cfbde7c49eede0255c25cb6b99321d9ab6 SHA1 12723dc2faf54b5c7e202f0cac3d15238307c65b SHA256 4c6bc3aab2fcbf58e19f4e496cbf10c8e648c40b146743cd36d8345502415b90
-MD5 a011527ddd6d627b32502370269f2ade ChangeLog 14547
-RMD160 5948b8cfbde7c49eede0255c25cb6b99321d9ab6 ChangeLog 14547
-SHA256 4c6bc3aab2fcbf58e19f4e496cbf10c8e648c40b146743cd36d8345502415b90 ChangeLog 14547
+EBUILD openvpn-2.0.7.ebuild 3908 RMD160 19d1179b8650e1925a4726378483e1a3c287948b SHA1 c83ab24e9aea95f732704153f13b731ea81712f3 SHA256 3c306e4b5b809b54d7296579dde5d5e97c75040aa955bff20345bc6f4d462627
+MD5 ad49363b0f9346229c71091d14163ac7 openvpn-2.0.7.ebuild 3908
+RMD160 19d1179b8650e1925a4726378483e1a3c287948b openvpn-2.0.7.ebuild 3908
+SHA256 3c306e4b5b809b54d7296579dde5d5e97c75040aa955bff20345bc6f4d462627 openvpn-2.0.7.ebuild 3908
+EBUILD openvpn-2.1_beta15.ebuild 4188 RMD160 f7354f8b6ff5f9ac41107697811e6a1edda633d9 SHA1 09cc2bc34eebeb804aaf520f15335665089244c6 SHA256 6fa69b6cf10b853628e4e585266b006da99b963d5938c39366ada933ef13f605
+MD5 7e95c74de0391a509107e2c4b15bacd9 openvpn-2.1_beta15.ebuild 4188
+RMD160 f7354f8b6ff5f9ac41107697811e6a1edda633d9 openvpn-2.1_beta15.ebuild 4188
+SHA256 6fa69b6cf10b853628e4e585266b006da99b963d5938c39366ada933ef13f605 openvpn-2.1_beta15.ebuild 4188
+MISC ChangeLog 14750 RMD160 4f16dcf4cf973382d62d7f98755b7eb0d798f5b9 SHA1 b29f0df6ce25166d0722d2199ba887a9e2fbdf51 SHA256 169513773ac57d1a0a50f581100a3faa09bcc56ac718820633c3b1de5bdb6b47
+MD5 c476160042a4341f84a1c522e7b5b3c0 ChangeLog 14750
+RMD160 4f16dcf4cf973382d62d7f98755b7eb0d798f5b9 ChangeLog 14750
+SHA256 169513773ac57d1a0a50f581100a3faa09bcc56ac718820633c3b1de5bdb6b47 ChangeLog 14750
 MISC metadata.xml 440 RMD160 120089ec9c799161dfeeacd9a3adfc40b4317f06 SHA1 23d2975ef0f709dc2e754a5867942e679ee60740 SHA256 408ca4fc4f58fa21e629582d0a44a759f9695a018479d70efbd3338b6bdbcfd6
 MD5 62aa0438042b29eba4a6afd971037761 metadata.xml 440
 RMD160 120089ec9c799161dfeeacd9a3adfc40b4317f06 metadata.xml 440
diff --git a/net-misc/openvpn/files/openvpn-2.0.7-pam.patch b/net-misc/openvpn/files/openvpn-2.0.7-pam.patch
new file mode 100644
index 000000000000..34fa3aeb0108
--- /dev/null
+++ b/net-misc/openvpn/files/openvpn-2.0.7-pam.patch
@@ -0,0 +1,34 @@
+We should use pam property - this works on both LinuxPAM and OpenPAM
+
+diff -ur openvpn-2.0.7.orig/plugin/auth-pam/Makefile openvpn-2.0.7/plugin/auth-pam/Makefile
+--- openvpn-2.0.7.orig/plugin/auth-pam/Makefile	2005-11-02 18:02:49 +0000
++++ openvpn-2.0.7/plugin/auth-pam/Makefile	2006-10-11 12:05:55 +0100
+@@ -4,7 +4,7 @@
+ 
+ # If PAM modules are not linked against libpam.so, set DLOPEN_PAM to 1. This
+ # must be done on SUSE 9.1, at least.
+-DLOPEN_PAM=1
++DLOPEN_PAM=0
+ 
+ ifeq ($(DLOPEN_PAM),1)
+ 	LIBPAM=-ldl
+diff -ur openvpn-2.0.7.orig/plugin/auth-pam/pamdl.c openvpn-2.0.7/plugin/auth-pam/pamdl.c
+--- openvpn-2.0.7.orig/plugin/auth-pam/pamdl.c	2005-11-02 18:02:49 +0000
++++ openvpn-2.0.7/plugin/auth-pam/pamdl.c	2006-10-11 12:04:48 +0100
+@@ -10,7 +10,6 @@
+ #include <stdio.h>
+ #include <dlfcn.h>
+ #include <security/pam_appl.h>
+-#include <security/_pam_macros.h>
+ 
+ #include "pamdl.h"
+ 
+@@ -74,7 +73,7 @@
+     return real_pam_set_item(pamh, item_type, item);
+ }
+ 
+-int pam_get_item(const pam_handle_t *pamh, int item_type, const void **item)
++int pam_get_item(pam_handle_t *pamh, int item_type, const void **item)
+ {
+     int (*real_pam_get_item)(const pam_handle_t *, int, const void **);
+     RESOLVE_PAM_FUNCTION(pam_get_item, int,
diff --git a/net-misc/openvpn/openvpn-2.0.7.ebuild b/net-misc/openvpn/openvpn-2.0.7.ebuild
index 9cbc8f7354cd..3548822d1192 100644
--- a/net-misc/openvpn/openvpn-2.0.7.ebuild
+++ b/net-misc/openvpn/openvpn-2.0.7.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/openvpn/openvpn-2.0.7.ebuild,v 1.1 2006/06/29 09:34:46 uberlord Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/openvpn/openvpn-2.0.7.ebuild,v 1.2 2006/10/11 12:15:49 uberlord Exp $
 
 inherit eutils gnuconfig multilib
 
@@ -25,9 +25,12 @@ DEPEND="${RDEPEND}
 
 src_unpack() {
 	unpack "${A}"
-	gnuconfig_update
 	cd "${S}"
+
 	epatch "${FILESDIR}/${PN}"-2.0.4-darwin.patch
+	epatch "${FILESDIR}/${P}-pam.patch"
+
+	gnuconfig_update
 }
 
 src_compile() {
diff --git a/net-misc/openvpn/openvpn-2.1_beta15.ebuild b/net-misc/openvpn/openvpn-2.1_beta15.ebuild
index 74345b72610b..197501e24e43 100644
--- a/net-misc/openvpn/openvpn-2.1_beta15.ebuild
+++ b/net-misc/openvpn/openvpn-2.1_beta15.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/openvpn/openvpn-2.1_beta15.ebuild,v 1.3 2006/10/05 20:56:23 corsair Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/openvpn/openvpn-2.1_beta15.ebuild,v 1.4 2006/10/11 12:15:49 uberlord Exp $
 
 inherit eutils gnuconfig multilib
 
@@ -23,9 +23,12 @@ DEPEND=">=dev-libs/lzo-1.07
 
 src_unpack() {
 	unpack ${A}
-	gnuconfig_update
 	cd "${S}"
+
 	epatch "${FILESDIR}/${PN}"-2.0.4-darwin.patch
+	epatch "${FILESDIR}/${PN}"-2.0.7-pam.patch
+
+	gnuconfig_update
 }
 
 src_compile() {