Skip site navigation (1)Skip section navigation (2)
Date:      Wed, 4 Jul 2012 16:33:31 +0200 (CEST)
From:      Jaap Akkerhuis <jaap@NLnetLabs.nl>
To:        FreeBSD-gnats-submit@FreeBSD.org
Cc:        jaap@NLnetLabs.nl
Subject:   ports/169646: [MAINTAINER] dns/opendnssec: update to 1.3.9
Message-ID:  <201207041433.q64EXVan026268@bartok.nlnetlabs.nl>
Resent-Message-ID: <201207041440.q64Ee79A066837@freefall.freebsd.org>

next in thread | raw e-mail | index | archive | help

>Number:         169646
>Category:       ports
>Synopsis:       [MAINTAINER] dns/opendnssec: update to 1.3.9
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          maintainer-update
>Submitter-Id:   current-users
>Arrival-Date:   Wed Jul 04 14:40:07 UTC 2012
>Closed-Date:
>Last-Modified:
>Originator:     Jaap Akkerhuis
>Release:        FreeBSD 8.3-STABLE i386
>Organization:
NLnet Labs
>Environment:
System: FreeBSD bartok.nlnetlabs.nl 8.3-STABLE FreeBSD 8.3-STABLE #16: Mon Jul  2 03:08:25 CEST
>Description:
- Update to 1.3.9

Port now set USER and GROUP (needs changes to UIDs & GIDs)

Removed file(s):
- files/patch-conf__Makefile.in

Generated with FreeBSD Port Tools 0.99_6 (mode: update, diff: suffix)
>How-To-Repeat:
>Fix:

Please change the UIDs & GIDs file according to diff below. Thanks!

diff -uN /usr/ports/UIDs.orig /usr/ports/UIDs
--- /usr/ports/UIDs.orig	2012-07-04 16:19:00.000000000 +0200
+++ /usr/ports/UIDs	2012-07-04 16:20:45.000000000 +0200
@@ -114,6 +114,7 @@
 git:*:211:211::0:0:gitosis user:/usr/local/git:/bin/sh
 hg:*:212:212::0:0:mercurial-server user:/usr/local/hg:/bin/sh
 drizzle:*:213:213::0:0:Drizzle daemon:/var/db/drizzle:/usr/sbin/nologin
+opendnssec:*:215:215::0:0:Opendnssec Pseudo User:/nonexistent:/usr/sbin/nologin
 bs:*:220:220::0:0:Big Sister:/usr/local/bigsister:/bin/sh
 postgrey:*:225:225::0:0:Postgrey Owner:/nonexistent:/usr/sbin/nologin
 sqlgrey:*:226:226::0:0:SQLgrey Owner:/nonexistent:/usr/sbin/nologin
diff -uN /usr/ports/GIDs.orig /usr/ports/GIDs
--- /usr/ports/GIDs.orig	2012-07-04 16:19:09.000000000 +0200
+++ /usr/ports/GIDs	2012-07-04 16:22:01.000000000 +0200
@@ -107,6 +107,7 @@
 git:*:211:
 hg:*:212:
 drizzle:*:213:
+opendnssec:*:215:
 bs:*:220:
 postgrey:*:225:
 sqlgrey:*:226:


--- opendnssec-1.3.9.patch begins here ---
diff -ruN --exclude=CVS ../opendnssec.orig/Makefile ./Makefile
--- ../opendnssec.orig/Makefile	2012-05-19 20:03:13.671337225 +0200
+++ ./Makefile	2012-07-04 14:19:10.143621770 +0200
@@ -6,9 +6,10 @@
 #
 
 PORTNAME=	opendnssec
-PORTVERSION=	1.3.7
+PORTVERSION=	1.3.9
 CATEGORIES=	dns
-MASTER_SITES=	http://www.opendnssec.org/files/source/
+MASTER_SITES=	http://www.opendnssec.org/files/source/ \
+		http://dist.opendnssec.org/source/
 
 MAINTAINER=	jaap@NLnetLabs.nl
 COMMENT=	Tool suite for maintaining DNSSEC
