[mod_gnutls/f16] Update to 0.5.10

[jkastner]

commit e2bcf0481aecbe3027d8f5763a32789e48bd17b6
Author: Jiri Kastner <jkastner at redhat.com>
Date:   Fri Nov 11 13:43:49 2011 +0100

    Update to 0.5.10

 .gitignore                             |    1 +
 mod_gnutls.spec                        |   32 ++++++++++++++++++++++++--------
 mod_gnutls_apr_memcache_m4_dirty.patch |   31 +++++++++++++++++++++++++++++++
 sources                                |    2 +-
 4 files changed, 57 insertions(+), 9 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index d693b30..01acbe0 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
 mod_gnutls-0.5.5.tar.bz2
+/mod_gnutls-0.5.10.tar.bz2
diff --git a/mod_gnutls.spec b/mod_gnutls.spec
index b945619..7a8c962 100644
--- a/mod_gnutls.spec
+++ b/mod_gnutls.spec
@@ -1,15 +1,16 @@
 Name:      mod_gnutls
-Version:   0.5.5
-Release:   6%{?dist}
+Version:   0.5.10
+Release:   1%{?dist}
 Summary:   GnuTLS module for the Apache HTTP server
 Group:     System Environment/Daemons
 License:   ASL 2.0
-URL:       http://www.outoforder.cc/projects/apache/mod_gnutls
-Source0:   http://www.outoforder.cc/downloads/mod_gnutls/%{name}-%{version}.tar.bz2
+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
 BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
-BuildRequires: gnutls-devel httpd-devel
-Requires:  httpd
+BuildRequires: gnutls-devel, gnutls-utils, httpd-devel, apr-util-devel >= 1.3, libtool, autoconf, automake
+Requires:  httpd, apr-util >= 1.3, gnutls-utils
 
 %description
 mod_gnutls uses the GnuTLS library to provide SSL 3.0, TLS 1.0 and TLS 1.1
@@ -32,9 +33,17 @@ Features
 
 %prep
 %setup -q
+%patch0 -p1
 cp %{SOURCE1} .
 
 %build
+rm -f configure
+export APR_MEMCACHE_LIBS="`apu-1-config --link-ld`"
+export APR_MEMCACHE_CFLAGS="`apu-1-config --includes`"
+autoreconf -f -i
+
+rm -rf autom4te.cache
+
 %configure --disable-srp
 %{__make} %{?_smp_mflags}
 
@@ -45,19 +54,26 @@ cp %{SOURCE1} .
 rm -rf %{buildroot}
 %{__install} -m 755 -D src/.libs/libmod_gnutls.so %{buildroot}%{_libdir}/httpd/modules/mod_gnutls.so
 %{__install} -m 644 -D %{SOURCE1} %{buildroot}%{_sysconfdir}/httpd/conf.d/mod_gnutls.conf
-%{__install} -d -m 0700 %{buildroot}%{_localstatedir}/cache/mod_gnutls
 
 %clean
 rm -rf %{buildroot}
 
+%pre
+rm -fr %{_localstatedir}/cache/mod_gnutls
+
 %files
 %defattr(-,root,root,-)
 %doc README NEWS NOTICE LICENSE README.ENV
 %{_libdir}/httpd/modules/*.so
 %config(noreplace) %{_sysconfdir}/httpd/conf.d/mod_gnutls.conf
-%{_localstatedir}/cache/mod_gnutls
 
 %changelog
+* Wed Oct 27 2011 Jiri Kastner <jkastner at redhat.com> - 0.5.10-1
+- apr_memcache.m4 modified for correct cheking of apr_memcache in apr-util
+- removed /var/cache/mod_gnutls from 'files' and 'install' stanzas
+- added 'pre' stanza for removal of old cache
+- update to 0.5.10
+
 * Tue Feb 08 2011 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.5.5-6
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
 
diff --git a/mod_gnutls_apr_memcache_m4_dirty.patch b/mod_gnutls_apr_memcache_m4_dirty.patch
new file mode 100644
index 0000000..028ebe1
--- /dev/null
+++ b/mod_gnutls_apr_memcache_m4_dirty.patch
@@ -0,0 +1,31 @@
+--- mod_gnutls-0.5.10/m4/apr_memcache.m4	2011-07-08 23:29:46.000000000 +0200
++++ mod_gnutls-0.5.10/m4/apr_memcache.m4.new	2011-09-15 20:04:00.117806214 +0200
+@@ -40,21 +40,20 @@
+ if test -n "$apr_memcache_includes"; then
+     apr_memcache_includedir=$apr_memcache_includes
+ elif test -n "$apr_memcache_prefix"; then
+-    apr_memcache_includedir=$apr_memcache_prefix/include/apr_memcache-0
++    apr_memcache_includedir=$apr_memcache_prefix/include/aprutil-1
+ else
+-    apr_memcache_includedir=$includedir/apr_memcache-0
++    apr_memcache_includedir=$includedir/aprutil-1
+ fi
++
+ CFLAGS="-I$apr_memcache_includedir $CFLAGS"
+ 
++
+ AC_CHECK_LIB(
+-    apr_memcache,
++    aprutil-1,
+     apr_memcache_create,
+     [
+-	APR_MEMCACHE_LIBS="-lapr_memcache"
+-	if test -n "$apr_memcache_libdir"; then
+-	    APR_MEMCACHE_LIBS="-R$apr_memcache_libdir -L$apr_memcache_libdir $APR_MEMCACHE_LIBS"
+-	fi
+-	APR_MEMCACHE_CFLAGS="-I$apr_memcache_includedir"
++    APR_MEMCACHE_LIBS="`apu-1-config --link-ld`"
++    APR_MEMCACHE_CFLAGS="`apu-1-config --includes`"
+     ]
+ )
+ CFLAGS=$save_CFLAGS
diff --git a/sources b/sources
index 0597d16..68c686a 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-53aef6d0c295fc2b7d5d2ee4576e6884  mod_gnutls-0.5.5.tar.bz2
+53fd571080b16333d3a4550b8477bf3c  mod_gnutls-0.5.10.tar.bz2