8 files changed, 22 insertions, 170 deletions

diff --git a/dns/powerdns/Makefile b/dns/powerdns/Makefile
index 8dd6627ca4d3..f964b4f0b2c5 100644
--- a/dns/powerdns/Makefile
+++ b/dns/powerdns/Makefile
@@ -6,8 +6,8 @@
 #
 
 PORTNAME=	powerdns
-PORTVERSION=	3.0.1
-PORTREVISION=	1
+PORTVERSION=	3.1
+PORTREVISION?=	0
 CATEGORIES=	dns ipv6
 MASTER_SITES=	http://downloads.powerdns.com/releases/ \
 		http://mirrors.evolva.ro/powerdns.com/releases/
@@ -16,6 +16,8 @@ DISTNAME=	pdns-${PORTVERSION}
 MAINTAINER=	tremere@cainites.net
 COMMENT=	An advanced DNS server with multiple backends including SQL
 
+LICENSE=	GPLv2
+
 BUILD_DEPENDS=	bjam:${PORTSDIR}/devel/boost-jam \
 		${LOCALBASE}/lib/libcryptopp.a:${PORTSDIR}/security/cryptopp
 LIB_DEPENDS=	botan.0:${PORTSDIR}/security/botan \
diff --git a/dns/powerdns/distinfo b/dns/powerdns/distinfo
index 9d3a15603192..1342de235a9e 100644
--- a/dns/powerdns/distinfo
+++ b/dns/powerdns/distinfo
@@ -1,2 +1,2 @@
-SHA256 (pdns-3.0.1.tar.gz) = 922554431737b4a8126a8c4b5be3126eb8bf8ac2a086e3030d1cf4b3dfa7d1b9
-SIZE (pdns-3.0.1.tar.gz) = 1196471
+SHA256 (pdns-3.1.tar.gz) = 1400f7bd659207c0b1f4b8296092e559a7b7bf6a2434951970217d9af06922a1
+SIZE (pdns-3.1.tar.gz) = 1268532
diff --git a/dns/powerdns/files/patch-embedded_polarssl b/dns/powerdns/files/patch-embedded_polarssl
deleted file mode 100644
index 56747e31cf17..000000000000
--- a/dns/powerdns/files/patch-embedded_polarssl
+++ /dev/null
@@ -1,109 +0,0 @@
---- pdns/Makefile.in.orig	2011-07-22 13:26:07.000000000 +0200
-+++ pdns/Makefile.in	2011-08-11 11:21:08.000000000 +0200
-@@ -598,7 +598,7 @@
- top_build_prefix = @top_build_prefix@
- top_builddir = @top_builddir@
- top_srcdir = @top_srcdir@
--AM_CXXFLAGS = -DSYSCONFDIR=\"@sysconfdir@\" -DLIBDIR=\"@libdir@\" -DLOCALSTATEDIR=\"@socketdir@\" -Ibackends/bind @THREADFLAGS@ $(LUA_CFLAGS) -Iext/polarssl/include
-+AM_CXXFLAGS = -DSYSCONFDIR=\"@sysconfdir@\" -DLIBDIR=\"@libdir@\" -DLOCALSTATEDIR=\"@socketdir@\" -Ibackends/bind @THREADFLAGS@ $(LUA_CFLAGS)
- AM_CPPFLAGS = -Ibackends/bind $(BOOST_CPPFLAGS) @THREADFLAGS@
- EXTRA_DIST = dnslabeltext.rl dnslabeltext.cc mtasker.cc inflighter.cc docs/pdns_control.8  docs/pdns_server.8 docs/zone2sql.8
- SUBDIRS = ext/polarssl backends 
-@@ -634,8 +634,8 @@
- 	$(am__append_3) $(am__append_5)
- 
- #
--pdns_server_LDFLAGS = @moduleobjects@ @modulelibs@ @DYNLINKFLAGS@ @LIBDL@ @THREADFLAGS@  -Lext/polarssl/library $(BOOST_SERIALIZATION_LDFLAGS)  -rdynamic
--pdns_server_LDADD = -lpolarssl $(BOOST_SERIALIZATION_LIBS) $(LUA_LIBS) \
-+pdns_server_LDFLAGS = @moduleobjects@ @modulelibs@ @DYNLINKFLAGS@ @LIBDL@ @THREADFLAGS@  $(BOOST_SERIALIZATION_LDFLAGS)  -rdynamic
-+pdns_server_LDADD = ext/polarssl/library/libpolarssl.a $(BOOST_SERIALIZATION_LIBS) $(LUA_LIBS) \
- 	$(am__append_2) $(am__append_4) $(am__append_6)
- pdnssec_SOURCES = pdnssec.cc dbdnsseckeeper.cc sstuff.hh dnsparser.cc \
- 	dnsparser.hh dnsrecords.cc dnswriter.cc dnswriter.hh misc.cc \
-@@ -650,8 +650,8 @@
- 	randombackend.cc dnssecsigner.cc polarrsakeyinfra.cc md5.cc \
- 	signingpipe.cc dnslabeltext.cc ednssubnet.cc $(am__append_7) \
- 	$(am__append_9) $(am__append_11)
--pdnssec_LDFLAGS = @moduleobjects@ @modulelibs@ @DYNLINKFLAGS@ @LIBDL@ @THREADFLAGS@ -Lext/polarssl/library/ $(BOOST_PROGRAM_OPTIONS_LDFLAGS) $(BOOST_SERIALIZATION_LDFLAGS)
--pdnssec_LDADD = -lpolarssl $(BOOST_PROGRAM_OPTIONS_LIBS) \
-+pdnssec_LDFLAGS = @moduleobjects@ @modulelibs@ @DYNLINKFLAGS@ @LIBDL@ @THREADFLAGS@ $(BOOST_PROGRAM_OPTIONS_LDFLAGS) $(BOOST_SERIALIZATION_LDFLAGS)
-+pdnssec_LDADD = ext/polarssl/library/libpolarssl.a $(BOOST_PROGRAM_OPTIONS_LIBS) \
- 	$(BOOST_SERIALIZATION_LIBS) $(am__append_8) $(am__append_10) \
- 	$(am__append_12)
- sdig_SOURCES = sdig.cc sstuff.hh dnsparser.cc dnsparser.hh dnsrecords.cc dnswriter.cc dnslabeltext.cc dnswriter.hh \
-@@ -675,8 +675,7 @@
- 	aes/aestab.c aes/aestab.h aes/brg_endian.h aes/brg_types.h aes/dns_random.cc \
- 	randomhelper.cc dns.cc
- 
--tsig_tests_LDFLAGS = -Lext/polarssl/library 	
--tsig_tests_LDADD = -lpolarssl
-+tsig_tests_LDADD = ext/polarssl/library/libpolarssl.a
- speedtest_SOURCES = speedtest.cc dnsparser.cc dnsparser.hh dnsrecords.cc dnswriter.cc dnslabeltext.cc dnswriter.hh \
- 	misc.cc misc.hh rcpgenerator.cc rcpgenerator.hh base64.cc base64.hh unix_utility.cc \
- 	qtype.cc sillyrecords.cc logger.cc statbag.cc nsecrecords.cc base32.cc
---- pdns/polarrsakeyinfra.cc.orig	2011-07-22 13:23:22.000000000 +0200
-+++ pdns/polarrsakeyinfra.cc	2011-08-11 11:24:24.000000000 +0200
-@@ -1,9 +1,9 @@
--#include <polarssl/rsa.h>
--#include <polarssl/base64.h>
--#include <polarssl/sha1.h>
--#include <polarssl/sha2.h>
--#include <polarssl/sha4.h>
--#include <polarssl/havege.h>
-+#include "ext/polarssl/include/polarssl/rsa.h"
-+#include "ext/polarssl/include/polarssl/base64.h"
-+#include "ext/polarssl/include/polarssl/sha1.h"
-+#include "ext/polarssl/include/polarssl/sha2.h"
-+#include "ext/polarssl/include/polarssl/sha4.h"
-+#include "ext/polarssl/include/polarssl/havege.h"
- #include <boost/assign/std/vector.hpp> // for 'operator+=()'
- #include <boost/foreach.hpp>
- #include "dnssecinfra.hh"
---- pdns/backends/bind/Makefile.in.orig	2011-07-22 13:26:07.000000000 +0200
-+++ pdns/backends/bind/Makefile.in	2011-08-11 11:35:05.000000000 +0200
-@@ -276,7 +276,7 @@
- top_build_prefix = @top_build_prefix@
- top_builddir = @top_builddir@
- top_srcdir = @top_srcdir@
--INCLUDES = -I../.. -I ../../ext/polarssl/include
-+INCLUDES = -I../..
- noinst_LTLIBRARIES = libbind2backend.la
- AM_CPPFLAGS = $(BOOST_CPPFLAGS) @THREADFLAGS@
- libbind2backend_la_SOURCES = bindbackend2.cc bindbackend2.hh bindparser.yy \
-@@ -300,10 +300,10 @@
- ../../dnswriter.cc dnslabeltext.cc  ../../rcpgenerator.cc ../../dnsparser.cc ../../base64.cc ../../sillyrecords.cc \
- ../../nsecrecords.cc ../../dnssecinfra.cc  ../../base32.cc ../../md5.cc # ../../dbdnsseckeeper.cc
- 
--zone2ldap_LDFLAGS = @THREADFLAGS@  -L../../ext/polarssl/library
--zone2ldap_LDADD = -lpolarssl
--zone2sql_LDFLAGS = @THREADFLAGS@  -L../../ext/polarssl/library
--zone2sql_LDADD = -lpolarssl
-+zone2ldap_LDFLAGS = @THREADFLAGS@
-+zone2ldap_LDADD = ../../ext/polarssl/library/libpolarssl.a
-+zone2sql_LDFLAGS = @THREADFLAGS@
-+zone2sql_LDADD = ../../ext/polarssl/library/libpolarssl.a
- AM_LFLAGS = -s -i
- AM_YFLAGS = -d --verbose --debug
- all: all-am
---- pdns/dnssecinfra.cc.orig	2011-07-22 13:23:22.000000000 +0200
-+++ pdns/dnssecinfra.cc	2011-08-11 13:21:53.000000000 +0200
-@@ -9,7 +9,7 @@
- #include <boost/algorithm/string.hpp>
- #include "dnssecinfra.hh" 
- #include "dnsseckeeper.hh"
--#include "polarssl/sha1.h"
-+#include "ext/polarssl/include/polarssl/sha1.h"
- #include <boost/assign/std/vector.hpp> // for 'operator+=()'
- #include <boost/assign/list_inserter.hpp>
- #include "base64.hh"
---- pdns/ext/polarssl/include/polarssl/rsa.h.orig	2011-07-22 13:26:22.000000000 +0200
-+++ pdns/ext/polarssl/include/polarssl/rsa.h	2011-08-11 13:40:15.000000000 +0200
-@@ -21,7 +21,7 @@
- #ifndef POLARSSL_RSA_H
- #define POLARSSL_RSA_H
- 
--#include "polarssl/bignum.h"
-+#include "bignum.h"
- 
- /*
-  * RSA Error codes
diff --git a/dns/powerdns/files/patch-modules_gpgsqlbackend_Makefile_in b/dns/powerdns/files/patch-modules_gpgsqlbackend_Makefile_in
index 92cca45a5442..91e11a68ef41 100644
--- a/dns/powerdns/files/patch-modules_gpgsqlbackend_Makefile_in
+++ b/dns/powerdns/files/patch-modules_gpgsqlbackend_Makefile_in
@@ -1,6 +1,6 @@
 --- modules/gpgsqlbackend/Makefile.in.org	2009-01-28 10:55:21.000000000 +0100
 +++ modules/gpgsqlbackend/Makefile.in	2009-01-28 11:02:29.000000000 +0100
-@@ -217,14 +217,14 @@
+@@ -217,8 +217,8 @@
  AM_CPPFLAGS = @THREADFLAGS@
  lib_LTLIBRARIES = libgpgsqlbackend.la
  EXTRA_DIST = OBJECTFILES OBJECTLIBS
@@ -9,11 +9,3 @@
  libgpgsqlbackend_la_SOURCES = gpgsqlbackend.cc gpgsqlbackend.hh \
  		spgsql.hh spgsql.cc
  
- libgpgsqlbackend_la_LDFLAGS = -module -avoid-version @PGSQL_lib@ -Wl,-Bstatic -lpq \
- 	-Wl,-Bdynamic 
- 
--libgpgsqlbackend_la_LIBADD = -lssl -lcrypt -lcrypto
-+libgpgsqlbackend_la_LIBADD = -lssl -lcrypto
- all: all-am
- 
- .SUFFIXES:
diff --git a/dns/powerdns/files/patch-modules_gsqlite3backend_Makefile_in b/dns/powerdns/files/patch-modules_gsqlite3backend_Makefile_in
deleted file mode 100644
index 9ca9ce9d8510..000000000000
--- a/dns/powerdns/files/patch-modules_gsqlite3backend_Makefile_in
+++ /dev/null
@@ -1,16 +0,0 @@
---- modules/gsqlite3backend/Makefile.in.orig	2011-07-22 13:26:06.000000000 +0200
-+++ modules/gsqlite3backend/Makefile.in	2011-08-08 16:22:15.000000000 +0200
-@@ -255,11 +255,11 @@
- AM_CPPFLAGS = @THREADFLAGS@
- lib_LTLIBRARIES = libgsqlite3backend.la
- EXTRA_DIST = OBJECTFILES OBJECTLIBS
--INCLUDES = -I@SQLITE3_CFLAGS@
-+INCLUDES = @SQLITE3_CFLAGS@
- libgsqlite3backend_la_SOURCES = gsqlite3backend.cc gsqlite3backend.hh \
-                 ssqlite3.hh ssqlite3.cc
- 
--libgsqlite3backend_la_LDFLAGS = -module -avoid-version -lsqlite3
-+libgsqlite3backend_la_LDFLAGS = -module -avoid-version @SQLITE3_LIBS@
- all: all-am
- 
- .SUFFIXES:
diff --git a/dns/powerdns/files/patch-pdns_Makefile_in b/dns/powerdns/files/patch-pdns_Makefile_in
index 1f64ba9b9c97..909edd631248 100644
--- a/dns/powerdns/files/patch-pdns_Makefile_in
+++ b/dns/powerdns/files/patch-pdns_Makefile_in
@@ -1,22 +1,23 @@
 --- pdns/Makefile.in.orig	2011-07-22 13:26:07.000000000 +0200
 +++ pdns/Makefile.in	2011-08-09 10:11:41.000000000 +0200
-@@ -51,15 +51,15 @@
+@@ -51,16 +51,16 @@
  	dnslog$(EXEEXT) nproxy$(EXEEXT) notify$(EXEEXT) \
  	pdnssec$(EXEEXT) dnsbulktest$(EXEEXT)
- @BOTAN19_TRUE@am__append_1 = botan19signers.cc botansigners.cc
--@BOTAN19_TRUE@am__append_2 = -lbotan -lgmp
-+@BOTAN19_TRUE@am__append_2 = -lbotan
+ @BOTAN110_TRUE@am__append_1 = botan110signers.cc botansigners.cc
+-@BOTAN110_TRUE@am__append_2 = -lbotan-1.10 -lgmp
++@BOTAN110_TRUE@am__append_2 = -lbotan-1.10
  @BOTAN18_TRUE@am__append_3 = botan18signers.cc botansigners.cc
 -@BOTAN18_TRUE@am__append_4 = -lbotan -lgmp
 +@BOTAN18_TRUE@am__append_4 = -lbotan
  @CRYPTOPP_TRUE@am__append_5 = cryptoppsigners.cc
  @CRYPTOPP_TRUE@am__append_6 = -lcryptopp
- @BOTAN19_TRUE@am__append_7 = botan19signers.cc botansigners.cc
--@BOTAN19_TRUE@am__append_8 = -lbotan -lgmp
-+@BOTAN19_TRUE@am__append_8 = -lbotan
- @BOTAN18_TRUE@am__append_9 = botan18signers.cc botansigners.cc
--@BOTAN18_TRUE@am__append_10 = -lbotan -lgmp
-+@BOTAN18_TRUE@am__append_10 = -lbotan
- @CRYPTOPP_TRUE@am__append_11 = cryptoppsigners.cc
- @CRYPTOPP_TRUE@am__append_12 = -lcryptopp
- subdir = pdns
+ @SQLITE3_TRUE@am__append_7 = ssqlite3.cc ssqlite3.hh
+ @BOTAN110_TRUE@am__append_8 = botan110signers.cc botansigners.cc
+-@BOTAN110_TRUE@am__append_9 = -lbotan-1.10 -lgmp
++@BOTAN110_TRUE@am__append_9 = -lbotan-1.10
+ @BOTAN18_TRUE@am__append_10 = botan18signers.cc botansigners.cc
+-@BOTAN18_TRUE@am__append_11 = -lbotan -lgmp
++@BOTAN18_TRUE@am__append_11 = -lbotan
+ @CRYPTOPP_TRUE@am__append_12 = cryptoppsigners.cc
+ @CRYPTOPP_TRUE@am__append_13 = -lcryptopp
+ @SQLITE3_TRUE@am__append_14 = ssqlite3.cc ssqlite3.hh
\ No newline at end of file
diff --git a/dns/powerdns/files/patch-pdns_pdns_backends_bind_bindbackend2_cc b/dns/powerdns/files/patch-pdns_pdns_backends_bind_bindbackend2_cc
deleted file mode 100644
index edd59f2c1aae..000000000000
--- a/dns/powerdns/files/patch-pdns_pdns_backends_bind_bindbackend2_cc
+++ /dev/null
@@ -1,16 +0,0 @@
---- pdns/backends/bind/bindbackend2.cc.orig	2011-07-22 13:23:22.000000000 +0200
-+++ pdns/backends/bind/bindbackend2.cc	2011-08-30 10:38:47.000000000 +0200
-@@ -620,5 +620,5 @@
- 
-     sort(domains.begin(), domains.end()); // put stuff in inode order
--
-+    DNSSECKeeper dk;
-     for(vector<BindDomainInfo>::const_iterator i=domains.begin();
-         i!=domains.end();
-@@ -660,5 +660,5 @@
-         if(filenameChanged || !bbd->d_loaded || !bbd->current()) {
-           L<<Logger::Info<<d_logprefix<<" parsing '"<<i->name<<"' from file '"<<i->filename<<"'"<<endl;
--          DNSSECKeeper dk;
-+
-           NSEC3PARAMRecordContent ns3pr;
-           bool nsec3zone=dk.getNSEC3PARAM(i->name, &ns3pr);
\ No newline at end of file
diff --git a/dns/powerdns/pkg-descr b/dns/powerdns/pkg-descr
index 9e1d2d6dbb2d..df31acd7a636 100644
--- a/dns/powerdns/pkg-descr
+++ b/dns/powerdns/pkg-descr
@@ -1,6 +1,4 @@
 PowerDNS is an advanced DNS server, which allows for several different
 backends. Current backends include MySQL, PostgreSQL, bind, etc.
 
-License: GPL V2
-
-WWW: http://www.powerdns.com/
+WWW:	http://www.powerdns.com/