diff options
-rw-r--r-- | net/powerdns-recursor/Makefile | 3 | ||||
-rw-r--r-- | net/powerdns-recursor/distinfo | 4 | ||||
-rw-r--r-- | net/powerdns-recursor/patches/patch-iputils.hh | 37 |
3 files changed, 39 insertions, 5 deletions
diff --git a/net/powerdns-recursor/Makefile b/net/powerdns-recursor/Makefile index bf02fcf44c2..7338d613733 100644 --- a/net/powerdns-recursor/Makefile +++ b/net/powerdns-recursor/Makefile @@ -1,7 +1,8 @@ -# $NetBSD: Makefile,v 1.20 2017/03/24 18:45:44 fhajny Exp $ +# $NetBSD: Makefile,v 1.21 2017/03/31 19:41:13 fhajny Exp $ # DISTNAME= pdns-recursor-4.0.4 +PKGREVISION= 1 CATEGORIES= net MASTER_SITES= http://downloads.powerdns.com/releases/ EXTRACT_SUFX= .tar.bz2 diff --git a/net/powerdns-recursor/distinfo b/net/powerdns-recursor/distinfo index a3770583c01..c8a2d903b10 100644 --- a/net/powerdns-recursor/distinfo +++ b/net/powerdns-recursor/distinfo @@ -1,10 +1,10 @@ -$NetBSD: distinfo,v 1.16 2017/03/09 13:43:49 fhajny Exp $ +$NetBSD: distinfo,v 1.17 2017/03/31 19:41:13 fhajny Exp $ SHA1 (pdns-recursor-4.0.4.tar.bz2) = e3d2f18e0ea929e425bc9da4256f76331797f691 RMD160 (pdns-recursor-4.0.4.tar.bz2) = 12b1b7239156d9b898199c02a1edd6875301a7b1 SHA512 (pdns-recursor-4.0.4.tar.bz2) = 9473dfe9abc509b2bb953139dd7892de2027ee1508902fa0c2cd30dd9a88878fcf44370b8372d573cbab12de32bb8c604005d3b39ea34db2ef86786e689d36ab Size (pdns-recursor-4.0.4.tar.bz2) = 1050596 bytes SHA1 (patch-dns.hh) = 7e9c1b10a066a605b74ebdbee2d894aed50f6c68 -SHA1 (patch-iputils.hh) = aaf3b913fbe26f5daa9c2b16ff24cc9a7a1d7de0 +SHA1 (patch-iputils.hh) = ab1c952d27648b6db9fd74eba987d10b79837517 SHA1 (patch-kqueuemplexer.cc) = 87b3b6670393ee60fc96cf91c5acf575adfd06c0 SHA1 (patch-qtype.hh) = f14eb9ad7efc7dd4a0ce220c1f93044ef69e99c2 diff --git a/net/powerdns-recursor/patches/patch-iputils.hh b/net/powerdns-recursor/patches/patch-iputils.hh index 1c00eac9847..62f9dd9f682 100644 --- a/net/powerdns-recursor/patches/patch-iputils.hh +++ b/net/powerdns-recursor/patches/patch-iputils.hh @@ -1,6 +1,8 @@ -$NetBSD: patch-iputils.hh,v 1.2 2017/03/09 13:43:49 fhajny Exp $ +$NetBSD: patch-iputils.hh,v 1.3 2017/03/31 19:41:13 fhajny Exp $ -IP_PKTINFO structure different on NetBSD than expected. +- IP_PKTINFO structure different on NetBSD than expected. +- Backport fix for SunOS segfault problem, see: + https://github.com/PowerDNS/pdns/pull/4877 --- iputils.hh.orig 2017-01-13 08:55:55.000000000 +0000 +++ iputils.hh @@ -15,3 +17,34 @@ IP_PKTINFO structure different on NetBSD than expected. #include "namespaces.hh" #ifdef __APPLE__ +@@ -59,23 +63,22 @@ + #define le64toh(x) OSSwapLittleToHostInt64(x) + #endif + +-// for illumos +-#ifdef BE_64 ++#ifdef __sun + + #define htobe16(x) BE_16(x) + #define htole16(x) LE_16(x) +-#define be16toh(x) BE_IN16(x) +-#define le16toh(x) LE_IN16(x) ++#define be16toh(x) BE_IN16(&(x)) ++#define le16toh(x) LE_IN16(&(x)) + + #define htobe32(x) BE_32(x) + #define htole32(x) LE_32(x) +-#define be32toh(x) BE_IN32(x) +-#define le32toh(x) LE_IN32(x) ++#define be32toh(x) BE_IN32(&(x)) ++#define le32toh(x) LE_IN32(&(x)) + + #define htobe64(x) BE_64(x) + #define htole64(x) LE_64(x) +-#define be64toh(x) BE_IN64(x) +-#define le64toh(x) LE_IN64(x) ++#define be64toh(x) BE_IN64(&(x)) ++#define le64toh(x) LE_IN64(&(x)) + + #endif + |