Bug #133134.

(Portage version: 2.1.2_rc4-r8)

6 files changed, 162 insertions, 5 deletions

diff --git a/net-www/mod_auth_pam/ChangeLog b/net-www/mod_auth_pam/ChangeLog
index 9f31d9567d73..956f5465e5f5 100644
--- a/net-www/mod_auth_pam/ChangeLog
+++ b/net-www/mod_auth_pam/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for net-www/mod_auth_pam
 # Copyright 2000-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-www/mod_auth_pam/ChangeLog,v 1.17 2007/01/14 18:41:53 chtekk Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-www/mod_auth_pam/ChangeLog,v 1.18 2007/01/15 21:51:53 chtekk Exp $
+
+*mod_auth_pam-1.1.1-r2 (15 Jan 2007)
+
+  15 Jan 2007; Luca Longinotti <chtekk@gentoo.org>
+  files/mod_auth_pam-1.1.1-compile-fix.patch,
+  +files/mod_auth_pam-1.1.1-service_name.patch,
+  mod_auth_pam-1.1.1-r1.ebuild, +mod_auth_pam-1.1.1-r2.ebuild:
+  Misc fixes, add service name specification support for Apache2, fixes bug
+  #133134.
 
   14 Jan 2007; Luca Longinotti <chtekk@gentoo.org>
   mod_auth_pam-1.1.1-r1.ebuild:
diff --git a/net-www/mod_auth_pam/files/digest-mod_auth_pam-1.1.1-r2 b/net-www/mod_auth_pam/files/digest-mod_auth_pam-1.1.1-r2
new file mode 100644
index 000000000000..43652b8aae55
--- /dev/null
+++ b/net-www/mod_auth_pam/files/digest-mod_auth_pam-1.1.1-r2
@@ -0,0 +1,6 @@
+MD5 b1e36b5df18a177e671785f7f4c8001c mod_auth_pam-1.1.1.tar.gz 9575
+RMD160 1072354a7a5bc42bfcbae0e935a5e444db280233 mod_auth_pam-1.1.1.tar.gz 9575
+SHA256 2c252f5f4932c8cfd398d1dfdf6245f6528ab8ae505c23c16a289c3626042b3f mod_auth_pam-1.1.1.tar.gz 9575
+MD5 ab873520ddd2fee7d480dfd53e464e0a mod_auth_pam-2.0-1.1.1.tar.gz 11456
+RMD160 4dbc4daae2e696b44767577d63ccf24aec397f2c mod_auth_pam-2.0-1.1.1.tar.gz 11456
+SHA256 21c55e3a3539e05782654d4dc6f12345b0a4eac29425c20c41f540260866977b mod_auth_pam-2.0-1.1.1.tar.gz 11456
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
index 20604e1c3f7e..2e95c8d17bba 100644
--- 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
@@ -1,5 +1,5 @@
 --- 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
