From: Luca Longinotti Date: Mon, 15 Jan 2007 20:17:17 +0000 (+0000) Subject: Cleanup. X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=6390f586fb15a1a15bb35bbfd3f5546eb629c49c;p=gentoo.git Cleanup. Package-Manager: portage-2.1.2_rc4-r8 --- diff --git a/net-www/mod_auth_kerb/Manifest b/net-www/mod_auth_kerb/Manifest index a4ac7c8fa1b1..ccd86c34fd6c 100644 --- a/net-www/mod_auth_kerb/Manifest +++ b/net-www/mod_auth_kerb/Manifest @@ -1,80 +1,20 @@ ------BEGIN PGP SIGNED MESSAGE----- -Hash: SHA1 - AUX 11_mod_auth_kerb.conf 360 RMD160 927b4d9efe81bbe6af2584d542b747d15891703a SHA1 1e0ed18e598ecc5ee920c20f7e5dee90bd231130 SHA256 e4da65c33b031724778df016c21eab6dd6a191eb63bebdbd4c49c50411466be9 MD5 20c0b6288def0974624689c3d1cc3a68 files/11_mod_auth_kerb.conf 360 RMD160 927b4d9efe81bbe6af2584d542b747d15891703a files/11_mod_auth_kerb.conf 360 SHA256 e4da65c33b031724778df016c21eab6dd6a191eb63bebdbd4c49c50411466be9 files/11_mod_auth_kerb.conf 360 -AUX mod_auth_kerb-5.0-CVE-2006-5989.patch 559 RMD160 86d4d70c3b9b5b1d0765d930b50f3e79e9260bed SHA1 82ff751a15ce586bcdf111aec7bc6520be1c0428 SHA256 0a2ec61ab9c0724f74408a3f3a255e22264dfbe394fcf6170b3eba744e209f56 -MD5 170086289392ee5e12b223374f9a25ae files/mod_auth_kerb-5.0-CVE-2006-5989.patch 559 -RMD160 86d4d70c3b9b5b1d0765d930b50f3e79e9260bed files/mod_auth_kerb-5.0-CVE-2006-5989.patch 559 -SHA256 0a2ec61ab9c0724f74408a3f3a255e22264dfbe394fcf6170b3eba744e209f56 files/mod_auth_kerb-5.0-CVE-2006-5989.patch 559 -AUX mod_auth_kerb-5.0-axps1.patch 1221 RMD160 d78138c76731b5c171223a9afe642810ae53c881 SHA1 41716821ca51ca05ba36382a24dcb7b1b79e62ac SHA256 8099a65774b994694b96c2b4208f12a76afded08de751850821d24fa359eaa20 -MD5 6d880586081cd4476b03738ae19c69c8 files/mod_auth_kerb-5.0-axps1.patch 1221 -RMD160 d78138c76731b5c171223a9afe642810ae53c881 files/mod_auth_kerb-5.0-axps1.patch 1221 -SHA256 8099a65774b994694b96c2b4208f12a76afded08de751850821d24fa359eaa20 files/mod_auth_kerb-5.0-axps1.patch 1221 -AUX mod_auth_kerb-5.0-cache.patch 3983 RMD160 f786581b6a502594e69c08a3eecf356ac09c1f34 SHA1 924e20a93da1095e6eb103e4e7df1d5fd19f8c0a SHA256 a3b7ce4d0dd182248017440de984db996187cce7083347e32407348e320547a0 -MD5 183d5abb723d11c7b7c95c09fb95f3be files/mod_auth_kerb-5.0-cache.patch 3983 -RMD160 f786581b6a502594e69c08a3eecf356ac09c1f34 files/mod_auth_kerb-5.0-cache.patch 3983 -SHA256 a3b7ce4d0dd182248017440de984db996187cce7083347e32407348e320547a0 files/mod_auth_kerb-5.0-cache.patch 3983 -AUX mod_auth_kerb-5.0-exports.patch 534 RMD160 8ffaffa0258fda749abb3552c4bcbd2eca4ef47c SHA1 b23daa8c5bb7db639b10cbd512b7556567c73485 SHA256 19344bfb976e255f8e151384992611ec60b76680bd507246515cb112a08e3e16 -MD5 c06d57f8d72243191bec0bd7c1d3c9c7 files/mod_auth_kerb-5.0-exports.patch 534 -RMD160 8ffaffa0258fda749abb3552c4bcbd2eca4ef47c files/mod_auth_kerb-5.0-exports.patch 534 -SHA256 19344bfb976e255f8e151384992611ec60b76680bd507246515cb112a08e3e16 files/mod_auth_kerb-5.0-exports.patch 534 -AUX mod_auth_kerb-5.0-gcc4.patch 391 RMD160 08ec1ca63d949a13b6afb96a95886dde68cae63f SHA1 58e96133e4e6a9b12534ede89878b32fa44de815 SHA256 f60a7cc4234ab5fc732323487057f36e2483655db676172867df2b2d845d9186 -MD5 6c5267823db912830883a671ccf7a023 files/mod_auth_kerb-5.0-gcc4.patch 391 -RMD160 08ec1ca63d949a13b6afb96a95886dde68cae63f files/mod_auth_kerb-5.0-gcc4.patch 391 -SHA256 f60a7cc4234ab5fc732323487057f36e2483655db676172867df2b2d845d9186 files/mod_auth_kerb-5.0-gcc4.patch 391 -DIST mod_auth_kerb-5.0-rc6.tar.gz 68761 RMD160 a9a277c532e7f72b3a649346e88db7aea1889036 SHA1 b1700b4eca2d50691977849750f5e614c7caa80d SHA256 ae33ab3ae5b419819725091d154add1a1d1a5d6d97e31e9f327f71a0b6370d3e -DIST mod_auth_kerb-5.0rc7.tar.gz 72272 RMD160 f336f1c9c4b67a88fd162395ec1299f73c5e89c4 SHA1 5a3e699b86c0f08b09fe44aa2747bfd8a67f5b87 SHA256 8cd4cdcc635ad153c82041d2256b17566bc74618ee79336f432e74b1d5a0930a DIST mod_auth_kerb-5.3.tar.gz 73530 RMD160 c1ba0dc27470ad4b355d795ba51374726ce57f03 SHA1 934e8afbd4e13e208ee0f1cf9e7498d7b6f7acd5 SHA256 89cd779a94405521770cbcb169af5af61e7f2aad91c4f4b82efaae35df7595ec -EBUILD mod_auth_kerb-5.0_rc6-r1.ebuild 1365 RMD160 e9464917403a83d171246f9cff950ab58d5e2791 SHA1 8bae6e2f0966d5eba1059b57a91e965275a9a528 SHA256 2c8a83e7efd8d2718fd46ab2f6f6efefeeca9eaefa07410cc84ee9f72c074e7d -MD5 f851565829b5b924e303df975d256b86 mod_auth_kerb-5.0_rc6-r1.ebuild 1365 -RMD160 e9464917403a83d171246f9cff950ab58d5e2791 mod_auth_kerb-5.0_rc6-r1.ebuild 1365 -SHA256 2c8a83e7efd8d2718fd46ab2f6f6efefeeca9eaefa07410cc84ee9f72c074e7d mod_auth_kerb-5.0_rc6-r1.ebuild 1365 -EBUILD mod_auth_kerb-5.0_rc6.ebuild 994 RMD160 59884098014995847824de37c745f7b59396c5df SHA1 5411cdeec70c0ca17b953e6881cbde8e5897cc93 SHA256 a46dcfcf816a75f05e19d422a4df210935e5f2aa9fbf41ee51a1625dfee1eb29 -MD5 f27c51774dfa20631dfbc8ee83e76267 mod_auth_kerb-5.0_rc6.ebuild 994 -RMD160 59884098014995847824de37c745f7b59396c5df mod_auth_kerb-5.0_rc6.ebuild 994 -SHA256 a46dcfcf816a75f05e19d422a4df210935e5f2aa9fbf41ee51a1625dfee1eb29 mod_auth_kerb-5.0_rc6.ebuild 994 -EBUILD mod_auth_kerb-5.0_rc7-r1.ebuild 1200 RMD160 cc8b0443ff6e79e051c2257f6d8c7e72a98c3167 SHA1 55b8dc70ea6a6840c77924aec856b22f7c1bd130 SHA256 402b7a5aef7cf1cd42cff950c1f454ad9c8cde7cc84f58710ae41f58bde089b7 -MD5 906f36dbf633ad6bc0e3df55e33c4d7c mod_auth_kerb-5.0_rc7-r1.ebuild 1200 -RMD160 cc8b0443ff6e79e051c2257f6d8c7e72a98c3167 mod_auth_kerb-5.0_rc7-r1.ebuild 1200 -SHA256 402b7a5aef7cf1cd42cff950c1f454ad9c8cde7cc84f58710ae41f58bde089b7 mod_auth_kerb-5.0_rc7-r1.ebuild 1200 -EBUILD mod_auth_kerb-5.0_rc7.ebuild 994 RMD160 e3eac2c0d1c0a104572656e8a526fa8b0a94f64d SHA1 6cb92235ea481a3afc0ff3fa0de6b55bcced47d2 SHA256 e8941b81333972497934727dba7de00f49f391261713ed29a633a5cd31a6ffe1 -MD5 5a22278bd688624404ea66a059b8d0c9 mod_auth_kerb-5.0_rc7.ebuild 994 -RMD160 e3eac2c0d1c0a104572656e8a526fa8b0a94f64d mod_auth_kerb-5.0_rc7.ebuild 994 -SHA256 e8941b81333972497934727dba7de00f49f391261713ed29a633a5cd31a6ffe1 mod_auth_kerb-5.0_rc7.ebuild 994 -EBUILD mod_auth_kerb-5.3.ebuild 987 RMD160 ee76f996707f6bce700b97f798825b45684e1dff SHA1 03f72f458ce26ebe8158f36e0fd05d211fd92453 SHA256 6461388d5206fd8920e5a5a11704fe5f1bd8f1cf40f0de013e3eb0c15c9d0be6 -MD5 029efbb50509523ea35b30013729d367 mod_auth_kerb-5.3.ebuild 987 -RMD160 ee76f996707f6bce700b97f798825b45684e1dff mod_auth_kerb-5.3.ebuild 987 -SHA256 6461388d5206fd8920e5a5a11704fe5f1bd8f1cf40f0de013e3eb0c15c9d0be6 mod_auth_kerb-5.3.ebuild 987 -MISC ChangeLog 3622 RMD160 b46ffe7a739f33a4a2cf5c4fc7c6179fbc330632 SHA1 218a1871ccb7b1aabdb5f55d7773aecb9eb9cb90 SHA256 42b34e0ee6e1e9eb3ae3ad2cc1e16ee6adf3149c3ef2654808f1d906003fde81 -MD5 bd3d4d0def0461d27b00c17b11bf7a7b ChangeLog 3622 -RMD160 b46ffe7a739f33a4a2cf5c4fc7c6179fbc330632 ChangeLog 3622 -SHA256 42b34e0ee6e1e9eb3ae3ad2cc1e16ee6adf3149c3ef2654808f1d906003fde81 ChangeLog 3622 -MISC metadata.xml 231 RMD160 a4a252abe4fb2922d19ccc4952d0128c3ccefbce SHA1 66b21c56c3a98e5a4b489dc000ff1d5956ab63d0 SHA256 79cc89f7b494dc5097d6dc5fedeb567e0dbc13e2adfcbe3f80082ad4625b38b3 -MD5 94cc9443fa6aead0b11dda55a10e117e metadata.xml 231 -RMD160 a4a252abe4fb2922d19ccc4952d0128c3ccefbce metadata.xml 231 -SHA256 79cc89f7b494dc5097d6dc5fedeb567e0dbc13e2adfcbe3f80082ad4625b38b3 metadata.xml 231 -MD5 60f00513746bd78dbbc905dd2d53e152 files/digest-mod_auth_kerb-5.0_rc6 262 -RMD160 fa455b7e746ac6bf818fd367d02082f3dbc66309 files/digest-mod_auth_kerb-5.0_rc6 262 -SHA256 b6392e5b1608dfcfb0632eaec96f533227c874ea1116a3ef4ed930bbc2aad86a files/digest-mod_auth_kerb-5.0_rc6 262 -MD5 60f00513746bd78dbbc905dd2d53e152 files/digest-mod_auth_kerb-5.0_rc6-r1 262 -RMD160 fa455b7e746ac6bf818fd367d02082f3dbc66309 files/digest-mod_auth_kerb-5.0_rc6-r1 262 -SHA256 b6392e5b1608dfcfb0632eaec96f533227c874ea1116a3ef4ed930bbc2aad86a files/digest-mod_auth_kerb-5.0_rc6-r1 262 -MD5 fc55498aaa35d757cea367eba2c831be files/digest-mod_auth_kerb-5.0_rc7 259 -RMD160 0f4f3f0812f45c3e16393cb17873f7d9cbb38eb2 files/digest-mod_auth_kerb-5.0_rc7 259 -SHA256 cfeffa27bace1ffa987700b0c868278af65e71c6b8265639e4ada382eeadf0b9 files/digest-mod_auth_kerb-5.0_rc7 259 -MD5 fc55498aaa35d757cea367eba2c831be files/digest-mod_auth_kerb-5.0_rc7-r1 259 -RMD160 0f4f3f0812f45c3e16393cb17873f7d9cbb38eb2 files/digest-mod_auth_kerb-5.0_rc7-r1 259 -SHA256 cfeffa27bace1ffa987700b0c868278af65e71c6b8265639e4ada382eeadf0b9 files/digest-mod_auth_kerb-5.0_rc7-r1 259 +EBUILD mod_auth_kerb-5.3.ebuild 924 RMD160 d4d041bf2a06f3b4e50329366f50353a71d796d8 SHA1 12bc07ddd89ca265f202526d6cfe25ac44e2dcfe SHA256 4bded1c000306a51a39ee692e2ef64cc919568bed81c503022ae9aee1ac97d2b +MD5 009203a2683d04b48fb77ea0037ab9b9 mod_auth_kerb-5.3.ebuild 924 +RMD160 d4d041bf2a06f3b4e50329366f50353a71d796d8 mod_auth_kerb-5.3.ebuild 924 +SHA256 4bded1c000306a51a39ee692e2ef64cc919568bed81c503022ae9aee1ac97d2b mod_auth_kerb-5.3.ebuild 924 +MISC ChangeLog 4072 RMD160 daa9aaaf207ad66b7f8939f138e25aebfdb9b527 SHA1 cf4a71589d55615902b66b1fcd380b94aeb7dd26 SHA256 b86aacb4c57e172ede6f83d10976a30ec2885b10b6c8332a06ef2fd556a27ae5 +MD5 ab890122b0344506c29305e73175836c ChangeLog 4072 +RMD160 daa9aaaf207ad66b7f8939f138e25aebfdb9b527 ChangeLog 4072 +SHA256 b86aacb4c57e172ede6f83d10976a30ec2885b10b6c8332a06ef2fd556a27ae5 ChangeLog 4072 +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 5b0e8742c4eb761068186e43d74621ac files/digest-mod_auth_kerb-5.3 250 RMD160 cce8f5bf396131c0edd35c9427da5d0e5322933c files/digest-mod_auth_kerb-5.3 250 SHA256 7a09875fc28474a3531327dad26f07afc4ed8ad73b27b6600583c046d3a618bc files/digest-mod_auth_kerb-5.3 250 ------BEGIN PGP SIGNATURE----- -Version: GnuPG v2.0.1 (GNU/Linux) - -iD8DBQFFqx8eV3J2n04EauwRAp91AJ4sh0VCWoHx6slZkG6+gkF8rQ1xVQCggVh2 -XrXJba7sDeyP3NuWOp2O3Ls= -=QVGG ------END PGP SIGNATURE----- diff --git a/net-www/mod_auth_kerb/files/digest-mod_auth_kerb-5.0_rc6 b/net-www/mod_auth_kerb/files/digest-mod_auth_kerb-5.0_rc6 deleted file mode 100644 index f2c5c3caa645..000000000000 --- a/net-www/mod_auth_kerb/files/digest-mod_auth_kerb-5.0_rc6 +++ /dev/null @@ -1,3 +0,0 @@ -MD5 274edfb950af20ce6ef0ddcb7c20263a mod_auth_kerb-5.0-rc6.tar.gz 68761 -RMD160 a9a277c532e7f72b3a649346e88db7aea1889036 mod_auth_kerb-5.0-rc6.tar.gz 68761 -SHA256 ae33ab3ae5b419819725091d154add1a1d1a5d6d97e31e9f327f71a0b6370d3e mod_auth_kerb-5.0-rc6.tar.gz 68761 diff --git a/net-www/mod_auth_kerb/files/digest-mod_auth_kerb-5.0_rc6-r1 b/net-www/mod_auth_kerb/files/digest-mod_auth_kerb-5.0_rc6-r1 deleted file mode 100644 index f2c5c3caa645..000000000000 --- a/net-www/mod_auth_kerb/files/digest-mod_auth_kerb-5.0_rc6-r1 +++ /dev/null @@ -1,3 +0,0 @@ -MD5 274edfb950af20ce6ef0ddcb7c20263a mod_auth_kerb-5.0-rc6.tar.gz 68761 -RMD160 a9a277c532e7f72b3a649346e88db7aea1889036 mod_auth_kerb-5.0-rc6.tar.gz 68761 -SHA256 ae33ab3ae5b419819725091d154add1a1d1a5d6d97e31e9f327f71a0b6370d3e mod_auth_kerb-5.0-rc6.tar.gz 68761 diff --git a/net-www/mod_auth_kerb/files/digest-mod_auth_kerb-5.0_rc7 b/net-www/mod_auth_kerb/files/digest-mod_auth_kerb-5.0_rc7 deleted file mode 100644 index 6b594c76c730..000000000000 --- a/net-www/mod_auth_kerb/files/digest-mod_auth_kerb-5.0_rc7 +++ /dev/null @@ -1,3 +0,0 @@ -MD5 139b63c98333682e611515b225b5222d mod_auth_kerb-5.0rc7.tar.gz 72272 -RMD160 f336f1c9c4b67a88fd162395ec1299f73c5e89c4 mod_auth_kerb-5.0rc7.tar.gz 72272 -SHA256 8cd4cdcc635ad153c82041d2256b17566bc74618ee79336f432e74b1d5a0930a mod_auth_kerb-5.0rc7.tar.gz 72272 diff --git a/net-www/mod_auth_kerb/files/digest-mod_auth_kerb-5.0_rc7-r1 b/net-www/mod_auth_kerb/files/digest-mod_auth_kerb-5.0_rc7-r1 deleted file mode 100644 index 6b594c76c730..000000000000 --- a/net-www/mod_auth_kerb/files/digest-mod_auth_kerb-5.0_rc7-r1 +++ /dev/null @@ -1,3 +0,0 @@ -MD5 139b63c98333682e611515b225b5222d mod_auth_kerb-5.0rc7.tar.gz 72272 -RMD160 f336f1c9c4b67a88fd162395ec1299f73c5e89c4 mod_auth_kerb-5.0rc7.tar.gz 72272 -SHA256 8cd4cdcc635ad153c82041d2256b17566bc74618ee79336f432e74b1d5a0930a mod_auth_kerb-5.0rc7.tar.gz 72272 diff --git a/net-www/mod_auth_kerb/files/mod_auth_kerb-5.0-CVE-2006-5989.patch b/net-www/mod_auth_kerb/files/mod_auth_kerb-5.0-CVE-2006-5989.patch deleted file mode 100644 index db64f8831f23..000000000000 --- a/net-www/mod_auth_kerb/files/mod_auth_kerb-5.0-CVE-2006-5989.patch +++ /dev/null @@ -1,13 +0,0 @@ -Index: mod_auth_kerb-5.0-rc6/spnegokrb5/der_get.c -=================================================================== ---- mod_auth_kerb-5.0-rc6.orig/spnegokrb5/der_get.c -+++ mod_auth_kerb-5.0-rc6/spnegokrb5/der_get.c -@@ -151,7 +151,7 @@ der_get_oid (const unsigned char *p, siz - if (len < 1) - return ASN1_OVERRUN; - -- data->components = malloc(len * sizeof(*data->components)); -+ data->components = malloc((len + 1) * sizeof(*data->components)); - if (data->components == NULL && len != 0) - return ENOMEM; - data->components[0] = (*p) / 40; diff --git a/net-www/mod_auth_kerb/files/mod_auth_kerb-5.0-axps1.patch b/net-www/mod_auth_kerb/files/mod_auth_kerb-5.0-axps1.patch deleted file mode 100644 index 8b40aa7ddee1..000000000000 --- a/net-www/mod_auth_kerb/files/mod_auth_kerb-5.0-axps1.patch +++ /dev/null @@ -1,38 +0,0 @@ -Index: mod_auth_kerb-5.0-rc6/src/mod_auth_kerb.c -=================================================================== ---- mod_auth_kerb-5.0-rc6.orig/src/mod_auth_kerb.c -+++ mod_auth_kerb-5.0-rc6/src/mod_auth_kerb.c -@@ -56,7 +56,7 @@ - #include - - #ifdef STANDARD20_MODULE_STUFF --#include -+#include - #include - #include - #endif -@@ -105,6 +105,24 @@ module auth_kerb_module; - #define MK_TABLE_GET apr_table_get - #define MK_USER r->user - #define MK_AUTH_TYPE r->ap_auth_type -+ -+#if AP_MODULE_MAGIC_AT_LEAST(20051115, 0) -+/* APR 1.x compatibility */ -+#define ap_pstrdup apr_pstrdup -+#define ap_psprintf apr_psprintf -+#define ap_pcalloc apr_pcalloc -+#define ap_table_setn apr_table_setn -+#define ap_register_cleanup apr_pool_cleanup_register -+#define APR_XtOffsetOf APR_OFFSETOF -+#define ap_pstrcat apr_pstrcat -+#define ap_null_cleanup apr_pool_cleanup_null -+#define ap_base64decode apr_base64_decode -+#define ap_base64decode_len apr_base64_decode_len -+#define ap_base64encode apr_base64_encode -+#define ap_base64encode_len apr_base64_encode_len -+#define ap_table_add apr_table_add -+#endif -+ - #else - #define MK_POOL pool - #define MK_TABLE_GET ap_table_get diff --git a/net-www/mod_auth_kerb/files/mod_auth_kerb-5.0-cache.patch b/net-www/mod_auth_kerb/files/mod_auth_kerb-5.0-cache.patch deleted file mode 100644 index d3260c925bbf..000000000000 --- a/net-www/mod_auth_kerb/files/mod_auth_kerb-5.0-cache.patch +++ /dev/null @@ -1,128 +0,0 @@ -Index: mod_auth_kerb-5.0-rc6/src/mod_auth_kerb.c -=================================================================== ---- mod_auth_kerb-5.0-rc6.orig/src/mod_auth_kerb.c -+++ mod_auth_kerb-5.0-rc6/src/mod_auth_kerb.c -@@ -61,6 +61,8 @@ - #include - #endif - -+#include -+ - #ifdef KRB5 - #include - #ifdef HEIMDAL -@@ -137,7 +139,7 @@ set_kerb_auth_headers(request_rec *r, co - int use_krb4, int use_krb5pwd, char *negotiate_ret_value); - - static const char* --krb5_save_realms(cmd_parms *cmd, kerb_auth_config *sec, char *arg); -+krb5_save_realms(cmd_parms *cmd, void *config, const char *arg); - - #ifdef STANDARD20_MODULE_STUFF - #define command(name, func, var, type, usage) \ -@@ -247,8 +249,9 @@ static void *kerb_dir_create_config(MK_P - } - - static const char* --krb5_save_realms(cmd_parms *cmd, kerb_auth_config *sec, char *arg) -+krb5_save_realms(cmd_parms *cmd, void *config, const char *arg) - { -+ kerb_auth_config *sec = config; - sec->krb_auth_realms= ap_pstrdup(cmd->pool, arg); - return NULL; - } -@@ -1086,6 +1089,8 @@ cmp_gss_type(gss_buffer_t token, gss_OID - return memcmp(p, oid->elements, oid->length); - } - -+#define NAMEKEY "mod_auth_kerb:client_name" -+ - static int - authenticate_user_gss(request_rec *r, kerb_auth_config *conf, - const char *auth_line, char **negotiate_ret_value) -@@ -1224,7 +1229,16 @@ authenticate_user_gss(request_rec *r, ke - } - - MK_AUTH_TYPE = "Negotiate"; -- MK_USER = ap_pstrdup(r->pool, output_token.value); -+ MK_USER = ap_pstrdup(r->connection->pool, output_token.value); -+ -+#ifndef APXS1 -+ { -+ apr_status_t rv; -+ rv = apr_pool_userdata_set(r->user, NAMEKEY, NULL, r->connection->pool); -+ ap_log_rerror(APLOG_MARK, APLOG_DEBUG, rv, r, -+ "set cached name %s for connection", r->user); -+ } -+#endif - - if (conf->krb_save_credentials && delegated_cred != GSS_C_NO_CREDENTIAL) - store_gss_creds(r, conf, (char *)output_token.value, delegated_cred); -@@ -1256,17 +1270,6 @@ end: - } - #endif /* KRB5 */ - --static int --already_succeeded(request_rec *r) --{ -- if (ap_is_initial_req(r) || MK_AUTH_TYPE == NULL) -- return 0; -- if (strcmp(MK_AUTH_TYPE, "Negotiate") || -- (strcmp(MK_AUTH_TYPE, "Basic") && strchr(MK_USER, '@'))) -- return 1; -- return 0; --} -- - static void - set_kerb_auth_headers(request_rec *r, const kerb_auth_config *conf, - int use_krb4, int use_krb5pwd, char *negotiate_ret_value) -@@ -1313,7 +1316,6 @@ int kerb_authenticate_user(request_rec * - const char *type = NULL; - int use_krb5 = 0, use_krb4 = 0; - int ret; -- static int last_return = HTTP_UNAUTHORIZED; - char *negotiate_ret_value = NULL; - - /* get the type specified in .htaccess */ -@@ -1332,6 +1334,23 @@ int kerb_authenticate_user(request_rec * - else - return DECLINED; - -+#ifndef APXS1 -+ if (use_krb5 && conf->krb_method_gssapi) { -+ void *data = NULL; -+ const char *name; -+ -+ if (apr_pool_userdata_get(&data, NAMEKEY, r->connection->pool) == APR_SUCCESS -+ && data != NULL) { -+ name = data; -+ ap_log_rerror(APLOG_MARK, APLOG_DEBUG, 0, r, -+ "using cached name %s", name); -+ r->user = ap_pstrdup(r->pool, name); -+ r->ap_auth_type = "Negotiate"; -+ return OK; -+ } -+ } -+#endif -+ - /* get what the user sent us in the HTTP header */ - auth_line = MK_TABLE_GET(r->headers_in, (r->proxyreq == PROXYREQ_PROXY) - ? "Proxy-Authorization" -@@ -1354,9 +1373,6 @@ int kerb_authenticate_user(request_rec * - (strcasecmp(auth_type, "Basic") == 0)) - return DECLINED; - -- if (already_succeeded(r)) -- return last_return; -- - ret = HTTP_UNAUTHORIZED; - - #ifdef KRB5 -@@ -1380,7 +1396,6 @@ int kerb_authenticate_user(request_rec * - - /* XXX log_debug: if ret==OK, log(user XY authenticated) */ - -- last_return = ret; - return ret; - } - diff --git a/net-www/mod_auth_kerb/files/mod_auth_kerb-5.0-exports.patch b/net-www/mod_auth_kerb/files/mod_auth_kerb-5.0-exports.patch deleted file mode 100644 index 3df03c9e698a..000000000000 --- a/net-www/mod_auth_kerb/files/mod_auth_kerb-5.0-exports.patch +++ /dev/null @@ -1,13 +0,0 @@ -Index: mod_auth_kerb-5.0-rc6/Makefile.in -=================================================================== ---- mod_auth_kerb-5.0-rc6.orig/Makefile.in -+++ mod_auth_kerb-5.0-rc6/Makefile.in -@@ -7,7 +7,7 @@ LIB_resolv = @LIB_resolv@ - SPNEGO_SRCS = @SPNEGO_SRCS@ - - CPPFLAGS = -I. -Ispnegokrb5 $(KRB5_CPPFLAGS) $(KRB4_CPPFLAGS) $(DEFS) --LDFLAGS = $(KRB5_LDFLAGS) $(KRB4_LDFLAGS) $(LIB_resolv) -+LDFLAGS = $(KRB5_LDFLAGS) $(KRB4_LDFLAGS) $(LIB_resolv) -Wl,-export-symbols-regex -Wl,auth_kerb_module - CFLAGS = - - all: src/mod_auth_kerb.so diff --git a/net-www/mod_auth_kerb/files/mod_auth_kerb-5.0-gcc4.patch b/net-www/mod_auth_kerb/files/mod_auth_kerb-5.0-gcc4.patch deleted file mode 100644 index 8d563739e0a7..000000000000 --- a/net-www/mod_auth_kerb/files/mod_auth_kerb-5.0-gcc4.patch +++ /dev/null @@ -1,13 +0,0 @@ -Index: mod_auth_kerb-5.0-rc6/spnegokrb5/spnego_asn1.h -=================================================================== ---- mod_auth_kerb-5.0-rc6.orig/spnegokrb5/spnego_asn1.h -+++ mod_auth_kerb-5.0-rc6/spnegokrb5/spnego_asn1.h -@@ -7,6 +7,8 @@ - #include - #include - -+#include "parse_units.h" -+ - #ifndef __asn1_common_definitions__ - #define __asn1_common_definitions__ - diff --git a/net-www/mod_auth_kerb/mod_auth_kerb-5.0_rc6-r1.ebuild b/net-www/mod_auth_kerb/mod_auth_kerb-5.0_rc6-r1.ebuild deleted file mode 100644 index d9668fc51da0..000000000000 --- a/net-www/mod_auth_kerb/mod_auth_kerb-5.0_rc6-r1.ebuild +++ /dev/null @@ -1,58 +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_kerb/mod_auth_kerb-5.0_rc6-r1.ebuild,v 1.2 2007/01/10 21:59:54 phreak Exp $ - -MY_PV="${PV/_rc/-rc}" - -inherit eutils apache-module autotools - -WANT_AUTOMAKE="1.9" -WANT_AUTOCONF="2.6" - -DESCRIPTION="An Apache2 authentication DSO using Kerberos." -HOMEPAGE="http://modauthkerb.sourceforge.net/" -SRC_URI="mirror://sourceforge/modauthkerb/${PN}-${MY_PV}.tar.gz" - -LICENSE="as-is" -KEYWORDS="~x86" -IUSE="apache2" -SLOT="0" - -DEPEND="virtual/krb5" -RDEPEND="" - -APACHE1_MOD_CONF="11_${PN}" -APACHE1_MOD_DEFINE="AUTH_KERB" - -APACHE2_MOD_CONF="11_${PN}" -APACHE2_MOD_DEFINE="AUTH_KERB" - -DOCFILES="INSTALL README" - -need_apache - -S="${WORKDIR}/${PN}-${MY_PV}" - -src_unpack() { - unpack ${A} - cd "${S}" - - epatch "${FILESDIR}/${PN}-5.0-CVE-2006-5989.patch" - epatch "${FILESDIR}/${PN}-5.0-gcc4.patch" - if use apache2 ; then - epatch "${FILESDIR}/${PN}-5.0-axps1.patch" - epatch "${FILESDIR}/${PN}-5.0-cache.patch" - epatch "${FILESDIR}/${PN}-5.0-exports.patch" - fi - - eautoreconf -} - -src_compile() { - if use apache2 ; then - CFLAGS="" APXS="${APXS2}" econf --with-krb5=/usr --without-krb4 || die "econf failed" - else - CFLAGS="" APXS="${APXS}" econf --with-krb5=/usr --without-krb4 || die "econf failed" - fi - emake || die "make failed" -} diff --git a/net-www/mod_auth_kerb/mod_auth_kerb-5.0_rc6.ebuild b/net-www/mod_auth_kerb/mod_auth_kerb-5.0_rc6.ebuild deleted file mode 100644 index 9db436ea798f..000000000000 --- a/net-www/mod_auth_kerb/mod_auth_kerb-5.0_rc6.ebuild +++ /dev/null @@ -1,40 +0,0 @@ -# Copyright 1999-2006 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-www/mod_auth_kerb/mod_auth_kerb-5.0_rc6.ebuild,v 1.5 2006/06/05 19:24:00 chtekk Exp $ - -MY_PV="${PV/_rc/-rc}" - -inherit eutils apache-module - -DESCRIPTION="An Apache2 authentication DSO using Kerberos." -HOMEPAGE="http://modauthkerb.sourceforge.net/" -SRC_URI="mirror://sourceforge/modauthkerb/${PN}-${MY_PV}.tar.gz" - -LICENSE="as-is" -KEYWORDS="x86" -IUSE="apache2" -SLOT="0" - -DEPEND="virtual/krb5" -RDEPEND="" - -APACHE1_MOD_CONF="11_${PN}" -APACHE1_MOD_DEFINE="AUTH_KERB" - -APACHE2_MOD_CONF="11_${PN}" -APACHE2_MOD_DEFINE="AUTH_KERB" - -DOCFILES="INSTALL README" - -need_apache - -S="${WORKDIR}/${PN}-${MY_PV}" - -src_compile() { - if use apache2 ; then - CFLAGS="" APXS="${APXS2}" econf --with-krb5=/usr --without-krb4 || die "econf failed" - else - CFLAGS="" APXS="${APXS}" econf --with-krb5=/usr --without-krb4 || die "econf failed" - fi - emake || die "make failed" -} diff --git a/net-www/mod_auth_kerb/mod_auth_kerb-5.0_rc7-r1.ebuild b/net-www/mod_auth_kerb/mod_auth_kerb-5.0_rc7-r1.ebuild deleted file mode 100644 index 7ae3e3716fdf..000000000000 --- a/net-www/mod_auth_kerb/mod_auth_kerb-5.0_rc7-r1.ebuild +++ /dev/null @@ -1,53 +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_kerb/mod_auth_kerb-5.0_rc7-r1.ebuild,v 1.4 2007/01/14 17:44:34 phreak Exp $ - -MY_PV="${PV/_rc/rc}" - -inherit eutils apache-module autotools - -WANT_AUTOMAKE="1.9" -WANT_AUTOCONF="2.6" - -DESCRIPTION="An Apache2 authentication DSO using Kerberos." -HOMEPAGE="http://modauthkerb.sourceforge.net/" -SRC_URI="mirror://sourceforge/modauthkerb/${PN}-${MY_PV}.tar.gz" - -LICENSE="as-is" -KEYWORDS="~x86" -IUSE="apache2" -SLOT="0" - -DEPEND="virtual/krb5" -RDEPEND="" - -APACHE1_MOD_CONF="11_${PN}" -APACHE1_MOD_DEFINE="AUTH_KERB" - -APACHE2_MOD_CONF="11_${PN}" -APACHE2_MOD_DEFINE="AUTH_KERB" - -DOCFILES="INSTALL README" - -need_apache - -S="${WORKDIR}/${PN}-${MY_PV}" - -src_unpack() { - unpack ${A} - cd "${S}" - - epatch "${FILESDIR}/${PN}-5.0-CVE-2006-5989.patch" - epatch "${FILESDIR}/${PN}-5.0-gcc4.patch" - - eautoreconf -} - -src_compile() { - if use apache2 ; then - CFLAGS="" APXS="${APXS2}" econf --with-krb5=/usr --without-krb4 || die "econf failed" - else - CFLAGS="" APXS="${APXS}" econf --with-krb5=/usr --without-krb4 || die "econf failed" - fi - emake || die "make failed" -} diff --git a/net-www/mod_auth_kerb/mod_auth_kerb-5.0_rc7.ebuild b/net-www/mod_auth_kerb/mod_auth_kerb-5.0_rc7.ebuild deleted file mode 100644 index b552bcc12a13..000000000000 --- a/net-www/mod_auth_kerb/mod_auth_kerb-5.0_rc7.ebuild +++ /dev/null @@ -1,40 +0,0 @@ -# Copyright 1999-2006 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-www/mod_auth_kerb/mod_auth_kerb-5.0_rc7.ebuild,v 1.2 2006/06/05 19:24:00 chtekk Exp $ - -MY_PV="${PV/_rc/rc}" - -inherit eutils apache-module - -DESCRIPTION="An Apache2 authentication DSO using Kerberos." -HOMEPAGE="http://modauthkerb.sourceforge.net/" -SRC_URI="mirror://sourceforge/modauthkerb/${PN}-${MY_PV}.tar.gz" - -LICENSE="as-is" -KEYWORDS="~x86" -IUSE="apache2" -SLOT="0" - -DEPEND="virtual/krb5" -RDEPEND="" - -APACHE1_MOD_CONF="11_${PN}" -APACHE1_MOD_DEFINE="AUTH_KERB" - -APACHE2_MOD_CONF="11_${PN}" -APACHE2_MOD_DEFINE="AUTH_KERB" - -DOCFILES="INSTALL README" - -need_apache - -S="${WORKDIR}/${PN}-${MY_PV}" - -src_compile() { - if use apache2 ; then - CFLAGS="" APXS="${APXS2}" econf --with-krb5=/usr --without-krb4 || die "econf failed" - else - CFLAGS="" APXS="${APXS}" econf --with-krb5=/usr --without-krb4 || die "econf failed" - fi - emake || die "make failed" -}