Update OpenDNSSEC from version 1.3.14nb1 to 1.4.1.

Pkgsrc changes:
 * Get rid of ruby dependencies, since the validator is no longer
   included in OpenDNSSEC
 * Adapt PLIST to changes in installed files
 * Add a patch so that the database migration scripts are installed
   as part of the package

Upstream notable changes:
 *  SUPPORT-58: Extend ods-signer sign <zone> with -serial <nr> so
    that the user can specify the SOA serial to use in the signed
    zone [OPENDNSSEC-401].
 *  OPENDNSSEC-91: Make the keytype flag required when rolling keys

Bugfixes:
 *  SUPPORT-60: Fix datecounter in case inbound serial is higher
    than outbound serial [OPENDNSSEC-420].
 *  OPENDNSSEC-247: Signer Engine: TTL on NSEC3 was not updated on
    SOA Minimum change.
 *  OPENDNSSEC-421: Signer Engine: Fix assertion error in case
    NSEC3 hash algorithm in signconf is not SHA1.
 *  OPENDNSSEC-421: ods-kaspcheck: Check whether NSEC3 hash algorithm
    in kasp is valid.
 *  Bugfix: The time when inbound serial is acquired was reset
    invalidly, could cause OpenDNSSEC wanting AXFR responses while
    requesting IXFR (thanks Stuart Lau).
 *  Bugfix: Fix malform in Outbound IXFR/TCP subsequent packet
    (thanks Stuart Lau).
 *  OPENDNSSEC-398: The ods-ksmutil key rollover command does not
    work correctly when rolling all keys using the -policy option

6 files changed, 466 insertions, 52 deletions

diff --git a/security/opendnssec/Makefile b/security/opendnssec/Makefile
index f01b7a554cb..2dfdec78428 100644
--- a/security/opendnssec/Makefile
+++ b/security/opendnssec/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.34 2013/07/12 10:45:02 jperkin Exp $
+# $NetBSD: Makefile,v 1.35 2013/08/22 11:05:45 he Exp $
 #
 
-DISTNAME=	opendnssec-1.3.14
-PKGREVISION=	1
+DISTNAME=	opendnssec-1.4.1
 CATEGORIES=	security net
 MASTER_SITES=	http://www.opendnssec.org/files/source/
 
@@ -12,7 +11,6 @@ COMMENT=	OSS for a fast and easy DNSSEC deployment
 LICENSE=	2-clause-bsd
 
 DEPENDS+=	ldns>=1.6.13:../../net/ldns
-DEPENDS+=	${RUBY_PKGPREFIX}-dnsruby>=1.53:../../net/ruby-dnsruby
 BUILD_DEPENDS+=	CUnit-[0-9]*:../../devel/cunit
 
 BUILD_DEFS+=	VARBASE
@@ -25,7 +23,6 @@ USE_LIBTOOL=	yes
 GNU_CONFIGURE=		yes
 CONFIGURE_ARGS+=	--prefix=${PREFIX:Q}
 CONFIGURE_ARGS+=	--localstatedir=${VARBASE}
-CONFIGURE_ENV+=		RUBY=${RUBY}
 
 ODS_USER?=	opendnssec
 ODS_GROUP?=	opendnssec
@@ -49,12 +46,12 @@ SUBST_SED.paths=	-e 's,@EGDIR@,${EGDIR},'
 
 CXXFLAGS.NetBSD+=	-D_NETBSD_SOURCE
 
-CONF_FILES=	${EGDIR}/conf.xml.sample \
+CONF_FILES+=	${EGDIR}/addns.xml.sample \
+			${ODS_SYSCONFDIR}/addns.xml
+CONF_FILES+=	${EGDIR}/conf.xml.sample \
 			${ODS_SYSCONFDIR}/conf.xml
 CONF_FILES+=	${EGDIR}/kasp.xml.sample \
 			${ODS_SYSCONFDIR}/kasp.xml
-CONF_FILES+=	${EGDIR}/zonefetch.xml.sample \
-			${ODS_SYSCONFDIR}/zonefetch.xml
 CONF_FILES+=	${EGDIR}/zonelist.xml.sample \
 			${ODS_SYSCONFDIR}/zonelist.xml
 
@@ -69,14 +66,6 @@ OWN_DIRS+=		${VARBASE}/opendnssec/signconf
 OWN_DIRS+=		${VARBASE}/opendnssec/signed
 OWN_DIRS+=		${VARBASE}/opendnssec/unsigned
 
