Attachment 120299 Details for Bug 163080 – opendnssec-1.3.3.patch

[patch] opendnssec-1.3.3.patch

opendnssec-1.3.3.patch (text/plain), 5.11 KB, created by Jaap Akkerhuis on 2011-12-05 15:00:25 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Jaap Akkerhuis

Created: 2011-12-05 15:00:25 UTC

Size: 5.11 KB

patch

obsolete

>diff -ruN --exclude=CVS /space/portstrees/AFreeBSD/ports/dns/opendnssec.orig/Makefile /space/portstrees/AFreeBSD/ports/dns/opendnssec/Makefile
>--- /space/portstrees/AFreeBSD/ports/dns/opendnssec.orig/Makefile	2011-11-21 22:51:34.000000000 +0100
>+++ /space/portstrees/AFreeBSD/ports/dns/opendnssec/Makefile	2011-12-05 15:51:48.000000000 +0100
>@@ -6,33 +6,30 @@
> #
> 
> PORTNAME=	opendnssec
>-PORTVERSION=	1.3.2
>-PORTREVISION=	2
>+PORTVERSION=	1.3.3
> 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 @@
> .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+=	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 @@
> .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 -ruN --exclude=CVS /space/portstrees/AFreeBSD/ports/dns/opendnssec.orig/distinfo /space/portstrees/AFreeBSD/ports/dns/opendnssec/distinfo
>--- /space/portstrees/AFreeBSD/ports/dns/opendnssec.orig/distinfo	2011-11-21 22:51:34.000000000 +0100
>+++ /space/portstrees/AFreeBSD/ports/dns/opendnssec/distinfo	2011-11-20 18:32:59.000000000 +0100
>@@ -1,2 +1,2 @@
>-SHA256 (opendnssec-1.3.2.tar.gz) = bcd23830445cafa1efd49acfd6aabcfa1835fc1942a67235a7db876c2f300953
>-SIZE (opendnssec-1.3.2.tar.gz) = 1078647
>+SHA256 (opendnssec-1.3.3.tar.gz) = a51b1b5eeeba36b0d48ccd217892b910cdae31b0a3341c481c0c387781dcae53
>+SIZE (opendnssec-1.3.3.tar.gz) = 1081139
>diff -ruN --exclude=CVS /space/portstrees/AFreeBSD/ports/dns/opendnssec.orig/files/opendnssec.in /space/portstrees/AFreeBSD/ports/dns/opendnssec/files/opendnssec.in
>--- /space/portstrees/AFreeBSD/ports/dns/opendnssec.orig/files/opendnssec.in	2011-11-21 22:51:34.000000000 +0100
>+++ /space/portstrees/AFreeBSD/ports/dns/opendnssec/files/opendnssec.in	2011-11-23 10:45:06.000000000 +0100
>@@ -4,6 +4,7 @@
> #
> # PROVIDE: opendnssec
> # REQUIRE: LOGIN
>+# REQUIRE: DAEMON
> # KEYWORD: shutdown
> #
> # Add the following line to /etc/rc.conf to enable opendnssec:
>diff -ruN --exclude=CVS /space/portstrees/AFreeBSD/ports/dns/opendnssec.orig/pkg-plist /space/portstrees/AFreeBSD/ports/dns/opendnssec/pkg-plist
>--- /space/portstrees/AFreeBSD/ports/dns/opendnssec.orig/pkg-plist	2011-11-21 22:51:34.000000000 +0100
>+++ /space/portstrees/AFreeBSD/ports/dns/opendnssec/pkg-plist	2011-11-21 19:11:42.000000000 +0100
>@@ -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

Actions: View | Diff

Attachments on bug 163080: 120299 | 120300 | 120301