Importing fixes for gcc4.

svn path=/; revision=181

7 files changed, 189 insertions, 22 deletions

diff --git a/bugfixes/net-www/mod_auth_kerb/Manifest b/bugfixes/net-www/mod_auth_kerb/Manifest
index 7364622..92661db 100644
--- a/bugfixes/net-www/mod_auth_kerb/Manifest
+++ b/bugfixes/net-www/mod_auth_kerb/Manifest
@@ -6,20 +6,28 @@ AUX mod_auth_kerb-5.0-CVE-2006-5989.patch 559 RMD160 86d4d70c3b9b5b1d0765d930b50
 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-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
-EBUILD mod_auth_kerb-5.0_rc6-r1.ebuild 1077 RMD160 8de4b0c8b5e3b11798587233117d88a94126ec19 SHA1 0e31504eab885f4b067d3f03e8cd34a7d0752b2c SHA256 15d5786ba3dd2b2c7fba044f1016977e4d4013ea7cb2f7eca32b03fc55f03d94
-MD5 141542c6870b85d34237df4ef864040e mod_auth_kerb-5.0_rc6-r1.ebuild 1077
-RMD160 8de4b0c8b5e3b11798587233117d88a94126ec19 mod_auth_kerb-5.0_rc6-r1.ebuild 1077
-SHA256 15d5786ba3dd2b2c7fba044f1016977e4d4013ea7cb2f7eca32b03fc55f03d94 mod_auth_kerb-5.0_rc6-r1.ebuild 1077
-EBUILD mod_auth_kerb-5.0_rc7-r1.ebuild 1077 RMD160 6d89162a270cd95efc69cb3344601aae43af9f72 SHA1 c3e7fc05e5916a8946d0fc0a9870ad1563a06656 SHA256 31584fae2c7b3574db948ee05a184a898fe90fd7a90a7d383767eebca80a37aa
-MD5 79b3645bcb9ecc706ec9c48fbdb43b0f mod_auth_kerb-5.0_rc7-r1.ebuild 1077
-RMD160 6d89162a270cd95efc69cb3344601aae43af9f72 mod_auth_kerb-5.0_rc7-r1.ebuild 1077
-SHA256 31584fae2c7b3574db948ee05a184a898fe90fd7a90a7d383767eebca80a37aa mod_auth_kerb-5.0_rc7-r1.ebuild 1077
-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
+EBUILD mod_auth_kerb-5.0_rc6-r1.ebuild 1268 RMD160 0a72afff8b078a20b436fb12ed9b9d885405c8a9 SHA1 849c7c76201208682cdcb3288fead20b0a2d3577 SHA256 88c77efd26612099ce932d2c0e745e96668a343caae67c66d3d244c394bce7f4
+MD5 a99e14e26b5ef32bd9d92c468044c3d5 mod_auth_kerb-5.0_rc6-r1.ebuild 1268
+RMD160 0a72afff8b078a20b436fb12ed9b9d885405c8a9 mod_auth_kerb-5.0_rc6-r1.ebuild 1268
+SHA256 88c77efd26612099ce932d2c0e745e96668a343caae67c66d3d244c394bce7f4 mod_auth_kerb-5.0_rc6-r1.ebuild 1268
+EBUILD mod_auth_kerb-5.0_rc7-r1.ebuild 1267 RMD160 c3501e31f3c581c1b14328db01e9c69b67678b3b SHA1 6fe6663485bd482c778f27f846e8ed68a44ea9be SHA256 7982e3f48487bf4998cb481d1eba610cd3cfff5a55981c2f77cd1659bb92fdbe
+MD5 c1efd481dfe7a989e5cddf3a923849f6 mod_auth_kerb-5.0_rc7-r1.ebuild 1267
+RMD160 c3501e31f3c581c1b14328db01e9c69b67678b3b mod_auth_kerb-5.0_rc7-r1.ebuild 1267
+SHA256 7982e3f48487bf4998cb481d1eba610cd3cfff5a55981c2f77cd1659bb92fdbe mod_auth_kerb-5.0_rc7-r1.ebuild 1267
 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
