- Update to 1.3.4

PR:		163080
Submitted by:	Jaap Akkerhuis <jaap@NLnetLabs.nl> (maintainer)

4 files changed, 34 insertions, 25 deletions

diff --git a/dns/opendnssec/Makefile b/dns/opendnssec/Makefile
index 7af00699f042..75a5c8d30e31 100644
--- a/dns/opendnssec/Makefile
+++ b/dns/opendnssec/Makefile
@@ -6,33 +6,30 @@
 #
 
 PORTNAME=	opendnssec
-PORTVERSION=	1.3.2
-PORTREVISION=	2
+PORTVERSION=	1.3.4
 CATEGORIES=	dns
 MASTER_SITES=	http://www.opendnssec.org/files/source/
 
 MAINTAINER=	jaap@NLnetLabs.nl
 COMMENT=	Tool suite for maintaining DNSSEC
 
-BUILD_DEPENDS=	ldns>=1.6.9:${PORTSDIR}/dns/ldns \
-		rubygem-dnsruby>=1.52:${PORTSDIR}/dns/rubygem-dnsruby
+BUILD_DEPENDS=	ldns>=1.6.9:${PORTSDIR}/dns/ldns
 LIB_DEPENDS=	ldns:${PORTSDIR}/dns/ldns
 
 GNU_CONFIGURE=	yes
 USE_RC_SUBR=	opendnssec
 USE_GNOME=	libxml2
-USE_OPENSSL=	yes
 USE_PERL5=	yes
-USE_RUBY=	yes
+USE_OPENSSL=	yes
 USE_LDCONFIG=	yes
 
-MAN1=		ods-auditor.1 ods-hsmspeed.1 ods-hsmutil.1 ods-kaspcheck.1 \
-		ods-ksmutil.1
+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=	SOFTHSM "Build/update SOFTHSM as well." Off \
+		AUDITOR "Build with Auditor." On \
 		MYSQL "Use with (experimental) MYSQL support" Off
 
 .include <bsd.port.options.mk>
@@ -40,7 +37,8 @@ OPTIONS=	SOFTHSM "Build/update SOFTHSM as well." Off \
 .if defined(WITH_MYSQL)
 CONFIGURE_ARGS+=	--with-mysql=${LOCALBASE}
 CONFIGURE_ARGS+=	--with-database-backend=mysql
-BUILD_DEPENDS+=	mysql-client>=5.0.3:${PORTSDIR}/databases/mysql50-client
+USE_MYSQL=	compat
+IGNORE_WITH_MYSQL=	323 40 41
 PLIST_SUB+=	SQLITE="@comment "
 PLIST_SUB+=	MYSQL=""
 .else
@@ -50,6 +48,16 @@ PLIST_SUB+=	SQLITE=""
 PLIST_SUB+=	MYSQL="@comment "
 .endif
 
+.if defined(WITH_AUDITOR)
+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 defined(WITH_SOFTHSM)
 CONFIGURE_ARGS+=	--with-softhsm
 CONFIGURE_ARGS+=	--with-pkcs11-softhsm=${LOCALBASE}/lib/libsofthsm.so
@@ -64,7 +72,7 @@ post-install:
 .endif
 
 .include <bsd.port.pre.mk>
-.if ${RUBY_VER} == 1.9
+.if defined(WITH_AUDITOR) && ${RUBY_VER} == 1.9
 BROKEN=	does not work with ruby 1.9
 .endif
 .include <bsd.port.post.mk>
diff --git a/dns/opendnssec/distinfo b/dns/opendnssec/distinfo
index fd3d02d1f1f8..4ceb3bb6520d 100644
--- a/dns/opendnssec/distinfo
+++ b/dns/opendnssec/distinfo
@@ -1,2 +1,2 @@
-SHA256 (opendnssec-1.3.2.tar.gz) = bcd23830445cafa1efd49acfd6aabcfa1835fc1942a67235a7db876c2f300953
-SIZE (opendnssec-1.3.2.tar.gz) = 1078647
+SHA256 (opendnssec-1.3.4.tar.gz) = 2c64f43e17afdd5b68cc003bbc51678acf6d09c75c208e820ea933f2eac61818
+SIZE (opendnssec-1.3.4.tar.gz) = 1081248
diff --git a/dns/opendnssec/files/opendnssec.in b/dns/opendnssec/files/opendnssec.in
index 6785224c086c..9fedbd161f99 100644
--- a/dns/opendnssec/files/opendnssec.in
+++ b/dns/opendnssec/files/opendnssec.in
@@ -4,6 +4,7 @@
 #
 # PROVIDE: opendnssec
 # REQUIRE: LOGIN
+# REQUIRE: DAEMON
 # KEYWORD: shutdown
 #
 # Add the following line to /etc/rc.conf to enable opendnssec:
diff --git a/dns/opendnssec/pkg-plist b/dns/opendnssec/pkg-plist
index 982357db2491..1924745c96ce 100644
--- a/dns/opendnssec/pkg-plist
+++ b/dns/opendnssec/pkg-plist
@@ -1,24 +1,24 @@
-bin/ods-auditor
+%%AUDITOR%%bin/ods-auditor
 bin/ods-hsmspeed
 bin/ods-hsmutil
 bin/ods-ksmutil
-bin/ods-kaspcheck
+%%AUDITOR%%bin/ods-kaspcheck
 bin/ods-kasp2html
 %%ETCDIR%%/conf.xml.sample
 %%ETCDIR%%/kasp.xml.sample
 %%ETCDIR%%/zonefetch.xml.sample
 %%ETCDIR%%/zonelist.xml.sample
-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/preparser.rb
-lib/opendnssec/kasp_auditor.rb
-lib/opendnssec/kasp_auditor/partial_auditor.rb
-lib/opendnssec/kasp_checker.rb
-lib/opendnssec/time_shift.rb
+%%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