[csw-devel] SF.net SVN: gar:[21510] csw/mgar/pkg/powerdns/trunk
wilbury at users.sourceforge.net
wilbury at users.sourceforge.net
Mon Jul 15 22:40:10 CEST 2013
Revision: 21510
http://gar.svn.sourceforge.net/gar/?rev=21510&view=rev
Author: wilbury
Date: 2013-07-15 20:40:04 +0000 (Mon, 15 Jul 2013)
Log Message:
-----------
powerdns/trunk: Update to 3.3, recipe adjusting, direct binding, etc...
Modified Paths:
--------------
csw/mgar/pkg/powerdns/trunk/Makefile
csw/mgar/pkg/powerdns/trunk/checksums
Added Paths:
-----------
csw/mgar/pkg/powerdns/trunk/files/0004-Use-PF_UNIX-instead-of-AF_LOCAL.patch
csw/mgar/pkg/powerdns/trunk/files/0005-Correctly-determine-build-user-host.patch
csw/mgar/pkg/powerdns/trunk/files/0006-Correct-defines.patch
Modified: csw/mgar/pkg/powerdns/trunk/Makefile
===================================================================
--- csw/mgar/pkg/powerdns/trunk/Makefile 2013-07-15 07:53:26 UTC (rev 21509)
+++ csw/mgar/pkg/powerdns/trunk/Makefile 2013-07-15 20:40:04 UTC (rev 21510)
@@ -2,7 +2,7 @@
# $Id$
#
NAME = pdns
-VERSION = 3.1
+VERSION = 3.3
GARTYPE = v2
DESCRIPTION = An advanced DNS server with multiple backends
@@ -32,6 +32,9 @@
DISTFILES += LICENSE
DISTFILES += cswpdns
PATCHFILES += 0003-Use-gar-instead-of-ar-for-ranlib.patch
+PATCHFILES += 0004-Use-PF_UNIX-instead-of-AF_LOCAL.patch
+PATCHFILES += 0005-Correctly-determine-build-user-host.patch
+PATCHFILES += 0006-Correct-defines.patch
WORKSRC = $(WORKDIR)/$(NAME)-$(VERSION)
@@ -54,16 +57,12 @@
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-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"
@@ -72,6 +71,8 @@
# 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
+LDFLAGS += -Wl,-B,direct
+LDFLAGS += -Wl,-z,ignore
# PowerDNS does not have any "test" target
SKIPTEST = 1
@@ -79,9 +80,9 @@
PACKAGES = CSWpdns
CATALOGNAME_CSWpdns = powerdns
SPKG_DESC_CSWpdns = PowerDNS
-RUNTIME_DEP_PKGS_CSWpdns += CSWlibz1
+#RUNTIME_DEP_PKGS_CSWpdns += CSWlibz1
RUNTIME_DEP_PKGS_CSWpdns += CSWlibgcc-s1
-RUNTIME_DEP_PKGS_CSWpdns += CSWlibmysqlclient15
+RUNTIME_DEP_PKGS_CSWpdns += CSWlibmysqlclient18
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
@@ -96,6 +97,7 @@
# These are not errors!
CHECKPKG_OVERRIDES_CSWpdns += catalogname-does-not-match-pkgname|pkgname=CSWpdns|catalogname=powerdns|expected-catalogname=pdns
+CHECKPKG_OVERRIDES_CSWpdns += soname-unused
INITSMF = /etc/opt/csw/init.d/cswpdns
PRESERVECONF = /etc/opt/csw/pdns/pdns.conf
Modified: csw/mgar/pkg/powerdns/trunk/checksums
===================================================================
--- csw/mgar/pkg/powerdns/trunk/checksums 2013-07-15 07:53:26 UTC (rev 21509)
+++ csw/mgar/pkg/powerdns/trunk/checksums 2013-07-15 20:40:04 UTC (rev 21510)
@@ -1 +1 @@
-7dedae65403b31a795b2d53a512947fd pdns-3.1.tar.gz
+73932211fe9895e02dc60713fe12c005 pdns-3.3.tar.gz
Added: csw/mgar/pkg/powerdns/trunk/files/0004-Use-PF_UNIX-instead-of-AF_LOCAL.patch
===================================================================
--- csw/mgar/pkg/powerdns/trunk/files/0004-Use-PF_UNIX-instead-of-AF_LOCAL.patch (rev 0)
+++ csw/mgar/pkg/powerdns/trunk/files/0004-Use-PF_UNIX-instead-of-AF_LOCAL.patch 2013-07-15 20:40:04 UTC (rev 21510)
@@ -0,0 +1,25 @@
+From 45fdb1b0623f3e8fafc101046e07d1cf78ae4479 Mon Sep 17 00:00:00 2001
+From: Juraj Lutter <wilbury at opencsw.org>
+Date: Sun, 14 Jul 2013 23:14:56 +0200
+Subject: [PATCH] Use PF_UNIX instead of AF_LOCAL
+
+---
+ modules/pipebackend/coprocess.cc | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/modules/pipebackend/coprocess.cc b/modules/pipebackend/coprocess.cc
+index 8f9f454..ee9c42b 100644
+--- a/modules/pipebackend/coprocess.cc
++++ b/modules/pipebackend/coprocess.cc
+@@ -166,7 +166,7 @@ void CoProcess::sendReceive(const string &snd, string &rcv)
+
+ UnixRemote::UnixRemote(const string& path, int timeout)
+ {
+- d_fd = socket(AF_LOCAL, SOCK_STREAM, 0);
++ d_fd = socket(PF_UNIX, SOCK_STREAM, 0);
+ if(d_fd < 0)
+ throw AhuException("Unable to create UNIX domain socket: "+string(strerror(errno)));
+
+--
+1.8.3.1
+
Added: csw/mgar/pkg/powerdns/trunk/files/0005-Correctly-determine-build-user-host.patch
===================================================================
--- csw/mgar/pkg/powerdns/trunk/files/0005-Correctly-determine-build-user-host.patch (rev 0)
+++ csw/mgar/pkg/powerdns/trunk/files/0005-Correctly-determine-build-user-host.patch 2013-07-15 20:40:04 UTC (rev 21510)
@@ -0,0 +1,39 @@
+From f63be3823949306e6e10760358a4d645dafe75d2 Mon Sep 17 00:00:00 2001
+From: Juraj Lutter <wilbury at opencsw.org>
+Date: Mon, 15 Jul 2013 00:22:19 +0200
+Subject: [PATCH] Correctly determine build user at host
+
+---
+ pdns/Makefile.am | 2 +-
+ pdns/Makefile.in | 2 +-
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/pdns/Makefile.am b/pdns/Makefile.am
+index a9157bb..b52815d 100644
+--- a/pdns/Makefile.am
++++ b/pdns/Makefile.am
+@@ -297,7 +297,7 @@ backends/bind/bindparser.cc:
+
+
+ build_date=$(shell LC_TIME=C date '+%Y%m%d%H%M%S')
+-build_host=$(shell id -u -n)@$(shell hostname -f)
++build_host=$(shell /usr/xpg4/bin/id -u -n)@$(shell uname -n)
+ if RELEASE_BUILD
+ pdns_version=$(PACKAGE_VERSION)
+ dist_host=$(DIST_HOST)
+diff --git a/pdns/Makefile.in b/pdns/Makefile.in
+index 9ff359c..a2b62e0 100644
+--- a/pdns/Makefile.in
++++ b/pdns/Makefile.in
+@@ -922,7 +922,7 @@ misc.cc unix_utility.cc qtype.cc
+ pdns_control_LDFLAGS = @THREADFLAGS@
+ TESTS_ENVIRONMENT = env BOOST_TEST_LOG_LEVEL=message
+ build_date = $(shell LC_TIME=C date '+%Y%m%d%H%M%S')
+-build_host = $(shell id -u -n)@$(shell hostname -f)
++build_host = $(shell /usr/xpg4/bin/id -u -n)@$(shell uname -n)
+ # Do the test in shell, so we don't confuse automake with ifeq/ifneq.
+ @RELEASE_BUILD_FALSE at pdns_version = $(shell test -z "$(git_version)" && echo UNKNOWN || echo "git-$(git_version)")
+ @RELEASE_BUILD_TRUE at pdns_version = $(PACKAGE_VERSION)
+--
+1.8.3.1
+
Added: csw/mgar/pkg/powerdns/trunk/files/0006-Correct-defines.patch
===================================================================
--- csw/mgar/pkg/powerdns/trunk/files/0006-Correct-defines.patch (rev 0)
+++ csw/mgar/pkg/powerdns/trunk/files/0006-Correct-defines.patch 2013-07-15 20:40:04 UTC (rev 21510)
@@ -0,0 +1,29 @@
+From f96765da7184034ecf9962a98425ff88326f3541 Mon Sep 17 00:00:00 2001
+From: Juraj Lutter <wilbury at opencsw.org>
+Date: Mon, 15 Jul 2013 00:24:19 +0200
+Subject: [PATCH 7/7] Correct #defines
+
+---
+ pdns/nameserver.cc | 5 ++---
+ 1 file changed, 2 insertions(+), 3 deletions(-)
+
+diff --git a/pdns/nameserver.cc b/pdns/nameserver.cc
+index 3efe3ca..ceb4c87 100644
+--- a/pdns/nameserver.cc
++++ b/pdns/nameserver.cc
+@@ -76,10 +76,9 @@ extern StatBag S;
+ The main() of PowerDNS can be found in receiver.cc - start reading there for further insights into the operation of the nameserver
+ */
+
+-#ifdef IP_PKTINFO
++#if defined (IP_PKTINFO)
+ #define GEN_IP_PKTINFO IP_PKTINFO
+-#endif
+-#ifdef IP_RECVDSTADDR
++#elif defined (IP_RECVDSTADDR)
+ #define GEN_IP_PKTINFO IP_RECVDSTADDR
+ #endif
+
+--
+1.8.3.1
+
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