From nobody@FreeBSD.org  Sun Sep  1 01:52:12 2013
Return-Path: <nobody@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 ESMTP id 7FC3AE5A
	for <freebsd-gnats-submit@FreeBSD.org>; Sun,  1 Sep 2013 01:52:12 +0000 (UTC)
	(envelope-from nobody@FreeBSD.org)
Received: from oldred.freebsd.org (oldred.freebsd.org [8.8.178.121])
	(using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits))
	(No client certificate requested)
	by mx1.freebsd.org (Postfix) with ESMTPS id 51B422EEF
	for <freebsd-gnats-submit@FreeBSD.org>; Sun,  1 Sep 2013 01:52:12 +0000 (UTC)
Received: from oldred.freebsd.org ([127.0.1.6])
	by oldred.freebsd.org (8.14.5/8.14.7) with ESMTP id r811qAoQ094637
	for <freebsd-gnats-submit@FreeBSD.org>; Sun, 1 Sep 2013 01:52:10 GMT
	(envelope-from nobody@oldred.freebsd.org)
Received: (from nobody@localhost)
	by oldred.freebsd.org (8.14.5/8.14.5/Submit) id r811qA8W094636;
	Sun, 1 Sep 2013 01:52:10 GMT
	(envelope-from nobody)
Message-Id: <201309010152.r811qA8W094636@oldred.freebsd.org>
Date: Sun, 1 Sep 2013 01:52:10 GMT
From: Leo Vandewoestijne <freebsd@dns-lab.com>
To: freebsd-gnats-submit@FreeBSD.org
Subject: [MAINTAINER-UPDATE] dns/knot: update to 1.3.1
X-Send-Pr-Version: www-3.1
X-GNATS-Notify:

>Number:         181716
>Category:       ports
>Synopsis:       [MAINTAINER-UPDATE] dns/knot: update to 1.3.1
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    itetcu
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          maintainer-update
>Submitter-Id:   current-users
>Arrival-Date:   Sun Sep 01 02:00:00 UTC 2013
>Closed-Date:    Tue Jan 07 10:46:51 UTC 2014
>Last-Modified:  Thu Feb 13 13:30:01 UTC 2014
>Originator:     Leo Vandewoestijne
>Release:        
>Organization:
DNS-Lab
>Environment:
>Description:
Knot 1.3.0 was released, but just before I had the port ready 1.3.1 already came out.
>How-To-Repeat:

>Fix:


Patch attached with submission follows:

diff -rupt knot.old/Makefile knot/Makefile
--- knot.old/Makefile	2013-08-31 23:11:51.000000000 +0000
+++ knot/Makefile	2013-09-01 01:38:06.000000000 +0000
@@ -2,11 +2,10 @@
 # $FreeBSD: dns/knot/Makefile 324744 2013-08-14 22:35:50Z ak $
 
 PORTNAME=       knot
-DISTVERSION=    1.3.0r1
+DISTVERSION=    1.3.1
 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
+                http://dns-lab.com/downloads/knot-dns/
 
 MAINTAINER=     freebsd@dns-lab.com
 COMMENT=        Knot DNS is a high performance authoritative-only DNS server
@@ -22,14 +21,14 @@ USE_AUTOTOOLS=	libtool
 USE_LDCONFIG=   yes
 USE_OPENSSL=    yes
 GNU_CONFIGURE=  yes
-CONFIGURE_ARGS= --sysconfdir=${ETCDIR}
 
 SUB_FILES=      pkg-message
 
 USE_RC_SUBR=    ${PORTNAME}d
 
-MAN8=           knotc.8 knotd.8 kdig.8 khost.8 knsupdate.8
+MAN8=           knotc.8 knotd.8
 MAN5=           knot.conf.5
+MAN1=           kdig.1 khost.1 knsupdate.1
 
 INFO=           knot
 
diff -rupt knot.old/distinfo knot/distinfo
--- knot.old/distinfo	2013-08-31 23:11:51.000000000 +0000
+++ knot/distinfo	2013-08-31 23:20:09.000000000 +0000
@@ -1,2 +1,2 @@
-SHA256 (knot-1.3.0-rc1.tar.gz) = 7f79dd4e2cf5e4346f9571cdc6667744298b0a0e98d56655287074bac95b3a5b
-SIZE (knot-1.3.0-rc1.tar.gz) = 1157222
+SHA256 (knot-1.3.1.tar.gz) = 0a6235782d6d30c2bc4ebc7f2c0676dc89d1199f1169eb0ae4410a9284b69711
+SIZE (knot-1.3.1.tar.gz) = 1150375
diff -rupt knot.old/pkg-plist knot/pkg-plist
--- knot.old/pkg-plist	2013-08-31 23:11:51.000000000 +0000
+++ knot/pkg-plist	2013-09-01 01:50:24.000000000 +0000
@@ -4,8 +4,8 @@
 %%ETCDIR%%/example.com.zone
 %%ETCDIR%%/knot.sample.conf
 @dirrmtry %%ETCDIR%%
-sbin/kdig
-sbin/khost
+bin/kdig
+bin/khost
+bin/knsupdate
 sbin/knotc
 sbin/knotd
-sbin/knsupdate



>Release-Note:
>Audit-Trail:
Responsible-Changed-From-To: freebsd-ports-bugs->itetcu 
Responsible-Changed-By: itetcu 
Responsible-Changed-When: Sun Sep 1 12:58:25 UTC 2013 
Responsible-Changed-Why:  
I'll take it. 

http://www.freebsd.org/cgi/query-pr.cgi?pr=181716 
State-Changed-From-To: open->feedback 
State-Changed-By: itetcu 
State-Changed-When: Sun Sep 1 14:23:55 UTC 2013 
State-Changed-Why:  
Ask for submitter fix. 

http://www.freebsd.org/cgi/query-pr.cgi?pr=181716 

From: Ion-Mihai Tetcu <itetcu@FreeBSD.org>
To: Leo Vandewoestijne <freebsd@dns-lab.com>
Cc: freebsd-gnats-submit@FreeBSD.org
Subject: Re: ports/181716: [MAINTAINER-UPDATE] dns/knot: update to 1.3.1
Date: Sun, 1 Sep 2013 17:23:19 +0300

 --Sig_/1Fld5UHQqJij7ie=A2+ZoXW
 Content-Type: text/plain; charset=US-ASCII
 Content-Transfer-Encoding: quoted-printable
 
 
 =3D=3D=3D=3D>> Checking for extra files and directories
 =3D=3D=3D=3D>> Files or directories left over:
 info/dir
 @dirrm var/run/knot
 @dirrm var/run
 @dirrm var/lib/knot
 @dirrm var/lib
 @dirrm var
 
 You should patch it to install the .info file in  PREFIX/INFO_PATH not
 PREFIX/INFO_PATH/dir
 And remove var/run/knot and var/lib/knot and try to remove var/lib
 
 --=20
 IOnut - Un^d^dregistered ;) FreeBSD "user"
   "Intellectual Property" is   nowhere near as valuable   as "Intellect"
 FreeBSD committer -> itetcu@FreeBSD.org, PGP Key ID 29597D20
 
 
 --Sig_/1Fld5UHQqJij7ie=A2+ZoXW
 Content-Type: application/pgp-signature; name=signature.asc
 Content-Disposition: attachment; filename=signature.asc
 
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.21 (FreeBSD)
 
 iQIcBAEBAgAGBQJSI03XAAoJELyiEpopWX0gI74P/iMDAypMJf8Mlz96Z/uQ5dra
 2uHj7iU0XpbNpzh9SH3FeeRnC5klLTBqVMV3loomWhEyrbyzvaM/JTAdVO2IhQMf
 GdSF8mz1CZETZ08SmY6giaLQ2Tvr2JbvN443BWqmAK6wLWWe1Ytvrmgk4132KXxs
 eCCFhRAx3SUycbku83iK4p2SIn8H57lU9g57wYIzT0LbNFvZ9PynrmIsxi3haO7U
 50oMFkcgeRYF3NALyv9ir9vCiyL5Eb5A3ldPyhSHaEHEsjj/sedzkoQc3B+KVUg8
 YXxsFqu1umcs3gqhJnm0q4TgRHASxTeXrsc4mE23ydqmboh/OeYCBe5hDvtAn3/j
 sa1ZgeBCPxE1ry/eksIlJaZyvT+nnTy7K66ORmMaswPwI/eD6trs7L4arIKzqaXn
 O0qvuXYOWN1eTV5KSyO6I/taTlWfVPMrd/lsgUfJ3hEf/4BMf/n1art9AXGTlme+
 o9zC/Q39wJ+xFTVxDRmIc1Dg5fv1/GsC7L1FKq70ooCEQ1REApK7vyun983Q6biq
 nISqy6x8a5GQFU5IQ2trlbn2NA0J+FMyzK5tMJWjUFi/zLyIRslhBAhpumzoKhHU
 G54/5kRuVE1DmWy7uksJQ1MwSWExLVHLLuywBzKuWfn7BvCinfEylfmGmQBMfNdp
 LLItFqL5Nxf/2u40KnMG
 =vajx
 -----END PGP SIGNATURE-----
 
 --Sig_/1Fld5UHQqJij7ie=A2+ZoXW--

From: Leo Vandewoestijne <freebsd@dns-lab.com>
To: bug-followup@FreeBSD.org
Cc:  
Subject: Re: ports/181716: [MAINTAINER-UPDATE] dns/knot: update to 1.3.1
Date: Tue, 5 Nov 2013 11:59:01 +0000

 Hi,
 
 
 The status of this PR is still open,
 however the problem was addressed and solved at the update to 1.3.2,
 so this can be closed.
 
 
 Thanks,
 
 
 Leo Vandewoestijne
State-Changed-From-To: feedback->closed 
State-Changed-By: erwin 
State-Changed-When: Tue Jan 7 10:46:44 UTC 2014 
State-Changed-Why:  
Close at submitters request. 

http://www.freebsd.org/cgi/query-pr.cgi?pr=181716 

From: dfilter@FreeBSD.ORG (dfilter service)
To: bug-followup@FreeBSD.org
Cc:  
Subject: Re: ports/181716: commit references a PR
Date: Thu, 13 Feb 2014 13:26:12 +0000 (UTC)

 Author: feld
 Date: Thu Feb 13 13:26:03 2014
 New Revision: 344100
 URL: http://svnweb.freebsd.org/changeset/ports/344100
 QAT: https://qat.redports.org/buildarchive/r344100/
 
 Log:
   Update Knot to 1.4.2
   Major improvements to the rc script
   
   PR:		ports/181716
   PR:		ports/185163
 
 Added:
   head/dns/knot/files/knot.in
      - copied, changed from r341444, head/dns/knot/files/knotd.in
 Deleted:
   head/dns/knot/files/knotd.in
 Modified:
   head/GIDs
   head/UIDs
   head/dns/knot/Makefile
   head/dns/knot/distinfo
   head/dns/knot/files/pkg-message.in
   head/dns/knot/pkg-plist
 
 Modified: head/GIDs
 ==============================================================================
 --- head/GIDs	Thu Feb 13 13:23:05 2014	(r344099)
 +++ head/GIDs	Thu Feb 13 13:26:03 2014	(r344100)
 @@ -172,6 +172,7 @@ pgbouncer:*:534:
  redis:*:535:
  _flowd:*:542:
  ejabberd:*:543:
 +knot:*:553:
  qtss:*:554:
  ircdru:*:555:
  messagebus:*:556:
 
 Modified: head/UIDs
 ==============================================================================
 --- head/UIDs	Thu Feb 13 13:23:05 2014	(r344099)
 +++ head/UIDs	Thu Feb 13 13:26:03 2014	(r344100)
 @@ -180,6 +180,7 @@ pgbouncer:*:534:534::0:0:Pgbouncer Daemo
  redis:*:535:535::0:0:Redis Daemon:/nonexistent:/usr/sbin/nologin
  _flowd:*:542:542::0:0:flowd privilege separation user:/var/empty:/usr/sbin/nologin
  ejabberd:*:543:543::0:0:ejabberd pseudo user:/var/spool/ejabberd:/bin/sh
 +knot:*:553:553::0:0:Knot DNS Server:/nonexistent:/usr/sbin/nologin
  qtss:*:554:554::0:0:Darwin Streaming Server:/nonexistent:/usr/sbin/nologin
  ircdru:*:555:555::0:0:Russian hybrid IRC server:/nonexistent:/bin/sh
  messagebus:*:556:556::0:0:D-BUS Daemon User:/nonexistent:/usr/sbin/nologin
 
 Modified: head/dns/knot/Makefile
 ==============================================================================
 --- head/dns/knot/Makefile	Thu Feb 13 13:23:05 2014	(r344099)
 +++ head/dns/knot/Makefile	Thu Feb 13 13:26:03 2014	(r344100)
 @@ -2,8 +2,7 @@
  # $FreeBSD$
  
  PORTNAME=	knot
 -DISTVERSION=	1.3.3
 -PORTREVISION=	1
 +DISTVERSION=	1.4.2
  CATEGORIES=	dns ipv6
  MASTER_SITES=	https://secure.nic.cz/files/knot-dns/ \
  		http://dns-lab.com/downloads/knot-dns/
 @@ -20,27 +19,37 @@ LIB_DEPENDS=	liburcu.so:${PORTSDIR}/sysu
  USE_AUTOTOOLS=	libtool
  
  USE_LDCONFIG=	yes
 +
  USE_OPENSSL=	yes
 +WITH_OPENSSL_PORT=yes
 +
  GNU_CONFIGURE=	yes
  
 +CONFIGURE_ARGS+=--with-storage=/var/db/knot
 +CONFIGURE_ARGS+=--with-rundir=/var/run/knot
 +
  SUB_FILES=	pkg-message
  
 -USE_RC_SUBR=	${PORTNAME}d
 +USE_RC_SUBR=	${PORTNAME}
  
  INFO=		knot
  
  PORTDOCS=	AUTHORS COPYING ChangeLog INSTALL NEWS README THANKS
  
 -OPTIONS_DEFINE=	DOCS
 +USERS=		knot
 +GROUPS=		knot
 +SUB_LIST+=	USERS="${USERS}" GROUPS="${GROUPS}"
 +
 +post-patch:
 +	${REINPLACE_CMD} 's|$$(INSTALL) -d $$(DESTDIR)/\@run_dir\@|#$$(INSTALL) -d $$(DESTDIR)/\@run_dir\@|' \
 +		${WRKSRC}/src/Makefile.in
 +	${REINPLACE_CMD} 's|$$(INSTALL) -d $$(DESTDIR)/\@storage_dir\@|#$$(INSTALL) -d $$(DESTDIR)/\@storage_dir\@|' \
 +		${WRKSRC}/src/Makefile.in
  
  post-install:
 -	@${MKDIR} ${STAGEDIR}${ETCDIR}
 +	${MKDIR} ${STAGEDIR}${ETCDIR}
  	${INSTALL_DATA} ${WRKSRC}/samples/knot.sample.conf ${STAGEDIR}${ETCDIR}
 -	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 +	${MKDIR} ${STAGEDIR}${DOCSDIR}
  	${INSTALL_DATA} ${PORTDOCS:S,^,${WRKSRC}/,} ${STAGEDIR}${DOCSDIR}/
 -	@${MKDIR} ${PREFIX}/var/lib/knot
 -	@${MKDIR} ${PREFIX}/var/run/knot
 -	@${CHOWN} 53:53 ${PREFIX}/var/lib/knot
 -	@${CHOWN} 53:53 ${PREFIX}/var/run/knot
  
  .include <bsd.port.mk>
 
 Modified: head/dns/knot/distinfo
 ==============================================================================
 --- head/dns/knot/distinfo	Thu Feb 13 13:23:05 2014	(r344099)
 +++ head/dns/knot/distinfo	Thu Feb 13 13:26:03 2014	(r344100)
 @@ -1,2 +1,2 @@
 -SHA256 (knot-1.3.3.tar.gz) = 70f5237871a92cd8a777c73b80b6ac339212ea084d4adfaf314388be704027b4
 -SIZE (knot-1.3.3.tar.gz) = 1148233
 +SHA256 (knot-1.4.2.tar.gz) = 9476111662220935a824c1fa53cbd1673440825e40a2c4a9282539ced4af4687
 +SIZE (knot-1.4.2.tar.gz) = 1365873
 
 Copied and modified: head/dns/knot/files/knot.in (from r341444, head/dns/knot/files/knotd.in)
 ==============================================================================
 --- head/dns/knot/files/knotd.in	Mon Jan 27 19:31:17 2014	(r341444, copy source)
 +++ head/dns/knot/files/knot.in	Thu Feb 13 13:26:03 2014	(r344100)
 @@ -10,7 +10,7 @@
  #
  # knot_enable="YES":	Set to NO by default.
  #			Set it to YES to enable knot.
 -# knot_config="":	Set to %%PREFIX%%/etc/knot/knot.conf
 +# knot_config="":	Set to /usr/local/etc/knot/knot.conf
  #			by default.
  
  . /etc/rc.subr
 @@ -18,22 +18,35 @@
  name=knot
  rcvar=knot_enable
  
 -extra_commands="reload"
 -reload_cmd="${name}_x reload"
 -status_cmd="${name}_x status"
 -stop_cmd="  ${name}_x stop"
 -
  load_rc_config ${name}
  
 -: ${knot_enable:="NO"}
 +: ${knot_enable:=NO}
  : ${knot_config="%%PREFIX%%/etc/knot/knot.conf"}
  
 -command=%%PREFIX%%/sbin/${name}d
 +command=%%PREFIX%%/sbin/knotd
  command_args="-c ${knot_config} -d"
 +control=%%PREFIX%%/sbin/knotc
 +pidfile=/var/run/knot/knot.pid
 +
  required_files=${knot_config}
  
 -knot_x() {
 -	%%PREFIX%%/sbin/${name}c -c ${knot_config} "$1"
 +extra_commands=reload
 +reload_cmd="${name}_reload"
 +start_precmd="${name}_prestart"
 +
 +knot_prestart() {
 +	if [ ! -d /var/run/knot ]; then
 +		install -d -o %%USERS%% -g %%GROUPS%% /var/run/knot
 +	fi
 +	if [ ! -d /var/db/knot ]; then
 +		install -d -o %%USERS%% -g %%GROUPS%% /var/db/knot
 +	fi
 +	grep -v '#' ${knot_config} | grep -q -E 'knot.knot;|bind.bind;'
 +	if [ $? -ne 0 ]; then
 +		echo "Notice: not running as uid.gid knot.knot or bind.bind"
 +	fi
 +	${control} -c ${knot_config} checkconf
  	}
  
 -run_rc_command "$1"
 +knot_reload() {
 +	echo "Reloading ${name}."
 
 Modified: head/dns/knot/files/pkg-message.in
 ==============================================================================
 --- head/dns/knot/files/pkg-message.in	Thu Feb 13 13:23:05 2014	(r344099)
 +++ head/dns/knot/files/pkg-message.in	Thu Feb 13 13:26:03 2014	(r344100)
 @@ -1,21 +1,11 @@
 -
  ####################################################################
  #
 -# To get Knot DNS started:
 +# To start using Knot DNS, you should complete the following tasks:
  #
 -  cp %%ETCDIR%%/knot.sample.conf %%ETCDIR%%/knot.conf
 -  $EDITOR %%ETCDIR%%/knot.conf
 -  echo knot_enable=\"YES\" >> /etc/rc.conf
 +# cp %%ETCDIR%%/knot.sample.conf %%ETCDIR%%/knot.conf
 +# $EDITOR %%ETCDIR%%/knot.conf
 +# echo knot_enable=\"YES\" >> /etc/rc.conf
  # echo knot_config=\"%%PREFIX%%/etc/knot/knot.conf\" >> /etc/rc.conf
 -  %%PREFIX%%/etc/rc.d/knotd start
 +# %%PREFIX%%/etc/rc.d/knot start
  #
  ####################################################################
 -
 -  When upgrading from version of before 1.3.0-RC1:
 -  mind the default config file location has changed.
 -
 -  When upgrading from version of 1.3.1-RC1 or before:
 -  the startup script has changed due to parameter changes.
 -  That problem reapeared in port 1.3.3 and was fixed in 1.3.3_1.
 -
 -====================================================================
 
 Modified: head/dns/knot/pkg-plist
 ==============================================================================
 --- head/dns/knot/pkg-plist	Thu Feb 13 13:23:05 2014	(r344099)
 +++ head/dns/knot/pkg-plist	Thu Feb 13 13:26:03 2014	(r344100)
 @@ -1,21 +1,19 @@
 -@unexec if cmp -s %B/knot.sample.conf %B/knot.conf; then rm -f %B/knot.conf; fi
 +@unexec if cmp -s %D/%%ETCDIR%%/knot.sample.conf %D/%%ETCDIR%%/knot.conf; then rm -f %D/%%ETCDIR%%/knot.conf; fi
  %%ETCDIR%%/knot.sample.conf
  @exec [ -f %B/knot.conf ] || cp %B/%f %B/knot.conf
  %%ETCDIR%%/example.com.zone
  man/man1/kdig.1.gz
  man/man1/khost.1.gz
 +man/man1/knsec3hash.1.gz
  man/man1/knsupdate.1.gz
  man/man5/knot.conf.5.gz
  man/man8/knotc.8.gz
  man/man8/knotd.8.gz
  @dirrmtry %%ETCDIR%%
 -@dirrmtry var/run/knot
 -@dirrmtry var/run
 -@dirrmtry var/lib/knot
 -@dirrmtry var/lib
 -@dirrmtry var
  bin/kdig
  bin/khost
 +bin/knsec3hash
  bin/knsupdate
 +info/dir
  sbin/knotc
  sbin/knotd
 _______________________________________________
 svn-ports-all@freebsd.org mailing list
 http://lists.freebsd.org/mailman/listinfo/svn-ports-all
 To unsubscribe, send any mail to "svn-ports-all-unsubscribe@freebsd.org"
 
>Unformatted:
