From owner-freebsd-ports-bugs@FreeBSD.ORG Mon Jun 10 10:31:46 2013 Return-Path: Delivered-To: freebsd-ports-bugs@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by hub.freebsd.org (Postfix) with ESMTP id 5823FF5; Mon, 10 Jun 2013 10:31:46 +0000 (UTC) (envelope-from leo@xs.unicycle.net.unicycle.net) Received: from xs.unicycle.net.unicycle.net (xs.unicycle.net [195.66.135.15]) by mx1.freebsd.org (Postfix) with ESMTP id AF7A91A65; Mon, 10 Jun 2013 10:31:45 +0000 (UTC) Received: from xs.unicycle.net.unicycle.net (xs.unicycle.net [195.66.135.15]) by xs.unicycle.net.unicycle.net (8.14.6/8.14.6) with ESMTP id r5AAVgMP026154; Mon, 10 Jun 2013 10:31:42 GMT (envelope-from leo@xs.unicycle.net.unicycle.net) Received: (from leo@localhost) by xs.unicycle.net.unicycle.net (8.14.6/8.14.6/Submit) id r5AAVb7S025869; Mon, 10 Jun 2013 10:31:37 GMT (envelope-from leo) Date: Mon, 10 Jun 2013 10:31:37 +0000 From: Leo Vandewoestijne To: FreeBSD-gnats-submit@FreeBSD.org, freebsd-ports-bugs@FreeBSD.org Subject: Re: ports/179428: [MAINTAINER-UPDATE] dns/knot: update to 1.3.0r1 Message-ID: <20130610103137.GA10649@relay7.ucia.gov> References: <201306081627.r58GROKB018838@oldred.freebsd.org> <201306081630.r58GU0Si067011@freefall.freebsd.org> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="/04w6evG8XlLl3ft" Content-Disposition: inline In-Reply-To: <201306081630.r58GU0Si067011@freefall.freebsd.org> User-Agent: LookOut 4.0 Microsoft X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 10 Jun 2013 10:31:46 -0000 --/04w6evG8XlLl3ft Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Ai, I'd submitted an older diff than the one I meant to submit. Should there better be a knot-devel? --/04w6evG8XlLl3ft Content-Type: text/plain; charset=us-ascii Content-Disposition: attachment; filename="knot.diff.txt" diff -rupN knot.orig/Makefile knot/Makefile --- knot.orig/Makefile 2013-06-07 12:36:07.000000000 +0000 +++ knot/Makefile 2013-06-08 16:17:59.000000000 +0000 @@ -1,26 +1,26 @@ # Created by: Leo Vandewoestijne -# $FreeBSD: dns/knot/Makefile 320197 2013-06-07 12:36:07Z koobs $ +# $FreeBSD: dns/knot/Makefile 316715 2013-04-28 13:10:51Z rakuco $ PORTNAME= knot -DISTVERSION= 1.2.0 +DISTVERSION= 1.3.0r1 CATEGORIES= dns ipv6 MASTER_SITES= https://secure.nic.cz/files/knot-dns/ \ http://www.dns-lab.com/downloads/knot-dns/ +DISTNAME= knot-1.3.0-rc1 MAINTAINER= freebsd@dns-lab.com COMMENT= Knot DNS is a high performance authoritative-only DNS server LICENSE= GPLv3 -BUILD_DEPENDS= bison:${PORTSDIR}/devel/bison \ - flex>=2.5.35_1:${PORTSDIR}/textproc/flex -LIB_DEPENDS= urcu:${PORTSDIR}/sysutils/liburcu +BUILD_DEPENDS= urcu>=0.5.4:${PORTSDIR}/sysutils/liburcu -CONFIGURE_ARGS= --sysconfdir=${ETCDIR} -GNU_CONFIGURE= yes MAKE_JOBS_SAFE= yes USE_AUTOTOOLS= libtool +USE_LDCONFIG= yes USE_OPENSSL= yes +GNU_CONFIGURE= yes +CONFIGURE_ARGS= --sysconfdir=${ETCDIR} .include @@ -28,18 +28,16 @@ SUB_FILES= pkg-message USE_RC_SUBR= ${PORTNAME}d -MAN8= knotc.8 knotd.8 +MAN8= knotc.8 knotd.8 kdig.8 khost.8 knsupdate.8 MAN5= knot.conf.5 INFO= knot -PORTDOCS= AUTHORS ChangeLog CodingStyle \ - INSTALL KNOWN_ISSUES NEWS README RELNOTES +PORTDOCS= AUTHORS COPYING ChangeLog INSTALL NEWS README THANKS post-install: @${MKDIR} ${ETCDIR} - @${INSTALL_DATA} ${WRKSRC}/samples/knot.min.conf ${ETCDIR} - @${INSTALL_DATA} ${WRKSRC}/samples/knot.full.conf ${ETCDIR} + @${INSTALL_DATA} ${WRKSRC}/samples/knot.sample.conf ${ETCDIR} .if ${PORT_OPTIONS:MDOCS} @${MKDIR} ${DOCSDIR} @${INSTALL_DATA} ${PORTDOCS:S,^,${WRKSRC}/,} ${DOCSDIR}/ diff -rupN knot.orig/distinfo knot/distinfo --- knot.orig/distinfo 2013-04-28 13:10:51.000000000 +0000 +++ knot/distinfo 2013-06-08 16:21:48.000000000 +0000 @@ -1,2 +1,2 @@ -SHA256 (knot-1.2.0.tar.gz) = 7c585ebae5543807db257b14f0e15af79f7cdf83ef90af89eec3d6af304440b0 -SIZE (knot-1.2.0.tar.gz) = 1241376 +SHA256 (knot-1.3.0-rc1.tar.gz) = 7f79dd4e2cf5e4346f9571cdc6667744298b0a0e98d56655287074bac95b3a5b +SIZE (knot-1.3.0-rc1.tar.gz) = 1157222 diff -rupN knot.orig/files/knotd.in knot/files/knotd.in --- knot.orig/files/knotd.in 2012-07-14 13:54:48.000000000 +0000 +++ knot/files/knotd.in 2013-06-08 15:44:21.000000000 +0000 @@ -18,10 +18,8 @@ name=knot rcvar=knot_enable -extra_commands="reload compile" -compile_cmd="${name}_compile" +extra_commands="reload" reload_cmd="${name}_reload" -start_precmd="${name}_compile" status_cmd="${name}_status" stop_cmd="${name}_stop" @@ -37,16 +35,12 @@ pidfile=/var/run/${name}.pid command_args="-c ${knot_config} -w start" required_files=${knot_config} -knot_compile() { - echo "Compiling zone(s)..." - ${command} -c ${knot_config} compile - } knot_reload() { echo "Reloading ${name}." ${command} -c ${knot_config} -a reload } knot_status() { - ${command} -c ${knot_config} running + ${command} -c ${knot_config} status } knot_stop() { echo "Stopping ${name}." diff -rupN knot.orig/files/pkg-message.in knot/files/pkg-message.in --- knot.orig/files/pkg-message.in 2012-07-14 13:54:48.000000000 +0000 +++ knot/files/pkg-message.in 2013-06-08 15:52:35.000000000 +0000 @@ -5,10 +5,8 @@ # # ----- configure -------------------------------------------------- # - $EDITOR %%ETCDIR%%/knot.min.conf -# -or- -# $EDITOR %%ETCDIR%%/knot.full.conf -# and save it as %%ETCDIR%%/knot.conf + cp %%ETCDIR%%/knot.sample.conf %%ETCDIR%%/knot.conf + $EDITOR %%ETCDIR%%/knot.conf # # ----- prepare ---------------------------------------------------- # @@ -23,3 +21,10 @@ # #################################################################### + + When upgrading from version of before 1.3.0-RC1: + mind the default config file location has changed. + + +==================================================================== + diff -rupN knot.orig/pkg-descr knot/pkg-descr --- knot.orig/pkg-descr 2012-12-18 12:36:46.000000000 +0000 +++ knot/pkg-descr 2013-06-08 15:45:55.000000000 +0000 @@ -1,6 +1,6 @@ Knot DNS is a high-performance authoritative-only DNS server which supports all key features of the domain name system -including zone transfers, dynamic updates and DNSSEC. +including zone AXFR and IXFR, DDNS and DNSSEC. Key features: diff -rupN knot.orig/pkg-plist knot/pkg-plist --- knot.orig/pkg-plist 2012-12-18 12:36:46.000000000 +0000 +++ knot/pkg-plist 2013-06-08 16:15:10.000000000 +0000 @@ -1,16 +1,11 @@ @stopdaemon knotd -%%ETCDIR%%/example.com.zone -@unexec if cmp -s %B/knot.min.conf %B/knot.conf; then rm -f %B/knot.conf; fi -%%ETCDIR%%/knot.full.conf -%%ETCDIR%%/knot.min.conf +@unexec if cmp -s %B/knot.sample.conf %B/knot.conf; then rm -f %B/knot.conf; fi @exec [ -f %B/knot.conf ] || cp %B/%f %B/knot.conf +%%ETCDIR%%/example.com.zone %%ETCDIR%%/knot.sample.conf @dirrmtry %%ETCDIR%% -libexec/knot-zcompile -libexec/unittests -libexec/unittests-libknot -libexec/unittests-libknot-realdata -libexec/unittests-xfr -libexec/unittests-zcompile +sbin/kdig +sbin/khost sbin/knotc sbin/knotd +sbin/knsupdate --/04w6evG8XlLl3ft--