9 files changed, 215 insertions, 44 deletions

diff --git a/dns/Makefile b/dns/Makefile
index efd748c49dc4..602ea2d936b1 100644
--- a/dns/Makefile
+++ b/dns/Makefile
@@ -80,6 +80,7 @@
     SUBDIR += odsclient
     SUBDIR += opendd
     SUBDIR += opendnssec
+    SUBDIR += opendnssec13
     SUBDIR += openresolv
     SUBDIR += p5-BIND-Conf_Parser
     SUBDIR += p5-BIND-Config-Parser
diff --git a/dns/opendnssec/Makefile b/dns/opendnssec/Makefile
index 8b9411602c46..846fe6d7194f 100644
--- a/dns/opendnssec/Makefile
+++ b/dns/opendnssec/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	opendnssec
-PORTVERSION=	1.3.13
+PORTVERSION=	1.4.0
 CATEGORIES=	dns
 MASTER_SITES=	http://dist.opendnssec.org/source/
 
@@ -19,18 +19,21 @@ USE_PERL5=	yes
 USE_OPENSSL=	yes
 USE_LDCONFIG=	yes
 
-USERS=		${PORTNAME}
-GROUPS=		${PORTNAME}
+CONFLICTS=	opendnssec-1.[0-3]*
 
-MAN1=		ods-hsmspeed.1 ods-hsmutil.1 ods-ksmutil.1
+USERS=		opendnssec
+GROUPS=		opendnssec
+
+MAN1=		ods-hsmspeed.1 ods-hsmutil.1 ods-ksmutil.1 ods-kaspcheck.1
 MAN5=		ods-timing.5
 MAN7=		opendnssec.7
 MAN8=		ods-control.8 ods-enforcerd.8 ods-signer.8 ods-signerd.8
 
-OPTIONS_DEFINE=		SOFTHSM AUDITOR MYSQL
-SOFTHSM_DESC=		Build/update SOFTHSM as well
-AUDITOR_DESC=		Build with Auditor
-OPTIONS_DEFAULT=	AUDITOR
+PORTDOCS=	KNOWN_ISSUES MIGRATION NEWS README
+
+OPTIONS_DEFINE=		SOFTHSM MYSQL
+SOFTHSM_DESC=		SoftHSM cryptographic store for PKCS \#11 interface
+OPTIONS_DEFAULT=	MYSQL
 
 .include <bsd.port.options.mk>
 
@@ -40,21 +43,15 @@ CONFIGURE_ARGS+=	--with-database-backend=mysql
 USE_MYSQL=	compat
 PLIST_SUB+=	SQLITE="@comment "
 PLIST_SUB+=	MYSQL=""
+PORTDATA=	migrate_adapters_1.mysql migrate_keyshare_mysql.pl \
+		migrate_zone_delete.mysql migrate_id_mysql.pl migrate_to_ng_mysql.pl
 .else
 BUILD_DEPENDS+=	sqlite3>=3.3.9:${PORTSDIR}/databases/sqlite3
 LIB_DEPENDS+=	sqlite3:${PORTSDIR}/databases/sqlite3
 PLIST_SUB+=	SQLITE=""
 PLIST_SUB+=	MYSQL="@comment "
-.endif
-
-.if ${PORT_OPTIONS:MAUDITOR}
-BUILD_DEPENDS+=	rubygem-dnsruby>=1.53:${PORTSDIR}/dns/rubygem-dnsruby
-USE_RUBY=	yes
-PLIST_SUB+=	AUDITOR=""
-MAN1+=		ods-auditor.1 ods-kaspcheck.1
-.else
-CONFIGURE_ARGS+=	--disable-auditor
-PLIST_SUB+=	AUDITOR="@comment "
+PORTDATA=	database_create.sqlite3 migrate_keyshare_sqlite3.pl \
+		migrate_adapters_1.sqlite3 migrate_to_ng_sqlite.pl
 .endif
 
 .if ${PORT_OPTIONS:MSOFTHSM}
@@ -71,13 +68,14 @@ pre-install:
 .endif
 
 post-install:
+.if ${PORT_OPTIONS:MDOCS}
+	@${MKDIR} ${DOCSDIR}
+	${INSTALL_DATA} ${PORTDOCS:S|^|${WRKSRC}/|} ${DOCSDIR}
+.endif
 .if !defined(BATCH)
 	@${CAT} ${PKGMESSAGE}
 .endif
+	${INSTALL_DATA} ${PORTDATA:S|^|${WRKSRC}/enforcer/utils/|} ${DATADIR}
 	${CHOWN} -R ${USERS}:${GROUPS} ${PREFIX}/var/opendnssec
 
-.include <bsd.port.pre.mk>
-.if ${PORT_OPTIONS:MAUDITOR} && ${RUBY_VER} == 1.9
-BROKEN=	does not work with ruby 1.9
-.endif
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/dns/opendnssec/distinfo b/dns/opendnssec/distinfo
index 2c302651717e..a9d55ab984c3 100644
--- a/dns/opendnssec/distinfo
+++ b/dns/opendnssec/distinfo
@@ -1,2 +1,2 @@
-SHA256 (opendnssec-1.3.13.tar.gz) = 4d587882ffc68bca56d96807592366d1a87147d0b8aa518ccfd85b694c889a3f
-SIZE (opendnssec-1.3.13.tar.gz) = 1156072
+SHA256 (opendnssec-1.4.0.tar.gz) = 36d4926dcdf351a527ad7600b151ab6cc56d0a472a7eb8871eecd70afef9e101
+SIZE (opendnssec-1.4.0.tar.gz) = 985512
diff --git a/dns/opendnssec/pkg-plist b/dns/opendnssec/pkg-plist
index b774565b6295..d33aa392ed2b 100644
--- a/dns/opendnssec/pkg-plist
+++ b/dns/opendnssec/pkg-plist
@@ -1,43 +1,33 @@
-%%AUDITOR%%bin/ods-auditor
 bin/ods-hsmspeed
 bin/ods-hsmutil
+bin/ods-kaspcheck
 bin/ods-ksmutil
-%%AUDITOR%%bin/ods-kaspcheck
 bin/ods-kasp2html
+@unexec if cmp -s %D/etc/opendnssec/addns.xml %D/etc/opendnssec/addns.xml.sample; then rm -f %D/etc/opendnssec/addns.xml; fi
+%%ETCDIR%%/addns.xml.sample
 @unexec if cmp -s %D/etc/opendnssec/conf.xml %D/etc/opendnssec/conf.xml.sample; then rm -f %D/etc/opendnssec/conf.xml; fi
 %%ETCDIR%%/conf.xml.sample
 @unexec if cmp -s %D/etc/opendnssec/kasp.xml %D/etc/opendnssec/kasp.xml.sample; then rm -f %D/etc/opendnssec/kasp.xml; fi
 %%ETCDIR%%/kasp.xml.sample
-@unexec if cmp -s %D/etc/opendnssec/zonefetch.xml %D/etc/opendnssec/zonefetch.xml.sample; then rm -f %D/etc/opendnssec/zonefetch.xml; fi
-%%ETCDIR%%/zonefetch.xml.sample
 @unexec if cmp -s %D/etc/opendnssec/zonelist.xml %D/etc/opendnssec/zonelist.xml.sample; then rm -f %D/etc/opendnssec/zonelist.xml; fi
 %%ETCDIR%%/zonelist.xml.sample
-%%AUDITOR%%lib/opendnssec/kasp_auditor/auditor.rb
-%%AUDITOR%%lib/opendnssec/kasp_auditor/changed_config.rb
-%%AUDITOR%%lib/opendnssec/kasp_auditor/commands.rb
-%%AUDITOR%%lib/opendnssec/kasp_auditor/config.rb
-%%AUDITOR%%lib/opendnssec/kasp_auditor/key_tracker.rb
-%%AUDITOR%%lib/opendnssec/kasp_auditor/parse.rb
-%%AUDITOR%%lib/opendnssec/kasp_auditor/preparser.rb
-%%AUDITOR%%lib/opendnssec/kasp_auditor.rb
-%%AUDITOR%%lib/opendnssec/kasp_auditor/partial_auditor.rb
-%%AUDITOR%%lib/opendnssec/kasp_checker.rb
-%%AUDITOR%%lib/opendnssec/time_shift.rb
 sbin/ods-control
 sbin/ods-enforcerd
 sbin/ods-signer
 sbin/ods-signerd
+%%DATADIR%%/addns.rnc
+%%DATADIR%%/addns.rng
 %%DATADIR%%/conf.rnc
 %%DATADIR%%/conf.rng
 %%SQLITE%%%%DATADIR%%/database_create.sqlite3
 %%MYSQL%%%%DATADIR%%/database_create.mysql
+%%DATADIR%%/enforcerstate.rnc
+%%DATADIR%%/enforcerstate.rng
 %%DATADIR%%/kasp.rnc
 %%DATADIR%%/kasp.rng
 %%DATADIR%%/kasp2html.xsl
 %%DATADIR%%/signconf.rnc
 %%DATADIR%%/signconf.rng
-%%DATADIR%%/zonefetch.rnc
-%%DATADIR%%/zonefetch.rng
 %%DATADIR%%/zonelist.rnc
 %%DATADIR%%/zonelist.rng
 @dirrm var/opendnssec/unsigned
@@ -46,8 +36,6 @@ sbin/ods-signerd
 @dirrm var/opendnssec/signconf
 @dirrm var/opendnssec
 @dirrm %%DATADIR%%
-@dirrm lib/opendnssec/kasp_auditor
-@dirrm lib/opendnssec
 @dirrm %%ETCDIR%%
 @exec mkdir -p %D/var/run/opendnssec
 @exec mkdir -p %D/var/opendnssec/unsigned
diff --git a/dns/opendnssec13/Makefile b/dns/opendnssec13/Makefile
new file mode 100644
index 000000000000..63f1b63f440c
--- /dev/null
+++ b/dns/opendnssec13/Makefile
@@ -0,0 +1,85 @@
+# Created by: Jaap Akkerhuis <jaap@NLnetLabs.nl>
+# $FreeBSD$
+
+PORTNAME=	opendnssec
+PORTVERSION=	1.3.13
+CATEGORIES=	dns
+MASTER_SITES=	http://dist.opendnssec.org/source/
+
+MAINTAINER=	jaap@NLnetLabs.nl
+COMMENT=	Tool suite for maintaining DNSSEC
+
+BUILD_DEPENDS=	ldns>=1.6.16:${PORTSDIR}/dns/ldns
+LIB_DEPENDS=	ldns:${PORTSDIR}/dns/ldns
+
+LATEST_LINK=	${PORTNAME}13
+
+GNU_CONFIGURE=	yes
+USE_RC_SUBR=	opendnssec
+USE_GNOME=	libxml2
+USE_PERL5=	yes
+USE_OPENSSL=	yes
+USE_LDCONFIG=	yes
+
+USERS=		${PORTNAME}
+GROUPS=		${PORTNAME}
+
+MAN1=		ods-hsmspeed.1 ods-hsmutil.1 ods-ksmutil.1
+MAN5=		ods-timing.5
+MAN7=		opendnssec.7
+MAN8=		ods-control.8 ods-enforcerd.8 ods-signer.8 ods-signerd.8
+
+OPTIONS_DEFINE=		SOFTHSM AUDITOR MYSQL
+SOFTHSM_DESC=		Build/update SOFTHSM as well
+AUDITOR_DESC=		Build with Auditor
+OPTIONS_DEFAULT=	AUDITOR
+
+.include <bsd.port.options.mk>
+
+.if ${PORT_OPTIONS:MMYSQL}
+CONFIGURE_ARGS+=	--with-mysql=${LOCALBASE}
+CONFIGURE_ARGS+=	--with-database-backend=mysql
+USE_MYSQL=	compat
+PLIST_SUB+=	SQLITE="@comment "
+PLIST_SUB+=	MYSQL=""
+.else
+BUILD_DEPENDS+=	sqlite3>=3.3.9:${PORTSDIR}/databases/sqlite3
+LIB_DEPENDS+=	sqlite3:${PORTSDIR}/databases/sqlite3
+PLIST_SUB+=	SQLITE=""
+PLIST_SUB+=	MYSQL="@comment "
+.endif
+
+.if ${PORT_OPTIONS:MAUDITOR}
+BUILD_DEPENDS+=	rubygem-dnsruby>=1.53:${PORTSDIR}/dns/rubygem-dnsruby
+USE_RUBY=	yes
+PLIST_SUB+=	AUDITOR=""
+MAN1+=		ods-auditor.1 ods-kaspcheck.1
+.else
+CONFIGURE_ARGS+=	--disable-auditor
+PLIST_SUB+=	AUDITOR="@comment "
+.endif
+
+.if ${PORT_OPTIONS:MSOFTHSM}
+CONFIGURE_ARGS+=	--with-softhsm
+CONFIGURE_ARGS+=	--with-pkcs11-softhsm=${LOCALBASE}/lib/libsofthsm.so
+RUN_DEPENDS+=	softhsm>=1.2.0:${PORTSDIR}/security/softhsm
+.endif
+
+PKGMESSAGE=	${WRKSRC}/MIGRATION
+
+pre-install:
+.if ${PORT_OPTIONS:MMYSQL}
+	@${REINPLACE_CMD} -e '/REQUIRE:/ s|$$| mysql|' ${WRKDIR}/opendnssec
+.endif
+
+post-install:
+.if !defined(BATCH)
+	@${CAT} ${PKGMESSAGE}
+.endif
+	${CHOWN} -R ${USERS}:${GROUPS} ${PREFIX}/var/opendnssec
+
+.include <bsd.port.pre.mk>
+.if ${PORT_OPTIONS:MAUDITOR} && ${RUBY_VER} == 1.9
+BROKEN=	does not work with ruby 1.9
+.endif
+.include <bsd.port.post.mk>
diff --git a/dns/opendnssec13/distinfo b/dns/opendnssec13/distinfo
new file mode 100644
index 000000000000..2c302651717e
--- /dev/null
+++ b/dns/opendnssec13/distinfo
@@ -0,0 +1,2 @@
+SHA256 (opendnssec-1.3.13.tar.gz) = 4d587882ffc68bca56d96807592366d1a87147d0b8aa518ccfd85b694c889a3f
+SIZE (opendnssec-1.3.13.tar.gz) = 1156072
diff --git a/dns/opendnssec13/files/opendnssec.in b/dns/opendnssec13/files/opendnssec.in
new file mode 100644
index 000000000000..63320707366d
--- /dev/null
+++ b/dns/opendnssec13/files/opendnssec.in
@@ -0,0 +1,33 @@
+#!/bin/sh
+
+# $FreeBSD$
+#
+# PROVIDE: opendnssec
+# REQUIRE: LOGIN DAEMON
+# KEYWORD: shutdown
+#
+# Add the following line to /etc/rc.conf to enable opendnssec:
+#
+# opendnssec_enable="YES"
+
+. /etc/rc.subr
+
+name=opendnssec
+rcvar=opendnssec_enable
+
+load_rc_config $name
+
+opendnssec_enable=${opendnssec_enable:-"NO"}
+
+start_cmd="${name}_run start"
+stop_cmd="${name}_run stop"
+extra_commands="reload ksm hsm signer enforcer"
+
+procname=${opendnssec_procname}
+
+opendnssec_run()
+{
+    %%PREFIX%%/sbin/ods-control $1
+}
+
+run_rc_command "$1"
diff --git a/dns/opendnssec13/pkg-descr b/dns/opendnssec13/pkg-descr
new file mode 100644
index 000000000000..147cc627fd96
--- /dev/null
+++ b/dns/opendnssec13/pkg-descr
@@ -0,0 +1,5 @@
+OpenDNSSEC was created as an open-source turn-key solution for
+DNSSEC. It secures zone data just before it is published in an
+authoritative name server.
+
+WWW: http://www.opendnssec.org
diff --git a/dns/opendnssec13/pkg-plist b/dns/opendnssec13/pkg-plist
new file mode 100644
index 000000000000..b774565b6295
--- /dev/null
+++ b/dns/opendnssec13/pkg-plist
@@ -0,0 +1,59 @@
+%%AUDITOR%%bin/ods-auditor
+bin/ods-hsmspeed
+bin/ods-hsmutil
+bin/ods-ksmutil
+%%AUDITOR%%bin/ods-kaspcheck
+bin/ods-kasp2html
+@unexec if cmp -s %D/etc/opendnssec/conf.xml %D/etc/opendnssec/conf.xml.sample; then rm -f %D/etc/opendnssec/conf.xml; fi
+%%ETCDIR%%/conf.xml.sample
+@unexec if cmp -s %D/etc/opendnssec/kasp.xml %D/etc/opendnssec/kasp.xml.sample; then rm -f %D/etc/opendnssec/kasp.xml; fi
+%%ETCDIR%%/kasp.xml.sample
+@unexec if cmp -s %D/etc/opendnssec/zonefetch.xml %D/etc/opendnssec/zonefetch.xml.sample; then rm -f %D/etc/opendnssec/zonefetch.xml; fi
+%%ETCDIR%%/zonefetch.xml.sample
+@unexec if cmp -s %D/etc/opendnssec/zonelist.xml %D/etc/opendnssec/zonelist.xml.sample; then rm -f %D/etc/opendnssec/zonelist.xml; fi
+%%ETCDIR%%/zonelist.xml.sample
+%%AUDITOR%%lib/opendnssec/kasp_auditor/auditor.rb
+%%AUDITOR%%lib/opendnssec/kasp_auditor/changed_config.rb
+%%AUDITOR%%lib/opendnssec/kasp_auditor/commands.rb
+%%AUDITOR%%lib/opendnssec/kasp_auditor/config.rb
+%%AUDITOR%%lib/opendnssec/kasp_auditor/key_tracker.rb
+%%AUDITOR%%lib/opendnssec/kasp_auditor/parse.rb
+%%AUDITOR%%lib/opendnssec/kasp_auditor/preparser.rb
+%%AUDITOR%%lib/opendnssec/kasp_auditor.rb
+%%AUDITOR%%lib/opendnssec/kasp_auditor/partial_auditor.rb
+%%AUDITOR%%lib/opendnssec/kasp_checker.rb
+%%AUDITOR%%lib/opendnssec/time_shift.rb
+sbin/ods-control
+sbin/ods-enforcerd
+sbin/ods-signer
+sbin/ods-signerd
+%%DATADIR%%/conf.rnc
+%%DATADIR%%/conf.rng
+%%SQLITE%%%%DATADIR%%/database_create.sqlite3
+%%MYSQL%%%%DATADIR%%/database_create.mysql
+%%DATADIR%%/kasp.rnc
+%%DATADIR%%/kasp.rng
+%%DATADIR%%/kasp2html.xsl
+%%DATADIR%%/signconf.rnc
+%%DATADIR%%/signconf.rng
+%%DATADIR%%/zonefetch.rnc
+%%DATADIR%%/zonefetch.rng
+%%DATADIR%%/zonelist.rnc
+%%DATADIR%%/zonelist.rng
+@dirrm var/opendnssec/unsigned
+@dirrm var/opendnssec/tmp
+@dirrm var/opendnssec/signed
+@dirrm var/opendnssec/signconf
+@dirrm var/opendnssec
+@dirrm %%DATADIR%%
+@dirrm lib/opendnssec/kasp_auditor
+@dirrm lib/opendnssec
+@dirrm %%ETCDIR%%
+@exec mkdir -p %D/var/run/opendnssec
+@exec mkdir -p %D/var/opendnssec/unsigned
+@exec mkdir -p %D/var/opendnssec/tmp
+@exec mkdir -p %D/var/opendnssec/signed
+@exec mkdir -p %D/var/opendnssec/signconf
+@dirrmtry var/run/opendnssec
+@dirrmtry var/run
+@dirrmtry var