Update OpenDNSSEC to version 1.4.8.2.

Pkgsrc changes:
 * Adapt patches to match new files.
 * Add new migration scripts to PLIST

Upstream changes:

News
 * Support for RFC5011 style KSK rollovers. KSK section in the KASP
   now accepts element.
 * Enforcer: New repository option allows to generate keys with
   CKA_EXTRACTABLE attribute set to TRUE so keys can be wrapped and
   extracted from HSM.

Bugfixes
 * SUPPORT-145: EOF handling an ARM architecture caused signer to hang.
 * Fixed signer hitting assertion on short reply XFR handler.
 * Include revoke bit in keytag calculation.
 * Increased stacksize on some systems (thanks Patrik Lundin!).
 * Stop ods-signerd on SIGINT.

Note:
 * Updating from earlier versions of OpenDNSSEC requires use of the
   database migration script(s) included in ${PKG}/share/opendnssec/
   as the migrate_1_4_8* scripts.

5 files changed, 34 insertions, 25 deletions

diff --git a/security/opendnssec/Makefile b/security/opendnssec/Makefile
index 03ef3291e66..e34d00d4a45 100644
--- a/security/opendnssec/Makefile
+++ b/security/opendnssec/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.51 2015/10/10 01:58:18 ryoon Exp $
+# $NetBSD: Makefile,v 1.52 2015/11/16 10:09:08 he Exp $
 #
 
-DISTNAME=	opendnssec-1.4.7
-PKGREVISION=	2
+DISTNAME=	opendnssec-1.4.8.2
 CATEGORIES=	security net
 MASTER_SITES=	http://www.opendnssec.org/files/source/
 
diff --git a/security/opendnssec/PLIST b/security/opendnssec/PLIST
index 432ad03395b..7436b8cce94 100644
--- a/security/opendnssec/PLIST
+++ b/security/opendnssec/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.6 2014/09/27 19:41:06 pettai Exp $
+@comment $NetBSD: PLIST,v 1.7 2015/11/16 10:09:08 he Exp $
 bin/ods-getconf
 bin/ods-hsmspeed
 bin/ods-hsmutil
@@ -41,6 +41,8 @@ share/opendnssec/enforcerstate.rng
 share/opendnssec/kasp.rnc
 share/opendnssec/kasp.rng
 share/opendnssec/kasp2html.xsl
+share/opendnssec/migrate_1_4_8.mysql
+share/opendnssec/migrate_1_4_8.sqlite3
 share/opendnssec/migrate_adapters_1.mysql
 share/opendnssec/migrate_adapters_1.sqlite3
 share/opendnssec/migrate_id_mysql.pl
diff --git a/security/opendnssec/distinfo b/security/opendnssec/distinfo
index c9eeebb37c7..1a730c7a526 100644
--- a/security/opendnssec/distinfo
+++ b/security/opendnssec/distinfo
@@ -1,9 +1,8 @@
-$NetBSD: distinfo,v 1.30 2015/11/04 01:17:52 agc Exp $
+$NetBSD: distinfo,v 1.31 2015/11/16 10:09:08 he Exp $
 
-SHA1 (opendnssec-1.4.7.tar.gz) = c8a5808d68a50db8ed7edf806a58f54428ad7aa8
-RMD160 (opendnssec-1.4.7.tar.gz) = f14f7a19b0072754ac7cb242ad2ee610d933364e
-SHA512 (opendnssec-1.4.7.tar.gz) = def2a8e41331bd70f287ea3081a7368144ada92ad5cc9f62d28d3064e34f7c0c84998422d515f5ec9c7e668757e796df8c5446839e24e4a9e2af1357c342c0b2
-Size (opendnssec-1.4.7.tar.gz) = 1038884 bytes
+SHA1 (opendnssec-1.4.8.2.tar.gz) = fd971ac015513206495b1f8531ebadabd010ca98
+RMD160 (opendnssec-1.4.8.2.tar.gz) = 73e015bc45c03ed7cf0ed84bb4c2a64a8bf9a567
+Size (opendnssec-1.4.8.2.tar.gz) = 1043171 bytes
 SHA1 (patch-aa) = 104e077af6c368cbb5fc3034d58b2f2249fcf991
-SHA1 (patch-enforcer_utils_Makefile.am) = bee7cb4f3cfe5aae96c5726a115eb8b6587288dd
-SHA1 (patch-enforcer_utils_Makefile.in) = 4d40385e4d6a70c2722ec43268832ca27ca89cbc
+SHA1 (patch-enforcer_utils_Makefile.am) = 80915dee723535e5854e62bc18f00ba2d5d7496c
+SHA1 (patch-enforcer_utils_Makefile.in) = fa37bd2c31594b23a5fd3797361dcd6125678d94
diff --git a/security/opendnssec/patches/patch-enforcer_utils_Makefile.am b/security/opendnssec/patches/patch-enforcer_utils_Makefile.am
index 71459259afe..cf9245d2c32 100644
--- a/security/opendnssec/patches/patch-enforcer_utils_Makefile.am
+++ b/security/opendnssec/patches/patch-enforcer_utils_Makefile.am
@@ -1,14 +1,13 @@
-$NetBSD: patch-enforcer_utils_Makefile.am,v 1.1 2013/08/22 11:05:45 he Exp $
+$NetBSD: patch-enforcer_utils_Makefile.am,v 1.2 2015/11/16 10:09:08 he Exp $
 
 Install the conversion scripts.
 
---- enforcer/utils/Makefile.am.orig	2012-10-24 10:42:52.000000000 +0000
+--- enforcer/utils/Makefile.am.orig	2015-10-05 14:19:26.000000000 +0000
 +++ enforcer/utils/Makefile.am
-@@ -43,3 +43,9 @@ EXTRA_DIST = $(srcdir)/migrate_*.pl
- EXTRA_DIST += $(srcdir)/migrate_adapters_1.*
- EXTRA_DIST += $(srcdir)/convert_database.pl
+@@ -43,3 +43,8 @@ EXTRA_DIST += $(srcdir)/convert_database
  EXTRA_DIST += $(srcdir)/migrate_zone_delete.mysql
-+
+ EXTRA_DIST += $(srcdir)/migrate_1_4_8.*
+ 
 +install-data-local: $(EXTRA_DIST)
 +	for f in $(EXTRA_DIST); do \
 +		$(INSTALL_DATA) "$$f" $(DESTDIR)$(opendnssecdatadir) \
diff --git a/security/opendnssec/patches/patch-enforcer_utils_Makefile.in b/security/opendnssec/patches/patch-enforcer_utils_Makefile.in
index 5c71d32c611..26eeab7fb04 100644
--- a/security/opendnssec/patches/patch-enforcer_utils_Makefile.in
+++ b/security/opendnssec/patches/patch-enforcer_utils_Makefile.in
@@ -1,10 +1,18 @@
-$NetBSD: patch-enforcer_utils_Makefile.in,v 1.2 2014/12/04 15:58:21 he Exp $
+$NetBSD: patch-enforcer_utils_Makefile.in,v 1.3 2015/11/16 10:09:08 he Exp $
 
 Regenerate after adding installation of migration scripts to Makefile.am.
 
---- enforcer/utils/Makefile.in.orig	2014-12-04 15:18:00.000000000 +0000
+--- enforcer/utils/Makefile.in.orig	2015-10-05 14:20:51.000000000 +0000
 +++ enforcer/utils/Makefile.in
-@@ -788,7 +788,8 @@ info: info-am
+@@ -423,7 +423,6 @@ pkcs11_softhsm_module = @pkcs11_softhsm_
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
+ psdir = @psdir@
+-runstatedir = @runstatedir@
+ sbindir = @sbindir@
+ sharedstatedir = @sharedstatedir@
+ srcdir = @srcdir@
+@@ -798,7 +797,8 @@ info: info-am
  
  info-am:
  
@@ -14,7 +22,7 @@ Regenerate after adding installation of migration scripts to Makefile.am.
  
  install-dvi: install-dvi-am
  
-@@ -846,17 +847,24 @@ uninstall-man: uninstall-man1
+@@ -856,20 +856,27 @@ uninstall-man: uninstall-man1
  	ctags ctags-am distclean distclean-compile distclean-generic \
  	distclean-libtool distclean-tags distdir dvi dvi-am html \
  	html-am info info-am install install-am install-binPROGRAMS \
@@ -28,7 +36,6 @@ Regenerate after adding installation of migration scripts to Makefile.am.
 -	mostlyclean-libtool pdf pdf-am ps ps-am tags tags-am uninstall \
 -	uninstall-am uninstall-binPROGRAMS \
 -	uninstall-dist_opendnssecdataDATA uninstall-man uninstall-man1
--
 +	install-data install-data-am install-data-local \
 +	install-dist_opendnssecdataDATA install-dvi install-dvi-am \
 +	install-exec install-exec-am install-html install-html-am \
@@ -40,13 +47,16 @@ Regenerate after adding installation of migration scripts to Makefile.am.
 +	pdf pdf-am ps ps-am tags tags-am uninstall uninstall-am \
 +	uninstall-binPROGRAMS uninstall-dist_opendnssecdataDATA \
 +	uninstall-man uninstall-man1
-+
-+
+ 
+ .PRECIOUS: Makefile
+ 
+ 
 +install-data-local: $(EXTRA_DIST)
 +	for f in $(EXTRA_DIST); do \
 +		$(INSTALL_DATA) "$$f" $(DESTDIR)$(opendnssecdatadir) \
 +			|| exit $$?; \
 +	done
- 
++
  # Tell versions [3.59,3.63) of GNU make to not export all variables.
  # Otherwise a system limit (for SysV at least) may be exceeded.
+ .NOEXPORT: