version bump fix #494634, drop old

(Portage version: 2.2.7/cvs/Linux x86_64, signed Manifest commit with key B658FA13)

9 files changed, 19 insertions, 278 deletions

diff --git a/net-dns/pdns/ChangeLog b/net-dns/pdns/ChangeLog
index 2e744574d66a..53c84552054d 100644
--- a/net-dns/pdns/ChangeLog
+++ b/net-dns/pdns/ChangeLog
@@ -1,6 +1,17 @@
 # ChangeLog for net-dns/pdns
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-dns/pdns/ChangeLog,v 1.90 2013/12/16 14:56:40 ultrabug Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-dns/pdns/ChangeLog,v 1.91 2013/12/19 16:34:57 ultrabug Exp $
+
+*pdns-3.3.1 (19 Dec 2013)
+
+  19 Dec 2013; Ultrabug <ultrabug@gentoo.org> -pdns-3.3.ebuild,
+  +pdns-3.3.1.ebuild, -files/pdns-3.3-fix-autoconf.patch,
+  -files/pdns-3.3-fix-conditional-polarssl.patch,
+  -files/pdns-3.3-fix-curl-link.patch,
+  -files/pdns-3.3-fix-polarssl_1.3.0.patch,
+  +files/pdns-3.3.1-fix-curl-link.patch, -files/pdns-3.3-lib_lua.patch,
+  -files/pdns-3.3_sha.hh, metadata.xml:
+  Version bump fix 494634 thx to @Nawadanp, add the tools IUSE, drop old
 
 *pdns-3.3 (16 Dec 2013)
 
