fixed bug #81044. cleaned up and fixed 1.1.1-r1

(Portage version: 2.0.51.16)

7 files changed, 61 insertions, 40 deletions

diff --git a/net-www/mod_auth_pam/ChangeLog b/net-www/mod_auth_pam/ChangeLog
index 68d9f3ecbf3a..7d6c3f25c4c5 100644
--- a/net-www/mod_auth_pam/ChangeLog
+++ b/net-www/mod_auth_pam/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-www/mod_auth_pam
 # Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-www/mod_auth_pam/ChangeLog,v 1.7 2005/01/23 13:27:04 trapni Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-www/mod_auth_pam/ChangeLog,v 1.8 2005/02/17 09:30:54 hollow Exp $
+
+  17 Feb 2005; Benedikt Boehm <hollow@gentoo.org>
+  +files/mod_auth_pam-1.1.1-compile-fix.patch,
+  -files/mod_auth_pam-1.1.1-r1-gentoo.diff, mod_auth_pam-1.1.1-r1.ebuild,
+  mod_auth_pam-1.1.1.ebuild:
+  fixed bug #81044. cleaned up and fixed 1.1.1-r1
 
   23 Jan 2005; Christian Parpart <trapni@gentoo.org>
   mod_auth_pam-1.1.1-r1.ebuild:
diff --git a/net-www/mod_auth_pam/Manifest b/net-www/mod_auth_pam/Manifest
index 9ffcb71c49a9..e7e5af03d74a 100644
--- a/net-www/mod_auth_pam/Manifest
+++ b/net-www/mod_auth_pam/Manifest
@@ -1,11 +1,11 @@
-MD5 2d0fadbbcb6bfcbe844f95949c487e30 ChangeLog 1071
+MD5 49b237c780190e69834c06b5222e7285 ChangeLog 1322
 MD5 0d18f0fe5d603b41b988373892caf195 metadata.xml 226
-MD5 0975dfb93f3fb015c383d0c8c89450fd mod_auth_pam-1.1.1.ebuild 1361
-MD5 9020eea1f379eb9cd3d08de90646a5dc mod_auth_pam-1.1.1-r1.ebuild 1541
+MD5 666942f7bf88eaa1f2d625608dbee6fa mod_auth_pam-1.1.1-r1.ebuild 1961
+MD5 ca834879fe93a520c13d906a3f8676ea mod_auth_pam-1.1.1.ebuild 1396
 MD5 1c6bc704c0a9ba60cde371d219c6a595 files/10_mod_auth_pam.conf 310
 MD5 d0cb338160e3be8790524af8071cc4df files/apache2.pam 380
-MD5 6cbbe41e49ddf63a8c680ce625084853 files/digest-mod_auth_pam-1.1.1 73
 MD5 30b234b6f95804e2ef9043368f3fd966 files/mod_auth_pam-1.1.1-gentoo.diff 392
-MD5 6cbbe41e49ddf63a8c680ce625084853 files/digest-mod_auth_pam-1.1.1-r1 73
-MD5 30b234b6f95804e2ef9043368f3fd966 files/mod_auth_pam-1.1.1-r1-gentoo.diff 392
+MD5 33ba9becf231dd55db43de324796964d files/mod_auth_pam-1.1.1-compile-fix.patch 1073
+MD5 5283c3d19faf5167133286041b5e3815 files/digest-mod_auth_pam-1.1.1-r1 141
+MD5 6cbbe41e49ddf63a8c680ce625084853 files/digest-mod_auth_pam-1.1.1 73
 MD5 6d39291f46444e6f9b7dbb3627ca5e78 files/1.1.1-r1/10_mod_auth_pam.conf 761
diff --git a/net-www/mod_auth_pam/files/digest-mod_auth_pam-1.1.1-r1 b/net-www/mod_auth_pam/files/digest-mod_auth_pam-1.1.1-r1
index d6c1f8c5cbb8..c19d2e400341 100644
--- a/net-www/mod_auth_pam/files/digest-mod_auth_pam-1.1.1-r1
+++ b/net-www/mod_auth_pam/files/digest-mod_auth_pam-1.1.1-r1
@@ -1 +1,2 @@
 MD5 ab873520ddd2fee7d480dfd53e464e0a mod_auth_pam-2.0-1.1.1.tar.gz 11456
