[pkgsrc/trunk]: pkgsrc/net/powerdns Fix SunOS segfaults. Bump PKGREVISION.

[fhajny <fhajny%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/ccf888977724
branches:  trunk
changeset: 360199:ccf888977724
user:      fhajny <fhajny%pkgsrc.org@localhost>
date:      Wed Mar 29 11:46:03 2017 +0000

description:
Fix SunOS segfaults. Bump PKGREVISION.

diffstat:

 net/powerdns/Makefile                      |   3 +-
 net/powerdns/distinfo                      |   4 +-
 net/powerdns/patches/patch-pdns_iputils.hh |  37 ++++++++++++++++++++++++++++-
 3 files changed, 39 insertions(+), 5 deletions(-)

diffs (79 lines):

diff -r 082a491e23ff -r ccf888977724 net/powerdns/Makefile
--- a/net/powerdns/Makefile     Wed Mar 29 07:32:04 2017 +0000
+++ b/net/powerdns/Makefile     Wed Mar 29 11:46:03 2017 +0000
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.23 2017/03/09 13:32:54 fhajny Exp $
+# $NetBSD: Makefile,v 1.24 2017/03/29 11:46:03 fhajny Exp $
 
 .include "Makefile.common"
 
 PKGNAME=               ${DISTNAME:S/pdns/powerdns/}
+PKGREVISION=           1
 COMMENT=               Modern, advanced and high performance nameserver
 
 .include "options.mk"
diff -r 082a491e23ff -r ccf888977724 net/powerdns/distinfo
--- a/net/powerdns/distinfo     Wed Mar 29 07:32:04 2017 +0000
+++ b/net/powerdns/distinfo     Wed Mar 29 11:46:03 2017 +0000
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.23 2017/03/24 15:14:14 joerg Exp $
+$NetBSD: distinfo,v 1.24 2017/03/29 11:46:03 fhajny Exp $
 
 SHA1 (pdns-4.0.3.tar.bz2) = de3562f135d31c6ccf9363f587bb59a5f65d1d91
 RMD160 (pdns-4.0.3.tar.bz2) = 5befc3a60dbbb14386f3557c7c419ee4b92b2438
@@ -8,5 +8,5 @@
 SHA1 (patch-ext_json11_json11.cpp) = a8ffe67156a836841aef8a6bba134a82283f381e
 SHA1 (patch-pdns_dns.hh) = 626eb4e29b7fcd82fbe056036c157c1e85fa49ca
 SHA1 (patch-pdns_dnsscope.cc) = b289b750686b25041c3e291fb0d3d562beb36eaf
-SHA1 (patch-pdns_iputils.hh) = 48df687a1e5116238aa4f04ff89cbdc2b4b4dfc3
+SHA1 (patch-pdns_iputils.hh) = 7507f6b080c9aa5e71068b3e9e92e71de6fc2b15
 SHA1 (patch-pdns_qtype.hh) = 0f8bca4c0cafea9a5257a08077fa42b4c52127f5
diff -r 082a491e23ff -r ccf888977724 net/powerdns/patches/patch-pdns_iputils.hh
--- a/net/powerdns/patches/patch-pdns_iputils.hh        Wed Mar 29 07:32:04 2017 +0000
+++ b/net/powerdns/patches/patch-pdns_iputils.hh        Wed Mar 29 11:46:03 2017 +0000
@@ -1,6 +1,8 @@
-$NetBSD: patch-pdns_iputils.hh,v 1.1 2017/03/09 13:32:54 fhajny Exp $
+$NetBSD: patch-pdns_iputils.hh,v 1.2 2017/03/29 11:46:03 fhajny Exp $
 
-Do not use IP_PKTINFO on NetBSD, the structure is not as expected.
+- Do not use IP_PKTINFO on NetBSD, the structure is not as expected.
+- Backport fix for SunOS segfault problem, see:
+  https://github.com/PowerDNS/pdns/pull/4877
 
 --- pdns/iputils.hh.orig       2017-01-17 08:43:49.000000000 +0000
 +++ pdns/iputils.hh
@@ -15,3 +17,34 @@
  #ifdef __APPLE__
  #include <libkern/OSByteOrder.h>
  
+@@ -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
+