From: Michael Tremer <michael.tremer@ipfire.org>
Date: Sat, 23 Jul 2011 08:55:02 +0000 (+0200)
Subject: pdns: Update to 3.0.
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=fe7131a4276be30502ebcc39c22d2a40ca5e12cf;p=ipfire-3.x.git

pdns: Update to 3.0.
---

diff --git a/pkgs/pdns/patches/pdns-2.9.22-gcc44-fixes.patch b/pkgs/pdns/patches/pdns-2.9.22-gcc44-fixes.patch
deleted file mode 100644
index cba5412e1..000000000
--- a/pkgs/pdns/patches/pdns-2.9.22-gcc44-fixes.patch
+++ /dev/null
@@ -1,11 +0,0 @@
-diff -up pdns-2.9.22/pdns/misc.hh.orig pdns-2.9.22/pdns/misc.hh
---- pdns-2.9.22/pdns/misc.hh.orig	2009-02-26 17:09:41.000000000 +0100
-+++ pdns-2.9.22/pdns/misc.hh	2009-02-26 17:09:54.000000000 +0100
-@@ -20,6 +20,7 @@
- #define MISC_HH
- #include <stdint.h>
- #include <cstring>
-+#include <cstdio>
- 
- #if 0
- #include <iostream>
diff --git a/pkgs/pdns/patches/pdns-fix-lua-detection.patch b/pkgs/pdns/patches/pdns-fix-lua-detection.patch
new file mode 100644
index 000000000..29b352a86
--- /dev/null
+++ b/pkgs/pdns/patches/pdns-fix-lua-detection.patch
@@ -0,0 +1,12 @@
+diff -up pdns-3.0-rc3/configure.orig pdns-3.0-rc3/configure
+--- pdns-3.0-rc3/configure.orig	2011-07-20 14:09:39.960000514 +0200
++++ pdns-3.0-rc3/configure	2011-07-20 14:09:46.288007162 +0200
+@@ -16494,7 +16494,7 @@ $as_echo_n "checking if with lua... " >&
+ 
+ # 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
diff --git a/pkgs/pdns/pdns.nm b/pkgs/pdns/pdns.nm
index b259d560a..4e572858d 100644
--- a/pkgs/pdns/pdns.nm
+++ b/pkgs/pdns/pdns.nm
@@ -25,8 +25,8 @@
 include $(PKGROOT)/Include
 
 PKG_NAME       = pdns
-PKG_VER        = 2.9.22
-PKG_REL        = 0
+PKG_VER        = 3.0
+PKG_REL        = 1
 
 PKG_MAINTAINER =
 PKG_GROUPS     = Networking/DNS
@@ -34,7 +34,8 @@ PKG_URL        = http://powerdns.com/
 PKG_LICENSE    = GPLv2
 PKG_SUMMARY    = A modern, advanced and high performance authoritative-only nameserver.
 
-PKG_BUILD_DEPS+= boost-devel gcc-c++ openldap-devel sqlite-devel zlib-devel
+PKG_BUILD_DEPS+= boost-devel chrpath gcc-c++ lua-devel openldap-devel \
+	sqlite-devel zlib-devel
 
 define PKG_DESCRIPTION
 	The PowerDNS Nameserver is a modern, advanced and high performance \
@@ -53,4 +54,16 @@ CONFIGURE_OPTIONS += \
 	--sysconfdir=/etc/pdns \
 	--libdir=/usr/lib/powerdns \
 	--with-modules="" \
-	--with-dynmodules="pipe geo ldap gsqlite3"
+	--with-dynmodules="pipe geo ldap gsqlite3" \
+	--with-lua \
+	--disable-static
+
+define STAGE_INSTALL_CMDS
+	chrpath --delete $(BUILDROOT)/usr/bin/pdns_control
+	chrpath --delete $(BUILDROOT)/usr/bin/zone2ldap
+	chrpath --delete $(BUILDROOT)/usr/bin/zone2sql
+	chrpath --delete $(BUILDROOT)/usr/sbin/pdns_server
+	chrpath --delete $(BUILDROOT)/usr/lib/powerdns/*.so
+	chrpath --delete $(BUILDROOT)/usr/bin/dnsreplay
+	chrpath --delete $(BUILDROOT)//usr/bin/pdnssec
+endef
diff --git a/pkgs/pdns/systemd/pdns.service b/pkgs/pdns/systemd/pdns.service
new file mode 100644
index 000000000..d9877ad7c
--- /dev/null
+++ b/pkgs/pdns/systemd/pdns.service
@@ -0,0 +1,13 @@
+[Unit]
+Description=PDNS DNS Server
+After=syslog.target network.target
+
+[Service]
+Type=forking
+ExecStart=/usr/sbin/pdns_server --daemon --guardian=yes
+ExecReload=/usr/bin/pdns_control cycle
+ExecStop=/usr/bin/pdns_control quit
+
+[Install]
+WantedBy=multi-user.target
+