[csw-devel] SF.net SVN: gar:[17616] csw/mgar/pkg/powerdns/branches/pdns-3.1-rc1

wilbury at users.sourceforge.net wilbury at users.sourceforge.net
Thu Apr 5 23:20:23 CEST 2012


Revision: 17616
          http://gar.svn.sourceforge.net/gar/?rev=17616&view=rev
Author:   wilbury
Date:     2012-04-05 21:20:22 +0000 (Thu, 05 Apr 2012)
Log Message:
-----------
powerdns/branches/pdns-3.1-rc1: PowerDNS 3.1-RC1 WIP - adjust PATCHFILES

Modified Paths:
--------------
    csw/mgar/pkg/powerdns/branches/pdns-3.1-rc1/Makefile
    csw/mgar/pkg/powerdns/branches/pdns-3.1-rc1/checksums

Added Paths:
-----------
    csw/mgar/pkg/powerdns/branches/pdns-3.1-rc1/files/0003-Patch-for-Solaris-compilation.patch
    csw/mgar/pkg/powerdns/branches/pdns-3.1-rc1/files/0004-Add-llber-to-make-OpenLDAP-happy.patch

Removed Paths:
-------------
    csw/mgar/pkg/powerdns/branches/pdns-3.1-rc1/files/0001-Make-checking-for-LUA-behave-correctly.patch
    csw/mgar/pkg/powerdns/branches/pdns-3.1-rc1/files/0002-Use-sys-isa_defs.h-instead-of-endian.h.patch
    csw/mgar/pkg/powerdns/branches/pdns-3.1-rc1/files/0003-Include-correct-sys-ethernet.h.patch
    csw/mgar/pkg/powerdns/branches/pdns-3.1-rc1/files/0004-Build-only-stub-LUA-pdns-recursor-implementation.-Do.patch
    csw/mgar/pkg/powerdns/branches/pdns-3.1-rc1/files/0005-Use-correct-namespace-for-timegm.patch
    csw/mgar/pkg/powerdns/branches/pdns-3.1-rc1/files/0006-Use-also-llber-with-lldap.patch
    csw/mgar/pkg/powerdns/branches/pdns-3.1-rc1/files/0009-Expand-SYSCONFDIR-properly.patch

Modified: csw/mgar/pkg/powerdns/branches/pdns-3.1-rc1/Makefile
===================================================================
--- csw/mgar/pkg/powerdns/branches/pdns-3.1-rc1/Makefile	2012-04-05 19:40:28 UTC (rev 17615)
+++ csw/mgar/pkg/powerdns/branches/pdns-3.1-rc1/Makefile	2012-04-05 21:20:22 UTC (rev 17616)
@@ -2,7 +2,7 @@
 # $Id$
 #
 NAME = pdns
-VERSION = 3.0.1
+VERSION = 3.1-rc1
 CATEGORIES = server
 GARTYPE = v2
 
@@ -12,28 +12,32 @@
   backends. Current backends include MySQL, PostgreSQL, bind, etc.
 endef
 
-MASTER_SITES = http://downloads.powerdns.com/releases/
+# Open issues:
+# -llber
+# timegm() in utils.hh ldapbackend
+# endian.h net.c
+# 
+#   AR    libpolarssl.a
+#   ar: creating libpolarssl.a
+#     RL    libpolarssl.a
+#     ar: one of [drqtpmx] must be specified
+#     gmake[5]: *** [libpolarssl.a] Error 1 
+#   ^^^ treba pouzit ranlib
+#
+# @@SYSCONFDIR@@
+# asprintf http://blogs.everycity.co.uk/alasdair/2011/07/vasprintf-and-asprintf-on-solaris-10/
+#
+MASTER_SITES = http://powerdnssec.org/downloads/
 SPKG_SOURCEURL = http://www.powerdns.com/
 DISTFILES  = $(NAME)-$(VERSION).tar.gz
 DISTFILES += LICENSE
 DISTFILES += cswpdns
-PATCHFILES += 0001-Make-checking-for-LUA-behave-correctly.patch
-PATCHFILES += 0002-Use-sys-isa_defs.h-instead-of-endian.h.patch
-PATCHFILES += 0003-Include-correct-sys-ethernet.h.patch
-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)
 
-# File name regex to get notifications about upstream software releases
-UFILES_REGEX = $(NAME)-(\d+(?:\.\d+)*).tar.gz
+PATCHFILES = 0003-Patch-for-Solaris-compilation.patch
+PATCHFILES += 0004-Add-llber-to-make-OpenLDAP-happy.patch
 
-# If the url used to check for software update is different of MASTER_SITES, then 
-# uncomment the next line. Otherwise it is set by default to the value of MASTER_SITES
-# UPSTREAM_MASTER_SITES = 
-
 LICENSE = $(FILEDIR)/LICENSE
 PACKAGING_PLATFORMS +=  solaris10-i386 solaris10-sparc
 

Modified: csw/mgar/pkg/powerdns/branches/pdns-3.1-rc1/checksums
===================================================================
--- csw/mgar/pkg/powerdns/branches/pdns-3.1-rc1/checksums	2012-04-05 19:40:28 UTC (rev 17615)
+++ csw/mgar/pkg/powerdns/branches/pdns-3.1-rc1/checksums	2012-04-05 21:20:22 UTC (rev 17616)
@@ -1 +1 @@
-a67763b2b45d9f3504a24607c5b4068d  pdns-3.0.1.tar.gz
+3e1ac551b4fb9d75be513e9dcfe59115  pdns-3.1-rc1.tar.gz

Deleted: csw/mgar/pkg/powerdns/branches/pdns-3.1-rc1/files/0001-Make-checking-for-LUA-behave-correctly.patch
===================================================================
--- csw/mgar/pkg/powerdns/branches/pdns-3.1-rc1/files/0001-Make-checking-for-LUA-behave-correctly.patch	2012-04-05 19:40:28 UTC (rev 17615)
+++ csw/mgar/pkg/powerdns/branches/pdns-3.1-rc1/files/0001-Make-checking-for-LUA-behave-correctly.patch	2012-04-05 21:20:22 UTC (rev 17616)
@@ -1,25 +0,0 @@
-From fa26498bf683e466fcbcf8b21c2bce06d9024423 Mon Sep 17 00:00:00 2001
-From: Juraj Lutter <wilbury at opencsw.org>
-Date: Tue, 3 Apr 2012 22:06:09 +0200
-Subject: [PATCH 1/4] Make checking for LUA behave correctly.
-
----
- configure |    2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
-
-diff --git a/configure b/configure
-index 1067417..55b5d20 100755
---- a/configure
-+++ b/configure
-@@ -16494,7 +16494,7 @@ $as_echo_n "checking if with lua... " >&6; }
- 
- # Check whether --with-lua was given.
- if test "${with_lua+set}" = set; then :
--  withval=$with_lua; WITH_LUA=$withval]
-+  withval=$with_lua; WITH_LUA=$withval
- else
-   WITH_LUA=yes
- fi
--- 
-1.7.9
-

Deleted: csw/mgar/pkg/powerdns/branches/pdns-3.1-rc1/files/0002-Use-sys-isa_defs.h-instead-of-endian.h.patch
===================================================================
--- csw/mgar/pkg/powerdns/branches/pdns-3.1-rc1/files/0002-Use-sys-isa_defs.h-instead-of-endian.h.patch	2012-04-05 19:40:28 UTC (rev 17615)
+++ csw/mgar/pkg/powerdns/branches/pdns-3.1-rc1/files/0002-Use-sys-isa_defs.h-instead-of-endian.h.patch	2012-04-05 21:20:22 UTC (rev 17616)
@@ -1,25 +0,0 @@
-From abd2e92b705c96a9422cdaff295ac9a3fbee4793 Mon Sep 17 00:00:00 2001
-From: Juraj Lutter <wilbury at opencsw.org>
-Date: Tue, 3 Apr 2012 22:12:41 +0200
-Subject: [PATCH 2/4] Use sys/isa_defs.h instead of endian.h
-
----
- pdns/ext/polarssl/library/net.c |    2 +
- 1 file changed, 2 insertions(+), 0 deletions(-)
-
-diff --git a/pdns/ext/polarssl/library/net.c b/pdns/ext/polarssl/library/net.c
-index 67b52a7..8106b74 100644
---- a/pdns/ext/polarssl/library/net.c
-+++ b/pdns/ext/polarssl/library/net.c
-@@ -59,6 +59,8 @@ static int wsa_init_done = 0;
- #include <sys/endian.h>
- #elif defined(__APPLE__)
- #include <machine/endian.h>
-+#elif defined(sun)
-+#include <sys/isa_defs.h>
- #else
- #include <endian.h>
- #endif
--- 
-1.7.9
-

Deleted: csw/mgar/pkg/powerdns/branches/pdns-3.1-rc1/files/0003-Include-correct-sys-ethernet.h.patch
===================================================================
--- csw/mgar/pkg/powerdns/branches/pdns-3.1-rc1/files/0003-Include-correct-sys-ethernet.h.patch	2012-04-05 19:40:28 UTC (rev 17615)
+++ csw/mgar/pkg/powerdns/branches/pdns-3.1-rc1/files/0003-Include-correct-sys-ethernet.h.patch	2012-04-05 21:20:22 UTC (rev 17616)
@@ -1,28 +0,0 @@
-From c20fa0d61171f461fc5c13be4303815e88d4892c Mon Sep 17 00:00:00 2001
-From: Juraj Lutter <wilbury at opencsw.org>
-Date: Tue, 3 Apr 2012 22:27:38 +0200
-Subject: [PATCH 3/4] Include correct sys/ethernet.h
-
----
- pdns/dnspcap.hh |    4 ++++
- 1 files changed, 4 insertions(+), 0 deletions(-)
-
-diff --git a/pdns/dnspcap.hh b/pdns/dnspcap.hh
-index 66e07b9..60596ff 100644
---- a/pdns/dnspcap.hh
-+++ b/pdns/dnspcap.hh
-@@ -10,7 +10,11 @@
- #include <netinet/in_systm.h>
- #include <netinet/ip.h>
- #include <netinet/udp.h>
-+#ifdef sun
-+#include <sys/ethernet.h>
-+#else
- #include <net/ethernet.h>
-+#endif
- #include <vector>
- #include <boost/format.hpp>
- #include "namespaces.hh"
--- 
-1.7.9
-

Added: csw/mgar/pkg/powerdns/branches/pdns-3.1-rc1/files/0003-Patch-for-Solaris-compilation.patch
===================================================================
--- csw/mgar/pkg/powerdns/branches/pdns-3.1-rc1/files/0003-Patch-for-Solaris-compilation.patch	                        (rev 0)
+++ csw/mgar/pkg/powerdns/branches/pdns-3.1-rc1/files/0003-Patch-for-Solaris-compilation.patch	2012-04-05 21:20:22 UTC (rev 17616)
@@ -0,0 +1,160 @@
+From 050de1b8fdc43e512e71b1e1c3119f8a07d60f89 Mon Sep 17 00:00:00 2001
+From: Juraj Lutter <wilbury at opencsw.org>
+Date: Thu, 5 Apr 2012 22:45:30 +0200
+Subject: [PATCH] Patch for Solaris compilation.
+
+---
+ modules/ldapbackend/utils.hh             |    2 +-
+ pdns/backends/gsql/gsqlbackend.cc        |   71 ++++++++++++++
+ pdns/dnspcap.hh                          |    4 +
+ pdns/ext/polarssl-1.1.1/library/Makefile |    2 +-
+ pdns/ext/polarssl-1.1.1/library/net.c    |    2 +
+ 5 files changed, 157 insertions(+), 80 deletions(-)
+
+diff --git a/modules/ldapbackend/utils.hh b/modules/ldapbackend/utils.hh
+index ba60f9f..25392c3 100644
+--- a/modules/ldapbackend/utils.hh
++++ b/modules/ldapbackend/utils.hh
+@@ -147,7 +147,7 @@ inline time_t str2tstamp( const string& str )
+ 
+         if( tmp != NULL && *tmp == 0 )
+         {
+-        	return timegm( &tm );
++        	return Utility::timegm( &tm );
+         }
+ 
+         return 0;
+diff --git a/pdns/backends/gsql/gsqlbackend.cc b/pdns/backends/gsql/gsqlbackend.cc
+index 2bd8ffc..aede8e6 100644
+--- a/pdns/backends/gsql/gsqlbackend.cc
++++ b/pdns/backends/gsql/gsqlbackend.cc
+@@ -21,6 +21,7 @@
+ # pragma warning ( disable: 4786 )
+ #endif // WIN32
+ 
++#include <sys/varargs.h>
+ #include <string>
+ #include <map>
+ 
+@@ -760,6 +761,76 @@ bool GSQLBackend::get(DNSResourceRecord &r)
+   return false;
+ }
+ 
++#if (defined (__SVR4) && defined (__sun))
++
++extern "C" {
++#define	INIT_SZ	128
++
++/* VARARGS2 */
++int
++vasprintf(char **str, const char *format, va_list ap)
++{
++   char string[INIT_SZ];
++   char *newstr;
++   int ret;
++   size_t len;
++
++   *str = NULL;
++   ret = vsnprintf(string, INIT_SZ, format, ap);
++   if (ret < 0)	/* retain the value of errno from vsnprintf() */
++      return (-1);
++   if (ret < INIT_SZ) {
++      len = ret + 1;
++      if ((newstr = (char*) malloc(len)) == NULL)
++	 return (-1);	/* retain errno from malloc() */
++      (void) strlcpy(newstr, string, len);
++      *str = newstr;
++      return (ret);
++   }
++   /*
++    * We will perform this loop more than once only if some other
++    * thread modifies one of the vasprintf() arguments after our
++    * previous call to vsnprintf().
++    */
++   for (;;) {
++      if (ret == INT_MAX) {	/* Bad length */
++	 errno = ENOMEM;
++	 return (-1);
++      }
++      len = ret + 1;
++      if ((newstr = (char*) malloc(len)) == NULL)
++	 return (-1);	/* retain errno from malloc() */
++      ret = vsnprintf(newstr, len, format, ap);
++      if (ret < 0) {		/* retain errno from vsnprintf() */
++	 free(newstr);
++	 return (-1);
++      }
++      if (ret < len) {
++	 *str = newstr;
++	 return (ret);
++      }
++      free(newstr);
++   }
++}
++
++int
++asprintf(char **str, const char *format, ...)
++{
++   va_list ap;
++   int ret;
++
++   *str = NULL;
++   va_start(ap, format);
++   ret = vasprintf(str, format, ap);
++   va_end(ap);
++
++   return (ret);
++}
++
++} /* extern "C" */
++
++#endif
++
+ bool GSQLBackend::feedRecord(const DNSResourceRecord &r)
+ {
+   char *output;
+diff --git a/pdns/dnspcap.hh b/pdns/dnspcap.hh
+index 66e07b9..607a397 100644
+--- a/pdns/dnspcap.hh
++++ b/pdns/dnspcap.hh
+@@ -10,7 +10,11 @@
+ #include <netinet/in_systm.h>
+ #include <netinet/ip.h>
+ #include <netinet/udp.h>
++#if defined (__sun)
++#include <sys/ethernet.h>
++#else
+ #include <net/ethernet.h>
++#endif
+ #include <vector>
+ #include <boost/format.hpp>
+ #include "namespaces.hh"
+diff --git a/pdns/ext/polarssl-1.1.1/library/Makefile b/pdns/ext/polarssl-1.1.1/library/Makefile
+index 26de4d7..624994c 100644
+--- a/pdns/ext/polarssl-1.1.1/library/Makefile
++++ b/pdns/ext/polarssl-1.1.1/library/Makefile
+@@ -49,7 +49,7 @@ libpolarssl.a: $(OBJS)
+ 	echo "  AR    $@"
+ 	$(AR) r $@ $(OBJS)
+ 	echo "  RL    $@"
+-	$(AR) s $@
++	ranlib $@
+ 
+ libpolarssl.so: libpolarssl.a
+ 	echo "  LD    $@"
+diff --git a/pdns/ext/polarssl-1.1.1/library/net.c b/pdns/ext/polarssl-1.1.1/library/net.c
+index 9724c07..e30aebb 100644
+--- a/pdns/ext/polarssl-1.1.1/library/net.c
++++ b/pdns/ext/polarssl-1.1.1/library/net.c
+@@ -63,6 +63,8 @@ static int wsa_init_done = 0;
+ #include <sys/endian.h>
+ #elif defined(__APPLE__)
+ #include <machine/endian.h>
++#elif defined(sun)
++#include <sys/isa_defs.h>
+ #else
+ #include <endian.h>
+ #endif
+-- 
+1.7.9
+

Added: csw/mgar/pkg/powerdns/branches/pdns-3.1-rc1/files/0004-Add-llber-to-make-OpenLDAP-happy.patch
===================================================================
--- csw/mgar/pkg/powerdns/branches/pdns-3.1-rc1/files/0004-Add-llber-to-make-OpenLDAP-happy.patch	                        (rev 0)
+++ csw/mgar/pkg/powerdns/branches/pdns-3.1-rc1/files/0004-Add-llber-to-make-OpenLDAP-happy.patch	2012-04-05 21:20:22 UTC (rev 17616)
@@ -0,0 +1,20 @@
+From be1063f6b42879daeab42f956fc9e59f2bdda6c5 Mon Sep 17 00:00:00 2001
+From: Juraj Lutter <wilbury at opencsw.org>
+Date: Thu, 5 Apr 2012 23:15:17 +0200
+Subject: [PATCH] Add -llber to make OpenLDAP happy.
+
+---
+ modules/ldapbackend/OBJECTLIBS |    2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+diff --git a/modules/ldapbackend/OBJECTLIBS b/modules/ldapbackend/OBJECTLIBS
+index a787b8d..4adc2f0 100644
+--- a/modules/ldapbackend/OBJECTLIBS
++++ b/modules/ldapbackend/OBJECTLIBS
+@@ -1 +1 @@
+--lldap_r
+\ No newline at end of file
++-lldap_r -llber
+-- 
+1.7.9
+

Deleted: csw/mgar/pkg/powerdns/branches/pdns-3.1-rc1/files/0004-Build-only-stub-LUA-pdns-recursor-implementation.-Do.patch
===================================================================
--- csw/mgar/pkg/powerdns/branches/pdns-3.1-rc1/files/0004-Build-only-stub-LUA-pdns-recursor-implementation.-Do.patch	2012-04-05 19:40:28 UTC (rev 17615)
+++ csw/mgar/pkg/powerdns/branches/pdns-3.1-rc1/files/0004-Build-only-stub-LUA-pdns-recursor-implementation.-Do.patch	2012-04-05 21:20:22 UTC (rev 17616)
@@ -1,25 +0,0 @@
-From 0fa2d44583c27e481565a38c8f8c331cb9c858e1 Mon Sep 17 00:00:00 2001
-From: Juraj Lutter <wilbury at opencsw.org>
-Date: Tue, 3 Apr 2012 23:19:42 +0200
-Subject: [PATCH 4/4] Build only stub LUA pdns recursor implementation. Do not
- check for LIBDIR
-
----
- pdns/lua-pdns-recursor.cc |    2 +-
- 1 file changed, 1 insertion(+), 0 deletions(-)
-
-diff --git a/pdns/lua-pdns-recursor.cc b/pdns/lua-pdns-recursor.cc
-index 5e0dd7f..eb6c380 100644
---- a/pdns/lua-pdns-recursor.cc
-+++ b/pdns/lua-pdns-recursor.cc
-@@ -1,6 +1,6 @@
- #include "lua-pdns-recursor.hh"
- 
--#if !defined(PDNS_ENABLE_LUA) && !defined(LIBDIR)
-+#if !defined(PDNS_ENABLE_LUA)
- 
- // stub implementation
- 
--- 
-1.7.9
-

Deleted: csw/mgar/pkg/powerdns/branches/pdns-3.1-rc1/files/0005-Use-correct-namespace-for-timegm.patch
===================================================================
--- csw/mgar/pkg/powerdns/branches/pdns-3.1-rc1/files/0005-Use-correct-namespace-for-timegm.patch	2012-04-05 19:40:28 UTC (rev 17615)
+++ csw/mgar/pkg/powerdns/branches/pdns-3.1-rc1/files/0005-Use-correct-namespace-for-timegm.patch	2012-04-05 21:20:22 UTC (rev 17616)
@@ -1,25 +0,0 @@
-From f0c281399bfdd40dd9d02d5a3fe07417dd20b070 Mon Sep 17 00:00:00 2001
-From: Juraj Lutter <wilbury at opencsw.org>
-Date: Wed, 4 Apr 2012 13:12:24 +0200
-Subject: [PATCH] Use correct namespace for timegm()
-
----
- modules/ldapbackend/utils.hh |    2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
-
-diff --git a/modules/ldapbackend/utils.hh b/modules/ldapbackend/utils.hh
-index ba60f9f..25392c3 100644
---- a/modules/ldapbackend/utils.hh
-+++ b/modules/ldapbackend/utils.hh
-@@ -147,7 +147,7 @@ inline time_t str2tstamp( const string& str )
- 
-         if( tmp != NULL && *tmp == 0 )
-         {
--		return timegm( &tm );
-+		return Utility::timegm( &tm );
-         }
- 
-         return 0;
--- 
-1.7.9
-

Deleted: csw/mgar/pkg/powerdns/branches/pdns-3.1-rc1/files/0006-Use-also-llber-with-lldap.patch
===================================================================
--- csw/mgar/pkg/powerdns/branches/pdns-3.1-rc1/files/0006-Use-also-llber-with-lldap.patch	2012-04-05 19:40:28 UTC (rev 17615)
+++ csw/mgar/pkg/powerdns/branches/pdns-3.1-rc1/files/0006-Use-also-llber-with-lldap.patch	2012-04-05 21:20:22 UTC (rev 17616)
@@ -1,20 +0,0 @@
-From f1b652f0be4c9f5ef6512a7d2207920bbe74179f Mon Sep 17 00:00:00 2001
-From: Juraj Lutter <wilbury at opencsw.org>
-Date: Wed, 4 Apr 2012 23:17:47 +0200
-Subject: [PATCH] Use also -llber with -lldap
-
----
- modules/ldapbackend/OBJECTLIBS |    2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
-
-diff --git a/modules/ldapbackend/OBJECTLIBS b/modules/ldapbackend/OBJECTLIBS
-index a787b8d..4adc2f0 100644
---- a/modules/ldapbackend/OBJECTLIBS
-+++ b/modules/ldapbackend/OBJECTLIBS
-@@ -1 +1 @@
---lldap_r
-\ No newline at end of file
-+-lldap_r -llber
--- 
-1.7.9
-

Deleted: csw/mgar/pkg/powerdns/branches/pdns-3.1-rc1/files/0009-Expand-SYSCONFDIR-properly.patch
===================================================================
--- csw/mgar/pkg/powerdns/branches/pdns-3.1-rc1/files/0009-Expand-SYSCONFDIR-properly.patch	2012-04-05 19:40:28 UTC (rev 17615)
+++ csw/mgar/pkg/powerdns/branches/pdns-3.1-rc1/files/0009-Expand-SYSCONFDIR-properly.patch	2012-04-05 21:20:22 UTC (rev 17616)
@@ -1,45 +0,0 @@
-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.



More information about the devel mailing list