[csw-devel] SF.net SVN: gar:[17614] csw/mgar/pkg/powerdns/branches
wilbury at users.sourceforge.net
wilbury at users.sourceforge.net
Thu Apr 5 17:09:55 CEST 2012
Revision: 17614
http://gar.svn.sourceforge.net/gar/?rev=17614&view=rev
Author: wilbury
Date: 2012-04-05 15:09:54 +0000 (Thu, 05 Apr 2012)
Log Message:
-----------
powerdns/branches/pdns-3.1-rc1: PowerDNS 3.1-RC1. Work in progress.
Added Paths:
-----------
csw/mgar/pkg/powerdns/branches/pdns-3.1-rc1/
csw/mgar/pkg/powerdns/branches/pdns-3.1-rc1/Makefile
csw/mgar/pkg/powerdns/branches/pdns-3.1-rc1/checksums
csw/mgar/pkg/powerdns/branches/pdns-3.1-rc1/files/
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
Removed Paths:
-------------
csw/mgar/pkg/powerdns/branches/pdns-3.1-rc1/Makefile
csw/mgar/pkg/powerdns/branches/pdns-3.1-rc1/checksums
csw/mgar/pkg/powerdns/branches/pdns-3.1-rc1/files/
csw/mgar/pkg/powerdns/branches/pdns-3.1-rc1/files/0007-Add-llber-to-lldap-for-ldapbackend-to-make-OpenLDAP-.patch
csw/mgar/pkg/powerdns/branches/pdns-3.1-rc1/work/
Deleted: csw/mgar/pkg/powerdns/branches/pdns-3.1-rc1/Makefile
===================================================================
--- csw/mgar/pkg/powerdns/trunk/Makefile 2012-04-04 21:28:08 UTC (rev 17609)
+++ csw/mgar/pkg/powerdns/branches/pdns-3.1-rc1/Makefile 2012-04-05 15:09:54 UTC (rev 17614)
@@ -1,97 +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
-
-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
-
-REINPLACEMENTS += usrlocallib
-REINPLACE_MATCH_usrlocallib = /usr/local/lib
-REINPLACE_WITH_usrlocallib = $(prefix)/lib/pdns
-REINPLACE_FILES_usrlocallib = pdns/pdns.conf
-
-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-3.1-rc1/Makefile (from rev 17613, csw/mgar/pkg/powerdns/trunk/Makefile)
===================================================================
--- csw/mgar/pkg/powerdns/branches/pdns-3.1-rc1/Makefile (rev 0)
+++ csw/mgar/pkg/powerdns/branches/pdns-3.1-rc1/Makefile 2012-04-05 15:09:54 UTC (rev 17614)
@@ -0,0 +1,98 @@
+# 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
Deleted: csw/mgar/pkg/powerdns/branches/pdns-3.1-rc1/checksums
===================================================================
--- csw/mgar/pkg/powerdns/trunk/checksums 2012-04-04 21:28:08 UTC (rev 17609)
+++ csw/mgar/pkg/powerdns/branches/pdns-3.1-rc1/checksums 2012-04-05 15:09:54 UTC (rev 17614)
@@ -1 +0,0 @@
-a67763b2b45d9f3504a24607c5b4068d pdns-3.0.1.tar.gz
Copied: csw/mgar/pkg/powerdns/branches/pdns-3.1-rc1/checksums (from rev 17608, csw/mgar/pkg/powerdns/trunk/checksums)
===================================================================
--- csw/mgar/pkg/powerdns/branches/pdns-3.1-rc1/checksums (rev 0)
+++ csw/mgar/pkg/powerdns/branches/pdns-3.1-rc1/checksums 2012-04-05 15:09:54 UTC (rev 17614)
@@ -0,0 +1 @@
+a67763b2b45d9f3504a24607c5b4068d pdns-3.0.1.tar.gz
Copied: csw/mgar/pkg/powerdns/branches/pdns-3.1-rc1/files/0006-Use-also-llber-with-lldap.patch (from rev 17609, csw/mgar/pkg/powerdns/trunk/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 (rev 0)
+++ 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)
@@ -0,0 +1,20 @@
+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/0007-Add-llber-to-lldap-for-ldapbackend-to-make-OpenLDAP-.patch
===================================================================
--- csw/mgar/pkg/powerdns/trunk/files/0007-Add-llber-to-lldap-for-ldapbackend-to-make-OpenLDAP-.patch 2012-04-04 21:03:48 UTC (rev 17608)
+++ csw/mgar/pkg/powerdns/branches/pdns-3.1-rc1/files/0007-Add-llber-to-lldap-for-ldapbackend-to-make-OpenLDAP-.patch 2012-04-05 15:09:54 UTC (rev 17614)
@@ -1,36 +0,0 @@
-From e72393802b2f4f786f7b7383c8a25a80ff289f33 Mon Sep 17 00:00:00 2001
-From: Juraj Lutter <wilbury at opencsw.org>
-Date: Wed, 4 Apr 2012 22:26:31 +0200
-Subject: [PATCH] Add -llber to -lldap for ldapbackend to make OpenLDAP happy.
-
----
- modules/ldapbackend/Makefile.am | 2 +-
- modules/ldapbackend/Makefile.in | 2 +-
- 2 files changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/modules/ldapbackend/Makefile.am b/modules/ldapbackend/Makefile.am
-index 8709848..abf762e 100644
---- a/modules/ldapbackend/Makefile.am
-+++ b/modules/ldapbackend/Makefile.am
-@@ -5,4 +5,4 @@ EXTRA_DIST = OBJECTFILES OBJECTLIBS
- lib_LTLIBRARIES = libldapbackend.la
- libldapbackend_la_SOURCES = ldapbackend.cc ldapbackend.hh powerldap.hh powerldap.cc utils.hh
- libldapbackend_la_LDFLAGS =-module -avoid-version
--libldapbackend_la_LIBADD =-l at LIBLDAP@
-+libldapbackend_la_LIBADD =-l at LIBLDAP@ -llber
-diff --git a/modules/ldapbackend/Makefile.in b/modules/ldapbackend/Makefile.in
-index 8d3b0d9..ccf27c5 100644
---- a/modules/ldapbackend/Makefile.in
-+++ b/modules/ldapbackend/Makefile.in
-@@ -257,7 +257,7 @@ EXTRA_DIST = OBJECTFILES OBJECTLIBS
- lib_LTLIBRARIES = libldapbackend.la
- libldapbackend_la_SOURCES = ldapbackend.cc ldapbackend.hh powerldap.hh powerldap.cc utils.hh
- libldapbackend_la_LDFLAGS = -module -avoid-version
--libldapbackend_la_LIBADD = -l at LIBLDAP@
-+libldapbackend_la_LIBADD = -l at LIBLDAP@ -llber
- all: all-am
-
- .SUFFIXES:
---
-1.7.9
-
Copied: csw/mgar/pkg/powerdns/branches/pdns-3.1-rc1/files/0009-Expand-SYSCONFDIR-properly.patch (from rev 17613, csw/mgar/pkg/powerdns/trunk/files/0009-Expand-SYSCONFDIR-properly.patch)
===================================================================
--- csw/mgar/pkg/powerdns/branches/pdns-3.1-rc1/files/0009-Expand-SYSCONFDIR-properly.patch (rev 0)
+++ csw/mgar/pkg/powerdns/branches/pdns-3.1-rc1/files/0009-Expand-SYSCONFDIR-properly.patch 2012-04-05 15:09:54 UTC (rev 17614)
@@ -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.
More information about the devel
mailing list