Bug #133134.

Package-Manager: portage-2.1.2_rc4-r8

diff --git a/net-www/mod_auth_pam/ChangeLog b/net-www/mod_auth_pam/ChangeLog
index 9f31d9567d7354ff4062b8d805d6df95b471819c..956f5465e5f5dc795cc9ac937726b2cd7b132547 100644 (file)
--- 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/Manifest b/net-www/mod_auth_pam/Manifest
index cfaff015ee65c04cf8f6f0476251bff57b554070..f9d84777a6dafb01ca5c9371d4f488861fe0c724 100644 (file)
--- a/net-www/mod_auth_pam/Manifest
+++ b/net-www/mod_auth_pam/Manifest
@@ -10,20 +10,28 @@ AUX apache2.pam 327 RMD160 47cbb63921f115e927f938dae82e7155a7aa5cfd SHA1 ff9381e
 MD5 6b1cd54dfe7b7385155a4a1c1f58caa4 files/apache2.pam 327
 RMD160 47cbb63921f115e927f938dae82e7155a7aa5cfd files/apache2.pam 327
 SHA256 bf813064125e86e4416973667fe5147f6415ef2543e538c90aea92bc8b13c8f1 files/apache2.pam 327
-AUX mod_auth_pam-1.1.1-compile-fix.patch 1073 RMD160 a7d0a081c7b9217ede401eb6ccbe5f28ec5cfc91 SHA1 6d1583a1ad0cfc7ba7c2bc7a53c61c9ce07d96ca SHA256 8c986ac4bb753ddec0b496690fe5addd9f366ecfc2fdad4fd15482f267afd1ad
-MD5 33ba9becf231dd55db43de324796964d files/mod_auth_pam-1.1.1-compile-fix.patch 1073
-RMD160 a7d0a081c7b9217ede401eb6ccbe5f28ec5cfc91 files/mod_auth_pam-1.1.1-compile-fix.patch 1073
-SHA256 8c986ac4bb753ddec0b496690fe5addd9f366ecfc2fdad4fd15482f267afd1ad files/mod_auth_pam-1.1.1-compile-fix.patch 1073
+AUX mod_auth_pam-1.1.1-compile-fix.patch 1065 RMD160 c775703ab79dd55c307b72234de59b882cdb03a4 SHA1 3b1da458e48035e6fa7adce89f476ac5e9b762a2 SHA256 5ace70a63c20e176ec6a605d5c6752fa8eff1ed7477a3fea30eb47c51ba6ac5b
+MD5 b15ab19607f631eebadddb24964c5986 files/mod_auth_pam-1.1.1-compile-fix.patch 1065
+RMD160 c775703ab79dd55c307b72234de59b882cdb03a4 files/mod_auth_pam-1.1.1-compile-fix.patch 1065
+SHA256 5ace70a63c20e176ec6a605d5c6752fa8eff1ed7477a3fea30eb47c51ba6ac5b files/mod_auth_pam-1.1.1-compile-fix.patch 1065
+AUX mod_auth_pam-1.1.1-service_name.patch 1644 RMD160 3a85398814be77c2f111b5a6ad447ac5f9442fd2 SHA1 e7bbd920d2da8fda63288488f7a0d367cdd1e05b SHA256 a3b5ebfa4533815dc6c9eb86d28eb8e6a4cd4959cd6d77d90774dc0c63efc023
+MD5 231d4fb9a632f6b129bf065fcf03c4b2 files/mod_auth_pam-1.1.1-service_name.patch 1644
+RMD160 3a85398814be77c2f111b5a6ad447ac5f9442fd2 files/mod_auth_pam-1.1.1-service_name.patch 1644
+SHA256 a3b5ebfa4533815dc6c9eb86d28eb8e6a4cd4959cd6d77d90774dc0c63efc023 files/mod_auth_pam-1.1.1-service_name.patch 1644
 DIST mod_auth_pam-1.1.1.tar.gz 9575 RMD160 1072354a7a5bc42bfcbae0e935a5e444db280233 SHA1 21f68410c240d3063a676e952b8c25c214b29546 SHA256 2c252f5f4932c8cfd398d1dfdf6245f6528ab8ae505c23c16a289c3626042b3f
 DIST mod_auth_pam-2.0-1.1.1.tar.gz 11456 RMD160 4dbc4daae2e696b44767577d63ccf24aec397f2c SHA1 9c7f5c552490d5d26e64401987291046714b870e SHA256 21c55e3a3539e05782654d4dc6f12345b0a4eac29425c20c41f540260866977b
