From 7d170f942f81a97cd12d0bee2e53b9023551d9c9 Mon Sep 17 00:00:00 2001 From: Bojan Smojver Date: May 18 2011 04:57:57 +0000 Subject: Merge branch 'master' into f13 Conflicts: .gitignore --- diff --git a/.gitignore b/.gitignore index 8a3a917..28f1249 100644 --- a/.gitignore +++ b/.gitignore @@ -1,4 +1,7 @@ apr-util-1.3.9.tar.bz2 -clog -x86_64 -apr-util-1.3.10.tar.bz2 +/apr-util-1.3.10.tar.bz2 +/*.rpm +/clog +/x86_64 +/.build*.log +/apr-util-1.3.11.tar.bz2 diff --git a/apr-util-1.3.11-ldap_rebind_init.patch b/apr-util-1.3.11-ldap_rebind_init.patch new file mode 100644 index 0000000..e192321 --- /dev/null +++ b/apr-util-1.3.11-ldap_rebind_init.patch @@ -0,0 +1,13 @@ +--- 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 new file mode 100644 index 0000000..f76ef96 --- /dev/null +++ b/apr-util-1.3.11.tar.bz2.asc @@ -0,0 +1,17 @@ +-----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.9.tar.bz2.asc b/apr-util-1.3.9.tar.bz2.asc deleted file mode 100644 index f126c11..0000000 --- a/apr-util-1.3.9.tar.bz2.asc +++ /dev/null @@ -1,17 +0,0 @@ ------BEGIN PGP SIGNATURE----- -Version: GnuPG v1.4.9 (GNU/Linux) - -iQIcBAABAgAGBQJKeKMTAAoJEKNIuYR/chSnLwsQAJVeM3J873BwSOiVOOX4cWKl -V2GV0Pi4dopAxXCllLF3lE2NRSCzGE6T7NfKV0MTyyFSuZ8r8sAdA/LI03TS8HCq -m08Yrq2cJdKKSeq4d+uES+BgtV+pVYX8/2tSTvfQ9v5jfGrxv+mNW1EXTFI2Sw3v -CSEkzqZeb2XSCjNfqQR0Jz6wTT3YQmf/hIQ068Bte4LqlW6RkSpT41vIpHHYndji -y8S7iDdx/Pzdgf2dB6g1ifAL9n526I/Ajfe5workKqblKYc4G5QMW9sE5sLIYAdI -hEZZoCvUPFvb6XtMtHUnDIaWLndnBlVv4h1re6MvPKqS7XpgTEDGOFcs6UIUTo1D -aUHyEMeSf/TipUD9VdCNeOETVr8NTXoiqiqgZqz0XZxAL4Wzh3ntqjCtIT6zjsTD -cwOT01xDXpd0pNadbQdF9sKSP/9v/qnwLCFnYXMNIGn7QyzRhOTjMTeAph4vLZ6d -/YriQr2oGIY/w+0zS0Xqtpgcx0jgwh8IZYg2s8yNwBq+Yz6d28pgLL2Dw+AJSEYy -RwuGe8BoRhZxkUlKa2gQfWite2VRtC3SbitzTlJ8Ks76ar+5ANSKuLvnwvf6T2gG -A6dvP2qkc7rVwmcA1MXEzxKwwmWN1yQ9CDguFc+vH4bwMbYO+uLx5VsR95+jLK7/ -NQdRuYPRt1h6A4w9pFb9 -=9TqS ------END PGP SIGNATURE----- diff --git a/apr-util.spec b/apr-util.spec index 0109f3c..8d5df53 100644 --- a/apr-util.spec +++ b/apr-util.spec @@ -3,14 +3,15 @@ Summary: Apache Portable Runtime Utility library Name: apr-util -Version: 1.3.10 -Release: 1%{?dist} +Version: 1.3.11 +Release: 2%{?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 @@ -96,9 +97,13 @@ 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 +# A fragile autoconf test which fails if the code trips +# any other warning; force correct result for OpenLDAP: +export ac_cv_ldap_set_rebind_proc_style=three %configure --with-apr=%{_prefix} \ --includedir=%{_includedir}/apr-%{apuver} \ --with-ldap --without-gdbm \ @@ -188,6 +193,30 @@ rm -rf $RPM_BUILD_ROOT %{_datadir}/aclocal/*.m4 %changelog +* Wed May 11 2011 Bojan Smojver - 1.3.11-2 +- fix crash in apr_ldap_rebind_init() + +* Mon May 9 2011 Bojan Smojver - 1.3.11-1 +- bump up to 1.3.11 + +* Wed Mar 23 2011 Dan Horák - 1.3.10-7 +- rebuilt for mysql 5.5.10 (soname bump in libmysqlclient) + +* Wed Mar 23 2011 Joe Orton - 1.3.10-6 +- rebuild for MySQL soname bump + +* Wed Mar 2 2011 Joe Orton - 1.3.10-5 +- fix build + +* Wed Mar 2 2011 Joe Orton - 1.3.10-4 +- rebuild + +* Mon Feb 07 2011 Fedora Release Engineering - 1.3.10-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild + +* Wed Dec 29 2010 Bojan Smojver - 1.3.10-2 +- rebuild for MySQL 5.5.x + * Tue Oct 5 2010 Joe Orton - 1.3.10-1 - update to 1.3.10 diff --git a/sources b/sources index 7ac6170..71f954f 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -6a6f501a1b2a45166b8ffd6df29204bb apr-util-1.3.10.tar.bz2 +2aeddb384b03f3f73107770724d5c97b apr-util-1.3.11.tar.bz2