Cleanup and fix #103889.

(Portage version: 2.1_rc4-r2)
 (Unsigned Manifest commit)

3 files changed, 20 insertions, 63 deletions

diff --git a/net-www/mod_auth_kerb/Manifest b/net-www/mod_auth_kerb/Manifest
index 98e599433a04..21a9b970918e 100644
--- a/net-www/mod_auth_kerb/Manifest
+++ b/net-www/mod_auth_kerb/Manifest
@@ -1,33 +1,25 @@
-AUX 11_mod_auth_kerb.conf 180 RMD160 57e08fb341a79457b30846723e57b363812682a8 SHA1 1ca6bd70da9eb49b8f55d8a5c768cd9e3ea0dca9 SHA256 bd8488de93178f3e6af11c6a2aff169ae463d38cef52908c9ecf3b9267220353
-MD5 c9bbfd002811a674505b3844837a63ee files/11_mod_auth_kerb.conf 180
-RMD160 57e08fb341a79457b30846723e57b363812682a8 files/11_mod_auth_kerb.conf 180
-SHA256 bd8488de93178f3e6af11c6a2aff169ae463d38cef52908c9ecf3b9267220353 files/11_mod_auth_kerb.conf 180
-AUX 4.11-r1/11_mod_auth_kerb.conf 362 RMD160 2a435853dff47dc92d44f1e29af856ed880f37ee SHA1 4e3954d7fa5866cb94bff20a63fccb0832f222f8 SHA256 b91623b079f36e597b3e92fa422c7fae2ce6daa5a7fc0b6b5a51938b9a9d5bc8
-MD5 0e8d91e6c3aa51e78b989b56d2b4028c files/4.11-r1/11_mod_auth_kerb.conf 362
-RMD160 2a435853dff47dc92d44f1e29af856ed880f37ee files/4.11-r1/11_mod_auth_kerb.conf 362
-SHA256 b91623b079f36e597b3e92fa422c7fae2ce6daa5a7fc0b6b5a51938b9a9d5bc8 files/4.11-r1/11_mod_auth_kerb.conf 362
-AUX mod_auth_kerb_register.patch 782 RMD160 4cb6711a3058f4eb9a9256b358e7c724623346b8 SHA1 7442b2bb7583728a1f537541f9c778f495e8ade9 SHA256 4120ed453d5bfe4cec6213eea7c9e928077bf871b687bf6c251bb9b9fef41f76
-MD5 05d525e36b7e86f564e3a15608eca8e4 files/mod_auth_kerb_register.patch 782
-RMD160 4cb6711a3058f4eb9a9256b358e7c724623346b8 files/mod_auth_kerb_register.patch 782
-SHA256 4120ed453d5bfe4cec6213eea7c9e928077bf871b687bf6c251bb9b9fef41f76 files/mod_auth_kerb_register.patch 782
+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
 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
