From 0e6341bfdd99720f61f46abc17452a7a6276cd62 Mon Sep 17 00:00:00 2001 From: heitbaum Date: Thu, 14 Jan 2021 07:20:22 +0000 Subject: [PATCH] net-snmp: update to 5.9 update 5.8 to 5.9 fix patches (dos2unix on 0003 patch) changelog: *5.9* snmplib: - Add IPv6 support to DTLSUDP transport CHANGES: snmplib: use new netsnmp_sockaddr_storage in netsnmp_addr_pair CHANGES: snmplib: add base_transport ptr for tunneled transports snmpd: - Security vulnerabilty in the ping MIB reported by Christopher Ertl from Microsoft fixed - Changing to a different uid/gid can only be done once - The extend mib is now read-only by default snmptrap: - BUG: 2899: Patch from Drew Roedersheimer to set library engineboots/time values before sending unspecified: - Add pkg-config support for building applications and sub-agents Use the netsnmp package when building Net-SNMP applications. Use the netsnmp-agent package when building Net-SNMP subagents. --- .../addons/service/net-snmp/changelog.txt | 5 +- packages/addons/service/net-snmp/package.mk | 6 +- .../patches/net-snmp-0001-read_config.c.patch | 2 +- ...snmp-0002-net-snmp-create-v3-user.in.patch | 10 +-- .../patches/net-snmp-0003-config.sub.patch | 68 +++++++++---------- 5 files changed, 47 insertions(+), 44 deletions(-) diff --git a/packages/addons/service/net-snmp/changelog.txt b/packages/addons/service/net-snmp/changelog.txt index de6237fc86..d919b7cf19 100644 --- a/packages/addons/service/net-snmp/changelog.txt +++ b/packages/addons/service/net-snmp/changelog.txt @@ -1,10 +1,13 @@ +107 +- update to 5.9 + 106 - update to 5.8 105 - Improve configuration screen - Make snmpv3 work again (missing include) -- Expose cputemp and/or gputemp with extends optionnaly +- Expose cputemp and/or gputemp with extends optionally 104 - Change daemon startup option diff --git a/packages/addons/service/net-snmp/package.mk b/packages/addons/service/net-snmp/package.mk index 342bf178f1..65b8093be8 100644 --- a/packages/addons/service/net-snmp/package.mk +++ b/packages/addons/service/net-snmp/package.mk @@ -2,9 +2,9 @@ # Copyright (C) 2016-present Team LibreELEC (https://libreelec.tv) PKG_NAME="net-snmp" -PKG_VERSION="5.8" -PKG_SHA256="b2fc3500840ebe532734c4786b0da4ef0a5f67e51ef4c86b3345d697e4976adf" -PKG_REV="106" +PKG_VERSION="5.9" +PKG_SHA256="04303a66f85d6d8b16d3cc53bde50428877c82ab524e17591dfceaeb94df6071" +PKG_REV="107" PKG_ARCH="any" PKG_LICENSE="BSD" PKG_SITE="http://www.net-snmp.org" diff --git a/packages/addons/service/net-snmp/patches/net-snmp-0001-read_config.c.patch b/packages/addons/service/net-snmp/patches/net-snmp-0001-read_config.c.patch index 6f52ff5a1f..58cb087014 100644 --- a/packages/addons/service/net-snmp/patches/net-snmp-0001-read_config.c.patch +++ b/packages/addons/service/net-snmp/patches/net-snmp-0001-read_config.c.patch @@ -1,6 +1,6 @@ --- a/snmplib/read_config.c 2014-12-08 14:23:22.000000000 -0600 +++ b/snmplib/read_config.c 2017-03-30 12:21:16.351042803 -0500 -@@ -1618,7 +1618,7 @@ +@@ -1642,7 +1642,7 @@ * save a warning header to the top of the new file */ snprintf(fileold, sizeof(fileold), diff --git a/packages/addons/service/net-snmp/patches/net-snmp-0002-net-snmp-create-v3-user.in.patch b/packages/addons/service/net-snmp/patches/net-snmp-0002-net-snmp-create-v3-user.in.patch index 397341c400..45dfcf9f09 100644 --- a/packages/addons/service/net-snmp/patches/net-snmp-0002-net-snmp-create-v3-user.in.patch +++ b/packages/addons/service/net-snmp/patches/net-snmp-0002-net-snmp-create-v3-user.in.patch @@ -1,8 +1,8 @@ ---- a/net-snmp-create-v3-user.in 2014-12-08 14:23:22.000000000 -0600 -+++ b/net-snmp-create-v3-user.in 2017-03-30 13:20:56.336794994 -0500 -@@ -28,10 +28,8 @@ - NSC_SRCDIR="NET-SNMP-SOURCE-DIR" - fi +--- net-snmp-5.9/net-snmp-create-v3-user.in 2020-08-14 21:41:47.000000000 +0000 ++++ net-snmp-5.9/net-snmp-create-v3-user.in 2021-01-14 07:04:26.196982169 +0000 +@@ -5,10 +5,8 @@ + # this shell script is designed to add new SNMPv3 users + # to Net-SNMP config file. -if @PSCMD@ | egrep ' snmpd *$' > /dev/null 2>&1 ; then - echo "Apparently at least one snmpd demon is already running." diff --git a/packages/addons/service/net-snmp/patches/net-snmp-0003-config.sub.patch b/packages/addons/service/net-snmp/patches/net-snmp-0003-config.sub.patch index a39388d49a..0da33713be 100644 --- a/packages/addons/service/net-snmp/patches/net-snmp-0003-config.sub.patch +++ b/packages/addons/service/net-snmp/patches/net-snmp-0003-config.sub.patch @@ -1,34 +1,34 @@ -diff -ur net-snmp-5.7.3/config.sub net-snmp-5.7.3.new/config.sub ---- net-snmp-5.7.3/config.sub 2014-12-08 21:23:22.000000000 +0100 -+++ net-snmp-5.7.3.new/config.sub 2017-11-09 18:39:31.638689732 +0100 -@@ -247,10 +247,11 @@ case $basic_machine in - # Some are omitted here because they have special meanings below. - 1750a | 580 \ - | a29k \ -+ | aarch64 | aarch64_be \ - | alpha | alphaev[4-8] | alphaev56 | alphaev6[78] | alphapca5[67] \ - | alpha64 | alpha64ev[4-8] | alpha64ev56 | alpha64ev6[78] | alpha64pca5[67] \ - | am33_2.0 \ -- | arc | arm | arm[bl]e | arme[lb] | armv[2345] | armv[345][lb] | avr | avr32 \ -+ | arm | arm[bl]e | arme[lb] | armv[2-8] | armv[3-8][lb] | armv7[arm] \ - | bfin \ - | c4x | clipper \ - | d10v | d30v | dlx | dsp16xx \ -@@ -339,6 +340,7 @@ case $basic_machine in - # Recognize the basic CPU types with company name. - 580-* \ - | a29k-* \ -+ | aarch64-* | aarch64_be-* \ - | alpha-* | alphaev[4-8]-* | alphaev56-* | alphaev6[78]-* \ - | alpha64-* | alpha64ev[4-8]-* | alpha64ev56-* | alpha64ev6[78]-* \ - | alphapca5[67]-* | alpha64pca5[67]-* | arc-* \ -@@ -1171,6 +1173,9 @@ case $basic_machine in - basic_machine=hppa1.1-winbond - os=-proelf - ;; -+ x64) -+ basic_machine=x86_64-pc -+ ;; - xbox) - basic_machine=i686-pc - os=-mingw32 \ No newline at end of file +diff -ur net-snmp-5.7.3/config.sub net-snmp-5.7.3.new/config.sub +--- net-snmp-5.7.3/config.sub 2014-12-08 21:23:22.000000000 +0100 ++++ net-snmp-5.7.3.new/config.sub 2017-11-09 18:39:31.638689732 +0100 +@@ -247,10 +247,11 @@ case $basic_machine in + # Some are omitted here because they have special meanings below. + 1750a | 580 \ + | a29k \ ++ | aarch64 | aarch64_be \ + | alpha | alphaev[4-8] | alphaev56 | alphaev6[78] | alphapca5[67] \ + | alpha64 | alpha64ev[4-8] | alpha64ev56 | alpha64ev6[78] | alpha64pca5[67] \ + | am33_2.0 \ +- | arc | arm | arm[bl]e | arme[lb] | armv[2345] | armv[345][lb] | avr | avr32 \ ++ | arm | arm[bl]e | arme[lb] | armv[2-8] | armv[3-8][lb] | armv7[arm] \ + | bfin \ + | c4x | clipper \ + | d10v | d30v | dlx | dsp16xx \ +@@ -339,6 +340,7 @@ case $basic_machine in + # Recognize the basic CPU types with company name. + 580-* \ + | a29k-* \ ++ | aarch64-* | aarch64_be-* \ + | alpha-* | alphaev[4-8]-* | alphaev56-* | alphaev6[78]-* \ + | alpha64-* | alpha64ev[4-8]-* | alpha64ev56-* | alpha64ev6[78]-* \ + | alphapca5[67]-* | alpha64pca5[67]-* | arc-* \ +@@ -1171,6 +1173,9 @@ case $basic_machine in + basic_machine=hppa1.1-winbond + os=-proelf + ;; ++ x64) ++ basic_machine=x86_64-pc ++ ;; + xbox) + basic_machine=i686-pc + os=-mingw32