Waldemar Brodkorb 3 месяцев назад
Родитель
Сommit
ae4acd0119

+ 5 - 5
package/net-snmp/Makefile

@@ -4,16 +4,16 @@
 include $(ADK_TOPDIR)/rules.mk
 include $(ADK_TOPDIR)/rules.mk
 
 
 PKG_NAME:=		net-snmp
 PKG_NAME:=		net-snmp
-PKG_VERSION:=		5.8
+PKG_VERSION:=		5.9.5.2
 PKG_RELEASE:=		1
 PKG_RELEASE:=		1
-PKG_HASH:=		b2fc3500840ebe532734c4786b0da4ef0a5f67e51ef4c86b3345d697e4976adf
+PKG_HASH:=		16707719f833184a4b72835dac359ae188123b06b5e42817c00790d7dc1384bf
 PKG_DESCR:=		snmp agent
 PKG_DESCR:=		snmp agent
 PKG_SECTION:=		net/misc
 PKG_SECTION:=		net/misc
 PKG_DEPENDS:=		libnetsnmp elfutils libnl
 PKG_DEPENDS:=		libnetsnmp elfutils libnl
 PKG_BUILDDEP:=		elfutils libnl
 PKG_BUILDDEP:=		elfutils libnl
 PKG_URL:=		http://www.net-snmp.org/
 PKG_URL:=		http://www.net-snmp.org/
-PKG_SITES:=		$(MASTER_SITE_SOURCEFORGE:=net-snmp/)
-PKG_NOPARALLEL:=	1
+PKG_SITES:=		https://sourceforge.net/projects/net-snmp/files/net-snmp/$(PKG_VERSION)/
+#PKG_NOPARALLEL:=	1
 PKG_LIBNAME:=		libnetsnmp
 PKG_LIBNAME:=		libnetsnmp
 PKG_OPTS:=		dev
 PKG_OPTS:=		dev
 
 
@@ -43,7 +43,7 @@ else
 SNMP_TRANSPORTS_EXCLUDED:=	TCPIPv6 UDPIPv6
 SNMP_TRANSPORTS_EXCLUDED:=	TCPIPv6 UDPIPv6
 endif
 endif
 
 
-TARGET_LDFLAGS+=	-pthread
+TARGET_LDFLAGS+=	-lncursesw
 CONFIGURE_ARGS+=	--with-defaults \
 CONFIGURE_ARGS+=	--with-defaults \
 			--with-persistent-directory=/etc/snmp \
 			--with-persistent-directory=/etc/snmp \
 			--with-default-snmp-version=3 \
 			--with-default-snmp-version=3 \

+ 0 - 10
package/net-snmp/patches/patch-agent_mibgroup_util_funcs_get_pid_from_inode_c

@@ -1,10 +0,0 @@
---- 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

+ 0 - 11
package/net-snmp/patches/patch-apps_Makefile_in

@@ -1,11 +0,0 @@
---- net-snmp-5.7.2.orig/apps/Makefile.in	2012-10-10 00:28:58.000000000 +0200
-+++ net-snmp-5.7.2/apps/Makefile.in	2014-02-21 11:50:25.000000000 +0100
-@@ -68,7 +68,7 @@ INSTALLSBINPROGS = snmptrapd$(EXEEXT)
- 
- INSTALLLIBS     = libnetsnmptrapd.$(LIB_EXTENSION)$(LIB_VERSION)
- 
--SUBDIRS		= snmpnetstat
-+#SUBDIRS		= snmpnetstat
- 
- FEATUREFILE=../include/net-snmp/features-apps.h
- 

+ 0 - 12
package/net-snmp/patches/patch-configure_d_config_os_libs2

@@ -1,12 +0,0 @@
---- net-snmp-5.8.orig/configure.d/config_os_libs2	2018-07-16 16:33:40.000000000 +0200
-+++ net-snmp-5.8/configure.d/config_os_libs2	2019-10-06 12:45:37.396843992 +0200
-@@ -604,6 +604,9 @@ AC_CHECK_FUNCS(nlist nlist64 knlist)
- AC_CHECK_HEADERS([curses.h])
- AC_CHECK_HEADERS([ncurses/curses.h])
- NETSNMP_SEARCH_LIBS([endwin], [curses ncurses],,,,[LIBCURSES])
-+if test -n "$LIBCURSES"; then
-+  NETSNMP_SEARCH_LIBS([halfdelay], [tinfo], [LIBCURSES="$LIBCURSES $LIBTINFO"],,,[LIBTINFO])
-+fi
- AC_SUBST([LIBCURSES])
- 
- #   libm for ceil

+ 0 - 15
package/net-snmp/patches/patch-net-snmp-config_in

@@ -1,15 +0,0 @@
---- 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)
--      echo @CFLAGS@ @CPPFLAGS@ -I${NSC_INCLUDEDIR}
-+      echo -I${NSC_INCLUDEDIR}
-       ;;
-     --cflags|--cf*)
--      echo @CFLAGS@ @DEVFLAGS@ @CPPFLAGS@ -I. -I${NSC_INCLUDEDIR}
-+      echo @DEVFLAGS@ -I. -I${NSC_INCLUDEDIR}
-       ;;
-     --srcdir)
-       echo $NSC_SRCDIR