summaryrefslogtreecommitdiff
path: root/devel/apr-util
diff options
context:
space:
mode:
authordrochner <drochner@pkgsrc.org>2011-05-20 09:35:35 +0000
committerdrochner <drochner@pkgsrc.org>2011-05-20 09:35:35 +0000
commitbdb54f60e81f3b6688c62cc72ee4a40fd2e7ca27 (patch)
tree7835bc8b1ac870d3a9789042a0261cea14d49562 /devel/apr-util
parent45d877f9dc31968af9efe75e279f376ad187b19e (diff)
downloadpkgsrc-bdb54f60e81f3b6688c62cc72ee4a40fd2e7ca27.tar.gz
add patch from upstream to fix possible crash on LDAP cleanup
(LDAP support is optional, not enabled per default)
Diffstat (limited to 'devel/apr-util')
-rw-r--r--devel/apr-util/distinfo3
-rw-r--r--devel/apr-util/patches/patch-ab13
2 files changed, 15 insertions, 1 deletions
diff --git a/devel/apr-util/distinfo b/devel/apr-util/distinfo
index a1bab810936..3a46d992d4f 100644
--- a/devel/apr-util/distinfo
+++ b/devel/apr-util/distinfo
@@ -1,6 +1,7 @@
-$NetBSD: distinfo,v 1.11 2011/05/11 18:11:18 tron Exp $
+$NetBSD: distinfo,v 1.12 2011/05/20 09:35:35 drochner Exp $
SHA1 (apr-util-1.3.11.tar.bz2) = dc71af7684f76d56f06b4fc8763a8606bd861e84
RMD160 (apr-util-1.3.11.tar.bz2) = 5b745baf523b99c8fa0501deab4f00d86ca050e5
Size (apr-util-1.3.11.tar.bz2) = 607486 bytes
SHA1 (patch-aa) = c778c6c5b9ea1d51aa6899fd885f00e4a5e9242b
+SHA1 (patch-ab) = 968a46d93d83de8701ba89da1e8e8850d4047db5
diff --git a/devel/apr-util/patches/patch-ab b/devel/apr-util/patches/patch-ab
new file mode 100644
index 00000000000..8c929883d23
--- /dev/null
+++ b/devel/apr-util/patches/patch-ab
@@ -0,0 +1,13 @@
+$NetBSD: patch-ab,v 1.4 2011/05/20 09:35:35 drochner Exp $
+
+--- ldap/apr_ldap_rebind.c.orig 2011-03-12 12:48:50.000000000 +0000
++++ ldap/apr_ldap_rebind.c
+@@ -82,7 +82,7 @@ APU_DECLARE_LDAP(apr_status_t) apr_ldap_
+ #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) {