Attachment #125944 for bug #169646

View | Details | Raw Unified | Return to bug 169646
Collapse All | Expand All

Lines 6-14 Link Here

(-)./Makefile (-2 / +12 lines)
6	#	6	#
7		7
8	PORTNAME= opendnssec	8	PORTNAME= opendnssec
9	PORTVERSION= 1.3.7	9	PORTVERSION= 1.3.9
10	CATEGORIES= dns	10	CATEGORIES= dns
11	MASTER_SITES= http://www.opendnssec.org/files/source/	11	MASTER_SITES= http://www.opendnssec.org/files/source/ \
		12	http://dist.opendnssec.org/source/
12		13
13	MAINTAINER= jaap@NLnetLabs.nl	14	MAINTAINER= jaap@NLnetLabs.nl
14	COMMENT= Tool suite for maintaining DNSSEC	15	COMMENT= Tool suite for maintaining DNSSEC
Lines 23-28 Link Here
23	USE_OPENSSL= yes	24	USE_OPENSSL= yes
24	USE_LDCONFIG= yes	25	USE_LDCONFIG= yes
25		26
		27	USERS= ${PORTNAME}
		28	GROUPS= ${PORTNAME}
		29
26	MAN1= ods-hsmspeed.1 ods-hsmutil.1 ods-ksmutil.1	30	MAN1= ods-hsmspeed.1 ods-hsmutil.1 ods-ksmutil.1
27	MAN5= ods-timing.5	31	MAN5= ods-timing.5
28	MAN7= opendnssec.7	32	MAN7= opendnssec.7
Lines 66-75 Link Here
66		70
67	PKGMESSAGE= ${WRKSRC}/MIGRATION	71	PKGMESSAGE= ${WRKSRC}/MIGRATION
68		72
		73	pre-install:
		74	.if defined(WITH_MYSQL)
		75	@${REINPLACE_CMD} -e '/REQUIRE:/ s\|$$\| mysql\|' ${WRKDIR}/opendnssec
		76	.endif
		77
69	post-install:	78	post-install:
70	.if !defined(BATCH)	79	.if !defined(BATCH)
71	@${CAT} ${PKGMESSAGE}	80	@${CAT} ${PKGMESSAGE}
72	.endif	81	.endif
		82	${CHOWN} -R ${USERS}:${GROUPS} ${PREFIX}/var/opendnssec
73		83
74	.include <bsd.port.pre.mk>	84	.include <bsd.port.pre.mk>
75	.if defined(WITH_AUDITOR) && ${RUBY_VER} == 1.9	85	.if defined(WITH_AUDITOR) && ${RUBY_VER} == 1.9

Lines 1-2 Link Here

(-)./distinfo (-2 / +2 lines)
1	SHA256 (opendnssec-1.3.7.tar.gz) = 04893a8a92537c9e7b52fb2d6e84e724aa31df7cf8194922248fa46886d0afd1	1	SHA256 (opendnssec-1.3.9.tar.gz) = 64c1b86c8a873409c32a90470914705c5562e81cc642e0355f4e655f2ef54968
2	SIZE (opendnssec-1.3.7.tar.gz) = 1085010	2	SIZE (opendnssec-1.3.9.tar.gz) = 1153929

Lines 3-10 Link Here

(-)./files/opendnssec.in (-2 / +1 lines)
3	# $FreeBSD: ports/dns/opendnssec/files/opendnssec.in,v 1.5 2012/03/18 04:44:00 miwi Exp $	3	# $FreeBSD: ports/dns/opendnssec/files/opendnssec.in,v 1.5 2012/03/18 04:44:00 miwi Exp $
4	#	4	#
5	# PROVIDE: opendnssec	5	# PROVIDE: opendnssec
6	# REQUIRE: LOGIN	6	# REQUIRE: LOGIN DAEMON
7	# REQUIRE: DAEMON
8	# KEYWORD: shutdown	7	# KEYWORD: shutdown
9	#	8	#
10	# Add the following line to /etc/rc.conf to enable opendnssec:	9	# Add the following line to /etc/rc.conf to enable opendnssec:




--- ./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.




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

%%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

@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

Return to bug 169646

Lines 1-20 Link Here

