[csw-devel] SF.net SVN: gar:[17613] csw/mgar/pkg/powerdns/trunk

[wilbury at users.sourceforge.net]

Revision: 17613
          http://gar.svn.sourceforge.net/gar/?rev=17613&view=rev
Author:   wilbury
Date:     2012-04-05 11:39:17 +0000 (Thu, 05 Apr 2012)
Log Message:
-----------
powerdns/trunk: Expand @@SYSCONFDIR@@ properly in some source files.

Modified Paths:
--------------
    csw/mgar/pkg/powerdns/trunk/Makefile

Added Paths:
-----------
    csw/mgar/pkg/powerdns/trunk/files/0009-Expand-SYSCONFDIR-properly.patch

Modified: csw/mgar/pkg/powerdns/trunk/Makefile
===================================================================
--- csw/mgar/pkg/powerdns/trunk/Makefile	2012-04-05 08:19:47 UTC (rev 17612)
+++ csw/mgar/pkg/powerdns/trunk/Makefile	2012-04-05 11:39:17 UTC (rev 17613)
@@ -23,6 +23,7 @@
 PATCHFILES += 0004-Build-only-stub-LUA-pdns-recursor-implementation.-Do.patch
 PATCHFILES += 0005-Use-correct-namespace-for-timegm.patch
 PATCHFILES += 0006-Use-also-llber-with-lldap.patch
+PATCHFILES += 0009-Expand-SYSCONFDIR-properly.patch
 
 WORKSRC = $(WORKDIR)/$(NAME)-$(VERSION)
 

Added: csw/mgar/pkg/powerdns/trunk/files/0009-Expand-SYSCONFDIR-properly.patch
===================================================================
--- csw/mgar/pkg/powerdns/trunk/files/0009-Expand-SYSCONFDIR-properly.patch	                        (rev 0)
+++ csw/mgar/pkg/powerdns/trunk/files/0009-Expand-SYSCONFDIR-properly.patch	2012-04-05 11:39:17 UTC (rev 17613)
@@ -0,0 +1,45 @@
+From 788b727662983e877d1ea7c0762212a4a11e7ea6 Mon Sep 17 00:00:00 2001
+From: Juraj Lutter <wilbury at opencsw.org>
+Date: Thu, 5 Apr 2012 13:36:22 +0200
+Subject: [PATCH] Expand @@SYSCONFDIR@@ properly.
+
+---
+ pdns/dynloader.cc |    4 ++--
+ pdns/receiver.cc  |    4 ++--
+ 2 files changed, 4 insertions(+), 4 deletions(-)
+
+diff --git a/pdns/dynloader.cc b/pdns/dynloader.cc
+index d810278..b7691a7 100644
+--- a/pdns/dynloader.cc
++++ b/pdns/dynloader.cc
+@@ -53,9 +53,9 @@ int main(int argc, char **argv)
+   string s_programname="pdns";
+   string localdir;
+ 
+-  static char pietje[128]="!@@SYSCONFDIR@@:";
++  static char pietje[128]="!/etc/opt/csw/pdns:";
+   ::arg().set("config-dir","Location of configuration directory (pdns.conf)")=
+-    strcmp(pietje+1,"@@SYSCONFDIR@@:") ? pietje+strlen("@@SYSCONFDIR@@:")+1 : SYSCONFDIR;
++    strcmp(pietje+1,"/etc/opt/csw/pdns:") ? pietje+strlen("/etc/opt/csw/pdns:")+1 : SYSCONFDIR;
+   
+   ::arg().set("socket-dir","Where the controlsocket will live")=LOCALSTATEDIR;
+   ::arg().set("remote-address","Remote address to query");
+diff --git a/pdns/receiver.cc b/pdns/receiver.cc
+index e92e67e..887b3eb 100644
+--- a/pdns/receiver.cc
++++ b/pdns/receiver.cc
+@@ -333,9 +333,9 @@ static int guardian(int argc, char **argv)
+ 
+ static void UNIX_declareArguments()
+ {
+-  static char pietje[128]="!@@SYSCONFDIR@@:";
++  static char pietje[128]="!/etc/opt/csw/pdns:";
+   ::arg().set("config-dir","Location of configuration directory (pdns.conf)")=
+-    strcmp(pietje+1,"@@SYSCONFDIR@@:") ? pietje+strlen("@@SYSCONFDIR@@:")+1 : SYSCONFDIR;
++    strcmp(pietje+1,"/etc/opt/csw/pdns:") ? pietje+strlen("/etc/opt/csw/pdns:")+1 : SYSCONFDIR;
+   
+   ::arg().set("config-name","Name of this virtual configuration - will rename the binary image")="";
+   ::arg().set("socket-dir","Where the controlsocket will live")=LOCALSTATEDIR;
+-- 
+1.7.9
+

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.