-EBUILD mod_auth_kerb-5.0_rc6.ebuild 1017 RMD160 d14114b335311b11770c4136cd62b601a4f4ad25 SHA1 a60d1cc57dc8e03a5840f0a4ff679ed9e5c8135b SHA256 0f34bc7f2211fd9b52f5549e3f95f21731bf13844c9f167913a243df9b8362b8
-MD5 96940b3fffb8e5bfc2332225156e4f9f mod_auth_kerb-5.0_rc6.ebuild 1017
-RMD160 d14114b335311b11770c4136cd62b601a4f4ad25 mod_auth_kerb-5.0_rc6.ebuild 1017
-SHA256 0f34bc7f2211fd9b52f5549e3f95f21731bf13844c9f167913a243df9b8362b8 mod_auth_kerb-5.0_rc6.ebuild 1017
-EBUILD mod_auth_kerb-5.0_rc7.ebuild 1018 RMD160 bae3edb3e45cad51695d6e3f7f809bcc9c0d97d9 SHA1 bba0c7e21224ab6f4b0d49dfd095a18659a11f35 SHA256 1e345bf155b7fd99274d452dd9797faca362ef2fd59526b96cb746ecdb0b66f4
-MD5 ede0b3d8af8a9b150e3c1addc239c4fa mod_auth_kerb-5.0_rc7.ebuild 1018
-RMD160 bae3edb3e45cad51695d6e3f7f809bcc9c0d97d9 mod_auth_kerb-5.0_rc7.ebuild 1018
-SHA256 1e345bf155b7fd99274d452dd9797faca362ef2fd59526b96cb746ecdb0b66f4 mod_auth_kerb-5.0_rc7.ebuild 1018
-MISC ChangeLog 1770 RMD160 2c134afeced83bf844eb001b35e1140f13aedaeb SHA1 ca5712f89d7dad2b452afa445d1e32f535aef939 SHA256 2cabdd8108dded32704a55bf84e7bdb6a3737ce6d81e4a28b091dd044d5a96ff
-MD5 8adf479202336172d8681f10d0766c00 ChangeLog 1770
-RMD160 2c134afeced83bf844eb001b35e1140f13aedaeb ChangeLog 1770
-SHA256 2cabdd8108dded32704a55bf84e7bdb6a3737ce6d81e4a28b091dd044d5a96ff ChangeLog 1770
-MISC metadata.xml 226 RMD160 d11ce73e47adf4b3d91309ec6489fded2f4d4e0e SHA1 fe9f7ce6f2281683065abb3255c8b731665c82ac SHA256 376a327f91f69eb96f0c1b05cc1481dd7017a0570f631a03b1f6d14d58215ca8
-MD5 7272d8b6d09e3e301b6a08aa9c912eb0 metadata.xml 226
-RMD160 d11ce73e47adf4b3d91309ec6489fded2f4d4e0e metadata.xml 226
-SHA256 376a327f91f69eb96f0c1b05cc1481dd7017a0570f631a03b1f6d14d58215ca8 metadata.xml 226
+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.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
+MISC ChangeLog 2035 RMD160 8cd1c562c8796a6a58d0d15bee739b59fc42f9c6 SHA1 ba74c5ce4bea6f0981ffdc85fb5f778b3c2443cf SHA256 437f387478788f852c4f762fbf9ff07a6d6992f9131d9c7df1bf67fe7c700fe5
+MD5 e6369557f03de2864f52d1f3e6401eb7 ChangeLog 2035
+RMD160 8cd1c562c8796a6a58d0d15bee739b59fc42f9c6 ChangeLog 2035
+SHA256 437f387478788f852c4f762fbf9ff07a6d6992f9131d9c7df1bf67fe7c700fe5 ChangeLog 2035
+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
diff --git a/net-www/mod_auth_kerb/files/4.11-r1/11_mod_auth_kerb.conf b/net-www/mod_auth_kerb/files/4.11-r1/11_mod_auth_kerb.conf
deleted file mode 100644
index 2f7470ed50c7..000000000000
--- a/net-www/mod_auth_kerb/files/4.11-r1/11_mod_auth_kerb.conf
+++ /dev/null
@@ -1,14 +0,0 @@
-<IfDefine AUTH_KERB>
-    LoadModule auth_kerb_module    modules/mod_auth_kerb.so
-</IfDefine>
-
-<IfModule mod_auth_kerb.c>
-	<Directory /var/www/private>
-		AuthType Kerberos
-		AuthName "Kerberos Login"
-		# See the INSTALL file about howto create the keytab
-		Krb5Keytab  conf/apache.keytab
-		KrbAuthRealms EXAMPLE.COM
-		Require valid-user
-	</Directory>
-</IfModule>
diff --git a/net-www/mod_auth_kerb/files/mod_auth_kerb_register.patch b/net-www/mod_auth_kerb/files/mod_auth_kerb_register.patch
deleted file mode 100644
index c696324d8b4b..000000000000
--- a/net-www/mod_auth_kerb/files/mod_auth_kerb_register.patch
+++ /dev/null
@@ -1,21 +0,0 @@
---- src/modules/kerberos/mod_auth_kerb.c.orig	2002-09-05 08:21:45.000000000 -0400
-+++ src/modules/kerberos/mod_auth_kerb.c	2002-09-05 08:24:25.000000000 -0400
-@@ -1932,11 +1932,18 @@
-     return rec;
- }
- 
-+static int kerbauth_init_handler(apr_pool_t *p, apr_pool_t *plog, 
-+                                 apr_pool_t *ptemp, server_rec *s)
-+{
-+    ap_add_version_component(p, "auth_kerberos/4.11");
-+    return OK;
-+}
- 
- /* register the functions in the correct places */
- #ifdef APXS2
- static void register_hooks(apr_pool_t *p)
- {
-+        ap_hook_post_config(kerbauth_init_handler, NULL, NULL, APR_HOOK_MIDDLE);
- 	ap_hook_check_user_id(kerb_authenticate_user, NULL, NULL, APR_HOOK_MIDDLE);
- #ifdef HESIOD
- 	ap_hook_access_checker(check_user_access, NULL, NULL, APR_HOOK_MIDDLE);