-.include "../../lang/ruby/rubyversion.mk"
-
-.if ${RUBY_VER} != 18
-DEPENDS+=	${RUBY_PKGPREFIX}-soap4r>=2.0.3:../../net/ruby-soap4r
-.else
-DEPENDS+=	${RUBY_PKGPREFIX}-rubygems-[0-9]*:../../misc/rubygems
-.endif
-
 .include "options.mk"
 
 pre-install:
@@ -90,5 +79,4 @@ post-install:
 .include "../../textproc/libxml2/buildlink3.mk"
 .include "../../net/ldns/buildlink3.mk"
 .include "../../databases/sqlite3/buildlink3.mk"
-.include "../../lang/ruby/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/security/opendnssec/PLIST b/security/opendnssec/PLIST
index 91a49a834b8..8fb8e34e1cb 100644
--- a/security/opendnssec/PLIST
+++ b/security/opendnssec/PLIST
@@ -1,22 +1,9 @@
-@comment $NetBSD: PLIST,v 1.4 2011/03/21 15:52:25 pettai Exp $
-bin/ods-auditor
+@comment $NetBSD: PLIST,v 1.5 2013/08/22 11:05:45 he Exp $
 bin/ods-hsmspeed
 bin/ods-hsmutil
 bin/ods-kasp2html
 bin/ods-kaspcheck
 bin/ods-ksmutil
-lib/opendnssec/kasp_auditor.rb
-lib/opendnssec/kasp_auditor/auditor.rb
-lib/opendnssec/kasp_auditor/changed_config.rb
-lib/opendnssec/kasp_auditor/commands.rb
-lib/opendnssec/kasp_auditor/config.rb
-lib/opendnssec/kasp_auditor/key_tracker.rb
-lib/opendnssec/kasp_auditor/parse.rb
-lib/opendnssec/kasp_auditor/partial_auditor.rb
-lib/opendnssec/kasp_auditor/preparser.rb
-lib/opendnssec/kasp_checker.rb
-lib/opendnssec/time_shift.rb
-man/man1/ods-auditor.1
 man/man1/ods-hsmspeed.1
 man/man1/ods-hsmutil.1
 man/man1/ods-kaspcheck.1
@@ -33,24 +20,35 @@ sbin/ods-signer
 sbin/ods-signerd
 share/doc/opendnssec/KNOWN_ISSUES
 share/doc/opendnssec/MIGRATION
+share/examples/opendnssec/addns.xml
+share/examples/opendnssec/addns.xml.sample
 share/examples/opendnssec/conf.xml
 share/examples/opendnssec/conf.xml.sample
 share/examples/opendnssec/kasp.xml
 share/examples/opendnssec/kasp.xml.sample
-share/examples/opendnssec/zonefetch.xml
-share/examples/opendnssec/zonefetch.xml.sample
 share/examples/opendnssec/zonelist.xml
 share/examples/opendnssec/zonelist.xml.sample
+share/opendnssec/addns.rnc
+share/opendnssec/addns.rng
 share/opendnssec/conf.rnc
 share/opendnssec/conf.rng
+share/opendnssec/convert_database.pl
 share/opendnssec/database_create.sqlite3
+share/opendnssec/enforcerstate.rnc
+share/opendnssec/enforcerstate.rng
 share/opendnssec/kasp.rnc
 share/opendnssec/kasp.rng
 share/opendnssec/kasp2html.xsl
+share/opendnssec/migrate_adapters_1.mysql
+share/opendnssec/migrate_adapters_1.sqlite3
+share/opendnssec/migrate_id_mysql.pl
+share/opendnssec/migrate_keyshare_mysql.pl
+share/opendnssec/migrate_keyshare_sqlite3.pl
+share/opendnssec/migrate_to_ng_mysql.pl
+share/opendnssec/migrate_to_ng_sqlite.pl
+share/opendnssec/migrate_zone_delete.mysql
 share/opendnssec/signconf.rnc
 share/opendnssec/signconf.rng
-share/opendnssec/zonefetch.rnc
-share/opendnssec/zonefetch.rng
 share/opendnssec/zonelist.rnc
 share/opendnssec/zonelist.rng
 @pkgdir lib/opendnssec/signer
diff --git a/security/opendnssec/distinfo b/security/opendnssec/distinfo
index 1e2b3297652..8e39f792691 100644
--- a/security/opendnssec/distinfo
+++ b/security/opendnssec/distinfo
@@ -1,6 +1,8 @@
-$NetBSD: distinfo,v 1.20 2013/06/15 16:42:48 pettai Exp $
+$NetBSD: distinfo,v 1.21 2013/08/22 11:05:45 he Exp $
 
