mirror of
https://github.com/openwrt/packages.git
synced 2026-10-14 01:17:27 +04:00
mini-snmpd: update to v2.1
Changelog: https://github.com/troglobit/mini-snmpd/blob/master/doc/ChangeLog.md Removed upstramed patches: - 0001-make-MAX_NR_INTERFACES-configurable.patch The startup script has been modified due to a change in the default listener behavior. Also fix param to enable debug level Fixes: https://github.com/openwrt/packages/issues/29943 Signed-off-by: Ivan Pavlov <AuthorReflex@gmail.com>
This commit is contained in:
Ivan Pavlov authored and 
Alexandru Ardelean committed
1 parent
9746339bb9
commit
e4f1163ffb
3 files changed
+9
-76
No files matched your search
@@ -8,8 +8,8 @@
|
||||
include $(TOPDIR)/rules.mk
|
||||
|
||||
PKG_NAME:=mini_snmpd
|
||||
PKG_VERSION:=1.6
|
||||
PKG_RELEASE:=5
|
||||
PKG_VERSION:=2.1
|
||||
PKG_RELEASE:=1
|
||||
PKG_MAINTAINER:=Marcin Jurkowski <marcin1j@gmail.com>
|
||||
PKG_LICENSE:=GPL-2.0
|
||||
PKG_LICENSE_FILES:=COPYING
|
||||
@@ -18,9 +18,9 @@ PKG_CPE_ID:=cpe:/a:minisnmpd_project:minisnmpd
|
||||
PKG_SOURCE_PROTO:=git
|
||||
PKG_SOURCE_URL:=https://github.com/troglobit/mini-snmpd
|
||||
PKG_SOURCE_SUBDIR:=mini-snmpd-$(PKG_VERSION)
|
||||
PKG_SOURCE_VERSION:=45765e39d52469fd2b5ec5cfb78e042f437c0df4
|
||||
PKG_SOURCE_VERSION:=79d4837660b5a22b1ad044a43596abc219c614d5
|
||||
PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(BUILD_VARIANT)/mini-snmpd-$(PKG_VERSION)
|
||||
PKG_MIRROR_HASH:=580eb4bc45a86d9827df505813ec0cf47ba836261d27e8e4b5ca5e0e1581c255
|
||||
PKG_MIRROR_HASH:=a72c0a089a9f464bfe013e7351a00319137ca8a17ff90f210a16771a844a2970
|
||||
|
||||
PKG_FIXUP:=autoreconf
|
||||
PKG_BUILD_PARALLEL:=1
|
||||
|
||||
@@ -219,8 +219,11 @@ start_instance() {
|
||||
append_arg "-V" "$vendor_oid"
|
||||
append_arg "-t" $mib_timeout
|
||||
|
||||
[ "$ipv6" = 1 ] && procd_append_param command "-6"
|
||||
[ "$debug" = 1 ] && procd_append_param command "-v"
|
||||
if "$PROG" -h 2>&1 | grep -q -- '--use-ipv4'; then
|
||||
[ "$ipv6" = 0 ] && procd_append_param command "-4"
|
||||
[ "$ipv6" = 1 ] && procd_append_param command "-6"
|
||||
fi
|
||||
[ "$debug" = 1 ] && procd_append_param command "-l" "debug"
|
||||
# uci_validate_section() aka /sbin/validate_data can only cast default values not defined in /etc/config/* to string
|
||||
# e.g. ="1" however it sets bools defined in /etc/config/* to =1 / =0
|
||||
[ "$auth" = 1 -o "$auth" = "1" ] && procd_append_param command "-a"
|
||||
|
||||
@@ -1,70 +0,0 @@
|
||||
From 60e685bd74bca45a4be9528d97f5a2edcc954e7f Mon Sep 17 00:00:00 2001
|
||||
From: =?UTF-8?q?Bj=C3=B8rn=20Mork?= <bjorn@mork.no>
|
||||
Date: Thu, 22 Sep 2022 11:49:42 +0200
|
||||
Subject: [PATCH] make MAX_NR_INTERFACES configurable
|
||||
MIME-Version: 1.0
|
||||
Content-Type: text/plain; charset=UTF-8
|
||||
Content-Transfer-Encoding: 8bit
|
||||
|
||||
Signed-off-by: Bjørn Mork <bjorn@mork.no>
|
||||
---
|
||||
configure.ac | 9 +++++++++
|
||||
mini-snmpd.h | 1 -
|
||||
2 files changed, 9 insertions(+), 1 deletion(-)
|
||||
|
||||
--- a/configure.ac
|
||||
+++ b/configure.ac
|
||||
@@ -40,6 +40,10 @@ AC_ARG_WITH(systemd,
|
||||
[AS_HELP_STRING([--with-systemd=DIR], [Directory for systemd service files])],,
|
||||
[with_systemd=auto])
|
||||
|
||||
+AC_ARG_WITH(interfaces,
|
||||
+ AS_HELP_STRING([--with-interfaces=NUM], [Support NUM interfaces, default: 8]),
|
||||
+ [with_interfaces=$withval], [with_interfaces="8"])
|
||||
+
|
||||
AC_ARG_ENABLE(debug,
|
||||
AS_HELP_STRING([--enable-debug], [Enable developer debug mode, disabled by default]),
|
||||
[enable_debug=$enableval], [enable_debug=no])
|
||||
@@ -56,6 +60,7 @@ AC_ARG_ENABLE(ethtool,
|
||||
AS_HELP_STRING([--enable-ethtool], [Enable ethtool interface stats, disabled by default]),
|
||||
[enable_ethtool=$enableval], [enable_ethtool=no])
|
||||
|
||||
+
|
||||
### Enable features ###########################################################################
|
||||
AS_IF([test "x$with_vendor" != "xno"],[
|
||||
AS_IF([test "x$vendor" = "xyes"],[
|
||||
@@ -69,6 +74,8 @@ AS_IF([test "x$with_config" != "xno"], [
|
||||
PKG_CHECK_MODULES([confuse], [libconfuse >= 2.7])])
|
||||
AM_CONDITIONAL([HAVE_CONFUSE], [test "x$with_config" != "xno"])
|
||||
|
||||
+AC_DEFINE_UNQUOTED(MAX_NR_INTERFACES, $with_interfaces, [Max Number of Interfaces])
|
||||
+
|
||||
AS_IF([test "x$enable_debug" = "xyes"],[
|
||||
AC_DEFINE(DEBUG, 1, [Define to enable debug mode.])])
|
||||
|
||||
@@ -81,6 +88,7 @@ AS_IF([test "x$enable_ipv6" != "xno"],[
|
||||
AS_IF([test "x$enable_ethtool" != "xno"],[
|
||||
AC_DEFINE(CONFIG_ENABLE_ETHTOOL, 1, [Define to enable ethtool stats.])])
|
||||
|
||||
+
|
||||
# Check where to install the systemd .service file
|
||||
AS_IF([test "x$with_systemd" = "xyes" -o "x$with_systemd" = "xauto"], [
|
||||
def_systemd=$($PKG_CONFIG --variable=systemdsystemunitdir systemd)
|
||||
@@ -129,6 +137,7 @@ cat <<EOF
|
||||
vendor OID........: $vendor
|
||||
ipv6..............: $enable_ipv6
|
||||
mini-snmpd.conf...: $with_config
|
||||
+ max interfaces....: $with_interfaces
|
||||
demo mode.........: $enable_demo
|
||||
systemd...........: $with_systemd
|
||||
ethtool stats.....: $enable_ethtool
|
||||
--- a/mini-snmpd.h
|
||||
+++ b/mini-snmpd.h
|
||||
@@ -38,7 +38,6 @@
|
||||
#define MAX_NR_OIDS 20
|
||||
#define MAX_NR_SUBIDS 20
|
||||
#define MAX_NR_DISKS 4
|
||||
-#define MAX_NR_INTERFACES 8
|
||||
#define MAX_NR_VALUES 2048
|
||||
|
||||
#define MAX_PACKET_SIZE 2048
|
||||
Reference in new issue
Block a user