[csw-devel] SF.net SVN: gar:[17605] csw/mgar/pkg/powerdns/trunk
wilbury at users.sourceforge.net
wilbury at users.sourceforge.net
Wed Apr 4 17:48:31 CEST 2012
Revision: 17605
http://gar.svn.sourceforge.net/gar/?rev=17605&view=rev
Author: wilbury
Date: 2012-04-04 15:48:30 +0000 (Wed, 04 Apr 2012)
Log Message:
-----------
powerdns/trunk: Correct dependencies and reinplacements.
Modified Paths:
--------------
csw/mgar/pkg/powerdns/trunk/Makefile
Added Paths:
-----------
csw/mgar/pkg/powerdns/trunk/files/0001-Make-checking-for-LUA-behave-correctly.patch
csw/mgar/pkg/powerdns/trunk/files/0002-Use-sys-isa_defs.h-instead-of-endian.h.patch
csw/mgar/pkg/powerdns/trunk/files/0003-Include-correct-sys-ethernet.h.patch
csw/mgar/pkg/powerdns/trunk/files/0004-Build-only-stub-LUA-pdns-recursor-implementation.-Do.patch
csw/mgar/pkg/powerdns/trunk/files/0005-Use-correct-namespace-for-timegm.patch
Removed Paths:
-------------
csw/mgar/pkg/powerdns/trunk/files/0003-Make-checking-for-LUA-behave-correctly.patch
csw/mgar/pkg/powerdns/trunk/files/0004-Use-sys-isa_defs.h-instead-of-endian.h.patch
csw/mgar/pkg/powerdns/trunk/files/0005-Include-correct-sys-ethernet.h.patch
csw/mgar/pkg/powerdns/trunk/files/0006-Build-only-stub-LUA-pdns-recursor-implementation.-Do.patch
Modified: csw/mgar/pkg/powerdns/trunk/Makefile
===================================================================
--- csw/mgar/pkg/powerdns/trunk/Makefile 2012-04-04 06:35:21 UTC (rev 17604)
+++ csw/mgar/pkg/powerdns/trunk/Makefile 2012-04-04 15:48:30 UTC (rev 17605)
@@ -9,18 +9,16 @@
backends. Current backends include MySQL, PostgreSQL, bind, etc.
endef
-# XXX: Open Issues:
-# - build recursor
-
MASTER_SITES = http://downloads.powerdns.com/releases/
SPKG_SOURCEURL = http://www.powerdns.com/
DISTFILES = $(NAME)-$(VERSION).tar.gz
DISTFILES += LICENSE
DISTFILES += cswpdns
-PATCHFILES += 0003-Make-checking-for-LUA-behave-correctly.patch
-PATCHFILES += 0004-Use-sys-isa_defs.h-instead-of-endian.h.patch
-PATCHFILES += 0006-Build-only-stub-LUA-pdns-recursor-implementation.-Do.patch
-PATCHFILES += 0005-Include-correct-sys-ethernet.h.patch
+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
WORKSRC = $(WORKDIR)/$(NAME)-$(VERSION)
@@ -37,18 +35,30 @@
#PACKAGING_PLATFORMS += solaris9-sparc solaris9-i386
#PACKAGING_PLATFORMS += solaris10-sparc solaris10-i386
PACKAGING_PLATFORMS += solaris10-i386
+NORUNPATH = 1
+REINPLACEMENTS += usrlocaletc
+REINPLACE_MATCH_usrlocaletc = /usr/local/etc
+REINPLACE_WITH_usrlocaletc = /etc/$(prefix)/pdns
+REINPLACE_FILES_usrlocaletc = /etc/$(prefix)/pdns/pdns.conf.CSW
+
# PowerDNS does not have any "test" target
SKIPTEST = 1
CONFIGURE_ARGS = $(DIRPATHS)
CONFIGURE_ARGS += --sysconfdir=/etc/$(prefix)/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"
EXTRA_INC = /opt/csw/gxx/include
+
+# Extra libs for LDAP backend
+EXTRA_LIB = lber
+
LDFLAGS += -L/opt/csw/gxx/lib
PACKAGES = CSWpdns
@@ -60,6 +70,8 @@
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
PACKAGES += CSWlibgeobackend
@@ -82,10 +94,11 @@
SPKG_DESC_CSWlibgmysqlbackend += $(DESCRIPTION), libgmysqlbackend.so
# These are not errors!
-#CHECKPKG_OVERRIDES_CSWlibgeobackend += soname-equals-filename|file=/opt/csw/lib/libgeobackend.so
-#CHECKPKG_OVERRIDES_CSWlibgeobackend += pkginfo-opencsw-repository-uncommitted
-#CHECKPKG_OVERRIDES_CSWlibgmysqlbackend += soname-equals-filename|file=/opt/csw/lib/libgmysqlbackend.so
-#CHECKPKG_OVERRIDES_CSWlibgmysqlbackend += pkginfo-opencsw-repository-uncommitted
+CHECKPKG_OVERRIDES_CSWlibgeobackend += pkginfo-opencsw-repository-uncommitted
+CHECKPKG_OVERRIDES_CSWpdns += file-with-bad-content|/usr/local|root/etc/opt/csw/pdns/pdns.conf.CSW
+CHECKPKG_OVERRIDES_CSWpdns += catalogname-does-not-match-pkgname|pkgname=CSWpdns|catalogname=powerdns|expected-catalogname=pdns
+CHECKPKG_OVERRIDES_CSWpdns += pkginfo-opencsw-repository-uncommitted
+CHECKPKG_OVERRIDES_CSWlibgmysqlbackend += pkginfo-opencsw-repository-uncommitted
INITSMF = /etc/opt/csw/init.d/cswpdns
PRESERVECONF = /etc/opt/csw/pdns/pdns.conf
Copied: csw/mgar/pkg/powerdns/trunk/files/0001-Make-checking-for-LUA-behave-correctly.patch (from rev 17601, csw/mgar/pkg/powerdns/trunk/files/0003-Make-checking-for-LUA-behave-correctly.patch)
===================================================================
--- csw/mgar/pkg/powerdns/trunk/files/0001-Make-checking-for-LUA-behave-correctly.patch (rev 0)
+++ csw/mgar/pkg/powerdns/trunk/files/0001-Make-checking-for-LUA-behave-correctly.patch 2012-04-04 15:48:30 UTC (rev 17605)
@@ -0,0 +1,25 @@
+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
+
Copied: csw/mgar/pkg/powerdns/trunk/files/0002-Use-sys-isa_defs.h-instead-of-endian.h.patch (from rev 17601, csw/mgar/pkg/powerdns/trunk/files/0004-Use-sys-isa_defs.h-instead-of-endian.h.patch)
===================================================================
--- csw/mgar/pkg/powerdns/trunk/files/0002-Use-sys-isa_defs.h-instead-of-endian.h.patch (rev 0)
+++ csw/mgar/pkg/powerdns/trunk/files/0002-Use-sys-isa_defs.h-instead-of-endian.h.patch 2012-04-04 15:48:30 UTC (rev 17605)
@@ -0,0 +1,25 @@
+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
+
Copied: csw/mgar/pkg/powerdns/trunk/files/0003-Include-correct-sys-ethernet.h.patch (from rev 17601, csw/mgar/pkg/powerdns/trunk/files/0005-Include-correct-sys-ethernet.h.patch)
===================================================================
--- csw/mgar/pkg/powerdns/trunk/files/0003-Include-correct-sys-ethernet.h.patch (rev 0)
+++ csw/mgar/pkg/powerdns/trunk/files/0003-Include-correct-sys-ethernet.h.patch 2012-04-04 15:48:30 UTC (rev 17605)
@@ -0,0 +1,28 @@
+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/trunk/files/0003-Make-checking-for-LUA-behave-correctly.patch
===================================================================
--- csw/mgar/pkg/powerdns/trunk/files/0003-Make-checking-for-LUA-behave-correctly.patch 2012-04-04 06:35:21 UTC (rev 17604)
+++ csw/mgar/pkg/powerdns/trunk/files/0003-Make-checking-for-LUA-behave-correctly.patch 2012-04-04 15:48:30 UTC (rev 17605)
@@ -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 3/5] 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
-
Copied: csw/mgar/pkg/powerdns/trunk/files/0004-Build-only-stub-LUA-pdns-recursor-implementation.-Do.patch (from rev 17601, csw/mgar/pkg/powerdns/trunk/files/0006-Build-only-stub-LUA-pdns-recursor-implementation.-Do.patch)
===================================================================
--- csw/mgar/pkg/powerdns/trunk/files/0004-Build-only-stub-LUA-pdns-recursor-implementation.-Do.patch (rev 0)
+++ csw/mgar/pkg/powerdns/trunk/files/0004-Build-only-stub-LUA-pdns-recursor-implementation.-Do.patch 2012-04-04 15:48:30 UTC (rev 17605)
@@ -0,0 +1,25 @@
+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/trunk/files/0004-Use-sys-isa_defs.h-instead-of-endian.h.patch
===================================================================
--- csw/mgar/pkg/powerdns/trunk/files/0004-Use-sys-isa_defs.h-instead-of-endian.h.patch 2012-04-04 06:35:21 UTC (rev 17604)
+++ csw/mgar/pkg/powerdns/trunk/files/0004-Use-sys-isa_defs.h-instead-of-endian.h.patch 2012-04-04 15:48:30 UTC (rev 17605)
@@ -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 4/5] 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/trunk/files/0005-Include-correct-sys-ethernet.h.patch
===================================================================
--- csw/mgar/pkg/powerdns/trunk/files/0005-Include-correct-sys-ethernet.h.patch 2012-04-04 06:35:21 UTC (rev 17604)
+++ csw/mgar/pkg/powerdns/trunk/files/0005-Include-correct-sys-ethernet.h.patch 2012-04-04 15:48:30 UTC (rev 17605)
@@ -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 5/5] 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/trunk/files/0005-Use-correct-namespace-for-timegm.patch
===================================================================
--- csw/mgar/pkg/powerdns/trunk/files/0005-Use-correct-namespace-for-timegm.patch (rev 0)
+++ csw/mgar/pkg/powerdns/trunk/files/0005-Use-correct-namespace-for-timegm.patch 2012-04-04 15:48:30 UTC (rev 17605)
@@ -0,0 +1,25 @@
+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/trunk/files/0006-Build-only-stub-LUA-pdns-recursor-implementation.-Do.patch
===================================================================
--- csw/mgar/pkg/powerdns/trunk/files/0006-Build-only-stub-LUA-pdns-recursor-implementation.-Do.patch 2012-04-04 06:35:21 UTC (rev 17604)
+++ csw/mgar/pkg/powerdns/trunk/files/0006-Build-only-stub-LUA-pdns-recursor-implementation.-Do.patch 2012-04-04 15:48:30 UTC (rev 17605)
@@ -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] 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
-
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