diff options
14 files changed, 38 insertions, 126 deletions
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..0eeddf752 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 @@ | |||
1 | From 6f8ea2e841ad45eed193310b599d3f3b410ae91d Mon Sep 17 00:00:00 2001 | 1 | From 98c62e24fdd05d7e8bd8149840bad8eb0feb3fb1 Mon Sep 17 00:00:00 2001 |
2 | From: Mingli Yu <mingli.yu@windriver.com> | 2 | From: Mingli Yu <mingli.yu@windriver.com> |
3 | Date: Fri, 29 Jan 2021 08:49:15 +0000 | 3 | Date: Fri, 29 Jan 2021 08:49:15 +0000 |
4 | Subject: [PATCH] ac_add_search_path.m4: keep consistent between 32bit and 64bit | 4 | Subject: [PATCH] ac_add_search_path.m4: keep consistent between 32bit and |
5 | 64bit | ||
5 | 6 | ||
6 | With configure option "--with-openssl=${STAGING_EXECPREFIXDIR}", it behaves | 7 | With configure option "--with-openssl=${STAGING_EXECPREFIXDIR}", it behaves |
7 | differently between 32bit and 64bit system as the openssl lib resides under | 8 | 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. | |||
15 | Upstream-Status: Inappropriate [configuration specific] | 16 | Upstream-Status: Inappropriate [configuration specific] |
16 | 17 | ||
17 | Signed-off-by: Mingli Yu <mingli.yu@windriver.com> | 18 | Signed-off-by: Mingli Yu <mingli.yu@windriver.com> |
19 | |||
18 | --- | 20 | --- |
19 | m4/ac_add_search_path.m4 | 4 ++-- | 21 | m4/ac_add_search_path.m4 | 4 ++-- |
20 | 1 file changed, 2 insertions(+), 2 deletions(-) | 22 | 1 file changed, 2 insertions(+), 2 deletions(-) |
21 | 23 | ||
22 | diff --git a/m4/ac_add_search_path.m4 b/m4/ac_add_search_path.m4 | 24 | diff --git a/m4/ac_add_search_path.m4 b/m4/ac_add_search_path.m4 |
23 | index 8e0a819..961f587 100644 | 25 | index 8e0a819..e9585bc 100644 |
24 | --- a/m4/ac_add_search_path.m4 | 26 | --- a/m4/ac_add_search_path.m4 |
25 | +++ b/m4/ac_add_search_path.m4 | 27 | +++ b/m4/ac_add_search_path.m4 |
26 | @@ -3,8 +3,8 @@ dnl Add a search path to the LIBS and CPPFLAGS variables | 28 | @@ -3,8 +3,8 @@ dnl Add a search path to the LIBS and CPPFLAGS variables |
@@ -34,6 +36,3 @@ index 8e0a819..961f587 100644 | |||
34 | fi | 36 | fi |
35 | if test -d $1/include; then | 37 | if test -d $1/include; then |
36 | CPPFLAGS="-I$1/include $CPPFLAGS" | 38 | CPPFLAGS="-I$1/include $CPPFLAGS" |
37 | -- | ||
38 | 2.29.2 | ||
39 | |||
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 @@ | |||
1 | From 69d4c517c07f55c505090e48d96ace8cd599fb26 Mon Sep 17 00:00:00 2001 | 1 | From e86d5fd52f19b85da0b7cce660c6e65ec4c0f9bb Mon Sep 17 00:00:00 2001 |
2 | From: Li xin <lixin.fnst@cn.fujitsu.com> | 2 | From: Li xin <lixin.fnst@cn.fujitsu.com> |
3 | Date: Fri, 21 Aug 2015 18:23:13 +0900 | 3 | Date: Fri, 21 Aug 2015 18:23:13 +0900 |
4 | Subject: [PATCH] config_os_headers: Error Fix | 4 | Subject: [PATCH] config_os_headers: Error Fix |
@@ -19,7 +19,7 @@ Signed-off-by: Li Xin <lixin.fnst@cn.fujitsu.com> | |||
19 | 1 file changed, 2 insertions(+), 2 deletions(-) | 19 | 1 file changed, 2 insertions(+), 2 deletions(-) |
20 | 20 | ||
21 | diff --git a/configure.d/config_os_headers b/configure.d/config_os_headers | 21 | diff --git a/configure.d/config_os_headers b/configure.d/config_os_headers |
22 | index f07d512..2363b42 100644 | 22 | index 01c3376..6edd85f 100644 |
23 | --- a/configure.d/config_os_headers | 23 | --- a/configure.d/config_os_headers |
24 | +++ b/configure.d/config_os_headers | 24 | +++ b/configure.d/config_os_headers |
25 | @@ -395,8 +395,8 @@ then | 25 | @@ -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 @@ | |||
1 | From 2bf1bbe1d428ed06d57aa76b03e394b72ff2216d Mon Sep 17 00:00:00 2001 | 1 | From 8097734b27fd146f358a4edd0d1a0d28309bd9a4 Mon Sep 17 00:00:00 2001 |
2 | From: Khem Raj <raj.khem@gmail.com> | 2 | From: Khem Raj <raj.khem@gmail.com> |
3 | Date: Fri, 22 Jul 2016 18:34:39 +0000 | 3 | Date: Fri, 22 Jul 2016 18:34:39 +0000 |
4 | Subject: [PATCH] get_pid_from_inode: Include limit.h | 4 | Subject: [PATCH] get_pid_from_inode: Include limit.h |
@@ -14,7 +14,7 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com> | |||
14 | 1 file changed, 1 insertion(+) | 14 | 1 file changed, 1 insertion(+) |
15 | 15 | ||
16 | diff --git a/agent/mibgroup/util_funcs/get_pid_from_inode.c b/agent/mibgroup/util_funcs/get_pid_from_inode.c | 16 | diff --git a/agent/mibgroup/util_funcs/get_pid_from_inode.c b/agent/mibgroup/util_funcs/get_pid_from_inode.c |
17 | index aee907d..7abaec2 100644 | 17 | index 5788e1d..ea380a6 100644 |
18 | --- a/agent/mibgroup/util_funcs/get_pid_from_inode.c | 18 | --- a/agent/mibgroup/util_funcs/get_pid_from_inode.c |
19 | +++ b/agent/mibgroup/util_funcs/get_pid_from_inode.c | 19 | +++ b/agent/mibgroup/util_funcs/get_pid_from_inode.c |
20 | @@ -6,6 +6,7 @@ | 20 | @@ -6,6 +6,7 @@ |
@@ -23,5 +23,5 @@ index aee907d..7abaec2 100644 | |||
23 | #include <ctype.h> | 23 | #include <ctype.h> |
24 | +#include <limits.h> | 24 | +#include <limits.h> |
25 | #include <stdio.h> | 25 | #include <stdio.h> |
26 | #if HAVE_STDLIB_H | 26 | #ifdef HAVE_STDLIB_H |
27 | #include <stdlib.h> | 27 | #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 @@ | |||
1 | From 94ca941e06bef157bf0e13251f8ca1471daa9393 Mon Sep 17 00:00:00 2001 | ||
2 | From: Kaarle Ritvanen <kaarle.ritvanen@datakunkku.fi> | ||
3 | Date: Fri, 27 Aug 2021 14:21:45 +0300 | ||
4 | Subject: [PATCH] snmpd: always exit after displaying usage | ||
5 | |||
6 | Currently, viewing the help text with -h results in snmpd being started | ||
7 | in the background, whereas this does not happen with --help. Similarly, | ||
8 | when an error is detected in command line syntax, the help text is | ||
9 | displayed but sometimes snmpd gets started anyway, depending on the | ||
10 | execution path. | ||
11 | |||
12 | This patch makes snmpd consistently terminate whenever the usage | ||
13 | function gets called. It also removes the goto statements no longer | ||
14 | needed. | ||
15 | |||
16 | Upstream-Status: Backport | ||
17 | [https://github.com/net-snmp/net-snmp/commit/94ca941e06bef157bf0e13251f8ca1471daa9393] | ||
18 | |||
19 | Signed-off-by: Yi Zhao <yi.zhao@windriver.com> | ||
20 | --- | ||
21 | agent/snmpd.c | 4 ++-- | ||
22 | 1 file changed, 2 insertions(+), 2 deletions(-) | ||
23 | |||
24 | diff --git a/agent/snmpd.c b/agent/snmpd.c | ||
25 | index f5aab0af8..90de12d99 100644 | ||
26 | --- a/agent/snmpd.c | ||
27 | +++ b/agent/snmpd.c | ||
28 | @@ -289,6 +289,8 @@ usage(char *prog) | ||
29 | " -S d|i|0-7\t\tuse -Ls <facility> instead\n" | ||
30 | "\n" | ||
31 | ); | ||
32 | + SOCK_CLEANUP; | ||
33 | + exit(1); | ||
34 | } | ||
35 | |||
36 | static void | ||
37 | @@ -494,7 +496,6 @@ main(int argc, char *argv[]) | ||
38 | case '-': | ||
39 | if (strcasecmp(optarg, "help") == 0) { | ||
40 | usage(argv[0]); | ||
41 | - goto out; | ||
42 | } | ||
43 | if (strcasecmp(optarg, "version") == 0) { | ||
44 | version(); | ||
45 | @@ -783,7 +784,6 @@ main(int argc, char *argv[]) | ||
46 | fprintf(stderr, "%s: Illegal argument -X:" | ||
47 | "AgentX support not compiled in.\n", argv[0]); | ||
48 | usage(argv[0]); | ||
49 | - goto out; | ||
50 | #endif | ||
51 | break; | ||
52 | |||
53 | -- | ||
54 | 2.25.1 | ||
55 | |||
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 @@ | |||
1 | From f3ff99736b8cccbba77349b0d10a3cee366a4c87 Mon Sep 17 00:00:00 2001 | 1 | From f4e1acd4f509dd26cf88da872bd5adcf884f4a5f Mon Sep 17 00:00:00 2001 |
2 | From: Khem Raj <raj.khem@gmail.com> | 2 | From: Khem Raj <raj.khem@gmail.com> |
3 | Date: Fri, 18 Sep 2015 00:28:45 -0400 | 3 | Date: Fri, 18 Sep 2015 00:28:45 -0400 |
4 | Subject: [PATCH] snmplib/keytools.c: Don't check for return from | 4 | Subject: [PATCH] snmplib/keytools.c: Don't check for return from |
@@ -17,7 +17,7 @@ Signed-off-by: Ovidiu Panait <ovidiu.panait@windriver.com> | |||
17 | 1 file changed, 1 insertion(+), 4 deletions(-) | 17 | 1 file changed, 1 insertion(+), 4 deletions(-) |
18 | 18 | ||
19 | diff --git a/snmplib/keytools.c b/snmplib/keytools.c | 19 | diff --git a/snmplib/keytools.c b/snmplib/keytools.c |
20 | index 129a7c0..2fc1efc 100644 | 20 | index 14a452a..fb1694b 100644 |
21 | --- a/snmplib/keytools.c | 21 | --- a/snmplib/keytools.c |
22 | +++ b/snmplib/keytools.c | 22 | +++ b/snmplib/keytools.c |
23 | @@ -183,10 +183,7 @@ generate_Ku(const oid * hashtype, u_int hashtype_len, | 23 | @@ -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 @@ | |||
1 | From 0a02ac779c51a2b4af3b58cb96967bf3eff80367 Mon Sep 17 00:00:00 2001 | ||
2 | From: Wenlin Kang <wenlin.kang@windriver.com> | ||
3 | Date: Wed, 24 May 2017 16:45:34 +0800 | ||
4 | Subject: [PATCH] configure: fix a cc check issue. | ||
5 | |||
6 | When has "." in cc value, the expression | ||
7 | $myperl -V:cc | $myperl -n -e 'print if (s/^\s*cc=.([-=\w\s\/]+).;\s*/$1/);' | ||
8 | can't get corretly the cc's value. | ||
9 | |||
10 | Signed-off-by: Wenlin Kang <wenlin.kang@windriver.com> | ||
11 | |||
12 | --- | ||
13 | configure.d/config_project_perl_python | 2 +- | ||
14 | 1 file changed, 1 insertion(+), 1 deletion(-) | ||
15 | |||
16 | diff --git a/configure.d/config_project_perl_python b/configure.d/config_project_perl_python | ||
17 | index 475c843..22d2ad3 100644 | ||
18 | --- a/configure.d/config_project_perl_python | ||
19 | +++ b/configure.d/config_project_perl_python | ||
20 | @@ -87,7 +87,7 @@ if test "x$install_perl" != "xno" ; then | ||
21 | if test "x$enable_perl_cc_checks" != "xno" ; then | ||
22 | AC_MSG_CHECKING([for Perl cc]) | ||
23 | changequote(, ) | ||
24 | - PERLCC=`$myperl -V:cc | $myperl -n -e 'print if (s/^\s*cc=.([-=\w\s\/]+).;\s*/$1/);'` | ||
25 | + PERLCC=`$myperl -V:cc | $myperl -n -e 'print if (s/^\s*cc=.([-=\.\w\s\/]+).;\s*/$1/);'` | ||
26 | changequote([, ]) | ||
27 | if test "x$PERLCC" != "x" ; then | ||
28 | 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 @@ | |||
1 | From 011bdcd07f2a289d0cfc1b411c03c0cc7c42dad1 Mon Sep 17 00:00:00 2001 | 1 | From 6d655ba677563ac9d62d4d8eee59fdb39d486c02 Mon Sep 17 00:00:00 2001 |
2 | From: Wenlin Kang <wenlin.kang@windriver.com> | 2 | From: Wenlin Kang <wenlin.kang@windriver.com> |
3 | Date: Wed, 24 May 2017 17:10:20 +0800 | 3 | Date: Wed, 24 May 2017 17:10:20 +0800 |
4 | Subject: [PATCH] configure: fix incorrect variable | 4 | Subject: [PATCH] configure: fix incorrect variable |
@@ -14,10 +14,10 @@ Signed-off-by: Wenlin Kang <wenlin.kang@windriver.com> | |||
14 | 1 file changed, 1 insertion(+), 1 deletion(-) | 14 | 1 file changed, 1 insertion(+), 1 deletion(-) |
15 | 15 | ||
16 | diff --git a/Makefile.in b/Makefile.in | 16 | diff --git a/Makefile.in b/Makefile.in |
17 | index 912f6b2..a53d1b2 100644 | 17 | index f1cbbf5..1545be3 100644 |
18 | --- a/Makefile.in | 18 | --- a/Makefile.in |
19 | +++ b/Makefile.in | 19 | +++ b/Makefile.in |
20 | @@ -174,7 +174,7 @@ OTHERCLEANTODOS=perlclean @PYTHONCLEANTARGS@ cleanfeatures perlcleanfeatures pyt | 20 | @@ -173,7 +173,7 @@ OTHERCLEANTODOS=perlclean @PYTHONCLEANTARGS@ cleanfeatures perlcleanfeatures pyt |
21 | # | 21 | # |
22 | # override LD_RUN_PATH to avoid dependencies on the build directory | 22 | # override LD_RUN_PATH to avoid dependencies on the build directory |
23 | perlmodules: perlmakefiles subdirs | 23 | 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 @@ | |||
1 | From 27444fbf8323679ea0551a3bd5f04c365143d8c0 Mon Sep 17 00:00:00 2001 | 1 | From ab1d77c52e84746e75506a2870783806bc77f396 Mon Sep 17 00:00:00 2001 |
2 | From: "Roy.Li" <rongqing.li@windriver.com> | 2 | From: "Roy.Li" <rongqing.li@windriver.com> |
3 | Date: Fri, 16 Jan 2015 14:14:01 +0800 | 3 | Date: Fri, 16 Jan 2015 14:14:01 +0800 |
4 | Subject: [PATCH] net-snmp: fix "libtool --finish" | 4 | Subject: [PATCH] net-snmp: fix "libtool --finish" |
@@ -20,11 +20,11 @@ Signed-off-by: Roy.Li <rongqing.li@windriver.com> | |||
20 | 1 file changed, 1 insertion(+), 1 deletion(-) | 20 | 1 file changed, 1 insertion(+), 1 deletion(-) |
21 | 21 | ||
22 | diff --git a/Makefile.top b/Makefile.top | 22 | diff --git a/Makefile.top b/Makefile.top |
23 | index 6315401..fc0ee06 100644 | 23 | index a962c54..1ba5607 100644 |
24 | --- a/Makefile.top | 24 | --- a/Makefile.top |
25 | +++ b/Makefile.top | 25 | +++ b/Makefile.top |
26 | @@ -89,7 +89,7 @@ LIBREVISION = 0 | 26 | @@ -89,7 +89,7 @@ LIBREVISION = 0 |
27 | LIB_LD_CMD = $(LIBTOOL) --mode=link $(LINKCC) $(CFLAGS) -rpath $(libdir) -version-info $(LIBCURRENT):$(LIBREVISION):$(LIBAGE) -o | 27 | LIB_LD_CMD = $(LIBTOOL) --mode=link $(LINKCC) $(CFLAGS) -rpath $(libdir) -version-info $(LIBCURRENT):$(LIBREVISION):$(LIBAGE) @LD_NO_UNDEFINED@ -o |
28 | LIB_EXTENSION = la | 28 | LIB_EXTENSION = la |
29 | LIB_VERSION = | 29 | LIB_VERSION = |
30 | -LIB_LDCONFIG_CMD = $(LIBTOOL) --mode=finish $(INSTALL_PREFIX)$(libdir) | 30 | -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..35e93d636 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 @@ | |||
1 | From 1e3178835217ba89aa355e2b6b88e490f17be16d Mon Sep 17 00:00:00 2001 | 1 | From 5ad4eab43c1ea63ff343bba64d576440e8783e75 Mon Sep 17 00:00:00 2001 |
2 | From: Zheng Ruoqin <zhengrq.fnst@fujitsu.com> | 2 | From: Zheng Ruoqin <zhengrq.fnst@fujitsu.com> |
3 | Date: Wed, 9 Jun 2021 15:47:30 +0900 | 3 | Date: Wed, 9 Jun 2021 15:47:30 +0900 |
4 | Subject: [PATCH] net snmp: fix engineBoots value on SIGHUP | 4 | Subject: [PATCH] net snmp: fix engineBoots value on SIGHUP |
@@ -7,6 +7,7 @@ Upstream-Status: Pending | |||
7 | 7 | ||
8 | Signed-off-by: Marian Florea <marian.florea@windriver.com> | 8 | Signed-off-by: Marian Florea <marian.florea@windriver.com> |
9 | Signed-off-by: Li Zhou <li.zhou@windriver.com> | 9 | Signed-off-by: Li Zhou <li.zhou@windriver.com> |
10 | Signed-off-by: Ovidiu Panait <ovidiu.panait@windriver.com> | ||
10 | 11 | ||
11 | --- | 12 | --- |
12 | agent/snmpd.c | 1 + | 13 | agent/snmpd.c | 1 + |
@@ -14,19 +15,19 @@ Signed-off-by: Li Zhou <li.zhou@windriver.com> | |||
14 | 2 files changed, 3 insertions(+), 2 deletions(-) | 15 | 2 files changed, 3 insertions(+), 2 deletions(-) |
15 | 16 | ||
16 | diff --git a/agent/snmpd.c b/agent/snmpd.c | 17 | diff --git a/agent/snmpd.c b/agent/snmpd.c |
17 | index 1af439f..355b510 100644 | 18 | index 90de12d..1ccc4db 100644 |
18 | --- a/agent/snmpd.c | 19 | --- a/agent/snmpd.c |
19 | +++ b/agent/snmpd.c | 20 | +++ b/agent/snmpd.c |
20 | @@ -1208,6 +1208,7 @@ receive(void) | 21 | @@ -1169,6 +1169,7 @@ snmpd_reconfig(void) |
21 | snmp_log(LOG_INFO, "NET-SNMP version %s restarted\n", | 22 | snmp_log(LOG_INFO, "NET-SNMP version %s restarted\n", |
22 | netsnmp_get_version()); | 23 | netsnmp_get_version()); |
23 | update_config(); | 24 | update_config(); |
24 | + snmp_store(app_name); | 25 | + snmp_store(app_name); |
25 | send_easy_trap(SNMP_TRAP_ENTERPRISESPECIFIC, 3); | 26 | send_easy_trap(SNMP_TRAP_ENTERPRISESPECIFIC, 3); |
26 | #if HAVE_SIGPROCMASK | 27 | #ifdef HAVE_SIGPROCMASK |
27 | ret = sigprocmask(SIG_UNBLOCK, &set, NULL); | 28 | ret = sigprocmask(SIG_UNBLOCK, &set, NULL); |
28 | diff --git a/snmplib/snmpv3.c b/snmplib/snmpv3.c | 29 | diff --git a/snmplib/snmpv3.c b/snmplib/snmpv3.c |
29 | index 29c2a0f..ada961c 100644 | 30 | index 7b1746b..4a17e0d 100644 |
30 | --- a/snmplib/snmpv3.c | 31 | --- a/snmplib/snmpv3.c |
31 | +++ b/snmplib/snmpv3.c | 32 | +++ b/snmplib/snmpv3.c |
32 | @@ -1059,9 +1059,9 @@ init_snmpv3_post_config(int majorid, int minorid, void *serverarg, | 33 | @@ -1059,9 +1059,9 @@ init_snmpv3_post_config(int majorid, int minorid, void *serverarg, |
@@ -41,6 +42,3 @@ index 29c2a0f..ada961c 100644 | |||
41 | engineBoots = 1; | 42 | engineBoots = 1; |
42 | } | 43 | } |
43 | 44 | ||
44 | -- | ||
45 | 2.25.1 | ||
46 | |||
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 @@ | |||
1 | From e507dcf8b29c55011f85d88bf05400d4717e4074 Mon Sep 17 00:00:00 2001 | 1 | From ad65b106d3cb3c6e595381be1c45a73c1ef6eb5e Mon Sep 17 00:00:00 2001 |
2 | From: Chong Lu <Chong.Lu@windriver.com> | 2 | From: Chong Lu <Chong.Lu@windriver.com> |
3 | Date: Thu, 28 May 2020 09:46:34 -0500 | 3 | Date: Thu, 28 May 2020 09:46:34 -0500 |
4 | Subject: [PATCH] net-snmp: add knob whether nlist.h are checked | 4 | Subject: [PATCH] net-snmp: add knob whether nlist.h are checked |
@@ -15,7 +15,7 @@ Signed-off-by: Chong Lu <Chong.Lu@windriver.com> | |||
15 | 1 file changed, 2 insertions(+) | 15 | 1 file changed, 2 insertions(+) |
16 | 16 | ||
17 | diff --git a/configure.d/config_os_headers b/configure.d/config_os_headers | 17 | diff --git a/configure.d/config_os_headers b/configure.d/config_os_headers |
18 | index 76ef58a..f07d512 100644 | 18 | index b9c8c31..01c3376 100644 |
19 | --- a/configure.d/config_os_headers | 19 | --- a/configure.d/config_os_headers |
20 | +++ b/configure.d/config_os_headers | 20 | +++ b/configure.d/config_os_headers |
21 | @@ -37,6 +37,7 @@ AC_CHECK_HEADERS([getopt.h pthread.h regex.h ] dnl | 21 | @@ -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 @@ | |||
1 | From 3ca4335ec1d6b7b384c134fc85d7a9e513c68376 Mon Sep 17 00:00:00 2001 | 1 | From b1b9980853b1083f0c8b9f628f8b4c3a484d4f91 Mon Sep 17 00:00:00 2001 |
2 | From: Jackie Huang <jackie.huang@windriver.com> | 2 | From: Jackie Huang <jackie.huang@windriver.com> |
3 | Date: Thu, 22 Jun 2017 10:25:08 +0800 | 3 | Date: Thu, 22 Jun 2017 10:25:08 +0800 |
4 | Subject: [PATCH] net-snmp: fix for --disable-des | 4 | Subject: [PATCH] net-snmp: fix for --disable-des |
@@ -15,7 +15,7 @@ Signed-off-by: Jackie Huang <jackie.huang@windriver.com> | |||
15 | 1 file changed, 2 insertions(+) | 15 | 1 file changed, 2 insertions(+) |
16 | 16 | ||
17 | diff --git a/snmplib/scapi.c b/snmplib/scapi.c | 17 | diff --git a/snmplib/scapi.c b/snmplib/scapi.c |
18 | index 00c9174..c6875e1 100644 | 18 | index 54fdd5c..0f7e931 100644 |
19 | --- a/snmplib/scapi.c | 19 | --- a/snmplib/scapi.c |
20 | +++ b/snmplib/scapi.c | 20 | +++ b/snmplib/scapi.c |
21 | @@ -85,7 +85,9 @@ netsnmp_feature_child_of(usm_scapi, usm_support); | 21 | @@ -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 @@ | |||
1 | From 972df16e9599dffddf5d714a4cbf43008c771122 Mon Sep 17 00:00:00 2001 | 1 | From 36a5656db7ea75dd15f35a6c1728937c6e2b901c Mon Sep 17 00:00:00 2001 |
2 | From: Jackie Huang <jackie.huang@windriver.com> | 2 | From: Jackie Huang <jackie.huang@windriver.com> |
3 | Date: Wed, 14 Jan 2015 15:10:06 +0800 | 3 | Date: Wed, 14 Jan 2015 15:10:06 +0800 |
4 | Subject: [PATCH] testing: add the output format for ptest | 4 | 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 @@ | |||
1 | From 84e362fe97f50fbad69f083bc2d8fe18f83eb2f7 Mon Sep 17 00:00:00 2001 | 1 | From b923cd38e2503b86aedf66b767fd7f51c9f25645 Mon Sep 17 00:00:00 2001 |
2 | From: "douglas.royds" <douglas.royds@taitradio.com> | 2 | From: "douglas.royds" <douglas.royds@taitradio.com> |
3 | Date: Wed, 21 Nov 2018 13:52:18 +1300 | 3 | Date: Wed, 21 Nov 2018 13:52:18 +1300 |
4 | Subject: [PATCH] net-snmp: Reproducibility: Don't check build host for | 4 | 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. | |||
13 | 1 file changed, 2 insertions(+), 2 deletions(-) | 13 | 1 file changed, 2 insertions(+), 2 deletions(-) |
14 | 14 | ||
15 | diff --git a/configure.d/config_os_misc4 b/configure.d/config_os_misc4 | 15 | diff --git a/configure.d/config_os_misc4 b/configure.d/config_os_misc4 |
16 | index 6f23c8e..8cea75a 100644 | 16 | index b6864d9..07ca922 100644 |
17 | --- a/configure.d/config_os_misc4 | 17 | --- a/configure.d/config_os_misc4 |
18 | +++ b/configure.d/config_os_misc4 | 18 | +++ b/configure.d/config_os_misc4 |
19 | @@ -99,9 +99,9 @@ if test x$LPSTAT_PATH != x; then | 19 | @@ -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 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 \ | |||
21 | file://0001-config_os_headers-Error-Fix.patch \ | 21 | file://0001-config_os_headers-Error-Fix.patch \ |
22 | file://0001-snmplib-keytools.c-Don-t-check-for-return-from-EVP_M.patch \ | 22 | file://0001-snmplib-keytools.c-Don-t-check-for-return-from-EVP_M.patch \ |
23 | file://0001-get_pid_from_inode-Include-limit.h.patch \ | 23 | file://0001-get_pid_from_inode-Include-limit.h.patch \ |
24 | file://0002-configure-fix-a-cc-check-issue.patch \ | ||
25 | file://0004-configure-fix-incorrect-variable.patch \ | 24 | file://0004-configure-fix-incorrect-variable.patch \ |
26 | file://net-snmp-5.7.2-fix-engineBoots-value-on-SIGHUP.patch \ | 25 | file://net-snmp-5.7.2-fix-engineBoots-value-on-SIGHUP.patch \ |
27 | file://net-snmp-fix-for-disable-des.patch \ | 26 | file://net-snmp-fix-for-disable-des.patch \ |
28 | file://reproducibility-have-printcap.patch \ | 27 | file://reproducibility-have-printcap.patch \ |
29 | file://0001-ac_add_search_path.m4-keep-consistent-between-32bit.patch \ | 28 | file://0001-ac_add_search_path.m4-keep-consistent-between-32bit.patch \ |
30 | file://0001-snmpd-always-exit-after-displaying-usage.patch \ | ||
31 | " | 29 | " |
32 | SRC_URI[sha256sum] = "eb7fd4a44de6cddbffd9a92a85ad1309e5c1054fb9d5a7dd93079c8953f48c3f" | 30 | SRC_URI[sha256sum] = "2097f29b7e1bf3f1300b4bae52fa2308d0bb8d5d3998dbe02f9462a413a2ef0a" |
33 | 31 | ||
34 | UPSTREAM_CHECK_URI = "https://sourceforge.net/projects/net-snmp/files/net-snmp/" | 32 | UPSTREAM_CHECK_URI = "https://sourceforge.net/projects/net-snmp/files/net-snmp/" |
35 | UPSTREAM_CHECK_REGEX = "/net-snmp/(?P<pver>\d+(\.\d+)+)/" | 33 | UPSTREAM_CHECK_REGEX = "/net-snmp/(?P<pver>\d+(\.\d+)+)/" |