-EBUILD mod_auth_pam-1.1.1-r1.ebuild 2048 RMD160 afd4332de4182bd54644f53767707060e8673989 SHA1 1bb69e772f293890f09df22a4e42a124722e72ed SHA256 73d5091ddf51c1247186c577d790bb3c9717fb0dfa473127e6124e0bb1272299
-MD5 98d900bb07f881f588466bf257c27558 mod_auth_pam-1.1.1-r1.ebuild 2048
-RMD160 afd4332de4182bd54644f53767707060e8673989 mod_auth_pam-1.1.1-r1.ebuild 2048
-SHA256 73d5091ddf51c1247186c577d790bb3c9717fb0dfa473127e6124e0bb1272299 mod_auth_pam-1.1.1-r1.ebuild 2048
-MISC ChangeLog 2571 RMD160 1aa60268cf6db885de68e8300bea02a95bbccebe SHA1 19215e924a93fc593426e6471abf3a731b1098a8 SHA256 77e365853caef0fa46de39d68ed800d06c2e7127d6322ab3fb89a7fa881d924c
-MD5 328d169b968b9d86a00e8209054ca4c1 ChangeLog 2571
-RMD160 1aa60268cf6db885de68e8300bea02a95bbccebe ChangeLog 2571
-SHA256 77e365853caef0fa46de39d68ed800d06c2e7127d6322ab3fb89a7fa881d924c ChangeLog 2571
+EBUILD mod_auth_pam-1.1.1-r1.ebuild 2029 RMD160 5bc41657eacb5ccf78cc08e16fbf570167446398 SHA1 fc63a540bfdbf88fe9d28f96008219281f54dc2d SHA256 89d8432d16b58489968a6cc4e6d827979777d926030f1ec359e4e4c37bf10d24
+MD5 5ed666265136f2f94f59c8f016b08ecb mod_auth_pam-1.1.1-r1.ebuild 2029
+RMD160 5bc41657eacb5ccf78cc08e16fbf570167446398 mod_auth_pam-1.1.1-r1.ebuild 2029
+SHA256 89d8432d16b58489968a6cc4e6d827979777d926030f1ec359e4e4c37bf10d24 mod_auth_pam-1.1.1-r1.ebuild 2029
+EBUILD mod_auth_pam-1.1.1-r2.ebuild 2004 RMD160 08a5444755b4828246f74bcd671b479cc21f1f65 SHA1 2ab9a8632873a1556bdab33d02d5cefe7e252f09 SHA256 3008406d9e19128beba105008e26a0a2c0110008457af23d49952939228f1ee0
+MD5 842da10741a0075abce60bd12fcd8bd4 mod_auth_pam-1.1.1-r2.ebuild 2004
+RMD160 08a5444755b4828246f74bcd671b479cc21f1f65 mod_auth_pam-1.1.1-r2.ebuild 2004
+SHA256 3008406d9e19128beba105008e26a0a2c0110008457af23d49952939228f1ee0 mod_auth_pam-1.1.1-r2.ebuild 2004
+MISC ChangeLog 2905 RMD160 483b1d1308f938f944de1cc9fc4d4793a4c38e57 SHA1 2ae7ae47468dda7f35e071fda65c1635c50ecd56 SHA256 d1495af9bda9184ab0a3a7ea3cdfef51ea4f96331069a2a8de04440f1bf70acc
+MD5 4e8a567d8294e56d7c9c80ad4601188e ChangeLog 2905
+RMD160 483b1d1308f938f944de1cc9fc4d4793a4c38e57 ChangeLog 2905
+SHA256 d1495af9bda9184ab0a3a7ea3cdfef51ea4f96331069a2a8de04440f1bf70acc ChangeLog 2905
 MISC metadata.xml 226 RMD160 d11ce73e47adf4b3d91309ec6489fded2f4d4e0e SHA1 fe9f7ce6f2281683065abb3255c8b731665c82ac SHA256 376a327f91f69eb96f0c1b05cc1481dd7017a0570f631a03b1f6d14d58215ca8
 MD5 7272d8b6d09e3e301b6a08aa9c912eb0 metadata.xml 226
 RMD160 d11ce73e47adf4b3d91309ec6489fded2f4d4e0e metadata.xml 226
@@ -31,3 +39,6 @@ SHA256 376a327f91f69eb96f0c1b05cc1481dd7017a0570f631a03b1f6d14d58215ca8 metadata
 MD5 f3f0f867e21df2259d300f5a33f73d94 files/digest-mod_auth_pam-1.1.1-r1 515
 RMD160 5812e95cd48b4737d41638d1136eed110f29e118 files/digest-mod_auth_pam-1.1.1-r1 515
 SHA256 1aca4d7d7798d5b0966a000807a4ac8cd8a478a8ce9dd04af6ee115af1e51f97 files/digest-mod_auth_pam-1.1.1-r1 515
+MD5 f3f0f867e21df2259d300f5a33f73d94 files/digest-mod_auth_pam-1.1.1-r2 515
+RMD160 5812e95cd48b4737d41638d1136eed110f29e118 files/digest-mod_auth_pam-1.1.1-r2 515
+SHA256 1aca4d7d7798d5b0966a000807a4ac8cd8a478a8ce9dd04af6ee115af1e51f97 files/digest-mod_auth_pam-1.1.1-r2 515

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 (file)
index 0000000..43652b8
--- /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 20604e1c3f7e0a88d850d10a6636f0b35401cc8c..2e95c8d17bba4830a13e37b50d5ca1668e0905d8 100644 (file)
--- 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 (file)
index 0000000..82529db
--- /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 97a1629bbc139fccd4bc5e4e8cf30c20a93fe8df..cd13bfb300bb6a8d0e60a4c2217c59d4bd9d62c8 100644 (file)
--- 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 (file)
index 0000000..369c28e
--- /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
+}