From root@cainites.net  Sun Jan 21 16:25:34 2007
Return-Path: <root@cainites.net>
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
	by hub.freebsd.org (Postfix) with ESMTP id 591B116A404
	for <FreeBSD-gnats-submit@freebsd.org>; Sun, 21 Jan 2007 16:25:34 +0000 (UTC)
	(envelope-from root@cainites.net)
Received: from mail.cainites.net (xs4all.cainites.net [80.126.212.243])
	by mx1.freebsd.org (Postfix) with ESMTP id 183D313C448
	for <FreeBSD-gnats-submit@freebsd.org>; Sun, 21 Jan 2007 16:25:29 +0000 (UTC)
	(envelope-from root@cainites.net)
Received: by mail.cainites.net (Postfix, from userid 0)
	id 95DA8E4; Sun, 21 Jan 2007 17:25:26 +0100 (CET)
Message-Id: <20070121162526.95DA8E4@mail.cainites.net>
Date: Sun, 21 Jan 2007 17:25:26 +0100 (CET)
From: Ralf van der Enden <tremere@cainites.net>
Reply-To: Ralf van der Enden <tremere@cainites.net>
To: FreeBSD-gnats-submit@freebsd.org
Cc:
Subject: dns/powerdns: fix building issues with gpgsql backend and remove sqlite3 backend (added it a bit too soon)
X-Send-Pr-Version: 3.113
X-GNATS-Notify:

>Number:         108182
>Category:       ports
>Synopsis:       dns/powerdns: fix building issues with gpgsql backend and remove sqlite3 backend (added it a bit too soon)
>Confidential:   no
>Severity:       serious
>Priority:       high
>Responsible:    freebsd-ports-bugs
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          maintainer-update
>Submitter-Id:   current-users
>Arrival-Date:   Sun Jan 21 16:30:22 GMT 2007
>Closed-Date:    Tue Jan 30 21:07:02 GMT 2007
>Last-Modified:  Thu Feb  1 20:40:24 GMT 2007
>Originator:     Ralf van der Enden
>Release:        FreeBSD 6.2-RELEASE i386
>Organization:
>Environment:
System: FreeBSD lan.cainites.net 6.2-RELEASE FreeBSD 6.2-RELEASE #0: Mon Jan 15 16:52:24 CET 2007 root@lan.cainites.net:/usr/obj/usr/src/sys/HELLKERNEL i386


	
>Description:
Remove SQLite 3 backend from OPTIONs (will be added in 2.9.21). Added a bit prematurely.
Fix building of the pgsql backend.

Additional information:
In the last update I moved the configuration file from /usr/local/etc to /usr/local/etc/pdns
I did this to match the location of the configfile of the dns/powerdns-recursor port.
Could this be mentioned in the /usr/ports/UPDATING file ?
>How-To-Repeat:
	
>Fix:

	

--- pdns-2.9.20_3.diff begins here ---
diff -ruN powerdns/Makefile powerdns.new/Makefile
--- powerdns/Makefile	Sat Jan 13 00:49:04 2007
+++ powerdns.new/Makefile	Sun Jan 21 17:17:49 2007
@@ -7,7 +7,7 @@
 
 PORTNAME=	powerdns
 PORTVERSION=	2.9.20
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	dns ipv6
 MASTER_SITES=	http://downloads.powerdns.com/releases/ \
 		http://mirrors.evolva.ro/powerdns.com/releases/
@@ -41,7 +41,6 @@
 OPTIONS=	PGSQL           "PostgreSQL backend" on \
 		MYSQL           "MySQL backend" off \
 		SQLITE          "SQLite 2 backend" off \
-		SQLITE3         "SQLite 3 backend" off \
 		OPENDBX         "OpenDBX backend" off \
 		OPENLDAP        "OpenLDAP backend" off \
 		GEO             "Geo backend" off
@@ -96,14 +95,6 @@
 PLIST_SUB+=		WITHSQLITE=""
 .else
 PLIST_SUB+=		WITHSQLITE="@comment "
-.endif
-
-.if defined(WITH_SQLITE3)
-USE_SQLITE?=		3
-CONFIGURE_MODULES+=	"gsqlite"
-PLIST_SUB+=		WITHSQLITE3=""
-.else
-PLIST_SUB+=		WITHSQLITE3="@comment "
 .endif
 
 .if defined(WITH_OPENDBX)
diff -ruN powerdns/files/patch-modules_gpgsqlbackend_Makefile_in powerdns.new/files/patch-modules_gpgsqlbackend_Makefile_in
--- powerdns/files/patch-modules_gpgsqlbackend_Makefile_in	Mon Jul 18 14:59:51 2005
+++ powerdns.new/files/patch-modules_gpgsqlbackend_Makefile_in	Sun Jan 21 17:17:18 2007
@@ -17,12 +17,3 @@
  all: all-am
  
  .SUFFIXES:
-@@ -272,7 +272,7 @@
- 	  rm -f "$${dir}/so_locations"; \
- 	done
- libgpgsqlbackend.la: $(libgpgsqlbackend_la_OBJECTS) $(libgpgsqlbackend_la_DEPENDENCIES) 
--	$(CXXLINK) -rpath $(libdir) $(libgpgsqlbackend_la_LDFLAGS) $(libgpgsqlbackend_la_OBJECTS) $(libgpgsqlbackend_la_LIBADD) $(LIBS)
-+#	$(CXXLINK) -rpath $(libdir) $(libgpgsqlbackend_la_LDFLAGS) $(libgpgsqlbackend_la_OBJECTS) $(libgpgsqlbackend_la_LIBADD) $(LIBS)
- 
- mostlyclean-compile:
- 	-rm -f *.$(OBJEXT)
diff -ruN powerdns/pkg-plist powerdns.new/pkg-plist
--- powerdns/pkg-plist	Sat Jan 13 00:49:04 2007
+++ powerdns.new/pkg-plist	Sun Jan 21 17:18:03 2007
@@ -10,10 +10,6 @@
 %%WITHSQLITE%%lib/libgsqlitebackend.la
 %%WITHSQLITE%%lib/libgsqlitebackend.so
 %%WITHSQLITE%%lib/libgsqlitebackend.so.0
-%%WITHSQLITE3%%lib/libgsqlitebackend.a
-%%WITHSQLITE3%%lib/libgsqlitebackend.la
-%%WITHSQLITE3%%lib/libgsqlitebackend.so
-%%WITHSQLITE3%%lib/libgsqlitebackend.so.0
 %%WITHOPENLDAP%%lib/libldapbackend.a
 %%WITHOPENLDAP%%lib/libldapbackend.la
 %%WITHOPENLDAP%%lib/libldapbackend.so
--- pdns-2.9.20_3.diff ends here ---


>Release-Note:
>Audit-Trail:

From: Tobias Roth <ports@fsck.ch>
To: bug-followup@FreeBSD.org, tremere@cainites.net
Cc:  
Subject: Re: ports/108182: dns/powerdns: fix building issues with gpgsql
 backend and remove sqlite3 backend (added it a bit too soon)
Date: Sun, 28 Jan 2007 21:33:07 +0100

 --MP_/OGu8ReA=KCvGxc07fG07Ka
 Content-Type: text/plain; charset=US-ASCII
 Content-Transfer-Encoding: 7bit
 Content-Disposition: inline
 
 Hi
 
 As discussed with Xride on IRC, the attached patch replaces the above
 one. It fixes the pkg-plist and removes an unneeded file.
 
 Cheers,
 Tobias
 --MP_/OGu8ReA=KCvGxc07fG07Ka
 Content-Type: text/x-patch; name=powerdns.patch
 Content-Transfer-Encoding: 7bit
 Content-Disposition: attachment; filename=powerdns.patch
 
 Index: Makefile
 ===================================================================
 RCS file: /home/ncvs/ports/dns/powerdns/Makefile,v
 retrieving revision 1.52
 diff -u -r1.52 Makefile
 --- Makefile	12 Jan 2007 23:49:04 -0000	1.52
 +++ Makefile	28 Jan 2007 20:28:26 -0000
 @@ -7,7 +7,7 @@
  
  PORTNAME=	powerdns
  PORTVERSION=	2.9.20
 -PORTREVISION=	2
 +PORTREVISION=	3
  CATEGORIES=	dns ipv6
  MASTER_SITES=	http://downloads.powerdns.com/releases/ \
  		http://mirrors.evolva.ro/powerdns.com/releases/
 @@ -41,7 +41,6 @@
  OPTIONS=	PGSQL           "PostgreSQL backend" on \
  		MYSQL           "MySQL backend" off \
  		SQLITE          "SQLite 2 backend" off \
 -		SQLITE3         "SQLite 3 backend" off \
  		OPENDBX         "OpenDBX backend" off \
  		OPENLDAP        "OpenLDAP backend" off \
  		GEO             "Geo backend" off
 @@ -98,14 +97,6 @@
  PLIST_SUB+=		WITHSQLITE="@comment "
  .endif
  
 -.if defined(WITH_SQLITE3)
 -USE_SQLITE?=		3
 -CONFIGURE_MODULES+=	"gsqlite"
 -PLIST_SUB+=		WITHSQLITE3=""
 -.else
 -PLIST_SUB+=		WITHSQLITE3="@comment "
 -.endif
 -
  .if defined(WITH_OPENDBX)
  LIB_DEPENDS+=		opendbx.1:${PORTSDIR}/databases/opendbx
  CONFIGURE_MODULES+=	"opendbx"
 Index: Makefile.inc
 ===================================================================
 RCS file: Makefile.inc
 diff -N Makefile.inc
 Index: pkg-plist
 ===================================================================
 RCS file: /home/ncvs/ports/dns/powerdns/pkg-plist,v
 retrieving revision 1.12
 diff -u -r1.12 pkg-plist
 --- pkg-plist	12 Jan 2007 23:49:04 -0000	1.12
 +++ pkg-plist	28 Jan 2007 20:28:26 -0000
 @@ -2,6 +2,10 @@
  bin/zone2ldap
  bin/zone2sql
  sbin/pdns_server
 +%%WITHPGSQL%%lib/libgpgsqlbackend.a
 +%%WITHPGSQL%%lib/libgpgsqlbackend.la
 +%%WITHPGSQL%%lib/libgpgsqlbackend.so
 +%%WITHPGSQL%%lib/libgpgsqlbackend.so.0
  %%WITHMYSQL%%lib/libgmysqlbackend.a
  %%WITHMYSQL%%lib/libgmysqlbackend.la
  %%WITHMYSQL%%lib/libgmysqlbackend.so
 @@ -10,10 +14,6 @@
  %%WITHSQLITE%%lib/libgsqlitebackend.la
  %%WITHSQLITE%%lib/libgsqlitebackend.so
  %%WITHSQLITE%%lib/libgsqlitebackend.so.0
 -%%WITHSQLITE3%%lib/libgsqlitebackend.a
 -%%WITHSQLITE3%%lib/libgsqlitebackend.la
 -%%WITHSQLITE3%%lib/libgsqlitebackend.so
 -%%WITHSQLITE3%%lib/libgsqlitebackend.so.0
  %%WITHOPENLDAP%%lib/libldapbackend.a
  %%WITHOPENLDAP%%lib/libldapbackend.la
  %%WITHOPENLDAP%%lib/libldapbackend.so
 Index: files/patch-modules_gpgsqlbackend_Makefile_in
 ===================================================================
 RCS file: /home/ncvs/ports/dns/powerdns/files/patch-modules_gpgsqlbackend_Makefile_in,v
 retrieving revision 1.2
 diff -u -r1.2 patch-modules_gpgsqlbackend_Makefile_in
 --- files/patch-modules_gpgsqlbackend_Makefile_in	18 Jul 2005 12:59:51 -0000	1.2
 +++ files/patch-modules_gpgsqlbackend_Makefile_in	28 Jan 2007 20:28:26 -0000
 @@ -17,12 +17,3 @@
   all: all-am
   
   .SUFFIXES:
 -@@ -272,7 +272,7 @@
 - 	  rm -f "$${dir}/so_locations"; \
 - 	done
 - libgpgsqlbackend.la: $(libgpgsqlbackend_la_OBJECTS) $(libgpgsqlbackend_la_DEPENDENCIES) 
 --	$(CXXLINK) -rpath $(libdir) $(libgpgsqlbackend_la_LDFLAGS) $(libgpgsqlbackend_la_OBJECTS) $(libgpgsqlbackend_la_LIBADD) $(LIBS)
 -+#	$(CXXLINK) -rpath $(libdir) $(libgpgsqlbackend_la_LDFLAGS) $(libgpgsqlbackend_la_OBJECTS) $(libgpgsqlbackend_la_LIBADD) $(LIBS)
 - 
 - mostlyclean-compile:
 - 	-rm -f *.$(OBJEXT)
 
 --MP_/OGu8ReA=KCvGxc07fG07Ka--

From: "Ralf van der Enden" <tremere@cainites.net>
To: "Tobias Roth" <ports@fsck.ch>, <bug-followup@FreeBSD.org>
Cc:  
Subject: Re: ports/108182: dns/powerdns: fix building issues with gpgsql  backend and remove sqlite3 backend (added it a bit too soon)
Date: Mon, 29 Jan 2007 09:15:31 +0100

 Hi Tobias,
 
 Looks good to me (almost identical to my own patch), so should be good to 
 commit.
 
 Regards,
 Ralf
 
 ----- Original Message ----- 
 From: "Tobias Roth" <ports@fsck.ch>
 To: <bug-followup@FreeBSD.org>; <tremere@cainites.net>
 Sent: Sunday, January 28, 2007 9:33 PM
 Subject: Re: ports/108182: dns/powerdns: fix building issues with gpgsql 
 backend and remove sqlite3 backend (added it a bit too soon)
 
 
 Hi
 
 As discussed with Xride on IRC, the attached patch replaces the above
 one. It fixes the pkg-plist and removes an unneeded file.
 
 Cheers,
 Tobias 
 
State-Changed-From-To: open->closed 
State-Changed-By: pav 
State-Changed-When: Tue Jan 30 20:48:10 UTC 2007 
State-Changed-Why:  
Committed, thanks! 

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

From: dfilter@FreeBSD.ORG (dfilter service)
To: bug-followup@FreeBSD.org
Cc:  
Subject: Re: ports/108182: commit references a PR
Date: Tue, 30 Jan 2007 21:04:12 +0000 (UTC)

 pav         2007-01-30 21:04:01 UTC
 
   FreeBSD ports repository
 
   Modified files:
     dns/powerdns         Makefile pkg-plist 
     dns/powerdns/files   patch-modules_gpgsqlbackend_Makefile_in 
   Log:
   - Remove SQLITE3 backend option, it was added prematurely
   - Fix plist
   
   PR:             ports/108182
   Submitted by:   Tobias Roth <ports@fsck.ch>
   Approved by:    Ralf van der Enden <tremere@cainites.net> (maintainer)
   
   Revision  Changes    Path
   1.53      +1 -10     ports/dns/powerdns/Makefile
   1.3       +0 -9      ports/dns/powerdns/files/patch-modules_gpgsqlbackend_Makefile_in
   1.13      +4 -4      ports/dns/powerdns/pkg-plist
 _______________________________________________
 cvs-all@freebsd.org mailing list
 http://lists.freebsd.org/mailman/listinfo/cvs-all
 To unsubscribe, send any mail to "cvs-all-unsubscribe@freebsd.org"
 

From: dfilter@FreeBSD.ORG (dfilter service)
To: bug-followup@FreeBSD.org
Cc:  
Subject: Re: ports/108182: commit references a PR
Date: Tue, 30 Jan 2007 21:06:50 +0000 (UTC)

 pav         2007-01-30 21:06:43 UTC
 
   FreeBSD ports repository
 
   Modified files:
     .                    UPDATING 
   Log:
   - Add a note about powerdns config file move
   
   PR:             ports/108182
   Submitted by:   Ralf van der Enden <tremere@cainites.net>
   
   Revision  Changes    Path
   1.451     +7 -1      ports/UPDATING
 _______________________________________________
 cvs-all@freebsd.org mailing list
 http://lists.freebsd.org/mailman/listinfo/cvs-all
 To unsubscribe, send any mail to "cvs-all-unsubscribe@freebsd.org"
 

From: Edmund Craske <edmund@m00is.net>
To: bug-followup@FreeBSD.org,  tremere@cainites.net
Cc:  
Subject: Re: ports/108182: dns/powerdns: fix building issues with gpgsql backend
 and remove sqlite3 backend (added it a bit too soon)
Date: Thu, 01 Feb 2007 20:13:10 +0000

 Hi, it appears that the pdns rc.d script needs updating with the new 
 location of the pdns.conf:
 
 pdns_conf=${pdns_conf:-"/usr/local/etc/pdns.conf"}
 
 should be
 
 pdns_conf=${pdns_conf:-"/usr/local/etc/pdns/pdns.conf"}
 
 If I don't change this, and remove /usr/local/etc/pdns.conf (as would be 
 the case with a new install) then I get an error like so:
 
 Feb  1 19:55:22 alpha m00: /usr/local/etc/rc.d/pdns: WARNING: 
 /usr/local/etc/pdns.conf is not readable.
 
 Also, it's probably a good idea to patch the pdns.conf-dist so that the 
 commented out config file location points to the right place:
 
 # config-dir=/usr/local/etc
 should become
 # config-dir=/usr/local/etc/pdns
 
 As for where pdns looks if this setting is left commented, I am not sure 
 - is it part of the configure process?
 
 Thanks for fixing the gpgsql backend issue :)
 
 Edmund Craske
>Unformatted:
