diff mbox series

[meta-openembedded,1/1] net-snmp: upgrade 5.9.1 -> 5.9.3

Message ID 20221003062716.3759210-1-narpat.mali@windriver.com
State New
Headers show
Series [meta-openembedded,1/1] net-snmp: upgrade 5.9.1 -> 5.9.3 | expand

Commit Message

nmali Oct. 3, 2022, 6:27 a.m. UTC
Issue: LIN1022-1131, LIN1022-1132, LIN1022-1133, LIN1022-1134, LIN1022-1135
Issue: LIN1022-1136

Upgrade summary:
----------------
- drop 0002-configure-fix-a-cc-check-issue.patch, as it was replaced with
  upstream commit https://github.com/net-snmp/net-snmp/commit/dbb49acfa2af
- drop 0001-snmpd-always-exit-after-displaying-usage.patch backport
- rebase net-snmp-5.7.2-fix-engineBoots-value-on-SIGHUP.patch manually
- refresh patches with devtool to get rid of fuzz

Changelog:
----------
*5.9.3*:
security:
  - These two CVEs can be exploited by a user with read-only credentials:
      - CVE-2022-24805 A buffer overflow in the handling of the INDEX of
        NET-SNMP-VACM-MIB can cause an out-of-bounds memory access.
      - CVE-2022-24809 A malformed OID in a GET-NEXT to the nsVacmAccessTable
        can cause a NULL pointer dereference.
  - These CVEs can be exploited by a user with read-write credentials:
      - CVE-2022-24806 Improper Input Validation when SETing malformed
        OIDs in master agent and subagent simultaneously
      - CVE-2022-24807 A malformed OID in a SET request to
        SNMP-VIEW-BASED-ACM-MIB::vacmAccessTable can cause an
        out-of-bounds memory access.
      - CVE-2022-24808 A malformed OID in a SET request to
        NET-SNMP-AGENT-MIB::nsLogTable can cause a NULL pointer dereference
      - CVE-2022-24810 A malformed OID in a SET to the nsVacmAccessTable
        can cause a NULL pointer dereference.
  - To avoid these flaws, use strong SNMPv3 credentials and do not share them.
    If you must use SNMPv1 or SNMPv2c, use a complex community string
    and enhance the protection by restricting access to a given IP address
    range.
  - Thanks are due to Yu Zhang of VARAS@IIE and Nanyu Zhong of VARAS@IIE for
    reporting the following CVEs that have been fixed in this release, and
    to Arista Networks for providing fixes.

Windows:
  - WinExtDLL: Fix multiple compiler warnings
  - WinExtDLL: Make long strings occupy a single line Make it easier to
    look up error messages in the source code by making long strings
    occupy a single source code line.
  - WinExtDLL: Restore MIB-II support Make winExtDLL work on 64-bit
    Windows systems") caused snmpd to skip MIB-II on 64-bit systems.

IF-MIB: Update ifTable entries even if the interface name has changed
    At least on Linux a network interface index may be reused for a
    network interface with a different name. Hence this patch that
    enables replacing network interface information even if the network
    interface name has changed.

unspecified:
  - Moved transport code into a separate subdirectory in snmplib
  - Snmplib: remove inline versions of container funcs".

misc:
  - snmp-create-v3-user: Fix the snmpd.conf path   @datadir@ is
    expanded in ${datarootdir} so datarootdir must be set before
    @datadir@ is used.

*5.9.2*:
skipped due to a last minute library versioning found bug -- use 5.9.3 instead

(master rev: bf4a826c7de51dcdac87f81fa2bd2301629d50db) -- backport

Signed-off-by: Narpat Mali <narpat.mali@windriver.com>
---
 ...ath.m4-keep-consistent-between-32bit.patch |  8 ++-
 .../0001-config_os_headers-Error-Fix.patch    |  4 +-
 ...1-get_pid_from_inode-Include-limit.h.patch |  6 +-
 ...d-always-exit-after-displaying-usage.patch | 55 -------------------
 ....c-Don-t-check-for-return-from-EVP_M.patch |  4 +-
 .../0002-configure-fix-a-cc-check-issue.patch | 28 ----------
 ...004-configure-fix-incorrect-variable.patch |  6 +-
 .../net-snmp/fix-libtool-finish.patch         |  6 +-
 ....7.2-fix-engineBoots-value-on-SIGHUP.patch | 22 ++++----
 ...add-knob-whether-nlist.h-are-checked.patch |  4 +-
 .../net-snmp-fix-for-disable-des.patch        |  4 +-
 ...ting-add-the-output-format-for-ptest.patch |  2 +-
 .../reproducibility-have-printcap.patch       |  4 +-
 .../{net-snmp_5.9.1.bb => net-snmp_5.9.3.bb}  |  4 +-
 14 files changed, 37 insertions(+), 120 deletions(-)
 delete mode 100644 meta-networking/recipes-protocols/net-snmp/net-snmp/0001-snmpd-always-exit-after-displaying-usage.patch
 delete mode 100644 meta-networking/recipes-protocols/net-snmp/net-snmp/0002-configure-fix-a-cc-check-issue.patch
 rename meta-networking/recipes-protocols/net-snmp/{net-snmp_5.9.1.bb => net-snmp_5.9.3.bb} (98%)

Comments

Khem Raj Oct. 3, 2022, 6:59 a.m. UTC | #1
how different is this from
https://git.openembedded.org/meta-openembedded/commit/?id=bf4a826c7de51dcdac87f81fa2bd2301629d50db

On Sun, Oct 2, 2022 at 11:27 PM Narpat Mali <narpat.mali@windriver.com> wrote:
>
> Issue: LIN1022-1131, LIN1022-1132, LIN1022-1133, LIN1022-1134, LIN1022-1135
> Issue: LIN1022-1136
>
> Upgrade summary:
> ----------------
> - drop 0002-configure-fix-a-cc-check-issue.patch, as it was replaced with
>   upstream commit https://github.com/net-snmp/net-snmp/commit/dbb49acfa2af
> - drop 0001-snmpd-always-exit-after-displaying-usage.patch backport
> - rebase net-snmp-5.7.2-fix-engineBoots-value-on-SIGHUP.patch manually
> - refresh patches with devtool to get rid of fuzz
>
> Changelog:
> ----------
> *5.9.3*:
> security:
>   - These two CVEs can be exploited by a user with read-only credentials:
>       - CVE-2022-24805 A buffer overflow in the handling of the INDEX of
>         NET-SNMP-VACM-MIB can cause an out-of-bounds memory access.
>       - CVE-2022-24809 A malformed OID in a GET-NEXT to the nsVacmAccessTable
>         can cause a NULL pointer dereference.
>   - These CVEs can be exploited by a user with read-write credentials:
>       - CVE-2022-24806 Improper Input Validation when SETing malformed
>         OIDs in master agent and subagent simultaneously
>       - CVE-2022-24807 A malformed OID in a SET request to
>         SNMP-VIEW-BASED-ACM-MIB::vacmAccessTable can cause an
>         out-of-bounds memory access.
>       - CVE-2022-24808 A malformed OID in a SET request to
>         NET-SNMP-AGENT-MIB::nsLogTable can cause a NULL pointer dereference
>       - CVE-2022-24810 A malformed OID in a SET to the nsVacmAccessTable
>         can cause a NULL pointer dereference.
>   - To avoid these flaws, use strong SNMPv3 credentials and do not share them.
>     If you must use SNMPv1 or SNMPv2c, use a complex community string
>     and enhance the protection by restricting access to a given IP address
>     range.
>   - Thanks are due to Yu Zhang of VARAS@IIE and Nanyu Zhong of VARAS@IIE for
>     reporting the following CVEs that have been fixed in this release, and
>     to Arista Networks for providing fixes.
>
> Windows:
>   - WinExtDLL: Fix multiple compiler warnings
>   - WinExtDLL: Make long strings occupy a single line Make it easier to
>     look up error messages in the source code by making long strings
>     occupy a single source code line.
>   - WinExtDLL: Restore MIB-II support Make winExtDLL work on 64-bit
>     Windows systems") caused snmpd to skip MIB-II on 64-bit systems.
>
> IF-MIB: Update ifTable entries even if the interface name has changed
>     At least on Linux a network interface index may be reused for a
>     network interface with a different name. Hence this patch that
>     enables replacing network interface information even if the network
>     interface name has changed.
>
> unspecified:
>   - Moved transport code into a separate subdirectory in snmplib
>   - Snmplib: remove inline versions of container funcs".
>
> misc:
>   - snmp-create-v3-user: Fix the snmpd.conf path   @datadir@ is
>     expanded in ${datarootdir} so datarootdir must be set before
>     @datadir@ is used.
>
> *5.9.2*:
> skipped due to a last minute library versioning found bug -- use 5.9.3 instead
>
> (master rev: bf4a826c7de51dcdac87f81fa2bd2301629d50db) -- backport
>
> Signed-off-by: Narpat Mali <narpat.mali@windriver.com>
> ---
>  ...ath.m4-keep-consistent-between-32bit.patch |  8 ++-
>  .../0001-config_os_headers-Error-Fix.patch    |  4 +-
>  ...1-get_pid_from_inode-Include-limit.h.patch |  6 +-
>  ...d-always-exit-after-displaying-usage.patch | 55 -------------------
>  ....c-Don-t-check-for-return-from-EVP_M.patch |  4 +-
>  .../0002-configure-fix-a-cc-check-issue.patch | 28 ----------
>  ...004-configure-fix-incorrect-variable.patch |  6 +-
>  .../net-snmp/fix-libtool-finish.patch         |  6 +-
>  ....7.2-fix-engineBoots-value-on-SIGHUP.patch | 22 ++++----
>  ...add-knob-whether-nlist.h-are-checked.patch |  4 +-
>  .../net-snmp-fix-for-disable-des.patch        |  4 +-
>  ...ting-add-the-output-format-for-ptest.patch |  2 +-
>  .../reproducibility-have-printcap.patch       |  4 +-
>  .../{net-snmp_5.9.1.bb => net-snmp_5.9.3.bb}  |  4 +-
>  14 files changed, 37 insertions(+), 120 deletions(-)
>  delete mode 100644 meta-networking/recipes-protocols/net-snmp/net-snmp/0001-snmpd-always-exit-after-displaying-usage.patch
>  delete mode 100644 meta-networking/recipes-protocols/net-snmp/net-snmp/0002-configure-fix-a-cc-check-issue.patch
>  rename meta-networking/recipes-protocols/net-snmp/{net-snmp_5.9.1.bb => net-snmp_5.9.3.bb} (98%)
>
> diff --git a/meta-networking/recipes-protocols/net-snmp/net-snmp/0001-ac_add_search_path.m4-keep-consistent-between-32bit.patch b/meta-networking/recipes-protocols/net-snmp/net-snmp/0001-ac_add_search_path.m4-keep-consistent-between-32bit.patch
> index 4cd729044..ed2ebc6d7 100644
> --- a/meta-networking/recipes-protocols/net-snmp/net-snmp/0001-ac_add_search_path.m4-keep-consistent-between-32bit.patch
> +++ b/meta-networking/recipes-protocols/net-snmp/net-snmp/0001-ac_add_search_path.m4-keep-consistent-between-32bit.patch
> @@ -1,7 +1,8 @@
> -From 6f8ea2e841ad45eed193310b599d3f3b410ae91d Mon Sep 17 00:00:00 2001
> +From 98c62e24fdd05d7e8bd8149840bad8eb0feb3fb1 Mon Sep 17 00:00:00 2001
>  From: Mingli Yu <mingli.yu@windriver.com>
>  Date: Fri, 29 Jan 2021 08:49:15 +0000
> -Subject: [PATCH] ac_add_search_path.m4: keep consistent between 32bit and 64bit
> +Subject: [PATCH] ac_add_search_path.m4: keep consistent between 32bit and
> + 64bit
>
>  With configure option "--with-openssl=${STAGING_EXECPREFIXDIR}", it behaves
>  differently between 32bit and 64bit system as the openssl lib resides under
> @@ -15,12 +16,13 @@ So add the patch to fix the gap between 32bit and 64bit system.
>  Upstream-Status: Inappropriate [configuration specific]
>
>  Signed-off-by: Mingli Yu <mingli.yu@windriver.com>
> +
>  ---
>   m4/ac_add_search_path.m4 | 4 ++--
>   1 file changed, 2 insertions(+), 2 deletions(-)
>
>  diff --git a/m4/ac_add_search_path.m4 b/m4/ac_add_search_path.m4
> -index 8e0a819..961f587 100644
> +index 8e0a819..e9585bc 100644
>  --- a/m4/ac_add_search_path.m4
>  +++ b/m4/ac_add_search_path.m4
>  @@ -3,8 +3,8 @@ dnl Add a search path to the LIBS and CPPFLAGS variables
> diff --git a/meta-networking/recipes-protocols/net-snmp/net-snmp/0001-config_os_headers-Error-Fix.patch b/meta-networking/recipes-protocols/net-snmp/net-snmp/0001-config_os_headers-Error-Fix.patch
> index 05a47f61c..f8a52a63f 100644
> --- a/meta-networking/recipes-protocols/net-snmp/net-snmp/0001-config_os_headers-Error-Fix.patch
> +++ b/meta-networking/recipes-protocols/net-snmp/net-snmp/0001-config_os_headers-Error-Fix.patch
> @@ -1,4 +1,4 @@
> -From 69d4c517c07f55c505090e48d96ace8cd599fb26 Mon Sep 17 00:00:00 2001
> +From e86d5fd52f19b85da0b7cce660c6e65ec4c0f9bb Mon Sep 17 00:00:00 2001
>  From: Li xin <lixin.fnst@cn.fujitsu.com>
>  Date: Fri, 21 Aug 2015 18:23:13 +0900
>  Subject: [PATCH] config_os_headers: Error Fix
> @@ -19,7 +19,7 @@ Signed-off-by: Li Xin <lixin.fnst@cn.fujitsu.com>
>   1 file changed, 2 insertions(+), 2 deletions(-)
>
>  diff --git a/configure.d/config_os_headers b/configure.d/config_os_headers
> -index f07d512..2363b42 100644
> +index 01c3376..6edd85f 100644
>  --- a/configure.d/config_os_headers
>  +++ b/configure.d/config_os_headers
>  @@ -395,8 +395,8 @@ then
> diff --git a/meta-networking/recipes-protocols/net-snmp/net-snmp/0001-get_pid_from_inode-Include-limit.h.patch b/meta-networking/recipes-protocols/net-snmp/net-snmp/0001-get_pid_from_inode-Include-limit.h.patch
> index 22e591556..a7881a871 100644
> --- a/meta-networking/recipes-protocols/net-snmp/net-snmp/0001-get_pid_from_inode-Include-limit.h.patch
> +++ b/meta-networking/recipes-protocols/net-snmp/net-snmp/0001-get_pid_from_inode-Include-limit.h.patch
> @@ -1,4 +1,4 @@
> -From 2bf1bbe1d428ed06d57aa76b03e394b72ff2216d Mon Sep 17 00:00:00 2001
> +From 8097734b27fd146f358a4edd0d1a0d28309bd9a4 Mon Sep 17 00:00:00 2001
>  From: Khem Raj <raj.khem@gmail.com>
>  Date: Fri, 22 Jul 2016 18:34:39 +0000
>  Subject: [PATCH] get_pid_from_inode: Include limit.h
> @@ -14,7 +14,7 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com>
>   1 file changed, 1 insertion(+)
>
>  diff --git a/agent/mibgroup/util_funcs/get_pid_from_inode.c b/agent/mibgroup/util_funcs/get_pid_from_inode.c
> -index aee907d..7abaec2 100644
> +index 5788e1d..ea380a6 100644
>  --- a/agent/mibgroup/util_funcs/get_pid_from_inode.c
>  +++ b/agent/mibgroup/util_funcs/get_pid_from_inode.c
>  @@ -6,6 +6,7 @@
> @@ -23,5 +23,5 @@ index aee907d..7abaec2 100644
>   #include <ctype.h>
>  +#include <limits.h>
>   #include <stdio.h>
> - #if HAVE_STDLIB_H
> + #ifdef HAVE_STDLIB_H
>   #include <stdlib.h>
> diff --git a/meta-networking/recipes-protocols/net-snmp/net-snmp/0001-snmpd-always-exit-after-displaying-usage.patch b/meta-networking/recipes-protocols/net-snmp/net-snmp/0001-snmpd-always-exit-after-displaying-usage.patch
> deleted file mode 100644
> index 4fc9e54b4..000000000
> --- a/meta-networking/recipes-protocols/net-snmp/net-snmp/0001-snmpd-always-exit-after-displaying-usage.patch
> +++ /dev/null
> @@ -1,55 +0,0 @@
> -From 94ca941e06bef157bf0e13251f8ca1471daa9393 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.
> -
> -Upstream-Status: Backport
> -[https://github.com/net-snmp/net-snmp/commit/94ca941e06bef157bf0e13251f8ca1471daa9393]
> -
> -Signed-off-by: Yi Zhao <yi.zhao@windriver.com>
> ----
> - 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.25.1
> -
> diff --git a/meta-networking/recipes-protocols/net-snmp/net-snmp/0001-snmplib-keytools.c-Don-t-check-for-return-from-EVP_M.patch b/meta-networking/recipes-protocols/net-snmp/net-snmp/0001-snmplib-keytools.c-Don-t-check-for-return-from-EVP_M.patch
> index 42352a6b0..af6334f72 100644
> --- a/meta-networking/recipes-protocols/net-snmp/net-snmp/0001-snmplib-keytools.c-Don-t-check-for-return-from-EVP_M.patch
> +++ b/meta-networking/recipes-protocols/net-snmp/net-snmp/0001-snmplib-keytools.c-Don-t-check-for-return-from-EVP_M.patch
> @@ -1,4 +1,4 @@
> -From f3ff99736b8cccbba77349b0d10a3cee366a4c87 Mon Sep 17 00:00:00 2001
> +From f4e1acd4f509dd26cf88da872bd5adcf884f4a5f Mon Sep 17 00:00:00 2001
>  From: Khem Raj <raj.khem@gmail.com>
>  Date: Fri, 18 Sep 2015 00:28:45 -0400
>  Subject: [PATCH] snmplib/keytools.c: Don't check for return from
> @@ -17,7 +17,7 @@ Signed-off-by: Ovidiu Panait <ovidiu.panait@windriver.com>
>   1 file changed, 1 insertion(+), 4 deletions(-)
>
>  diff --git a/snmplib/keytools.c b/snmplib/keytools.c
> -index 129a7c0..2fc1efc 100644
> +index 14a452a..fb1694b 100644
>  --- a/snmplib/keytools.c
>  +++ b/snmplib/keytools.c
>  @@ -183,10 +183,7 @@ generate_Ku(const oid * hashtype, u_int hashtype_len,
> diff --git a/meta-networking/recipes-protocols/net-snmp/net-snmp/0002-configure-fix-a-cc-check-issue.patch b/meta-networking/recipes-protocols/net-snmp/net-snmp/0002-configure-fix-a-cc-check-issue.patch
> deleted file mode 100644
> index c973bde72..000000000
> --- a/meta-networking/recipes-protocols/net-snmp/net-snmp/0002-configure-fix-a-cc-check-issue.patch
> +++ /dev/null
> @@ -1,28 +0,0 @@
> -From 0a02ac779c51a2b4af3b58cb96967bf3eff80367 Mon Sep 17 00:00:00 2001
> -From: Wenlin Kang <wenlin.kang@windriver.com>
> -Date: Wed, 24 May 2017 16:45:34 +0800
> -Subject: [PATCH] configure: fix a cc check issue.
> -
> -When has "." in cc value, the expression
> -$myperl -V:cc | $myperl -n -e 'print if (s/^\s*cc=.([-=\w\s\/]+).;\s*/$1/);'
> -can't get corretly the cc's value.
> -
> -Signed-off-by: Wenlin Kang <wenlin.kang@windriver.com>
> -
> ----
> - configure.d/config_project_perl_python | 2 +-
> - 1 file changed, 1 insertion(+), 1 deletion(-)
> -
> -diff --git a/configure.d/config_project_perl_python b/configure.d/config_project_perl_python
> -index 475c843..22d2ad3 100644
> ---- a/configure.d/config_project_perl_python
> -+++ b/configure.d/config_project_perl_python
> -@@ -87,7 +87,7 @@ if test "x$install_perl" != "xno" ; then
> -     if test "x$enable_perl_cc_checks" != "xno" ; then
> -         AC_MSG_CHECKING([for Perl cc])
> -         changequote(, )
> --        PERLCC=`$myperl -V:cc | $myperl -n -e 'print if (s/^\s*cc=.([-=\w\s\/]+).;\s*/$1/);'`
> -+        PERLCC=`$myperl -V:cc | $myperl -n -e 'print if (s/^\s*cc=.([-=\.\w\s\/]+).;\s*/$1/);'`
> -         changequote([, ])
> -         if test "x$PERLCC" != "x" ; then
> -             AC_MSG_RESULT([$PERLCC])
> diff --git a/meta-networking/recipes-protocols/net-snmp/net-snmp/0004-configure-fix-incorrect-variable.patch b/meta-networking/recipes-protocols/net-snmp/net-snmp/0004-configure-fix-incorrect-variable.patch
> index bfddc63dd..6e224188a 100644
> --- a/meta-networking/recipes-protocols/net-snmp/net-snmp/0004-configure-fix-incorrect-variable.patch
> +++ b/meta-networking/recipes-protocols/net-snmp/net-snmp/0004-configure-fix-incorrect-variable.patch
> @@ -1,4 +1,4 @@
> -From 011bdcd07f2a289d0cfc1b411c03c0cc7c42dad1 Mon Sep 17 00:00:00 2001
> +From 6d655ba677563ac9d62d4d8eee59fdb39d486c02 Mon Sep 17 00:00:00 2001
>  From: Wenlin Kang <wenlin.kang@windriver.com>
>  Date: Wed, 24 May 2017 17:10:20 +0800
>  Subject: [PATCH] configure: fix incorrect variable
> @@ -14,10 +14,10 @@ Signed-off-by: Wenlin Kang <wenlin.kang@windriver.com>
>   1 file changed, 1 insertion(+), 1 deletion(-)
>
>  diff --git a/Makefile.in b/Makefile.in
> -index 912f6b2..a53d1b2 100644
> +index f1cbbf5..1545be3 100644
>  --- a/Makefile.in
>  +++ b/Makefile.in
> -@@ -174,7 +174,7 @@ OTHERCLEANTODOS=perlclean @PYTHONCLEANTARGS@ cleanfeatures perlcleanfeatures pyt
> +@@ -173,7 +173,7 @@ OTHERCLEANTODOS=perlclean @PYTHONCLEANTARGS@ cleanfeatures perlcleanfeatures pyt
>   #
>   # override LD_RUN_PATH to avoid dependencies on the build directory
>   perlmodules: perlmakefiles subdirs
> diff --git a/meta-networking/recipes-protocols/net-snmp/net-snmp/fix-libtool-finish.patch b/meta-networking/recipes-protocols/net-snmp/net-snmp/fix-libtool-finish.patch
> index 26dd014ce..409c1e03c 100644
> --- a/meta-networking/recipes-protocols/net-snmp/net-snmp/fix-libtool-finish.patch
> +++ b/meta-networking/recipes-protocols/net-snmp/net-snmp/fix-libtool-finish.patch
> @@ -1,4 +1,4 @@
> -From 27444fbf8323679ea0551a3bd5f04c365143d8c0 Mon Sep 17 00:00:00 2001
> +From ab1d77c52e84746e75506a2870783806bc77f396 Mon Sep 17 00:00:00 2001
>  From: "Roy.Li" <rongqing.li@windriver.com>
>  Date: Fri, 16 Jan 2015 14:14:01 +0800
>  Subject: [PATCH] net-snmp: fix "libtool --finish"
> @@ -20,11 +20,11 @@ Signed-off-by: Roy.Li <rongqing.li@windriver.com>
>   1 file changed, 1 insertion(+), 1 deletion(-)
>
>  diff --git a/Makefile.top b/Makefile.top
> -index 6315401..fc0ee06 100644
> +index a962c54..1ba5607 100644
>  --- a/Makefile.top
>  +++ b/Makefile.top
>  @@ -89,7 +89,7 @@ LIBREVISION = 0
> - 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) -version-info $(LIBCURRENT):$(LIBREVISION):$(LIBAGE) @LD_NO_UNDEFINED@ -o
>   LIB_EXTENSION   = la
>   LIB_VERSION     =
>  -LIB_LDCONFIG_CMD = $(LIBTOOL) --mode=finish $(INSTALL_PREFIX)$(libdir)
> diff --git a/meta-networking/recipes-protocols/net-snmp/net-snmp/net-snmp-5.7.2-fix-engineBoots-value-on-SIGHUP.patch b/meta-networking/recipes-protocols/net-snmp/net-snmp/net-snmp-5.7.2-fix-engineBoots-value-on-SIGHUP.patch
> index 022eb958f..87f192e5b 100644
> --- a/meta-networking/recipes-protocols/net-snmp/net-snmp/net-snmp-5.7.2-fix-engineBoots-value-on-SIGHUP.patch
> +++ b/meta-networking/recipes-protocols/net-snmp/net-snmp/net-snmp-5.7.2-fix-engineBoots-value-on-SIGHUP.patch
> @@ -1,4 +1,4 @@
> -From 1e3178835217ba89aa355e2b6b88e490f17be16d Mon Sep 17 00:00:00 2001
> +From 5ad4eab43c1ea63ff343bba64d576440e8783e75 Mon Sep 17 00:00:00 2001
>  From: Zheng Ruoqin <zhengrq.fnst@fujitsu.com>
>  Date: Wed, 9 Jun 2021 15:47:30 +0900
>  Subject: [PATCH] net snmp: fix engineBoots value on SIGHUP
> @@ -7,6 +7,7 @@ Upstream-Status: Pending
>
>  Signed-off-by: Marian Florea <marian.florea@windriver.com>
>  Signed-off-by: Li Zhou <li.zhou@windriver.com>
> +Signed-off-by: Ovidiu Panait <ovidiu.panait@windriver.com>
>
>  ---
>   agent/snmpd.c    | 1 +
> @@ -14,19 +15,18 @@ Signed-off-by: Li Zhou <li.zhou@windriver.com>
>   2 files changed, 3 insertions(+), 2 deletions(-)
>
>  diff --git a/agent/snmpd.c b/agent/snmpd.c
> -index 1af439f..355b510 100644
> +index 90de12d..1ccc4db 100644
>  --- a/agent/snmpd.c
>  +++ b/agent/snmpd.c
> -@@ -1208,6 +1208,7 @@ receive(void)
> -           snmp_log(LOG_INFO, "NET-SNMP version %s restarted\n",
> -                    netsnmp_get_version());
> -             update_config();
> -+          snmp_store(app_name);
> -             send_easy_trap(SNMP_TRAP_ENTERPRISESPECIFIC, 3);
> - #if HAVE_SIGPROCMASK
> -             ret = sigprocmask(SIG_UNBLOCK, &set, NULL);
> +     snmp_log(LOG_INFO, "NET-SNMP version %s restarted\n",
> +              netsnmp_get_version());
> +     update_config();
> ++    snmp_store(app_name);
> +     send_easy_trap(SNMP_TRAP_ENTERPRISESPECIFIC, 3);
> + #ifdef HAVE_SIGPROCMASK
> +     ret = sigprocmask(SIG_UNBLOCK, &set, NULL);
>  diff --git a/snmplib/snmpv3.c b/snmplib/snmpv3.c
> -index 29c2a0f..ada961c 100644
> +index 7b1746b..4a17e0d 100644
>  --- a/snmplib/snmpv3.c
>  +++ b/snmplib/snmpv3.c
>  @@ -1059,9 +1059,9 @@ init_snmpv3_post_config(int majorid, int minorid, void *serverarg,
> diff --git a/meta-networking/recipes-protocols/net-snmp/net-snmp/net-snmp-add-knob-whether-nlist.h-are-checked.patch b/meta-networking/recipes-protocols/net-snmp/net-snmp/net-snmp-add-knob-whether-nlist.h-are-checked.patch
> index f1ebe2bb6..c5a453abe 100644
> --- a/meta-networking/recipes-protocols/net-snmp/net-snmp/net-snmp-add-knob-whether-nlist.h-are-checked.patch
> +++ b/meta-networking/recipes-protocols/net-snmp/net-snmp/net-snmp-add-knob-whether-nlist.h-are-checked.patch
> @@ -1,4 +1,4 @@
> -From e507dcf8b29c55011f85d88bf05400d4717e4074 Mon Sep 17 00:00:00 2001
> +From ad65b106d3cb3c6e595381be1c45a73c1ef6eb5e Mon Sep 17 00:00:00 2001
>  From: Chong Lu <Chong.Lu@windriver.com>
>  Date: Thu, 28 May 2020 09:46:34 -0500
>  Subject: [PATCH] net-snmp: add knob whether nlist.h are checked
> @@ -15,7 +15,7 @@ Signed-off-by: Chong Lu <Chong.Lu@windriver.com>
>   1 file changed, 2 insertions(+)
>
>  diff --git a/configure.d/config_os_headers b/configure.d/config_os_headers
> -index 76ef58a..f07d512 100644
> +index b9c8c31..01c3376 100644
>  --- a/configure.d/config_os_headers
>  +++ b/configure.d/config_os_headers
>  @@ -37,6 +37,7 @@ AC_CHECK_HEADERS([getopt.h   pthread.h  regex.h      ] dnl
> diff --git a/meta-networking/recipes-protocols/net-snmp/net-snmp/net-snmp-fix-for-disable-des.patch b/meta-networking/recipes-protocols/net-snmp/net-snmp/net-snmp-fix-for-disable-des.patch
> index 2941a3609..c382c02d8 100644
> --- a/meta-networking/recipes-protocols/net-snmp/net-snmp/net-snmp-fix-for-disable-des.patch
> +++ b/meta-networking/recipes-protocols/net-snmp/net-snmp/net-snmp-fix-for-disable-des.patch
> @@ -1,4 +1,4 @@
> -From 3ca4335ec1d6b7b384c134fc85d7a9e513c68376 Mon Sep 17 00:00:00 2001
> +From b1b9980853b1083f0c8b9f628f8b4c3a484d4f91 Mon Sep 17 00:00:00 2001
>  From: Jackie Huang <jackie.huang@windriver.com>
>  Date: Thu, 22 Jun 2017 10:25:08 +0800
>  Subject: [PATCH] net-snmp: fix for --disable-des
> @@ -15,7 +15,7 @@ Signed-off-by: Jackie Huang <jackie.huang@windriver.com>
>   1 file changed, 2 insertions(+)
>
>  diff --git a/snmplib/scapi.c b/snmplib/scapi.c
> -index 00c9174..c6875e1 100644
> +index 54fdd5c..0f7e931 100644
>  --- a/snmplib/scapi.c
>  +++ b/snmplib/scapi.c
>  @@ -85,7 +85,9 @@ netsnmp_feature_child_of(usm_scapi, usm_support);
> diff --git a/meta-networking/recipes-protocols/net-snmp/net-snmp/net-snmp-testing-add-the-output-format-for-ptest.patch b/meta-networking/recipes-protocols/net-snmp/net-snmp/net-snmp-testing-add-the-output-format-for-ptest.patch
> index 807983f61..09ca532a7 100644
> --- a/meta-networking/recipes-protocols/net-snmp/net-snmp/net-snmp-testing-add-the-output-format-for-ptest.patch
> +++ b/meta-networking/recipes-protocols/net-snmp/net-snmp/net-snmp-testing-add-the-output-format-for-ptest.patch
> @@ -1,4 +1,4 @@
> -From 972df16e9599dffddf5d714a4cbf43008c771122 Mon Sep 17 00:00:00 2001
> +From 36a5656db7ea75dd15f35a6c1728937c6e2b901c Mon Sep 17 00:00:00 2001
>  From: Jackie Huang <jackie.huang@windriver.com>
>  Date: Wed, 14 Jan 2015 15:10:06 +0800
>  Subject: [PATCH] testing: add the output format for ptest
> diff --git a/meta-networking/recipes-protocols/net-snmp/net-snmp/reproducibility-have-printcap.patch b/meta-networking/recipes-protocols/net-snmp/net-snmp/reproducibility-have-printcap.patch
> index bf1e7bedf..c0b51c51e 100644
> --- a/meta-networking/recipes-protocols/net-snmp/net-snmp/reproducibility-have-printcap.patch
> +++ b/meta-networking/recipes-protocols/net-snmp/net-snmp/reproducibility-have-printcap.patch
> @@ -1,4 +1,4 @@
> -From 84e362fe97f50fbad69f083bc2d8fe18f83eb2f7 Mon Sep 17 00:00:00 2001
> +From b923cd38e2503b86aedf66b767fd7f51c9f25645 Mon Sep 17 00:00:00 2001
>  From: "douglas.royds" <douglas.royds@taitradio.com>
>  Date: Wed, 21 Nov 2018 13:52:18 +1300
>  Subject: [PATCH] net-snmp: Reproducibility: Don't check build host for
> @@ -13,7 +13,7 @@ set in the environment to "yes" or "no" as appropriate for the target platform.
>   1 file changed, 2 insertions(+), 2 deletions(-)
>
>  diff --git a/configure.d/config_os_misc4 b/configure.d/config_os_misc4
> -index 6f23c8e..8cea75a 100644
> +index b6864d9..07ca922 100644
>  --- a/configure.d/config_os_misc4
>  +++ b/configure.d/config_os_misc4
>  @@ -99,9 +99,9 @@ if test x$LPSTAT_PATH != x; then
> diff --git a/meta-networking/recipes-protocols/net-snmp/net-snmp_5.9.1.bb b/meta-networking/recipes-protocols/net-snmp/net-snmp_5.9.3.bb
> similarity index 98%
> rename from meta-networking/recipes-protocols/net-snmp/net-snmp_5.9.1.bb
> rename to meta-networking/recipes-protocols/net-snmp/net-snmp_5.9.3.bb
> index 30c0ce74c..7af514756 100644
> --- a/meta-networking/recipes-protocols/net-snmp/net-snmp_5.9.1.bb
> +++ b/meta-networking/recipes-protocols/net-snmp/net-snmp_5.9.3.bb
> @@ -21,15 +21,13 @@ SRC_URI = "${SOURCEFORGE_MIRROR}/net-snmp/net-snmp-${PV}.tar.gz \
>             file://0001-config_os_headers-Error-Fix.patch \
>             file://0001-snmplib-keytools.c-Don-t-check-for-return-from-EVP_M.patch \
>             file://0001-get_pid_from_inode-Include-limit.h.patch \
> -           file://0002-configure-fix-a-cc-check-issue.patch \
>             file://0004-configure-fix-incorrect-variable.patch \
>             file://net-snmp-5.7.2-fix-engineBoots-value-on-SIGHUP.patch \
>             file://net-snmp-fix-for-disable-des.patch \
>             file://reproducibility-have-printcap.patch \
>             file://0001-ac_add_search_path.m4-keep-consistent-between-32bit.patch \
> -           file://0001-snmpd-always-exit-after-displaying-usage.patch \
>             "
> -SRC_URI[sha256sum] = "eb7fd4a44de6cddbffd9a92a85ad1309e5c1054fb9d5a7dd93079c8953f48c3f"
> +SRC_URI[sha256sum] = "2097f29b7e1bf3f1300b4bae52fa2308d0bb8d5d3998dbe02f9462a413a2ef0a"
>
>  UPSTREAM_CHECK_URI = "https://sourceforge.net/projects/net-snmp/files/net-snmp/"
>  UPSTREAM_CHECK_REGEX = "/net-snmp/(?P<pver>\d+(\.\d+)+)/"
> --
> 2.25.1
>
>
> -=-=-=-=-=-=-=-=-=-=-=-
> Links: You receive all messages sent to this group.
> View/Reply Online (#99037): https://lists.openembedded.org/g/openembedded-devel/message/99037
> Mute This Topic: https://lists.openembedded.org/mt/94085410/1997914
> Group Owner: openembedded-devel+owner@lists.openembedded.org
> Unsubscribe: https://lists.openembedded.org/g/openembedded-devel/unsub [raj.khem@gmail.com]
> -=-=-=-=-=-=-=-=-=-=-=-
>
nmali Oct. 3, 2022, 5:11 p.m. UTC | #2
Hi Khem Raj,

It is the same commit but, we need this patch commit for "kirkstone" branch of meta-openembedded.
We observed that the "master" branch has "net-snmp 5.9.3" version at https://git.openembedded.org/meta-openembedded/tree/meta-networking/recipes-protocols/net-snmp and the "kirkstone" branch has "net-snmp 5.9.1" at https://git.openembedded.org/meta-openembedded/tree/meta-networking/recipes-protocols/net-snmp?h=kirkstone

Since, our product is using "kirkstone" branch of meta-openembedded so, CVE-2022-24805 to CVE-2022-24810 are vulnerable for our product.
Could you please let us know, How to get net-snmp upgraded to 5.9.3 version in "kirkstone" branch ?

Best Regards,
Narpat Mali

Sent from Mail<https://go.microsoft.com/fwlink/?LinkId=550986> for Windows
Khem Raj Oct. 3, 2022, 7:41 p.m. UTC | #3
Ok it will be good to add [kirkstone] in subject
So folks know where intend it for

On Mon, Oct 3, 2022 at 10:12 AM Mali, Narpat <Narpat.Mali@windriver.com>
wrote:

> Hi Khem Raj,
>
>
>
> It is the same commit but, we need this patch commit for “kirkstone”
> branch of meta-openembedded.
>
> We observed that the “master” branch has “net-snmp 5.9.3” version at
> https://git.openembedded.org/meta-openembedded/tree/meta-networking/recipes-protocols/net-snmp
> and the “kirkstone” branch has “net-snmp 5.9.1” at
> https://git.openembedded.org/meta-openembedded/tree/meta-networking/recipes-protocols/net-snmp?h=kirkstone
>
>
>
> Since, our product is using “kirkstone” branch of meta-openembedded so,
> CVE-2022-24805 to CVE-2022-24810 are vulnerable for our product.
>
> Could you please let us know, How to get net-snmp upgraded to 5.9.3
> version in “kirkstone” branch ?
>
>
>
> Best Regards,
>
> Narpat Mali
>
>
>
> Sent from Mail <https://go.microsoft.com/fwlink/?LinkId=550986> for
> Windows
>
>
> ------------------------------
> *From:* Khem Raj <raj.khem@gmail.com>
> *Sent:* Monday, October 3, 2022 12:29:18 PM
> *To:* Mali, Narpat <Narpat.Mali@windriver.com>
> *Cc:* openembedded-devel@lists.openembedded.org <
> openembedded-devel@lists.openembedded.org>; Polampalli, Archana <
> Archana.Polampalli@windriver.com>; Urade, Yogita <
> Yogita.Urade@windriver.com>; G Pillai, Hari <Hari.GPillai@windriver.com>
> *Subject:* Re: [oe] [meta-openembedded][PATCH 1/1] net-snmp: upgrade
> 5.9.1 -> 5.9.3
>
> [Please note: This e-mail is from an EXTERNAL e-mail address]
>
>
> how different is this from
>
> https://git.openembedded.org/meta-openembedded/commit/?id=bf4a826c7de51dcdac87f81fa2bd2301629d50db
>
> On Sun, Oct 2, 2022 at 11:27 PM Narpat Mali <narpat.mali@windriver.com>
> wrote:
> >
> > Issue: LIN1022-1131, LIN1022-1132, LIN1022-1133, LIN1022-1134,
> LIN1022-1135
> > Issue: LIN1022-1136
> >
> > Upgrade summary:
> > ----------------
> > - drop 0002-configure-fix-a-cc-check-issue.patch, as it was replaced with
> >   upstream commit
> https://github.com/net-snmp/net-snmp/commit/dbb49acfa2af
> > - drop 0001-snmpd-always-exit-after-displaying-usage.patch backport
> > - rebase net-snmp-5.7.2-fix-engineBoots-value-on-SIGHUP.patch manually
> > - refresh patches with devtool to get rid of fuzz
> >
> > Changelog:
> > ----------
> > *5.9.3*:
> > security:
> >   - These two CVEs can be exploited by a user with read-only credentials:
> >       - CVE-2022-24805 A buffer overflow in the handling of the INDEX of
> >         NET-SNMP-VACM-MIB can cause an out-of-bounds memory access.
> >       - CVE-2022-24809 A malformed OID in a GET-NEXT to the
> nsVacmAccessTable
> >         can cause a NULL pointer dereference.
> >   - These CVEs can be exploited by a user with read-write credentials:
> >       - CVE-2022-24806 Improper Input Validation when SETing malformed
> >         OIDs in master agent and subagent simultaneously
> >       - CVE-2022-24807 A malformed OID in a SET request to
> >         SNMP-VIEW-BASED-ACM-MIB::vacmAccessTable can cause an
> >         out-of-bounds memory access.
> >       - CVE-2022-24808 A malformed OID in a SET request to
> >         NET-SNMP-AGENT-MIB::nsLogTable can cause a NULL pointer
> dereference
> >       - CVE-2022-24810 A malformed OID in a SET to the nsVacmAccessTable
> >         can cause a NULL pointer dereference.
> >   - To avoid these flaws, use strong SNMPv3 credentials and do not share
> them.
> >     If you must use SNMPv1 or SNMPv2c, use a complex community string
> >     and enhance the protection by restricting access to a given IP
> address
> >     range.
> >   - Thanks are due to Yu Zhang of VARAS@IIE and Nanyu Zhong of VARAS@IIE
> for
> >     reporting the following CVEs that have been fixed in this release,
> and
> >     to Arista Networks for providing fixes.
> >
> > Windows:
> >   - WinExtDLL: Fix multiple compiler warnings
> >   - WinExtDLL: Make long strings occupy a single line Make it easier to
> >     look up error messages in the source code by making long strings
> >     occupy a single source code line.
> >   - WinExtDLL: Restore MIB-II support Make winExtDLL work on 64-bit
> >     Windows systems") caused snmpd to skip MIB-II on 64-bit systems.
> >
> > IF-MIB: Update ifTable entries even if the interface name has changed
> >     At least on Linux a network interface index may be reused for a
> >     network interface with a different name. Hence this patch that
> >     enables replacing network interface information even if the network
> >     interface name has changed.
> >
> > unspecified:
> >   - Moved transport code into a separate subdirectory in snmplib
> >   - Snmplib: remove inline versions of container funcs".
> >
> > misc:
> >   - snmp-create-v3-user: Fix the snmpd.conf path   @datadir@ is
> >     expanded in ${datarootdir} so datarootdir must be set before
> >     @datadir@ is used.
> >
> > *5.9.2*:
> > skipped due to a last minute library versioning found bug -- use 5.9.3
> instead
> >
> > (master rev: bf4a826c7de51dcdac87f81fa2bd2301629d50db) -- backport
> >
> > Signed-off-by: Narpat Mali <narpat.mali@windriver.com>
> > ---
> >  ...ath.m4-keep-consistent-between-32bit.patch |  8 ++-
> >  .../0001-config_os_headers-Error-Fix.patch    |  4 +-
> >  ...1-get_pid_from_inode-Include-limit.h.patch |  6 +-
> >  ...d-always-exit-after-displaying-usage.patch | 55 -------------------
> >  ....c-Don-t-check-for-return-from-EVP_M.patch |  4 +-
> >  .../0002-configure-fix-a-cc-check-issue.patch | 28 ----------
> >  ...004-configure-fix-incorrect-variable.patch |  6 +-
> >  .../net-snmp/fix-libtool-finish.patch         |  6 +-
> >  ....7.2-fix-engineBoots-value-on-SIGHUP.patch | 22 ++++----
> >  ...add-knob-whether-nlist.h-are-checked.patch |  4 +-
> >  .../net-snmp-fix-for-disable-des.patch        |  4 +-
> >  ...ting-add-the-output-format-for-ptest.patch |  2 +-
> >  .../reproducibility-have-printcap.patch       |  4 +-
> >  .../{net-snmp_5.9.1.bb => net-snmp_5.9.3.bb}  |  4 +-
> >  14 files changed, 37 insertions(+), 120 deletions(-)
> >  delete mode 100644
> meta-networking/recipes-protocols/net-snmp/net-snmp/0001-snmpd-always-exit-after-displaying-usage.patch
> >  delete mode 100644
> meta-networking/recipes-protocols/net-snmp/net-snmp/0002-configure-fix-a-cc-check-issue.patch
> >  rename meta-networking/recipes-protocols/net-snmp/{net-snmp_5.9.1.bb
> => net-snmp_5.9.3.bb} (98%)
> >
> > diff --git
> a/meta-networking/recipes-protocols/net-snmp/net-snmp/0001-ac_add_search_path.m4-keep-consistent-between-32bit.patch
> b/meta-networking/recipes-protocols/net-snmp/net-snmp/0001-ac_add_search_path.m4-keep-consistent-between-32bit.patch
> > index 4cd729044..ed2ebc6d7 100644
> > ---
> a/meta-networking/recipes-protocols/net-snmp/net-snmp/0001-ac_add_search_path.m4-keep-consistent-between-32bit.patch
> > +++
> b/meta-networking/recipes-protocols/net-snmp/net-snmp/0001-ac_add_search_path.m4-keep-consistent-between-32bit.patch
> > @@ -1,7 +1,8 @@
> > -From 6f8ea2e841ad45eed193310b599d3f3b410ae91d Mon Sep 17 00:00:00 2001
> > +From 98c62e24fdd05d7e8bd8149840bad8eb0feb3fb1 Mon Sep 17 00:00:00 2001
> >  From: Mingli Yu <mingli.yu@windriver.com>
> >  Date: Fri, 29 Jan 2021 08:49:15 +0000
> > -Subject: [PATCH] ac_add_search_path.m4: keep consistent between 32bit
> and 64bit
> > +Subject: [PATCH] ac_add_search_path.m4: keep consistent between 32bit
> and
> > + 64bit
> >
> >  With configure option "--with-openssl=${STAGING_EXECPREFIXDIR}", it
> behaves
> >  differently between 32bit and 64bit system as the openssl lib resides
> under
> > @@ -15,12 +16,13 @@ So add the patch to fix the gap between 32bit and
> 64bit system.
> >  Upstream-Status: Inappropriate [configuration specific]
> >
> >  Signed-off-by: Mingli Yu <mingli.yu@windriver.com>
> > +
> >  ---
> >   m4/ac_add_search_path.m4 | 4 ++--
> >   1 file changed, 2 insertions(+), 2 deletions(-)
> >
> >  diff --git a/m4/ac_add_search_path.m4 b/m4/ac_add_search_path.m4
> > -index 8e0a819..961f587 100644
> > +index 8e0a819..e9585bc 100644
> >  --- a/m4/ac_add_search_path.m4
> >  +++ b/m4/ac_add_search_path.m4
> >  @@ -3,8 +3,8 @@ dnl Add a search path to the LIBS and CPPFLAGS variables
> > diff --git
> a/meta-networking/recipes-protocols/net-snmp/net-snmp/0001-config_os_headers-Error-Fix.patch
> b/meta-networking/recipes-protocols/net-snmp/net-snmp/0001-config_os_headers-Error-Fix.patch
> > index 05a47f61c..f8a52a63f 100644
> > ---
> a/meta-networking/recipes-protocols/net-snmp/net-snmp/0001-config_os_headers-Error-Fix.patch
> > +++
> b/meta-networking/recipes-protocols/net-snmp/net-snmp/0001-config_os_headers-Error-Fix.patch
> > @@ -1,4 +1,4 @@
> > -From 69d4c517c07f55c505090e48d96ace8cd599fb26 Mon Sep 17 00:00:00 2001
> > +From e86d5fd52f19b85da0b7cce660c6e65ec4c0f9bb Mon Sep 17 00:00:00 2001
> >  From: Li xin <lixin.fnst@cn.fujitsu.com>
> >  Date: Fri, 21 Aug 2015 18:23:13 +0900
> >  Subject: [PATCH] config_os_headers: Error Fix
> > @@ -19,7 +19,7 @@ Signed-off-by: Li Xin <lixin.fnst@cn.fujitsu.com>
> >   1 file changed, 2 insertions(+), 2 deletions(-)
> >
> >  diff --git a/configure.d/config_os_headers
> b/configure.d/config_os_headers
> > -index f07d512..2363b42 100644
> > +index 01c3376..6edd85f 100644
> >  --- a/configure.d/config_os_headers
> >  +++ b/configure.d/config_os_headers
> >  @@ -395,8 +395,8 @@ then
> > diff --git
> a/meta-networking/recipes-protocols/net-snmp/net-snmp/0001-get_pid_from_inode-Include-limit.h.patch
> b/meta-networking/recipes-protocols/net-snmp/net-snmp/0001-get_pid_from_inode-Include-limit.h.patch
> > index 22e591556..a7881a871 100644
> > ---
> a/meta-networking/recipes-protocols/net-snmp/net-snmp/0001-get_pid_from_inode-Include-limit.h.patch
> > +++
> b/meta-networking/recipes-protocols/net-snmp/net-snmp/0001-get_pid_from_inode-Include-limit.h.patch
> > @@ -1,4 +1,4 @@
> > -From 2bf1bbe1d428ed06d57aa76b03e394b72ff2216d Mon Sep 17 00:00:00 2001
> > +From 8097734b27fd146f358a4edd0d1a0d28309bd9a4 Mon Sep 17 00:00:00 2001
> >  From: Khem Raj <raj.khem@gmail.com>
> >  Date: Fri, 22 Jul 2016 18:34:39 +0000
> >  Subject: [PATCH] get_pid_from_inode: Include limit.h
> > @@ -14,7 +14,7 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com>
> >   1 file changed, 1 insertion(+)
> >
> >  diff --git a/agent/mibgroup/util_funcs/get_pid_from_inode.c
> b/agent/mibgroup/util_funcs/get_pid_from_inode.c
> > -index aee907d..7abaec2 100644
> > +index 5788e1d..ea380a6 100644
> >  --- a/agent/mibgroup/util_funcs/get_pid_from_inode.c
> >  +++ b/agent/mibgroup/util_funcs/get_pid_from_inode.c
> >  @@ -6,6 +6,7 @@
> > @@ -23,5 +23,5 @@ index aee907d..7abaec2 100644
> >   #include <ctype.h>
> >  +#include <limits.h>
> >   #include <stdio.h>
> > - #if HAVE_STDLIB_H
> > + #ifdef HAVE_STDLIB_H
> >   #include <stdlib.h>
> > diff --git
> a/meta-networking/recipes-protocols/net-snmp/net-snmp/0001-snmpd-always-exit-after-displaying-usage.patch
> b/meta-networking/recipes-protocols/net-snmp/net-snmp/0001-snmpd-always-exit-after-displaying-usage.patch
> > deleted file mode 100644
> > index 4fc9e54b4..000000000
> > ---
> a/meta-networking/recipes-protocols/net-snmp/net-snmp/0001-snmpd-always-exit-after-displaying-usage.patch
> > +++ /dev/null
> > @@ -1,55 +0,0 @@
> > -From 94ca941e06bef157bf0e13251f8ca1471daa9393 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.
> > -
> > -Upstream-Status: Backport
> > -[
> https://github.com/net-snmp/net-snmp/commit/94ca941e06bef157bf0e13251f8ca1471daa9393
> ]
> > -
> > -Signed-off-by: Yi Zhao <yi.zhao@windriver.com>
> > ----
> > - 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.25.1
> > -
> > diff --git
> a/meta-networking/recipes-protocols/net-snmp/net-snmp/0001-snmplib-keytools.c-Don-t-check-for-return-from-EVP_M.patch
> b/meta-networking/recipes-protocols/net-snmp/net-snmp/0001-snmplib-keytools.c-Don-t-check-for-return-from-EVP_M.patch
> > index 42352a6b0..af6334f72 100644
> > ---
> a/meta-networking/recipes-protocols/net-snmp/net-snmp/0001-snmplib-keytools.c-Don-t-check-for-return-from-EVP_M.patch
> > +++
> b/meta-networking/recipes-protocols/net-snmp/net-snmp/0001-snmplib-keytools.c-Don-t-check-for-return-from-EVP_M.patch
> > @@ -1,4 +1,4 @@
> > -From f3ff99736b8cccbba77349b0d10a3cee366a4c87 Mon Sep 17 00:00:00 2001
> > +From f4e1acd4f509dd26cf88da872bd5adcf884f4a5f Mon Sep 17 00:00:00 2001
> >  From: Khem Raj <raj.khem@gmail.com>
> >  Date: Fri, 18 Sep 2015 00:28:45 -0400
> >  Subject: [PATCH] snmplib/keytools.c: Don't check for return from
> > @@ -17,7 +17,7 @@ Signed-off-by: Ovidiu Panait <
> ovidiu.panait@windriver.com>
> >   1 file changed, 1 insertion(+), 4 deletions(-)
> >
> >  diff --git a/snmplib/keytools.c b/snmplib/keytools.c
> > -index 129a7c0..2fc1efc 100644
> > +index 14a452a..fb1694b 100644
> >  --- a/snmplib/keytools.c
> >  +++ b/snmplib/keytools.c
> >  @@ -183,10 +183,7 @@ generate_Ku(const oid * hashtype, u_int
> hashtype_len,
> > diff --git
> a/meta-networking/recipes-protocols/net-snmp/net-snmp/0002-configure-fix-a-cc-check-issue.patch
> b/meta-networking/recipes-protocols/net-snmp/net-snmp/0002-configure-fix-a-cc-check-issue.patch
> > deleted file mode 100644
> > index c973bde72..000000000
> > ---
> a/meta-networking/recipes-protocols/net-snmp/net-snmp/0002-configure-fix-a-cc-check-issue.patch
> > +++ /dev/null
> > @@ -1,28 +0,0 @@
> > -From 0a02ac779c51a2b4af3b58cb96967bf3eff80367 Mon Sep 17 00:00:00 2001
> > -From: Wenlin Kang <wenlin.kang@windriver.com>
> > -Date: Wed, 24 May 2017 16:45:34 +0800
> > -Subject: [PATCH] configure: fix a cc check issue.
> > -
> > -When has "." in cc value, the expression
> > -$myperl -V:cc | $myperl -n -e 'print if
> (s/^\s*cc=.([-=\w\s\/]+).;\s*/$1/);'
> > -can't get corretly the cc's value.
> > -
> > -Signed-off-by: Wenlin Kang <wenlin.kang@windriver.com>
> > -
> > ----
> > - configure.d/config_project_perl_python | 2 +-
> > - 1 file changed, 1 insertion(+), 1 deletion(-)
> > -
> > -diff --git a/configure.d/config_project_perl_python
> b/configure.d/config_project_perl_python
> > -index 475c843..22d2ad3 100644
> > ---- a/configure.d/config_project_perl_python
> > -+++ b/configure.d/config_project_perl_python
> > -@@ -87,7 +87,7 @@ if test "x$install_perl" != "xno" ; then
> > -     if test "x$enable_perl_cc_checks" != "xno" ; then
> > -         AC_MSG_CHECKING([for Perl cc])
> > -         changequote(, )
> > --        PERLCC=`$myperl -V:cc | $myperl -n -e 'print if
> (s/^\s*cc=.([-=\w\s\/]+).;\s*/$1/);'`
> > -+        PERLCC=`$myperl -V:cc | $myperl -n -e 'print if
> (s/^\s*cc=.([-=\.\w\s\/]+).;\s*/$1/);'`
> > -         changequote([, ])
> > -         if test "x$PERLCC" != "x" ; then
> > -             AC_MSG_RESULT([$PERLCC])
> > diff --git
> a/meta-networking/recipes-protocols/net-snmp/net-snmp/0004-configure-fix-incorrect-variable.patch
> b/meta-networking/recipes-protocols/net-snmp/net-snmp/0004-configure-fix-incorrect-variable.patch
> > index bfddc63dd..6e224188a 100644
> > ---
> a/meta-networking/recipes-protocols/net-snmp/net-snmp/0004-configure-fix-incorrect-variable.patch
> > +++
> b/meta-networking/recipes-protocols/net-snmp/net-snmp/0004-configure-fix-incorrect-variable.patch
> > @@ -1,4 +1,4 @@
> > -From 011bdcd07f2a289d0cfc1b411c03c0cc7c42dad1 Mon Sep 17 00:00:00 2001
> > +From 6d655ba677563ac9d62d4d8eee59fdb39d486c02 Mon Sep 17 00:00:00 2001
> >  From: Wenlin Kang <wenlin.kang@windriver.com>
> >  Date: Wed, 24 May 2017 17:10:20 +0800
> >  Subject: [PATCH] configure: fix incorrect variable
> > @@ -14,10 +14,10 @@ Signed-off-by: Wenlin Kang <
> wenlin.kang@windriver.com>
> >   1 file changed, 1 insertion(+), 1 deletion(-)
> >
> >  diff --git a/Makefile.in b/Makefile.in
> > -index 912f6b2..a53d1b2 100644
> > +index f1cbbf5..1545be3 100644
> >  --- a/Makefile.in
> >  +++ b/Makefile.in
> > -@@ -174,7 +174,7 @@ OTHERCLEANTODOS=perlclean @PYTHONCLEANTARGS@
> cleanfeatures perlcleanfeatures pyt
> > +@@ -173,7 +173,7 @@ OTHERCLEANTODOS=perlclean @PYTHONCLEANTARGS@
> cleanfeatures perlcleanfeatures pyt
> >   #
> >   # override LD_RUN_PATH to avoid dependencies on the build directory
> >   perlmodules: perlmakefiles subdirs
> > diff --git
> a/meta-networking/recipes-protocols/net-snmp/net-snmp/fix-libtool-finish.patch
> b/meta-networking/recipes-protocols/net-snmp/net-snmp/fix-libtool-finish.patch
> > index 26dd014ce..409c1e03c 100644
> > ---
> a/meta-networking/recipes-protocols/net-snmp/net-snmp/fix-libtool-finish.patch
> > +++
> b/meta-networking/recipes-protocols/net-snmp/net-snmp/fix-libtool-finish.patch
> > @@ -1,4 +1,4 @@
> > -From 27444fbf8323679ea0551a3bd5f04c365143d8c0 Mon Sep 17 00:00:00 2001
> > +From ab1d77c52e84746e75506a2870783806bc77f396 Mon Sep 17 00:00:00 2001
> >  From: "Roy.Li" <rongqing.li@windriver.com>
> >  Date: Fri, 16 Jan 2015 14:14:01 +0800
> >  Subject: [PATCH] net-snmp: fix "libtool --finish"
> > @@ -20,11 +20,11 @@ Signed-off-by: Roy.Li <rongqing.li@windriver.com>
> >   1 file changed, 1 insertion(+), 1 deletion(-)
> >
> >  diff --git a/Makefile.top b/Makefile.top
> > -index 6315401..fc0ee06 100644
> > +index a962c54..1ba5607 100644
> >  --- a/Makefile.top
> >  +++ b/Makefile.top
> >  @@ -89,7 +89,7 @@ LIBREVISION = 0
> > - 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) -version-info $(LIBCURRENT):$(LIBREVISION):$(LIBAGE)
> @LD_NO_UNDEFINED@ -o
> >   LIB_EXTENSION   = la
> >   LIB_VERSION     =
> >  -LIB_LDCONFIG_CMD = $(LIBTOOL) --mode=finish $(INSTALL_PREFIX)$(libdir)
> > diff --git
> a/meta-networking/recipes-protocols/net-snmp/net-snmp/net-snmp-5.7.2-fix-engineBoots-value-on-SIGHUP.patch
> b/meta-networking/recipes-protocols/net-snmp/net-snmp/net-snmp-5.7.2-fix-engineBoots-value-on-SIGHUP.patch
> > index 022eb958f..87f192e5b 100644
> > ---
> a/meta-networking/recipes-protocols/net-snmp/net-snmp/net-snmp-5.7.2-fix-engineBoots-value-on-SIGHUP.patch
> > +++
> b/meta-networking/recipes-protocols/net-snmp/net-snmp/net-snmp-5.7.2-fix-engineBoots-value-on-SIGHUP.patch
> > @@ -1,4 +1,4 @@
> > -From 1e3178835217ba89aa355e2b6b88e490f17be16d Mon Sep 17 00:00:00 2001
> > +From 5ad4eab43c1ea63ff343bba64d576440e8783e75 Mon Sep 17 00:00:00 2001
> >  From: Zheng Ruoqin <zhengrq.fnst@fujitsu.com>
> >  Date: Wed, 9 Jun 2021 15:47:30 +0900
> >  Subject: [PATCH] net snmp: fix engineBoots value on SIGHUP
> > @@ -7,6 +7,7 @@ Upstream-Status: Pending
> >
> >  Signed-off-by: Marian Florea <marian.florea@windriver.com>
> >  Signed-off-by: Li Zhou <li.zhou@windriver.com>
> > +Signed-off-by: Ovidiu Panait <ovidiu.panait@windriver.com>
> >
> >  ---
> >   agent/snmpd.c    | 1 +
> > @@ -14,19 +15,18 @@ Signed-off-by: Li Zhou <li.zhou@windriver.com>
> >   2 files changed, 3 insertions(+), 2 deletions(-)
> >
> >  diff --git a/agent/snmpd.c b/agent/snmpd.c
> > -index 1af439f..355b510 100644
> > +index 90de12d..1ccc4db 100644
> >  --- a/agent/snmpd.c
> >  +++ b/agent/snmpd.c
> > -@@ -1208,6 +1208,7 @@ receive(void)
> > -           snmp_log(LOG_INFO, "NET-SNMP version %s restarted\n",
> > -                    netsnmp_get_version());
> > -             update_config();
> > -+          snmp_store(app_name);
> > -             send_easy_trap(SNMP_TRAP_ENTERPRISESPECIFIC, 3);
> > - #if HAVE_SIGPROCMASK
> > -             ret = sigprocmask(SIG_UNBLOCK, &set, NULL);
> > +     snmp_log(LOG_INFO, "NET-SNMP version %s restarted\n",
> > +              netsnmp_get_version());
> > +     update_config();
> > ++    snmp_store(app_name);
> > +     send_easy_trap(SNMP_TRAP_ENTERPRISESPECIFIC, 3);
> > + #ifdef HAVE_SIGPROCMASK
> > +     ret = sigprocmask(SIG_UNBLOCK, &set, NULL);
> >  diff --git a/snmplib/snmpv3.c b/snmplib/snmpv3.c
> > -index 29c2a0f..ada961c 100644
> > +index 7b1746b..4a17e0d 100644
> >  --- a/snmplib/snmpv3.c
> >  +++ b/snmplib/snmpv3.c
> >  @@ -1059,9 +1059,9 @@ init_snmpv3_post_config(int majorid, int minorid,
> void *serverarg,
> > diff --git
> a/meta-networking/recipes-protocols/net-snmp/net-snmp/net-snmp-add-knob-whether-nlist.h-are-checked.patch
> b/meta-networking/recipes-protocols/net-snmp/net-snmp/net-snmp-add-knob-whether-nlist.h-are-checked.patch
> > index f1ebe2bb6..c5a453abe 100644
> > ---
> a/meta-networking/recipes-protocols/net-snmp/net-snmp/net-snmp-add-knob-whether-nlist.h-are-checked.patch
> > +++
> b/meta-networking/recipes-protocols/net-snmp/net-snmp/net-snmp-add-knob-whether-nlist.h-are-checked.patch
> > @@ -1,4 +1,4 @@
> > -From e507dcf8b29c55011f85d88bf05400d4717e4074 Mon Sep 17 00:00:00 2001
> > +From ad65b106d3cb3c6e595381be1c45a73c1ef6eb5e Mon Sep 17 00:00:00 2001
> >  From: Chong Lu <Chong.Lu@windriver.com>
> >  Date: Thu, 28 May 2020 09:46:34 -0500
> >  Subject: [PATCH] net-snmp: add knob whether nlist.h are checked
> > @@ -15,7 +15,7 @@ Signed-off-by: Chong Lu <Chong.Lu@windriver.com>
> >   1 file changed, 2 insertions(+)
> >
> >  diff --git a/configure.d/config_os_headers
> b/configure.d/config_os_headers
> > -index 76ef58a..f07d512 100644
> > +index b9c8c31..01c3376 100644
> >  --- a/configure.d/config_os_headers
> >  +++ b/configure.d/config_os_headers
> >  @@ -37,6 +37,7 @@ AC_CHECK_HEADERS([getopt.h   pthread.h  regex.h
> ] dnl
> > diff --git
> a/meta-networking/recipes-protocols/net-snmp/net-snmp/net-snmp-fix-for-disable-des.patch
> b/meta-networking/recipes-protocols/net-snmp/net-snmp/net-snmp-fix-for-disable-des.patch
> > index 2941a3609..c382c02d8 100644
> > ---
> a/meta-networking/recipes-protocols/net-snmp/net-snmp/net-snmp-fix-for-disable-des.patch
> > +++
> b/meta-networking/recipes-protocols/net-snmp/net-snmp/net-snmp-fix-for-disable-des.patch
> > @@ -1,4 +1,4 @@
> > -From 3ca4335ec1d6b7b384c134fc85d7a9e513c68376 Mon Sep 17 00:00:00 2001
> > +From b1b9980853b1083f0c8b9f628f8b4c3a484d4f91 Mon Sep 17 00:00:00 2001
> >  From: Jackie Huang <jackie.huang@windriver.com>
> >  Date: Thu, 22 Jun 2017 10:25:08 +0800
> >  Subject: [PATCH] net-snmp: fix for --disable-des
> > @@ -15,7 +15,7 @@ Signed-off-by: Jackie Huang <
> jackie.huang@windriver.com>
> >   1 file changed, 2 insertions(+)
> >
> >  diff --git a/snmplib/scapi.c b/snmplib/scapi.c
> > -index 00c9174..c6875e1 100644
> > +index 54fdd5c..0f7e931 100644
> >  --- a/snmplib/scapi.c
> >  +++ b/snmplib/scapi.c
> >  @@ -85,7 +85,9 @@ netsnmp_feature_child_of(usm_scapi, usm_support);
> > diff --git
> a/meta-networking/recipes-protocols/net-snmp/net-snmp/net-snmp-testing-add-the-output-format-for-ptest.patch
> b/meta-networking/recipes-protocols/net-snmp/net-snmp/net-snmp-testing-add-the-output-format-for-ptest.patch
> > index 807983f61..09ca532a7 100644
> > ---
> a/meta-networking/recipes-protocols/net-snmp/net-snmp/net-snmp-testing-add-the-output-format-for-ptest.patch
> > +++
> b/meta-networking/recipes-protocols/net-snmp/net-snmp/net-snmp-testing-add-the-output-format-for-ptest.patch
> > @@ -1,4 +1,4 @@
> > -From 972df16e9599dffddf5d714a4cbf43008c771122 Mon Sep 17 00:00:00 2001
> > +From 36a5656db7ea75dd15f35a6c1728937c6e2b901c Mon Sep 17 00:00:00 2001
> >  From: Jackie Huang <jackie.huang@windriver.com>
> >  Date: Wed, 14 Jan 2015 15:10:06 +0800
> >  Subject: [PATCH] testing: add the output format for ptest
> > diff --git
> a/meta-networking/recipes-protocols/net-snmp/net-snmp/reproducibility-have-printcap.patch
> b/meta-networking/recipes-protocols/net-snmp/net-snmp/reproducibility-have-printcap.patch
> > index bf1e7bedf..c0b51c51e 100644
> > ---
> a/meta-networking/recipes-protocols/net-snmp/net-snmp/reproducibility-have-printcap.patch
> > +++
> b/meta-networking/recipes-protocols/net-snmp/net-snmp/reproducibility-have-printcap.patch
> > @@ -1,4 +1,4 @@
> > -From 84e362fe97f50fbad69f083bc2d8fe18f83eb2f7 Mon Sep 17 00:00:00 2001
> > +From b923cd38e2503b86aedf66b767fd7f51c9f25645 Mon Sep 17 00:00:00 2001
> >  From: "douglas.royds" <douglas.royds@taitradio.com>
> >  Date: Wed, 21 Nov 2018 13:52:18 +1300
> >  Subject: [PATCH] net-snmp: Reproducibility: Don't check build host for
> > @@ -13,7 +13,7 @@ set in the environment to "yes" or "no" as appropriate
> for the target platform.
> >   1 file changed, 2 insertions(+), 2 deletions(-)
> >
> >  diff --git a/configure.d/config_os_misc4 b/configure.d/config_os_misc4
> > -index 6f23c8e..8cea75a 100644
> > +index b6864d9..07ca922 100644
> >  --- a/configure.d/config_os_misc4
> >  +++ b/configure.d/config_os_misc4
> >  @@ -99,9 +99,9 @@ if test x$LPSTAT_PATH != x; then
> > diff --git a/meta-networking/recipes-protocols/net-snmp/
> net-snmp_5.9.1.bb b/meta-networking/recipes-protocols/net-snmp/
> net-snmp_5.9.3.bb
> > similarity index 98%
> > rename from meta-networking/recipes-protocols/net-snmp/net-snmp_5.9.1.bb
> > rename to meta-networking/recipes-protocols/net-snmp/net-snmp_5.9.3.bb
> > index 30c0ce74c..7af514756 100644
> > --- a/meta-networking/recipes-protocols/net-snmp/net-snmp_5.9.1.bb
> > +++ b/meta-networking/recipes-protocols/net-snmp/net-snmp_5.9.3.bb
> > @@ -21,15 +21,13 @@ SRC_URI =
> "${SOURCEFORGE_MIRROR}/net-snmp/net-snmp-${PV}.tar.gz \
> >             file://0001-config_os_headers-Error-Fix.patch \
> >
> file://0001-snmplib-keytools.c-Don-t-check-for-return-from-EVP_M.patch \
> >             file://0001-get_pid_from_inode-Include-limit.h.patch \
> > -           file://0002-configure-fix-a-cc-check-issue.patch \
> >             file://0004-configure-fix-incorrect-variable.patch \
> >             file://net-snmp-5.7.2-fix-engineBoots-value-on-SIGHUP.patch
> \
> >             file://net-snmp-fix-for-disable-des.patch \
> >             file://reproducibility-have-printcap.patch \
> >
> file://0001-ac_add_search_path.m4-keep-consistent-between-32bit.patch \
> > -           file://0001-snmpd-always-exit-after-displaying-usage.patch \
> >             "
> > -SRC_URI[sha256sum] =
> "eb7fd4a44de6cddbffd9a92a85ad1309e5c1054fb9d5a7dd93079c8953f48c3f"
> > +SRC_URI[sha256sum] =
> "2097f29b7e1bf3f1300b4bae52fa2308d0bb8d5d3998dbe02f9462a413a2ef0a"
> >
> >  UPSTREAM_CHECK_URI = "
> https://sourceforge.net/projects/net-snmp/files/net-snmp/"
> >  UPSTREAM_CHECK_REGEX = "/net-snmp/(?P<pver>\d+(\.\d+)+)/"
> > --
> > 2.25.1
> >
> >
> > -=-=-=-=-=-=-=-=-=-=-=-
> > Links: You receive all messages sent to this group.
> > View/Reply Online (#99037):
> https://lists.openembedded.org/g/openembedded-devel/message/99037
> > Mute This Topic: https://lists.openembedded.org/mt/94085410/1997914
> > Group Owner: openembedded-devel+owner@lists.openembedded.org
> > Unsubscribe: https://lists.openembedded.org/g/openembedded-devel/unsub [
> raj.khem@gmail.com]
> > -=-=-=-=-=-=-=-=-=-=-=-
> >
>
nmali Oct. 4, 2022, 7:15 a.m. UTC | #4
Hi Khem Raj,

Have added the “[kirkstone]” in subject.
Do I need to send the patch again ?

Best Regards,
Narpat Mali

Sent from Mail<https://go.microsoft.com/fwlink/?LinkId=550986> for Windows

From: Khem Raj<mailto:raj.khem@gmail.com>
Sent: 04 October 2022 01:11
To: Mali, Narpat<mailto:Narpat.Mali@windriver.com>
Cc: G Pillai, Hari<mailto:Hari.GPillai@windriver.com>; Polampalli, Archana<mailto:Archana.Polampalli@windriver.com>; Urade, Yogita<mailto:Yogita.Urade@windriver.com>; openembedded-devel@lists.openembedded.org<mailto:openembedded-devel@lists.openembedded.org>
Subject: Re: [oe] [meta-openembedded][PATCH 1/1] net-snmp: upgrade 5.9.1 -> 5.9.3

[Please note: This e-mail is from an EXTERNAL e-mail address]
Ok it will be good to add [kirkstone] in subject
So folks know where intend it for

On Mon, Oct 3, 2022 at 10:12 AM Mali, Narpat <Narpat.Mali@windriver.com<mailto:Narpat.Mali@windriver.com>> wrote:
Hi Khem Raj,

It is the same commit but, we need this patch commit for “kirkstone” branch of meta-openembedded.
We observed that the “master” branch has “net-snmp 5.9.3” version at https://git.openembedded.org/meta-openembedded/tree/meta-networking/recipes-protocols/net-snmp<https://urldefense.com/v3/__https:/git.openembedded.org/meta-openembedded/tree/meta-networking/recipes-protocols/net-snmp__;!!AjveYdw8EvQ!ZzYDx7kFVh5e_WREHKtwOKlB0gzWJ5uBreZgWz17XbqSPIpRoCWlAxdMV_d3cedWCD1nDmiLXuSYtigk1r7C$> and the “kirkstone” branch has “net-snmp 5.9.1” at https://git.openembedded.org/meta-openembedded/tree/meta-networking/recipes-protocols/net-snmp?h=kirkstone<https://urldefense.com/v3/__https:/git.openembedded.org/meta-openembedded/tree/meta-networking/recipes-protocols/net-snmp?h=kirkstone__;!!AjveYdw8EvQ!ZzYDx7kFVh5e_WREHKtwOKlB0gzWJ5uBreZgWz17XbqSPIpRoCWlAxdMV_d3cedWCD1nDmiLXuSYtnBwmXJ0$>

Since, our product is using “kirkstone” branch of meta-openembedded so, CVE-2022-24805 to CVE-2022-24810 are vulnerable for our product.
Could you please let us know, How to get net-snmp upgraded to 5.9.3 version in “kirkstone” branch ?

Best Regards,
Narpat Mali

Sent from Mail<https://urldefense.com/v3/__https:/go.microsoft.com/fwlink/?LinkId=550986__;!!AjveYdw8EvQ!ZzYDx7kFVh5e_WREHKtwOKlB0gzWJ5uBreZgWz17XbqSPIpRoCWlAxdMV_d3cedWCD1nDmiLXuSYtrYRmqeF$> for Windows


From: Khem Raj <raj.khem@gmail.com<mailto:raj.khem@gmail.com>>
Sent: Monday, October 3, 2022 12:29:18 PM
To: Mali, Narpat <Narpat.Mali@windriver.com<mailto:Narpat.Mali@windriver.com>>
Cc: openembedded-devel@lists.openembedded.org<mailto:openembedded-devel@lists.openembedded.org> <openembedded-devel@lists.openembedded.org<mailto:openembedded-devel@lists.openembedded.org>>; Polampalli, Archana <Archana.Polampalli@windriver.com<mailto:Archana.Polampalli@windriver.com>>; Urade, Yogita <Yogita.Urade@windriver.com<mailto:Yogita.Urade@windriver.com>>; G Pillai, Hari <Hari.GPillai@windriver.com<mailto:Hari.GPillai@windriver.com>>
Subject: Re: [oe] [meta-openembedded][PATCH 1/1] net-snmp: upgrade 5.9.1 -> 5.9.3

[Please note: This e-mail is from an EXTERNAL e-mail address]


how different is this from
https://git.openembedded.org/meta-openembedded/commit/?id=bf4a826c7de51dcdac87f81fa2bd2301629d50db<https://urldefense.com/v3/__https:/git.openembedded.org/meta-openembedded/commit/?id=bf4a826c7de51dcdac87f81fa2bd2301629d50db__;!!AjveYdw8EvQ!ZzYDx7kFVh5e_WREHKtwOKlB0gzWJ5uBreZgWz17XbqSPIpRoCWlAxdMV_d3cedWCD1nDmiLXuSYtpcGLzXP$>

On Sun, Oct 2, 2022 at 11:27 PM Narpat Mali <narpat.mali@windriver.com<mailto:narpat.mali@windriver.com>> wrote:
>
> Issue: LIN1022-1131, LIN1022-1132, LIN1022-1133, LIN1022-1134, LIN1022-1135
> Issue: LIN1022-1136
>
> Upgrade summary:
> ----------------
> - drop 0002-configure-fix-a-cc-check-issue.patch, as it was replaced with
>   upstream commit https://github.com/net-snmp/net-snmp/commit/dbb49acfa2af<https://urldefense.com/v3/__https:/github.com/net-snmp/net-snmp/commit/dbb49acfa2af__;!!AjveYdw8EvQ!ZzYDx7kFVh5e_WREHKtwOKlB0gzWJ5uBreZgWz17XbqSPIpRoCWlAxdMV_d3cedWCD1nDmiLXuSYtoZJYKse$>
> - drop 0001-snmpd-always-exit-after-displaying-usage.patch backport
> - rebase net-snmp-5.7.2-fix-engineBoots-value-on-SIGHUP.patch manually
> - refresh patches with devtool to get rid of fuzz
>
> Changelog:
> ----------
> *5.9.3*:
> security:
>   - These two CVEs can be exploited by a user with read-only credentials:
>       - CVE-2022-24805 A buffer overflow in the handling of the INDEX of
>         NET-SNMP-VACM-MIB can cause an out-of-bounds memory access.
>       - CVE-2022-24809 A malformed OID in a GET-NEXT to the nsVacmAccessTable
>         can cause a NULL pointer dereference.
>   - These CVEs can be exploited by a user with read-write credentials:
>       - CVE-2022-24806 Improper Input Validation when SETing malformed
>         OIDs in master agent and subagent simultaneously
>       - CVE-2022-24807 A malformed OID in a SET request to
>         SNMP-VIEW-BASED-ACM-MIB::vacmAccessTable can cause an
>         out-of-bounds memory access.
>       - CVE-2022-24808 A malformed OID in a SET request to
>         NET-SNMP-AGENT-MIB::nsLogTable can cause a NULL pointer dereference
>       - CVE-2022-24810 A malformed OID in a SET to the nsVacmAccessTable
>         can cause a NULL pointer dereference.
>   - To avoid these flaws, use strong SNMPv3 credentials and do not share them.
>     If you must use SNMPv1 or SNMPv2c, use a complex community string
>     and enhance the protection by restricting access to a given IP address
>     range.
>   - Thanks are due to Yu Zhang of VARAS@IIE and Nanyu Zhong of VARAS@IIE for
>     reporting the following CVEs that have been fixed in this release, and
>     to Arista Networks for providing fixes.
>
> Windows:
>   - WinExtDLL: Fix multiple compiler warnings
>   - WinExtDLL: Make long strings occupy a single line Make it easier to
>     look up error messages in the source code by making long strings
>     occupy a single source code line.
>   - WinExtDLL: Restore MIB-II support Make winExtDLL work on 64-bit
>     Windows systems") caused snmpd to skip MIB-II on 64-bit systems.
>
> IF-MIB: Update ifTable entries even if the interface name has changed
>     At least on Linux a network interface index may be reused for a
>     network interface with a different name. Hence this patch that
>     enables replacing network interface information even if the network
>     interface name has changed.
>
> unspecified:
>   - Moved transport code into a separate subdirectory in snmplib
>   - Snmplib: remove inline versions of container funcs".
>
> misc:
>   - snmp-create-v3-user: Fix the snmpd.conf path   @datadir@ is
>     expanded in ${datarootdir} so datarootdir must be set before
>     @datadir@ is used.
>
> *5.9.2*:
> skipped due to a last minute library versioning found bug -- use 5.9.3 instead
>
> (master rev: bf4a826c7de51dcdac87f81fa2bd2301629d50db) -- backport
>
> Signed-off-by: Narpat Mali <narpat.mali@windriver.com<mailto:narpat.mali@windriver.com>>
> ---
>  ...ath.m4-keep-consistent-between-32bit.patch |  8 ++-
>  .../0001-config_os_headers-Error-Fix.patch    |  4 +-
>  ...1-get_pid_from_inode-Include-limit.h.patch |  6 +-
>  ...d-always-exit-after-displaying-usage.patch | 55 -------------------
>  ....c-Don-t-check-for-return-from-EVP_M.patch |  4 +-
>  .../0002-configure-fix-a-cc-check-issue.patch | 28 ----------
>  ...004-configure-fix-incorrect-variable.patch |  6 +-
>  .../net-snmp/fix-libtool-finish.patch         |  6 +-
>  ....7.2-fix-engineBoots-value-on-SIGHUP.patch | 22 ++++----
>  ...add-knob-whether-nlist.h-are-checked.patch |  4 +-
>  .../net-snmp-fix-for-disable-des.patch        |  4 +-
>  ...ting-add-the-output-format-for-ptest.patch |  2 +-
>  .../reproducibility-have-printcap.patch       |  4 +-
>  .../{net-snmp_5.9.1.bb<https://urldefense.com/v3/__http:/net-snmp_5.9.1.bb__;!!AjveYdw8EvQ!ZzYDx7kFVh5e_WREHKtwOKlB0gzWJ5uBreZgWz17XbqSPIpRoCWlAxdMV_d3cedWCD1nDmiLXuSYtgJfttSA$> => net-snmp_5.9.3.bb<https://urldefense.com/v3/__http:/net-snmp_5.9.3.bb__;!!AjveYdw8EvQ!ZzYDx7kFVh5e_WREHKtwOKlB0gzWJ5uBreZgWz17XbqSPIpRoCWlAxdMV_d3cedWCD1nDmiLXuSYtg4FzuZn$>}  |  4 +-
>  14 files changed, 37 insertions(+), 120 deletions(-)
>  delete mode 100644 meta-networking/recipes-protocols/net-snmp/net-snmp/0001-snmpd-always-exit-after-displaying-usage.patch
>  delete mode 100644 meta-networking/recipes-protocols/net-snmp/net-snmp/0002-configure-fix-a-cc-check-issue.patch
>  rename meta-networking/recipes-protocols/net-snmp/{net-snmp_5.9.1.bb<https://urldefense.com/v3/__http:/net-snmp_5.9.1.bb__;!!AjveYdw8EvQ!ZzYDx7kFVh5e_WREHKtwOKlB0gzWJ5uBreZgWz17XbqSPIpRoCWlAxdMV_d3cedWCD1nDmiLXuSYtgJfttSA$> => net-snmp_5.9.3.bb<https://urldefense.com/v3/__http:/net-snmp_5.9.3.bb__;!!AjveYdw8EvQ!ZzYDx7kFVh5e_WREHKtwOKlB0gzWJ5uBreZgWz17XbqSPIpRoCWlAxdMV_d3cedWCD1nDmiLXuSYtg4FzuZn$>} (98%)
>
> diff --git a/meta-networking/recipes-protocols/net-snmp/net-snmp/0001-ac_add_search_path.m4-keep-consistent-between-32bit.patch b/meta-networking/recipes-protocols/net-snmp/net-snmp/0001-ac_add_search_path.m4-keep-consistent-between-32bit.patch
> index 4cd729044..ed2ebc6d7 100644
> --- a/meta-networking/recipes-protocols/net-snmp/net-snmp/0001-ac_add_search_path.m4-keep-consistent-between-32bit.patch
> +++ b/meta-networking/recipes-protocols/net-snmp/net-snmp/0001-ac_add_search_path.m4-keep-consistent-between-32bit.patch
> @@ -1,7 +1,8 @@
> -From 6f8ea2e841ad45eed193310b599d3f3b410ae91d Mon Sep 17 00:00:00 2001
> +From 98c62e24fdd05d7e8bd8149840bad8eb0feb3fb1 Mon Sep 17 00:00:00 2001
>  From: Mingli Yu <mingli.yu@windriver.com<mailto:mingli.yu@windriver.com>>
>  Date: Fri, 29 Jan 2021 08:49:15 +0000
> -Subject: [PATCH] ac_add_search_path.m4: keep consistent between 32bit and 64bit
> +Subject: [PATCH] ac_add_search_path.m4: keep consistent between 32bit and
> + 64bit
>
>  With configure option "--with-openssl=${STAGING_EXECPREFIXDIR}", it behaves
>  differently between 32bit and 64bit system as the openssl lib resides under
> @@ -15,12 +16,13 @@ So add the patch to fix the gap between 32bit and 64bit system.
>  Upstream-Status: Inappropriate [configuration specific]
>
>  Signed-off-by: Mingli Yu <mingli.yu@windriver.com<mailto:mingli.yu@windriver.com>>
> +
>  ---
>   m4/ac_add_search_path.m4 | 4 ++--
>   1 file changed, 2 insertions(+), 2 deletions(-)
>
>  diff --git a/m4/ac_add_search_path.m4 b/m4/ac_add_search_path.m4
> -index 8e0a819..961f587 100644
> +index 8e0a819..e9585bc 100644
>  --- a/m4/ac_add_search_path.m4
>  +++ b/m4/ac_add_search_path.m4
>  @@ -3,8 +3,8 @@ dnl Add a search path to the LIBS and CPPFLAGS variables
> diff --git a/meta-networking/recipes-protocols/net-snmp/net-snmp/0001-config_os_headers-Error-Fix.patch b/meta-networking/recipes-protocols/net-snmp/net-snmp/0001-config_os_headers-Error-Fix.patch
> index 05a47f61c..f8a52a63f 100644
> --- a/meta-networking/recipes-protocols/net-snmp/net-snmp/0001-config_os_headers-Error-Fix.patch
> +++ b/meta-networking/recipes-protocols/net-snmp/net-snmp/0001-config_os_headers-Error-Fix.patch
> @@ -1,4 +1,4 @@
> -From 69d4c517c07f55c505090e48d96ace8cd599fb26 Mon Sep 17 00:00:00 2001
> +From e86d5fd52f19b85da0b7cce660c6e65ec4c0f9bb Mon Sep 17 00:00:00 2001
>  From: Li xin <lixin.fnst@cn.fujitsu.com<mailto:lixin.fnst@cn.fujitsu.com>>
>  Date: Fri, 21 Aug 2015 18:23:13 +0900
>  Subject: [PATCH] config_os_headers: Error Fix
> @@ -19,7 +19,7 @@ Signed-off-by: Li Xin <lixin.fnst@cn.fujitsu.com<mailto:lixin.fnst@cn.fujitsu.com>>
>   1 file changed, 2 insertions(+), 2 deletions(-)
>
>  diff --git a/configure.d/config_os_headers b/configure.d/config_os_headers
> -index f07d512..2363b42 100644
> +index 01c3376..6edd85f 100644
>  --- a/configure.d/config_os_headers
>  +++ b/configure.d/config_os_headers
>  @@ -395,8 +395,8 @@ then
> diff --git a/meta-networking/recipes-protocols/net-snmp/net-snmp/0001-get_pid_from_inode-Include-limit.h.patch b/meta-networking/recipes-protocols/net-snmp/net-snmp/0001-get_pid_from_inode-Include-limit.h.patch
> index 22e591556..a7881a871 100644
> --- a/meta-networking/recipes-protocols/net-snmp/net-snmp/0001-get_pid_from_inode-Include-limit.h.patch
> +++ b/meta-networking/recipes-protocols/net-snmp/net-snmp/0001-get_pid_from_inode-Include-limit.h.patch
> @@ -1,4 +1,4 @@
> -From 2bf1bbe1d428ed06d57aa76b03e394b72ff2216d Mon Sep 17 00:00:00 2001
> +From 8097734b27fd146f358a4edd0d1a0d28309bd9a4 Mon Sep 17 00:00:00 2001
>  From: Khem Raj <raj.khem@gmail.com<mailto:raj.khem@gmail.com>>
>  Date: Fri, 22 Jul 2016 18:34:39 +0000
>  Subject: [PATCH] get_pid_from_inode: Include limit.h
> @@ -14,7 +14,7 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com<mailto:raj.khem@gmail.com>>
>   1 file changed, 1 insertion(+)
>
>  diff --git a/agent/mibgroup/util_funcs/get_pid_from_inode.c b/agent/mibgroup/util_funcs/get_pid_from_inode.c
> -index aee907d..7abaec2 100644
> +index 5788e1d..ea380a6 100644
>  --- a/agent/mibgroup/util_funcs/get_pid_from_inode.c
>  +++ b/agent/mibgroup/util_funcs/get_pid_from_inode.c
>  @@ -6,6 +6,7 @@
> @@ -23,5 +23,5 @@ index aee907d..7abaec2 100644
>   #include <ctype.h>
>  +#include <limits.h>
>   #include <stdio.h>
> - #if HAVE_STDLIB_H
> + #ifdef HAVE_STDLIB_H
>   #include <stdlib.h>
> diff --git a/meta-networking/recipes-protocols/net-snmp/net-snmp/0001-snmpd-always-exit-after-displaying-usage.patch b/meta-networking/recipes-protocols/net-snmp/net-snmp/0001-snmpd-always-exit-after-displaying-usage.patch
> deleted file mode 100644
> index 4fc9e54b4..000000000
> --- a/meta-networking/recipes-protocols/net-snmp/net-snmp/0001-snmpd-always-exit-after-displaying-usage.patch
> +++ /dev/null
> @@ -1,55 +0,0 @@
> -From 94ca941e06bef157bf0e13251f8ca1471daa9393 Mon Sep 17 00:00:00 2001
> -From: Kaarle Ritvanen <kaarle.ritvanen@datakunkku.fi<mailto: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.
> -
> -Upstream-Status: Backport
> -[https://github.com/net-snmp/net-snmp/commit/94ca941e06bef157bf0e13251f8ca1471daa9393<https://urldefense.com/v3/__https:/github.com/net-snmp/net-snmp/commit/94ca941e06bef157bf0e13251f8ca1471daa9393__;!!AjveYdw8EvQ!ZzYDx7kFVh5e_WREHKtwOKlB0gzWJ5uBreZgWz17XbqSPIpRoCWlAxdMV_d3cedWCD1nDmiLXuSYtoLiNbMZ$>]
> -
> -Signed-off-by: Yi Zhao <yi.zhao@windriver.com<mailto:yi.zhao@windriver.com>>
> ----
> - 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.25.1
> -
> diff --git a/meta-networking/recipes-protocols/net-snmp/net-snmp/0001-snmplib-keytools.c-Don-t-check-for-return-from-EVP_M.patch b/meta-networking/recipes-protocols/net-snmp/net-snmp/0001-snmplib-keytools.c-Don-t-check-for-return-from-EVP_M.patch
> index 42352a6b0..af6334f72 100644
> --- a/meta-networking/recipes-protocols/net-snmp/net-snmp/0001-snmplib-keytools.c-Don-t-check-for-return-from-EVP_M.patch
> +++ b/meta-networking/recipes-protocols/net-snmp/net-snmp/0001-snmplib-keytools.c-Don-t-check-for-return-from-EVP_M.patch
> @@ -1,4 +1,4 @@
> -From f3ff99736b8cccbba77349b0d10a3cee366a4c87 Mon Sep 17 00:00:00 2001
> +From f4e1acd4f509dd26cf88da872bd5adcf884f4a5f Mon Sep 17 00:00:00 2001
>  From: Khem Raj <raj.khem@gmail.com<mailto:raj.khem@gmail.com>>
>  Date: Fri, 18 Sep 2015 00:28:45 -0400
>  Subject: [PATCH] snmplib/keytools.c: Don't check for return from
> @@ -17,7 +17,7 @@ Signed-off-by: Ovidiu Panait <ovidiu.panait@windriver.com<mailto:ovidiu.panait@windriver.com>>
>   1 file changed, 1 insertion(+), 4 deletions(-)
>
>  diff --git a/snmplib/keytools.c b/snmplib/keytools.c
> -index 129a7c0..2fc1efc 100644
> +index 14a452a..fb1694b 100644
>  --- a/snmplib/keytools.c
>  +++ b/snmplib/keytools.c
>  @@ -183,10 +183,7 @@ generate_Ku(const oid * hashtype, u_int hashtype_len,
> diff --git a/meta-networking/recipes-protocols/net-snmp/net-snmp/0002-configure-fix-a-cc-check-issue.patch b/meta-networking/recipes-protocols/net-snmp/net-snmp/0002-configure-fix-a-cc-check-issue.patch
> deleted file mode 100644
> index c973bde72..000000000
> --- a/meta-networking/recipes-protocols/net-snmp/net-snmp/0002-configure-fix-a-cc-check-issue.patch
> +++ /dev/null
> @@ -1,28 +0,0 @@
> -From 0a02ac779c51a2b4af3b58cb96967bf3eff80367 Mon Sep 17 00:00:00 2001
> -From: Wenlin Kang <wenlin.kang@windriver.com<mailto:wenlin.kang@windriver.com>>
> -Date: Wed, 24 May 2017 16:45:34 +0800
> -Subject: [PATCH] configure: fix a cc check issue.
> -
> -When has "." in cc value, the expression
> -$myperl -V:cc | $myperl -n -e 'print if (s/^\s*cc=.([-=\w\s\/]+).;\s*/$1/);'
> -can't get corretly the cc's value.
> -
> -Signed-off-by: Wenlin Kang <wenlin.kang@windriver.com<mailto:wenlin.kang@windriver.com>>
> -
> ----
> - configure.d/config_project_perl_python | 2 +-
> - 1 file changed, 1 insertion(+), 1 deletion(-)
> -
> -diff --git a/configure.d/config_project_perl_python b/configure.d/config_project_perl_python
> -index 475c843..22d2ad3 100644
> ---- a/configure.d/config_project_perl_python
> -+++ b/configure.d/config_project_perl_python
> -@@ -87,7 +87,7 @@ if test "x$install_perl" != "xno" ; then
> -     if test "x$enable_perl_cc_checks" != "xno" ; then
> -         AC_MSG_CHECKING([for Perl cc])
> -         changequote(, )
> --        PERLCC=`$myperl -V:cc | $myperl -n -e 'print if (s/^\s*cc=.([-=\w\s\/]+).;\s*/$1/);'`
> -+        PERLCC=`$myperl -V:cc | $myperl -n -e 'print if (s/^\s*cc=.([-=\.\w\s\/]+).;\s*/$1/);'`
> -         changequote([, ])
> -         if test "x$PERLCC" != "x" ; then
> -             AC_MSG_RESULT([$PERLCC])
> diff --git a/meta-networking/recipes-protocols/net-snmp/net-snmp/0004-configure-fix-incorrect-variable.patch b/meta-networking/recipes-protocols/net-snmp/net-snmp/0004-configure-fix-incorrect-variable.patch
> index bfddc63dd..6e224188a 100644
> --- a/meta-networking/recipes-protocols/net-snmp/net-snmp/0004-configure-fix-incorrect-variable.patch
> +++ b/meta-networking/recipes-protocols/net-snmp/net-snmp/0004-configure-fix-incorrect-variable.patch
> @@ -1,4 +1,4 @@
> -From 011bdcd07f2a289d0cfc1b411c03c0cc7c42dad1 Mon Sep 17 00:00:00 2001
> +From 6d655ba677563ac9d62d4d8eee59fdb39d486c02 Mon Sep 17 00:00:00 2001
>  From: Wenlin Kang <wenlin.kang@windriver.com<mailto:wenlin.kang@windriver.com>>
>  Date: Wed, 24 May 2017 17:10:20 +0800
>  Subject: [PATCH] configure: fix incorrect variable
> @@ -14,10 +14,10 @@ Signed-off-by: Wenlin Kang <wenlin.kang@windriver.com<mailto:wenlin.kang@windriver.com>>
>   1 file changed, 1 insertion(+), 1 deletion(-)
>
>  diff --git a/Makefile.in<https://urldefense.com/v3/__http:/Makefile.in__;!!AjveYdw8EvQ!ZzYDx7kFVh5e_WREHKtwOKlB0gzWJ5uBreZgWz17XbqSPIpRoCWlAxdMV_d3cedWCD1nDmiLXuSYtsi07kql$> b/Makefile.in<https://urldefense.com/v3/__http:/Makefile.in__;!!AjveYdw8EvQ!ZzYDx7kFVh5e_WREHKtwOKlB0gzWJ5uBreZgWz17XbqSPIpRoCWlAxdMV_d3cedWCD1nDmiLXuSYtsi07kql$>
> -index 912f6b2..a53d1b2 100644
> +index f1cbbf5..1545be3 100644
>  --- a/Makefile.in<https://urldefense.com/v3/__http:/Makefile.in__;!!AjveYdw8EvQ!ZzYDx7kFVh5e_WREHKtwOKlB0gzWJ5uBreZgWz17XbqSPIpRoCWlAxdMV_d3cedWCD1nDmiLXuSYtsi07kql$>
>  +++ b/Makefile.in<https://urldefense.com/v3/__http:/Makefile.in__;!!AjveYdw8EvQ!ZzYDx7kFVh5e_WREHKtwOKlB0gzWJ5uBreZgWz17XbqSPIpRoCWlAxdMV_d3cedWCD1nDmiLXuSYtsi07kql$>
> -@@ -174,7 +174,7 @@ OTHERCLEANTODOS=perlclean @PYTHONCLEANTARGS@ cleanfeatures perlcleanfeatures pyt
> +@@ -173,7 +173,7 @@ OTHERCLEANTODOS=perlclean @PYTHONCLEANTARGS@ cleanfeatures perlcleanfeatures pyt
>   #
>   # override LD_RUN_PATH to avoid dependencies on the build directory
>   perlmodules: perlmakefiles subdirs
> diff --git a/meta-networking/recipes-protocols/net-snmp/net-snmp/fix-libtool-finish.patch b/meta-networking/recipes-protocols/net-snmp/net-snmp/fix-libtool-finish.patch
> index 26dd014ce..409c1e03c 100644
> --- a/meta-networking/recipes-protocols/net-snmp/net-snmp/fix-libtool-finish.patch
> +++ b/meta-networking/recipes-protocols/net-snmp/net-snmp/fix-libtool-finish.patch
> @@ -1,4 +1,4 @@
> -From 27444fbf8323679ea0551a3bd5f04c365143d8c0 Mon Sep 17 00:00:00 2001
> +From ab1d77c52e84746e75506a2870783806bc77f396 Mon Sep 17 00:00:00 2001
>  From: "Roy.Li" <rongqing.li@windriver.com<mailto:rongqing.li@windriver.com>>
>  Date: Fri, 16 Jan 2015 14:14:01 +0800
>  Subject: [PATCH] net-snmp: fix "libtool --finish"
> @@ -20,11 +20,11 @@ Signed-off-by: Roy.Li<https://urldefense.com/v3/__http:/Roy.Li__;!!AjveYdw8EvQ!ZzYDx7kFVh5e_WREHKtwOKlB0gzWJ5uBreZgWz17XbqSPIpRoCWlAxdMV_d3cedWCD1nDmiLXuSYttQgWTFr$> <rongqing.li@windriver.com<mailto:rongqing.li@windriver.com>>
>   1 file changed, 1 insertion(+), 1 deletion(-)
>
>  diff --git a/Makefile.top<https://urldefense.com/v3/__http:/Makefile.top__;!!AjveYdw8EvQ!ZzYDx7kFVh5e_WREHKtwOKlB0gzWJ5uBreZgWz17XbqSPIpRoCWlAxdMV_d3cedWCD1nDmiLXuSYticrioNt$> b/Makefile.top<https://urldefense.com/v3/__http:/Makefile.top__;!!AjveYdw8EvQ!ZzYDx7kFVh5e_WREHKtwOKlB0gzWJ5uBreZgWz17XbqSPIpRoCWlAxdMV_d3cedWCD1nDmiLXuSYticrioNt$>
> -index 6315401..fc0ee06 100644
> +index a962c54..1ba5607 100644
>  --- a/Makefile.top<https://urldefense.com/v3/__http:/Makefile.top__;!!AjveYdw8EvQ!ZzYDx7kFVh5e_WREHKtwOKlB0gzWJ5uBreZgWz17XbqSPIpRoCWlAxdMV_d3cedWCD1nDmiLXuSYticrioNt$>
>  +++ b/Makefile.top<https://urldefense.com/v3/__http:/Makefile.top__;!!AjveYdw8EvQ!ZzYDx7kFVh5e_WREHKtwOKlB0gzWJ5uBreZgWz17XbqSPIpRoCWlAxdMV_d3cedWCD1nDmiLXuSYticrioNt$>
>  @@ -89,7 +89,7 @@ LIBREVISION = 0
> - 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) -version-info $(LIBCURRENT):$(LIBREVISION):$(LIBAGE) @LD_NO_UNDEFINED@ -o
>   LIB_EXTENSION   = la
>   LIB_VERSION     =
>  -LIB_LDCONFIG_CMD = $(LIBTOOL) --mode=finish $(INSTALL_PREFIX)$(libdir)
> diff --git a/meta-networking/recipes-protocols/net-snmp/net-snmp/net-snmp-5.7.2-fix-engineBoots-value-on-SIGHUP.patch b/meta-networking/recipes-protocols/net-snmp/net-snmp/net-snmp-5.7.2-fix-engineBoots-value-on-SIGHUP.patch
> index 022eb958f..87f192e5b 100644
> --- a/meta-networking/recipes-protocols/net-snmp/net-snmp/net-snmp-5.7.2-fix-engineBoots-value-on-SIGHUP.patch
> +++ b/meta-networking/recipes-protocols/net-snmp/net-snmp/net-snmp-5.7.2-fix-engineBoots-value-on-SIGHUP.patch
> @@ -1,4 +1,4 @@
> -From 1e3178835217ba89aa355e2b6b88e490f17be16d Mon Sep 17 00:00:00 2001
> +From 5ad4eab43c1ea63ff343bba64d576440e8783e75 Mon Sep 17 00:00:00 2001
>  From: Zheng Ruoqin <zhengrq.fnst@fujitsu.com<mailto:zhengrq.fnst@fujitsu.com>>
>  Date: Wed, 9 Jun 2021 15:47:30 +0900
>  Subject: [PATCH] net snmp: fix engineBoots value on SIGHUP
> @@ -7,6 +7,7 @@ Upstream-Status: Pending
>
>  Signed-off-by: Marian Florea <marian.florea@windriver.com<mailto:marian.florea@windriver.com>>
>  Signed-off-by: Li Zhou <li.zhou@windriver.com<mailto:li.zhou@windriver.com>>
> +Signed-off-by: Ovidiu Panait <ovidiu.panait@windriver.com<mailto:ovidiu.panait@windriver.com>>
>
>  ---
>   agent/snmpd.c    | 1 +
> @@ -14,19 +15,18 @@ Signed-off-by: Li Zhou <li.zhou@windriver.com<mailto:li.zhou@windriver.com>>
>   2 files changed, 3 insertions(+), 2 deletions(-)
>
>  diff --git a/agent/snmpd.c b/agent/snmpd.c
> -index 1af439f..355b510 100644
> +index 90de12d..1ccc4db 100644
>  --- a/agent/snmpd.c
>  +++ b/agent/snmpd.c
> -@@ -1208,6 +1208,7 @@ receive(void)
> -           snmp_log(LOG_INFO, "NET-SNMP version %s restarted\n",
> -                    netsnmp_get_version());
> -             update_config();
> -+          snmp_store(app_name);
> -             send_easy_trap(SNMP_TRAP_ENTERPRISESPECIFIC, 3);
> - #if HAVE_SIGPROCMASK
> -             ret = sigprocmask(SIG_UNBLOCK, &set, NULL);
> +     snmp_log(LOG_INFO, "NET-SNMP version %s restarted\n",
> +              netsnmp_get_version());
> +     update_config();
> ++    snmp_store(app_name);
> +     send_easy_trap(SNMP_TRAP_ENTERPRISESPECIFIC, 3);
> + #ifdef HAVE_SIGPROCMASK
> +     ret = sigprocmask(SIG_UNBLOCK, &set, NULL);
>  diff --git a/snmplib/snmpv3.c b/snmplib/snmpv3.c
> -index 29c2a0f..ada961c 100644
> +index 7b1746b..4a17e0d 100644
>  --- a/snmplib/snmpv3.c
>  +++ b/snmplib/snmpv3.c
>  @@ -1059,9 +1059,9 @@ init_snmpv3_post_config(int majorid, int minorid, void *serverarg,
> diff --git a/meta-networking/recipes-protocols/net-snmp/net-snmp/net-snmp-add-knob-whether-nlist.h-are-checked.patch b/meta-networking/recipes-protocols/net-snmp/net-snmp/net-snmp-add-knob-whether-nlist.h-are-checked.patch
> index f1ebe2bb6..c5a453abe 100644
> --- a/meta-networking/recipes-protocols/net-snmp/net-snmp/net-snmp-add-knob-whether-nlist.h-are-checked.patch
> +++ b/meta-networking/recipes-protocols/net-snmp/net-snmp/net-snmp-add-knob-whether-nlist.h-are-checked.patch
> @@ -1,4 +1,4 @@
> -From e507dcf8b29c55011f85d88bf05400d4717e4074 Mon Sep 17 00:00:00 2001
> +From ad65b106d3cb3c6e595381be1c45a73c1ef6eb5e Mon Sep 17 00:00:00 2001
>  From: Chong Lu <Chong.Lu@windriver.com<mailto:Chong.Lu@windriver.com>>
>  Date: Thu, 28 May 2020 09:46:34 -0500
>  Subject: [PATCH] net-snmp: add knob whether nlist.h are checked
> @@ -15,7 +15,7 @@ Signed-off-by: Chong Lu <Chong.Lu@windriver.com<mailto:Chong.Lu@windriver.com>>
>   1 file changed, 2 insertions(+)
>
>  diff --git a/configure.d/config_os_headers b/configure.d/config_os_headers
> -index 76ef58a..f07d512 100644
> +index b9c8c31..01c3376 100644
>  --- a/configure.d/config_os_headers
>  +++ b/configure.d/config_os_headers
>  @@ -37,6 +37,7 @@ AC_CHECK_HEADERS([getopt.h   pthread.h  regex.h      ] dnl
> diff --git a/meta-networking/recipes-protocols/net-snmp/net-snmp/net-snmp-fix-for-disable-des.patch b/meta-networking/recipes-protocols/net-snmp/net-snmp/net-snmp-fix-for-disable-des.patch
> index 2941a3609..c382c02d8 100644
> --- a/meta-networking/recipes-protocols/net-snmp/net-snmp/net-snmp-fix-for-disable-des.patch
> +++ b/meta-networking/recipes-protocols/net-snmp/net-snmp/net-snmp-fix-for-disable-des.patch
> @@ -1,4 +1,4 @@
> -From 3ca4335ec1d6b7b384c134fc85d7a9e513c68376 Mon Sep 17 00:00:00 2001
> +From b1b9980853b1083f0c8b9f628f8b4c3a484d4f91 Mon Sep 17 00:00:00 2001
>  From: Jackie Huang <jackie.huang@windriver.com<mailto:jackie.huang@windriver.com>>
>  Date: Thu, 22 Jun 2017 10:25:08 +0800
>  Subject: [PATCH] net-snmp: fix for --disable-des
> @@ -15,7 +15,7 @@ Signed-off-by: Jackie Huang <jackie.huang@windriver.com<mailto:jackie.huang@windriver.com>>
>   1 file changed, 2 insertions(+)
>
>  diff --git a/snmplib/scapi.c b/snmplib/scapi.c
> -index 00c9174..c6875e1 100644
> +index 54fdd5c..0f7e931 100644
>  --- a/snmplib/scapi.c
>  +++ b/snmplib/scapi.c
>  @@ -85,7 +85,9 @@ netsnmp_feature_child_of(usm_scapi, usm_support);
> diff --git a/meta-networking/recipes-protocols/net-snmp/net-snmp/net-snmp-testing-add-the-output-format-for-ptest.patch b/meta-networking/recipes-protocols/net-snmp/net-snmp/net-snmp-testing-add-the-output-format-for-ptest.patch
> index 807983f61..09ca532a7 100644
> --- a/meta-networking/recipes-protocols/net-snmp/net-snmp/net-snmp-testing-add-the-output-format-for-ptest.patch
> +++ b/meta-networking/recipes-protocols/net-snmp/net-snmp/net-snmp-testing-add-the-output-format-for-ptest.patch
> @@ -1,4 +1,4 @@
> -From 972df16e9599dffddf5d714a4cbf43008c771122 Mon Sep 17 00:00:00 2001
> +From 36a5656db7ea75dd15f35a6c1728937c6e2b901c Mon Sep 17 00:00:00 2001
>  From: Jackie Huang <jackie.huang@windriver.com<mailto:jackie.huang@windriver.com>>
>  Date: Wed, 14 Jan 2015 15:10:06 +0800
>  Subject: [PATCH] testing: add the output format for ptest
> diff --git a/meta-networking/recipes-protocols/net-snmp/net-snmp/reproducibility-have-printcap.patch b/meta-networking/recipes-protocols/net-snmp/net-snmp/reproducibility-have-printcap.patch
> index bf1e7bedf..c0b51c51e 100644
> --- a/meta-networking/recipes-protocols/net-snmp/net-snmp/reproducibility-have-printcap.patch
> +++ b/meta-networking/recipes-protocols/net-snmp/net-snmp/reproducibility-have-printcap.patch
> @@ -1,4 +1,4 @@
> -From 84e362fe97f50fbad69f083bc2d8fe18f83eb2f7 Mon Sep 17 00:00:00 2001
> +From b923cd38e2503b86aedf66b767fd7f51c9f25645 Mon Sep 17 00:00:00 2001
>  From: "douglas.royds" <douglas.royds@taitradio.com<mailto:douglas.royds@taitradio.com>>
>  Date: Wed, 21 Nov 2018 13:52:18 +1300
>  Subject: [PATCH] net-snmp: Reproducibility: Don't check build host for
> @@ -13,7 +13,7 @@ set in the environment to "yes" or "no" as appropriate for the target platform.
>   1 file changed, 2 insertions(+), 2 deletions(-)
>
>  diff --git a/configure.d/config_os_misc4 b/configure.d/config_os_misc4
> -index 6f23c8e..8cea75a 100644
> +index b6864d9..07ca922 100644
>  --- a/configure.d/config_os_misc4
>  +++ b/configure.d/config_os_misc4
>  @@ -99,9 +99,9 @@ if test x$LPSTAT_PATH != x; then
> diff --git a/meta-networking/recipes-protocols/net-snmp/net-snmp_5.9.1.bb<https://urldefense.com/v3/__http:/net-snmp_5.9.1.bb__;!!AjveYdw8EvQ!ZzYDx7kFVh5e_WREHKtwOKlB0gzWJ5uBreZgWz17XbqSPIpRoCWlAxdMV_d3cedWCD1nDmiLXuSYtgJfttSA$> b/meta-networking/recipes-protocols/net-snmp/net-snmp_5.9.3.bb<https://urldefense.com/v3/__http:/net-snmp_5.9.3.bb__;!!AjveYdw8EvQ!ZzYDx7kFVh5e_WREHKtwOKlB0gzWJ5uBreZgWz17XbqSPIpRoCWlAxdMV_d3cedWCD1nDmiLXuSYtg4FzuZn$>
> similarity index 98%
> rename from meta-networking/recipes-protocols/net-snmp/net-snmp_5.9.1.bb<https://urldefense.com/v3/__http:/net-snmp_5.9.1.bb__;!!AjveYdw8EvQ!ZzYDx7kFVh5e_WREHKtwOKlB0gzWJ5uBreZgWz17XbqSPIpRoCWlAxdMV_d3cedWCD1nDmiLXuSYtgJfttSA$>
> rename to meta-networking/recipes-protocols/net-snmp/net-snmp_5.9.3.bb<https://urldefense.com/v3/__http:/net-snmp_5.9.3.bb__;!!AjveYdw8EvQ!ZzYDx7kFVh5e_WREHKtwOKlB0gzWJ5uBreZgWz17XbqSPIpRoCWlAxdMV_d3cedWCD1nDmiLXuSYtg4FzuZn$>
> index 30c0ce74c..7af514756 100644
> --- a/meta-networking/recipes-protocols/net-snmp/net-snmp_5.9.1.bb<https://urldefense.com/v3/__http:/net-snmp_5.9.1.bb__;!!AjveYdw8EvQ!ZzYDx7kFVh5e_WREHKtwOKlB0gzWJ5uBreZgWz17XbqSPIpRoCWlAxdMV_d3cedWCD1nDmiLXuSYtgJfttSA$>
> +++ b/meta-networking/recipes-protocols/net-snmp/net-snmp_5.9.3.bb<https://urldefense.com/v3/__http:/net-snmp_5.9.3.bb__;!!AjveYdw8EvQ!ZzYDx7kFVh5e_WREHKtwOKlB0gzWJ5uBreZgWz17XbqSPIpRoCWlAxdMV_d3cedWCD1nDmiLXuSYtg4FzuZn$>
> @@ -21,15 +21,13 @@ SRC_URI = "${SOURCEFORGE_MIRROR}/net-snmp/net-snmp-${PV}.tar.gz \
>             file://0001-config_os_headers-Error-Fix.patch \
>             file://0001-snmplib-keytools.c-Don-t-check-for-return-from-EVP_M.patch \
>             file://0001-get_pid_from_inode-Include-limit.h.patch \
> -           file://0002-configure-fix-a-cc-check-issue.patch \
>             file://0004-configure-fix-incorrect-variable.patch \
>             file://net-snmp-5.7.2-fix-engineBoots-value-on-SIGHUP.patch \
>             file://net-snmp-fix-for-disable-des.patch \
>             file://reproducibility-have-printcap.patch \
>             file://0001-ac_add_search_path.m4-keep-consistent-between-32bit.patch \
> -           file://0001-snmpd-always-exit-after-displaying-usage.patch \
>             "
> -SRC_URI[sha256sum] = "eb7fd4a44de6cddbffd9a92a85ad1309e5c1054fb9d5a7dd93079c8953f48c3f"
> +SRC_URI[sha256sum] = "2097f29b7e1bf3f1300b4bae52fa2308d0bb8d5d3998dbe02f9462a413a2ef0a"
>
>  UPSTREAM_CHECK_URI = "https://sourceforge.net/projects/net-snmp/files/net-snmp/<https://urldefense.com/v3/__https:/sourceforge.net/projects/net-snmp/files/net-snmp/__;!!AjveYdw8EvQ!ZzYDx7kFVh5e_WREHKtwOKlB0gzWJ5uBreZgWz17XbqSPIpRoCWlAxdMV_d3cedWCD1nDmiLXuSYttt45kxq$>"
>  UPSTREAM_CHECK_REGEX = "/net-snmp/(?P<pver>\d+(\.\d+)+)/"
> --
> 2.25.1
>
>
> -=-=-=-=-=-=-=-=-=-=-=-
> Links: You receive all messages sent to this group.
> View/Reply Online (#99037): https://lists.openembedded.org/g/openembedded-devel/message/99037<https://urldefense.com/v3/__https:/lists.openembedded.org/g/openembedded-devel/message/99037__;!!AjveYdw8EvQ!ZzYDx7kFVh5e_WREHKtwOKlB0gzWJ5uBreZgWz17XbqSPIpRoCWlAxdMV_d3cedWCD1nDmiLXuSYtnWSrQ1-$>
> Mute This Topic: https://lists.openembedded.org/mt/94085410/1997914<https://urldefense.com/v3/__https:/lists.openembedded.org/mt/94085410/1997914__;!!AjveYdw8EvQ!ZzYDx7kFVh5e_WREHKtwOKlB0gzWJ5uBreZgWz17XbqSPIpRoCWlAxdMV_d3cedWCD1nDmiLXuSYtnZeynhZ$>
> Group Owner: openembedded-devel+owner@lists.openembedded.org<mailto:openembedded-devel%2Bowner@lists.openembedded.org>
> Unsubscribe: https://lists.openembedded.org/g/openembedded-devel/unsub<https://urldefense.com/v3/__https:/lists.openembedded.org/g/openembedded-devel/unsub__;!!AjveYdw8EvQ!ZzYDx7kFVh5e_WREHKtwOKlB0gzWJ5uBreZgWz17XbqSPIpRoCWlAxdMV_d3cedWCD1nDmiLXuSYttC2KpO6$> [raj.khem@gmail.com<mailto:raj.khem@gmail.com>]
> -=-=-=-=-=-=-=-=-=-=-=-
>
nmali Oct. 6, 2022, 8:17 a.m. UTC | #5
Hi Khem Raj,

Please ignore this patch, have sent again fresh patch with “[kirkstone]” in subject.

Best Regards,
Narpat Mali

Sent from Mail<https://go.microsoft.com/fwlink/?LinkId=550986> for Windows

From: Mali, Narpat<mailto:Narpat.Mali@windriver.com>
Sent: 04 October 2022 12:45
To: Khem Raj<mailto:raj.khem@gmail.com>
Cc: G Pillai, Hari<mailto:Hari.GPillai@windriver.com>; Polampalli, Archana<mailto:Archana.Polampalli@windriver.com>; Urade, Yogita<mailto:Yogita.Urade@windriver.com>; openembedded-devel@lists.openembedded.org<mailto:openembedded-devel@lists.openembedded.org>
Subject: RE: [oe] [kirkstone] [PATCH 1/1] net-snmp: upgrade 5.9.1 -> 5.9.3

Hi Khem Raj,

Have added the “[kirkstone]” in subject.
Do I need to send the patch again ?

Best Regards,
Narpat Mali

Sent from Mail<https://go.microsoft.com/fwlink/?LinkId=550986> for Windows

From: Khem Raj<mailto:raj.khem@gmail.com>
Sent: 04 October 2022 01:11
To: Mali, Narpat<mailto:Narpat.Mali@windriver.com>
Cc: G Pillai, Hari<mailto:Hari.GPillai@windriver.com>; Polampalli, Archana<mailto:Archana.Polampalli@windriver.com>; Urade, Yogita<mailto:Yogita.Urade@windriver.com>; openembedded-devel@lists.openembedded.org<mailto:openembedded-devel@lists.openembedded.org>
Subject: Re: [oe] [meta-openembedded][PATCH 1/1] net-snmp: upgrade 5.9.1 -> 5.9.3

[Please note: This e-mail is from an EXTERNAL e-mail address]
Ok it will be good to add [kirkstone] in subject
So folks know where intend it for

On Mon, Oct 3, 2022 at 10:12 AM Mali, Narpat <Narpat.Mali@windriver.com<mailto:Narpat.Mali@windriver.com>> wrote:
Hi Khem Raj,

It is the same commit but, we need this patch commit for “kirkstone” branch of meta-openembedded.
We observed that the “master” branch has “net-snmp 5.9.3” version at https://git.openembedded.org/meta-openembedded/tree/meta-networking/recipes-protocols/net-snmp<https://urldefense.com/v3/__https:/git.openembedded.org/meta-openembedded/tree/meta-networking/recipes-protocols/net-snmp__;!!AjveYdw8EvQ!ZzYDx7kFVh5e_WREHKtwOKlB0gzWJ5uBreZgWz17XbqSPIpRoCWlAxdMV_d3cedWCD1nDmiLXuSYtigk1r7C$> and the “kirkstone” branch has “net-snmp 5.9.1” at https://git.openembedded.org/meta-openembedded/tree/meta-networking/recipes-protocols/net-snmp?h=kirkstone<https://urldefense.com/v3/__https:/git.openembedded.org/meta-openembedded/tree/meta-networking/recipes-protocols/net-snmp?h=kirkstone__;!!AjveYdw8EvQ!ZzYDx7kFVh5e_WREHKtwOKlB0gzWJ5uBreZgWz17XbqSPIpRoCWlAxdMV_d3cedWCD1nDmiLXuSYtnBwmXJ0$>

Since, our product is using “kirkstone” branch of meta-openembedded so, CVE-2022-24805 to CVE-2022-24810 are vulnerable for our product.
Could you please let us know, How to get net-snmp upgraded to 5.9.3 version in “kirkstone” branch ?

Best Regards,
Narpat Mali

Sent from Mail<https://urldefense.com/v3/__https:/go.microsoft.com/fwlink/?LinkId=550986__;!!AjveYdw8EvQ!ZzYDx7kFVh5e_WREHKtwOKlB0gzWJ5uBreZgWz17XbqSPIpRoCWlAxdMV_d3cedWCD1nDmiLXuSYtrYRmqeF$> for Windows


From: Khem Raj <raj.khem@gmail.com<mailto:raj.khem@gmail.com>>
Sent: Monday, October 3, 2022 12:29:18 PM
To: Mali, Narpat <Narpat.Mali@windriver.com<mailto:Narpat.Mali@windriver.com>>
Cc: openembedded-devel@lists.openembedded.org<mailto:openembedded-devel@lists.openembedded.org> <openembedded-devel@lists.openembedded.org<mailto:openembedded-devel@lists.openembedded.org>>; Polampalli, Archana <Archana.Polampalli@windriver.com<mailto:Archana.Polampalli@windriver.com>>; Urade, Yogita <Yogita.Urade@windriver.com<mailto:Yogita.Urade@windriver.com>>; G Pillai, Hari <Hari.GPillai@windriver.com<mailto:Hari.GPillai@windriver.com>>
Subject: Re: [oe] [meta-openembedded][PATCH 1/1] net-snmp: upgrade 5.9.1 -> 5.9.3

[Please note: This e-mail is from an EXTERNAL e-mail address]


how different is this from
https://git.openembedded.org/meta-openembedded/commit/?id=bf4a826c7de51dcdac87f81fa2bd2301629d50db<https://urldefense.com/v3/__https:/git.openembedded.org/meta-openembedded/commit/?id=bf4a826c7de51dcdac87f81fa2bd2301629d50db__;!!AjveYdw8EvQ!ZzYDx7kFVh5e_WREHKtwOKlB0gzWJ5uBreZgWz17XbqSPIpRoCWlAxdMV_d3cedWCD1nDmiLXuSYtpcGLzXP$>

On Sun, Oct 2, 2022 at 11:27 PM Narpat Mali <narpat.mali@windriver.com<mailto:narpat.mali@windriver.com>> wrote:
>
> Issue: LIN1022-1131, LIN1022-1132, LIN1022-1133, LIN1022-1134, LIN1022-1135
> Issue: LIN1022-1136
>
> Upgrade summary:
> ----------------
> - drop 0002-configure-fix-a-cc-check-issue.patch, as it was replaced with
>   upstream commit https://github.com/net-snmp/net-snmp/commit/dbb49acfa2af<https://urldefense.com/v3/__https:/github.com/net-snmp/net-snmp/commit/dbb49acfa2af__;!!AjveYdw8EvQ!ZzYDx7kFVh5e_WREHKtwOKlB0gzWJ5uBreZgWz17XbqSPIpRoCWlAxdMV_d3cedWCD1nDmiLXuSYtoZJYKse$>
> - drop 0001-snmpd-always-exit-after-displaying-usage.patch backport
> - rebase net-snmp-5.7.2-fix-engineBoots-value-on-SIGHUP.patch manually
> - refresh patches with devtool to get rid of fuzz
>
> Changelog:
> ----------
> *5.9.3*:
> security:
>   - These two CVEs can be exploited by a user with read-only credentials:
>       - CVE-2022-24805 A buffer overflow in the handling of the INDEX of
>         NET-SNMP-VACM-MIB can cause an out-of-bounds memory access.
>       - CVE-2022-24809 A malformed OID in a GET-NEXT to the nsVacmAccessTable
>         can cause a NULL pointer dereference.
>   - These CVEs can be exploited by a user with read-write credentials:
>       - CVE-2022-24806 Improper Input Validation when SETing malformed
>         OIDs in master agent and subagent simultaneously
>       - CVE-2022-24807 A malformed OID in a SET request to
>         SNMP-VIEW-BASED-ACM-MIB::vacmAccessTable can cause an
>         out-of-bounds memory access.
>       - CVE-2022-24808 A malformed OID in a SET request to
>         NET-SNMP-AGENT-MIB::nsLogTable can cause a NULL pointer dereference
>       - CVE-2022-24810 A malformed OID in a SET to the nsVacmAccessTable
>         can cause a NULL pointer dereference.
>   - To avoid these flaws, use strong SNMPv3 credentials and do not share them.
>     If you must use SNMPv1 or SNMPv2c, use a complex community string
>     and enhance the protection by restricting access to a given IP address
>     range.
>   - Thanks are due to Yu Zhang of VARAS@IIE and Nanyu Zhong of VARAS@IIE for
>     reporting the following CVEs that have been fixed in this release, and
>     to Arista Networks for providing fixes.
>
> Windows:
>   - WinExtDLL: Fix multiple compiler warnings
>   - WinExtDLL: Make long strings occupy a single line Make it easier to
>     look up error messages in the source code by making long strings
>     occupy a single source code line.
>   - WinExtDLL: Restore MIB-II support Make winExtDLL work on 64-bit
>     Windows systems") caused snmpd to skip MIB-II on 64-bit systems.
>
> IF-MIB: Update ifTable entries even if the interface name has changed
>     At least on Linux a network interface index may be reused for a
>     network interface with a different name. Hence this patch that
>     enables replacing network interface information even if the network
>     interface name has changed.
>
> unspecified:
>   - Moved transport code into a separate subdirectory in snmplib
>   - Snmplib: remove inline versions of container funcs".
>
> misc:
>   - snmp-create-v3-user: Fix the snmpd.conf path   @datadir@ is
>     expanded in ${datarootdir} so datarootdir must be set before
>     @datadir@ is used.
>
> *5.9.2*:
> skipped due to a last minute library versioning found bug -- use 5.9.3 instead
>
> (master rev: bf4a826c7de51dcdac87f81fa2bd2301629d50db) -- backport
>
> Signed-off-by: Narpat Mali <narpat.mali@windriver.com<mailto:narpat.mali@windriver.com>>
> ---
>  ...ath.m4-keep-consistent-between-32bit.patch |  8 ++-
>  .../0001-config_os_headers-Error-Fix.patch    |  4 +-
>  ...1-get_pid_from_inode-Include-limit.h.patch |  6 +-
>  ...d-always-exit-after-displaying-usage.patch | 55 -------------------
>  ....c-Don-t-check-for-return-from-EVP_M.patch |  4 +-
>  .../0002-configure-fix-a-cc-check-issue.patch | 28 ----------
>  ...004-configure-fix-incorrect-variable.patch |  6 +-
>  .../net-snmp/fix-libtool-finish.patch         |  6 +-
>  ....7.2-fix-engineBoots-value-on-SIGHUP.patch | 22 ++++----
>  ...add-knob-whether-nlist.h-are-checked.patch |  4 +-
>  .../net-snmp-fix-for-disable-des.patch        |  4 +-
>  ...ting-add-the-output-format-for-ptest.patch |  2 +-
>  .../reproducibility-have-printcap.patch       |  4 +-
>  .../{net-snmp_5.9.1.bb<https://urldefense.com/v3/__http:/net-snmp_5.9.1.bb__;!!AjveYdw8EvQ!ZzYDx7kFVh5e_WREHKtwOKlB0gzWJ5uBreZgWz17XbqSPIpRoCWlAxdMV_d3cedWCD1nDmiLXuSYtgJfttSA$> => net-snmp_5.9.3.bb<https://urldefense.com/v3/__http:/net-snmp_5.9.3.bb__;!!AjveYdw8EvQ!ZzYDx7kFVh5e_WREHKtwOKlB0gzWJ5uBreZgWz17XbqSPIpRoCWlAxdMV_d3cedWCD1nDmiLXuSYtg4FzuZn$>}  |  4 +-
>  14 files changed, 37 insertions(+), 120 deletions(-)
>  delete mode 100644 meta-networking/recipes-protocols/net-snmp/net-snmp/0001-snmpd-always-exit-after-displaying-usage.patch
>  delete mode 100644 meta-networking/recipes-protocols/net-snmp/net-snmp/0002-configure-fix-a-cc-check-issue.patch
>  rename meta-networking/recipes-protocols/net-snmp/{net-snmp_5.9.1.bb<https://urldefense.com/v3/__http:/net-snmp_5.9.1.bb__;!!AjveYdw8EvQ!ZzYDx7kFVh5e_WREHKtwOKlB0gzWJ5uBreZgWz17XbqSPIpRoCWlAxdMV_d3cedWCD1nDmiLXuSYtgJfttSA$> => net-snmp_5.9.3.bb<https://urldefense.com/v3/__http:/net-snmp_5.9.3.bb__;!!AjveYdw8EvQ!ZzYDx7kFVh5e_WREHKtwOKlB0gzWJ5uBreZgWz17XbqSPIpRoCWlAxdMV_d3cedWCD1nDmiLXuSYtg4FzuZn$>} (98%)
>
> diff --git a/meta-networking/recipes-protocols/net-snmp/net-snmp/0001-ac_add_search_path.m4-keep-consistent-between-32bit.patch b/meta-networking/recipes-protocols/net-snmp/net-snmp/0001-ac_add_search_path.m4-keep-consistent-between-32bit.patch
> index 4cd729044..ed2ebc6d7 100644
> --- a/meta-networking/recipes-protocols/net-snmp/net-snmp/0001-ac_add_search_path.m4-keep-consistent-between-32bit.patch
> +++ b/meta-networking/recipes-protocols/net-snmp/net-snmp/0001-ac_add_search_path.m4-keep-consistent-between-32bit.patch
> @@ -1,7 +1,8 @@
> -From 6f8ea2e841ad45eed193310b599d3f3b410ae91d Mon Sep 17 00:00:00 2001
> +From 98c62e24fdd05d7e8bd8149840bad8eb0feb3fb1 Mon Sep 17 00:00:00 2001
>  From: Mingli Yu <mingli.yu@windriver.com<mailto:mingli.yu@windriver.com>>
>  Date: Fri, 29 Jan 2021 08:49:15 +0000
> -Subject: [PATCH] ac_add_search_path.m4: keep consistent between 32bit and 64bit
> +Subject: [PATCH] ac_add_search_path.m4: keep consistent between 32bit and
> + 64bit
>
>  With configure option "--with-openssl=${STAGING_EXECPREFIXDIR}", it behaves
>  differently between 32bit and 64bit system as the openssl lib resides under
> @@ -15,12 +16,13 @@ So add the patch to fix the gap between 32bit and 64bit system.
>  Upstream-Status: Inappropriate [configuration specific]
>
>  Signed-off-by: Mingli Yu <mingli.yu@windriver.com<mailto:mingli.yu@windriver.com>>
> +
>  ---
>   m4/ac_add_search_path.m4 | 4 ++--
>   1 file changed, 2 insertions(+), 2 deletions(-)
>
>  diff --git a/m4/ac_add_search_path.m4 b/m4/ac_add_search_path.m4
> -index 8e0a819..961f587 100644
> +index 8e0a819..e9585bc 100644
>  --- a/m4/ac_add_search_path.m4
>  +++ b/m4/ac_add_search_path.m4
>  @@ -3,8 +3,8 @@ dnl Add a search path to the LIBS and CPPFLAGS variables
> diff --git a/meta-networking/recipes-protocols/net-snmp/net-snmp/0001-config_os_headers-Error-Fix.patch b/meta-networking/recipes-protocols/net-snmp/net-snmp/0001-config_os_headers-Error-Fix.patch
> index 05a47f61c..f8a52a63f 100644
> --- a/meta-networking/recipes-protocols/net-snmp/net-snmp/0001-config_os_headers-Error-Fix.patch
> +++ b/meta-networking/recipes-protocols/net-snmp/net-snmp/0001-config_os_headers-Error-Fix.patch
> @@ -1,4 +1,4 @@
> -From 69d4c517c07f55c505090e48d96ace8cd599fb26 Mon Sep 17 00:00:00 2001
> +From e86d5fd52f19b85da0b7cce660c6e65ec4c0f9bb Mon Sep 17 00:00:00 2001
>  From: Li xin <lixin.fnst@cn.fujitsu.com<mailto:lixin.fnst@cn.fujitsu.com>>
>  Date: Fri, 21 Aug 2015 18:23:13 +0900
>  Subject: [PATCH] config_os_headers: Error Fix
> @@ -19,7 +19,7 @@ Signed-off-by: Li Xin <lixin.fnst@cn.fujitsu.com<mailto:lixin.fnst@cn.fujitsu.com>>
>   1 file changed, 2 insertions(+), 2 deletions(-)
>
>  diff --git a/configure.d/config_os_headers b/configure.d/config_os_headers
> -index f07d512..2363b42 100644
> +index 01c3376..6edd85f 100644
>  --- a/configure.d/config_os_headers
>  +++ b/configure.d/config_os_headers
>  @@ -395,8 +395,8 @@ then
> diff --git a/meta-networking/recipes-protocols/net-snmp/net-snmp/0001-get_pid_from_inode-Include-limit.h.patch b/meta-networking/recipes-protocols/net-snmp/net-snmp/0001-get_pid_from_inode-Include-limit.h.patch
> index 22e591556..a7881a871 100644
> --- a/meta-networking/recipes-protocols/net-snmp/net-snmp/0001-get_pid_from_inode-Include-limit.h.patch
> +++ b/meta-networking/recipes-protocols/net-snmp/net-snmp/0001-get_pid_from_inode-Include-limit.h.patch
> @@ -1,4 +1,4 @@
> -From 2bf1bbe1d428ed06d57aa76b03e394b72ff2216d Mon Sep 17 00:00:00 2001
> +From 8097734b27fd146f358a4edd0d1a0d28309bd9a4 Mon Sep 17 00:00:00 2001
>  From: Khem Raj <raj.khem@gmail.com<mailto:raj.khem@gmail.com>>
>  Date: Fri, 22 Jul 2016 18:34:39 +0000
>  Subject: [PATCH] get_pid_from_inode: Include limit.h
> @@ -14,7 +14,7 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com<mailto:raj.khem@gmail.com>>
>   1 file changed, 1 insertion(+)
>
>  diff --git a/agent/mibgroup/util_funcs/get_pid_from_inode.c b/agent/mibgroup/util_funcs/get_pid_from_inode.c
> -index aee907d..7abaec2 100644
> +index 5788e1d..ea380a6 100644
>  --- a/agent/mibgroup/util_funcs/get_pid_from_inode.c
>  +++ b/agent/mibgroup/util_funcs/get_pid_from_inode.c
>  @@ -6,6 +6,7 @@
> @@ -23,5 +23,5 @@ index aee907d..7abaec2 100644
>   #include <ctype.h>
>  +#include <limits.h>
>   #include <stdio.h>
> - #if HAVE_STDLIB_H
> + #ifdef HAVE_STDLIB_H
>   #include <stdlib.h>
> diff --git a/meta-networking/recipes-protocols/net-snmp/net-snmp/0001-snmpd-always-exit-after-displaying-usage.patch b/meta-networking/recipes-protocols/net-snmp/net-snmp/0001-snmpd-always-exit-after-displaying-usage.patch
> deleted file mode 100644
> index 4fc9e54b4..000000000
> --- a/meta-networking/recipes-protocols/net-snmp/net-snmp/0001-snmpd-always-exit-after-displaying-usage.patch
> +++ /dev/null
> @@ -1,55 +0,0 @@
> -From 94ca941e06bef157bf0e13251f8ca1471daa9393 Mon Sep 17 00:00:00 2001
> -From: Kaarle Ritvanen <kaarle.ritvanen@datakunkku.fi<mailto: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.
> -
> -Upstream-Status: Backport
> -[https://github.com/net-snmp/net-snmp/commit/94ca941e06bef157bf0e13251f8ca1471daa9393<https://urldefense.com/v3/__https:/github.com/net-snmp/net-snmp/commit/94ca941e06bef157bf0e13251f8ca1471daa9393__;!!AjveYdw8EvQ!ZzYDx7kFVh5e_WREHKtwOKlB0gzWJ5uBreZgWz17XbqSPIpRoCWlAxdMV_d3cedWCD1nDmiLXuSYtoLiNbMZ$>]
> -
> -Signed-off-by: Yi Zhao <yi.zhao@windriver.com<mailto:yi.zhao@windriver.com>>
> ----
> - 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.25.1
> -
> diff --git a/meta-networking/recipes-protocols/net-snmp/net-snmp/0001-snmplib-keytools.c-Don-t-check-for-return-from-EVP_M.patch b/meta-networking/recipes-protocols/net-snmp/net-snmp/0001-snmplib-keytools.c-Don-t-check-for-return-from-EVP_M.patch
> index 42352a6b0..af6334f72 100644
> --- a/meta-networking/recipes-protocols/net-snmp/net-snmp/0001-snmplib-keytools.c-Don-t-check-for-return-from-EVP_M.patch
> +++ b/meta-networking/recipes-protocols/net-snmp/net-snmp/0001-snmplib-keytools.c-Don-t-check-for-return-from-EVP_M.patch
> @@ -1,4 +1,4 @@
> -From f3ff99736b8cccbba77349b0d10a3cee366a4c87 Mon Sep 17 00:00:00 2001
> +From f4e1acd4f509dd26cf88da872bd5adcf884f4a5f Mon Sep 17 00:00:00 2001
>  From: Khem Raj <raj.khem@gmail.com<mailto:raj.khem@gmail.com>>
>  Date: Fri, 18 Sep 2015 00:28:45 -0400
>  Subject: [PATCH] snmplib/keytools.c: Don't check for return from
> @@ -17,7 +17,7 @@ Signed-off-by: Ovidiu Panait <ovidiu.panait@windriver.com<mailto:ovidiu.panait@windriver.com>>
>   1 file changed, 1 insertion(+), 4 deletions(-)
>
>  diff --git a/snmplib/keytools.c b/snmplib/keytools.c
> -index 129a7c0..2fc1efc 100644
> +index 14a452a..fb1694b 100644
>  --- a/snmplib/keytools.c
>  +++ b/snmplib/keytools.c
>  @@ -183,10 +183,7 @@ generate_Ku(const oid * hashtype, u_int hashtype_len,
> diff --git a/meta-networking/recipes-protocols/net-snmp/net-snmp/0002-configure-fix-a-cc-check-issue.patch b/meta-networking/recipes-protocols/net-snmp/net-snmp/0002-configure-fix-a-cc-check-issue.patch
> deleted file mode 100644
> index c973bde72..000000000
> --- a/meta-networking/recipes-protocols/net-snmp/net-snmp/0002-configure-fix-a-cc-check-issue.patch
> +++ /dev/null
> @@ -1,28 +0,0 @@
> -From 0a02ac779c51a2b4af3b58cb96967bf3eff80367 Mon Sep 17 00:00:00 2001
> -From: Wenlin Kang <wenlin.kang@windriver.com<mailto:wenlin.kang@windriver.com>>
> -Date: Wed, 24 May 2017 16:45:34 +0800
> -Subject: [PATCH] configure: fix a cc check issue.
> -
> -When has "." in cc value, the expression
> -$myperl -V:cc | $myperl -n -e 'print if (s/^\s*cc=.([-=\w\s\/]+).;\s*/$1/);'
> -can't get corretly the cc's value.
> -
> -Signed-off-by: Wenlin Kang <wenlin.kang@windriver.com<mailto:wenlin.kang@windriver.com>>
> -
> ----
> - configure.d/config_project_perl_python | 2 +-
> - 1 file changed, 1 insertion(+), 1 deletion(-)
> -
> -diff --git a/configure.d/config_project_perl_python b/configure.d/config_project_perl_python
> -index 475c843..22d2ad3 100644
> ---- a/configure.d/config_project_perl_python
> -+++ b/configure.d/config_project_perl_python
> -@@ -87,7 +87,7 @@ if test "x$install_perl" != "xno" ; then
> -     if test "x$enable_perl_cc_checks" != "xno" ; then
> -         AC_MSG_CHECKING([for Perl cc])
> -         changequote(, )
> --        PERLCC=`$myperl -V:cc | $myperl -n -e 'print if (s/^\s*cc=.([-=\w\s\/]+).;\s*/$1/);'`
> -+        PERLCC=`$myperl -V:cc | $myperl -n -e 'print if (s/^\s*cc=.([-=\.\w\s\/]+).;\s*/$1/);'`
> -         changequote([, ])
> -         if test "x$PERLCC" != "x" ; then
> -             AC_MSG_RESULT([$PERLCC])
> diff --git a/meta-networking/recipes-protocols/net-snmp/net-snmp/0004-configure-fix-incorrect-variable.patch b/meta-networking/recipes-protocols/net-snmp/net-snmp/0004-configure-fix-incorrect-variable.patch
> index bfddc63dd..6e224188a 100644
> --- a/meta-networking/recipes-protocols/net-snmp/net-snmp/0004-configure-fix-incorrect-variable.patch
> +++ b/meta-networking/recipes-protocols/net-snmp/net-snmp/0004-configure-fix-incorrect-variable.patch
> @@ -1,4 +1,4 @@
> -From 011bdcd07f2a289d0cfc1b411c03c0cc7c42dad1 Mon Sep 17 00:00:00 2001
> +From 6d655ba677563ac9d62d4d8eee59fdb39d486c02 Mon Sep 17 00:00:00 2001
>  From: Wenlin Kang <wenlin.kang@windriver.com<mailto:wenlin.kang@windriver.com>>
>  Date: Wed, 24 May 2017 17:10:20 +0800
>  Subject: [PATCH] configure: fix incorrect variable
> @@ -14,10 +14,10 @@ Signed-off-by: Wenlin Kang <wenlin.kang@windriver.com<mailto:wenlin.kang@windriver.com>>
>   1 file changed, 1 insertion(+), 1 deletion(-)
>
>  diff --git a/Makefile.in<https://urldefense.com/v3/__http:/Makefile.in__;!!AjveYdw8EvQ!ZzYDx7kFVh5e_WREHKtwOKlB0gzWJ5uBreZgWz17XbqSPIpRoCWlAxdMV_d3cedWCD1nDmiLXuSYtsi07kql$> b/Makefile.in<https://urldefense.com/v3/__http:/Makefile.in__;!!AjveYdw8EvQ!ZzYDx7kFVh5e_WREHKtwOKlB0gzWJ5uBreZgWz17XbqSPIpRoCWlAxdMV_d3cedWCD1nDmiLXuSYtsi07kql$>
> -index 912f6b2..a53d1b2 100644
> +index f1cbbf5..1545be3 100644
>  --- a/Makefile.in<https://urldefense.com/v3/__http:/Makefile.in__;!!AjveYdw8EvQ!ZzYDx7kFVh5e_WREHKtwOKlB0gzWJ5uBreZgWz17XbqSPIpRoCWlAxdMV_d3cedWCD1nDmiLXuSYtsi07kql$>
>  +++ b/Makefile.in<https://urldefense.com/v3/__http:/Makefile.in__;!!AjveYdw8EvQ!ZzYDx7kFVh5e_WREHKtwOKlB0gzWJ5uBreZgWz17XbqSPIpRoCWlAxdMV_d3cedWCD1nDmiLXuSYtsi07kql$>
> -@@ -174,7 +174,7 @@ OTHERCLEANTODOS=perlclean @PYTHONCLEANTARGS@ cleanfeatures perlcleanfeatures pyt
> +@@ -173,7 +173,7 @@ OTHERCLEANTODOS=perlclean @PYTHONCLEANTARGS@ cleanfeatures perlcleanfeatures pyt
>   #
>   # override LD_RUN_PATH to avoid dependencies on the build directory
>   perlmodules: perlmakefiles subdirs
> diff --git a/meta-networking/recipes-protocols/net-snmp/net-snmp/fix-libtool-finish.patch b/meta-networking/recipes-protocols/net-snmp/net-snmp/fix-libtool-finish.patch
> index 26dd014ce..409c1e03c 100644
> --- a/meta-networking/recipes-protocols/net-snmp/net-snmp/fix-libtool-finish.patch
> +++ b/meta-networking/recipes-protocols/net-snmp/net-snmp/fix-libtool-finish.patch
> @@ -1,4 +1,4 @@
> -From 27444fbf8323679ea0551a3bd5f04c365143d8c0 Mon Sep 17 00:00:00 2001
> +From ab1d77c52e84746e75506a2870783806bc77f396 Mon Sep 17 00:00:00 2001
>  From: "Roy.Li" <rongqing.li@windriver.com<mailto:rongqing.li@windriver.com>>
>  Date: Fri, 16 Jan 2015 14:14:01 +0800
>  Subject: [PATCH] net-snmp: fix "libtool --finish"
> @@ -20,11 +20,11 @@ Signed-off-by: Roy.Li<https://urldefense.com/v3/__http:/Roy.Li__;!!AjveYdw8EvQ!ZzYDx7kFVh5e_WREHKtwOKlB0gzWJ5uBreZgWz17XbqSPIpRoCWlAxdMV_d3cedWCD1nDmiLXuSYttQgWTFr$> <rongqing.li@windriver.com<mailto:rongqing.li@windriver.com>>
>   1 file changed, 1 insertion(+), 1 deletion(-)
>
>  diff --git a/Makefile.top<https://urldefense.com/v3/__http:/Makefile.top__;!!AjveYdw8EvQ!ZzYDx7kFVh5e_WREHKtwOKlB0gzWJ5uBreZgWz17XbqSPIpRoCWlAxdMV_d3cedWCD1nDmiLXuSYticrioNt$> b/Makefile.top<https://urldefense.com/v3/__http:/Makefile.top__;!!AjveYdw8EvQ!ZzYDx7kFVh5e_WREHKtwOKlB0gzWJ5uBreZgWz17XbqSPIpRoCWlAxdMV_d3cedWCD1nDmiLXuSYticrioNt$>
> -index 6315401..fc0ee06 100644
> +index a962c54..1ba5607 100644
>  --- a/Makefile.top<https://urldefense.com/v3/__http:/Makefile.top__;!!AjveYdw8EvQ!ZzYDx7kFVh5e_WREHKtwOKlB0gzWJ5uBreZgWz17XbqSPIpRoCWlAxdMV_d3cedWCD1nDmiLXuSYticrioNt$>
>  +++ b/Makefile.top<https://urldefense.com/v3/__http:/Makefile.top__;!!AjveYdw8EvQ!ZzYDx7kFVh5e_WREHKtwOKlB0gzWJ5uBreZgWz17XbqSPIpRoCWlAxdMV_d3cedWCD1nDmiLXuSYticrioNt$>
>  @@ -89,7 +89,7 @@ LIBREVISION = 0
> - 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) -version-info $(LIBCURRENT):$(LIBREVISION):$(LIBAGE) @LD_NO_UNDEFINED@ -o
>   LIB_EXTENSION   = la
>   LIB_VERSION     =
>  -LIB_LDCONFIG_CMD = $(LIBTOOL) --mode=finish $(INSTALL_PREFIX)$(libdir)
> diff --git a/meta-networking/recipes-protocols/net-snmp/net-snmp/net-snmp-5.7.2-fix-engineBoots-value-on-SIGHUP.patch b/meta-networking/recipes-protocols/net-snmp/net-snmp/net-snmp-5.7.2-fix-engineBoots-value-on-SIGHUP.patch
> index 022eb958f..87f192e5b 100644
> --- a/meta-networking/recipes-protocols/net-snmp/net-snmp/net-snmp-5.7.2-fix-engineBoots-value-on-SIGHUP.patch
> +++ b/meta-networking/recipes-protocols/net-snmp/net-snmp/net-snmp-5.7.2-fix-engineBoots-value-on-SIGHUP.patch
> @@ -1,4 +1,4 @@
> -From 1e3178835217ba89aa355e2b6b88e490f17be16d Mon Sep 17 00:00:00 2001
> +From 5ad4eab43c1ea63ff343bba64d576440e8783e75 Mon Sep 17 00:00:00 2001
>  From: Zheng Ruoqin <zhengrq.fnst@fujitsu.com<mailto:zhengrq.fnst@fujitsu.com>>
>  Date: Wed, 9 Jun 2021 15:47:30 +0900
>  Subject: [PATCH] net snmp: fix engineBoots value on SIGHUP
> @@ -7,6 +7,7 @@ Upstream-Status: Pending
>
>  Signed-off-by: Marian Florea <marian.florea@windriver.com<mailto:marian.florea@windriver.com>>
>  Signed-off-by: Li Zhou <li.zhou@windriver.com<mailto:li.zhou@windriver.com>>
> +Signed-off-by: Ovidiu Panait <ovidiu.panait@windriver.com<mailto:ovidiu.panait@windriver.com>>
>
>  ---
>   agent/snmpd.c    | 1 +
> @@ -14,19 +15,18 @@ Signed-off-by: Li Zhou <li.zhou@windriver.com<mailto:li.zhou@windriver.com>>
>   2 files changed, 3 insertions(+), 2 deletions(-)
>
>  diff --git a/agent/snmpd.c b/agent/snmpd.c
> -index 1af439f..355b510 100644
> +index 90de12d..1ccc4db 100644
>  --- a/agent/snmpd.c
>  +++ b/agent/snmpd.c
> -@@ -1208,6 +1208,7 @@ receive(void)
> -           snmp_log(LOG_INFO, "NET-SNMP version %s restarted\n",
> -                    netsnmp_get_version());
> -             update_config();
> -+          snmp_store(app_name);
> -             send_easy_trap(SNMP_TRAP_ENTERPRISESPECIFIC, 3);
> - #if HAVE_SIGPROCMASK
> -             ret = sigprocmask(SIG_UNBLOCK, &set, NULL);
> +     snmp_log(LOG_INFO, "NET-SNMP version %s restarted\n",
> +              netsnmp_get_version());
> +     update_config();
> ++    snmp_store(app_name);
> +     send_easy_trap(SNMP_TRAP_ENTERPRISESPECIFIC, 3);
> + #ifdef HAVE_SIGPROCMASK
> +     ret = sigprocmask(SIG_UNBLOCK, &set, NULL);
>  diff --git a/snmplib/snmpv3.c b/snmplib/snmpv3.c
> -index 29c2a0f..ada961c 100644
> +index 7b1746b..4a17e0d 100644
>  --- a/snmplib/snmpv3.c
>  +++ b/snmplib/snmpv3.c
>  @@ -1059,9 +1059,9 @@ init_snmpv3_post_config(int majorid, int minorid, void *serverarg,
> diff --git a/meta-networking/recipes-protocols/net-snmp/net-snmp/net-snmp-add-knob-whether-nlist.h-are-checked.patch b/meta-networking/recipes-protocols/net-snmp/net-snmp/net-snmp-add-knob-whether-nlist.h-are-checked.patch
> index f1ebe2bb6..c5a453abe 100644
> --- a/meta-networking/recipes-protocols/net-snmp/net-snmp/net-snmp-add-knob-whether-nlist.h-are-checked.patch
> +++ b/meta-networking/recipes-protocols/net-snmp/net-snmp/net-snmp-add-knob-whether-nlist.h-are-checked.patch
> @@ -1,4 +1,4 @@
> -From e507dcf8b29c55011f85d88bf05400d4717e4074 Mon Sep 17 00:00:00 2001
> +From ad65b106d3cb3c6e595381be1c45a73c1ef6eb5e Mon Sep 17 00:00:00 2001
>  From: Chong Lu <Chong.Lu@windriver.com<mailto:Chong.Lu@windriver.com>>
>  Date: Thu, 28 May 2020 09:46:34 -0500
>  Subject: [PATCH] net-snmp: add knob whether nlist.h are checked
> @@ -15,7 +15,7 @@ Signed-off-by: Chong Lu <Chong.Lu@windriver.com<mailto:Chong.Lu@windriver.com>>
>   1 file changed, 2 insertions(+)
>
>  diff --git a/configure.d/config_os_headers b/configure.d/config_os_headers
> -index 76ef58a..f07d512 100644
> +index b9c8c31..01c3376 100644
>  --- a/configure.d/config_os_headers
>  +++ b/configure.d/config_os_headers
>  @@ -37,6 +37,7 @@ AC_CHECK_HEADERS([getopt.h   pthread.h  regex.h      ] dnl
> diff --git a/meta-networking/recipes-protocols/net-snmp/net-snmp/net-snmp-fix-for-disable-des.patch b/meta-networking/recipes-protocols/net-snmp/net-snmp/net-snmp-fix-for-disable-des.patch
> index 2941a3609..c382c02d8 100644
> --- a/meta-networking/recipes-protocols/net-snmp/net-snmp/net-snmp-fix-for-disable-des.patch
> +++ b/meta-networking/recipes-protocols/net-snmp/net-snmp/net-snmp-fix-for-disable-des.patch
> @@ -1,4 +1,4 @@
> -From 3ca4335ec1d6b7b384c134fc85d7a9e513c68376 Mon Sep 17 00:00:00 2001
> +From b1b9980853b1083f0c8b9f628f8b4c3a484d4f91 Mon Sep 17 00:00:00 2001
>  From: Jackie Huang <jackie.huang@windriver.com<mailto:jackie.huang@windriver.com>>
>  Date: Thu, 22 Jun 2017 10:25:08 +0800
>  Subject: [PATCH] net-snmp: fix for --disable-des
> @@ -15,7 +15,7 @@ Signed-off-by: Jackie Huang <jackie.huang@windriver.com<mailto:jackie.huang@windriver.com>>
>   1 file changed, 2 insertions(+)
>
>  diff --git a/snmplib/scapi.c b/snmplib/scapi.c
> -index 00c9174..c6875e1 100644
> +index 54fdd5c..0f7e931 100644
>  --- a/snmplib/scapi.c
>  +++ b/snmplib/scapi.c
>  @@ -85,7 +85,9 @@ netsnmp_feature_child_of(usm_scapi, usm_support);
> diff --git a/meta-networking/recipes-protocols/net-snmp/net-snmp/net-snmp-testing-add-the-output-format-for-ptest.patch b/meta-networking/recipes-protocols/net-snmp/net-snmp/net-snmp-testing-add-the-output-format-for-ptest.patch
> index 807983f61..09ca532a7 100644
> --- a/meta-networking/recipes-protocols/net-snmp/net-snmp/net-snmp-testing-add-the-output-format-for-ptest.patch
> +++ b/meta-networking/recipes-protocols/net-snmp/net-snmp/net-snmp-testing-add-the-output-format-for-ptest.patch
> @@ -1,4 +1,4 @@
> -From 972df16e9599dffddf5d714a4cbf43008c771122 Mon Sep 17 00:00:00 2001
> +From 36a5656db7ea75dd15f35a6c1728937c6e2b901c Mon Sep 17 00:00:00 2001
>  From: Jackie Huang <jackie.huang@windriver.com<mailto:jackie.huang@windriver.com>>
>  Date: Wed, 14 Jan 2015 15:10:06 +0800
>  Subject: [PATCH] testing: add the output format for ptest
> diff --git a/meta-networking/recipes-protocols/net-snmp/net-snmp/reproducibility-have-printcap.patch b/meta-networking/recipes-protocols/net-snmp/net-snmp/reproducibility-have-printcap.patch
> index bf1e7bedf..c0b51c51e 100644
> --- a/meta-networking/recipes-protocols/net-snmp/net-snmp/reproducibility-have-printcap.patch
> +++ b/meta-networking/recipes-protocols/net-snmp/net-snmp/reproducibility-have-printcap.patch
> @@ -1,4 +1,4 @@
> -From 84e362fe97f50fbad69f083bc2d8fe18f83eb2f7 Mon Sep 17 00:00:00 2001
> +From b923cd38e2503b86aedf66b767fd7f51c9f25645 Mon Sep 17 00:00:00 2001
>  From: "douglas.royds" <douglas.royds@taitradio.com<mailto:douglas.royds@taitradio.com>>
>  Date: Wed, 21 Nov 2018 13:52:18 +1300
>  Subject: [PATCH] net-snmp: Reproducibility: Don't check build host for
> @@ -13,7 +13,7 @@ set in the environment to "yes" or "no" as appropriate for the target platform.
>   1 file changed, 2 insertions(+), 2 deletions(-)
>
>  diff --git a/configure.d/config_os_misc4 b/configure.d/config_os_misc4
> -index 6f23c8e..8cea75a 100644
> +index b6864d9..07ca922 100644
>  --- a/configure.d/config_os_misc4
>  +++ b/configure.d/config_os_misc4
>  @@ -99,9 +99,9 @@ if test x$LPSTAT_PATH != x; then
> diff --git a/meta-networking/recipes-protocols/net-snmp/net-snmp_5.9.1.bb<https://urldefense.com/v3/__http:/net-snmp_5.9.1.bb__;!!AjveYdw8EvQ!ZzYDx7kFVh5e_WREHKtwOKlB0gzWJ5uBreZgWz17XbqSPIpRoCWlAxdMV_d3cedWCD1nDmiLXuSYtgJfttSA$> b/meta-networking/recipes-protocols/net-snmp/net-snmp_5.9.3.bb<https://urldefense.com/v3/__http:/net-snmp_5.9.3.bb__;!!AjveYdw8EvQ!ZzYDx7kFVh5e_WREHKtwOKlB0gzWJ5uBreZgWz17XbqSPIpRoCWlAxdMV_d3cedWCD1nDmiLXuSYtg4FzuZn$>
> similarity index 98%
> rename from meta-networking/recipes-protocols/net-snmp/net-snmp_5.9.1.bb<https://urldefense.com/v3/__http:/net-snmp_5.9.1.bb__;!!AjveYdw8EvQ!ZzYDx7kFVh5e_WREHKtwOKlB0gzWJ5uBreZgWz17XbqSPIpRoCWlAxdMV_d3cedWCD1nDmiLXuSYtgJfttSA$>
> rename to meta-networking/recipes-protocols/net-snmp/net-snmp_5.9.3.bb<https://urldefense.com/v3/__http:/net-snmp_5.9.3.bb__;!!AjveYdw8EvQ!ZzYDx7kFVh5e_WREHKtwOKlB0gzWJ5uBreZgWz17XbqSPIpRoCWlAxdMV_d3cedWCD1nDmiLXuSYtg4FzuZn$>
> index 30c0ce74c..7af514756 100644
> --- a/meta-networking/recipes-protocols/net-snmp/net-snmp_5.9.1.bb<https://urldefense.com/v3/__http:/net-snmp_5.9.1.bb__;!!AjveYdw8EvQ!ZzYDx7kFVh5e_WREHKtwOKlB0gzWJ5uBreZgWz17XbqSPIpRoCWlAxdMV_d3cedWCD1nDmiLXuSYtgJfttSA$>
> +++ b/meta-networking/recipes-protocols/net-snmp/net-snmp_5.9.3.bb<https://urldefense.com/v3/__http:/net-snmp_5.9.3.bb__;!!AjveYdw8EvQ!ZzYDx7kFVh5e_WREHKtwOKlB0gzWJ5uBreZgWz17XbqSPIpRoCWlAxdMV_d3cedWCD1nDmiLXuSYtg4FzuZn$>
> @@ -21,15 +21,13 @@ SRC_URI = "${SOURCEFORGE_MIRROR}/net-snmp/net-snmp-${PV}.tar.gz \
>             file://0001-config_os_headers-Error-Fix.patch \
>             file://0001-snmplib-keytools.c-Don-t-check-for-return-from-EVP_M.patch \
>             file://0001-get_pid_from_inode-Include-limit.h.patch \
> -           file://0002-configure-fix-a-cc-check-issue.patch \
>             file://0004-configure-fix-incorrect-variable.patch \
>             file://net-snmp-5.7.2-fix-engineBoots-value-on-SIGHUP.patch \
>             file://net-snmp-fix-for-disable-des.patch \
>             file://reproducibility-have-printcap.patch \
>             file://0001-ac_add_search_path.m4-keep-consistent-between-32bit.patch \
> -           file://0001-snmpd-always-exit-after-displaying-usage.patch \
>             "
> -SRC_URI[sha256sum] = "eb7fd4a44de6cddbffd9a92a85ad1309e5c1054fb9d5a7dd93079c8953f48c3f"
> +SRC_URI[sha256sum] = "2097f29b7e1bf3f1300b4bae52fa2308d0bb8d5d3998dbe02f9462a413a2ef0a"
>
>  UPSTREAM_CHECK_URI = "https://sourceforge.net/projects/net-snmp/files/net-snmp/<https://urldefense.com/v3/__https:/sourceforge.net/projects/net-snmp/files/net-snmp/__;!!AjveYdw8EvQ!ZzYDx7kFVh5e_WREHKtwOKlB0gzWJ5uBreZgWz17XbqSPIpRoCWlAxdMV_d3cedWCD1nDmiLXuSYttt45kxq$>"
>  UPSTREAM_CHECK_REGEX = "/net-snmp/(?P<pver>\d+(\.\d+)+)/"
> --
> 2.25.1
>
>
> -=-=-=-=-=-=-=-=-=-=-=-
> Links: You receive all messages sent to this group.
> View/Reply Online (#99037): https://lists.openembedded.org/g/openembedded-devel/message/99037<https://urldefense.com/v3/__https:/lists.openembedded.org/g/openembedded-devel/message/99037__;!!AjveYdw8EvQ!ZzYDx7kFVh5e_WREHKtwOKlB0gzWJ5uBreZgWz17XbqSPIpRoCWlAxdMV_d3cedWCD1nDmiLXuSYtnWSrQ1-$>
> Mute This Topic: https://lists.openembedded.org/mt/94085410/1997914<https://urldefense.com/v3/__https:/lists.openembedded.org/mt/94085410/1997914__;!!AjveYdw8EvQ!ZzYDx7kFVh5e_WREHKtwOKlB0gzWJ5uBreZgWz17XbqSPIpRoCWlAxdMV_d3cedWCD1nDmiLXuSYtnZeynhZ$>
> Group Owner: openembedded-devel+owner@lists.openembedded.org<mailto:openembedded-devel%2Bowner@lists.openembedded.org>
> Unsubscribe: https://lists.openembedded.org/g/openembedded-devel/unsub<https://urldefense.com/v3/__https:/lists.openembedded.org/g/openembedded-devel/unsub__;!!AjveYdw8EvQ!ZzYDx7kFVh5e_WREHKtwOKlB0gzWJ5uBreZgWz17XbqSPIpRoCWlAxdMV_d3cedWCD1nDmiLXuSYttC2KpO6$> [raj.khem@gmail.com<mailto:raj.khem@gmail.com>]
> -=-=-=-=-=-=-=-=-=-=-=-
>
diff mbox series

Patch

diff --git a/meta-networking/recipes-protocols/net-snmp/net-snmp/0001-ac_add_search_path.m4-keep-consistent-between-32bit.patch b/meta-networking/recipes-protocols/net-snmp/net-snmp/0001-ac_add_search_path.m4-keep-consistent-between-32bit.patch
index 4cd729044..ed2ebc6d7 100644
--- a/meta-networking/recipes-protocols/net-snmp/net-snmp/0001-ac_add_search_path.m4-keep-consistent-between-32bit.patch
+++ b/meta-networking/recipes-protocols/net-snmp/net-snmp/0001-ac_add_search_path.m4-keep-consistent-between-32bit.patch
@@ -1,7 +1,8 @@ 
-From 6f8ea2e841ad45eed193310b599d3f3b410ae91d Mon Sep 17 00:00:00 2001
+From 98c62e24fdd05d7e8bd8149840bad8eb0feb3fb1 Mon Sep 17 00:00:00 2001
 From: Mingli Yu <mingli.yu@windriver.com>
 Date: Fri, 29 Jan 2021 08:49:15 +0000
-Subject: [PATCH] ac_add_search_path.m4: keep consistent between 32bit and 64bit
+Subject: [PATCH] ac_add_search_path.m4: keep consistent between 32bit and 
+ 64bit
 
 With configure option "--with-openssl=${STAGING_EXECPREFIXDIR}", it behaves
 differently between 32bit and 64bit system as the openssl lib resides under
@@ -15,12 +16,13 @@  So add the patch to fix the gap between 32bit and 64bit system.
 Upstream-Status: Inappropriate [configuration specific]
 
 Signed-off-by: Mingli Yu <mingli.yu@windriver.com>
+
 ---
  m4/ac_add_search_path.m4 | 4 ++--
  1 file changed, 2 insertions(+), 2 deletions(-)
 
 diff --git a/m4/ac_add_search_path.m4 b/m4/ac_add_search_path.m4
-index 8e0a819..961f587 100644
+index 8e0a819..e9585bc 100644
 --- a/m4/ac_add_search_path.m4
 +++ b/m4/ac_add_search_path.m4
 @@ -3,8 +3,8 @@ dnl Add a search path to the LIBS and CPPFLAGS variables
diff --git a/meta-networking/recipes-protocols/net-snmp/net-snmp/0001-config_os_headers-Error-Fix.patch b/meta-networking/recipes-protocols/net-snmp/net-snmp/0001-config_os_headers-Error-Fix.patch
index 05a47f61c..f8a52a63f 100644
--- a/meta-networking/recipes-protocols/net-snmp/net-snmp/0001-config_os_headers-Error-Fix.patch
+++ b/meta-networking/recipes-protocols/net-snmp/net-snmp/0001-config_os_headers-Error-Fix.patch
@@ -1,4 +1,4 @@ 
-From 69d4c517c07f55c505090e48d96ace8cd599fb26 Mon Sep 17 00:00:00 2001
+From e86d5fd52f19b85da0b7cce660c6e65ec4c0f9bb Mon Sep 17 00:00:00 2001
 From: Li xin <lixin.fnst@cn.fujitsu.com>
 Date: Fri, 21 Aug 2015 18:23:13 +0900
 Subject: [PATCH] config_os_headers: Error Fix
@@ -19,7 +19,7 @@  Signed-off-by: Li Xin <lixin.fnst@cn.fujitsu.com>
  1 file changed, 2 insertions(+), 2 deletions(-)
 
 diff --git a/configure.d/config_os_headers b/configure.d/config_os_headers
-index f07d512..2363b42 100644
+index 01c3376..6edd85f 100644
 --- a/configure.d/config_os_headers
 +++ b/configure.d/config_os_headers
 @@ -395,8 +395,8 @@ then
diff --git a/meta-networking/recipes-protocols/net-snmp/net-snmp/0001-get_pid_from_inode-Include-limit.h.patch b/meta-networking/recipes-protocols/net-snmp/net-snmp/0001-get_pid_from_inode-Include-limit.h.patch
index 22e591556..a7881a871 100644
--- a/meta-networking/recipes-protocols/net-snmp/net-snmp/0001-get_pid_from_inode-Include-limit.h.patch
+++ b/meta-networking/recipes-protocols/net-snmp/net-snmp/0001-get_pid_from_inode-Include-limit.h.patch
@@ -1,4 +1,4 @@ 
-From 2bf1bbe1d428ed06d57aa76b03e394b72ff2216d Mon Sep 17 00:00:00 2001
+From 8097734b27fd146f358a4edd0d1a0d28309bd9a4 Mon Sep 17 00:00:00 2001
 From: Khem Raj <raj.khem@gmail.com>
 Date: Fri, 22 Jul 2016 18:34:39 +0000
 Subject: [PATCH] get_pid_from_inode: Include limit.h
@@ -14,7 +14,7 @@  Signed-off-by: Khem Raj <raj.khem@gmail.com>
  1 file changed, 1 insertion(+)
 
 diff --git a/agent/mibgroup/util_funcs/get_pid_from_inode.c b/agent/mibgroup/util_funcs/get_pid_from_inode.c
-index aee907d..7abaec2 100644
+index 5788e1d..ea380a6 100644
 --- a/agent/mibgroup/util_funcs/get_pid_from_inode.c
 +++ b/agent/mibgroup/util_funcs/get_pid_from_inode.c
 @@ -6,6 +6,7 @@
@@ -23,5 +23,5 @@  index aee907d..7abaec2 100644
  #include <ctype.h>
 +#include <limits.h>
  #include <stdio.h>
- #if HAVE_STDLIB_H
+ #ifdef HAVE_STDLIB_H
  #include <stdlib.h>
diff --git a/meta-networking/recipes-protocols/net-snmp/net-snmp/0001-snmpd-always-exit-after-displaying-usage.patch b/meta-networking/recipes-protocols/net-snmp/net-snmp/0001-snmpd-always-exit-after-displaying-usage.patch
deleted file mode 100644
index 4fc9e54b4..000000000
--- a/meta-networking/recipes-protocols/net-snmp/net-snmp/0001-snmpd-always-exit-after-displaying-usage.patch
+++ /dev/null
@@ -1,55 +0,0 @@ 
-From 94ca941e06bef157bf0e13251f8ca1471daa9393 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.
-
-Upstream-Status: Backport
-[https://github.com/net-snmp/net-snmp/commit/94ca941e06bef157bf0e13251f8ca1471daa9393]
-
-Signed-off-by: Yi Zhao <yi.zhao@windriver.com>
----
- 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.25.1
-
diff --git a/meta-networking/recipes-protocols/net-snmp/net-snmp/0001-snmplib-keytools.c-Don-t-check-for-return-from-EVP_M.patch b/meta-networking/recipes-protocols/net-snmp/net-snmp/0001-snmplib-keytools.c-Don-t-check-for-return-from-EVP_M.patch
index 42352a6b0..af6334f72 100644
--- a/meta-networking/recipes-protocols/net-snmp/net-snmp/0001-snmplib-keytools.c-Don-t-check-for-return-from-EVP_M.patch
+++ b/meta-networking/recipes-protocols/net-snmp/net-snmp/0001-snmplib-keytools.c-Don-t-check-for-return-from-EVP_M.patch
@@ -1,4 +1,4 @@ 
-From f3ff99736b8cccbba77349b0d10a3cee366a4c87 Mon Sep 17 00:00:00 2001
+From f4e1acd4f509dd26cf88da872bd5adcf884f4a5f Mon Sep 17 00:00:00 2001
 From: Khem Raj <raj.khem@gmail.com>
 Date: Fri, 18 Sep 2015 00:28:45 -0400
 Subject: [PATCH] snmplib/keytools.c: Don't check for return from
@@ -17,7 +17,7 @@  Signed-off-by: Ovidiu Panait <ovidiu.panait@windriver.com>
  1 file changed, 1 insertion(+), 4 deletions(-)
 
 diff --git a/snmplib/keytools.c b/snmplib/keytools.c
-index 129a7c0..2fc1efc 100644
+index 14a452a..fb1694b 100644
 --- a/snmplib/keytools.c
 +++ b/snmplib/keytools.c
 @@ -183,10 +183,7 @@ generate_Ku(const oid * hashtype, u_int hashtype_len,
diff --git a/meta-networking/recipes-protocols/net-snmp/net-snmp/0002-configure-fix-a-cc-check-issue.patch b/meta-networking/recipes-protocols/net-snmp/net-snmp/0002-configure-fix-a-cc-check-issue.patch
deleted file mode 100644
index c973bde72..000000000
--- a/meta-networking/recipes-protocols/net-snmp/net-snmp/0002-configure-fix-a-cc-check-issue.patch
+++ /dev/null
@@ -1,28 +0,0 @@ 
-From 0a02ac779c51a2b4af3b58cb96967bf3eff80367 Mon Sep 17 00:00:00 2001
-From: Wenlin Kang <wenlin.kang@windriver.com>
-Date: Wed, 24 May 2017 16:45:34 +0800
-Subject: [PATCH] configure: fix a cc check issue.
-
-When has "." in cc value, the expression
-$myperl -V:cc | $myperl -n -e 'print if (s/^\s*cc=.([-=\w\s\/]+).;\s*/$1/);'
-can't get corretly the cc's value.
-
-Signed-off-by: Wenlin Kang <wenlin.kang@windriver.com>
-
----
- configure.d/config_project_perl_python | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/configure.d/config_project_perl_python b/configure.d/config_project_perl_python
-index 475c843..22d2ad3 100644
---- a/configure.d/config_project_perl_python
-+++ b/configure.d/config_project_perl_python
-@@ -87,7 +87,7 @@ if test "x$install_perl" != "xno" ; then
-     if test "x$enable_perl_cc_checks" != "xno" ; then
-         AC_MSG_CHECKING([for Perl cc])
-         changequote(, )
--        PERLCC=`$myperl -V:cc | $myperl -n -e 'print if (s/^\s*cc=.([-=\w\s\/]+).;\s*/$1/);'`
-+        PERLCC=`$myperl -V:cc | $myperl -n -e 'print if (s/^\s*cc=.([-=\.\w\s\/]+).;\s*/$1/);'`
-         changequote([, ])
-         if test "x$PERLCC" != "x" ; then
-             AC_MSG_RESULT([$PERLCC])
diff --git a/meta-networking/recipes-protocols/net-snmp/net-snmp/0004-configure-fix-incorrect-variable.patch b/meta-networking/recipes-protocols/net-snmp/net-snmp/0004-configure-fix-incorrect-variable.patch
index bfddc63dd..6e224188a 100644
--- a/meta-networking/recipes-protocols/net-snmp/net-snmp/0004-configure-fix-incorrect-variable.patch
+++ b/meta-networking/recipes-protocols/net-snmp/net-snmp/0004-configure-fix-incorrect-variable.patch
@@ -1,4 +1,4 @@ 
-From 011bdcd07f2a289d0cfc1b411c03c0cc7c42dad1 Mon Sep 17 00:00:00 2001
+From 6d655ba677563ac9d62d4d8eee59fdb39d486c02 Mon Sep 17 00:00:00 2001
 From: Wenlin Kang <wenlin.kang@windriver.com>
 Date: Wed, 24 May 2017 17:10:20 +0800
 Subject: [PATCH] configure: fix incorrect variable
@@ -14,10 +14,10 @@  Signed-off-by: Wenlin Kang <wenlin.kang@windriver.com>
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/Makefile.in b/Makefile.in
-index 912f6b2..a53d1b2 100644
+index f1cbbf5..1545be3 100644
 --- a/Makefile.in
 +++ b/Makefile.in
-@@ -174,7 +174,7 @@ OTHERCLEANTODOS=perlclean @PYTHONCLEANTARGS@ cleanfeatures perlcleanfeatures pyt
+@@ -173,7 +173,7 @@ OTHERCLEANTODOS=perlclean @PYTHONCLEANTARGS@ cleanfeatures perlcleanfeatures pyt
  #
  # override LD_RUN_PATH to avoid dependencies on the build directory
  perlmodules: perlmakefiles subdirs
diff --git a/meta-networking/recipes-protocols/net-snmp/net-snmp/fix-libtool-finish.patch b/meta-networking/recipes-protocols/net-snmp/net-snmp/fix-libtool-finish.patch
index 26dd014ce..409c1e03c 100644
--- a/meta-networking/recipes-protocols/net-snmp/net-snmp/fix-libtool-finish.patch
+++ b/meta-networking/recipes-protocols/net-snmp/net-snmp/fix-libtool-finish.patch
@@ -1,4 +1,4 @@ 
-From 27444fbf8323679ea0551a3bd5f04c365143d8c0 Mon Sep 17 00:00:00 2001
+From ab1d77c52e84746e75506a2870783806bc77f396 Mon Sep 17 00:00:00 2001
 From: "Roy.Li" <rongqing.li@windriver.com>
 Date: Fri, 16 Jan 2015 14:14:01 +0800
 Subject: [PATCH] net-snmp: fix "libtool --finish"
@@ -20,11 +20,11 @@  Signed-off-by: Roy.Li <rongqing.li@windriver.com>
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/Makefile.top b/Makefile.top
-index 6315401..fc0ee06 100644
+index a962c54..1ba5607 100644
 --- a/Makefile.top
 +++ b/Makefile.top
 @@ -89,7 +89,7 @@ LIBREVISION = 0
- 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) -version-info $(LIBCURRENT):$(LIBREVISION):$(LIBAGE) @LD_NO_UNDEFINED@ -o
  LIB_EXTENSION   = la
  LIB_VERSION     =
 -LIB_LDCONFIG_CMD = $(LIBTOOL) --mode=finish $(INSTALL_PREFIX)$(libdir)
diff --git a/meta-networking/recipes-protocols/net-snmp/net-snmp/net-snmp-5.7.2-fix-engineBoots-value-on-SIGHUP.patch b/meta-networking/recipes-protocols/net-snmp/net-snmp/net-snmp-5.7.2-fix-engineBoots-value-on-SIGHUP.patch
index 022eb958f..87f192e5b 100644
--- a/meta-networking/recipes-protocols/net-snmp/net-snmp/net-snmp-5.7.2-fix-engineBoots-value-on-SIGHUP.patch
+++ b/meta-networking/recipes-protocols/net-snmp/net-snmp/net-snmp-5.7.2-fix-engineBoots-value-on-SIGHUP.patch
@@ -1,4 +1,4 @@ 
-From 1e3178835217ba89aa355e2b6b88e490f17be16d Mon Sep 17 00:00:00 2001
+From 5ad4eab43c1ea63ff343bba64d576440e8783e75 Mon Sep 17 00:00:00 2001
 From: Zheng Ruoqin <zhengrq.fnst@fujitsu.com>
 Date: Wed, 9 Jun 2021 15:47:30 +0900
 Subject: [PATCH] net snmp: fix engineBoots value on SIGHUP
@@ -7,6 +7,7 @@  Upstream-Status: Pending
 
 Signed-off-by: Marian Florea <marian.florea@windriver.com>
 Signed-off-by: Li Zhou <li.zhou@windriver.com>
+Signed-off-by: Ovidiu Panait <ovidiu.panait@windriver.com>
 
 ---
  agent/snmpd.c    | 1 +
@@ -14,19 +15,18 @@  Signed-off-by: Li Zhou <li.zhou@windriver.com>
  2 files changed, 3 insertions(+), 2 deletions(-)
 
 diff --git a/agent/snmpd.c b/agent/snmpd.c
-index 1af439f..355b510 100644
+index 90de12d..1ccc4db 100644
 --- a/agent/snmpd.c
 +++ b/agent/snmpd.c
-@@ -1208,6 +1208,7 @@ receive(void)
- 	    snmp_log(LOG_INFO, "NET-SNMP version %s restarted\n",
- 		     netsnmp_get_version());
-             update_config();
-+	    snmp_store(app_name);
-             send_easy_trap(SNMP_TRAP_ENTERPRISESPECIFIC, 3);
- #if HAVE_SIGPROCMASK
-             ret = sigprocmask(SIG_UNBLOCK, &set, NULL);
+     snmp_log(LOG_INFO, "NET-SNMP version %s restarted\n",
+              netsnmp_get_version());
+     update_config();
++    snmp_store(app_name);
+     send_easy_trap(SNMP_TRAP_ENTERPRISESPECIFIC, 3);
+ #ifdef HAVE_SIGPROCMASK
+     ret = sigprocmask(SIG_UNBLOCK, &set, NULL);
 diff --git a/snmplib/snmpv3.c b/snmplib/snmpv3.c
-index 29c2a0f..ada961c 100644
+index 7b1746b..4a17e0d 100644
 --- a/snmplib/snmpv3.c
 +++ b/snmplib/snmpv3.c
 @@ -1059,9 +1059,9 @@ init_snmpv3_post_config(int majorid, int minorid, void *serverarg,
diff --git a/meta-networking/recipes-protocols/net-snmp/net-snmp/net-snmp-add-knob-whether-nlist.h-are-checked.patch b/meta-networking/recipes-protocols/net-snmp/net-snmp/net-snmp-add-knob-whether-nlist.h-are-checked.patch
index f1ebe2bb6..c5a453abe 100644
--- a/meta-networking/recipes-protocols/net-snmp/net-snmp/net-snmp-add-knob-whether-nlist.h-are-checked.patch
+++ b/meta-networking/recipes-protocols/net-snmp/net-snmp/net-snmp-add-knob-whether-nlist.h-are-checked.patch
@@ -1,4 +1,4 @@ 
-From e507dcf8b29c55011f85d88bf05400d4717e4074 Mon Sep 17 00:00:00 2001
+From ad65b106d3cb3c6e595381be1c45a73c1ef6eb5e Mon Sep 17 00:00:00 2001
 From: Chong Lu <Chong.Lu@windriver.com>
 Date: Thu, 28 May 2020 09:46:34 -0500
 Subject: [PATCH] net-snmp: add knob whether nlist.h are checked
@@ -15,7 +15,7 @@  Signed-off-by: Chong Lu <Chong.Lu@windriver.com>
  1 file changed, 2 insertions(+)
 
 diff --git a/configure.d/config_os_headers b/configure.d/config_os_headers
-index 76ef58a..f07d512 100644
+index b9c8c31..01c3376 100644
 --- a/configure.d/config_os_headers
 +++ b/configure.d/config_os_headers
 @@ -37,6 +37,7 @@ AC_CHECK_HEADERS([getopt.h   pthread.h  regex.h      ] dnl
diff --git a/meta-networking/recipes-protocols/net-snmp/net-snmp/net-snmp-fix-for-disable-des.patch b/meta-networking/recipes-protocols/net-snmp/net-snmp/net-snmp-fix-for-disable-des.patch
index 2941a3609..c382c02d8 100644
--- a/meta-networking/recipes-protocols/net-snmp/net-snmp/net-snmp-fix-for-disable-des.patch
+++ b/meta-networking/recipes-protocols/net-snmp/net-snmp/net-snmp-fix-for-disable-des.patch
@@ -1,4 +1,4 @@ 
-From 3ca4335ec1d6b7b384c134fc85d7a9e513c68376 Mon Sep 17 00:00:00 2001
+From b1b9980853b1083f0c8b9f628f8b4c3a484d4f91 Mon Sep 17 00:00:00 2001
 From: Jackie Huang <jackie.huang@windriver.com>
 Date: Thu, 22 Jun 2017 10:25:08 +0800
 Subject: [PATCH] net-snmp: fix for --disable-des
@@ -15,7 +15,7 @@  Signed-off-by: Jackie Huang <jackie.huang@windriver.com>
  1 file changed, 2 insertions(+)
 
 diff --git a/snmplib/scapi.c b/snmplib/scapi.c
-index 00c9174..c6875e1 100644
+index 54fdd5c..0f7e931 100644
 --- a/snmplib/scapi.c
 +++ b/snmplib/scapi.c
 @@ -85,7 +85,9 @@ netsnmp_feature_child_of(usm_scapi, usm_support);
diff --git a/meta-networking/recipes-protocols/net-snmp/net-snmp/net-snmp-testing-add-the-output-format-for-ptest.patch b/meta-networking/recipes-protocols/net-snmp/net-snmp/net-snmp-testing-add-the-output-format-for-ptest.patch
index 807983f61..09ca532a7 100644
--- a/meta-networking/recipes-protocols/net-snmp/net-snmp/net-snmp-testing-add-the-output-format-for-ptest.patch
+++ b/meta-networking/recipes-protocols/net-snmp/net-snmp/net-snmp-testing-add-the-output-format-for-ptest.patch
@@ -1,4 +1,4 @@ 
-From 972df16e9599dffddf5d714a4cbf43008c771122 Mon Sep 17 00:00:00 2001
+From 36a5656db7ea75dd15f35a6c1728937c6e2b901c Mon Sep 17 00:00:00 2001
 From: Jackie Huang <jackie.huang@windriver.com>
 Date: Wed, 14 Jan 2015 15:10:06 +0800
 Subject: [PATCH] testing: add the output format for ptest
diff --git a/meta-networking/recipes-protocols/net-snmp/net-snmp/reproducibility-have-printcap.patch b/meta-networking/recipes-protocols/net-snmp/net-snmp/reproducibility-have-printcap.patch
index bf1e7bedf..c0b51c51e 100644
--- a/meta-networking/recipes-protocols/net-snmp/net-snmp/reproducibility-have-printcap.patch
+++ b/meta-networking/recipes-protocols/net-snmp/net-snmp/reproducibility-have-printcap.patch
@@ -1,4 +1,4 @@ 
-From 84e362fe97f50fbad69f083bc2d8fe18f83eb2f7 Mon Sep 17 00:00:00 2001
+From b923cd38e2503b86aedf66b767fd7f51c9f25645 Mon Sep 17 00:00:00 2001
 From: "douglas.royds" <douglas.royds@taitradio.com>
 Date: Wed, 21 Nov 2018 13:52:18 +1300
 Subject: [PATCH] net-snmp: Reproducibility: Don't check build host for
@@ -13,7 +13,7 @@  set in the environment to "yes" or "no" as appropriate for the target platform.
  1 file changed, 2 insertions(+), 2 deletions(-)
 
 diff --git a/configure.d/config_os_misc4 b/configure.d/config_os_misc4
-index 6f23c8e..8cea75a 100644
+index b6864d9..07ca922 100644
 --- a/configure.d/config_os_misc4
 +++ b/configure.d/config_os_misc4
 @@ -99,9 +99,9 @@ if test x$LPSTAT_PATH != x; then
diff --git a/meta-networking/recipes-protocols/net-snmp/net-snmp_5.9.1.bb b/meta-networking/recipes-protocols/net-snmp/net-snmp_5.9.3.bb
similarity index 98%
rename from meta-networking/recipes-protocols/net-snmp/net-snmp_5.9.1.bb
rename to meta-networking/recipes-protocols/net-snmp/net-snmp_5.9.3.bb
index 30c0ce74c..7af514756 100644
--- a/meta-networking/recipes-protocols/net-snmp/net-snmp_5.9.1.bb
+++ b/meta-networking/recipes-protocols/net-snmp/net-snmp_5.9.3.bb
@@ -21,15 +21,13 @@  SRC_URI = "${SOURCEFORGE_MIRROR}/net-snmp/net-snmp-${PV}.tar.gz \
            file://0001-config_os_headers-Error-Fix.patch \
            file://0001-snmplib-keytools.c-Don-t-check-for-return-from-EVP_M.patch \
            file://0001-get_pid_from_inode-Include-limit.h.patch \
-           file://0002-configure-fix-a-cc-check-issue.patch \
            file://0004-configure-fix-incorrect-variable.patch \
            file://net-snmp-5.7.2-fix-engineBoots-value-on-SIGHUP.patch \
            file://net-snmp-fix-for-disable-des.patch \
            file://reproducibility-have-printcap.patch \
            file://0001-ac_add_search_path.m4-keep-consistent-between-32bit.patch \
-           file://0001-snmpd-always-exit-after-displaying-usage.patch \
            "
-SRC_URI[sha256sum] = "eb7fd4a44de6cddbffd9a92a85ad1309e5c1054fb9d5a7dd93079c8953f48c3f"
+SRC_URI[sha256sum] = "2097f29b7e1bf3f1300b4bae52fa2308d0bb8d5d3998dbe02f9462a413a2ef0a"
 
 UPSTREAM_CHECK_URI = "https://sourceforge.net/projects/net-snmp/files/net-snmp/"
 UPSTREAM_CHECK_REGEX = "/net-snmp/(?P<pver>\d+(\.\d+)+)/"