@@ -23,6 +24,9 @@
 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
@@ -66,10 +70,16 @@
 
 PKGMESSAGE=	${WRKSRC}/MIGRATION
 
+pre-install:
+.if defined(WITH_MYSQL)
+	@${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 defined(WITH_AUDITOR) && ${RUBY_VER} == 1.9
diff -ruN --exclude=CVS ../opendnssec.orig/distinfo ./distinfo
--- ../opendnssec.orig/distinfo	2012-05-19 20:03:13.669466204 +0200
+++ ./distinfo	2012-06-18 22:15:41.923803699 +0200
@@ -1,2 +1,2 @@
-SHA256 (opendnssec-1.3.7.tar.gz) = 04893a8a92537c9e7b52fb2d6e84e724aa31df7cf8194922248fa46886d0afd1
-SIZE (opendnssec-1.3.7.tar.gz) = 1085010
+SHA256 (opendnssec-1.3.9.tar.gz) = 64c1b86c8a873409c32a90470914705c5562e81cc642e0355f4e655f2ef54968
+SIZE (opendnssec-1.3.9.tar.gz) = 1153929
diff -ruN --exclude=CVS ../opendnssec.orig/files/opendnssec.in ./files/opendnssec.in
--- ../opendnssec.orig/files/opendnssec.in	2012-05-19 20:03:13.669466204 +0200
+++ ./files/opendnssec.in	2012-05-19 20:17:28.477732395 +0200
@@ -3,8 +3,7 @@
 # $FreeBSD: ports/dns/opendnssec/files/opendnssec.in,v 1.5 2012/03/18 04:44:00 miwi Exp $
 #
 # PROVIDE: opendnssec
-# REQUIRE: LOGIN
-# REQUIRE: DAEMON
+# REQUIRE: LOGIN DAEMON
 # KEYWORD: shutdown
 #
 # Add the following line to /etc/rc.conf to enable opendnssec:
diff -ruN --exclude=CVS ../opendnssec.orig/files/patch-conf__Makefile.in ./files/patch-conf__Makefile.in
--- ../opendnssec.orig/files/patch-conf__Makefile.in	2012-05-19 20:03:13.669466204 +0200
+++ ./files/patch-conf__Makefile.in	1970-01-01 01:00:00.000000000 +0100
@@ -1,20 +0,0 @@
---- ./conf/Makefile.in.orig	2011-03-20 23:41:56.000000000 +0100
-+++ ./conf/Makefile.in	2011-03-20 23:42:26.000000000 +0100
-@@ -531,17 +531,9 @@
- 
- install-data-hook:
- 	test -d ${DESTDIR}${sysconfdir} || mkdir -p ${DESTDIR}${sysconfdir}
--	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}/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
- # 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 -ruN --exclude=CVS ../opendnssec.orig/pkg-plist ./pkg-plist
--- ../opendnssec.orig/pkg-plist	2012-05-19 20:03:13.671337225 +0200
+++ ./pkg-plist	2012-05-20 19:25:25.236611574 +0200
@@ -4,9 +4,13 @@
 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
@@ -36,14 +40,11 @@
 %%DATADIR%%/zonefetch.rng
 %%DATADIR%%/zonelist.rnc
 %%DATADIR%%/zonelist.rng
-@dirrm var/run/opendnssec
-@dirrm var/run
 @dirrm var/opendnssec/unsigned
 @dirrm var/opendnssec/tmp
 @dirrm var/opendnssec/signed
 @dirrm var/opendnssec/signconf
 @dirrm var/opendnssec
-@dirrm var
 @dirrm %%DATADIR%%
 @dirrm lib/opendnssec/kasp_auditor
 @dirrm lib/opendnssec
@@ -53,3 +54,6 @@
 @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
--- opendnssec-1.3.9.patch ends here ---

>Release-Note:
>Audit-Trail:
>Unformatted:



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201207041433.q64EXVan026268>