(-)./files/patch-conf__Makefile.in (-20 lines)
1	--- ./conf/Makefile.in.orig 2011-03-20 23:41:56.000000000 +0100
2	+++ ./conf/Makefile.in 2011-03-20 23:42:26.000000000 +0100
3	@@ -531,17 +531,9 @@
4
5	install-data-hook:
6	test -d ${DESTDIR}${sysconfdir} \|\| mkdir -p ${DESTDIR}${sysconfdir}
7	- test -f ${DESTDIR}${sysconfdir}/conf.xml \|\| \
8	- ${INSTALL_DATA} -m 0640 conf.xml ${DESTDIR}${sysconfdir}
9	${INSTALL_DATA} -m 640 conf.xml ${DESTDIR}${sysconfdir}/conf.xml.sample
10	- test -f ${DESTDIR}${sysconfdir}/zonelist.xml \|\| \
11	- ${INSTALL_DATA} zonelist.xml ${DESTDIR}${sysconfdir}
12	${INSTALL_DATA} zonelist.xml ${DESTDIR}${sysconfdir}/zonelist.xml.sample
13	- test -f ${DESTDIR}${sysconfdir}/zonefetch.xml \|\| \
14	- ${INSTALL_DATA} -m 0640 zonefetch.xml ${DESTDIR}${sysconfdir}
15	${INSTALL_DATA} -m 640 zonefetch.xml ${DESTDIR}${sysconfdir}/zonefetch.xml.sample
16	- test -f ${DESTDIR}${sysconfdir}/kasp.xml \|\| \
17	- ${INSTALL_DATA} kasp.xml ${DESTDIR}${sysconfdir}
18	${INSTALL_DATA} kasp.xml ${DESTDIR}${sysconfdir}/kasp.xml.sample
19	# Tell versions [3.59,3.63) of GNU make to not export all variables.
20	# Otherwise a system limit (for SysV at least) may be exceeded.

Lines 4-12 Link Here

(-)./pkg-plist (-3 / +7 lines)
4	bin/ods-ksmutil	4	bin/ods-ksmutil
5	%%AUDITOR%%bin/ods-kaspcheck	5	%%AUDITOR%%bin/ods-kaspcheck
6	bin/ods-kasp2html	6	bin/ods-kasp2html
		7	@unexec if cmp -s %D/etc/opendnssec/conf.xml %D/etc/opendnssec/conf.xml.sample; then rm -f %D/etc/opendnssec/conf.xml; fi
7	%%ETCDIR%%/conf.xml.sample	8	%%ETCDIR%%/conf.xml.sample
		9	@unexec if cmp -s %D/etc/opendnssec/kasp.xml %D/etc/opendnssec/kasp.xml.sample; then rm -f %D/etc/opendnssec/kasp.xml; fi
8	%%ETCDIR%%/kasp.xml.sample	10	%%ETCDIR%%/kasp.xml.sample
		11	@unexec if cmp -s %D/etc/opendnssec/zonefetch.xml %D/etc/opendnssec/zonefetch.xml.sample; then rm -f %D/etc/opendnssec/zonefetch.xml; fi
9	%%ETCDIR%%/zonefetch.xml.sample	12	%%ETCDIR%%/zonefetch.xml.sample
		13	@unexec if cmp -s %D/etc/opendnssec/zonelist.xml %D/etc/opendnssec/zonelist.xml.sample; then rm -f %D/etc/opendnssec/zonelist.xml; fi
10	%%ETCDIR%%/zonelist.xml.sample	14	%%ETCDIR%%/zonelist.xml.sample
11	%%AUDITOR%%lib/opendnssec/kasp_auditor/auditor.rb	15	%%AUDITOR%%lib/opendnssec/kasp_auditor/auditor.rb
12	%%AUDITOR%%lib/opendnssec/kasp_auditor/changed_config.rb	16	%%AUDITOR%%lib/opendnssec/kasp_auditor/changed_config.rb
Lines 36-49 Link Here
36	%%DATADIR%%/zonefetch.rng	40	%%DATADIR%%/zonefetch.rng
37	%%DATADIR%%/zonelist.rnc	41	%%DATADIR%%/zonelist.rnc
38	%%DATADIR%%/zonelist.rng	42	%%DATADIR%%/zonelist.rng
39	@dirrm var/run/opendnssec
40	@dirrm var/run
41	@dirrm var/opendnssec/unsigned	43	@dirrm var/opendnssec/unsigned
42	@dirrm var/opendnssec/tmp	44	@dirrm var/opendnssec/tmp
43	@dirrm var/opendnssec/signed	45	@dirrm var/opendnssec/signed
44	@dirrm var/opendnssec/signconf	46	@dirrm var/opendnssec/signconf
45	@dirrm var/opendnssec	47	@dirrm var/opendnssec
46	@dirrm var
47	@dirrm %%DATADIR%%	48	@dirrm %%DATADIR%%
48	@dirrm lib/opendnssec/kasp_auditor	49	@dirrm lib/opendnssec/kasp_auditor
49	@dirrm lib/opendnssec	50	@dirrm lib/opendnssec
Lines 53-55 Link Here
53	@exec mkdir -p %D/var/opendnssec/tmp	54	@exec mkdir -p %D/var/opendnssec/tmp
54	@exec mkdir -p %D/var/opendnssec/signed	55	@exec mkdir -p %D/var/opendnssec/signed
55	@exec mkdir -p %D/var/opendnssec/signconf	56	@exec mkdir -p %D/var/opendnssec/signconf
		57	@dirrmtry var/run/opendnssec
		58	@dirrmtry var/run
		59	@dirrmtry var