Avoid in effect calling xmlCleanupThreads twice, xmlCleanupParser

has already internally called the former, and doing it twice causes
an abort internally in the pthread library in NetBSD 7.0.
Bump PKGREVISION.

4 files changed, 44 insertions, 2 deletions

diff --git a/security/opendnssec/Makefile b/security/opendnssec/Makefile
index 2f31626c586..63d5c42d407 100644
--- a/security/opendnssec/Makefile
+++ b/security/opendnssec/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.59 2016/11/06 12:54:35 he Exp $
+# $NetBSD: Makefile,v 1.60 2016/11/27 14:25:41 he Exp $
 #
 
 DISTNAME=	opendnssec-1.4.12
+PKGREVISION=	1
 CATEGORIES=	security net
 MASTER_SITES=	http://www.opendnssec.org/files/source/
 
diff --git a/security/opendnssec/distinfo b/security/opendnssec/distinfo
index 8ca8ce6a64b..9fc8b13cf7b 100644
--- a/security/opendnssec/distinfo
+++ b/security/opendnssec/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.35 2016/11/06 12:54:35 he Exp $
+$NetBSD: distinfo,v 1.36 2016/11/27 14:25:41 he Exp $
 
 SHA1 (opendnssec-1.4.12.tar.gz) = feab78605d2c49a2788a4b65e7eb4416777e9610
 RMD160 (opendnssec-1.4.12.tar.gz) = dc91f862691218ca99b3496a7340ef16f29e37aa
@@ -7,5 +7,7 @@ Size (opendnssec-1.4.12.tar.gz) = 1036392 bytes
 SHA1 (patch-aa) = 104e077af6c368cbb5fc3034d58b2f2249fcf991
 SHA1 (patch-enforcer_utils_Makefile.am) = 80915dee723535e5854e62bc18f00ba2d5d7496c
 SHA1 (patch-enforcer_utils_Makefile.in) = 6c1b4ad25956bfcc8b410a8ca22f2581e64198d1
+SHA1 (patch-enforcer_utils_ksmutil.c) = f9456e0339d45dcc2776375cf40f3f8d9221878f
+SHA1 (patch-signer_src_daemon_engine.c) = a95846ba4aa6fa42043541bb2bde0f95464f9ba4
 SHA1 (patch-signer_src_signer_ixfr.c) = 74c2c320080e585a6126e146c453998f44c164f7
 SHA1 (patch-signer_src_signer_zone.c) = 0330236f11ccab7ed83b73bc83d851f932124318
diff --git a/security/opendnssec/patches/patch-enforcer_utils_ksmutil.c b/security/opendnssec/patches/patch-enforcer_utils_ksmutil.c
new file mode 100644
index 00000000000..2cfed42d800
--- /dev/null
+++ b/security/opendnssec/patches/patch-enforcer_utils_ksmutil.c
@@ -0,0 +1,16 @@
+$NetBSD: patch-enforcer_utils_ksmutil.c,v 1.1 2016/11/27 14:25:41 he Exp $
+
+Avoid calling xmlCleanupThreads, xmlCleanupParser has called it
+already, and this leads to an abort / assert failure with NetBSD
+7.0 pthread.
+
+--- enforcer/utils/ksmutil.c.orig	2016-10-17 12:32:58.000000000 +0000
++++ enforcer/utils/ksmutil.c
+@@ -4440,7 +4440,6 @@ main (int argc, char *argv[])
+ 
+     xmlCleanupParser();
+     xmlCleanupGlobals();
+-    xmlCleanupThreads();
+ 
+     exit(result);
+ }
diff --git a/security/opendnssec/patches/patch-signer_src_daemon_engine.c b/security/opendnssec/patches/patch-signer_src_daemon_engine.c
new file mode 100644
index 00000000000..d99ee882a3c
--- /dev/null
+++ b/security/opendnssec/patches/patch-signer_src_daemon_engine.c
@@ -0,0 +1,23 @@
+$NetBSD: patch-signer_src_daemon_engine.c,v 1.1 2016/11/27 14:25:41 he Exp $
+
+xmlCleanupThreads already done by xmlCleanupParser, and calling
+xmlCleanupThreads twice leads to abort with NetBSD 7.0 pthread.
+
+--- signer/src/daemon/engine.c.orig	2016-10-17 12:32:58.000000000 +0000
++++ signer/src/daemon/engine.c
+@@ -531,7 +531,6 @@ engine_setup(engine_type* engine)
+                 engine = NULL;
+                 xmlCleanupParser();
+                 xmlCleanupGlobals();
+-                xmlCleanupThreads();
+                 exit(0);
+         }
+         if (setsid() == -1) {
+@@ -1085,7 +1084,6 @@ earlyexit:
+     ods_log_close();
+     xmlCleanupParser();
+     xmlCleanupGlobals();
+-    xmlCleanupThreads();
+ }
+ 
+