CVS commit: pkgsrc/security/opendnssec

["Havard Eidnes" <he%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   he
Date:           Tue Mar 27 11:40:22 UTC 2018

Modified Files:
        pkgsrc/security/opendnssec: Makefile distinfo
        pkgsrc/security/opendnssec/patches: patch-signer_src_daemon_engine.c

Log Message:
Apply fix from
  https://github.com/opendnssec/opendnssec/pull/713/files
Remove notify handler from netio on zone removal.
Bump PKGREVISION.


To generate a diff of this commit:
cvs rdiff -u -r1.68 -r1.69 pkgsrc/security/opendnssec/Makefile
cvs rdiff -u -r1.38 -r1.39 pkgsrc/security/opendnssec/distinfo
cvs rdiff -u -r1.1 -r1.2 \
    pkgsrc/security/opendnssec/patches/patch-signer_src_daemon_engine.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/security/opendnssec/Makefile
diff -u pkgsrc/security/opendnssec/Makefile:1.68 pkgsrc/security/opendnssec/Makefile:1.69
--- pkgsrc/security/opendnssec/Makefile:1.68    Thu Nov 30 16:45:37 2017
+++ pkgsrc/security/opendnssec/Makefile Tue Mar 27 11:40:22 2018
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.68 2017/11/30 16:45:37 adam Exp $
+# $NetBSD: Makefile,v 1.69 2018/03/27 11:40:22 he Exp $
 #
 
 DISTNAME=      opendnssec-1.4.13
-PKGREVISION=   3
+PKGREVISION=   4
 CATEGORIES=    security net
 MASTER_SITES=  https://www.opendnssec.org/files/source/
 

Index: pkgsrc/security/opendnssec/distinfo
diff -u pkgsrc/security/opendnssec/distinfo:1.38 pkgsrc/security/opendnssec/distinfo:1.39
--- pkgsrc/security/opendnssec/distinfo:1.38    Fri Jan 20 16:12:39 2017
+++ pkgsrc/security/opendnssec/distinfo Tue Mar 27 11:40:22 2018
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.38 2017/01/20 16:12:39 he Exp $
+$NetBSD: distinfo,v 1.39 2018/03/27 11:40:22 he Exp $
 
 SHA1 (opendnssec-1.4.13.tar.gz) = 739e1d0178124e0930f48de529c85a6fea4fa02b
 RMD160 (opendnssec-1.4.13.tar.gz) = 033059b39acb9675df0db85a3476b678fdf7e193
@@ -8,6 +8,6 @@ SHA1 (patch-aa) = 104e077af6c368cbb5fc30
 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_daemon_engine.c) = 4a33a0220f3b64ba065ab415a5519062a0729e3c
 SHA1 (patch-signer_src_signer_ixfr.c) = 74c2c320080e585a6126e146c453998f44c164f7
 SHA1 (patch-signer_src_signer_zone.c) = 0330236f11ccab7ed83b73bc83d851f932124318

Index: pkgsrc/security/opendnssec/patches/patch-signer_src_daemon_engine.c
diff -u pkgsrc/security/opendnssec/patches/patch-signer_src_daemon_engine.c:1.1 pkgsrc/security/opendnssec/patches/patch-signer_src_daemon_engine.c:1.2
--- pkgsrc/security/opendnssec/patches/patch-signer_src_daemon_engine.c:1.1     Sun Nov 27 14:25:41 2016
+++ pkgsrc/security/opendnssec/patches/patch-signer_src_daemon_engine.c Tue Mar 27 11:40:22 2018
@@ -1,9 +1,11 @@
-$NetBSD: patch-signer_src_daemon_engine.c,v 1.1 2016/11/27 14:25:41 he Exp $
+$NetBSD: patch-signer_src_daemon_engine.c,v 1.2 2018/03/27 11:40:22 he Exp $
 
 xmlCleanupThreads already done by xmlCleanupParser, and calling
 xmlCleanupThreads twice leads to abort with NetBSD 7.0 pthread.
+Remove notify handler from netio on zone removal, ref.
+https://github.com/opendnssec/opendnssec/pull/713/files
 
---- signer/src/daemon/engine.c.orig    2016-10-17 12:32:58.000000000 +0000
+--- signer/src/daemon/engine.c.orig    2017-01-20 14:57:50.000000000 +0000
 +++ signer/src/daemon/engine.c
 @@ -531,7 +531,6 @@ engine_setup(engine_type* engine)
                  engine = NULL;
@@ -13,7 +15,16 @@ xmlCleanupThreads twice leads to abort w
                  exit(0);
          }
          if (setsid() == -1) {
-@@ -1085,7 +1084,6 @@ earlyexit:
+@@ -806,6 +805,8 @@ engine_update_zones(engine_type* engine,
+             lock_basic_unlock(&zone->zone_lock);
+             netio_remove_handler(engine->xfrhandler->netio,
+                 &zone->xfrd->handler);
++          netio_remove_handler(engine->xfrhandler->netio,
++              &zone->notify->handler);
+             zone_cleanup(zone);
+             zone = NULL;
+             continue;
+@@ -1085,7 +1086,6 @@ earlyexit:
      ods_log_close();
      xmlCleanupParser();
      xmlCleanupGlobals();