apache herd package refresh

(Portage version: 2.0.51-r14)

8 files changed, 127 insertions, 10 deletions

diff --git a/net-www/mod_auth_external/ChangeLog b/net-www/mod_auth_external/ChangeLog
index b1bf01ef513b..68aff59f1218 100644
--- a/net-www/mod_auth_external/ChangeLog
+++ b/net-www/mod_auth_external/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for net-www/mod_auth_external
-# Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-www/mod_auth_external/ChangeLog,v 1.11 2004/06/25 00:59:25 agriffis Exp $
+# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-www/mod_auth_external/ChangeLog,v 1.12 2005/01/22 04:27:45 trapni Exp $
+
+  22 Jan 2005; Christian Parpart <trapni@gentoo.org>
+  +digest-mod_auth_external-2.2.7-r1,
+  +files/2.2.7-r1/10_mod_auth_external.conf:
+  Apache Herd Package Refresh
 
   20 Jun 2004; Chuck Short <zul@gentoo.org> mod_auth_external-2.2.3.ebuild,
   mod_auth_external-2.2.7.ebuild:
diff --git a/net-www/mod_auth_external/Manifest b/net-www/mod_auth_external/Manifest
index 72ad6f19f4fb..e8f3c632b32e 100644
--- a/net-www/mod_auth_external/Manifest
+++ b/net-www/mod_auth_external/Manifest
@@ -1,9 +1,13 @@
-MD5 2bea14c7325a37a923410a76d450c2d1 mod_auth_external-2.2.3.ebuild 1698
-MD5 7dd1f7f5611ea06b7fbcce8481ddcbe0 mod_auth_external-2.2.7.ebuild 1778
-MD5 5b673e1cc67f4f1d6fe9b764c7e74d4d ChangeLog 1424
 MD5 f61bfa064e3acdfcd826e4a38b121196 metadata.xml 161
+MD5 a8ec29a3b5e57fb20a6d3e626f8e16e9 mod_auth_external-2.2.3.ebuild 1698
+MD5 ff4ab8e98db2174c9171ce662be42500 mod_auth_external-2.2.7.ebuild 1778
+MD5 0dddfbd300d4ea810917b84ccfe7eaae mod_auth_external-2.2.7-r1.ebuild 1813
+MD5 0682340a42fcdf3d43f063ef6174bdcc digest-mod_auth_external-2.2.7-r1 74
+MD5 5b673e1cc67f4f1d6fe9b764c7e74d4d ChangeLog 1424
+MD5 dcccde2ac96e98d941240a2dc8c83120 files/10_mod_auth_external.conf 1240
 MD5 a877f74ba95c1388341792c72687402b files/digest-mod_auth_external-2.2.3 156
 MD5 0682340a42fcdf3d43f063ef6174bdcc files/digest-mod_auth_external-2.2.7 74
 MD5 4eece529a11bcc39843827ab95d062a5 files/mod_auth_external-2.2.7-gentoo.diff 3505
-MD5 dcccde2ac96e98d941240a2dc8c83120 files/10_mod_auth_external.conf 1240
 MD5 d0cb338160e3be8790524af8071cc4df files/pwauth.pam 380
+MD5 0682340a42fcdf3d43f063ef6174bdcc files/digest-mod_auth_external-2.2.7-r1 74
+MD5 14e8c984c2bdaa0e441e2d694bfe5ef0 files/2.2.7-r1/10_mod_auth_external.conf 1230
diff --git a/net-www/mod_auth_external/digest-mod_auth_external-2.2.7-r1 b/net-www/mod_auth_external/digest-mod_auth_external-2.2.7-r1
new file mode 100644
index 000000000000..7d5505412c5f
--- /dev/null
+++ b/net-www/mod_auth_external/digest-mod_auth_external-2.2.7-r1
@@ -0,0 +1 @@
+MD5 ddd6cd5cc772f1952d83f2b8e5d91243 mod_auth_external-2.2.7.tar.gz 64220
diff --git a/net-www/mod_auth_external/files/2.2.7-r1/10_mod_auth_external.conf b/net-www/mod_auth_external/files/2.2.7-r1/10_mod_auth_external.conf
new file mode 100644
index 000000000000..1e2bf2af33c5
--- /dev/null
+++ b/net-www/mod_auth_external/files/2.2.7-r1/10_mod_auth_external.conf
@@ -0,0 +1,44 @@
+<IfDefine AUTH_EXTERNAL>
+  <IfModule !mod_auth_external.c>
+    LoadModule external_auth_module		modules/mod_auth_external.so
+  </IfModule>
+</IfDefine>
+
+<IfModule mod_auth_external.c>
+
+AddExternalAuth  pwauth /etc/apache2/modules/pwauth
+SetExternalAuthMethod  pwauth pipe
+
+# For external group check
+# AddExternalGroup unixgroup modules/unixgroup
+# SetExternalGroupMethod  unixgroup environment
+
+#  Put an .htaccess file in whatever directory you want to protect.
+#	(For .htaccess files to work, you may need to change some
+#      "AllowOverride None" directives in your httpd.conf file into
+#      "AllowOverride AuthConfig" directives).
+#
+#      A typical .htaccess file would look like:
+#
+#     AuthName Your-Site-Name
+#     AuthType Basic
+#  	  AuthExternal pwauth
+#  		   require valid-user
+# or 
+# 					 require user1
+#
+#	    GroupExternal unixgroup
+#   	  AuthGroupFile /dev/null
+#     	require group <groupname1> <groupname2> ...
+#
+#      Alternately, you can put a <Directory> block with the same directives
+#      in your httpd.conf file.
+#
+# Note1:	Using group method, don't forget to add users in the authorized group
+# group files
+# somegroup:x:500:user1,user2,user3
+#
+# 
+# - samples from pwauth/INSTALL 
+
+</IfModule>
diff --git a/net-www/mod_auth_external/files/digest-mod_auth_external-2.2.7-r1 b/net-www/mod_auth_external/files/digest-mod_auth_external-2.2.7-r1
new file mode 100644
index 000000000000..7d5505412c5f
--- /dev/null
+++ b/net-www/mod_auth_external/files/digest-mod_auth_external-2.2.7-r1
@@ -0,0 +1 @@
+MD5 ddd6cd5cc772f1952d83f2b8e5d91243 mod_auth_external-2.2.7.tar.gz 64220
diff --git a/net-www/mod_auth_external/mod_auth_external-2.2.3.ebuild b/net-www/mod_auth_external/mod_auth_external-2.2.3.ebuild
index bed6ab19238e..62d367db2194 100644
--- a/net-www/mod_auth_external/mod_auth_external-2.2.3.ebuild
+++ b/net-www/mod_auth_external/mod_auth_external-2.2.3.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2004 Gentoo Foundation
+# 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_external/mod_auth_external-2.2.3.ebuild,v 1.6 2004/06/25 00:59:25 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-www/mod_auth_external/mod_auth_external-2.2.3.ebuild,v 1.7 2005/01/22 04:27:45 trapni Exp $
 
 inherit eutils
 