++++ mod_auth_pam.c	2005-02-17 08:31:13.812819720 +0100
 @@ -231,13 +231,11 @@
  
  static command_rec auth_pam_cmds[] = {
diff --git a/net-www/mod_auth_pam/files/mod_auth_pam-1.1.1-service_name.patch b/net-www/mod_auth_pam/files/mod_auth_pam-1.1.1-service_name.patch
new file mode 100644
index 000000000000..82529db2c0ff
--- /dev/null
+++ b/net-www/mod_auth_pam/files/mod_auth_pam-1.1.1-service_name.patch
@@ -0,0 +1,66 @@
+--- mod_auth_pam.c	2002-08-24 16:22:23.000000000 +0200
++++ mod_auth_pam.c	2004-10-27 16:48:50.000000000 +0200
+@@ -126,6 +126,9 @@
+  *				fall through but return "access denied" instead
+  *				Defaults to off
+  *
++ * AuthPAM_Service <service>	The PAM-service to be used for authentication.
++ *				Defaults to "apache2"
++ *
+  * AuthPAM_Authorative on|off   DEPRECATED
+  */
+ 
+@@ -146,12 +149,12 @@
+ 
+ /* change this to 0 on RedHat 4.x */
+ #define PAM_STRE_NEEDS_PAMH 1
+-#define VERSION "2.0-1.1"
++#define VERSION "2.0-1.1e"
+ 
+ module auth_pam_module;
+ 
+ static const char
+-	*pam_servicename = "httpd",
++	*pam_servicename = "apache2",
+ 	*valid_user 	 = "valid-user";
+ 
+ typedef struct {
+@@ -190,6 +193,7 @@
+ 				 * username (defaults to 0) */
+         enabled;		/* 1 to use mod_auth_pam, 0 otherwise
+ 				 * (defaults to 1) */
++    const char* pam_servicename;
+ }      auth_pam_dir_config;
+ 
+ static
+@@ -214,6 +218,7 @@
+     new->fail_delay = 0;	/* 0 ms */
+     new->fall_through = 0;	/* off */
+     new->enabled = 1;		/* on */
++    new->pam_servicename = pam_servicename;
+     return new;
+ }
+ 
+@@ -237,6 +242,11 @@
+ 	 "on|off - determines if PAM authentication is enabled. "
+ 	 "(default is on.)"),
+ 
++	AP_INIT_TAKE1("AuthPAM_Service",
++	ap_set_string_slot, (void *) APR_OFFSETOF(auth_pam_dir_config, pam_servicename),
++	OR_AUTHCFG,
++	"PAM-service to be used for authentication"),
++
+     {NULL}
+ };
+ 
+@@ -341,7 +351,7 @@
+     userinfo.name = r->user;
+ 
+     /* initialize pam */
+-    if ((res = pam_start(pam_servicename,
++    if ((res = pam_start(conf->pam_servicename,
+ 			 userinfo.name,
+ 			 &conv_info,
+ 			 &pamh)) != PAM_SUCCESS) {
+
+ 	  	 
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 97a1629bbc13..cd13bfb300bb 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,8 +1,8 @@
 # Copyright 1999-2007 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.13 2007/01/14 18:41:53 chtekk Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-www/mod_auth_pam/mod_auth_pam-1.1.1-r1.ebuild,v 1.14 2007/01/15 21:51:53 chtekk Exp $
 
-inherit eutils apache-module portability
+inherit eutils apache-module
 
 KEYWORDS="~amd64 ppc ~sparc x86"
 
@@ -10,7 +10,7 @@ DESCRIPTION="PAM authentication module for Apache."
 HOMEPAGE="http://pam.sourceforge.net/mod_auth_pam/"
 LICENSE="as-is"
 SLOT="0"
-IUSE="apache2"
+IUSE=""
 RESTRICT="nomirror"
 
 DEPEND="sys-libs/pam"
diff --git a/net-www/mod_auth_pam/mod_auth_pam-1.1.1-r2.ebuild b/net-www/mod_auth_pam/mod_auth_pam-1.1.1-r2.ebuild
new file mode 100644
index 000000000000..369c28e54989
--- /dev/null
+++ b/net-www/mod_auth_pam/mod_auth_pam-1.1.1-r2.ebuild
@@ -0,0 +1,76 @@
+# Copyright 1999-2007 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-r2.ebuild,v 1.1 2007/01/15 21:51:53 chtekk Exp $
+
+inherit eutils apache-module
+
+KEYWORDS="~amd64 ~ppc ~sparc ~x86"
+
+DESCRIPTION="PAM authentication module for Apache."
+HOMEPAGE="http://pam.sourceforge.net/mod_auth_pam/"
+LICENSE="as-is"
+SLOT="0"
+IUSE=""
+RESTRICT="nomirror"
+
+DEPEND="sys-libs/pam"
+RDEPEND="${DEPEND}"
+
+APXS1_ARGS="-c ${PN}.c -lpam"
+APXS2_ARGS="-c ${PN}.c -lpam"
+
+APACHE2_EXECFILES=".libs/mod_auth_sys_group.so"
+
+APACHE1_MOD_CONF="10_${PN}_ap1"
+APACHE1_MOD_DEFINE="AUTH_PAM"
+
+APACHE2_MOD_CONF="10_${PN}"
+APACHE2_MOD_DEFINE="AUTH_PAM"
+
+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/${P}.tar.gz )"
+
+use apache2 && S="${WORKDIR}/${PN}"
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+
+	use apache2 || epatch "${FILESDIR}/${P}-compile-fix.patch"
+	use apache2 && epatch "${FILESDIR}/${P}-service_name.patch"
+	use apache2 || sed -i -e 's/servicename = "httpd"/servicename = "apache"/' "${PN}.c"
+}
+
+src_compile() {
+	apache-module_src_compile
+	use apache2 && ${APXS2} -c mod_auth_sys_group.c
+}
+
+src_install() {
+	apache-module_src_install
+	insinto /etc/pam.d
+	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"
+	einfo "the following commands must be executed by root to make /etc/shadow"
+	einfo "accessible by the Apache webserver:"
+	einfo
+	if [[ -z "${gid}" ]] ; then
+		einfo "    # groupadd shadow"
+		einfo "    # gpasswd -a apache shadow"
+	fi
+	einfo "    # chgrp shadow /etc/shadow"
+	einfo "    # chmod 640 /etc/shadow"
+	einfo
+}