From 4c8e51072d67d23ec11863ce6df0f16d622af48d Mon Sep 17 00:00:00 2001 From: tron Date: Sun, 28 Nov 2010 14:04:37 +0000 Subject: Pullup ticket #3284 - requested by taca net/net-snmp: build fix Revisions pulled up: - net/net-snmp/distinfo 1.57 - net/net-snmp/patches/patch-et 1.5 - net/net-snmp/patches/patch-eu 1.2 - net/net-snmp/patches/patch-ev 1.2 - net/net-snmp/patches/patch-ew 1.2 - net/net-snmp/patches/patch-ex 1.2 - net/net-snmp/patches/patch-ey 1.3 - net/net-snmp/patches/patch-ez 1.2 - net/net-snmp/patches/patch-fa 1.2 --- Module Name: pkgsrc Committed By: taca Date: Wed Nov 17 00:59:07 UTC 2010 Modified Files: pkgsrc/net/net-snmp: distinfo pkgsrc/net/net-snmp/patches: patch-et patch-eu patch-ev patch-ew patch-ex patch-ey patch-ez patch-fa Log Message: Fix build problem on NetBSD 4. Previous patch for NetBSD wasn't really for netbsd4 but 4.99.58 and later. So, I changed "#ifdef netbsd4" to "#ifdef NETBSD_STATS_VIA_SYSCTL" and clean up patches. Should be fix PR pkg/43288. It is fix of build problem only, so no PKG_REVISION bump. --- net/net-snmp/distinfo | 18 +++++++++--------- net/net-snmp/patches/patch-et | 14 +++++++------- net/net-snmp/patches/patch-eu | 14 +++++++------- net/net-snmp/patches/patch-ev | 12 ++++++++---- net/net-snmp/patches/patch-ew | 6 +++--- net/net-snmp/patches/patch-ex | 8 ++++---- net/net-snmp/patches/patch-ey | 10 +++++----- net/net-snmp/patches/patch-ez | 16 ++++++++-------- net/net-snmp/patches/patch-fa | 12 ++++++------ 9 files changed, 57 insertions(+), 53 deletions(-) diff --git a/net/net-snmp/distinfo b/net/net-snmp/distinfo index 629aa2beb14..cef92201fdb 100644 --- a/net/net-snmp/distinfo +++ b/net/net-snmp/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.56 2010/07/20 08:33:44 adam Exp $ +$NetBSD: distinfo,v 1.56.2.1 2010/11/28 14:04:37 tron Exp $ SHA1 (net-snmp-5.4.3.tar.gz) = 849a20ddeaa90b1b0010e487876927e615b5c6bc RMD160 (net-snmp-5.4.3.tar.gz) = 417f47c301c3221a64f37162b56b4661c9f6d8cb @@ -44,12 +44,12 @@ SHA1 (patch-ei) = 7628297dcfd56c8d69cf8235a680956b868aaca5 SHA1 (patch-el) = f80dc7058b8a60e3be53e5673538f6eb2d173b68 SHA1 (patch-ep) = 91029b17538360ba09e8e74943d2c4481f89a33a SHA1 (patch-es) = c26c048ccbda7e4d28cb0a2263cdaa71befb4f96 -SHA1 (patch-et) = 5a352594bfde763c215eb8b0d18951add1f3e777 -SHA1 (patch-eu) = c0521de99c52c517509a76b55a62640fdce06d40 -SHA1 (patch-ev) = 4a686c44e73a7d9d6a792db1f1a5b20fc654e33e -SHA1 (patch-ew) = 2f96f61269723adbb4df0cd0adc65d0e0abb6b01 -SHA1 (patch-ex) = ac1876e54fd7bc643ae8a290f83ce4ab3b50d7c6 -SHA1 (patch-ey) = bc54546495c3726a5e4853eb29b04de9858f8f19 -SHA1 (patch-ez) = 812fffcf992a040677cbb05d8a8344d221203030 -SHA1 (patch-fa) = ea4243dd36395d16ee1a6b2eccce9ef833a9308b +SHA1 (patch-et) = e7e56b535b684580ce16eb279b786af6a9e12d40 +SHA1 (patch-eu) = 7f6f2ac9cfd88577dbc77ee713bd0041b10c2c9a +SHA1 (patch-ev) = 966e9686d826e530323baad5a10e6bd251a08526 +SHA1 (patch-ew) = 503c4db9c3e784a16854a6b5aa40a79798f2e381 +SHA1 (patch-ex) = d624bfdea76e425d632be4a523706470f5abe570 +SHA1 (patch-ey) = ff5f0fbcbea699f5ae628b315b39a676acb8d190 +SHA1 (patch-ez) = dc7ef797733fd930f2a3dacb8c28151371706dfc +SHA1 (patch-fa) = 9478aa624fbdc82b54d1e7f50f4e2ee0518dcb92 SHA1 (patch-fb) = 64d97a51d82488ef4d3ea5dd40278501975d58fb diff --git a/net/net-snmp/patches/patch-et b/net/net-snmp/patches/patch-et index f0e366a97d0..e78838e564f 100644 --- a/net/net-snmp/patches/patch-et +++ b/net/net-snmp/patches/patch-et @@ -1,12 +1,12 @@ -$NetBSD: patch-et,v 1.4 2010/05/11 04:39:54 adam Exp $ +$NetBSD: patch-et,v 1.4.4.1 2010/11/28 14:04:37 tron Exp $ ---- agent/mibgroup/mibII/icmp.c.orig 2010-03-12 00:31:17.000000000 +0000 -+++ agent/mibgroup/mibII/icmp.c 2010-03-12 00:33:41.000000000 +0000 -@@ -127,6 +127,12 @@ +--- agent/mibgroup/mibII/icmp.c.orig 2010-10-19 03:54:57.000000000 +0000 ++++ agent/mibgroup/mibII/icmp.c +@@ -127,6 +127,12 @@ init_icmp(void) #define USES_SNMP_DESIGNED_ICMPSTAT #endif -+#ifdef netbsd4 ++#ifdef NETBSD_STATS_VIA_SYSCTL +#define ICMP_STAT_STRUCTURE struct icmp_mib +#define USES_SNMP_DESIGNED_ICMPSTAT +#undef ICMP_NSTATS @@ -15,11 +15,11 @@ $NetBSD: patch-et,v 1.4 2010/05/11 04:39:54 adam Exp $ #if defined (WIN32) || defined (cygwin) #include #define ICMP_STAT_STRUCTURE MIB_ICMP -@@ -706,6 +712,21 @@ +@@ -706,6 +712,21 @@ icmp_load(netsnmp_cache *cache, void *vm } return ret_value; } -+#elif defined(netbsd4) ++#elif defined(NETBSD_STATS_VIA_SYSCTL) +int +icmp_load(netsnmp_cache *cache, void *vmagic) +{ diff --git a/net/net-snmp/patches/patch-eu b/net/net-snmp/patches/patch-eu index 79fda4a294a..f4ebd643a8c 100644 --- a/net/net-snmp/patches/patch-eu +++ b/net/net-snmp/patches/patch-eu @@ -1,12 +1,12 @@ -$NetBSD: patch-eu,v 1.1 2010/05/11 04:39:54 adam Exp $ +$NetBSD: patch-eu,v 1.1.4.1 2010/11/28 14:04:37 tron Exp $ ---- agent/mibgroup/mibII/ip.c.orig 2010-03-12 00:31:27.000000000 +0000 -+++ agent/mibgroup/mibII/ip.c 2010-03-12 00:33:50.000000000 +0000 -@@ -199,6 +199,12 @@ +--- agent/mibgroup/mibII/ip.c.orig 2010-10-19 03:54:57.000000000 +0000 ++++ agent/mibgroup/mibII/ip.c +@@ -199,6 +199,12 @@ init_ip(void) #define USES_SNMP_DESIGNED_IPSTAT #endif -+#ifdef netbsd4 ++#ifdef NETBSD_STATS_VIA_SYSCTL +#define IP_STAT_STRUCTURE struct ip_mib +#define USES_SNMP_DESIGNED_IPSTAT +#undef IP_NSTATS @@ -15,11 +15,11 @@ $NetBSD: patch-eu,v 1.1 2010/05/11 04:39:54 adam Exp $ #if defined (WIN32) || defined (cygwin) #include #define IP_STAT_STRUCTURE MIB_IPSTATS -@@ -804,6 +810,21 @@ +@@ -804,6 +810,21 @@ ip_load(netsnmp_cache *cache, void *vmag } return ret_value; } -+#elif defined (netbsd4) ++#elif defined (NETBSD_STATS_VIA_SYSCTL) +int +ip_load(netsnmp_cache *cache, void *vmagic) +{ diff --git a/net/net-snmp/patches/patch-ev b/net/net-snmp/patches/patch-ev index 031da8e1e31..99587ed2b41 100644 --- a/net/net-snmp/patches/patch-ev +++ b/net/net-snmp/patches/patch-ev @@ -1,8 +1,8 @@ -$NetBSD: patch-ev,v 1.1 2010/05/11 04:39:54 adam Exp $ +$NetBSD: patch-ev,v 1.1.4.1 2010/11/28 14:04:37 tron Exp $ ---- agent/mibgroup/mibII/kernel_netbsd.c.orig 2010-03-12 00:47:14.000000000 +0000 -+++ agent/mibgroup/mibII/kernel_netbsd.c 2010-03-12 01:40:58.000000000 +0000 -@@ -0,0 +1,194 @@ +--- agent/mibgroup/mibII/kernel_netbsd.c.orig 2010-10-19 03:54:58.000000000 +0000 ++++ agent/mibgroup/mibII/kernel_netbsd.c +@@ -0,0 +1,198 @@ +/* + * NetBSD implementation for mapping the IP stat arrays into struct's + * Required for NetBSD versions produced after April 7th 2008 (4+) @@ -32,6 +32,8 @@ $NetBSD: patch-ev,v 1.1 2010/05/11 04:39:54 adam Exp $ + +#include "kernel_netbsd.h" + ++#if defined(NETBSD_STATS_VIA_SYSCTL) ++ +int +netbsd_read_icmp_stat(struct icmp_mib *mib) +{ @@ -197,3 +199,5 @@ $NetBSD: patch-ev,v 1.1 2010/05/11 04:39:54 adam Exp $ + + return 0; +} ++ ++#endif diff --git a/net/net-snmp/patches/patch-ew b/net/net-snmp/patches/patch-ew index e3d8eabc343..14d184ede9f 100644 --- a/net/net-snmp/patches/patch-ew +++ b/net/net-snmp/patches/patch-ew @@ -1,4 +1,4 @@ -$NetBSD: patch-ew,v 1.1 2010/05/11 04:39:54 adam Exp $ +$NetBSD: patch-ew,v 1.1.4.1 2010/11/28 14:04:37 tron Exp $ --- agent/mibgroup/mibII/kernel_netbsd.h.orig 2010-03-12 00:31:50.000000000 +0000 +++ agent/mibgroup/mibII/kernel_netbsd.h 2010-03-12 00:31:50.000000000 +0000 @@ -6,7 +6,7 @@ $NetBSD: patch-ew,v 1.1 2010/05/11 04:39:54 adam Exp $ +#ifndef _MIBGROUP_KERNEL_NETBSD_H +#define _MIBGROUP_KERNEL_NETBSD_H + -+#if __NetBSD_Version__ >= 499005800 ++#if defined(NETBSD_STATS_VIA_SYSCTL) + +struct icmp_mib { + unsigned long icmpInMsgs; @@ -91,6 +91,6 @@ $NetBSD: patch-ew,v 1.1 2010/05/11 04:39:54 adam Exp $ +int netbsd_read_tcp_stat(struct tcp_mib *); +int netbsd_read_udp_stat(struct udp_mib *); + -+#endif /* __NetBSD_Version__ >= 499005800 */ ++#endif /* NETBSD_STATS_VIA_SYSCTL */ + +#endif /* _MIBGROUP_KERNEL_NETBSD_H */ diff --git a/net/net-snmp/patches/patch-ex b/net/net-snmp/patches/patch-ex index 42d0bef908c..8744a4b534f 100644 --- a/net/net-snmp/patches/patch-ex +++ b/net/net-snmp/patches/patch-ex @@ -1,12 +1,12 @@ -$NetBSD: patch-ex,v 1.1 2010/05/11 04:39:54 adam Exp $ +$NetBSD: patch-ex,v 1.1.4.1 2010/11/28 14:04:37 tron Exp $ ---- agent/mibgroup/mibII/mibII_common.h.orig 2010-03-12 00:32:15.000000000 +0000 -+++ agent/mibgroup/mibII/mibII_common.h 2010-03-12 00:33:59.000000000 +0000 +--- agent/mibgroup/mibII/mibII_common.h.orig 2006-09-15 00:48:50.000000000 +0000 ++++ agent/mibgroup/mibII/mibII_common.h @@ -100,6 +100,9 @@ #ifdef linux #include "kernel_linux.h" #endif -+#ifdef netbsd4 ++#ifdef NETBSD_STATS_VIA_SYSCTL +#include "kernel_netbsd.h" +#endif /* or MIB_xxxCOUNTER_SYMBOL || hpux11 */ diff --git a/net/net-snmp/patches/patch-ey b/net/net-snmp/patches/patch-ey index 00fe9e456aa..42483181656 100644 --- a/net/net-snmp/patches/patch-ey +++ b/net/net-snmp/patches/patch-ey @@ -1,12 +1,12 @@ -$NetBSD: patch-ey,v 1.2 2010/07/20 08:33:44 adam Exp $ +$NetBSD: patch-ey,v 1.2.2.1 2010/11/28 14:04:37 tron Exp $ ---- agent/mibgroup/mibII/tcp.c.orig 2009-11-13 12:59:26.000000000 +0000 +--- agent/mibgroup/mibII/tcp.c.orig 2010-10-19 03:54:58.000000000 +0000 +++ agent/mibgroup/mibII/tcp.c @@ -167,6 +167,12 @@ init_tcp(void) #define USES_SNMP_DESIGNED_TCPSTAT #endif -+#ifdef netbsd4 ++#ifdef NETBSD_STATS_VIA_SYSCTL +#define TCP_STAT_STRUCTURE struct tcp_mib +#define USES_SNMP_DESIGNED_TCPSTAT +#undef TCP_NSTATS @@ -15,11 +15,11 @@ $NetBSD: patch-ey,v 1.2 2010/07/20 08:33:44 adam Exp $ #if defined (WIN32) || defined (cygwin) #include #define TCP_STAT_STRUCTURE MIB_TCPSTATS -@@ -689,6 +695,21 @@ tcp_load(netsnmp_cache *cache, void *vma +@@ -768,6 +774,21 @@ tcp_load(netsnmp_cache *cache, void *vma } return ret_value; } -+#elif defined(netbsd4) ++#elif defined(NETBSD_STATS_VIA_SYSCTL) +int +tcp_load(netsnmp_cache *cache, void *vmagic) +{ diff --git a/net/net-snmp/patches/patch-ez b/net/net-snmp/patches/patch-ez index 8d5d89e0fad..63b98787e14 100644 --- a/net/net-snmp/patches/patch-ez +++ b/net/net-snmp/patches/patch-ez @@ -1,23 +1,23 @@ -$NetBSD: patch-ez,v 1.1 2010/05/11 04:39:54 adam Exp $ +$NetBSD: patch-ez,v 1.1.4.1 2010/11/28 14:04:37 tron Exp $ ---- agent/mibgroup/mibII/udp.c.orig 2010-03-12 00:32:31.000000000 +0000 -+++ agent/mibgroup/mibII/udp.c 2010-03-12 00:34:17.000000000 +0000 +--- agent/mibgroup/mibII/udp.c.orig 2010-10-19 03:54:57.000000000 +0000 ++++ agent/mibgroup/mibII/udp.c @@ -29,6 +29,10 @@ #include "kernel_linux.h" #endif -+#ifdef netbsd4 ++#ifdef NETBSD_STATS_VIA_SYSCTL +#include "kernel_netbsd.h" +#endif + #ifdef cygwin #define WIN32 #include -@@ -149,6 +153,12 @@ +@@ -149,6 +153,12 @@ init_udp(void) #define USES_SNMP_DESIGNED_UDPSTAT #endif -+#ifdef netbsd4 ++#ifdef NETBSD_STATS_VIA_SYSCTL +#define UDP_STAT_STRUCTURE struct udp_mib +#define USES_SNMP_DESIGNED_UDPSTAT +#undef UDP_NSTATS @@ -26,11 +26,11 @@ $NetBSD: patch-ez,v 1.1 2010/05/11 04:39:54 adam Exp $ #ifdef WIN32 #include #define UDP_STAT_STRUCTURE MIB_UDPSTATS -@@ -469,6 +479,21 @@ +@@ -469,6 +479,21 @@ udp_load(netsnmp_cache *cache, void *vma } return ret_value; } -+#elif defined(netbsd4) ++#elif defined(NETBSD_STATS_VIA_SYSCTL) +int +udp_load(netsnmp_cache *cache, void *vmagic) +{ diff --git a/net/net-snmp/patches/patch-fa b/net/net-snmp/patches/patch-fa index 33a69ce6339..dded9b68ef2 100644 --- a/net/net-snmp/patches/patch-fa +++ b/net/net-snmp/patches/patch-fa @@ -1,14 +1,14 @@ -$NetBSD: patch-fa,v 1.1 2010/05/11 04:39:54 adam Exp $ +$NetBSD: patch-fa,v 1.1.4.1 2010/11/28 14:04:37 tron Exp $ ---- include/net-snmp/system/netbsd.h.orig 2010-03-12 00:32:48.000000000 +0000 -+++ include/net-snmp/system/netbsd.h 2010-03-12 00:34:40.000000000 +0000 +--- include/net-snmp/system/netbsd.h.orig 2007-03-08 15:52:34.000000000 +0000 ++++ include/net-snmp/system/netbsd.h @@ -38,5 +38,9 @@ # define netbsd1 netbsd1 #endif -+#if __NetBSD_Version__ >= 400000000 -+#define netbsd4 netbsd4 -+#endif /* __NetBSD_Version__ >= 400000000 */ ++#if __NetBSD_Version__ >= 499005800 ++#define NETBSD_STATS_VIA_SYSCTL ++#endif /* __NetBSD_Version__ >= 499005800 */ + /* define the extra mib modules that are supported */ #define NETSNMP_INCLUDE_HOST_RESOURCES -- cgit v1.2.3