+MD5 b1e36b5df18a177e671785f7f4c8001c mod_auth_pam-1.1.1.tar.gz 9575
diff --git a/net-www/mod_auth_pam/files/mod_auth_pam-1.1.1-compile-fix.patch b/net-www/mod_auth_pam/files/mod_auth_pam-1.1.1-compile-fix.patch
new file mode 100644
index 000000000000..20604e1c3f7e
--- /dev/null
+++ b/net-www/mod_auth_pam/files/mod_auth_pam-1.1.1-compile-fix.patch
@@ -0,0 +1,18 @@
+--- mod_auth_pam.c	2002-08-08 15:47:33.000000000 +0200
++++ mod_auth_pam.c-patched	2005-02-17 08:31:13.812819720 +0100
+@@ -231,13 +231,11 @@
+ 
+ static command_rec auth_pam_cmds[] = {
+   { "AuthFailDelay", (const char*(*)())auth_fail_delay, 0, OR_AUTHCFG, TAKE1,
+-    "number of micro seconds to wait after failed authentication attempt. defau
+-lt is 0" },
++    "number of micro seconds to wait after failed authentication attempt. default is 0" },
+   { "AuthPAM_Authorative", (const char*(*)())auth_fall_through, NULL, OR_AUTHCFG, FLAG,
+     "no longer in use -- see AuthPAM_FallThrough instead" },
+   { "AuthPAM_FallThrough", (const char*(*)())auth_fall_through, NULL, OR_AUTHCFG, FLAG,
+-    "on|off - determines if other authentication methods are attempted if this
+-one fails; default is off" },
++    "on|off - determines if other authentication methods are attempted if thisone fails; default is off" },
+   { "AuthPAM_Enabled", (const char*(*)())auth_enable, NULL, OR_AUTHCFG, FLAG,
+     "on|off - determines if PAM authentication is enabled; default is on" },
+   { 0 }
diff --git a/net-www/mod_auth_pam/files/mod_auth_pam-1.1.1-r1-gentoo.diff b/net-www/mod_auth_pam/files/mod_auth_pam-1.1.1-r1-gentoo.diff
deleted file mode 100644
index 8f7376d5223d..000000000000
--- a/net-www/mod_auth_pam/files/mod_auth_pam-1.1.1-r1-gentoo.diff
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -urN mod_auth_pam.orig/mod_auth_pam.c mod_auth_pam/mod_auth_pam.c
---- mod_auth_pam.orig/mod_auth_pam.c	2002-08-24 16:22:23.000000000 +0200
-+++ mod_auth_pam/mod_auth_pam.c	2003-09-07 12:07:05.000000000 +0200
-@@ -151,7 +151,7 @@
- module auth_pam_module;
- 
- static const char
--	*pam_servicename = "httpd",
-+	*pam_servicename = "apache2",
- 	*valid_user 	 = "valid-user";
- 
- typedef struct {
diff --git a/net-www/mod_auth_pam/mod_auth_pam-1.1.1-r1.ebuild b/net-www/mod_auth_pam/mod_auth_pam-1.1.1-r1.ebuild
index 67e4c61c486e..ce6b168ee0f3 100644
--- a/net-www/mod_auth_pam/mod_auth_pam-1.1.1-r1.ebuild
+++ b/net-www/mod_auth_pam/mod_auth_pam-1.1.1-r1.ebuild
@@ -1,50 +1,57 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-www/mod_auth_pam/mod_auth_pam-1.1.1-r1.ebuild,v 1.3 2005/01/23 13:27:04 trapni Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-www/mod_auth_pam/mod_auth_pam-1.1.1-r1.ebuild,v 1.4 2005/02/17 09:30:54 hollow Exp $
 
 inherit eutils apache-module
 
-DESCRIPTION="PAM authentication module for Apache2"
-HOMEPAGE="http://pam.sourceforge.net/mod_auth_pam/"
+RESTRICT="nomirror"
 
-SRC_URI="http://pam.sourceforge.net/mod_auth_pam/dist/${PN}-2.0-${PV}.tar.gz"
-LICENSE="Apache-1.1"
+DESCRIPTION="PAM authentication module for Apache"
+HOMEPAGE="http://pam.sourceforge.net/mod_auth_pam/"
 
+LICENSE="as-is"
 KEYWORDS="~x86 ~ppc ~sparc ~amd64"
-
 DEPEND="sys-libs/pam"
 SLOT="0"
 IUSE=""
 
-S="${WORKDIR}/${PN}"
+APACHE2_EXECFILES=".libs/mod_auth_sys_group.so"
 
-APACHE2_MOD_CONF="${PVR}/10_mod_auth_pam"
-DOCFILES="INSTALL README"
+APACHE1_MOD_CONF="${PVR}/10_${PN}"
+APACHE2_MOD_CONF="${PVR}/10_${PN}"
+
+DOCFILES="INSTALL README doc/*"
 
 need_apache
 
+SRC_URI="apache2?  http://pam.sourceforge.net/mod_auth_pam/dist/${PN}-2.0-${PV}.tar.gz
+	 !apache2? http://pam.sourceforge.net/mod_auth_pam/dist/${PN}-${PV}.tar.gz"
+
+use apache2 && S=${WORKDIR}/${PN}
+
 src_unpack() {
-	unpack "${PN}-2.0-${PV}.tar.gz"
-	cd "${S}"
-	epatch ${FILESDIR}/${PF}-gentoo.diff || die
+	unpack ${A} || die "unpack failed"
+	cd ${S} || "couldn't cd to \$S"
+	use apache2 || epatch ${FILESDIR}/${P}-compile-fix.patch || die "patch failed"
+	use apache2 && sed -i -e 's/servicename = "httpd"/servicename = "apache2"/' ${PN}.c
+	use apache2 || sed -i -e 's/servicename = "httpd"/servicename = "apache"/' ${PN}.c
 }
 
 src_compile() {
-	emake APXS=${APXS2} || die
+	apache-module_src_compile
+	use apache2 && ${APXS2} -c mod_auth_sys_group.c
 }
 
 src_install () {
-	APACHE2_MOD_FILE='.libs/mod_auth_sys_group.so' apache2_src_install
-	unset DOCFILES APACHE2_MOD_CONF
-	APACHE2_MOD_FILE='.libs/mod_auth_pam.so' apache2_src_install
-
+	apache-module_src_install
 	insinto /etc/pam.d
-	newins ${FILESDIR}/apache2.pam apache2
-
-	dohtml doc/*
+	use apache2 && newins ${FILESDIR}/apache2.pam apache2
+	use apache2 || newins ${FILESDIR}/apache2.pam apache
 }
 
 pkg_postinst() {
+	apache-module_pkg_postinst
+
 	local gid=`grep ^shadow: /etc/group | cut -d: -f3`
 	einfo
 	einfo "If the system is configured with the shadow authentication method"
diff --git a/net-www/mod_auth_pam/mod_auth_pam-1.1.1.ebuild b/net-www/mod_auth_pam/mod_auth_pam-1.1.1.ebuild
index ac48517a7fa2..9cc29bf200ca 100644
--- a/net-www/mod_auth_pam/mod_auth_pam-1.1.1.ebuild
+++ b/net-www/mod_auth_pam/mod_auth_pam-1.1.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-www/mod_auth_pam/mod_auth_pam-1.1.1.ebuild,v 1.5 2005/01/23 13:06:47 trapni Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-www/mod_auth_pam/mod_auth_pam-1.1.1.ebuild,v 1.6 2005/02/17 09:30:54 hollow Exp $
 
 inherit eutils
 
@@ -31,6 +31,7 @@ src_compile() {
 src_install () {
 	exeinto /usr/lib/apache2-extramodules
 	doexe .libs/mod_auth_pam.so
+	doexe .libs/mod_auth_sys_group.so
 
 	insinto /etc/apache2/conf/modules.d
 	doins ${FILESDIR}/10_mod_auth_pam.conf