diff --git a/net-dns/pdns/files/pdns-3.3-fix-autoconf.patch b/net-dns/pdns/files/pdns-3.3-fix-autoconf.patch
deleted file mode 100644
index e3ee3037b5df..000000000000
--- a/net-dns/pdns/files/pdns-3.3-fix-autoconf.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/configure.ac b/configure.ac
-index 1beab82..243b693 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -180,7 +180,7 @@ AC_ARG_WITH([system-polarssl],
-  [system_polarssl=$withval],
-  [system_polarssl=yes])
- AC_MSG_RESULT($system_polarssl)
--AM_CONDITIONAL(HAVE_LIBPOLARSSL, false)
-+AM_CONDITIONAL(HAVE_LIBPOLARSSL, test x"$system_polarssl" = "xyes")
- if test x$system_polarssl = xyes; then
-  AC_MSG_CHECKING([PolarSSL version >= 1.1])
-  AC_COMPILE_IFELSE(
diff --git a/net-dns/pdns/files/pdns-3.3-fix-conditional-polarssl.patch b/net-dns/pdns/files/pdns-3.3-fix-conditional-polarssl.patch
deleted file mode 100644
index 15a2c504f49d..000000000000
--- a/net-dns/pdns/files/pdns-3.3-fix-conditional-polarssl.patch
+++ /dev/null
@@ -1,26 +0,0 @@
---- a/pdns/Makefile.am	2013-12-10 11:53:54.530368351 +0100
-+++ b/pdns/Makefile.am	2013-12-10 11:55:33.398973939 +0100
-@@ -70,7 +70,11 @@
- 
- #
- pdns_server_LDFLAGS=@moduleobjects@ @modulelibs@ @DYNLINKFLAGS@ @LIBDL@ @THREADFLAGS@  $(BOOST_SERIALIZATION_LDFLAGS) -rdynamic 
-+if HAVE_LIBPOLARSSL
-+pdns_server_LDADD= $(BOOST_SERIALIZATION_LIBS) $(LUA_LIBS) $(SQLITE3_LIBS) $(LIBCURL_LIBS) $(MYSQL_lib)
-+else
- pdns_server_LDADD= ext/polarssl-1.1.2/library/libpolarssl.a $(BOOST_SERIALIZATION_LIBS) $(LUA_LIBS) $(SQLITE3_LIBS) $(LIBCURL_LIBS) $(MYSQL_lib)
-+endif
- 
- if BOTAN110
- pdns_server_SOURCES += botan110signers.cc botansigners.cc
-@@ -112,7 +116,11 @@
- 
- 
- pdnssec_LDFLAGS=@moduleobjects@ @modulelibs@ @DYNLINKFLAGS@ @LIBDL@ @THREADFLAGS@  $(BOOST_PROGRAM_OPTIONS_LDFLAGS) $(BOOST_SERIALIZATION_LDFLAGS) 
-+if HAVE_LIBPOLARSSL
-+pdnssec_LDADD= $(BOOST_PROGRAM_OPTIONS_LIBS) $(BOOST_SERIALIZATION_LIBS) $(SQLITE3_LIBS) $(LIBCURL_LIBS) $(MYSQL_lib)
-+else
- pdnssec_LDADD= ext/polarssl-1.1.2/library/libpolarssl.a $(BOOST_PROGRAM_OPTIONS_LIBS) $(BOOST_SERIALIZATION_LIBS) $(SQLITE3_LIBS) $(LIBCURL_LIBS) $(MYSQL_lib)
-+endif
- 
- if BOTAN110
- pdnssec_SOURCES += botan110signers.cc botansigners.cc
diff --git a/net-dns/pdns/files/pdns-3.3-fix-polarssl_1.3.0.patch b/net-dns/pdns/files/pdns-3.3-fix-polarssl_1.3.0.patch
deleted file mode 100644
index 032cfd028461..000000000000
--- a/net-dns/pdns/files/pdns-3.3-fix-polarssl_1.3.0.patch
+++ /dev/null
@@ -1,77 +0,0 @@
---- /dev/shm/portage/net-dns/pdns-3.3/work/pdns-3.3/pdns/polarrsakeyinfra.cc	2013-04-26 21:54:34.000000000 +0200
-+++ pdns/pdns/polarrsakeyinfra.cc	2013-12-16 15:08:59.476418683 +0100
-@@ -1,20 +1,8 @@
--#ifdef HAVE_LIBPOLARSSLSSL
- #include <polarssl/rsa.h>
- #include <polarssl/base64.h>
--#include <polarssl/sha1.h>
--#include <polarssl/sha2.h>
--#include <polarssl/sha4.h>
-+#include <sha.hh>
- #include <polarssl/entropy.h>
- #include <polarssl/ctr_drbg.h>
--#else
--#include "ext/polarssl-1.1.2/include/polarssl/rsa.h"
--#include "ext/polarssl-1.1.2/include/polarssl/base64.h"
--#include "ext/polarssl-1.1.2/include/polarssl/sha1.h"
--#include "ext/polarssl-1.1.2/include/polarssl/sha2.h"
--#include "ext/polarssl-1.1.2/include/polarssl/sha4.h"
--#include "ext/polarssl-1.1.2/include/polarssl/entropy.h"
--#include "ext/polarssl-1.1.2/include/polarssl/ctr_drbg.h"
--#endif
- #include <boost/assign/std/vector.hpp> // for 'operator+=()'
- #include <boost/foreach.hpp>
- #include "dnssecinfra.hh"
-@@ -147,7 +135,8 @@
- {
-   string hash = this->hash(msg);
-   unsigned char signature[mpi_size(&d_context.N)];
--  int hashKind;
-+  md_type_t hashKind;
-+
-   if(hash.size()==20)
-     hashKind= SIG_RSA_SHA1;
-   else if(hash.size()==32) 
-@@ -169,7 +158,7 @@
- 
- bool RSADNSCryptoKeyEngine::verify(const std::string& msg, const std::string& signature) const
- {
--  int hashKind;
-+  md_type_t hashKind;
-   string hash=this->hash(msg);
-   if(hash.size()==20)
-     hashKind= SIG_RSA_SHA1;
-@@ -178,7 +167,11 @@
-   else
-     hashKind = SIG_RSA_SHA512;
-   
--  int ret=rsa_pkcs1_verify(const_cast<rsa_context*>(&d_context), RSA_PUBLIC, 
-+  int ret=rsa_pkcs1_verify(const_cast<rsa_context*>(&d_context),
-+#if POLARSSL_VERSION_NUMBER >= 0x01020900
-+    NULL, NULL,
-+#endif
-+    RSA_PUBLIC,
-     hashKind,
-     hash.size(),
-     (const unsigned char*) hash.c_str(), (unsigned char*) signature.c_str());
-@@ -195,12 +188,20 @@
-   } 
-   else if(d_algorithm == 8) { // RSASHA256
-     unsigned char hash[32];
-+#if POLARSSL_VERSION_NUMBER >= 0x01030000
-+    sha256((unsigned char*)toHash.c_str(), toHash.length(), hash, 0);
-+#else
-     sha2((unsigned char*)toHash.c_str(), toHash.length(), hash, 0);
-+#endif
-     return string((char*)hash, sizeof(hash));
-   } 
-   else if(d_algorithm == 10) { // RSASHA512
-     unsigned char hash[64];
-+#if POLARSSL_VERSION_NUMBER >= 0x01030000
-+    sha512((unsigned char*)toHash.c_str(), toHash.length(), hash, 0);
-+#else
-     sha4((unsigned char*)toHash.c_str(), toHash.length(), hash, 0);
-+#endif
-     return string((char*)hash, sizeof(hash));
-   }
-   throw runtime_error("PolarSSL hashing method can't hash algorithm "+lexical_cast<string>(d_algorithm));
diff --git a/net-dns/pdns/files/pdns-3.3-lib_lua.patch b/net-dns/pdns/files/pdns-3.3-lib_lua.patch
deleted file mode 100644
index 916ae26c911a..000000000000
--- a/net-dns/pdns/files/pdns-3.3-lib_lua.patch
+++ /dev/null
@@ -1,16 +0,0 @@
---- a/modules/luabackend/Makefile.am	2013-12-10 11:57:48.597065748 +0100
-+++ b/modules/luabackend/Makefile.am	2013-12-10 12:00:05.855127730 +0100
-@@ -1,4 +1,4 @@
--AM_CPPFLAGS=-I/usr/include/lua5.1 @THREADFLAGS@
-+AM_CPPFLAGS=$(LUA_CFLAGS) @THREADFLAGS@
- #AM_CPPFLAGS=-I/usr/local/include/luajit-2.0 -DUSE_LUAJIT @THREADFLAGS@
- EXTRA_DIST=OBJECTFILES OBJECTLIBS 
- 
-@@ -8,5 +8,6 @@
- libluabackend_la_SOURCES=luabackend.cc luabackend.hh minimal.cc reload.cc lua_functions.cc master.cc private.cc slave.cc supermaster.cc dnssec.cc \
- 	lua_functions.hh 
- 
--libluabackend_la_LDFLAGS=-module -avoid-version -llua5.1
-+libluabackend_la_LDFLAGS=-module -avoid-version
-+libluabackend_la_LIBADD=$(LUA_LIBS)
- #-lluajit-5.1
diff --git a/net-dns/pdns/files/pdns-3.3-fix-curl-link.patch b/net-dns/pdns/files/pdns-3.3.1-fix-curl-link.patch
index 64366a09d7f3..5ab2889ee853 100644
--- a/net-dns/pdns/files/pdns-3.3-fix-curl-link.patch
+++ b/net-dns/pdns/files/pdns-3.3.1-fix-curl-link.patch
@@ -1,6 +1,6 @@
 --- a/modules/remotebackend/Makefile.am	2013-12-10 11:45:24.487559267 +0100
 +++ b/modules/remotebackend/Makefile.am	2013-12-10 11:45:48.887215368 +0100
-@@ -13,7 +13,7 @@
+@@ -16,7 +16,7 @@
  libremotebackend_la_SOURCES=remotebackend.hh remotebackend.cc unixconnector.cc httpconnector.cc pipeconnector.cc 
  
  libremotebackend_la_LDFLAGS=-module -avoid-version
diff --git a/net-dns/pdns/files/pdns-3.3_sha.hh b/net-dns/pdns/files/pdns-3.3_sha.hh
deleted file mode 100644
index f90e8cb3e720..000000000000
--- a/net-dns/pdns/files/pdns-3.3_sha.hh
+++ /dev/null
@@ -1,134 +0,0 @@
-#ifndef _SHA_HH
-#define _SHA_HH
-
-#include <string>
-#include <stdint.h>
-#include <polarssl/version.h>
-#if POLARSSL_VERSION_NUMBER >= 0x01030000
-  #include <polarssl/sha1.h>
-  #include <polarssl/sha256.h>
-  #include <polarssl/sha512.h>
-  typedef sha256_context sha2_context;
-  typedef sha512_context sha4_context;
-  #define sha2_finish sha256_finish
-  #define sha2_hmac_finish sha256_hmac_finish
-  #define sha2_hmac_starts sha256_hmac_starts
-  #define sha2_hmac_update sha256_hmac_update
-  #define sha2_starts sha256_starts
-  #define sha2_update sha256_update
-  #define sha4_finish sha512_finish
-  #define sha4_hmac_finish sha512_hmac_finish
-  #define sha4_hmac_starts sha512_hmac_starts
-  #define sha4_hmac_update sha512_hmac_update
-  #define sha4_starts sha512_starts
-  #define sha4_update sha512_update
-  #define POLARSSL_SHA2_C POLARSSL_SHA256_C
-  #define POLARSSL_SHA4_C POLARSSL_SHA512_C
-  #define SIG_RSA_SHA1    POLARSSL_MD_SHA1
-  #define SIG_RSA_SHA224  POLARSSL_MD_SHA224
-  #define SIG_RSA_SHA256  POLARSSL_MD_SHA256
-  #define SIG_RSA_SHA384  POLARSSL_MD_SHA384
-  #define SIG_RSA_SHA512  POLARSSL_MD_SHA512
-#else
-  #include <polarssl/sha1.h>
-  #include <polarssl/sha2.h>
-  #include <polarssl/sha4.h>
-  typedef int md_type_t;
-#endif
-
-class SHA1Summer
-{
-public:
-   SHA1Summer() { sha1_starts(&d_context); };
-   void feed(const std::string &str) { feed(str.c_str(), str.length()); };
-   void feed(const char *ptr, size_t len) { sha1_update(&d_context, reinterpret_cast<const unsigned char*>(ptr), len); };
-   const std::string get() const { 
-     sha1_context ctx2;
-     unsigned char result[20] = {0};
-     ctx2=d_context;
-     sha1_finish(&ctx2, result);
-     return std::string(result, result + sizeof result);
-   };
-private:
-   SHA1Summer(const SHA1Summer&);
-   SHA1Summer& operator=(const SHA1Summer&);
-   sha1_context d_context;
-};
-
-class SHA224Summer
-{
-public:
-   SHA224Summer() { sha2_starts(&d_context, 1); };
-   void feed(const std::string &str) { feed(str.c_str(), str.length()); };
-   void feed(const char *ptr, size_t len) { sha2_update(&d_context, reinterpret_cast<const unsigned char*>(ptr), len); };
-   const std::string get() const { 
-     sha2_context ctx2;
-     unsigned char result[32] = {0};
-     ctx2=d_context;
-     sha2_finish(&ctx2, result);
-     return std::string(result, result + 28);
-   };
-private:
-   SHA224Summer(const SHA1Summer&);
-   SHA224Summer& operator=(const SHA1Summer&);
-   sha2_context d_context;
-};
-
-class SHA256Summer
-{
-public:
-   SHA256Summer() { sha2_starts(&d_context, 0); };
-   void feed(const std::string &str) { feed(str.c_str(), str.length()); };
-   void feed(const char *ptr, size_t len) { sha2_update(&d_context, reinterpret_cast<const unsigned char*>(ptr), len); };
-   const std::string get() const {
-     sha2_context ctx2;
-     unsigned char result[32] = {0};
-     ctx2=d_context;
-     sha2_finish(&ctx2, result);
-     return std::string(result, result + 32);
-   };
-private:
-   SHA256Summer(const SHA1Summer&);
-   SHA256Summer& operator=(const SHA1Summer&);
-   sha2_context d_context;
-};
-
-class SHA384Summer
-{
-public:
-   SHA384Summer() { sha4_starts(&d_context, 1); };
-   void feed(const std::string &str) { feed(str.c_str(), str.length()); };
-   void feed(const char *ptr, size_t len) { sha4_update(&d_context, reinterpret_cast<const unsigned char*>(ptr), len); };
-   const std::string get() const {
-     sha4_context ctx2;
-     unsigned char result[64] = {0};
-     ctx2 = d_context;
-     sha4_finish(&ctx2, result);
-     return std::string(result, result + 48);
-   };
-private:
-   SHA384Summer(const SHA1Summer&);
-   SHA384Summer& operator=(const SHA1Summer&);
-   sha4_context d_context;
-};
-
-class SHA512Summer
-{
-public:
-   SHA512Summer() { sha4_starts(&d_context, 0); };
-   void feed(const std::string &str) { feed(str.c_str(), str.length()); };
-   void feed(const char *ptr, size_t len) { sha4_update(&d_context, reinterpret_cast<const unsigned char*>(ptr), len); };
-   const std::string get() const {
-     sha4_context ctx2;
-     unsigned char result[64] = {0};
-     ctx2=d_context;
-     sha4_finish(&ctx2, result);
-     return std::string(result, result + sizeof result);
-   };
-private:
-   SHA512Summer(const SHA1Summer&);
-   SHA512Summer& operator=(const SHA1Summer&);
-   sha4_context d_context;
-};
-
-#endif /* sha.hh */
diff --git a/net-dns/pdns/metadata.xml b/net-dns/pdns/metadata.xml
index b43f48ecba53..ec7b58d9d788 100644
--- a/net-dns/pdns/metadata.xml
+++ b/net-dns/pdns/metadata.xml
@@ -19,5 +19,6 @@ standards documents. Furthermore, PowerDNS interfaces with almost any database.
 	<flag name='remote'>Use a generic socket or pipe as a backend (via JSON RPC requests).</flag>
 	<flag name='remote-http'>Enable remote connections to HTTP as backends (via RESTful JSON requests).</flag>
 	<flag name='tinydns'>Use a TinyDNS CDB database as backend.</flag>
+	<flag name='tools'>Build optional tools (dnsscan, dnsscope, etc..).</flag>
 </use>
 </pkgmetadata>
diff --git a/net-dns/pdns/pdns-3.3.ebuild b/net-dns/pdns/pdns-3.3.1.ebuild
index e13cac88aa6d..7343f8942d32 100644
--- a/net-dns/pdns/pdns-3.3.ebuild
+++ b/net-dns/pdns/pdns-3.3.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-dns/pdns/pdns-3.3.ebuild,v 1.1 2013/12/16 14:56:40 ultrabug Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-dns/pdns/pdns-3.3.1.ebuild,v 1.1 2013/12/19 16:34:57 ultrabug Exp $
 
 EAPI=5
 
@@ -20,7 +20,7 @@ KEYWORDS="~amd64 ~x86"
 # xdb: (almost) dead, surely not supported
 
 IUSE="botan cryptopp debug doc ldap lua mydns mysql odbc opendbx postgres remote
-remote-http sqlite static tinydns"
+remote-http sqlite static tools tinydns"
 
 REQUIRED_USE="mydns? ( mysql )"
 
@@ -41,7 +41,7 @@ RDEPEND="!static? (
 DEPEND="${RDEPEND}
 	virtual/pkgconfig
 	static? (
-		net-libs/polarssl[static-libs(+)]
+		>=net-libs/polarssl-1.3.0[static-libs(+)]
 		>=dev-libs/boost-1.34[static-libs(+)]
 		botan? ( =dev-libs/botan-1.10*[static-libs(+)] )
 		cryptopp? ( dev-libs/crypto++[static-libs(+)] )
@@ -57,14 +57,8 @@ DEPEND="${RDEPEND}
 	doc? ( app-doc/doxygen )"
 
 src_prepare() {
-	#TODO: kill me, I'm dirty @ultrabug
-	cp "${FILESDIR}/${P}_sha.hh" pdns/sha.hh
 	epatch \
-		"${FILESDIR}/${P}-fix-polarssl_1.3.0.patch" \
-		"${FILESDIR}/${P}-fix-autoconf.patch" \
-		"${FILESDIR}/${P}-fix-conditional-polarssl.patch" \
-		"${FILESDIR}/${P}-fix-curl-link.patch" \
-		"${FILESDIR}/${P}-lib_lua.patch"
+		"${FILESDIR}/${P}-fix-curl-link.patch"
 	eautoreconf
 }
 
@@ -108,6 +102,7 @@ src_configure() {
 		--with-mysql-lib=/usr/$(get_libdir) \
 		$(use_with lua) \
 		$(use_enable static static-binaries) \
+		$(use_enable tools) \
 		${myconf}
 }