From owner-freebsd-ports-bugs@FreeBSD.ORG Thu May 15 00:30:00 2014 Return-Path: Delivered-To: freebsd-ports-bugs@smarthost.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id D5AB49E6 for ; Thu, 15 May 2014 00:30:00 +0000 (UTC) Received: from freefall.freebsd.org (freefall.freebsd.org [IPv6:2001:1900:2254:206c::16:87]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id B50022AD2 for ; Thu, 15 May 2014 00:30:00 +0000 (UTC) Received: from freefall.freebsd.org (localhost [127.0.0.1]) by freefall.freebsd.org (8.14.8/8.14.8) with ESMTP id s4F0U0bI006594 for ; Thu, 15 May 2014 00:30:00 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.14.8/8.14.8/Submit) id s4F0U0rC006581; Thu, 15 May 2014 00:30:00 GMT (envelope-from gnats) Resent-Date: Thu, 15 May 2014 00:30:00 GMT Resent-Message-Id: <201405150030.s4F0U0rC006581@freefall.freebsd.org> Resent-From: FreeBSD-gnats-submit@FreeBSD.org (GNATS Filer) Resent-To: freebsd-ports-bugs@FreeBSD.org Resent-Reply-To: FreeBSD-gnats-submit@FreeBSD.org, Erwin Lansing Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id C1A65766 for ; Thu, 15 May 2014 00:25:10 +0000 (UTC) Received: from mail.droso.net (koala.droso.dk [213.239.220.246]) (using TLSv1 with cipher DHE-RSA-CAMELLIA256-SHA (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 1F6A92A99 for ; Thu, 15 May 2014 00:25:09 +0000 (UTC) Received: by mail.droso.net (Postfix, from userid 1001) id 4F45213CB9; Thu, 15 May 2014 02:25:01 +0200 (CEST) Message-Id: <20140515002501.4F45213CB9@mail.droso.net> Date: Thu, 15 May 2014 02:25:01 +0200 (CEST) From: Erwin Lansing Reply-To: Erwin Lansing To: FreeBSD-gnats-submit@freebsd.org X-Send-Pr-Version: 3.114 Subject: ports/189823: [dns/opendnssec] Finalize stagifying X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 15 May 2014 00:30:01 -0000 >Number: 189823 >Category: ports >Synopsis: [dns/opendnssec] Finalize stagifying >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: update >Submitter-Id: current-users >Arrival-Date: Thu May 15 00:30:00 UTC 2014 >Closed-Date: >Last-Modified: >Originator: Erwin Lansing >Release: FreeBSD 9.2-RELEASE-p5 amd64 >Organization: DK Hostmaster A/S >Environment: System: FreeBSD koala.droso.dk 9.2-RELEASE-p5 FreeBSD 9.2-RELEASE-p5 #0: Tue Apr 29 19:09:13 UTC 2014 root@amd64-builder.daemonology.net:/usr/obj/usr/src/sys/GENERIC amd64 >Description: Fix some outstanding issues with staging and make it work with both pkg_install and pkgng. PORTDATA is a bit too magical for the current use, so I moved the sqlite/mysql dependent files into a new variable SCRIPTDATA, though the name is arbitrary. >How-To-Repeat: >Fix: --- odns-stage2.diff begins here --- Index: Makefile =================================================================== --- Makefile (revision 354095) +++ Makefile (working copy) @@ -3,6 +3,7 @@ PORTNAME= opendnssec PORTVERSION= 1.4.5 +PORTREVISION= 1 CATEGORIES= dns MASTER_SITES= http://dist.opendnssec.org/source/ @@ -47,13 +48,13 @@ .if ${PORT_OPTIONS:MMYSQL} CONFIGURE_ARGS+= --with-database-backend=mysql USE_MYSQL= compat -PORTDATA= migrate_adapters_1.mysql migrate_keyshare_mysql.pl \ +SCRIPTDATA= migrate_adapters_1.mysql migrate_keyshare_mysql.pl \ migrate_zone_delete.mysql migrate_id_mysql.pl migrate_to_ng_mysql.pl .endif .if ${PORT_OPTIONS:MSQLITE} BUILD_DEPENDS+= sqlite3>=3.3.9:${PORTSDIR}/databases/sqlite3 -PORTDATA= database_create.sqlite3 migrate_keyshare_sqlite3.pl \ +SCRIPTDATA= database_create.sqlite3 migrate_keyshare_sqlite3.pl \ migrate_adapters_1.sqlite3 migrate_to_ng_sqlite.pl .endif @@ -77,7 +78,7 @@ .if !defined(BATCH) @${CAT} ${PKGMESSAGE} .endif - ${INSTALL_DATA} ${PORTDATA:S|^|${WRKSRC}/enforcer/utils/|} ${STAGEDIR}${DATADIR} + ${INSTALL_DATA} ${SCRIPTDATA:S|^|${WRKSRC}/enforcer/utils/|} ${STAGEDIR}${DATADIR} # ${CHOWN} -R ${USERS}:${GROUPS} ${PREFIX}/var/opendnssec .include Index: pkg-plist =================================================================== --- pkg-plist (revision 354095) +++ pkg-plist (working copy) @@ -3,14 +3,10 @@ bin/ods-kaspcheck bin/ods-ksmutil 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/zonelist.xml %D/etc/opendnssec/zonelist.xml.sample; then rm -f %D/etc/opendnssec/zonelist.xml; fi -%%ETCDIR%%/zonelist.xml.sample +@sample %%ETCDIR%%/addns.xml.sample +@sample %%ETCDIR%%/conf.xml.sample +@sample %%ETCDIR%%/kasp.xml.sample +@sample %%ETCDIR%%/zonelist.xml.sample sbin/ods-control sbin/ods-enforcerd sbin/ods-signer @@ -26,6 +22,14 @@ %%DATADIR%%/kasp.rnc %%DATADIR%%/kasp.rng %%DATADIR%%/kasp2html.xsl +%%SQLITE%%%%DATADIR%%/migrate_adapters_1.sqlite3 +%%SQLITE%%%%DATADIR%%/migrate_keyshare_sqlite3.pl +%%SQLITE%%%%DATADIR%%/migrate_to_ng_sqlite.pl +%%MYSQL%%%%DATADIR%%/migrate_adapters_1.mysql +%%MYSQL%%%%DATADIR%%/migrate_keyshare_mysql.pl +%%MYSQL%%%%DATADIR%%/migrate_zone_delete.mysql +%%MYSQL%%%%DATADIR%%/migrate_id_mysql.pl +%%MYSQL%%%%DATADIR%%/migrate_to_ng_mysql.pl %%DATADIR%%/signconf.rnc %%DATADIR%%/signconf.rng %%DATADIR%%/zonelist.rnc @@ -40,18 +44,22 @@ man/man8/ods-enforcerd.8.gz man/man8/ods-signer.8.gz man/man8/ods-signerd.8.gz -@exec chown opendnssec:opendnssec %D/var/opendnssec/unsigned -@exec chown opendnssec:opendnssec %D/var/opendnssec/tmp -@exec chown opendnssec:opendnssec %D/var/opendnssec/signed -@exec chown opendnssec:opendnssec %D/var/opendnssec/signconf -@dirrm var/opendnssec +@owner opendnssec +@group opendnssec +@exec install -d -o opendnssec -g opendnssec %D/var/opendnssec/unsigned +@exec install -d -o opendnssec -g opendnssec %D/var/opendnssec/tmp +@exec install -d -o opendnssec -g opendnssec %D/var/opendnssec/signed +@exec install -d -o opendnssec -g opendnssec %D/var/opendnssec/signconf @dirrm var/opendnssec/unsigned @dirrm var/opendnssec/tmp @dirrm var/opendnssec/signed @dirrm var/opendnssec/signconf @dirrm var/opendnssec +@owner root +@group wheel @dirrm %%DATADIR%% @dirrm %%ETCDIR%% +@exec mkdir -p %D/var/run/opendnssec @dirrmtry var/run/opendnssec @dirrmtry var/run @dirrmtry var --- odns-stage2.diff ends here --- >Release-Note: >Audit-Trail: >Unformatted: