[Pkg-net-snmp-commits] r315 - in branches: net-snmp54/debian net-snmp54/debian/patches net-snmp54-dev/debian/patches
Jochen Friedrich
jochen at alioth.debian.org
Fri Nov 27 15:41:01 UTC 2009
Author: jochen
Date: 2009-11-27 15:41:01 +0000 (Fri, 27 Nov 2009)
New Revision: 315
Modified:
branches/net-snmp54-dev/debian/patches/26_kfreebsd.patch
branches/net-snmp54/debian/changelog
branches/net-snmp54/debian/patches/26_kfreebsd.patch
Log:
Update kFreeBSD patch from Petr Salinger
Modified: branches/net-snmp54/debian/changelog
===================================================================
--- branches/net-snmp54/debian/changelog 2009-11-18 17:32:31 UTC (rev 314)
+++ branches/net-snmp54/debian/changelog 2009-11-27 15:41:01 UTC (rev 315)
@@ -1,3 +1,10 @@
+net-snmp (5.4.2.1~dfsg-4) unstable; urgency=low
+
+ * Update 26_kfreebsd.patch with patch from Petr Salinger
+ <Petr.Salinger at seznam.cz> (Closes: #557244).
+
+ -- Jochen Friedrich <jochen at scram.de> Fri, 27 Nov 2009 16:33:10 +0100
+
net-snmp (5.4.2.1~dfsg-3) unstable; urgency=low
* Fix typo in NEWS.
Modified: branches/net-snmp54/debian/patches/26_kfreebsd.patch
===================================================================
--- branches/net-snmp54/debian/patches/26_kfreebsd.patch 2009-11-18 17:32:31 UTC (rev 314)
+++ branches/net-snmp54/debian/patches/26_kfreebsd.patch 2009-11-27 15:41:01 UTC (rev 315)
@@ -1,7 +1,9 @@
only in patch2:
unchanged:
---- net-snmp-5.3.1.orig/Makefile.in
-+++ net-snmp-5.3.1/Makefile.in
+Index: net-snmp-5.4.2.1/Makefile.in
+===================================================================
+--- net-snmp-5.4.2.1.orig/Makefile.in 2009-11-27 15:13:25.000000000 +0100
++++ net-snmp-5.4.2.1/Makefile.in 2009-11-27 15:13:35.000000000 +0100
@@ -17,8 +17,8 @@
INCLUDESUBDIR=system
INCLUDESUBDIRHEADERS= aix.h bsd.h bsdi3.h bsdi4.h bsdi.h cygwin.h \
@@ -11,12 +13,12 @@
+ dynix.h freebsd2.h freebsd3.h freebsd4.h freebsd.h generic.h kfreebsd.h \
+ hpux.h irix.h linux.h mingw32.h mips.h netbsd.h openbsd.h osf5.h \
solaris2.3.h solaris2.4.h solaris2.5.h solaris2.6.h \
- solaris.h sunos.h svr5.h sysv.h ultrix4.h
+ solaris.h sunos.h svr5.h sysv.h ultrix4.h dragonfly.h
INCLUDESUBDIR2=machine
-only in patch2:
-unchanged:
---- net-snmp-5.3.1.orig/include/net-snmp/system/kfreebsd.h
-+++ net-snmp-5.3.1/include/net-snmp/system/kfreebsd.h
+Index: net-snmp-5.4.2.1/include/net-snmp/system/kfreebsd.h
+===================================================================
+--- /dev/null 1970-01-01 00:00:00.000000000 +0000
++++ net-snmp-5.4.2.1/include/net-snmp/system/kfreebsd.h 2009-11-27 15:13:35.000000000 +0100
@@ -0,0 +1,65 @@
+#include "freebsd6.h"
+#define freebsd6 freebsd6
@@ -83,3 +85,43 @@
+ u_quad_t xt_alignment_hack;
+};
+
+Index: net-snmp-5.4.2.1/agent/mibgroup/hardware/cpu/cpu_sysctl.c
+===================================================================
+--- net-snmp-5.4.2.1.orig/agent/mibgroup/hardware/cpu/cpu_sysctl.c 2009-11-27 15:15:37.000000000 +0100
++++ net-snmp-5.4.2.1/agent/mibgroup/hardware/cpu/cpu_sysctl.c 2009-11-27 15:19:01.000000000 +0100
+@@ -11,7 +11,7 @@
+ #include <unistd.h>
+ #include <sys/types.h>
+
+-#if defined(__FreeBSD__)
++#if defined(__FreeBSD__) || defined(__FreeBSD_kernel__)
+ #include <sys/resource.h>
+ #if !defined(CPUSTATES)
+ #include <sys/dkstat.h>
+@@ -73,7 +73,7 @@
+ #define NETSNMP_CPU_STATS uint64_t
+ #endif
+
+-#elif defined(__FreeBSD__)
++#elif defined(__FreeBSD__) || defined(__FreeBSD_kernel__)
+ #define NETSNMP_KERN_CPU 0 /* dummy value - sysctlnametomib(2) should be used */
+
+ #else
+@@ -107,7 +107,7 @@
+ #define NETSNMP_VM_STATS_TYPE struct uvmexp
+ #endif /* VM_UVMEXP2 || VM_UVMEXP */
+
+-#elif defined(__FreeBSD__) /* FreeBSD */
++#elif defined(__FreeBSD__) || defined(__FreeBSD_kernel__) /* FreeBSD */
+ #define NETSNMP_VM_STATS VM_METER
+ #define NETSNMP_VM_STATS_TYPE struct vmmeter
+ #define NS_VM_INTR v_intr
+@@ -159,7 +159,7 @@
+ size_t mem_size = sizeof(NETSNMP_VM_STATS_TYPE);
+ netsnmp_cpu_info *cpu = netsnmp_cpu_get_byIdx( -1, 0 );
+
+-#if defined(__FreeBSD__)
++#if defined(__FreeBSD__) || defined(__FreeBSD_kernel__)
+ sysctlbyname("kern.cp_time", cpu_stats, &cpu_size, NULL, 0);
+ #else
+ sysctl(cpu_mib, 2, cpu_stats, &cpu_size, NULL, 0);
Modified: branches/net-snmp54-dev/debian/patches/26_kfreebsd.patch
===================================================================
--- branches/net-snmp54-dev/debian/patches/26_kfreebsd.patch 2009-11-18 17:32:31 UTC (rev 314)
+++ branches/net-snmp54-dev/debian/patches/26_kfreebsd.patch 2009-11-27 15:41:01 UTC (rev 315)
@@ -1,7 +1,9 @@
only in patch2:
unchanged:
---- net-snmp-5.3.1.orig/Makefile.in
-+++ net-snmp-5.3.1/Makefile.in
+Index: net-snmp-5.4.2.1/Makefile.in
+===================================================================
+--- net-snmp-5.4.2.1.orig/Makefile.in 2009-11-27 15:13:25.000000000 +0100
++++ net-snmp-5.4.2.1/Makefile.in 2009-11-27 15:13:35.000000000 +0100
@@ -17,8 +17,8 @@
INCLUDESUBDIR=system
INCLUDESUBDIRHEADERS= aix.h bsd.h bsdi3.h bsdi4.h bsdi.h cygwin.h \
@@ -11,12 +13,12 @@
+ dynix.h freebsd2.h freebsd3.h freebsd4.h freebsd.h generic.h kfreebsd.h \
+ hpux.h irix.h linux.h mingw32.h mips.h netbsd.h openbsd.h osf5.h \
solaris2.3.h solaris2.4.h solaris2.5.h solaris2.6.h \
- solaris.h sunos.h svr5.h sysv.h ultrix4.h
+ solaris.h sunos.h svr5.h sysv.h ultrix4.h dragonfly.h
INCLUDESUBDIR2=machine
-only in patch2:
-unchanged:
---- net-snmp-5.3.1.orig/include/net-snmp/system/kfreebsd.h
-+++ net-snmp-5.3.1/include/net-snmp/system/kfreebsd.h
+Index: net-snmp-5.4.2.1/include/net-snmp/system/kfreebsd.h
+===================================================================
+--- /dev/null 1970-01-01 00:00:00.000000000 +0000
++++ net-snmp-5.4.2.1/include/net-snmp/system/kfreebsd.h 2009-11-27 15:13:35.000000000 +0100
@@ -0,0 +1,65 @@
+#include "freebsd6.h"
+#define freebsd6 freebsd6
@@ -83,3 +85,43 @@
+ u_quad_t xt_alignment_hack;
+};
+
+Index: net-snmp-5.4.2.1/agent/mibgroup/hardware/cpu/cpu_sysctl.c
+===================================================================
+--- net-snmp-5.4.2.1.orig/agent/mibgroup/hardware/cpu/cpu_sysctl.c 2009-11-27 15:15:37.000000000 +0100
++++ net-snmp-5.4.2.1/agent/mibgroup/hardware/cpu/cpu_sysctl.c 2009-11-27 15:19:01.000000000 +0100
+@@ -11,7 +11,7 @@
+ #include <unistd.h>
+ #include <sys/types.h>
+
+-#if defined(__FreeBSD__)
++#if defined(__FreeBSD__) || defined(__FreeBSD_kernel__)
+ #include <sys/resource.h>
+ #if !defined(CPUSTATES)
+ #include <sys/dkstat.h>
+@@ -73,7 +73,7 @@
+ #define NETSNMP_CPU_STATS uint64_t
+ #endif
+
+-#elif defined(__FreeBSD__)
++#elif defined(__FreeBSD__) || defined(__FreeBSD_kernel__)
+ #define NETSNMP_KERN_CPU 0 /* dummy value - sysctlnametomib(2) should be used */
+
+ #else
+@@ -107,7 +107,7 @@
+ #define NETSNMP_VM_STATS_TYPE struct uvmexp
+ #endif /* VM_UVMEXP2 || VM_UVMEXP */
+
+-#elif defined(__FreeBSD__) /* FreeBSD */
++#elif defined(__FreeBSD__) || defined(__FreeBSD_kernel__) /* FreeBSD */
+ #define NETSNMP_VM_STATS VM_METER
+ #define NETSNMP_VM_STATS_TYPE struct vmmeter
+ #define NS_VM_INTR v_intr
+@@ -159,7 +159,7 @@
+ size_t mem_size = sizeof(NETSNMP_VM_STATS_TYPE);
+ netsnmp_cpu_info *cpu = netsnmp_cpu_get_byIdx( -1, 0 );
+
+-#if defined(__FreeBSD__)
++#if defined(__FreeBSD__) || defined(__FreeBSD_kernel__)
+ sysctlbyname("kern.cp_time", cpu_stats, &cpu_size, NULL, 0);
+ #else
+ sysctl(cpu_mib, 2, cpu_stats, &cpu_size, NULL, 0);
More information about the Pkg-net-snmp-commits
mailing list