-SHA1 (opendnssec-1.3.14.tar.gz) = 9e6be8b42ab25cf1984f00326d44d0c195e00ef2
-RMD160 (opendnssec-1.3.14.tar.gz) = c23842c8fb9531efaee6140ea52764e28d2b5be3
-Size (opendnssec-1.3.14.tar.gz) = 1159293 bytes
-SHA1 (patch-aa) = 8fbe0f6e5200a3766e36bc8e5351ac00bd119823
+SHA1 (opendnssec-1.4.1.tar.gz) = 90020d343456af0846b13c951a6a914109cb5d22
+RMD160 (opendnssec-1.4.1.tar.gz) = 54c64bb73295593857ceb0ec89f0c4240d9d841e
+Size (opendnssec-1.4.1.tar.gz) = 988263 bytes
+SHA1 (patch-aa) = 104e077af6c368cbb5fc3034d58b2f2249fcf991
+SHA1 (patch-enforcer_utils_Makefile.am) = bee7cb4f3cfe5aae96c5726a115eb8b6587288dd
+SHA1 (patch-enforcer_utils_Makefile.in) = da9fce97e631bb81607851f9758b206ea975b052
diff --git a/security/opendnssec/patches/patch-aa b/security/opendnssec/patches/patch-aa
index fa6ef79cca9..fe537d9c01b 100644
--- a/security/opendnssec/patches/patch-aa
+++ b/security/opendnssec/patches/patch-aa
@@ -1,18 +1,18 @@
-$NetBSD: patch-aa,v 1.6 2013/06/15 16:42:48 pettai Exp $
+$NetBSD: patch-aa,v 1.7 2013/08/22 11:05:45 he Exp $
 
-Install the configuration examples in ${EGDIR}
+Install sample configurations in another directory.
 
---- conf/Makefile.in.orig	2012-05-09 18:50:03.000000000 +0000
+--- conf/Makefile.in.orig	2013-06-27 08:04:17.000000000 +0000
 +++ conf/Makefile.in
-@@ -302,6 +302,7 @@ sharedstatedir = @sharedstatedir@
+@@ -299,6 +299,7 @@ sbindir = @sbindir@
+ sharedstatedir = @sharedstatedir@
  srcdir = @srcdir@
- subdirs = @subdirs@
  sysconfdir = @sysconfdir@/opendnssec
 +EGDIR=@EGDIR@
  target_alias = @target_alias@
  top_build_prefix = @top_build_prefix@
  top_builddir = @top_builddir@
-@@ -563,19 +564,19 @@ regress: $(RNG)
+@@ -568,19 +569,20 @@ regress: $(RNG)
  		(echo "kasp.xml built")
  
  install-data-hook:
@@ -20,12 +20,12 @@ Install the configuration examples in ${EGDIR}
 -	test -f ${DESTDIR}${sysconfdir}/conf.xml || \
 -		${INSTALL_DATA} -m 0640 conf.xml ${DESTDIR}${sysconfdir}
 -	${INSTALL_DATA} -m 640 conf.xml ${DESTDIR}${sysconfdir}/conf.xml.sample
+-	test -f ${DESTDIR}${sysconfdir}/addns.xml || \
+-		${INSTALL_DATA} addns.xml ${DESTDIR}${sysconfdir}
+-	${INSTALL_DATA} addns.xml ${DESTDIR}${sysconfdir}/addns.xml.sample
 -	test -f ${DESTDIR}${sysconfdir}/zonelist.xml || \
 -		${INSTALL_DATA} zonelist.xml ${DESTDIR}${sysconfdir}
 -	${INSTALL_DATA} zonelist.xml ${DESTDIR}${sysconfdir}/zonelist.xml.sample
--	test -f ${DESTDIR}${sysconfdir}/zonefetch.xml || \
--		${INSTALL_DATA} -m 0640 zonefetch.xml ${DESTDIR}${sysconfdir}
--	${INSTALL_DATA} -m 640 zonefetch.xml ${DESTDIR}${sysconfdir}/zonefetch.xml.sample
 -	test -f ${DESTDIR}${sysconfdir}/kasp.xml || \
 -		${INSTALL_DATA} kasp.xml ${DESTDIR}${sysconfdir}
 -	${INSTALL_DATA} kasp.xml ${DESTDIR}${sysconfdir}/kasp.xml.sample
