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.spec b/apr-util.spec index e233074..8d5df53 100644 --- a/apr-util.spec +++ b/apr-util.spec @@ -4,13 +4,14 @@ Summary: Apache Portable Runtime Utility library Name: apr-util Version: 1.3.11 -Release: 1%{?dist} +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,6 +97,7 @@ 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 @@ -191,6 +193,9 @@ 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