Attachment 174626 Details for Bug 211148 – Update to 4.0.3

[patch] Update to 4.0.3

powerdns-recursor-4.0.3.patch (text/plain), 5.38 KB, created by Ralf van der Enden on 2016-09-10 18:08:54 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Ralf van der Enden

Created: 2016-09-10 18:08:54 UTC

Size: 5.38 KB

patch

obsolete

>Index: Makefile
>===================================================================
>--- Makefile	(revision 421640)
>+++ Makefile	(working copy)
>@@ -2,7 +2,7 @@
> # $FreeBSD$
> 
> PORTNAME=	recursor
>-PORTVERSION=	4.0.1
>+PORTVERSION=	4.0.3
> CATEGORIES=	dns ipv6
> MASTER_SITES=	http://downloads.powerdns.com/releases/
> PKGNAMEPREFIX=	powerdns-
>@@ -14,6 +14,7 @@
> LICENSE=	GPLv2
> 
> BUILD_DEPENDS=	${LOCALBASE}/include/boost/shared_ptr.hpp:devel/boost-libs
>+LIB_DEPENDS=	libboost_context.so:devel/boost-libs
> 
> BROKEN_sparc64=	Does not compile on sparc64
> BROKEN_FreeBSD_9=	linker error
>Index: distinfo
>===================================================================
>--- distinfo	(revision 421640)
>+++ distinfo	(working copy)
>@@ -1,3 +1,3 @@
>-TIMESTAMP = 1470038617
>-SHA256 (pdns-recursor-4.0.1.tar.bz2) = 472db541307c8ca83a846d260ecfc854fd8e879c1bb2ce5683a8df5d21e860b0
>-SIZE (pdns-recursor-4.0.1.tar.bz2) = 1035584
>+TIMESTAMP = 1473284590
>+SHA256 (pdns-recursor-4.0.3.tar.bz2) = ae9813a64d13d9ebe4b44e89e8e4e44fc438693b6ce4c3a98e4cab1af22d9627
>+SIZE (pdns-recursor-4.0.3.tar.bz2) = 1045041
>Index: files/patch-libressl
>===================================================================
>--- files/patch-libressl	(revision 421640)
>+++ files/patch-libressl	(nonexistent)
>@@ -1,31 +0,0 @@
>---- dns_random.cc.orig	2016-07-29 14:32:32 UTC
>-+++ dns_random.cc
>-@@ -2,7 +2,7 @@
>- #include "config.h"
>- #endif
>- #include <openssl/aes.h>
>--#if OPENSSL_VERSION_NUMBER > 0x1000100fL
>-+#if OPENSSL_VERSION_NUMBER > 0x1000100fL && !defined LIBRESSL_VERSION_NUMBER
>- // Older OpenSSL does not have CRYPTO_ctr128_encrypt. Before 1.1.0 the header
>- // file did not have the necessary extern "C" wrapper. In 1.1.0, AES_ctr128_encrypt
>- // was removed.
>-@@ -53,7 +53,7 @@ unsigned int dns_random(unsigned int n)
>-   if(!g_initialized)
>-     abort();
>-   uint32_t out;
>--#if OPENSSL_VERSION_NUMBER > 0x1000100fL
>-+#if OPENSSL_VERSION_NUMBER > 0x1000100fL && !defined LIBRESSL_VERSION_NUMBER
>-   CRYPTO_ctr128_encrypt((const unsigned char*)&g_in, (unsigned char*) &out, sizeof(g_in), &aes_key, g_counter, g_stream, &g_offset, (block128_f) AES_encrypt);
>- #else
>-   AES_ctr128_encrypt((const unsigned char*)&g_in, (unsigned char*) &out, sizeof(g_in), &aes_key, g_counter, g_stream, &g_offset);
>---- opensslsigners.cc.orig	2016-07-29 14:32:32 UTC
>-+++ opensslsigners.cc
>-@@ -12,7 +12,7 @@
>- #include "opensslsigners.hh"
>- #include "dnssecinfra.hh"
>- 
>--#if OPENSSL_VERSION_NUMBER < 0x1010000fL
>-+#if (OPENSSL_VERSION_NUMBER < 0x1010000fL || defined LIBRESSL_VERSION_NUMBER)
>- /* OpenSSL < 1.1.0 needs support for threading/locking in the calling application. */
>- static pthread_mutex_t *openssllocks;
>- 
>
>Property changes on: files/patch-libressl
>___________________________________________________________________
>Deleted: fbsd:nokeywords
>## -1 +0,0 ##
>-yes
>\ No newline at end of property
>Deleted: svn:eol-style
>## -1 +0,0 ##
>-native
>\ No newline at end of property
>Deleted: svn:mime-type
>## -1 +0,0 ##
>-text/plain
>\ No newline at end of property
>Index: files/patch-lua-recursor4.cc
>===================================================================
>--- files/patch-lua-recursor4.cc	(nonexistent)
>+++ files/patch-lua-recursor4.cc	(working copy)
>@@ -0,0 +1,26 @@
>+--- lua-recursor4.cc.orig	2016-09-06 12:50:29 UTC
>++++ lua-recursor4.cc
>+@@ -263,8 +263,8 @@ RecursorLua4::RecursorLua4(const std::st
>+       return DNSName(boost::get<const DNSName>(dom));
>+   });
>+   d_lw->registerFunction("isPartOf", &DNSName::isPartOf);
>+-  d_lw->registerFunction("countLabels", &DNSName::countLabels);
>+-  d_lw->registerFunction("wirelength", &DNSName::wirelength);
>++  d_lw->registerFunction<unsigned int(DNSName::*)()>("countLabels", [](const DNSName& name) { return name.countLabels(); });
>++  d_lw->registerFunction<size_t(DNSName::*)()>("wirelength", [](const DNSName& name) { return name.wirelength(); });
>+   d_lw->registerFunction<bool(DNSName::*)(const std::string&)>(
>+     "equal",
>+      [](const DNSName& lhs, const std::string& rhs) {
>+@@ -285,9 +285,9 @@ RecursorLua4::RecursorLua4(const std::st
>+     } );
>+   d_lw->registerFunction<bool(ComboAddress::*)()>("isIPv4", [](const ComboAddress& ca) { return ca.sin4.sin_family == AF_INET; });
>+   d_lw->registerFunction<bool(ComboAddress::*)()>("isIPv6", [](const ComboAddress& ca) { return ca.sin4.sin_family == AF_INET6; });
>+-  d_lw->registerFunction("isMappedIPv4", &ComboAddress::isMappedIPv4);
>+-  d_lw->registerFunction("mapToIPv4", &ComboAddress::mapToIPv4);
>+-  d_lw->registerFunction("truncate", &ComboAddress::truncate);
>++  d_lw->registerFunction<bool(ComboAddress::*)()>("isMappedIPv4", [](const ComboAddress& ca) { return ca.isMappedIPv4(); });
>++  d_lw->registerFunction<ComboAddress(ComboAddress::*)()>("mapToIPv4", [](const ComboAddress& ca) { return ca.mapToIPv4(); });
>++  d_lw->registerFunction<void(ComboAddress::*)(unsigned int)>("truncate", [](ComboAddress& ca, unsigned int bits) { ca.truncate(bits); });
>+ 
>+   d_lw->writeFunction("newCA", [](const std::string& a) { return ComboAddress(a); });
>+   typedef std::unordered_set<ComboAddress,ComboAddress::addressOnlyHash,ComboAddress::addressOnlyEqual> cas_t;
>
>Property changes on: files/patch-lua-recursor4.cc
>___________________________________________________________________
>Added: fbsd:nokeywords
>## -0,0 +1 ##
>+yes
>\ No newline at end of property
>Added: svn:eol-style
>## -0,0 +1 ##
>+native
>\ No newline at end of property
>Added: svn:mime-type
>## -0,0 +1 ##
>+text/plain
>\ No newline at end of property

Flags:

tremere: maintainer-approval+

Actions: View | Diff

Attachments on bug 211148: 172563 | 172564 | 173489 | 173490 | 173834 | 174099 | 174204 | 174205 | 174626