@@ -33,15 +33,16 @@ Install the configuration examples in ${EGDIR}
 +	test -f ${DESTDIR}${EGDIR}/conf.xml || \
 +		${INSTALL_DATA} -m 0640 conf.xml ${DESTDIR}${EGDIR}
 +	${INSTALL_DATA} -m 640 conf.xml ${DESTDIR}${EGDIR}/conf.xml.sample
++	test -f ${DESTDIR}${EGDIR}/addns.xml || \
++		${INSTALL_DATA} addns.xml ${DESTDIR}${EGDIR}
++	${INSTALL_DATA} addns.xml ${DESTDIR}${EGDIR}/addns.xml.sample
 +	test -f ${DESTDIR}${EGDIR}/zonelist.xml || \
 +		${INSTALL_DATA} zonelist.xml ${DESTDIR}${EGDIR}
 +	${INSTALL_DATA} zonelist.xml ${DESTDIR}${EGDIR}/zonelist.xml.sample
-+	test -f ${DESTDIR}${EGDIR}/zonefetch.xml || \
-+		${INSTALL_DATA} -m 0640 zonefetch.xml ${DESTDIR}${EGDIR}
-+	${INSTALL_DATA} -m 640 zonefetch.xml ${DESTDIR}${EGDIR}/zonefetch.xml.sample
 +	test -f ${DESTDIR}${EGDIR}/kasp.xml || \
 +		${INSTALL_DATA} kasp.xml ${DESTDIR}${EGDIR}
 +	${INSTALL_DATA} kasp.xml ${DESTDIR}${EGDIR}/kasp.xml.sample
++
  
  # 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.
