[mod_gnutls] Update to 0.5.10-6

[jkastner]

commit f583eb4ae4768756d2a21e5f1c332d96bf99da65
Author: Jiri Kastner <jkastner at redhat.com>
Date:   Fri Mar 30 12:09:29 2012 +0200

    Update to 0.5.10-6

 mod_gnutls-0.5.10-httpd24.patch |   18 ++++++++++++++++++
 mod_gnutls.spec                 |    9 +++++++--
 2 files changed, 25 insertions(+), 2 deletions(-)
---
diff --git a/mod_gnutls-0.5.10-httpd24.patch b/mod_gnutls-0.5.10-httpd24.patch
new file mode 100644
index 0000000..bc529ef
--- /dev/null
+++ b/mod_gnutls-0.5.10-httpd24.patch
@@ -0,0 +1,18 @@
+
+Fix for httpd 2.4.
+
+--- mod_gnutls-0.5.10/src/gnutls_hooks.c.httpd24
++++ mod_gnutls-0.5.10/src/gnutls_hooks.c
+@@ -750,7 +750,12 @@ int mgs_hook_pre_connection(conn_rec * c
+ 		return DECLINED;
+ 	}
+ 
++#if AP_MODULE_MAGIC_AT_LEAST(20111130, 0)
++        /* ### this is a bizarre test -- jorton */
++	if (c->client_addr->hostname || strcmp(c->client_ip,c->local_ip) == 0) {
++#else
+ 	if (c->remote_addr->hostname || apr_strnatcmp(c->remote_ip,c->local_ip) == 0) {
++#endif
+         /* Connection initiated by Apache (mod_proxy) => ignore */
+                 return OK;
+         }
diff --git a/mod_gnutls.spec b/mod_gnutls.spec
index e2204e5..4924f86 100644
--- a/mod_gnutls.spec
+++ b/mod_gnutls.spec
@@ -1,7 +1,7 @@
 %{!?_httpd_mmn: %{expand: %%global _httpd_mmn %%(cat %{_includedir}/httpd/.mmn || echo missing-httpd-devel)}}
 Name:      mod_gnutls
 Version:   0.5.10
-Release:   5%{?dist}
+Release:   6%{?dist}
 Summary:   GnuTLS module for the Apache HTTP server
 Group:     System Environment/Daemons
 License:   ASL 2.0
@@ -9,6 +9,7 @@ URL:       http://modgnutls.sourceforge.net/
 Source0:   http://modgnutls.sourceforge.net/downloads/%{name}-%{version}.tar.bz2
 Source1:   mod_gnutls.conf
 Patch0:    mod_gnutls_apr_memcache_m4_dirty.patch
+Patch1:    mod_gnutls-0.5.10-httpd24.patch
 BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
 BuildRequires: gnutls-devel, gnutls-utils, httpd-devel, apr-util-devel >= 1.3, libtool, autoconf, automake
 Requires:  apr-util >= 1.3, gnutls-utils, httpd-mmn = %{_httpd_mmn}
@@ -35,6 +36,7 @@ Features
 %prep
 %setup -q
 %patch0 -p1
+%patch1 -p1 -b .httpd24
 cp %{SOURCE1} .
 
 %build
@@ -45,7 +47,7 @@ autoreconf -f -i
 
 rm -rf autom4te.cache
 
-%configure --disable-srp
+%configure --disable-srp %{?_httpd_apxs:--with-apxs=%{_httpd_apxs}}
 %{__make} %{?_smp_mflags}
 
 %check
@@ -69,6 +71,9 @@ rm -fr %{_localstatedir}/cache/mod_gnutls
 %config(noreplace) %{_sysconfdir}/httpd/conf.d/mod_gnutls.conf
 
 %changelog
+* Thu Mar 29 2012 Joe Orton <jorton at redhat.com> - 0.5.10-6
+- fix build w/httpd 2.4
+
 * Tue Mar 27 2012 Jiri Kastner <jkastner at redhat.com> - 0.5.10-5
 - httpd 2.4 rebuild