From c365f53de97c1320b9d33430e8fee86a50a7a841 Mon Sep 17 00:00:00 2001 From: Christian Heim Date: Sun, 29 Jul 2007 16:18:53 +0000 Subject: Moving net-www/mod_auth_pam to www-apache/mod_auth_pam (#81244). --- net-www/mod_auth_pam/ChangeLog | 104 --------------------- net-www/mod_auth_pam/Manifest | 35 ------- net-www/mod_auth_pam/files/10_mod_auth_pam.conf | 37 -------- net-www/mod_auth_pam/files/apache2.pam | 6 -- .../files/digest-mod_auth_pam-1.1.1-r1 | 3 - .../files/digest-mod_auth_pam-1.1.1-r2 | 3 - .../files/mod_auth_pam-1.1.1-service_name.patch | 66 ------------- net-www/mod_auth_pam/metadata.xml | 8 -- net-www/mod_auth_pam/mod_auth_pam-1.1.1-r1.ebuild | 66 ------------- net-www/mod_auth_pam/mod_auth_pam-1.1.1-r2.ebuild | 66 ------------- 10 files changed, 394 deletions(-) delete mode 100644 net-www/mod_auth_pam/ChangeLog delete mode 100644 net-www/mod_auth_pam/Manifest delete mode 100644 net-www/mod_auth_pam/files/10_mod_auth_pam.conf delete mode 100644 net-www/mod_auth_pam/files/apache2.pam delete mode 100644 net-www/mod_auth_pam/files/digest-mod_auth_pam-1.1.1-r1 delete mode 100644 net-www/mod_auth_pam/files/digest-mod_auth_pam-1.1.1-r2 delete mode 100644 net-www/mod_auth_pam/files/mod_auth_pam-1.1.1-service_name.patch delete mode 100644 net-www/mod_auth_pam/metadata.xml delete mode 100644 net-www/mod_auth_pam/mod_auth_pam-1.1.1-r1.ebuild delete mode 100644 net-www/mod_auth_pam/mod_auth_pam-1.1.1-r2.ebuild (limited to 'net-www') diff --git a/net-www/mod_auth_pam/ChangeLog b/net-www/mod_auth_pam/ChangeLog deleted file mode 100644 index fa843b61f4ad..000000000000 --- a/net-www/mod_auth_pam/ChangeLog +++ /dev/null @@ -1,104 +0,0 @@ -# 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.23 2007/06/29 15:12:29 chtekk Exp $ - - 29 Jun 2007; Luca Longinotti files/apache2.pam, - metadata.xml: - Fix DOS line endings. - - 14 Jun 2007; Christian Heim - files/10_mod_auth_pam.conf: - Document "AuthBasicAuthoritative Off" in the configuration examples. - - 14 Jun 2007; Christian Heim files/apache2.pam: - Fixing apache2.pam as pointed out in #155050 (thanks to candrews at - integralblue.com). - - 12 May 2007; Luca Longinotti - -files/10_mod_auth_pam_ap1.conf, - -files/mod_auth_pam-1.1.1-compile-fix.patch, mod_auth_pam-1.1.1-r1.ebuild, - mod_auth_pam-1.1.1-r2.ebuild: - Remove Apache1 support, fix Apache2 support. - - 20 Jan 2007; Christian Heim - mod_auth_pam-1.1.1-r1.ebuild, mod_auth_pam-1.1.1-r2.ebuild: - Remove unneeded RESTRICT="nomirror". - -*mod_auth_pam-1.1.1-r2 (15 Jan 2007) - - 15 Jan 2007; Luca Longinotti - 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 - mod_auth_pam-1.1.1-r1.ebuild: - Uniform install usage. - - 14 Jan 2007; Luca Longinotti - -files/1.1.1-r1/10_mod_auth_pam.conf, files/10_mod_auth_pam.conf, - -files/1.1.1-r1-1/10_mod_auth_pam.conf, +files/10_mod_auth_pam_ap1.conf, - -files/mod_auth_pam-1.1.1-gentoo.diff, mod_auth_pam-1.1.1-r1.ebuild: - Cleanup. - - 04 Jun 2006; Michael Stewart - -mod_auth_pam-1.1.1.ebuild: - Remove old-style ebuilds - - 21 Mar 2006; Joseph Jezak - mod_auth_pam-1.1.1-r1.ebuild: - Marked ppc stable for bug #125167. Thanks to mabi for testing. - - 16 Mar 2006; Krzysiek Pawlik - mod_auth_pam-1.1.1-r1.ebuild: - Stable on x86, see bug #125167. - - 08 Oct 2005; Bryan Østergaard files/apache2.pam: - Remove pam_console reference, bug 98454. - - 05 May 2005; Sven Wegener - mod_auth_pam-1.1.1-r1.ebuild: - Added missing parentheses to SRC_URI. - - 25 Feb 2005; Benedikt Boehm - +files/1.1.1-r1-1/10_mod_auth_pam.conf, mod_auth_pam-1.1.1-r1.ebuild: - fixed 1.3 support - - 25 Feb 2005; Benedikt Boehm - mod_auth_pam-1.1.1-r1.ebuild: - fixed minor bugs - - 17 Feb 2005; Benedikt Boehm - +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 - mod_auth_pam-1.1.1-r1.ebuild: - code cleanup; added missing need_apache2 - - 23 Jan 2005; Christian Parpart - mod_auth_pam-1.1.1-r1.ebuild: - -m adding ~amd64 to keywords - - 13 Oct 2004; Christian Parpart : - 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 - mod_auth_pam-1.1.1.ebuild: - Masked mod_auth_pam-1.1.1.ebuild stable for ppc - - 23 Jun 2004; Chuck Short files/apache2.pam, - files/mod_auth_pam-1.1.1-gentoo.diff: - Added missing files. - -*mod_auth_pam-1.1.1 (14 Jun 2004) - - 14 Jun 2004; Chuck Short mod_auth_pam-1.1.1.ebuild, - files/10_mod_auth_pam.conf: - Initial ebuild, closes #28114. - diff --git a/net-www/mod_auth_pam/Manifest b/net-www/mod_auth_pam/Manifest deleted file mode 100644 index 87c8481ea3f6..000000000000 --- a/net-www/mod_auth_pam/Manifest +++ /dev/null @@ -1,35 +0,0 @@ -AUX 10_mod_auth_pam.conf 1025 RMD160 b9e57e20819fc4ae5a68a73e8c749118c79d80d9 SHA1 22eafe53e55ea35d41c196291a88d999ff1200a7 SHA256 899a2927f8fcff638705ea60a0a0e4764a2f70482b1da00454a9f626c00bf0d2 -MD5 b2061e68ba24c4e621b32d711b2c5823 files/10_mod_auth_pam.conf 1025 -RMD160 b9e57e20819fc4ae5a68a73e8c749118c79d80d9 files/10_mod_auth_pam.conf 1025 -SHA256 899a2927f8fcff638705ea60a0a0e4764a2f70482b1da00454a9f626c00bf0d2 files/10_mod_auth_pam.conf 1025 -AUX apache2.pam 193 RMD160 a7fef247ec9ea0f201d87140b107c42a9ed0979e SHA1 0a832eb9e850bad4a172b18a8f368183aa253820 SHA256 f849e877a0a7bd23e2d0ce747d674a5a5ace7da603c90a36a468a83fb123aee1 -MD5 423d18894914e70111b6036d0cfd5fc9 files/apache2.pam 193 -RMD160 a7fef247ec9ea0f201d87140b107c42a9ed0979e files/apache2.pam 193 -SHA256 f849e877a0a7bd23e2d0ce747d674a5a5ace7da603c90a36a468a83fb123aee1 files/apache2.pam 193 -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-2.0-1.1.1.tar.gz 11456 RMD160 4dbc4daae2e696b44767577d63ccf24aec397f2c SHA1 9c7f5c552490d5d26e64401987291046714b870e SHA256 21c55e3a3539e05782654d4dc6f12345b0a4eac29425c20c41f540260866977b -EBUILD mod_auth_pam-1.1.1-r1.ebuild 1567 RMD160 279b2b067b18962e4619d2c6483ab90477329c4e SHA1 e28ebfd7c2473b20b19ca6e5d0854bc67df4408c SHA256 56d4f91268a46dc37057fdf6bbb04b11a08193af38e22d510d8ebcbfc203d3a5 -MD5 2bddcef78e3d7d177c8ac74599137e4e mod_auth_pam-1.1.1-r1.ebuild 1567 -RMD160 279b2b067b18962e4619d2c6483ab90477329c4e mod_auth_pam-1.1.1-r1.ebuild 1567 -SHA256 56d4f91268a46dc37057fdf6bbb04b11a08193af38e22d510d8ebcbfc203d3a5 mod_auth_pam-1.1.1-r1.ebuild 1567 -EBUILD mod_auth_pam-1.1.1-r2.ebuild 1542 RMD160 e15226b2d33a67c830ff66b3628725491d2a396f SHA1 54c85ed4c455a011feb26a4d52df09714536d42a SHA256 734ea5894452a019ce05eaaf011d4486618372ef350adf4d9dab241adf8d919a -MD5 3cebcc40d3f7445c07e6b8e78ce12623 mod_auth_pam-1.1.1-r2.ebuild 1542 -RMD160 e15226b2d33a67c830ff66b3628725491d2a396f mod_auth_pam-1.1.1-r2.ebuild 1542 -SHA256 734ea5894452a019ce05eaaf011d4486618372ef350adf4d9dab241adf8d919a mod_auth_pam-1.1.1-r2.ebuild 1542 -MISC ChangeLog 3724 RMD160 fe4a00126119844e43ac8374fc14f0da8d76e45e SHA1 72216549ba9c71424d9bf5c987b38679047ba814 SHA256 966bb7649ef6c0a378fba447890be677b3b6be41ac5b9740df3c8cc14e6eb323 -MD5 919215c8fe3ff09d79440883563db5ae ChangeLog 3724 -RMD160 fe4a00126119844e43ac8374fc14f0da8d76e45e ChangeLog 3724 -SHA256 966bb7649ef6c0a378fba447890be677b3b6be41ac5b9740df3c8cc14e6eb323 ChangeLog 3724 -MISC metadata.xml 229 RMD160 bb816bd761846ad578f8c1521a1f1ec6297410f4 SHA1 92fdbcb6a85ece96506733ad67a5e4e74a58a529 SHA256 8e1aafc5385805d45759406a60df79f0ce88aa1df1a58d44b596405d64c9226d -MD5 17bfbf436c6d4afc4dea019597d048d1 metadata.xml 229 -RMD160 bb816bd761846ad578f8c1521a1f1ec6297410f4 metadata.xml 229 -SHA256 8e1aafc5385805d45759406a60df79f0ce88aa1df1a58d44b596405d64c9226d metadata.xml 229 -MD5 49900d6fb41df415b014223fd0810f57 files/digest-mod_auth_pam-1.1.1-r1 265 -RMD160 c8e2a0326e86b920e5a1eb120dd923ca3a618cc5 files/digest-mod_auth_pam-1.1.1-r1 265 -SHA256 bba5e29ae8b31f6dfcc058ff10ef6e528d57056ef718748920ac96288f17ec0d files/digest-mod_auth_pam-1.1.1-r1 265 -MD5 49900d6fb41df415b014223fd0810f57 files/digest-mod_auth_pam-1.1.1-r2 265 -RMD160 c8e2a0326e86b920e5a1eb120dd923ca3a618cc5 files/digest-mod_auth_pam-1.1.1-r2 265 -SHA256 bba5e29ae8b31f6dfcc058ff10ef6e528d57056ef718748920ac96288f17ec0d files/digest-mod_auth_pam-1.1.1-r2 265 diff --git a/net-www/mod_auth_pam/files/10_mod_auth_pam.conf b/net-www/mod_auth_pam/files/10_mod_auth_pam.conf deleted file mode 100644 index afcc4ef8974c..000000000000 --- a/net-www/mod_auth_pam/files/10_mod_auth_pam.conf +++ /dev/null @@ -1,37 +0,0 @@ - - - LoadModule auth_pam_module modules/mod_auth_pam.so - - - LoadModule auth_sys_group_module modules/mod_auth_sys_group.so - - - -### EXAMPLE 1: authentificate against a single PAM account -### -# -# AuthPAM_Enabled on -# -# # If you want to make mod_auth_pam work with apache-2.2, please uncomment -# # the following line: -# AuthBasicAuthoritative Off -# AuthType Basic -# AuthName "secure area" -# Require user webmaster -# - -### EXAMPLE 2: authentificate against a a PAM group, so, that each user -### beeing in this group may access this "secure area" -### -# -# AuthPAM_Enabled on -# -# # If you want to make mod_auth_pam work with apache-2.2, please uncomment -# # the following line: -# AuthBasicAuthoritative Off -# AuthType Basic -# AuthName "secure area" -# Require group staff -# - -# vim:syntax=apache diff --git a/net-www/mod_auth_pam/files/apache2.pam b/net-www/mod_auth_pam/files/apache2.pam deleted file mode 100644 index a17959a3929f..000000000000 --- a/net-www/mod_auth_pam/files/apache2.pam +++ /dev/null @@ -1,6 +0,0 @@ -#%PAM-1.0 -auth include system-auth -auth required pam_nologin.so -account include system-auth -password include system-auth -session include system-auth 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 deleted file mode 100644 index c6afce1046ca..000000000000 --- a/net-www/mod_auth_pam/files/digest-mod_auth_pam-1.1.1-r1 +++ /dev/null @@ -1,3 +0,0 @@ -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/digest-mod_auth_pam-1.1.1-r2 b/net-www/mod_auth_pam/files/digest-mod_auth_pam-1.1.1-r2 deleted file mode 100644 index c6afce1046ca..000000000000 --- a/net-www/mod_auth_pam/files/digest-mod_auth_pam-1.1.1-r2 +++ /dev/null @@ -1,3 +0,0 @@ -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-service_name.patch b/net-www/mod_auth_pam/files/mod_auth_pam-1.1.1-service_name.patch deleted file mode 100644 index 82529db2c0ff..000000000000 --- a/net-www/mod_auth_pam/files/mod_auth_pam-1.1.1-service_name.patch +++ /dev/null @@ -1,66 +0,0 @@ ---- 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 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/metadata.xml b/net-www/mod_auth_pam/metadata.xml deleted file mode 100644 index a1f5ceff2352..000000000000 --- a/net-www/mod_auth_pam/metadata.xml +++ /dev/null @@ -1,8 +0,0 @@ - - - - apache - - apache-bugs@gentoo.org - - 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 deleted file mode 100644 index 5fde88f79f1c..000000000000 --- a/net-www/mod_auth_pam/mod_auth_pam-1.1.1-r1.ebuild +++ /dev/null @@ -1,66 +0,0 @@ -# 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.16 2007/05/12 10:57:59 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="" - -DEPEND="sys-libs/pam" -RDEPEND="${DEPEND}" - -APXS2_ARGS="-c ${PN}.c -lpam" -APACHE2_EXECFILES=".libs/mod_auth_sys_group.so" - -APACHE2_MOD_CONF="10_${PN}" -APACHE2_MOD_DEFINE="AUTH_PAM" - -DOCFILES="INSTALL README doc/*" - -need_apache - -SRC_URI="http://pam.sourceforge.net/mod_auth_pam/dist/${PN}-2.0-${PV}.tar.gz" - -S="${WORKDIR}/${PN}" - -src_unpack() { - unpack ${A} - cd "${S}" - - sed -i -e 's/servicename = "httpd"/servicename = "apache2"/' "${PN}.c" -} - -src_compile() { - apache-module_src_compile - ${APXS2} -c mod_auth_sys_group.c -} - -src_install() { - apache-module_src_install - insinto /etc/pam.d - newins "${FILESDIR}/apache2.pam" apache2 -} - -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 -} 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 deleted file mode 100644 index 4ff702d754c8..000000000000 --- a/net-www/mod_auth_pam/mod_auth_pam-1.1.1-r2.ebuild +++ /dev/null @@ -1,66 +0,0 @@ -# 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.3 2007/05/12 10:57:59 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="" - -DEPEND="sys-libs/pam" -RDEPEND="${DEPEND}" - -APXS2_ARGS="-c ${PN}.c -lpam" -APACHE2_EXECFILES=".libs/mod_auth_sys_group.so" - -APACHE2_MOD_CONF="10_${PN}" -APACHE2_MOD_DEFINE="AUTH_PAM" - -DOCFILES="INSTALL README doc/*" - -need_apache - -SRC_URI="http://pam.sourceforge.net/mod_auth_pam/dist/${PN}-2.0-${PV}.tar.gz" - -S="${WORKDIR}/${PN}" - -src_unpack() { - unpack ${A} - cd "${S}" - - epatch "${FILESDIR}/${P}-service_name.patch" -} - -src_compile() { - apache-module_src_compile - ${APXS2} -c mod_auth_sys_group.c -} - -src_install() { - apache-module_src_install - insinto /etc/pam.d - newins "${FILESDIR}/apache2.pam" apache2 -} - -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 -} -- cgit v1.2.3-65-gdbad