svn commit: r310280 - in head/dns/powerdns-devel: . files

[Raphael Kubo da Costa]

Author: rakuco
Date: Sat Jan 12 16:00:01 2013
New Revision: 310280
URL: http://svnweb.freebsd.org/changeset/ports/310280

Log:
  - Update to PowerDNS 3.2-RC4.
  - Add a patch to fix ECDSA keys (algorithms 13 & 14) for DNSSEC operation;
    will be part of RC5.
  - Fix CONFIGURE_ARGS for DNSSEC option (was CONFIGURE_FLAGS for some
    mysterious reason) so cryptopp is actually compiled in.
  
  Changelog: http://rtfm.powerdns.com/changelog.html#changelog-auth-3-2
  
  PR:		ports/175185
  Submitted by:	Ralf van der Enden <tremere at cainites.net> (maintainer)

Added:
  head/dns/powerdns-devel/files/patch-pdns_cryptoppsigners_cc   (contents, props changed)
Deleted:
  head/dns/powerdns-devel/files/patch-pdns__dnsreplay.cc
  head/dns/powerdns-devel/files/patch-pdns_pdns_backends_bind_binddnssec_cc
Modified:
  head/dns/powerdns-devel/Makefile
  head/dns/powerdns-devel/distinfo
  head/dns/powerdns-devel/pkg-plist

Modified: head/dns/powerdns-devel/Makefile
==============================================================================
--- head/dns/powerdns-devel/Makefile	Sat Jan 12 15:48:47 2013	(r310279)
+++ head/dns/powerdns-devel/Makefile	Sat Jan 12 16:00:01 2013	(r310280)
@@ -1,7 +1,7 @@
 # $FreeBSD$
 
 PORTNAME=	powerdns
-PORTVERSION=	3.2.r1
+PORTVERSION=	3.2.r4
 PORTREVISION?=	0
 PORTEPOCH=	1
 CATEGORIES=	dns ipv6
@@ -15,7 +15,6 @@ COMMENT=	An advanced DNS server with mul
 LICENSE=	GPLv2
 
 LIB_DEPENDS=	boost_serialization.[4-9]:${PORTSDIR}/devel/boost-libs
-#		botan.0:${PORTSDIR}/security/botan
 
 USE_LUA=	5.1
 LUA_COMPS=	lua
@@ -160,7 +159,7 @@ PLIST_SUB+=		WITHOPENDBX="@comment "
 
 .if ${PORT_OPTIONS:MDNSSEC}
 BUILD_DEPENDS+=		${LOCALBASE}/lib/libcryptopp.a:${PORTSDIR}/security/cryptopp
-CONFIGURE_FLAGS+=	--enable-cryptopp
+CONFIGURE_ARGS+=	--enable-cryptopp
 .endif
 
 post-patch:

Modified: head/dns/powerdns-devel/distinfo
==============================================================================
--- head/dns/powerdns-devel/distinfo	Sat Jan 12 15:48:47 2013	(r310279)
+++ head/dns/powerdns-devel/distinfo	Sat Jan 12 16:00:01 2013	(r310280)
@@ -1,2 +1,2 @@
-SHA256 (pdns-3.2-rc1.tar.gz) = c450828c042e6c893fb8f5232b67f7808f9cbb0d09296aa11b331cfe9ed6a7dd
-SIZE (pdns-3.2-rc1.tar.gz) = 1277305
+SHA256 (pdns-3.2-rc4.tar.gz) = adcf5f651811fb979f9033a3c156492c5637b3f9c872f335ac24ffa046a60934
+SIZE (pdns-3.2-rc4.tar.gz) = 1292662

Added: head/dns/powerdns-devel/files/patch-pdns_cryptoppsigners_cc
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/dns/powerdns-devel/files/patch-pdns_cryptoppsigners_cc	Sat Jan 12 16:00:01 2013	(r310280)
@@ -0,0 +1,31 @@
+--- pdns/cryptoppsigners.cc	(revision 3032)
++++ pdns/cryptoppsigners.cc	(working copy)
+@@ -82,18 +82,26 @@
+   storvect.push_back(make_pair("PrivateKey", string((char*)buffer, sizeof(buffer))));
+   return storvect;
+ }
++
+ template<class HASHER, class CURVE, int BITS>
+ void CryptoPPECDSADNSCryptoKeyEngine<HASHER,CURVE,BITS>::fromISCMap(DNSKEYRecordContent& drc, std::map<std::string, std::string>& stormap )
+ {
++  AutoSeededRandomPool prng;
+   privatekey_t* privateKey = new privatekey_t;
+-  const CryptoPP::Integer x;
++  const CryptoPP::Integer x(reinterpret_cast<const unsigned char*>(stormap["privatekey"].c_str()), BITS/8); // well it should be this long
+   CryptoPP::OID oid=CURVE();
+-  privateKey->Initialize(oid, x );
++  privateKey->Initialize(oid, x);
++  bool result = privateKey->Validate(prng, 3);
++  if (!result) {
++      throw "Cannot load private key - validation failed!";
++  }
+   d_key = shared_ptr<privatekey_t>(privateKey);
+   publickey_t* publicKey = new publickey_t();
+   d_key->MakePublicKey(*publicKey);
+   d_pubkey = shared_ptr<publickey_t>(publicKey);
++  drc.d_algorithm = atoi(stormap["algorithm"].c_str());
+ }
++
+ template<class HASHER, class CURVE, int BITS>
+ std::string CryptoPPECDSADNSCryptoKeyEngine<HASHER,CURVE,BITS>::getPubKeyHash() const
+ {

Modified: head/dns/powerdns-devel/pkg-plist
==============================================================================
--- head/dns/powerdns-devel/pkg-plist	Sat Jan 12 15:48:47 2013	(r310279)
+++ head/dns/powerdns-devel/pkg-plist	Sat Jan 12 16:00:01 2013	(r310280)
@@ -1,6 +1,7 @@
 bin/dnsreplay
 bin/pdns_control
 bin/pdnssec
+bin/zone2json
 bin/zone2ldap
 bin/zone2sql
 sbin/pdns_server