diff --git a/.gitignore b/.gitignore index 28f1249..e86cc00 100644 --- a/.gitignore +++ b/.gitignore @@ -5,3 +5,4 @@ apr-util-1.3.9.tar.bz2 /x86_64 /.build*.log /apr-util-1.3.11.tar.bz2 +/apr-util-1.3.12.tar.bz2 diff --git a/apr-util-1.3.11-ldap_rebind_init.patch b/apr-util-1.3.11-ldap_rebind_init.patch deleted file mode 100644 index e192321..0000000 --- a/apr-util-1.3.11-ldap_rebind_init.patch +++ /dev/null @@ -1,13 +0,0 @@ ---- 1.3.x/ldap/apr_ldap_rebind.c 2011/05/10 21:34:23 1101656 -+++ 1.3.x/ldap/apr_ldap_rebind.c 2011/05/10 21:34:43 1101657 -@@ -82,7 +82,8 @@ - #endif - - /* run after apr_thread_mutex_create cleanup */ -- apr_pool_cleanup_register(pool, &apr_ldap_xref_lock, apr_ldap_pool_cleanup_set_null, NULL); -+ apr_pool_cleanup_register(pool, &apr_ldap_xref_lock, apr_ldap_pool_cleanup_set_null, -+ apr_pool_cleanup_null); - - #if APR_HAS_THREADS - if (apr_ldap_xref_lock == NULL) { - diff --git a/apr-util-1.3.11.tar.bz2.asc b/apr-util-1.3.11.tar.bz2.asc deleted file mode 100644 index f76ef96..0000000 --- a/apr-util-1.3.11.tar.bz2.asc +++ /dev/null @@ -1,17 +0,0 @@ ------BEGIN PGP SIGNATURE----- -Version: GnuPG v2.0.14 (GNU/Linux) - -iQIcBAABCgAGBQJNp4RQAAoJEOxYLrY5/wkseW8QAMHqTsc2msvW/b3Ps1zN94Hx -/abBtDHrWSuInK88FDh9eyVVXY+c32QvOuWL4Rv318/6XtNd2zvVAOHjX6nekLN7 -8AKGhmRv0pm8rdWYMCIgAKb6dOYMsw7WZ9OVU7RVcDbS7/Jzfh/5vm+2L0FPK4zK -vNn0SM34p7S3kQgINiSUTZlFj2VDBdwwDc6PJ4kCEyovkkQKXcVHQ3jBP+/2ramJ -X0xtKBmS84Wrsde35PzeXmBXKPH1bOJqBBugmvufyykamf9NiuxwnOKtcKBaDzan -gaeABQ84xq9ob6X74WdAqGVeEc9YgoL11ZuLpR4cjx9oS5chhWBe5WzXFzdUjdSY -SaT+0QBLOg6oS+ywYCYxQCccsHsAz41PdeGr0n9EGnOrLVbJdM+HvYhINIqJ0KCt -+kLHlihTIk7qPjOqKBxbtNfsPEMOYVXGIcjX2rkFUmfQEESj72CQrAw9gPtlrV37 -TLdv9MlwR9el+vnryCzhckk/5Wz2F+pjAXzG5LEIarSZD/pCIVYGIAa/91HfBOQm -nsONX5cX/ZTanD2mDqxFb6cpAAL8JCy7gZ5KZ0AxonGsCFL6RQIdPfPGgWFj/Oz2 -40+3/Qd7oL5/2ByZlleio3kTyznF8P9sIQCF5uPQjMW7hgkw4DornG/nQ7dgwPDn -r6Oda0+k9xVbWUTaeP54 -=bESn ------END PGP SIGNATURE----- diff --git a/apr-util-1.3.12.tar.bz2.asc b/apr-util-1.3.12.tar.bz2.asc new file mode 100644 index 0000000..41d7883 --- /dev/null +++ b/apr-util-1.3.12.tar.bz2.asc @@ -0,0 +1,17 @@ +-----BEGIN PGP SIGNATURE----- +Version: GnuPG v2.0.14 (GNU/Linux) + +iQIcBAABCgAGBQJN1TAWAAoJEOxYLrY5/wksk8oQALjjEvTXg+CkqcOfm/7FIW/m +3Wo9KOx059HrPi9/D3aYkxZPOUEv2V+uTXaU4b7pe8wQ6MOPGGkwIiPJhxz6V8Og +Z5xsxFuZTfY/gwG+9O/b9a77jGcVY9QJh5740UzwDRiVA0IsIDg5uRwfEWkxyle4 +l+aYwKBF4f4VPvgB8bo3ORjBFCybr2/BuAuUzVZhwKua8nN2lSN7QfR7nJFL88AC +ilOCF4crMhuF6jTPVc079lzOynHGIjkIdjDlZRRjWNyFPtF/4Ad1YKG6n5RoEAcS +zTiPPElzS3yHeBAwfBw4xlpfrdGZin5KP1yqUYjYQnxDwG2fxXSmAKULVW3+YCFy +JCysHZ224yJFde2IpJhP6R4QWMayfyAL19HwtmP4XFKRWsgkZVCOtgNd80ptjf7N +uiRJqn/6Cbo0mP8sCho4PRwi0BLpqPK4nKs5S4j50UwV97jEjKc1X1EDVuymPLb2 +AB7U0di3KpTlXd5zNpsiYEcPOI7jOlkeZFTdRDZru+9fCVKDD2pYJztkfU3WMmSP +P19JeH+iPLVmptEQ5CyX1eEWhxUF4Jc8GZhH/t2qFsySRJK80lTmq7cuTxWhw+or +dBFcJTDyqWRJnFVxy6ZRBG6QZF5jndhQjWYc3Yf/p+bx3iQJW9WhqH3iY0GXxpeW +j/I2UjdHZ1P01JvHAV2x +=Tw0d +-----END PGP SIGNATURE----- diff --git a/apr-util.spec b/apr-util.spec index 8d5df53..852132a 100644 --- a/apr-util.spec +++ b/apr-util.spec @@ -3,15 +3,14 @@ Summary: Apache Portable Runtime Utility library Name: apr-util -Version: 1.3.11 -Release: 2%{?dist} +Version: 1.3.12 +Release: 1%{?dist} License: ASL 2.0 Group: System Environment/Libraries URL: http://apr.apache.org/ Source0: http://www.apache.org/dist/apr/%{name}-%{version}.tar.bz2 Patch1: apr-util-1.2.7-pkgconf.patch Patch2: apr-util-1.3.7-nodbmdso.patch -Patch3: apr-util-1.3.11-ldap_rebind_init.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot BuildRequires: autoconf, apr-devel >= 1.3.0 BuildRequires: db4-devel, expat-devel, libuuid-devel @@ -97,7 +96,6 @@ This package provides the LDAP support for the apr-util. %setup -q %patch1 -p1 -b .pkgconf %patch2 -p1 -b .nodbmdso -%patch3 -p1 -b .ldap_rebind_init %build autoheader && autoconf @@ -193,6 +191,9 @@ rm -rf $RPM_BUILD_ROOT %{_datadir}/aclocal/*.m4 %changelog +* Fri May 20 2011 Bojan Smojver - 1.3.12-1 +- bump up to 1.3.12 + * Wed May 11 2011 Bojan Smojver - 1.3.11-2 - fix crash in apr_ldap_rebind_init() diff --git a/sources b/sources index 71f954f..63043fb 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -2aeddb384b03f3f73107770724d5c97b apr-util-1.3.11.tar.bz2 +0f671b037ca62751a8a7005578085560 apr-util-1.3.12.tar.bz2