diff --git a/bugfixes/net-www/mod_auth_kerb/files/mod_auth_kerb-5.0-cache.patch b/bugfixes/net-www/mod_auth_kerb/files/mod_auth_kerb-5.0-cache.patch
new file mode 100644
index 0000000..d3260c9
--- /dev/null
+++ b/bugfixes/net-www/mod_auth_kerb/files/mod_auth_kerb-5.0-cache.patch
@@ -0,0 +1,128 @@
+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 <apr_base64.h>
+ #endif
+ 
++#include <unistd.h>
++
+ #ifdef KRB5
+ #include <krb5.h>
+ #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/bugfixes/net-www/mod_auth_kerb/files/mod_auth_kerb-5.0-exports.patch b/bugfixes/net-www/mod_auth_kerb/files/mod_auth_kerb-5.0-exports.patch
new file mode 100644
index 0000000..3df03c9
--- /dev/null
+++ b/bugfixes/net-www/mod_auth_kerb/files/mod_auth_kerb-5.0-exports.patch
@@ -0,0 +1,13 @@
+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/bugfixes/net-www/mod_auth_kerb/files/mod_auth_kerb-5.0-gcc4.patch b/bugfixes/net-www/mod_auth_kerb/files/mod_auth_kerb-5.0-gcc4.patch
new file mode 100644
index 0000000..8d56373
--- /dev/null
+++ b/bugfixes/net-www/mod_auth_kerb/files/mod_auth_kerb-5.0-gcc4.patch
@@ -0,0 +1,13 @@
+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 <stddef.h>
+ #include <time.h>
+ 
++#include "parse_units.h"
++
+ #ifndef __asn1_common_definitions__
+ #define __asn1_common_definitions__
+ 
diff --git a/bugfixes/net-www/mod_auth_kerb/metadata.xml b/bugfixes/net-www/mod_auth_kerb/metadata.xml
deleted file mode 100644
index 8f398d8..0000000
--- a/bugfixes/net-www/mod_auth_kerb/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<herd>apache</herd>
-	<maintainer>
-  		<email>apache-bugs@gentoo.org</email>
-	</maintainer>
-</pkgmetadata>
diff --git a/bugfixes/net-www/mod_auth_kerb/mod_auth_kerb-5.0_rc6-r1.ebuild b/bugfixes/net-www/mod_auth_kerb/mod_auth_kerb-5.0_rc6-r1.ebuild
index 594ef4c..43c9065 100644
--- a/bugfixes/net-www/mod_auth_kerb/mod_auth_kerb-5.0_rc6-r1.ebuild
+++ b/bugfixes/net-www/mod_auth_kerb/mod_auth_kerb-5.0_rc6-r1.ebuild
@@ -4,7 +4,10 @@
 
 MY_PV="${PV/_rc/-rc}"
 
-inherit eutils apache-module
+inherit eutils apache-module autotools
+
+WANT_AUTOMAKE="latest"
+WANT_AUTOCONF="latest"
 
 DESCRIPTION="An Apache2 authentication DSO using Kerberos."
 HOMEPAGE="http://modauthkerb.sourceforge.net/"
@@ -30,9 +33,13 @@ need_apache
 
 S="${WORKDIR}/${PN}-${MY_PV}"
 
+
 src_unpack() {
 	unpack ${A}
 	epatch "${FILESDIR}/${PN}-5.0-CVE-2006-5989.patch"
+	epatch "${FILESDIR}/${PN}-5.0-gcc4.patch"
+	epatch "${FILESDIR}/${PN}-5.0-exports.patch"
+	epatch "${FILESDIR}/${PN}-5.0-cache.patch"
 }
 
 src_compile() {
diff --git a/bugfixes/net-www/mod_auth_kerb/mod_auth_kerb-5.0_rc7-r1.ebuild b/bugfixes/net-www/mod_auth_kerb/mod_auth_kerb-5.0_rc7-r1.ebuild
index c550e1f..655024d 100644
--- a/bugfixes/net-www/mod_auth_kerb/mod_auth_kerb-5.0_rc7-r1.ebuild
+++ b/bugfixes/net-www/mod_auth_kerb/mod_auth_kerb-5.0_rc7-r1.ebuild
@@ -4,7 +4,10 @@
 
 MY_PV="${PV/_rc/rc}"
 
-inherit eutils apache-module
+inherit eutils apache-module autotools
+
+WANT_AUTOMAKE="latest"
+WANT_AUTOCONF="latest"
 
 DESCRIPTION="An Apache2 authentication DSO using Kerberos."
 HOMEPAGE="http://modauthkerb.sourceforge.net/"
@@ -33,6 +36,9 @@ S="${WORKDIR}/${PN}-${MY_PV}"
 src_unpack() {
 	unpack ${A}
 	epatch "${FILESDIR}/${PN}-5.0-CVE-2006-5989.patch"
+	epatch "${FILESDIR}/${PN}-5.0-gcc4.patch"
+	epatch "${FILESDIR}/${PN}-5.0-exports.patch"
+	epatch "${FILESDIR}/${PN}-5.0-cache.patch"
 }
 
 src_compile() {