From df20fcc7a0925d69b0e8bda44683e593d5d3dbe7 Mon Sep 17 00:00:00 2001
From: jmc <jmc>
Date: Fri, 8 Mar 2002 05:18:11 +0000
Subject: Check NetBSD version and call getpeername and accept with a socklen_t
 if >= 1.3J. Fixes bugs with casting int *'s to socklen_t *'s which gcc 2.95.x
 won't do in c++ mode since they are differing types.

---
 misc/root/distinfo         |  3 ++-
 misc/root/patches/patch-am | 33 +++++++++++++++++++++++++++++++++
 2 files changed, 35 insertions(+), 1 deletion(-)
 create mode 100644 misc/root/patches/patch-am

(limited to 'misc/root')

diff --git a/misc/root/distinfo b/misc/root/distinfo
index f02a85f0b8a..c0e73b12e62 100644
--- a/misc/root/distinfo
+++ b/misc/root/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.2 2001/04/20 13:52:20 agc Exp $
+$NetBSD: distinfo,v 1.3 2002/03/08 05:18:11 jmc Exp $
 
 SHA1 (root_v2.23.08.source.tar.gz) = 659cc90f1da9baa5565903d0b547be9c273d4369
 Size (root_v2.23.08.source.tar.gz) = 3333232 bytes
@@ -14,3 +14,4 @@ SHA1 (patch-ai) = 4b677a3513fdcd2e158d2f2883aa72d8fd2cc7c7
 SHA1 (patch-aj) = 6e2d1c6cfba47088703a4fc402cbe6dcd18d9114
 SHA1 (patch-ak) = 84fa09056ec2cdd13f596849bc010bd282a57208
 SHA1 (patch-al) = 5b5302dc265805fd28fc49af7b1ddd955a462b05
+SHA1 (patch-am) = 606a6d533a4b43a0b1af6ea2ae7c54accdb9f125
diff --git a/misc/root/patches/patch-am b/misc/root/patches/patch-am
new file mode 100644
index 00000000000..18bdec2278f
--- /dev/null
+++ b/misc/root/patches/patch-am
@@ -0,0 +1,33 @@
+$NetBSD: patch-am,v 1.1 2002/03/08 05:18:12 jmc Exp $
+
+--- src/ROOTD_net.cxx.orig	Fri Mar  8 04:26:20 2002
++++ src/ROOTD_net.cxx	Fri Mar  8 04:28:52 2002
+@@ -33,6 +33,10 @@
+ #include <netdb.h>
+ #include <errno.h>
+ 
++#ifdef __NetBSD__
++#include <sys/param.h>
++#endif
++
+ //*KEEP,rootdp,T=C++.
+ #include "rootdp.h"
+ //*KEND.
+@@ -176,7 +180,7 @@
+       if (gDebug > 0) {
+ #ifdef _AIX
+          size_t clilen = sizeof(tcp_cli_addr);
+-#elif defined(R__GLIBC)
++#elif defined(R__GLIBC) || (defined(__NetBSD__) && __NetBSD_Version__ >= 103100000)
+          socklen_t clilen = sizeof(tcp_cli_addr);
+ #else
+          int clilen = sizeof(tcp_cli_addr);
+@@ -206,7 +210,7 @@
+ again:
+ #ifdef _AIX
+    size_t clilen = sizeof(tcp_cli_addr);
+-#elif defined(R__GLIBC)
++#elif defined(R__GLIBC) || (defined(__NetBSD__) && __NetBSD_Version__ >= 103100000)
+    socklen_t clilen = sizeof(tcp_cli_addr);
+ #else
+    int clilen = sizeof(tcp_cli_addr);
-- 
cgit v1.2.3