zkt 1.1 -- 30. Jan 2012

* misc  Release numbering changed to three level "major.minor.revison" scheme
* bug   REMOVE_HOLD_TIME was set to 10 days only (Thanks to Chris Thompson)
* doc   Improved README file (Thanks to Jan-Piet Mens)
* misc  Fix of some typos in log messages
* bug   Fixed error in rollover.c (return code of genfirstkey() wasn't checked)
* misc  Default of KeySetDir changed from NULL to ".." (best for hierarchical mode)
        Default Sig Lifetime changed from 10 days to 3 weeks (21 days)
        Default ZSK lifetime changed from 3 months to 4 times the sig lifetime
        Default KSK lifetime changed from 1 year to 2 years
        Parameter checks in checkconfig() adapted.
        KSK random device changed back from /dev/urandom to BIND default
        (Be aware of some possibly long delay in key generation)
* func  New configure option to set the bind utility path manually (--enable-bindutil_path)
        BIND_UTIL_PATH in config_zkt.h will no longer used
* bug   If nsec3 is turned on and KeyAlgo (or AddKeyAlgo) is RSHASHA1
        or DSA, genkey() uses algorithm type NSECRSASHA1 or NSEC3DSA instead.
* bug   Error in printconfigdiff() fixed. (Thanks to Holger Wirtz)
* func  Description added to (some of the) dnssec.conf parameters
* func  Adding a patch from Hrant Dadivanyan to always pre-publish ZSKs
* misc  Config file syntax changed to parameter names without underscores.
        zkt-conf uses ZKT_VERSION string as config version
* bug   "make install-man" now installs all man page
* bug   Bug fixed in zfparse.c. zkt-conf was unable to detect an already
        included dnskey.db file if another file was included.
* misc  destination dnssec-zkt removed from Makefile.in
* func  dki_prt_managedkeys() added to dki.c
        zkt_list_managedkeys() added to zkt.c
        zkt-ls has new option -M to print out a list of managed-keys
* bug   Bug fixed in the config parser (zconf.c). Couldn't parse
        agorithm RSASHA512 correctly (Thanks to Michael Sinatra)

3 files changed, 9 insertions, 20 deletions

diff --git a/security/zkt/Makefile b/security/zkt/Makefile
index 4521242409c..2b7fb6cb1ea 100644
--- a/security/zkt/Makefile
+++ b/security/zkt/Makefile
@@ -1,13 +1,12 @@
-# $NetBSD: Makefile,v 1.3 2011/12/17 23:43:43 sbd Exp $
+# $NetBSD: Makefile,v 1.4 2012/06/16 22:55:25 pettai Exp $
 #
 
-DISTNAME=	zkt-1.0
-PKGREVISION=	1
+DISTNAME=	zkt-1.1.0
 CATEGORIES=	security
-MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=zkt/}
+MASTER_SITES=	http://www.hznet.de/dns/zkt/
 
 MAINTAINER=	pettai@NetBSD.org
-HOMEPAGE=	http://zkt.sourceforge.net/
+HOMEPAGE=	http://www.hznet.de/dns/zkt/
 COMMENT=	DNSSEC Zone Key Tool
 LICENSE=	original-bsd
 
@@ -20,8 +19,6 @@ CONFIGURE_ARGS+=	--enable-configpath=${PKG_SYSCONFDIR}/zkt
 INSTALLATION_DIRS=	sbin share/doc/zkt ${PKGMANDIR}/man8 etc/zkt
 
 do-install:
-	${INSTALL_PROGRAM} ${WRKSRC}/dnssec-zkt \
-		${DESTDIR}${PREFIX}/sbin/dnssec-zkt
 	${INSTALL_PROGRAM} ${WRKSRC}/zkt-conf \
 		${DESTDIR}${PREFIX}/sbin/zkt-conf
 	${INSTALL_PROGRAM} ${WRKSRC}/zkt-keyman \
@@ -30,12 +27,8 @@ do-install:
 		${DESTDIR}${PREFIX}/sbin/zkt-ls
 	${INSTALL_PROGRAM} ${WRKSRC}/zkt-signer \
 		${DESTDIR}${PREFIX}/sbin/zkt-signer
-	${LN} -f ${DESTDIR}${PREFIX}/sbin/zkt-signer \
-		${DESTDIR}${PREFIX}/sbin/dnssec-signer
 	${INSTALL_PROGRAM} ${WRKSRC}/zkt-soaserial \
 		${DESTDIR}${PREFIX}/sbin/zkt-soaserial
-	${INSTALL_MAN} ${WRKSRC}/man/dnssec-zkt.8 \
-		${DESTDIR}${PREFIX}/${PKGMANDIR}/man8/dnssec-zkt.8
 	${INSTALL_MAN} ${WRKSRC}/man/zkt-conf.8 \
 		${DESTDIR}${PREFIX}/${PKGMANDIR}/man8/zkt-conf.8
 	${INSTALL_MAN} ${WRKSRC}/man/zkt-ls.8 \
@@ -49,6 +42,5 @@ do-install:
 	${INSTALL_DATA} ${WRKSRC}/README.logging \
 		${DESTDIR}${PREFIX}/share/doc/zkt/README.logging
 
-#.include "../../net/bind96/buildlink3.mk"
 .include "../../mk/curses.buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/security/zkt/PLIST b/security/zkt/PLIST
index 54c1f5ff96c..8249a454ab8 100644
--- a/security/zkt/PLIST
+++ b/security/zkt/PLIST
@@ -1,15 +1,12 @@
-@comment $NetBSD: PLIST,v 1.2 2011/03/12 16:46:05 pettai Exp $
-man/man8/dnssec-zkt.8
+@comment $NetBSD: PLIST,v 1.3 2012/06/16 22:55:26 pettai Exp $
 man/man8/zkt-conf.8
 man/man8/zkt-keyman.8
 man/man8/zkt-ls.8
 man/man8/zkt-signer.8
-sbin/dnssec-zkt
 sbin/zkt-conf
 sbin/zkt-keyman
 sbin/zkt-ls
 sbin/zkt-signer
-sbin/dnssec-signer
 sbin/zkt-soaserial
 share/doc/zkt/README
 share/doc/zkt/README.logging
diff --git a/security/zkt/distinfo b/security/zkt/distinfo
index 5ddc163f88a..63d6710cbf6 100644
--- a/security/zkt/distinfo
+++ b/security/zkt/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.2 2011/03/12 16:46:05 pettai Exp $
+$NetBSD: distinfo,v 1.3 2012/06/16 22:55:26 pettai Exp $
 
-SHA1 (zkt-1.0.tar.gz) = c4ecf607854943dab9cb05478b5b4a09cfec0acc
-RMD160 (zkt-1.0.tar.gz) = 9a52acd41ac136907f0050bd4258fb2040e40adc
-Size (zkt-1.0.tar.gz) = 331260 bytes
+SHA1 (zkt-1.1.0.tar.gz) = 3adbeba2547f971259c3e07fa4b8166daa3bf353
+RMD160 (zkt-1.1.0.tar.gz) = 35629aa8bd31bc061f60f14abe3bf94b19041b4b
+Size (zkt-1.1.0.tar.gz) = 343811 bytes