From: Luca Longinotti Date: Sat, 13 Jan 2007 20:09:11 +0000 (+0000) Subject: Cleanup. X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=ff70992478e8c5128170e15e80de4653b29f30bb;p=gentoo.git Cleanup. Package-Manager: portage-2.1.2_rc4-r8 --- diff --git a/net-www/mod_auth_external/Manifest b/net-www/mod_auth_external/Manifest index f3b9b4a0057b..06ea9fc81da1 100644 --- a/net-www/mod_auth_external/Manifest +++ b/net-www/mod_auth_external/Manifest @@ -1,43 +1,26 @@ -AUX 10_mod_auth_external.conf 1240 RMD160 05fe39ecd5001fd263936883994ee73d81f5eebf SHA1 22fa99417aeb9a7f944bb63b8b3f0a2c24e09942 SHA256 e16de66343ac607a0a1b36558837319c82e39c35659c692a0fd8916e2b61c70a -MD5 dcccde2ac96e98d941240a2dc8c83120 files/10_mod_auth_external.conf 1240 -RMD160 05fe39ecd5001fd263936883994ee73d81f5eebf files/10_mod_auth_external.conf 1240 -SHA256 e16de66343ac607a0a1b36558837319c82e39c35659c692a0fd8916e2b61c70a files/10_mod_auth_external.conf 1240 -AUX 2.2.7-r1/10_mod_auth_external.conf 1292 RMD160 c4be77fa878489cec2752a5ce2d47eabf7323672 SHA1 69b282031a4d579f419ac36db1578d8a90c9adfd SHA256 68fcfdaa45877dc762399274a902ec066259e4cef665785e583cef0c248a6179 -MD5 c1a9a5e119336cf9524711598141c554 files/2.2.7-r1/10_mod_auth_external.conf 1292 -RMD160 c4be77fa878489cec2752a5ce2d47eabf7323672 files/2.2.7-r1/10_mod_auth_external.conf 1292 -SHA256 68fcfdaa45877dc762399274a902ec066259e4cef665785e583cef0c248a6179 files/2.2.7-r1/10_mod_auth_external.conf 1292 -AUX mod_auth_external-2.2.7-gentoo.diff 3505 RMD160 76eb5052129320f99ba0275ac08d7bca6c27599f SHA1 bd5ddb3beffe2e963968b8fcdf15e368d638a412 SHA256 251617b8604b0eb014780dbffcf424ea16ea1d6b2134364f03f52c3977eb44b2 -MD5 4eece529a11bcc39843827ab95d062a5 files/mod_auth_external-2.2.7-gentoo.diff 3505 -RMD160 76eb5052129320f99ba0275ac08d7bca6c27599f files/mod_auth_external-2.2.7-gentoo.diff 3505 -SHA256 251617b8604b0eb014780dbffcf424ea16ea1d6b2134364f03f52c3977eb44b2 files/mod_auth_external-2.2.7-gentoo.diff 3505 -AUX pwauth.pam 327 RMD160 47cbb63921f115e927f938dae82e7155a7aa5cfd SHA1 ff9381e34b7988673708ba40ee46c8581fee420c SHA256 bf813064125e86e4416973667fe5147f6415ef2543e538c90aea92bc8b13c8f1 -MD5 6b1cd54dfe7b7385155a4a1c1f58caa4 files/pwauth.pam 327 -RMD160 47cbb63921f115e927f938dae82e7155a7aa5cfd files/pwauth.pam 327 -SHA256 bf813064125e86e4416973667fe5147f6415ef2543e538c90aea92bc8b13c8f1 files/pwauth.pam 327 +AUX 10_mod_auth_external.conf 1292 RMD160 c4be77fa878489cec2752a5ce2d47eabf7323672 SHA1 69b282031a4d579f419ac36db1578d8a90c9adfd SHA256 68fcfdaa45877dc762399274a902ec066259e4cef665785e583cef0c248a6179 +MD5 c1a9a5e119336cf9524711598141c554 files/10_mod_auth_external.conf 1292 +RMD160 c4be77fa878489cec2752a5ce2d47eabf7323672 files/10_mod_auth_external.conf 1292 +SHA256 68fcfdaa45877dc762399274a902ec066259e4cef665785e583cef0c248a6179 files/10_mod_auth_external.conf 1292 DIST mod_auth_external-2.1.19.tar.gz 51390 RMD160 f4012119f3e3eca73b07c1f90292338e6256e31a SHA1 da2266f93acf82e488e14380157f1acd69198ad9 SHA256 9ad88330dce3b60f89d95106df5f6a58ff0a6414669e509789824e6706ddb636 DIST mod_auth_external-2.2.11.tar.gz 52542 RMD160 be27183d8049989f64548a5c8dd3cdecc3b3a5e2 SHA1 da89adcdac611ec8c0f69a79f2edff669210f2a1 SHA256 8068130444e9a93193062494c43e6a2d2d8e03e8ebdc9d378ab9c17c12a9e0c5 -DIST mod_auth_external-2.2.7.tar.gz 64220 DIST mod_auth_external-2.2.9.tar.gz 51857 RMD160 e08681fe1487db92ead67562e66f9ed5275a903d SHA1 47309efa7c5f3b18e4d65845811b47dd17863280 SHA256 0a1d1a079671b59b90f75ac25b23e2b65ef1f28d8086ce692e88d1efce07a5df -EBUILD mod_auth_external-2.1.19.ebuild 659 RMD160 a811400caedba47920590a7632d0e03b98b24660 SHA1 ae23e3a846da6f7e54b4bb11662f3dbd3895ea4c SHA256 02ec51c88981658c01fbed88d7ce3d21e59b294354790b4101c8cbe2e88c7d7c -MD5 e053bc92cc6ee163b5be9c4cf45426f7 mod_auth_external-2.1.19.ebuild 659 -RMD160 a811400caedba47920590a7632d0e03b98b24660 mod_auth_external-2.1.19.ebuild 659 -SHA256 02ec51c88981658c01fbed88d7ce3d21e59b294354790b4101c8cbe2e88c7d7c mod_auth_external-2.1.19.ebuild 659 -EBUILD mod_auth_external-2.2.11.ebuild 682 RMD160 07b00218c6f8a38023707ba845ebd93354ce0fea SHA1 749ebde6b3e186d02628aed88f70626275a25e6a SHA256 65d55045f9e8d704f80b95fa1ace9051f4ed33336e7914a6a8aee13d7eaec92b -MD5 f7f313ded2ca1aec223d8693470c99e3 mod_auth_external-2.2.11.ebuild 682 -RMD160 07b00218c6f8a38023707ba845ebd93354ce0fea mod_auth_external-2.2.11.ebuild 682 -SHA256 65d55045f9e8d704f80b95fa1ace9051f4ed33336e7914a6a8aee13d7eaec92b mod_auth_external-2.2.11.ebuild 682 -EBUILD mod_auth_external-2.2.7-r1.ebuild 1814 RMD160 c84d078fe3b89e1c6862960f1dc026c3c2e57668 SHA1 b19b66d2d029e9a048b0e4db0d564b3570e90fa0 SHA256 5f992367d6bd1ed1374496543c76f952952a70fd8d7cace75bb229c6116ea815 -MD5 35d1441e1be7ffa60d4077bd08255651 mod_auth_external-2.2.7-r1.ebuild 1814 -RMD160 c84d078fe3b89e1c6862960f1dc026c3c2e57668 mod_auth_external-2.2.7-r1.ebuild 1814 -SHA256 5f992367d6bd1ed1374496543c76f952952a70fd8d7cace75bb229c6116ea815 mod_auth_external-2.2.7-r1.ebuild 1814 -EBUILD mod_auth_external-2.2.9.ebuild 678 RMD160 befc50efc505298b1c7f75d15797e5a6501eef18 SHA1 bad0cf6e410a4d1c001023e4dcbe2a651898323a SHA256 486a198bf48f2fc250d315eba85ba42b40ffe1adfa1337ded2d448f780bcfba9 -MD5 4ce7eeaa97a09e5f9cf5d008d7ab997b mod_auth_external-2.2.9.ebuild 678 -RMD160 befc50efc505298b1c7f75d15797e5a6501eef18 mod_auth_external-2.2.9.ebuild 678 -SHA256 486a198bf48f2fc250d315eba85ba42b40ffe1adfa1337ded2d448f780bcfba9 mod_auth_external-2.2.9.ebuild 678 -MISC ChangeLog 2768 RMD160 f4e82abe15db3f9c0a17258e08dcf6a16fa28444 SHA1 9de610b2b8ce4e9fd8071299f162db5ba4ef177a SHA256 258986bc39685e92b0629aebc2e04c7c5409f3f7f51bb6c413e30144dfd4c2dd -MD5 d68b827eb8acdd5c18798d8c7580f9a4 ChangeLog 2768 -RMD160 f4e82abe15db3f9c0a17258e08dcf6a16fa28444 ChangeLog 2768 -SHA256 258986bc39685e92b0629aebc2e04c7c5409f3f7f51bb6c413e30144dfd4c2dd ChangeLog 2768 +EBUILD mod_auth_external-2.1.19.ebuild 650 RMD160 a6d090046a8f9f7aa3331312471c3d622ca16e48 SHA1 f02faf1554c5bc383510d258868788142e330219 SHA256 20a9b7de2cbd0e81b17113a1087242fb3c8f4fec27ea84ca885492703139852f +MD5 7a8401f736832c5276429d3c910da005 mod_auth_external-2.1.19.ebuild 650 +RMD160 a6d090046a8f9f7aa3331312471c3d622ca16e48 mod_auth_external-2.1.19.ebuild 650 +SHA256 20a9b7de2cbd0e81b17113a1087242fb3c8f4fec27ea84ca885492703139852f mod_auth_external-2.1.19.ebuild 650 +EBUILD mod_auth_external-2.2.11.ebuild 673 RMD160 258fd67b6a4306956d33e200adc4555151aa2073 SHA1 e60f14cce5b75abfe231ea61610717347d03702d SHA256 f5ba37015934f70d7b435220db4f41e66c9373ae5e1c8535636d3a975e62a0eb +MD5 66e2d471e1b9947d9885785b473e62c6 mod_auth_external-2.2.11.ebuild 673 +RMD160 258fd67b6a4306956d33e200adc4555151aa2073 mod_auth_external-2.2.11.ebuild 673 +SHA256 f5ba37015934f70d7b435220db4f41e66c9373ae5e1c8535636d3a975e62a0eb mod_auth_external-2.2.11.ebuild 673 +EBUILD mod_auth_external-2.2.9.ebuild 670 RMD160 241cac8a9bf2f0b5741893b3cfa0c134112feb1c SHA1 f4c319ff23cfe6bc7d56d96d7d49014cc9df2a4d SHA256 7216aef2a64518b3a7c29c066cf11455f7355f24a7d44aa3278357422e48a5e2 +MD5 6be60befd100e16e20fa732cce94e938 mod_auth_external-2.2.9.ebuild 670 +RMD160 241cac8a9bf2f0b5741893b3cfa0c134112feb1c mod_auth_external-2.2.9.ebuild 670 +SHA256 7216aef2a64518b3a7c29c066cf11455f7355f24a7d44aa3278357422e48a5e2 mod_auth_external-2.2.9.ebuild 670 +MISC ChangeLog 3114 RMD160 2e674234e82ee8c02b41e3437b8f4c7f7fde18e5 SHA1 c8ddb0bf34aa62bf07a4692e0205b8c28f0c72a2 SHA256 4a34bd07a7316637034abdf9fdfce6ef56ed1e43b651638fa26d6d809fae716f +MD5 8e8314149be8cea63bebef5ace4ab846 ChangeLog 3114 +RMD160 2e674234e82ee8c02b41e3437b8f4c7f7fde18e5 ChangeLog 3114 +SHA256 4a34bd07a7316637034abdf9fdfce6ef56ed1e43b651638fa26d6d809fae716f ChangeLog 3114 MISC metadata.xml 226 RMD160 d11ce73e47adf4b3d91309ec6489fded2f4d4e0e SHA1 fe9f7ce6f2281683065abb3255c8b731665c82ac SHA256 376a327f91f69eb96f0c1b05cc1481dd7017a0570f631a03b1f6d14d58215ca8 MD5 7272d8b6d09e3e301b6a08aa9c912eb0 metadata.xml 226 RMD160 d11ce73e47adf4b3d91309ec6489fded2f4d4e0e metadata.xml 226 @@ -48,9 +31,6 @@ SHA256 4d315e3314900c1008f076c7d07c86db4b21e71360d4083b48d1c0bb68033bb4 files/di MD5 426bfa0512da1c409944427563760337 files/digest-mod_auth_external-2.2.11 271 RMD160 48bfc3d94c68152eb11b54867955ee9300f430ac files/digest-mod_auth_external-2.2.11 271 SHA256 3a7457f050fae1073a499b3697e491616f8c51e79c7d1b619a7963a6d22d4a3c files/digest-mod_auth_external-2.2.11 271 -MD5 0682340a42fcdf3d43f063ef6174bdcc files/digest-mod_auth_external-2.2.7-r1 74 -RMD160 582bd56e3f80409e7ba6865e79ee573cab517e87 files/digest-mod_auth_external-2.2.7-r1 74 -SHA256 23fd358f179e58be703e46afd9bba775556206a0faa3c7b6d7fe6f8809fd7259 files/digest-mod_auth_external-2.2.7-r1 74 MD5 18d52bf9e86cc0181a3bbb3ebea919dd files/digest-mod_auth_external-2.2.9 268 RMD160 cc87dfb976d58c2faf86c0151e0ff9e0ddd31568 files/digest-mod_auth_external-2.2.9 268 SHA256 e1e18a16dddfbc6ecfdc9c91b8be6db57b37b213a4244cf98dadab6e3324d4a3 files/digest-mod_auth_external-2.2.9 268 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 deleted file mode 100644 index 98b743a45b94..000000000000 --- a/net-www/mod_auth_external/files/2.2.7-r1/10_mod_auth_external.conf +++ /dev/null @@ -1,45 +0,0 @@ - - - LoadModule external_auth_module modules/mod_auth_external.so - - - - - -# provided by net-www/pwauth -# AddExternalAuth pwauth /etc/apache2/modules/pwauth -# SetExternalAuthMethod pwauth pipe - -# For external group check (provided by net-www/pwauth) -# 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 ... -# -# Alternately, you can put a 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 - - 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 deleted file mode 100644 index 7d5505412c5f..000000000000 --- a/net-www/mod_auth_external/files/digest-mod_auth_external-2.2.7-r1 +++ /dev/null @@ -1 +0,0 @@ -MD5 ddd6cd5cc772f1952d83f2b8e5d91243 mod_auth_external-2.2.7.tar.gz 64220 diff --git a/net-www/mod_auth_external/files/mod_auth_external-2.2.7-gentoo.diff b/net-www/mod_auth_external/files/mod_auth_external-2.2.7-gentoo.diff deleted file mode 100644 index a221ae6cad42..000000000000 --- a/net-www/mod_auth_external/files/mod_auth_external-2.2.7-gentoo.diff +++ /dev/null @@ -1,121 +0,0 @@ -diff -urN mod_auth_external-2.2.7.orig/mod_auth_external.c mod_auth_external-2.2.7/mod_auth_external.c ---- mod_auth_external-2.2.7.orig/mod_auth_external.c 2004-04-22 15:23:27.000000000 +0000 -+++ mod_auth_external-2.2.7/mod_auth_external.c 2004-04-23 08:19:22.231779096 +0000 -@@ -582,6 +582,14 @@ - } - - -+static int extauth_init_handler(apr_pool_t *p, apr_pool_t *plog, apr_pool_t *ptemp, -+ server_rec *s) -+{ -+ ap_add_version_component(p, "auth_external/2.2.1"); -+ return OK; -+} -+ -+ - /* - * Authenticate a user - */ -@@ -810,6 +818,7 @@ - - static void register_hooks(apr_pool_t *p) - { -+ ap_hook_post_config(extauth_init_handler, NULL, NULL, APR_HOOK_MIDDLE); - ap_hook_check_user_id(extauth_basic_user, NULL, NULL, APR_HOOK_MIDDLE); - ap_hook_auth_checker(extauth_check_auth, NULL, NULL, APR_HOOK_MIDDLE); - } -diff -urN mod_auth_external-2.2.7.orig/pwauth/config.h mod_auth_external-2.2.7/pwauth/config.h ---- mod_auth_external-2.2.7.orig/pwauth/config.h 2004-04-22 15:23:27.000000000 +0000 -+++ mod_auth_external-2.2.7/pwauth/config.h 2004-04-23 08:20:55.938533504 +0000 -@@ -92,11 +92,11 @@ - - /* #define SHADOW_NONE /**/ - /* #define SHADOW_BSD /**/ --#define SHADOW_SUN /**/ -+/* #define SHADOW_SUN /**/ - /* #define SHADOW_JFH /**/ - /* #define SHADOW_MDW /**/ - /* #define SHADOW_AIX /**/ --/* #define PAM /**/ -+#define PAM /**/ - /* #define PAM_SOLARIS_26 /**/ - - -@@ -130,7 +130,7 @@ - * via the web. If you have the lastlog.h header file, define HAVE_LASTLOG_H. - */ - --#define UNIX_LASTLOG /**/ -+/*#define UNIX_LASTLOG /**/ - #define HAVE_LASTLOG_H /**/ - - /* SERVER_UIDS is a list of the uid numbers of the accounts that may run -@@ -145,7 +145,7 @@ - * last). - */ - --#define SERVER_UIDS 99 /* user "nobody" */ -+/*#define SERVER_UIDS 48 /* user "apache" */ - - - /* If MIN_UNIX_UID is defined to an integer, logins with uid numbers less than -@@ -156,7 +156,7 @@ - * given value will be accepted). - */ - --#define MIN_UNIX_UID 500 /**/ -+/*#define MIN_UNIX_UID 500 /**/ - - - /* If IGNORE_CASE is defined, the login given is checked in two different -@@ -184,7 +184,7 @@ - * SLEEP_LOCK. SLEEP_TIME defaults to 2 seconds if not defined. - */ - --#define SLEEP_LOCK "/var/run/pwauth.lock" -+/*#define SLEEP_LOCK "/var/run/pwauth.lock" - - - /* If ENV_METHOD is defined, pwauth expects mod_auth_external to be configured -diff -urN mod_auth_external-2.2.7.orig/pwauth/pwauth.c mod_auth_external-2.2.7/pwauth/pwauth.c ---- mod_auth_external-2.2.7.orig/pwauth/pwauth.c 2004-04-22 15:23:27.000000000 +0000 -+++ mod_auth_external-2.2.7/pwauth/pwauth.c 2004-04-23 08:19:22.232778944 +0000 -@@ -653,8 +653,10 @@ - #endif - } - -+#ifdef SERVER_UIDS - /* Array of uid numbers that may run this program */ - int server_uids[]= {SERVER_UIDS, 0}; -+#endif - - main(int argc, char **argv) - { -@@ -664,7 +666,10 @@ - char login[BFSZ+1], passwd[BFSZ+1]; - char *c, *strchr(); - #endif --int uid,i; -+#ifdef SERVER_UIDS -+int uid; -+#endif -+int i; - int passwd_ok; - struct rlimit rlim; - -@@ -672,6 +677,7 @@ - rlim.rlim_cur = rlim.rlim_max = 0; - (void)setrlimit(RLIMIT_CORE, &rlim); - -+#ifdef SERVER_UIDS - /* Check that we were invoked by one of the listed uids or by root */ - uid= getuid(); - for (i= 0; server_uids[i] != 0 && server_uids[i] != uid; i++) -@@ -679,6 +685,7 @@ - if (uid != server_uids[i]) - exit(2); - -+#endif - /* Get the arguments (login and password) */ - #ifdef ENV_METHOD - if ((login= getenv("USER")) == NULL || diff --git a/net-www/mod_auth_external/files/pwauth.pam b/net-www/mod_auth_external/files/pwauth.pam deleted file mode 100644 index a0539df577f3..000000000000 --- a/net-www/mod_auth_external/files/pwauth.pam +++ /dev/null @@ -1,6 +0,0 @@ -#%PAM-1.0 -auth required /lib/security/pam_stack.so service=system-auth -auth required /lib/security/pam_nologin.so -account required /lib/security/pam_stack.so service=system-auth -password required /lib/security/pam_stack.so service=system-auth -session required /lib/security/pam_stack.so service=system-auth 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 deleted file mode 100644 index b32e0cabec09..000000000000 --- a/net-www/mod_auth_external/mod_auth_external-2.2.7-r1.ebuild +++ /dev/null @@ -1,62 +0,0 @@ -# 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 -}