From e18010d80b99fae9a22d7b005081e992b93cffa6 Mon Sep 17 00:00:00 2001
From: schmonz <schmonz@pkgsrc.org>
Date: Mon, 21 Mar 2005 04:03:35 +0000
Subject: Incorporate patch from Bernhard Roth to correct the default values
 generated by tinydns-data on sparc64 (and presumably other 64-bit platforms).
 Discussed on the dns list in this thread:

http://marc.theaimsgroup.com/?l=djbdns&m=110845281123105&w=2

Bump PKGREVISION for this user-visible change.

Addresses PR pkg/28420.
---
 net/djbdns/Makefile         |  4 ++--
 net/djbdns/distinfo         |  3 ++-
 net/djbdns/patches/patch-ac | 57 +++++++++++++++++++++++++++++++++++++++++++++
 3 files changed, 61 insertions(+), 3 deletions(-)
 create mode 100644 net/djbdns/patches/patch-ac

(limited to 'net')

diff --git a/net/djbdns/Makefile b/net/djbdns/Makefile
index 7db19e58214..b93cbe22642 100644
--- a/net/djbdns/Makefile
+++ b/net/djbdns/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.38 2005/03/13 03:25:44 schmonz Exp $
+# $NetBSD: Makefile,v 1.39 2005/03/21 04:03:35 schmonz Exp $
 # FreeBSD Id: ports/net/djbdns/Makefile,v 1.4 2000/09/28 18:18:41 nbm Exp
 #
 
 DISTNAME=		djbdns-1.05
-PKGREVISION=		5
+PKGREVISION=		6
 CATEGORIES=		net
 MASTER_SITES=		http://cr.yp.to/djbdns/	ftp://cr.yp.to/djbdns/
 DISTFILES=		${DISTNAME}${EXTRACT_SUFX} ${MANPAGES}
diff --git a/net/djbdns/distinfo b/net/djbdns/distinfo
index 1b004a34b2a..89c621d58f2 100644
--- a/net/djbdns/distinfo
+++ b/net/djbdns/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.12 2005/02/24 12:13:45 agc Exp $
+$NetBSD: distinfo,v 1.13 2005/03/21 04:03:35 schmonz Exp $
 
 SHA1 (djbdns-1.05.tar.gz) = 2efdb3a039d0c548f40936aa9cb30829e0ce8c3d
 RMD160 (djbdns-1.05.tar.gz) = a832cbfd93e4ccec6a565492a4ee0b3c1b4b68ed
@@ -13,3 +13,4 @@ SHA1 (djbdns-1.05-ignoreip2.patch) = ec4281a6864bd044a84fbfcaaf42baa6b003976d
 Size (djbdns-1.05-ignoreip2.patch) = 3890 bytes
 SHA1 (patch-aa) = 8953486b88d57d003956c6fe2addea9bcd16e5aa
 SHA1 (patch-ab) = e14b7cba40d1dc7279c3ab04ede597277e2576d1
+SHA1 (patch-ac) = 338c8dbda014f35a7dccae780126fd8a7a3b33c6
diff --git a/net/djbdns/patches/patch-ac b/net/djbdns/patches/patch-ac
new file mode 100644
index 00000000000..e16b78ac262
--- /dev/null
+++ b/net/djbdns/patches/patch-ac
@@ -0,0 +1,57 @@
+$NetBSD: patch-ac,v 1.3 2005/03/21 04:03:35 schmonz Exp $
+
+--- tinydns-data.c.orig	2001-02-11 16:11:45.000000000 -0500
++++ tinydns-data.c
+@@ -196,6 +196,7 @@ int main()
+   char type[2];
+   char soa[20];
+   char buf[4];
++  uint32 hack64bit;
+ 
+   umask(022);
+ 
+@@ -251,19 +252,39 @@ int main()
+ 	if (!dns_domain_fromdot(&d1,f[0].s,f[0].len)) nomem();
+ 
+ 	if (!stralloc_0(&f[3])) nomem();
+-	if (!scan_ulong(f[3].s,&u)) uint32_unpack_big(defaultsoa,&u);
++	if (!scan_ulong(f[3].s,&u))
++	{
++	  uint32_unpack_big(defaultsoa,&hack64bit);
++	  u = hack64bit;
++	}
+ 	uint32_pack_big(soa,u);
+ 	if (!stralloc_0(&f[4])) nomem();
+-	if (!scan_ulong(f[4].s,&u)) uint32_unpack_big(defaultsoa + 4,&u);
++	if (!scan_ulong(f[4].s,&u))
++	{
++	  uint32_unpack_big(defaultsoa + 4,&hack64bit);
++	  u = hack64bit;
++	}
+ 	uint32_pack_big(soa + 4,u);
+ 	if (!stralloc_0(&f[5])) nomem();
+-	if (!scan_ulong(f[5].s,&u)) uint32_unpack_big(defaultsoa + 8,&u);
++	if (!scan_ulong(f[5].s,&u))
++	{
++	  uint32_unpack_big(defaultsoa + 8,&hack64bit);
++	  u = hack64bit;
++	}
+ 	uint32_pack_big(soa + 8,u);
+ 	if (!stralloc_0(&f[6])) nomem();
+-	if (!scan_ulong(f[6].s,&u)) uint32_unpack_big(defaultsoa + 12,&u);
++	if (!scan_ulong(f[6].s,&u))
++	{
++	  uint32_unpack_big(defaultsoa + 12,&hack64bit);
++	  u = hack64bit;
++	}
+ 	uint32_pack_big(soa + 12,u);
+ 	if (!stralloc_0(&f[7])) nomem();
+-	if (!scan_ulong(f[7].s,&u)) uint32_unpack_big(defaultsoa + 16,&u);
++	if (!scan_ulong(f[7].s,&u))
++	{
++	  uint32_unpack_big(defaultsoa + 16,&hack64bit);
++	  u = hack64bit;
++	}
+ 	uint32_pack_big(soa + 16,u);
+ 
+ 	if (!stralloc_0(&f[8])) nomem();
-- 
cgit v1.2.3