From nobody@FreeBSD.org  Tue Sep 17 05:51:58 2013
Return-Path: <nobody@FreeBSD.org>
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
	(using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
	(No client certificate requested)
	by hub.freebsd.org (Postfix) with ESMTP id 9637F767
	for <freebsd-gnats-submit@FreeBSD.org>; Tue, 17 Sep 2013 05:51:58 +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 845B42C7E
	for <freebsd-gnats-submit@FreeBSD.org>; Tue, 17 Sep 2013 05:51:58 +0000 (UTC)
Received: from oldred.freebsd.org ([127.0.1.6])
	by oldred.freebsd.org (8.14.5/8.14.7) with ESMTP id r8H5pwJk021781
	for <freebsd-gnats-submit@FreeBSD.org>; Tue, 17 Sep 2013 05:51:58 GMT
	(envelope-from nobody@oldred.freebsd.org)
Received: (from nobody@localhost)
	by oldred.freebsd.org (8.14.5/8.14.5/Submit) id r8H5pwND021724;
	Tue, 17 Sep 2013 05:51:58 GMT
	(envelope-from nobody)
Message-Id: <201309170551.r8H5pwND021724@oldred.freebsd.org>
Date: Tue, 17 Sep 2013 05:51:58 GMT
From: Allan Jude <ports@scaleengine.com>
To: freebsd-gnats-submit@FreeBSD.org
Subject: [maintainer][patch] Update gdnsd to 1.10.0
X-Send-Pr-Version: www-3.1
X-GNATS-Notify:

>Number:         182179
>Category:       ports
>Synopsis:       [maintainer][patch] Update dns/gdnsd to 1.10.0
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    tabthorpe
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          maintainer-update
>Submitter-Id:   current-users
>Arrival-Date:   Tue Sep 17 06:00:00 UTC 2013
>Closed-Date:    Fri Sep 20 04:10:46 UTC 2013
>Last-Modified:  Fri Sep 20 04:20:00 UTC 2013
>Originator:     Allan Jude
>Release:        9.1-RELEASE
>Organization:
ScaleEngine Inc.
>Environment:
FreeBSD gdnsd.build.scaleengine.net 9.1-RELEASE-p7 FreeBSD 9.1-RELEASE-p7 #0: Mon Sep 9 21:34:37 UTC 2013 root@amd64-builder.daemonology.net:/usr/obj/usr/src/sys/GENERIC amd64

>Description:
Upgrade gdnsd to version 1.10.0

update rc.d script for newer syntax ('-d configdir' instead of '-c configfile')

>How-To-Repeat:

>Fix:


Patch attached with submission follows:

diff -ruN gdnsd/Makefile gdnsd_1.10.0/Makefile
--- gdnsd/Makefile	2013-09-05 09:22:10.000000000 +0000
+++ gdnsd_1.10.0/Makefile	2013-09-17 05:28:17.006149000 +0000
@@ -1,8 +1,8 @@
-# Created by: Stefan Caunter <stef@scaleengine.com>
+# Created by: Allan Jude <ports@scaleengine.com>
 # $FreeBSD: dns/gdnsd/Makefile 326374 2013-09-05 09:22:10Z bapt $
 
 PORTNAME=	gdnsd
-PORTVERSION=	1.9.0
+PORTVERSION=	1.10.0
 CATEGORIES=	dns
 MASTER_SITES=	http://downloads.gdnsd.net/ \
 		http://gdnsd.scaleengine.net/gdnsd/
@@ -40,4 +40,10 @@
 RUN_DEPENDS+=	${LOCALBASE}/share/GeoIP/GeoIP.dat:${PORTSDIR}/net/GeoIP
 .endif
 
+
+post-install:
+	${MKDIR} ${PREFIX}/var/run/gdnsd
+	${MKDIR} ${PREFIX}/etc/gdnsd/zones
+	${TOUCH} ${PREFIX}/etc/gdnsd/zones/.keep-me
+
 .include <bsd.port.mk>
diff -ruN gdnsd/distinfo gdnsd_1.10.0/distinfo
--- gdnsd/distinfo	2013-09-02 15:45:53.000000000 +0000
+++ gdnsd_1.10.0/distinfo	2013-09-16 21:24:29.556158000 +0000
@@ -1,2 +1,2 @@
-SHA256 (gdnsd-1.9.0.tar.xz) = 050e52eda89d819ed340ec8cf49210de35c112ee993116906e13c4d2be19d38d
-SIZE (gdnsd-1.9.0.tar.xz) = 620632
+SHA256 (gdnsd-1.10.0.tar.xz) = 43c1c50cf58bc7a5dacb7379bf39276c5f4ebb2b4697d25dba228953015db3af
+SIZE (gdnsd-1.10.0.tar.xz) = 622584
diff -ruN gdnsd/files/gdnsd.in gdnsd_1.10.0/files/gdnsd.in
--- gdnsd/files/gdnsd.in	2012-07-14 13:54:48.000000000 +0000
+++ gdnsd_1.10.0/files/gdnsd.in	2013-09-17 05:29:50.229938000 +0000
@@ -12,37 +12,33 @@
 #
 # gdnsd_enable (bool):	Set to NO by default.
 #				Set it to YES to enable gdnsd.
-# gdnsd_config (path):	Set to %%PREFIX%%/etc/gdnsd/config
-#				by default.
+# gdnsd_flags (str):		Set to "" by default
+#				Extra command line argument flags
 
 . /etc/rc.subr
 
 name="gdnsd"
-rcvar=`set_rcvar`
-command="%%PREFIX%%/sbin/gdnsd"
+rcvar=gdnsd_enable
 
 # set defaults
 load_rc_config $name
 : ${gdnsd_enable:="NO"}
-: ${gdnsd_config="%%PREFIX%%/etc/gdnsd/config"}
-: ${gdnsd_pidfile="%%PREFIX%%/var/run/gdnsd.pid"}
+: ${gdnsd_flags:=""}
 
-required_files=${gdnsd_config}
-command_args="-c ${gdnsd_config} start"
+command="%%PREFIX%%/sbin/gdnsd"
+command_args="${gdnsd_flags} start"
 procname=${command}
-extra_commands="checkconf"
-checkconf_cmd="gdnsd_checkconf"
-
-stop_postcmd=stop_postcmd
-
-stop_postcmd()
+reload_cmd="gdnsd_reload"
+configtest_cmd="gdnsd_checkconf"
+extra_commands="reload configtest"
+gdnsd_reload()
 {
-  rm -f ${gdnsd_pidfile}
+  ${command} ${gdnsd_flags} reload
 }
 
 gdnsd_checkconf()
 {
-  ${command} -c ${gdnsd_config} checkconf
+  ${command} ${gdnsd_flags} checkconf
 }
 
 run_rc_command "$1"
diff -ruN gdnsd/pkg-plist gdnsd_1.10.0/pkg-plist
--- gdnsd/pkg-plist	2013-09-02 15:45:53.000000000 +0000
+++ gdnsd_1.10.0/pkg-plist	2013-09-17 05:24:21.316165000 +0000
@@ -70,6 +70,10 @@
 %%DOCSDIR%%/gdnsd_manual.pod
 %%DOCSDIR%%/gdnsd_manual.txt
 @dirrm %%DOCSDIR%%
-@exec mkdir -p %D/%%ETCDIR%%/gdnsd
+@exec mkdir -p %D/var/run/gdnsd
+@dirrmtry var/run/gdnsd
+etc/gdnsd/zones/.keep-me
+@exec mkdir -p %D/%%ETCDIR%%/gdnsd/zones
+@dirrmtry etc/gdnsd/zones
 @dirrmtry etc/gdnsd
 @stopdaemon gdnsd


>Release-Note:
>Audit-Trail:
Responsible-Changed-From-To: freebsd-ports-bugs->tabthorpe 
Responsible-Changed-By: tabthorpe 
Responsible-Changed-When: Thu Sep 19 15:43:20 UTC 2013 
Responsible-Changed-Why:  
I'll take it. 

http://www.freebsd.org/cgi/query-pr.cgi?pr=182179 
State-Changed-From-To: open->closed 
State-Changed-By: tabthorpe 
State-Changed-When: Fri Sep 20 04:10:45 UTC 2013 
State-Changed-Why:  
Committed, with minor changes. Thanks! 

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

From: dfilter@FreeBSD.ORG (dfilter service)
To: bug-followup@FreeBSD.org
Cc:  
Subject: Re: ports/182179: commit references a PR
Date: Fri, 20 Sep 2013 04:10:29 +0000 (UTC)

 Author: tabthorpe
 Date: Fri Sep 20 04:10:21 2013
 New Revision: 327654
 URL: http://svnweb.freebsd.org/changeset/ports/327654
 
 Log:
   - Update to 1.10.0
   
   PR:		ports/182179
   Submitted by:	Allan Jude <ports@scaleengine.com> (maintainer)
 
 Modified:
   head/dns/gdnsd/Makefile
   head/dns/gdnsd/distinfo
   head/dns/gdnsd/files/gdnsd.in   (contents, props changed)
   head/dns/gdnsd/pkg-plist
 
 Modified: head/dns/gdnsd/Makefile
 ==============================================================================
 --- head/dns/gdnsd/Makefile	Thu Sep 19 22:24:49 2013	(r327653)
 +++ head/dns/gdnsd/Makefile	Fri Sep 20 04:10:21 2013	(r327654)
 @@ -1,8 +1,8 @@
 -# Created by: Stefan Caunter <stef@scaleengine.com>
 +# Created by: Allan Jude <ports@scaleengine.com>
  # $FreeBSD$
  
  PORTNAME=	gdnsd
 -PORTVERSION=	1.9.0
 +PORTVERSION=	1.10.0
  CATEGORIES=	dns
  MASTER_SITES=	http://downloads.gdnsd.net/ \
  		http://gdnsd.scaleengine.net/gdnsd/
 @@ -12,7 +12,7 @@ COMMENT=	Authoritative-only GeoIP-aware 
  
  LICENSE=	GPLv3
  
 -LIB_DEPENDS=	ev:${PORTSDIR}/devel/libev
 +LIB_DEPENDS=	libev.so:${PORTSDIR}/devel/libev
  
  OPTIONS_DEFINE=	GEOIP
  
 @@ -40,4 +40,9 @@ GROUPS?=	gdnsd
  RUN_DEPENDS+=	${LOCALBASE}/share/GeoIP/GeoIP.dat:${PORTSDIR}/net/GeoIP
  .endif
  
 +post-install:
 +	${MKDIR} ${PREFIX}/var/run/gdnsd
 +	${MKDIR} ${PREFIX}/etc/gdnsd/zones
 +	${TOUCH} ${PREFIX}/etc/gdnsd/zones/.keep-me
 +
  .include <bsd.port.mk>
 
 Modified: head/dns/gdnsd/distinfo
 ==============================================================================
 --- head/dns/gdnsd/distinfo	Thu Sep 19 22:24:49 2013	(r327653)
 +++ head/dns/gdnsd/distinfo	Fri Sep 20 04:10:21 2013	(r327654)
 @@ -1,2 +1,2 @@
 -SHA256 (gdnsd-1.9.0.tar.xz) = 050e52eda89d819ed340ec8cf49210de35c112ee993116906e13c4d2be19d38d
 -SIZE (gdnsd-1.9.0.tar.xz) = 620632
 +SHA256 (gdnsd-1.10.0.tar.xz) = 43c1c50cf58bc7a5dacb7379bf39276c5f4ebb2b4697d25dba228953015db3af
 +SIZE (gdnsd-1.10.0.tar.xz) = 622584
 
 Modified: head/dns/gdnsd/files/gdnsd.in
 ==============================================================================
 --- head/dns/gdnsd/files/gdnsd.in	Thu Sep 19 22:24:49 2013	(r327653)
 +++ head/dns/gdnsd/files/gdnsd.in	Fri Sep 20 04:10:21 2013	(r327654)
 @@ -12,37 +12,33 @@
  #
  # gdnsd_enable (bool):	Set to NO by default.
  #				Set it to YES to enable gdnsd.
 -# gdnsd_config (path):	Set to %%PREFIX%%/etc/gdnsd/config
 -#				by default.
 +# gdnsd_flags (str):		Set to "" by default
 +#				Extra command line argument flags
  
  . /etc/rc.subr
  
  name="gdnsd"
 -rcvar=`set_rcvar`
 -command="%%PREFIX%%/sbin/gdnsd"
 +rcvar=gdnsd_enable
  
  # set defaults
  load_rc_config $name
  : ${gdnsd_enable:="NO"}
 -: ${gdnsd_config="%%PREFIX%%/etc/gdnsd/config"}
 -: ${gdnsd_pidfile="%%PREFIX%%/var/run/gdnsd.pid"}
 +: ${gdnsd_flags:=""}
  
 -required_files=${gdnsd_config}
 -command_args="-c ${gdnsd_config} start"
 +command="%%PREFIX%%/sbin/gdnsd"
 +command_args="${gdnsd_flags} start"
  procname=${command}
 -extra_commands="checkconf"
 -checkconf_cmd="gdnsd_checkconf"
 -
 -stop_postcmd=stop_postcmd
 -
 -stop_postcmd()
 +reload_cmd="gdnsd_reload"
 +configtest_cmd="gdnsd_checkconf"
 +extra_commands="reload configtest"
 +gdnsd_reload()
  {
 -  rm -f ${gdnsd_pidfile}
 +  ${command} ${gdnsd_flags} reload
  }
  
  gdnsd_checkconf()
  {
 -  ${command} -c ${gdnsd_config} checkconf
 +  ${command} ${gdnsd_flags} checkconf
  }
  
  run_rc_command "$1"
 
 Modified: head/dns/gdnsd/pkg-plist
 ==============================================================================
 --- head/dns/gdnsd/pkg-plist	Thu Sep 19 22:24:49 2013	(r327653)
 +++ head/dns/gdnsd/pkg-plist	Fri Sep 20 04:10:21 2013	(r327654)
 @@ -70,6 +70,10 @@ sbin/gdnsd
  %%DOCSDIR%%/gdnsd_manual.pod
  %%DOCSDIR%%/gdnsd_manual.txt
  @dirrm %%DOCSDIR%%
 -@exec mkdir -p %D/%%ETCDIR%%/gdnsd
 +@exec mkdir -p %D/var/run/gdnsd
 +@dirrmtry var/run/gdnsd
 +etc/gdnsd/zones/.keep-me
 +@exec mkdir -p %D/%%ETCDIR%%/gdnsd/zones
 +@dirrmtry etc/gdnsd/zones
  @dirrmtry etc/gdnsd
  @stopdaemon gdnsd
 _______________________________________________
 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:
