diff options
| author | ptrcnull <git@ptrcnull.me> | 2022-07-11 12:19:27 +0200 |
|---|---|---|
| committer | alice <alice@ayaya.dev> | 2022-07-17 17:21:04 +0000 |
| commit | 5e28f536e2f6684963c1ff40b012353356479cc9 (patch) | |
| tree | 90f3b619592c21ad2d3ffc8ca6825eb43527d833 | |
| parent | fe4a4507e83558ce077fc0936873e6c3926cd12c (diff) | |
| download | aports-5e28f536e2f6684963c1ff40b012353356479cc9.zip | |
main/net-snmp: upgrade to 5.9.3
| -rw-r--r-- | main/net-snmp/0001-snmpd-always-exit-after-displaying-usage.patch | 50 | ||||
| -rw-r--r-- | main/net-snmp/APKBUILD | 16 |
2 files changed, 11 insertions, 55 deletions
diff --git a/main/net-snmp/0001-snmpd-always-exit-after-displaying-usage.patch b/main/net-snmp/0001-snmpd-always-exit-after-displaying-usage.patch deleted file mode 100644 index 3d9c160ff47..00000000000 --- a/main/net-snmp/0001-snmpd-always-exit-after-displaying-usage.patch +++ /dev/null @@ -1,50 +0,0 @@ -From f51095d579b46f35e7bc9ab0aaed4223e9c92c57 Mon Sep 17 00:00:00 2001 -From: Kaarle Ritvanen <kaarle.ritvanen@datakunkku.fi> -Date: Fri, 27 Aug 2021 14:21:45 +0300 -Subject: [PATCH] snmpd: always exit after displaying usage - -Currently, viewing the help text with -h results in snmpd being started -in the background, whereas this does not happen with --help. Similarly, -when an error is detected in command line syntax, the help text is -displayed but sometimes snmpd gets started anyway, depending on the -execution path. - -This patch makes snmpd consistently terminate whenever the usage -function gets called. It also removes the goto statements no longer -needed. ---- - agent/snmpd.c | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/agent/snmpd.c b/agent/snmpd.c -index f5aab0af8..90de12d99 100644 ---- a/agent/snmpd.c -+++ b/agent/snmpd.c -@@ -289,6 +289,8 @@ usage(char *prog) - " -S d|i|0-7\t\tuse -Ls <facility> instead\n" - "\n" - ); -+ SOCK_CLEANUP; -+ exit(1); - } - - static void -@@ -494,7 +496,6 @@ main(int argc, char *argv[]) - case '-': - if (strcasecmp(optarg, "help") == 0) { - usage(argv[0]); -- goto out; - } - if (strcasecmp(optarg, "version") == 0) { - version(); -@@ -783,7 +784,6 @@ main(int argc, char *argv[]) - fprintf(stderr, "%s: Illegal argument -X:" - "AgentX support not compiled in.\n", argv[0]); - usage(argv[0]); -- goto out; - #endif - break; - --- -2.31.1 - diff --git a/main/net-snmp/APKBUILD b/main/net-snmp/APKBUILD index 0992ca40713..80e2e27d8b3 100644 --- a/main/net-snmp/APKBUILD +++ b/main/net-snmp/APKBUILD @@ -1,8 +1,8 @@ # Contributor: Carlo Landmeter <clandmeter@alpinelinux.org> # Maintainer: Carlo Landmeter <clandmeter@alpinelinux.org> pkgname=net-snmp -pkgver=5.9.1 -pkgrel=7 +pkgver=5.9.3 +pkgrel=0 pkgdesc="Simple Network Management Protocol" url="http://www.net-snmp.org/" arch="all" @@ -16,13 +16,20 @@ subpackages="$pkgname-dbg $pkgname-doc $pkgname-dev $pkgname-libs $pkgname-agent source="https://downloads.sourceforge.net/net-snmp/net-snmp-$pkgver.tar.gz netsnmp-swinst-crash.patch fix-includes.patch - 0001-snmpd-always-exit-after-displaying-usage.patch snmpd.initd snmpd.confd snmptrapd.confd " +# secfixes: +# 5.9.3-r0: +# - CVE-2022-24805 +# - CVE-2022-24806 +# - CVE-2022-24807 +# - CVE-2022-24808 +# - CVE-2022-24809 +# - CVE-2022-24810 prepare() { update_config_sub @@ -139,10 +146,9 @@ tools() { } sha512sums=" -30989e43034e17433b885854490f2f37470a532cb7cab0d2a3beb37f5f3c2b10e803af125a5177d87fc0a36cecc266fefc016b609427b558f36567c2f1a84b20 net-snmp-5.9.1.tar.gz +a476df4967029a2eb03d27b0e250170785d0a8c143d49b900ee958c3cbdfaccd415b70af40f6fbed9cb8819d522c35a6073a431091d908ccc7c018fa0aaa2abc net-snmp-5.9.3.tar.gz 4ad92f50b14d5e27ba86256cc532a2dd055502f4d5fbb1700434f9f01f881fd09bb1eadb94e727554e1470f036707558314c64a66d0376b54e71ab31d5e4baa3 netsnmp-swinst-crash.patch 87a552bd2e41684bba6e87fbcf6454a85ee912d7a339411fda24cebddf7661f0856729e076a917920a542cf84b687ffd90a091daa15f2c48f0ff64f3a53c0ddb fix-includes.patch -a085785c935a2791090eaa265c139674387c2f121c843125956fe14377e737844e0f929e2a652f3471b860b406926c43f5e796fedf5041ce6dde0790f25b15a2 0001-snmpd-always-exit-after-displaying-usage.patch 1616d471105fc004bd7472d244d4ff9eae936875853bc51381ce2ddbb4bc29825beab6ed01299c76e3230b5725083ae169381f4572d12f015f6c682926b708bc snmpd.initd ca4921190e8b81e3244465fa66bf6f0a075add159c8ec13a1198ded155df89eb984a48e34972b20f549fbfa9bbff4a24d66bf7cd0b51f5f86a26ad4c2f5cf5cc snmpd.confd 073fd2b83eedd6eda1f7345350268ce7946ef6d67a8f26f7c232e46feb75babf68272ae12071a2f9ea76ede71393b3ae4672d3cd47cfd14ab77e3a6482f2e124 snmptrapd.confd |