diff --git a/net-www/mod_auth_external/mod_auth_external-2.2.7-r1.ebuild b/net-www/mod_auth_external/mod_auth_external-2.2.7-r1.ebuild
new file mode 100644
index 000000000000..b32e0cabec09
--- /dev/null
+++ b/net-www/mod_auth_external/mod_auth_external-2.2.7-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_external/mod_auth_external-2.2.7-r1.ebuild,v 1.1 2005/01/22 04:27:45 trapni Exp $
+
+inherit eutils apache-module
+
+DESCRIPTION="An Apache2 authentication DSO using external programs"
+HOMEPAGE="http://www.unixpapa.com/mod_auth_external.html"
+
+SRC_URI="http://www.unixpapa.com/software/${P}.tar.gz"
+DEPEND="sys-libs/pam"
+RDEPEND=""
+LICENSE="Apache-1.1"
+KEYWORDS="~x86"
+IUSE=""
+SLOT="0"
+
+DOCFILES="AUTHENTICATORS CHANGES INSTALL INSTALL.HARDCODE README TODO"
+
+APACHE2_MOD_CONF="${PVR}/10_mod_auth_external"
+APACHE2_MOD_DEFINE="AUTH_EXTERNAL"
+APACHE2_EXECFILES="pwauth/unixgroup pwauth/pwauth"
+
+need_apache2
+
+src_unpack() {
+	unpack ${A} || die "unpack ${A} failed"
+	cd ${S} || die "cd ${S} failed"
+	epatch ${FILESDIR}/${P}-gentoo.diff
+}
+
+src_compile() {
+	apache2_src_compile
+
+	cd pwauth || die "cd pwauth failed"
+	sed -i -e  "s,\(LOCALFLAGS=\),\1$CFLAGS ,g" \
+		-e  "s,\(LIB=.*\),\1 -lpam -ldl,g" Makefile
+	# add `-Wl,-z,now' to LIB to workaround glibc suid/sgid race
+	emake LIB="-lpam -ldl -Wl,-z,now" || die "Make failed"
+}
+
+src_install() {
+	apache2_src_install
+
+	insinto /etc/pam.d
+	newins ${FILESDIR}/pwauth.pam pwauth
+	newins ${FILESDIR}/pwauth.pam unixgroup
+
+	docinto mysql; dodoc mysql/*
+	docinto pwauth; dodoc pwauth/{FORM_AUTH,INSTALL,README}
+	docinto radius; dodoc radius/{CHANGES,README}
+	docinto sybase; dodoc sybase/README
+	docinto test; dodoc test/*
+
+	# protect these programs
+	local gid=`grep ^apache: /etc/group |cut -d: -f3`
+	[ -z "${gid}" ] && gid=81
+	fowners root:${gid} ${APACHE2_MODULESDIR}/unixgroup
+	fowners root:${gid} ${APACHE2_MODULESDIR}/pwauth
+	fperms 4710 ${APACHE2_MODULESDIR}/unixgroup
+	fperms 4710 ${APACHE2_MODULESDIR}/pwauth
+}
diff --git a/net-www/mod_auth_external/mod_auth_external-2.2.7.ebuild b/net-www/mod_auth_external/mod_auth_external-2.2.7.ebuild
index 29bc3442b606..b24ebbbb8637 100644
--- a/net-www/mod_auth_external/mod_auth_external-2.2.7.ebuild
+++ b/net-www/mod_auth_external/mod_auth_external-2.2.7.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2004 Gentoo Foundation
+# 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_external/mod_auth_external-2.2.7.ebuild,v 1.5 2004/06/25 00:59:25 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-www/mod_auth_external/mod_auth_external-2.2.7.ebuild,v 1.6 2005/01/22 04:27:45 trapni Exp $
 
 inherit eutils