diff --git a/security/opendnssec/patches/patch-enforcer_utils_Makefile.am b/security/opendnssec/patches/patch-enforcer_utils_Makefile.am
new file mode 100644
index 00000000000..71459259afe
--- /dev/null
+++ b/security/opendnssec/patches/patch-enforcer_utils_Makefile.am
@@ -0,0 +1,16 @@
+$NetBSD: patch-enforcer_utils_Makefile.am,v 1.1 2013/08/22 11:05:45 he Exp $
+
+Install the conversion scripts.
+
+--- enforcer/utils/Makefile.am.orig	2012-10-24 10:42:52.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
+ EXTRA_DIST += $(srcdir)/migrate_zone_delete.mysql
++
++install-data-local: $(EXTRA_DIST)
++	for f in $(EXTRA_DIST); do \
++		$(INSTALL_DATA) "$$f" $(DESTDIR)$(opendnssecdatadir) \
++			|| exit $$?; \
++	done
diff --git a/security/opendnssec/patches/patch-enforcer_utils_Makefile.in b/security/opendnssec/patches/patch-enforcer_utils_Makefile.in
new file mode 100644
index 00000000000..d79fc7502e0
--- /dev/null
+++ b/security/opendnssec/patches/patch-enforcer_utils_Makefile.in
@@ -0,0 +1,409 @@
+$NetBSD: patch-enforcer_utils_Makefile.in,v 1.1 2013/08/22 11:05:45 he Exp $
+
+Regenerate after adding installation of migration scripts to Makefile.am.
+
+--- enforcer/utils/Makefile.in.orig	2013-06-27 08:04:17.000000000 +0000
++++ enforcer/utils/Makefile.in
+@@ -1,9 +1,8 @@
+-# Makefile.in generated by automake 1.11.3 from Makefile.am.
++# Makefile.in generated by automake 1.13.1 from Makefile.am.
+ # @configure_input@
+ 
+-# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software
+-# Foundation, Inc.
++# Copyright (C) 1994-2012 Free Software Foundation, Inc.
++
+ # This Makefile.in is free software; the Free Software Foundation
+ # gives unlimited permission to copy and/or distribute it,
+ # with or without modifications, as long as this notice is preserved.
+@@ -19,6 +18,23 @@
+ 
+ 
+ VPATH = @srcdir@
++am__make_dryrun = \
++  { \
++    am__dry=no; \
++    case $$MAKEFLAGS in \
++      *\\[\ \	]*) \
++        echo 'am--echo: ; @echo "AM"  OK' | $(MAKE) -f - 2>/dev/null \
++          | grep '^AM OK$$' >/dev/null || am__dry=yes;; \
++      *) \
++        for am__flg in $$MAKEFLAGS; do \
++          case $$am__flg in \
++            *=*|--*) ;; \
++            *n*) am__dry=yes; break;; \
++          esac; \
++        done;; \
++    esac; \
++    test $$am__dry = yes; \
++  }
+ pkgdatadir = $(datadir)/@PACKAGE@
+ pkgincludedir = $(includedir)/@PACKAGE@
+ pkglibdir = $(libdir)/@PACKAGE@
+@@ -39,9 +55,10 @@ build_triplet = @build@
+ host_triplet = @host@
+ bin_PROGRAMS = ods-ksmutil$(EXEEXT) ods-kaspcheck$(EXEEXT)
+ subdir = enforcer/utils
+-DIST_COMMON = README $(am__dist_opendnssecdata_DATA_DIST) \
+-	$(srcdir)/Makefile.am $(srcdir)/Makefile.in \
+-	$(srcdir)/ods-kaspcheck.1.in $(srcdir)/ods-ksmutil.1.in
++DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \
++	$(srcdir)/ods-kaspcheck.1.in $(srcdir)/ods-ksmutil.1.in \
++	$(top_srcdir)/depcomp $(am__dist_opendnssecdata_DATA_DIST) \
++	README
+ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+ am__aclocal_m4_deps = $(top_srcdir)/m4/acx_broken_setres.m4 \
+ 	$(top_srcdir)/m4/acx_check_strptime.m4 \
+@@ -77,24 +94,54 @@ PROGRAMS = $(bin_PROGRAMS)
+ am_ods_kaspcheck_OBJECTS = kaspcheck.$(OBJEXT) kc_helper.$(OBJEXT)
+ ods_kaspcheck_OBJECTS = $(am_ods_kaspcheck_OBJECTS)
+ ods_kaspcheck_DEPENDENCIES = $(LIBHSM) $(LIBCOMPAT)
++AM_V_lt = $(am__v_lt_@AM_V@)
++am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@)
++am__v_lt_0 = --silent
++am__v_lt_1 = 
+ am_ods_ksmutil_OBJECTS = ksmutil.$(OBJEXT)
+ ods_ksmutil_OBJECTS = $(am_ods_ksmutil_OBJECTS)
+ ods_ksmutil_DEPENDENCIES = $(LIBKSM) $(LIBHSM) $(LIBCOMPAT)
++AM_V_P = $(am__v_P_@AM_V@)
++am__v_P_ = $(am__v_P_@AM_DEFAULT_V@)
++am__v_P_0 = false
++am__v_P_1 = :
++AM_V_GEN = $(am__v_GEN_@AM_V@)
++am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@)
++am__v_GEN_0 = @echo "  GEN     " $@;
++am__v_GEN_1 = 
++AM_V_at = $(am__v_at_@AM_V@)
++am__v_at_ = $(am__v_at_@AM_DEFAULT_V@)
++am__v_at_0 = @
++am__v_at_1 = 
+ DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)/common
+ depcomp = $(SHELL) $(top_srcdir)/depcomp
+ am__depfiles_maybe = depfiles
+ am__mv = mv -f
+ COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
+ 	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+-LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+-	--mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+-	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
++LTCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
++	$(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) \
++	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
++	$(AM_CFLAGS) $(CFLAGS)
++AM_V_CC = $(am__v_CC_@AM_V@)
++am__v_CC_ = $(am__v_CC_@AM_DEFAULT_V@)
++am__v_CC_0 = @echo "  CC      " $@;
++am__v_CC_1 = 
+ CCLD = $(CC)
+-LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+-	--mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \
+-	$(LDFLAGS) -o $@
++LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
++	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
++	$(AM_LDFLAGS) $(LDFLAGS) -o $@
++AM_V_CCLD = $(am__v_CCLD_@AM_V@)
++am__v_CCLD_ = $(am__v_CCLD_@AM_DEFAULT_V@)
++am__v_CCLD_0 = @echo "  CCLD    " $@;
++am__v_CCLD_1 = 
+ SOURCES = $(ods_kaspcheck_SOURCES) $(ods_ksmutil_SOURCES)
+ DIST_SOURCES = $(ods_kaspcheck_SOURCES) $(ods_ksmutil_SOURCES)
++am__can_run_installinfo = \
++  case $$AM_UPDATE_INFO_DIR in \
++    n|no|NO) false;; \
++    *) (install-info --version) >/dev/null 2>&1;; \
++  esac
+ am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
+ am__vpath_adj = case $$p in \
+     $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
+@@ -128,11 +175,29 @@ MANS = $(man1_MANS)
+ am__dist_opendnssecdata_DATA_DIST = database_create.sqlite3 \
+ 	database_create.mysql
+ DATA = $(dist_opendnssecdata_DATA)
++am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
++# Read a list of newline-separated strings from the standard input,
++# and print each of them once, without duplicates.  Input order is
++# *not* preserved.
++am__uniquify_input = $(AWK) '\
++  BEGIN { nonempty = 0; } \
++  { items[$$0] = 1; nonempty = 1; } \
++  END { if (nonempty) { for (i in items) print i; }; } \
++'
++# Make sure the list of sources is unique.  This is necessary because,
++# e.g., the same source file might be shared among _SOURCES variables
++# for different programs/libraries.
++am__define_uniq_tagged_files = \
++  list='$(am__tagged_files)'; \
++  unique=`for i in $$list; do \
++    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
++  done | $(am__uniquify_input)`
+ ETAGS = etags
+ CTAGS = ctags
+ DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+ ACLOCAL = @ACLOCAL@
+ AMTAR = @AMTAR@
++AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
+ AR = @AR@
+ AUTOCONF = @AUTOCONF@
+ AUTOHEADER = @AUTOHEADER@
+@@ -400,14 +465,19 @@ ods-ksmutil.1: $(top_builddir)/config.st
+ 	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
+ install-binPROGRAMS: $(bin_PROGRAMS)
+ 	@$(NORMAL_INSTALL)
+-	test -z "$(bindir)" || $(MKDIR_P) "$(DESTDIR)$(bindir)"
+ 	@list='$(bin_PROGRAMS)'; test -n "$(bindir)" || list=; \
++	if test -n "$$list"; then \
++	  echo " $(MKDIR_P) '$(DESTDIR)$(bindir)'"; \
++	  $(MKDIR_P) "$(DESTDIR)$(bindir)" || exit 1; \
++	fi; \
+ 	for p in $$list; do echo "$$p $$p"; done | \
+ 	sed 's/$(EXEEXT)$$//' | \
+-	while read p p1; do if test -f $$p || test -f $$p1; \
+-	  then echo "$$p"; echo "$$p"; else :; fi; \
++	while read p p1; do if test -f $$p \
++	 || test -f $$p1 \
++	  ; then echo "$$p"; echo "$$p"; else :; fi; \
+ 	done | \
+-	sed -e 'p;s,.*/,,;n;h' -e 's|.*|.|' \
++	sed -e 'p;s,.*/,,;n;h' \
++	    -e 's|.*|.|' \
+ 	    -e 'p;x;s,.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/' | \
+ 	sed 'N;N;N;s,\n, ,g' | \
+ 	$(AWK) 'BEGIN { files["."] = ""; dirs["."] = 1 } \
+@@ -428,7 +498,8 @@ uninstall-binPROGRAMS:
+ 	@list='$(bin_PROGRAMS)'; test -n "$(bindir)" || list=; \
+ 	files=`for p in $$list; do echo "$$p"; done | \
+ 	  sed -e 'h;s,^.*/,,;s/$(EXEEXT)$$//;$(transform)' \
+-	      -e 's/$$/$(EXEEXT)/' `; \
++	      -e 's/$$/$(EXEEXT)/' \
++	`; \
+ 	test -n "$$list" || exit 0; \
+ 	echo " ( cd '$(DESTDIR)$(bindir)' && rm -f" $$files ")"; \
+ 	cd "$(DESTDIR)$(bindir)" && rm -f $$files
+@@ -443,10 +514,10 @@ clean-binPROGRAMS:
+ 	rm -f $$list
+ ods-kaspcheck$(EXEEXT): $(ods_kaspcheck_OBJECTS) $(ods_kaspcheck_DEPENDENCIES) $(EXTRA_ods_kaspcheck_DEPENDENCIES) 
+ 	@rm -f ods-kaspcheck$(EXEEXT)
+-	$(LINK) $(ods_kaspcheck_OBJECTS) $(ods_kaspcheck_LDADD) $(LIBS)
++	$(AM_V_CCLD)$(LINK) $(ods_kaspcheck_OBJECTS) $(ods_kaspcheck_LDADD) $(LIBS)
+ ods-ksmutil$(EXEEXT): $(ods_ksmutil_OBJECTS) $(ods_ksmutil_DEPENDENCIES) $(EXTRA_ods_ksmutil_DEPENDENCIES) 
+ 	@rm -f ods-ksmutil$(EXEEXT)
+-	$(LINK) $(ods_ksmutil_OBJECTS) $(ods_ksmutil_LDADD) $(LIBS)
++	$(AM_V_CCLD)$(LINK) $(ods_ksmutil_OBJECTS) $(ods_ksmutil_LDADD) $(LIBS)
+ 
+ mostlyclean-compile:
+ 	-rm -f *.$(OBJEXT)
+@@ -459,25 +530,25 @@ distclean-compile:
+ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ksmutil.Po@am__quote@
+ 
+ .c.o:
+-@am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+-@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
++@am__fastdepCC_TRUE@	$(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
++@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
++@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+-@am__fastdepCC_FALSE@	$(COMPILE) -c $<
++@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(COMPILE) -c $<
+ 
+ .c.obj:
+-@am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
+-@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
++@am__fastdepCC_TRUE@	$(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
++@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
++@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+-@am__fastdepCC_FALSE@	$(COMPILE) -c `$(CYGPATH_W) '$<'`
++@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(COMPILE) -c `$(CYGPATH_W) '$<'`
+ 
+ .c.lo:
+-@am__fastdepCC_TRUE@	$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+-@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
+-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
++@am__fastdepCC_TRUE@	$(AM_V_CC)$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
++@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
++@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+-@am__fastdepCC_FALSE@	$(LTCOMPILE) -c -o $@ $<
++@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LTCOMPILE) -c -o $@ $<
+ 
+ mostlyclean-libtool:
+ 	-rm -f *.lo
+@@ -486,9 +557,18 @@ clean-libtool:
+ 	-rm -rf .libs _libs
+ install-man1: $(man1_MANS)
+ 	@$(NORMAL_INSTALL)
+-	test -z "$(man1dir)" || $(MKDIR_P) "$(DESTDIR)$(man1dir)"
+-	@list='$(man1_MANS)'; test -n "$(man1dir)" || exit 0; \
+-	{ for i in $$list; do echo "$$i"; done; \
++	@list1='$(man1_MANS)'; \
++	list2=''; \
++	test -n "$(man1dir)" \
++	  && test -n "`echo $$list1$$list2`" \
++	  || exit 0; \
++	echo " $(MKDIR_P) '$(DESTDIR)$(man1dir)'"; \
++	$(MKDIR_P) "$(DESTDIR)$(man1dir)" || exit 1; \
++	{ for i in $$list1; do echo "$$i"; done;  \
++	if test -n "$$list2"; then \
++	  for i in $$list2; do echo "$$i"; done \
++	    | sed -n '/\.1[a-z]*$$/p'; \
++	fi; \
+ 	} | while read p; do \
+ 	  if test -f $$p; then d=; else d="$(srcdir)/"; fi; \
+ 	  echo "$$d$$p"; echo "$$p"; \
+@@ -518,8 +598,11 @@ uninstall-man1:
+ 	dir='$(DESTDIR)$(man1dir)'; $(am__uninstall_files_from_dir)
+ install-dist_opendnssecdataDATA: $(dist_opendnssecdata_DATA)
+ 	@$(NORMAL_INSTALL)
+-	test -z "$(opendnssecdatadir)" || $(MKDIR_P) "$(DESTDIR)$(opendnssecdatadir)"
+ 	@list='$(dist_opendnssecdata_DATA)'; test -n "$(opendnssecdatadir)" || list=; \
++	if test -n "$$list"; then \
++	  echo " $(MKDIR_P) '$(DESTDIR)$(opendnssecdatadir)'"; \
++	  $(MKDIR_P) "$(DESTDIR)$(opendnssecdatadir)" || exit 1; \
++	fi; \
+ 	for p in $$list; do \
+ 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+ 	  echo "$$d$$p"; \
+@@ -535,26 +618,15 @@ uninstall-dist_opendnssecdataDATA:
+ 	files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
+ 	dir='$(DESTDIR)$(opendnssecdatadir)'; $(am__uninstall_files_from_dir)
+ 
+-ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
+-	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
+-	unique=`for i in $$list; do \
+-	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+-	  done | \
+-	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+-	      END { if (nonempty) { for (i in files) print i; }; }'`; \
+-	mkid -fID $$unique
+-tags: TAGS
++ID: $(am__tagged_files)
++	$(am__define_uniq_tagged_files); mkid -fID $$unique
++tags: tags-am
++TAGS: tags
+ 
+-TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
+-		$(TAGS_FILES) $(LISP)
++tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
+ 	set x; \
+ 	here=`pwd`; \
+-	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
+-	unique=`for i in $$list; do \
+-	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+-	  done | \
+-	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+-	      END { if (nonempty) { for (i in files) print i; }; }'`; \
++	$(am__define_uniq_tagged_files); \
+ 	shift; \
+ 	if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
+ 	  test -n "$$unique" || unique=$$empty_fix; \
+@@ -566,15 +638,11 @@ TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEP
+ 	      $$unique; \
+ 	  fi; \
+ 	fi
+-ctags: CTAGS
+-CTAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
+-		$(TAGS_FILES) $(LISP)
+-	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
+-	unique=`for i in $$list; do \
+-	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+-	  done | \
+-	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+-	      END { if (nonempty) { for (i in files) print i; }; }'`; \
++ctags: ctags-am
++
++CTAGS: ctags
++ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
++	$(am__define_uniq_tagged_files); \
+ 	test -z "$(CTAGS_ARGS)$$unique" \
+ 	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
+ 	     $$unique
+@@ -583,24 +651,26 @@ GTAGS:
+ 	here=`$(am__cd) $(top_builddir) && pwd` \
+ 	  && $(am__cd) $(top_srcdir) \
+ 	  && gtags -i $(GTAGS_ARGS) "$$here"
++cscopelist: cscopelist-am
++
++cscopelist-am: $(am__tagged_files)
++	list='$(am__tagged_files)'; \
++	case "$(srcdir)" in \
++	  [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \
++	  *) sdir=$(subdir)/$(srcdir) ;; \
++	esac; \
++	for i in $$list; do \
++	  if test -f "$$i"; then \
++	    echo "$(subdir)/$$i"; \
++	  else \
++	    echo "$$sdir/$$i"; \
++	  fi; \
++	done >> $(top_builddir)/cscope.files
+ 
+ distclean-tags:
+ 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
+ 
+ distdir: $(DISTFILES)
+-	@list='$(MANS)'; if test -n "$$list"; then \
+-	  list=`for p in $$list; do \
+-	    if test -f $$p; then d=; else d="$(srcdir)/"; fi; \
+-	    if test -f "$$d$$p"; then echo "$$d$$p"; else :; fi; done`; \
+-	  if test -n "$$list" && \
+-	    grep 'ab help2man is required to generate this page' $$list >/dev/null; then \
+-	    echo "error: found man pages containing the \`missing help2man' replacement text:" >&2; \
+-	    grep -l 'ab help2man is required to generate this page' $$list | sed 's/^/         /' >&2; \
+-	    echo "       to fix them, install help2man, remove and regenerate the man pages;" >&2; \
+-	    echo "       typically \`make maintainer-clean' will remove them" >&2; \
+-	    exit 1; \
+-	  else :; fi; \
+-	else :; fi
+ 	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+ 	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+ 	list='$(DISTFILES)'; \
+@@ -690,7 +760,8 @@ info: info-am
+ 
+ info-am:
+ 
+-install-data-am: install-dist_opendnssecdataDATA install-man
++install-data-am: install-data-local install-dist_opendnssecdataDATA \
++	install-man
+ 
+ install-dvi: install-dvi-am
+ 
+@@ -743,11 +814,12 @@ uninstall-man: uninstall-man1
+ 
+ .MAKE: install-am install-strip
+ 
+-.PHONY: CTAGS GTAGS all all-am check check-am clean clean-binPROGRAMS \
+-	clean-generic clean-libtool ctags distclean distclean-compile \
+-	distclean-generic distclean-libtool distclean-tags distdir dvi \
+-	dvi-am html html-am info info-am install install-am \
+-	install-binPROGRAMS install-data install-data-am \
++.PHONY: CTAGS GTAGS TAGS all all-am check check-am clean \
++	clean-binPROGRAMS clean-generic clean-libtool cscopelist-am \
++	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 \
++	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 \
+ 	install-info install-info-am install-man install-man1 \
+@@ -755,11 +827,17 @@ uninstall-man: uninstall-man1
+ 	install-strip installcheck installcheck-am installdirs \
+ 	maintainer-clean maintainer-clean-generic mostlyclean \
+ 	mostlyclean-compile mostlyclean-generic mostlyclean-libtool \
+-	pdf pdf-am ps ps-am tags uninstall uninstall-am \
++	pdf pdf-am ps ps-am tags tags-am uninstall uninstall-am \
+ 	uninstall-binPROGRAMS uninstall-dist_opendnssecdataDATA \
+ 	uninstall-man uninstall-man1
+ 
+ 
++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: