[csw-devel] SF.net SVN: gar:[17637] csw/mgar/pkg/powerdns/branches
wilbury at users.sourceforge.net
wilbury at users.sourceforge.net
Mon Apr 9 23:31:49 CEST 2012
Revision: 17637
http://gar.svn.sourceforge.net/gar/?rev=17637&view=rev
Author: wilbury
Date: 2012-04-09 21:31:48 +0000 (Mon, 09 Apr 2012)
Log Message:
-----------
powerdns/branches/pdns-current: PowerDNS 3-CURRENT
Added Paths:
-----------
csw/mgar/pkg/powerdns/branches/pdns-current/
csw/mgar/pkg/powerdns/branches/pdns-current/Makefile
csw/mgar/pkg/powerdns/branches/pdns-current/checksums
Removed Paths:
-------------
csw/mgar/pkg/powerdns/branches/pdns-current/Makefile
csw/mgar/pkg/powerdns/branches/pdns-current/checksums
csw/mgar/pkg/powerdns/branches/pdns-current/files/0001-Make-checking-for-LUA-behave-correctly.patch
csw/mgar/pkg/powerdns/branches/pdns-current/files/0002-Use-sys-isa_defs.h-instead-of-endian.h.patch
csw/mgar/pkg/powerdns/branches/pdns-current/files/0003-Include-correct-sys-ethernet.h.patch
csw/mgar/pkg/powerdns/branches/pdns-current/files/0004-Build-only-stub-LUA-pdns-recursor-implementation.-Do.patch
csw/mgar/pkg/powerdns/branches/pdns-current/files/0005-Use-correct-namespace-for-timegm.patch
csw/mgar/pkg/powerdns/branches/pdns-current/files/0006-Use-also-llber-with-lldap.patch
csw/mgar/pkg/powerdns/branches/pdns-current/files/0009-Expand-SYSCONFDIR-properly.patch
Deleted: csw/mgar/pkg/powerdns/branches/pdns-current/Makefile
===================================================================
--- csw/mgar/pkg/powerdns/branches/pdns-3.1-rc1/Makefile 2012-04-05 15:09:54 UTC (rev 17614)
+++ csw/mgar/pkg/powerdns/branches/pdns-current/Makefile 2012-04-09 21:31:48 UTC (rev 17637)
@@ -1,98 +0,0 @@
-# PowerDNS
-# $Id$
-#
-NAME = pdns
-VERSION = 3.0.1
-CATEGORIES = server
-GARTYPE = v2
-
-DESCRIPTION = An advanced DNS server with multiple backends
-define BLURB
- PowerDNS is an advanced DNS server, which allows for several different
- backends. Current backends include MySQL, PostgreSQL, bind, etc.
-endef
-
-MASTER_SITES = http://downloads.powerdns.com/releases/
-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
-
-# 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
-
-GARCOMPILER = GNU
-NORUNPATH = 1
-
-REINPLACEMENTS += usrlocaletc
-REINPLACE_MATCH_usrlocaletc = /usr/local/etc
-REINPLACE_WITH_usrlocaletc = /etc$(prefix)/pdns
-REINPLACE_FILES_usrlocaletc = pdns/pdns.conf-dist
-
-REINPLACEMENTS += usrlocallib
-REINPLACE_MATCH_usrlocallib = /usr/local/lib
-REINPLACE_WITH_usrlocallib = $(prefix)/lib/pdns
-REINPLACE_FILES_usrlocallib = pdns/pdns.conf-dist
-
-CONFIGURE_ARGS = $(DIRPATHS)
-CONFIGURE_ARGS += --sysconfdir=/etc/$(prefix)/pdns
-CONFIGURE_ARGS += --libdir=$(prefix)/lib/pdns
-CONFIGURE_ARGS += --disable-recursor
-CONFIGURE_ARGS += --with-lua=no
-CONFIGURE_ARGS += --with-boost=/opt/csw/gxx
-CONFIGURE_ARGS += --with-mysql=$(prefix)
-CONFIGURE_ARGS += --with-mysql-lib=$(prefix)/lib
-CONFIGURE_ARGS += --with-mysql-includes=$(prefix)/include
-CONFIGURE_ARGS += --with-modules="ldap geo gmysql"
-
-# Prepend Boost 1.49 installation in paths so we pick up the correct one
-EXTRA_INC = /opt/csw/gxx/include
-LDFLAGS += -L/opt/csw/gxx/lib
-
-# PowerDNS does not have any "test" target
-SKIPTEST = 1
-
-PACKAGES = CSWpdns
-CATALOGNAME_CSWpdns = powerdns
-SPKG_DESC_CSWpdns = PowerDNS
-RUNTIME_DEP_PKGS_CSWpdns += CSWlibz1
-RUNTIME_DEP_PKGS_CSWpdns += CSWlibgcc-s1
-RUNTIME_DEP_PKGS_CSWpdns += CSWlibmysqlclient15
-RUNTIME_DEP_PKGS_CSWpdns += CSWlibstdc++6
-RUNTIME_DEP_PKGS_CSWpdns += CSWlibboost-prog-opts1-49-0-gxx
-RUNTIME_DEP_PKGS_CSWpdns += CSWlibboost-s13n1-49-0-gxx
-RUNTIME_DEP_PKGS_CSWpdns += CSWliblber2-4-2
-RUNTIME_DEP_PKGS_CSWpdns += CSWlibldap-r2-4-2
-BUILD_DEP_PKGS = CSWmysql-dev CSWboostdevel
-
-# These are not errors!
-CHECKPKG_OVERRIDES_CSWpdns += catalogname-does-not-match-pkgname|pkgname=CSWpdns|catalogname=powerdns|expected-catalogname=pdns
-
-INITSMF = /etc/opt/csw/init.d/cswpdns
-PRESERVECONF = /etc/opt/csw/pdns/pdns.conf
-
-post-install-modulated:
- @echo " ==> Installing Init Script"
- @ginstall -d $(DESTDIR)/etc/opt/csw/init.d
- @ginstall -m 755 $(FILEDIR)/cswpdns $(DESTDIR)/etc/opt/csw/init.d/cswpdns
- @echo " ==> Moving config file"
- @mv $(DESTDIR)/etc/opt/csw/pdns/pdns.conf-dist $(DESTDIR)/etc/opt/csw/pdns/pdns.conf
- @$(MAKECOOKIE)
-
-include gar/category.mk
Copied: csw/mgar/pkg/powerdns/branches/pdns-current/Makefile (from rev 17622, csw/mgar/pkg/powerdns/branches/pdns-3.1-rc1/Makefile)
===================================================================
--- csw/mgar/pkg/powerdns/branches/pdns-current/Makefile (rev 0)
+++ csw/mgar/pkg/powerdns/branches/pdns-current/Makefile 2012-04-09 21:31:48 UTC (rev 17637)
@@ -0,0 +1,111 @@
+# PowerDNS
+# $Id$
+#
+NAME = pdns
+VERSION = current-r2559
+CATEGORIES = server
+GARTYPE = v2
+
+DESCRIPTION = An advanced DNS server with multiple backends
+define BLURB
+ PowerDNS is an advanced DNS server, which allows for several different
+ backends. Current backends include MySQL, PostgreSQL, bind, etc.
+endef
+
+# 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://sk.freebsd.org/pub/local/distfiles/
+SPKG_SOURCEURL = http://www.powerdns.com/
+DISTFILES = $(NAME)-$(VERSION).tar.gz
+DISTFILES += LICENSE
+DISTFILES += cswpdns
+
+WORKSRC = $(WORKDIR)/$(NAME)
+
+LICENSE = $(FILEDIR)/LICENSE
+PACKAGING_PLATFORMS = solaris10-i386
+
+GARCOMPILER = GNU
+NORUNPATH = 1
+
+REINPLACEMENTS += usrlocaletc
+REINPLACE_MATCH_usrlocaletc = /usr/local/etc
+REINPLACE_WITH_usrlocaletc = /etc$(prefix)/pdns
+REINPLACE_FILES_usrlocaletc = pdns/pdns.conf-dist
+
+REINPLACEMENTS += usrlocallib
+REINPLACE_MATCH_usrlocallib = /usr/local/lib
+REINPLACE_WITH_usrlocallib = $(prefix)/lib/pdns
+REINPLACE_FILES_usrlocallib = pdns/pdns.conf-dist
+
+CONFIGURE_ARGS = $(DIRPATHS)
+CONFIGURE_ARGS += --sysconfdir=/etc/$(prefix)/pdns
+CONFIGURE_ARGS += --libdir=$(prefix)/lib/pdns
+CONFIGURE_ARGS += --enable-recursor
+CONFIGURE_ARGS += --with-lua=no
+CONFIGURE_ARGS += --with-boost=/opt/csw/gxx
+CONFIGURE_ARGS += --with-mysql=$(prefix)
+CONFIGURE_ARGS += --with-mysql-lib=$(prefix)/lib
+CONFIGURE_ARGS += --with-mysql-includes=$(prefix)/include
+CONFIGURE_ARGS += --with-sqlite3
+CONFIGURE_ARGS += --with-sqlite=$(prefix)
+CONFIGURE_ARGS += --with-sqlite-lib=$(prefix)/lib
+CONFIGURE_ARGS += --with-sqlite-includes=$(prefix)/include
+CONFIGURE_ARGS += --with-modules="ldap geo gmysql gsqlite3"
+
+EXTRA_CONFIGURE_ENV += "PKG_CONFIG=/opt/csw/bin/pkg-config"
+EXTRA_CONFIGURE_ENV += "PKG_CONFIG_PATH=/opt/csw/lib/pkgconfig"
+
+# Prepend Boost 1.49 installation in paths so we pick up the correct one
+EXTRA_INC = /opt/csw/gxx/include
+LDFLAGS += -L/opt/csw/gxx/lib
+
+# PowerDNS does not have any "test" target
+SKIPTEST = 1
+
+PACKAGES = CSWpdns
+CATALOGNAME_CSWpdns = powerdns
+SPKG_DESC_CSWpdns = PowerDNS
+RUNTIME_DEP_PKGS_CSWpdns += CSWlibz1
+RUNTIME_DEP_PKGS_CSWpdns += CSWlibgcc-s1
+RUNTIME_DEP_PKGS_CSWpdns += CSWlibmysqlclient15
+RUNTIME_DEP_PKGS_CSWpdns += CSWlibstdc++6
+RUNTIME_DEP_PKGS_CSWpdns += CSWlibboost-prog-opts1-49-0-gxx
+RUNTIME_DEP_PKGS_CSWpdns += CSWlibboost-s13n1-49-0-gxx
+RUNTIME_DEP_PKGS_CSWpdns += CSWliblber2-4-2
+RUNTIME_DEP_PKGS_CSWpdns += CSWlibldap-r2-4-2
+RUNTIME_DEP_PKGS_CSWpdns += CSWlibsqlite3-0
+BUILD_DEP_PKGS = CSWmysql-dev CSWboostdevel CSWlibsqlite3-dev CSWopenldap-dev CSWlibz-dev
+
+# These are not errors!
+CHECKPKG_OVERRIDES_CSWpdns += catalogname-does-not-match-pkgname|pkgname=CSWpdns|catalogname=powerdns|expected-catalogname=pdns
+
+INITSMF = /etc/opt/csw/init.d/cswpdns
+PRESERVECONF = /etc/opt/csw/pdns/pdns.conf
+
+pre-configure-modulated:
+ (cd $(WORKSRC) && autoreconf -i && ./bootstrap)
+ @$(MAKECOOKIE)
+
+post-install-modulated:
+ @echo " ==> Installing Init Script"
+ @ginstall -d $(DESTDIR)/etc/opt/csw/init.d
+ @ginstall -m 755 $(FILEDIR)/cswpdns $(DESTDIR)/etc/opt/csw/init.d/cswpdns
+ @echo " ==> Moving config file"
+ @mv $(DESTDIR)/etc/opt/csw/pdns/pdns.conf-dist $(DESTDIR)/etc/opt/csw/pdns/pdns.conf
+ @$(MAKECOOKIE)
+
+include gar/category.mk
Deleted: csw/mgar/pkg/powerdns/branches/pdns-current/checksums
===================================================================
--- csw/mgar/pkg/powerdns/branches/pdns-3.1-rc1/checksums 2012-04-05 15:09:54 UTC (rev 17614)
+++ csw/mgar/pkg/powerdns/branches/pdns-current/checksums 2012-04-09 21:31:48 UTC (rev 17637)
@@ -1 +0,0 @@
-a67763b2b45d9f3504a24607c5b4068d pdns-3.0.1.tar.gz
Copied: csw/mgar/pkg/powerdns/branches/pdns-current/checksums (from rev 17616, csw/mgar/pkg/powerdns/branches/pdns-3.1-rc1/checksums)
===================================================================
--- csw/mgar/pkg/powerdns/branches/pdns-current/checksums (rev 0)
+++ csw/mgar/pkg/powerdns/branches/pdns-current/checksums 2012-04-09 21:31:48 UTC (rev 17637)
@@ -0,0 +1 @@
+ea2c3c45f2753f48830018e9682ca14a pdns-current-r2559.tar.gz
Deleted: csw/mgar/pkg/powerdns/branches/pdns-current/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 15:09:54 UTC (rev 17614)
+++ csw/mgar/pkg/powerdns/branches/pdns-current/files/0001-Make-checking-for-LUA-behave-correctly.patch 2012-04-09 21:31:48 UTC (rev 17637)
@@ -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-current/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 15:09:54 UTC (rev 17614)
+++ csw/mgar/pkg/powerdns/branches/pdns-current/files/0002-Use-sys-isa_defs.h-instead-of-endian.h.patch 2012-04-09 21:31:48 UTC (rev 17637)
@@ -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-current/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 15:09:54 UTC (rev 17614)
+++ csw/mgar/pkg/powerdns/branches/pdns-current/files/0003-Include-correct-sys-ethernet.h.patch 2012-04-09 21:31:48 UTC (rev 17637)
@@ -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
-
Deleted: csw/mgar/pkg/powerdns/branches/pdns-current/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 15:09:54 UTC (rev 17614)
+++ csw/mgar/pkg/powerdns/branches/pdns-current/files/0004-Build-only-stub-LUA-pdns-recursor-implementation.-Do.patch 2012-04-09 21:31:48 UTC (rev 17637)
@@ -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-current/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 15:09:54 UTC (rev 17614)
+++ csw/mgar/pkg/powerdns/branches/pdns-current/files/0005-Use-correct-namespace-for-timegm.patch 2012-04-09 21:31:48 UTC (rev 17637)
@@ -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-current/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 15:09:54 UTC (rev 17614)
+++ csw/mgar/pkg/powerdns/branches/pdns-current/files/0006-Use-also-llber-with-lldap.patch 2012-04-09 21:31:48 UTC (rev 17637)
@@ -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-current/files/0009-Expand-SYSCONFDIR-properly.patch
===================================================================
--- csw/mgar/pkg/powerdns/branches/pdns-3.1-rc1/files/0009-Expand-SYSCONFDIR-properly.patch 2012-04-05 15:09:54 UTC (rev 17614)
+++ csw/mgar/pkg/powerdns/branches/pdns-current/files/0009-Expand-SYSCONFDIR-properly.patch 2012-04-09 21:31:48 UTC (rev 17637)
@@ -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