merged from apache-herd svn tree

7 files changed, 120 insertions, 6 deletions

diff --git a/net-www/mod_auth_pam/ChangeLog b/net-www/mod_auth_pam/ChangeLog
index 69bde35cc769..c27016b5fb2d 100644
--- a/net-www/mod_auth_pam/ChangeLog
+++ b/net-www/mod_auth_pam/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-www/mod_auth_pam
 # Copyright 2000-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-www/mod_auth_pam/ChangeLog,v 1.4 2004/09/03 23:24:08 pvdabeel Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-www/mod_auth_pam/ChangeLog,v 1.5 2005/01/10 22:05:39 trapni Exp $
+
+  13 Oct 2004; Christian Parpart <trapni@gentoo.org> :
+  fixed bug, that prevented the modules to be installed; 
+  minor typo fix that caused apache2.pam not beeing installed
 
   04 Sep 2004; Pieter Van den Abeele <pvdabeel@gentoo.org>
   mod_auth_pam-1.1.1.ebuild:
diff --git a/net-www/mod_auth_pam/Manifest b/net-www/mod_auth_pam/Manifest
index 93bd215c5fda..e13aebf790ec 100644
--- a/net-www/mod_auth_pam/Manifest
+++ b/net-www/mod_auth_pam/Manifest
@@ -1,7 +1,11 @@
-MD5 02f523b0885d603bbfeb372f906fe1cb ChangeLog 651
-MD5 5b6dd438f81019e56fa641841c0c13fe metadata.xml 501
+MD5 ced77ea32383f7a4b1c05bc11db55bfc ChangeLog 825
+MD5 0d18f0fe5d603b41b988373892caf195 metadata.xml 226
 MD5 3e190e3fc499d93e216e7b332cf43c05 mod_auth_pam-1.1.1.ebuild 1363
+MD5 bcb85a08278c6656d318d73880e8b3a3 mod_auth_pam-1.1.1-r1.ebuild 1531
 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 6d39291f46444e6f9b7dbb3627ca5e78 files/1.1.1-r1/10_mod_auth_pam.conf 761
diff --git a/net-www/mod_auth_pam/files/1.1.1-r1/10_mod_auth_pam.conf b/net-www/mod_auth_pam/files/1.1.1-r1/10_mod_auth_pam.conf
new file mode 100644
index 000000000000..cc5ecd38291f
--- /dev/null
+++ b/net-www/mod_auth_pam/files/1.1.1-r1/10_mod_auth_pam.conf
@@ -0,0 +1,31 @@
+<IfDefine AUTH_PAM>
+  <IfModule !mod_auth_pam.c>
+    LoadModule auth_pam_module          modules/mod_auth_pam.so
+  </IfModule>
+  <IfModule !mod_auth_sys_group.c>
+    LoadModule auth_sys_group_module    modules/mod_auth_sys_group.so
+  </IfModule>
+</IfDefine>
+
+### EXAMPLE 1: authentificate against a single PAM account
+###
+#	<IfModule mod_auth_pam.c>
+#		AuthPAM_Enabled on
+#
+#		AuthType Basic
+#		AuthName "secure area"
+#		Require user webmaster
+#	</IfModule>
+
+### EXAMPLE 2: authentificate against a a PAM group, so, that each user
+###            beeing in this group may access this "secure area"
+###
+#	<IfModule mod_auth_sys_group.c>
+#		AuthPAM_Enabled on
+#
+#		AuthType Basic
+#		AuthName "secure area"
+#		Require group staff
+#	</IfModule>
+
+# vim:syntax=apache
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
new file mode 100644
index 000000000000..d6c1f8c5cbb8
--- /dev/null
+++ b/net-www/mod_auth_pam/files/digest-mod_auth_pam-1.1.1-r1
@@ -0,0 +1 @@
+MD5 ab873520ddd2fee7d480dfd53e464e0a 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-r1-gentoo.diff b/net-www/mod_auth_pam/files/mod_auth_pam-1.1.1-r1-gentoo.diff
new file mode 100644
index 000000000000..8f7376d5223d
--- /dev/null
+++ b/net-www/mod_auth_pam/files/mod_auth_pam-1.1.1-r1-gentoo.diff
@@ -0,0 +1,12 @@
+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/metadata.xml b/net-www/mod_auth_pam/metadata.xml
index bcaabdbbd0d3..10510cb8be95 100644
--- a/net-www/mod_auth_pam/metadata.xml
+++ b/net-www/mod_auth_pam/metadata.xml
@@ -2,7 +2,7 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 <herd>apache</herd>
-<longdescription>
-The Apache HTTP Server Project is an effort to develop and maintain an open-source HTTP server for modern operating systems including UNIX and Windows NT. The goal of this project is to provide a secure, efficient and extensible server that provides HTTP services in sync with the current HTTP standards.
-</longdescription>
+<maintainer>
+  <email>apache-devs@gentoo.org</email>
+</maintainer>
 </pkgmetadata>
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
new file mode 100644
index 000000000000..8383cd8afbee
--- /dev/null
+++ b/net-www/mod_auth_pam/mod_auth_pam-1.1.1-r1.ebuild
@@ -0,0 +1,62 @@
+# 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.1 2005/01/10 22:05:39 trapni Exp $
+
+inherit eutils apache-module
+
+DESCRIPTION="PAM authentication module for Apache2"
+HOMEPAGE="http://pam.sourceforge.net/mod_auth_pam/"
+
+SRC_URI="http://pam.sourceforge.net/mod_auth_pam/dist/${PN}-2.0-1.1.1.tar.gz"
+LICENSE="Apache-1.1"
+
+KEYWORDS="~x86 ~ppc ~sparc"
+
+DEPEND="sys-libs/pam"
+SLOT="0"
+IUSE=""
+
+S="${WORKDIR}/${PN}"
+
+APXS2_S="${S}/.libs"
+APACHE2_MOD_CONF="${PVR}/10_mod_auth_pam"
+DOCFILES="INSTALL README"
+
+
+src_unpack() {
+	unpack "${PN}-2.0-1.1.1.tar.gz"
+	cd "${S}"
+	epatch ${FILESDIR}/${PF}-gentoo.diff || die
+}
+
+src_compile() {
+	emake APXS=${APXS2} || die
+}
+
+src_install () {
+	APACHE2_MOD_FILE='mod_auth_sys_group.so' apache2_src_install
+	unset DOCFILES APACHE2_MOD_CONF
+	APACHE2_MOD_FILE='mod_auth_pam.so' apache2_src_install
+
+	insinto /etc/pam.d
+	newins ${FILESDIR}/apache2.pam apache2
+
+	dohtml doc/*
+}
+
+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 server:"
+	einfo
+	if [ -z "${gid}" ]; then
+		einfo "    # groupadd shadow"
+		einfo "    # gpasswd -a apache shadow"
+		gid='shadow'
+	fi
+	einfo "    # chgrp ${gid} /etc/shadow"
+	einfo "    # chmod 640 /etc/shadow"
+	einfo
+}