net-snmp : update to 5.7.3
Update to 5.7.3 by refreshing patches; remove 800-format-security as upstream integrated. Add libnl dependency in the package Makefile as net-snmp will check if libnl is enabled in config_os_libs2. Remove unneeded PKG_FIXUP build variable. Signed-off-by: Hans Dedecker <dedeckeh@gmail.com>
This commit is contained in:
parent
dd2e073feb
commit
6282bf2114
|
@ -8,17 +8,15 @@
|
|||
include $(TOPDIR)/rules.mk
|
||||
|
||||
PKG_NAME:=net-snmp
|
||||
PKG_VERSION:=5.4.4
|
||||
PKG_RELEASE:=3
|
||||
PKG_VERSION:=5.7.3
|
||||
PKG_RELEASE:=1
|
||||
|
||||
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
|
||||
PKG_SOURCE_URL:=@SF/net-snmp
|
||||
PKG_MD5SUM:=95aa054f3c99a1ce242807d7eaf98619
|
||||
PKG_MD5SUM:=d4a3459e1577d0efa8d96ca70a885e53
|
||||
PKG_MAINTAINER:=Stijn Tintel <stijn@linux-ipv6.be>
|
||||
PKG_LICENSE:=MIT BSD-3-Clause-Clear
|
||||
|
||||
PKG_FIXUP = patch-libtool
|
||||
|
||||
include $(INCLUDE_DIR)/package.mk
|
||||
|
||||
define Package/net-snmp/Default
|
||||
|
@ -40,6 +38,7 @@ define Package/libnetsnmp
|
|||
$(call Package/net-snmp/Default)
|
||||
SECTION:=libs
|
||||
CATEGORY:=Libraries
|
||||
DEPENDS:=+PACKAGE_libnl:libnl
|
||||
TITLE:=Open source SNMP implementation (libraries)
|
||||
endef
|
||||
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
--- a/agent/mibgroup/mibII/interfaces.c
|
||||
+++ b/agent/mibgroup/mibII/interfaces.c
|
||||
@@ -1561,6 +1561,10 @@ Interface_Scan_Init(void)
|
||||
@@ -1590,6 +1590,10 @@ Interface_Scan_Init(void)
|
||||
struct ifnet *nnew;
|
||||
char *stats, *ifstart = line;
|
||||
|
||||
|
@ -11,7 +11,7 @@
|
|||
if (line[strlen(line) - 1] == '\n')
|
||||
line[strlen(line) - 1] = '\0';
|
||||
|
||||
@@ -1594,7 +1598,7 @@ Interface_Scan_Init(void)
|
||||
@@ -1622,7 +1622,7 @@ Interface_Scan_Init(void)
|
||||
&coll) != 5)) {
|
||||
if ((scan_line_to_use == scan_line_2_2)
|
||||
&& !strstr(line, "No statistics available"))
|
||||
|
|
|
@ -1,6 +1,7 @@
|
|||
--- a/local/Makefile.in
|
||||
+++ b/local/Makefile.in
|
||||
@@ -100,7 +100,7 @@ tkmib.made: $(srcdir)/tkmib
|
||||
diff -uNr a/local/Makefile.in b/local/Makefile.in
|
||||
--- a/local/Makefile.in 2014-02-20 08:36:42.000000000 +0800
|
||||
+++ b/local/Makefile.in 2014-05-27 13:21:34.245223503 +0800
|
||||
@@ -103,7 +103,7 @@
|
||||
|
||||
mib2c.made: $(srcdir)/mib2c
|
||||
if test "x$(PERL)" != "x" ; then \
|
||||
|
@ -9,9 +10,21 @@
|
|||
else \
|
||||
touch mib2c.made; \
|
||||
fi
|
||||
--- a/mibs/Makefile.in
|
||||
+++ b/mibs/Makefile.in
|
||||
@@ -48,11 +48,15 @@ NETSNMPMIBS = NET-SNMP-TC.txt NET-SNMP-M
|
||||
diff -uNr a/Makefile.top b/Makefile.top
|
||||
--- a/Makefile.top 2014-02-20 08:36:42.000000000 +0800
|
||||
+++ b/Makefile.top 2014-05-27 13:26:53.023737120 +0800
|
||||
@@ -27,6 +27,7 @@
|
||||
snmplibdir = $(datadir)/snmp
|
||||
mibdir = $(snmplibdir)/mibs
|
||||
persistentdir = @PERSISTENT_DIRECTORY@
|
||||
+sysconfdir = @sysconfdir@
|
||||
DESTDIR = @INSTALL_PREFIX@
|
||||
INSTALL_PREFIX = $(DESTDIR)
|
||||
|
||||
diff -uNr a/mibs/Makefile.in b/mibs/Makefile.in
|
||||
--- a/mibs/Makefile.in 2014-02-20 08:36:42.000000000 +0800
|
||||
+++ b/mibs/Makefile.in 2014-05-27 13:25:07.151988585 +0800
|
||||
@@ -49,11 +49,15 @@
|
||||
UCDMIBS = UCD-SNMP-MIB.txt UCD-DEMO-MIB.txt UCD-IPFWACC-MIB.txt \
|
||||
UCD-DLMOD-MIB.txt UCD-DISKIO-MIB.txt
|
||||
|
||||
|
@ -28,13 +41,3 @@
|
|||
|
||||
all: standardall
|
||||
|
||||
--- a/Makefile.top
|
||||
+++ b/Makefile.top
|
||||
@@ -26,6 +26,7 @@ man8dir = $(mandir)/man8
|
||||
snmplibdir = $(datadir)/snmp
|
||||
mibdir = $(snmplibdir)/mibs
|
||||
persistentdir = @PERSISTENT_DIRECTORY@
|
||||
+sysconfdir = @sysconfdir@
|
||||
DESTDIR = @INSTALL_PREFIX@
|
||||
INSTALL_PREFIX = $(DESTDIR)
|
||||
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
--- a/local/mib2c
|
||||
+++ b/local/mib2c
|
||||
@@ -60,8 +60,9 @@ $currentlevel = -1;
|
||||
@@ -61,8 +61,9 @@ $currentlevel = -1;
|
||||
if($ENV{MIB2C_DIR}) {
|
||||
push @def_search_dirs, split(/:/, $ENV{MIB2C_DIR});
|
||||
}
|
||||
|
|
File diff suppressed because it is too large
Load Diff
|
@ -1,6 +1,6 @@
|
|||
--- a/configure
|
||||
+++ b/configure
|
||||
@@ -10216,7 +10216,7 @@ linux* | k*bsd*-gnu)
|
||||
@@ -14197,7 +14197,7 @@ linux* | k*bsd*-gnu | kopensolaris*-gnu)
|
||||
need_version=no
|
||||
library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
|
||||
soname_spec='${libname}${release}${shared_ext}$major'
|
||||
|
@ -8,4 +8,4 @@
|
|||
+ finish_cmds=''
|
||||
shlibpath_var=LD_LIBRARY_PATH
|
||||
shlibpath_overrides_runpath=no
|
||||
# This implies no fast_install, which is unacceptable.
|
||||
|
||||
|
|
|
@ -1,11 +1,11 @@
|
|||
--- a/Makefile.top
|
||||
+++ b/Makefile.top
|
||||
@@ -81,7 +81,7 @@ LIBCURRENT = 16
|
||||
LIBAGE = 1
|
||||
@@ -85,7 +85,7 @@ LIBCURRENT = 30
|
||||
LIBAGE = 0
|
||||
LIBREVISION = 3
|
||||
|
||||
-LIB_LD_CMD = $(LIBTOOL) --mode=link $(LINKCC) $(CFLAGS) -rpath $(libdir) -version-info $(LIBCURRENT):$(LIBREVISION):$(LIBAGE) -o
|
||||
+LIB_LD_CMD = $(LIBTOOL) --mode=link $(LINKCC) $(CFLAGS) -rpath $(libdir) $(LDFLAGS) -version-info $(LIBCURRENT):$(LIBREVISION):$(LIBAGE) -o
|
||||
LIB_EXTENSION = la
|
||||
LIB_VERSION =
|
||||
LIB_LDCONFIG_CMD = $(LIBTOOL) --mode=finish $(libdir)
|
||||
LIB_LDCONFIG_CMD = $(LIBTOOL) --mode=finish $(INSTALL_PREFIX)$(libdir)
|
||||
|
|
|
@ -1,29 +0,0 @@
|
|||
--- a/agent/mibgroup/host/hr_filesys.c
|
||||
+++ b/agent/mibgroup/host/hr_filesys.c
|
||||
@@ -322,13 +322,13 @@ var_hrfilesys(struct variable *vp,
|
||||
long_return = fsys_idx;
|
||||
return (u_char *) & long_return;
|
||||
case HRFSYS_MOUNT:
|
||||
- snprintf(string, sizeof(string), HRFS_entry->HRFS_mount);
|
||||
+ snprintf(string, sizeof(string), "%s", HRFS_entry->HRFS_mount);
|
||||
string[ sizeof(string)-1 ] = 0;
|
||||
*var_len = strlen(string);
|
||||
return (u_char *) string;
|
||||
case HRFSYS_RMOUNT:
|
||||
if (Check_HR_FileSys_NFS()) {
|
||||
- snprintf(string, sizeof(string), HRFS_entry->HRFS_name);
|
||||
+ snprintf(string, sizeof(string), "%s", HRFS_entry->HRFS_name);
|
||||
string[ sizeof(string)-1 ] = 0;
|
||||
} else
|
||||
string[0] = '\0';
|
||||
--- a/agent/mibgroup/ucd-snmp/extensible.c
|
||||
+++ b/agent/mibgroup/ucd-snmp/extensible.c
|
||||
@@ -513,7 +513,7 @@ fixExecError(int action,
|
||||
}
|
||||
tmp = *((long *) var_val);
|
||||
if ((tmp == 1) && (action == COMMIT) && (exten->fixcmd[0] != 0)) {
|
||||
- sprintf(ex.command, exten->fixcmd);
|
||||
+ sprintf(ex.command, "%s", exten->fixcmd);
|
||||
if ((fd = get_exec_output(&ex)) != -1) {
|
||||
file = fdopen(fd, "r");
|
||||
while (fgets(ex.output, sizeof(ex.output), file) != NULL);
|
Loading…
Reference in New Issue