- adjusted libnl patch and dependencies for libnl 3.2.x

[packages/net-snmp.git] / net-snmp-llinterfaces.patch

diff --git a/net-snmp-llinterfaces.patch b/net-snmp-llinterfaces.patch
index 53d97d8b3abada09547997ef4ffad37adfea3de3..739c7b6c3d2ae0523187a87db5631b5a87f6d427 100644 (file)
--- a/net-snmp-llinterfaces.patch
+++ b/net-snmp-llinterfaces.patch
@@ -1,26 +1,15 @@
-===================================================================
-RCS file: /cvsroot/net-snmp/net-snmp/agent/mibgroup/mibII/interfaces.c,v
-retrieving revision 1.75.2.16
-retrieving revision 1.75.2.17
-diff -u -r1.75.2.16 -r1.75.2.17
---- net-snmp/net-snmp/agent/mibgroup/mibII/interfaces.c        2001/11/28 22:30:33     1.75.2.16
-+++ net-snmp/net-snmp/agent/mibgroup/mibII/interfaces.c        2002/01/09 16:23:06     1.75.2.17
-@@ -1266,14 +1266,14 @@
-     struct ifreq    ifrq;
-     struct ifnet  **ifnetaddr_ptr;
-     FILE           *devin;
--    unsigned long   rec_pkt, rec_oct, rec_err, rec_drop;
--    unsigned long   snd_pkt, snd_oct, snd_err, snd_drop, coll;
-+    unsigned long long rec_pkt, rec_oct, rec_err, rec_drop;
-+    unsigned long long snd_pkt, snd_oct, snd_err, snd_drop, coll;
-     int             i, fd;
-     conf_if_list   *if_ptr;
+diff -ur net-snmp-5.2.orig/agent/mibgroup/mibII/interfaces.c net-snmp-5.2/agent/mibgroup/mibII/interfaces.c
+--- net-snmp-5.2.orig/agent/mibgroup/mibII/interfaces.c        2004-10-06 22:10:16.000000000 +0200
++++ net-snmp-5.2/agent/mibgroup/mibII/interfaces.c     2004-12-29 21:27:25.939529536 +0100
+@@ -1383,9 +1383,9 @@
+     unsigned long   rec_pkt, rec_oct, rec_err, rec_drop;
+     unsigned long   snd_pkt, snd_oct, snd_err, snd_drop, coll;
      const char     *scan_line_2_2 =
 -        "%lu %lu %lu %lu %*lu %*lu %*lu %*lu %lu %lu %lu %lu %*lu %lu";
-+        "%llu %llu %llu %llu %*llu %*llu %*llu %*llu %llu %llu %llu %llu %*llu %llu";
++        "%llu %llu %llu %llu %*llu %*llu %*llu %*llu %llu %llu %llu %llu %*llu %llu"
      const char     *scan_line_2_0 =
 -        "%lu %lu %*lu %*lu %*lu %lu %lu %*lu %*lu %lu";
 +        "%llu %llu %*llu %*llu %*llu %llu %llu %*llu %*llu %llu";
+ #endif
      const char     *scan_line_to_use;
-     
- #endif  
+     struct timeval et;                              /* elapsed time */