From 8207b8d44693503e1c086aea0fc30c592a59b15d Mon Sep 17 00:00:00 2001
From: Waldemar Brodkorb <wbx@openadk.org>
Date: Wed, 1 Jan 2014 20:19:13 +0100
Subject: another round of updates and musl fixes

---
 package/net-snmp/Makefile                                    |  2 +-
 .../net-snmp/patches/patch-agent_mibgroup_mibII_tcpTable_c   | 12 ++++++------
 .../patch-agent_mibgroup_util_funcs_get_pid_from_inode_c     | 10 ++++++++++
 package/net-snmp/patches/patch-net-snmp-config_in            |  6 +++---
 4 files changed, 20 insertions(+), 10 deletions(-)
 create mode 100644 package/net-snmp/patches/patch-agent_mibgroup_util_funcs_get_pid_from_inode_c

(limited to 'package/net-snmp')

diff --git a/package/net-snmp/Makefile b/package/net-snmp/Makefile
index 07c90a094..04fed494f 100644
--- a/package/net-snmp/Makefile
+++ b/package/net-snmp/Makefile
@@ -5,7 +5,7 @@ include ${TOPDIR}/rules.mk
 
 PKG_NAME:=		net-snmp
 PKG_VERSION:=		5.7.2
-PKG_RELEASE:=		1
+PKG_RELEASE:=		2
 PKG_MD5SUM:=		5bddd02e2f82b62daa79f82717737a14
 PKG_DESCR:=		SNMP Agent
 PKG_SECTION:=		net/misc
diff --git a/package/net-snmp/patches/patch-agent_mibgroup_mibII_tcpTable_c b/package/net-snmp/patches/patch-agent_mibgroup_mibII_tcpTable_c
index f0be57e78..a4396b963 100644
--- a/package/net-snmp/patches/patch-agent_mibgroup_mibII_tcpTable_c
+++ b/package/net-snmp/patches/patch-agent_mibgroup_mibII_tcpTable_c
@@ -1,6 +1,6 @@
---- net-snmp-5.6.1.orig/agent/mibgroup/mibII/tcpTable.c	2010-10-20 15:12:08.000000000 +0200
-+++ net-snmp-5.6.1/agent/mibgroup/mibII/tcpTable.c	2011-01-12 14:48:14.000000000 +0100
-@@ -33,6 +33,12 @@
+--- net-snmp-5.7.2.orig/agent/mibgroup/mibII/tcpTable.c	2012-10-10 00:28:58.000000000 +0200
++++ net-snmp-5.7.2/agent/mibgroup/mibII/tcpTable.c	2014-01-01 17:12:30.000000000 +0100
+@@ -34,6 +34,12 @@
  #include <netlink/netlink.h>
  #include <netlink/msg.h>
  #include <linux/inet_diag.h>
@@ -13,7 +13,7 @@
  #endif
  
  #include <net-snmp/net-snmp-includes.h>
-@@ -565,8 +571,8 @@ tcpTable_load_netlink(void)
+@@ -579,8 +585,8 @@ tcpTable_load_netlink(void)
  	}
  
  	if (nl_connect(nl, NETLINK_INET_DIAG) < 0) {
@@ -24,7 +24,7 @@
  		nl_handle_destroy(nl);
  		return -1;
  	}
-@@ -580,8 +586,8 @@ tcpTable_load_netlink(void)
+@@ -594,8 +600,8 @@ tcpTable_load_netlink(void)
  	nlmsg_append(nm, &req, sizeof(struct inet_diag_req), 0);
  
  	if (nl_send_auto_complete(nl, nm) < 0) {
@@ -35,7 +35,7 @@
  		nl_handle_destroy(nl);
  		return -1;
  	}
-@@ -593,8 +599,8 @@ tcpTable_load_netlink(void)
+@@ -607,8 +613,8 @@ tcpTable_load_netlink(void)
  
  	while (running) {
  		if ((len = nl_recv(nl, &peer, &buf, NULL)) <= 0) {
diff --git a/package/net-snmp/patches/patch-agent_mibgroup_util_funcs_get_pid_from_inode_c b/package/net-snmp/patches/patch-agent_mibgroup_util_funcs_get_pid_from_inode_c
new file mode 100644
index 000000000..08097feb3
--- /dev/null
+++ b/package/net-snmp/patches/patch-agent_mibgroup_util_funcs_get_pid_from_inode_c
@@ -0,0 +1,10 @@
+--- net-snmp-5.7.2.orig/agent/mibgroup/util_funcs/get_pid_from_inode.c	2012-10-10 00:28:58.000000000 +0200
++++ net-snmp-5.7.2/agent/mibgroup/util_funcs/get_pid_from_inode.c	2014-01-01 17:29:08.000000000 +0100
+@@ -6,6 +6,7 @@
+ 
+ #include <ctype.h>
+ #include <stdio.h>
++#include <limits.h>
+ #if HAVE_STDLIB_H
+ #include <stdlib.h>
+ #endif
diff --git a/package/net-snmp/patches/patch-net-snmp-config_in b/package/net-snmp/patches/patch-net-snmp-config_in
index 2465be023..7e0623ad7 100644
--- a/package/net-snmp/patches/patch-net-snmp-config_in
+++ b/package/net-snmp/patches/patch-net-snmp-config_in
@@ -1,6 +1,6 @@
---- net-snmp-5.6.1.orig/net-snmp-config.in	2010-10-13 11:58:34.000000000 +0200
-+++ net-snmp-5.6.1/net-snmp-config.in	2011-01-21 18:05:18.494919068 +0100
-@@ -127,10 +127,10 @@ else
+--- net-snmp-5.7.2.orig/net-snmp-config.in	2012-10-10 00:28:58.000000000 +0200
++++ net-snmp-5.7.2/net-snmp-config.in	2014-01-01 17:12:30.000000000 +0100
+@@ -138,10 +138,10 @@ else
        ;;
      #################################################### compile
      --base-cflags)
-- 
cgit v1.2.3