diff options
| author | Leonardo Arena <rnalrd@alpinelinux.org> | 2017-01-16 15:18:29 +0000 |
|---|---|---|
| committer | Leonardo Arena <rnalrd@alpinelinux.org> | 2017-01-16 15:24:11 +0000 |
| commit | a2f555f35642d2478b56f01d5e9a6c6709d8fa84 (patch) | |
| tree | 40d21dd9b2d95b031e341331f121da1319ebb1fe /community/pdns | |
| parent | dafe374a2573e72f257124371bb632a8d56c7f34 (diff) | |
| download | aports-a2f555f35642d2478b56f01d5e9a6c6709d8fa84.tar.bz2 aports-a2f555f35642d2478b56f01d5e9a6c6709d8fa84.tar.xz | |
community/pdns: upgrade to 4.0.2
Diffstat (limited to 'community/pdns')
| -rw-r--r-- | community/pdns/APKBUILD | 14 | ||||
| -rw-r--r-- | community/pdns/libressl.patch | 46 |
2 files changed, 5 insertions, 55 deletions
diff --git a/community/pdns/APKBUILD b/community/pdns/APKBUILD index 7720d0ae4c..aaf26b5db7 100644 --- a/community/pdns/APKBUILD +++ b/community/pdns/APKBUILD @@ -3,8 +3,8 @@ # Contributor: Olivier Mauras <olivier@mauras.ch> # Maintainer: Matt Smith <mcs@darkregion.net> pkgname=pdns -pkgver=4.0.1 -pkgrel=1 +pkgver=4.0.2 +pkgrel=0 pkgdesc="PowerDNS Authoritative Server" url="http://www.powerdns.com/" arch="all" @@ -25,7 +25,6 @@ subpackages="$pkgname-doc pkgusers="pdns" pkggroups="pdns" source="http://downloads.powerdns.com/releases/pdns-$pkgver.tar.bz2 - libressl.patch pdns.initd pdns.conf " @@ -92,15 +91,12 @@ _mv_backend() { "$subpkgdir"/usr/lib/pdns/pdns/ || return 1 } -md5sums="d34a390672aa043f8a287e5bb2284f4a pdns-4.0.1.tar.bz2 -262a16352b63b3bb89eda6ff01292f52 libressl.patch +md5sums="7629b2393fac3336cc37b49d8e769358 pdns-4.0.2.tar.bz2 db11dfe72474858f706155c817f2ded5 pdns.initd 351bac7f784a1a40e768466d9e6f1a79 pdns.conf" -sha256sums="d191eed4a6664430e85969f49835c59e810ecbb7b3eb506e64c6b2734091edd7 pdns-4.0.1.tar.bz2 -81b86dca30af161d0bb6f944e7e89b84f21494bf9534c2a223baff71cd84f53e libressl.patch +sha256sums="d051e53b63f586c924f00ce8a81662f7bd285b461d125d4991538f92cf7e629d pdns-4.0.2.tar.bz2 081835f812e419b153a9cc716ad55b9cb22c6c185b748e0aafc40430fa5e8b5e pdns.initd 5fdf423f829dca0b50bc81bab773d7ec4ee6627e35f861124d8c2ccd79a2f50c pdns.conf" -sha512sums="77fce9963a05198afeb569f92fbb0f6a1cb3426c28dd77b0921128189c80d9a72ebdbfc249dfc0b5b89cc7a65a83887a0388d6cc3461453b1e3096e563afdd1e pdns-4.0.1.tar.bz2 -21e88422c6a7cd7d9fbe0de972f85d7ea6e5c3b63e96d742d5cbee99de21f35a1ccd5cdde713a31a932414cc9e43d1b20dcd8d9cfd8f9ce3827915d03f6ba497 libressl.patch +sha512sums="6720289332ee5186f4c58a00a720f3bb58480c0ae7f09915148ca8b40e2dfdc77e2f14123df903692afa464539eeef6b21e8ea3d284278897751ba807e2cdffe pdns-4.0.2.tar.bz2 71257be925fe57b15ebf29a7810cd70581cb867416ab9562300a1bbc3eb94fcb92ea2eb95f15e3ee3bd409468911077c50f90a2501801b0c8c49ed979f41f3a4 pdns.initd 9913551bb4d685aaced806134b1037d85ce759e7d9e780e256e67651d9d346aad5e608b4a45a4933f0ba879605b69d06e579c38b7f917f7a9be37c7797c5953b pdns.conf" diff --git a/community/pdns/libressl.patch b/community/pdns/libressl.patch deleted file mode 100644 index 0fecb70814..0000000000 --- a/community/pdns/libressl.patch +++ /dev/null @@ -1,46 +0,0 @@ -From 115f658ee2000a4cdcc13e999da50b3634c6a907 Mon Sep 17 00:00:00 2001 -From: Remi Gacogne <remi.gacogne@powerdns.com> -Date: Fri, 12 Aug 2016 09:52:08 +0200 -Subject: [PATCH] Fix build with LibreSSL, for which OPENSSL_VERSION_NUMBER is - irrelevant - ---- - pdns/dns_random.cc | 4 ++-- - pdns/opensslsigners.cc | 2 +- - 2 files changed, 3 insertions(+), 3 deletions(-) - -diff --git a/pdns/dns_random.cc b/pdns/dns_random.cc -index 623e3aa..4a8ef82 100644 ---- a/pdns/dns_random.cc -+++ b/pdns/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); -diff --git a/pdns/opensslsigners.cc b/pdns/opensslsigners.cc -index 3496992..18b78cd 100644 ---- a/pdns/opensslsigners.cc -+++ b/pdns/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; - |