summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--meta-networking/recipes-protocols/net-snmp/net-snmp/0001-Add-pkg-config-support-for-building-applications-and.patch24
-rw-r--r--meta-networking/recipes-protocols/net-snmp/net-snmp/0001-config_os_headers-Error-Fix.patch10
-rw-r--r--meta-networking/recipes-protocols/net-snmp/net-snmp/0001-net-snmp-fix-compile-error-disable-des.patch14
-rw-r--r--meta-networking/recipes-protocols/net-snmp/net-snmp/net-snmp-add-knob-whether-nlist.h-are-checked.patch15
4 files changed, 33 insertions, 30 deletions
diff --git a/meta-networking/recipes-protocols/net-snmp/net-snmp/0001-Add-pkg-config-support-for-building-applications-and.patch b/meta-networking/recipes-protocols/net-snmp/net-snmp/0001-Add-pkg-config-support-for-building-applications-and.patch
index 6cb9588eb1..dd159b9cec 100644
--- a/meta-networking/recipes-protocols/net-snmp/net-snmp/0001-Add-pkg-config-support-for-building-applications-and.patch
+++ b/meta-networking/recipes-protocols/net-snmp/net-snmp/0001-Add-pkg-config-support-for-building-applications-and.patch
@@ -1,4 +1,4 @@
1From aea8c2f0bf8004c8da8ca9acb04ab07798cd8068 Mon Sep 17 00:00:00 2001 1From 4bf83597379523032663c8e95b3786a217c9a849 Mon Sep 17 00:00:00 2001
2From: Hugh McMaster <hugh.mcmaster@outlook.com> 2From: Hugh McMaster <hugh.mcmaster@outlook.com>
3Date: Wed, 3 Apr 2019 21:36:03 +1100 3Date: Wed, 3 Apr 2019 21:36:03 +1100
4Subject: [PATCH] Add pkg-config support for building applications and 4Subject: [PATCH] Add pkg-config support for building applications and
@@ -10,10 +10,8 @@ The netsnmp-agent package should be used when building Net-SNMP subagents.
10Signed-off-by: Hugh McMaster <hugh.mcmaster@outlook.com> 10Signed-off-by: Hugh McMaster <hugh.mcmaster@outlook.com>
11[ bvanassche: edited makefile code and .pc files; added ./configure changes ] 11[ bvanassche: edited makefile code and .pc files; added ./configure changes ]
12 12
13
14Upstream-Status: Backport 13Upstream-Status: Backport
15https://sourceforge.net/p/net-snmp/patches/_discuss/thread/a0d66e91dd/f940/attachment/0001-Add-pkg-config-support-for-building-applications-and.patch 14https://sourceforge.net/p/net-snmp/patches/_discuss/thread/a0d66e91dd/f940/attachment/0001-Add-pkg-config-support-for-building-applications-and.patch
16
17--- 15---
18 Makefile.in | 2 ++ 16 Makefile.in | 2 ++
19 Makefile.rules | 30 ++++++++++++++++++++++++++---- 17 Makefile.rules | 30 ++++++++++++++++++++++++++----
@@ -26,7 +24,7 @@ https://sourceforge.net/p/net-snmp/patches/_discuss/thread/a0d66e91dd/f940/attac
26 create mode 100644 netsnmp.pc.in 24 create mode 100644 netsnmp.pc.in
27 25
28diff --git a/Makefile.in b/Makefile.in 26diff --git a/Makefile.in b/Makefile.in
29index 9dbdde1353b1..ec972636c279 100644 27index 9dbdde1353..ec972636c2 100644
30--- a/Makefile.in 28--- a/Makefile.in
31+++ b/Makefile.in 29+++ b/Makefile.in
32@@ -35,6 +35,7 @@ INSTALLBUILTHEADERS=include/net-snmp/net-snmp-config.h 30@@ -35,6 +35,7 @@ INSTALLBUILTHEADERS=include/net-snmp/net-snmp-config.h
@@ -46,7 +44,7 @@ index 9dbdde1353b1..ec972636c279 100644
46 rm -f include/net-snmp/agent/mib_module_config.h \ 44 rm -f include/net-snmp/agent/mib_module_config.h \
47 include/net-snmp/agent/agent_module_config.h \ 45 include/net-snmp/agent/agent_module_config.h \
48diff --git a/Makefile.rules b/Makefile.rules 46diff --git a/Makefile.rules b/Makefile.rules
49index 9e9e9009e5d2..e714f91e725e 100644 47index 9e9e9009e5..e714f91e72 100644
50--- a/Makefile.rules 48--- a/Makefile.rules
51+++ b/Makefile.rules 49+++ b/Makefile.rules
52@@ -85,12 +85,14 @@ subdirs: 50@@ -85,12 +85,14 @@ subdirs:
@@ -96,10 +94,10 @@ index 9e9e9009e5d2..e714f91e725e 100644
96 # normal bin binaries 94 # normal bin binaries
97 # 95 #
98diff --git a/configure b/configure 96diff --git a/configure b/configure
99index 5ec44f5ce082..5103a4dc9d88 100755 97index cad6b74486..8909bffe05 100755
100--- a/configure 98--- a/configure
101+++ b/configure 99+++ b/configure
102@@ -30422,6 +30422,8 @@ ac_config_files="$ac_config_files net-snmp-config:net-snmp-config.in" 100@@ -31717,6 +31717,8 @@ ac_config_files="$ac_config_files net-snmp-config:net-snmp-config.in"
103 101
104 ac_config_files="$ac_config_files net-snmp-create-v3-user:net-snmp-create-v3-user.in" 102 ac_config_files="$ac_config_files net-snmp-create-v3-user:net-snmp-create-v3-user.in"
105 103
@@ -108,7 +106,7 @@ index 5ec44f5ce082..5103a4dc9d88 100755
108 ac_config_files="$ac_config_files dist/generation-scripts/gen-variables:dist/generation-scripts/gen-variables.in" 106 ac_config_files="$ac_config_files dist/generation-scripts/gen-variables:dist/generation-scripts/gen-variables.in"
109 107
110 ac_config_files="$ac_config_files local/snmpconf" 108 ac_config_files="$ac_config_files local/snmpconf"
111@@ -31445,6 +31447,8 @@ do 109@@ -32740,6 +32742,8 @@ do
112 "mibs/Makefile") CONFIG_FILES="$CONFIG_FILES mibs/Makefile:Makefile.top:mibs/Makefile.in:Makefile.rules" ;; 110 "mibs/Makefile") CONFIG_FILES="$CONFIG_FILES mibs/Makefile:Makefile.top:mibs/Makefile.in:Makefile.rules" ;;
113 "net-snmp-config") CONFIG_FILES="$CONFIG_FILES net-snmp-config:net-snmp-config.in" ;; 111 "net-snmp-config") CONFIG_FILES="$CONFIG_FILES net-snmp-config:net-snmp-config.in" ;;
114 "net-snmp-create-v3-user") CONFIG_FILES="$CONFIG_FILES net-snmp-create-v3-user:net-snmp-create-v3-user.in" ;; 112 "net-snmp-create-v3-user") CONFIG_FILES="$CONFIG_FILES net-snmp-create-v3-user:net-snmp-create-v3-user.in" ;;
@@ -118,10 +116,10 @@ index 5ec44f5ce082..5103a4dc9d88 100755
118 "local/snmpconf") CONFIG_FILES="$CONFIG_FILES local/snmpconf" ;; 116 "local/snmpconf") CONFIG_FILES="$CONFIG_FILES local/snmpconf" ;;
119 "default") CONFIG_COMMANDS="$CONFIG_COMMANDS default" ;; 117 "default") CONFIG_COMMANDS="$CONFIG_COMMANDS default" ;;
120diff --git a/configure.ac b/configure.ac 118diff --git a/configure.ac b/configure.ac
121index 4c4dce09d488..d62a02da5d88 100644 119index 1622b7c051..898b50f368 100644
122--- a/configure.ac 120--- a/configure.ac
123+++ b/configure.ac 121+++ b/configure.ac
124@@ -136,6 +136,7 @@ AC_CONFIG_FILES([net-snmp-config:net-snmp-config.in], 122@@ -118,6 +118,7 @@ AC_CONFIG_FILES([net-snmp-config:net-snmp-config.in],
125 [chmod +x net-snmp-config]) 123 [chmod +x net-snmp-config])
126 AC_CONFIG_FILES([net-snmp-create-v3-user:net-snmp-create-v3-user.in], 124 AC_CONFIG_FILES([net-snmp-create-v3-user:net-snmp-create-v3-user.in],
127 [chmod +x net-snmp-create-v3-user]) 125 [chmod +x net-snmp-create-v3-user])
@@ -131,7 +129,7 @@ index 4c4dce09d488..d62a02da5d88 100644
131 129
132diff --git a/netsnmp-agent.pc.in b/netsnmp-agent.pc.in 130diff --git a/netsnmp-agent.pc.in b/netsnmp-agent.pc.in
133new file mode 100644 131new file mode 100644
134index 000000000000..3a1c77bbf814 132index 0000000000..3a1c77bbf8
135--- /dev/null 133--- /dev/null
136+++ b/netsnmp-agent.pc.in 134+++ b/netsnmp-agent.pc.in
137@@ -0,0 +1,12 @@ 135@@ -0,0 +1,12 @@
@@ -149,7 +147,7 @@ index 000000000000..3a1c77bbf814
149+Libs.private: @LDFLAGS@ @LMIBLIBS@ @LAGENTLIBS@ @PERLLDOPTS_FOR_APPS@ @LNETSNMPLIBS@ @LIBS@ 147+Libs.private: @LDFLAGS@ @LMIBLIBS@ @LAGENTLIBS@ @PERLLDOPTS_FOR_APPS@ @LNETSNMPLIBS@ @LIBS@
150diff --git a/netsnmp.pc.in b/netsnmp.pc.in 148diff --git a/netsnmp.pc.in b/netsnmp.pc.in
151new file mode 100644 149new file mode 100644
152index 000000000000..0a1f5785a4f4 150index 0000000000..0a1f5785a4
153--- /dev/null 151--- /dev/null
154+++ b/netsnmp.pc.in 152+++ b/netsnmp.pc.in
155@@ -0,0 +1,12 @@ 153@@ -0,0 +1,12 @@
@@ -166,5 +164,5 @@ index 000000000000..0a1f5785a4f4
166+Libs: -L${libdir} -lnetsnmp 164+Libs: -L${libdir} -lnetsnmp
167+Libs.private: @LDFLAGS@ @LNETSNMPLIBS@ @LIBS@ @PERLLDOPTS_FOR_APPS@ 165+Libs.private: @LDFLAGS@ @LNETSNMPLIBS@ @LIBS@ @PERLLDOPTS_FOR_APPS@
168-- 166--
1692.21.0.196.g041f5ea1cf98 1672.26.2
170 168
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 bfc55a08ac..5ad7470c90 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 @@
1From 7ae2ce8dbf1c54d4e2db4a5f49397a239baadc49 Mon Sep 17 00:00:00 2001 1From 2ad4df6d503be72a8910c3087611adb33d77ffde Mon Sep 17 00:00:00 2001
2From: Li xin <lixin.fnst@cn.fujitsu.com> 2From: Li xin <lixin.fnst@cn.fujitsu.com>
3Date: Fri, 21 Aug 2015 18:23:13 +0900 3Date: Fri, 21 Aug 2015 18:23:13 +0900
4Subject: [PATCH] config_os_headers: Error Fix 4Subject: [PATCH] config_os_headers: Error Fix
@@ -13,16 +13,15 @@ conftest.c:168:17: fatal error: pkg.h: No such file or directory
13Upstream-Status: pending 13Upstream-Status: pending
14 14
15Signed-off-by: Li Xin <lixin.fnst@cn.fujitsu.com> 15Signed-off-by: Li Xin <lixin.fnst@cn.fujitsu.com>
16
17--- 16---
18 configure.d/config_os_headers | 4 ++-- 17 configure.d/config_os_headers | 4 ++--
19 1 file changed, 2 insertions(+), 2 deletions(-) 18 1 file changed, 2 insertions(+), 2 deletions(-)
20 19
21diff --git a/configure.d/config_os_headers b/configure.d/config_os_headers 20diff --git a/configure.d/config_os_headers b/configure.d/config_os_headers
22index af99746..83b2e31 100644 21index 2fdb5a35d6..0272f02c8e 100644
23--- a/configure.d/config_os_headers 22--- a/configure.d/config_os_headers
24+++ b/configure.d/config_os_headers 23+++ b/configure.d/config_os_headers
25@@ -489,8 +489,8 @@ then 24@@ -487,8 +487,8 @@ then
26 unset ac_cv_header_pkg_h 25 unset ac_cv_header_pkg_h
27 netsnmp_save_CPPFLAGS="$CPPFLAGS" 26 netsnmp_save_CPPFLAGS="$CPPFLAGS"
28 netsnmp_save_LDFLAGS="$LDFLAGS" 27 netsnmp_save_LDFLAGS="$LDFLAGS"
@@ -33,3 +32,6 @@ index af99746..83b2e31 100644
33 AC_CHECK_HEADERS(pkg.h, 32 AC_CHECK_HEADERS(pkg.h,
34 NETSNMP_SEARCH_LIBS(pkg_init, pkg, 33 NETSNMP_SEARCH_LIBS(pkg_init, pkg,
35 AC_DEFINE(HAVE_LIBPKG, 1, [define if you have BSD pkg-ng]))) 34 AC_DEFINE(HAVE_LIBPKG, 1, [define if you have BSD pkg-ng])))
35--
362.26.2
37
diff --git a/meta-networking/recipes-protocols/net-snmp/net-snmp/0001-net-snmp-fix-compile-error-disable-des.patch b/meta-networking/recipes-protocols/net-snmp/net-snmp/0001-net-snmp-fix-compile-error-disable-des.patch
index 7e686ce7fe..33a1e745fa 100644
--- a/meta-networking/recipes-protocols/net-snmp/net-snmp/0001-net-snmp-fix-compile-error-disable-des.patch
+++ b/meta-networking/recipes-protocols/net-snmp/net-snmp/0001-net-snmp-fix-compile-error-disable-des.patch
@@ -1,4 +1,4 @@
1From e38c508ef401593b1d4fe42b62e42a49cfec82af Mon Sep 17 00:00:00 2001 1From 383e67e359b89abe0440597ce414297892ade511 Mon Sep 17 00:00:00 2001
2From: Changqing Li <changqing.li@windriver.com> 2From: Changqing Li <changqing.li@windriver.com>
3Date: Tue, 26 Feb 2019 14:26:07 +0800 3Date: Tue, 26 Feb 2019 14:26:07 +0800
4Subject: [PATCH] net-snmp: fix compile error with --disable-des 4Subject: [PATCH] net-snmp: fix compile error with --disable-des
@@ -12,12 +12,12 @@ Subject: [PATCH] net-snmp: fix compile error with --disable-des
12pad_size is defined only without --disable-des 12pad_size is defined only without --disable-des
13[snip] 13[snip]
14#ifndef NETSNMP_DISABLE_DES 14#ifndef NETSNMP_DISABLE_DES
15 int pad, plast, pad_size = 0; 15 int pad, plast, pad_size = 0;
16 16
17but used when disable-des, 17but used when disable-des,
18[snip] 18[snip]
19 QUITFUN(SNMPERR_GENERR, sc_encrypt_quit); 19 QUITFUN(SNMPERR_GENERR, sc_encrypt_quit);
20 } 20 }
21 pad_size = pai->pad_size; 21 pad_size = pai->pad_size;
22 22
23 memset(my_iv, 0, sizeof(my_iv)); 23 memset(my_iv, 0, sizeof(my_iv));
@@ -37,10 +37,10 @@ Signed-off-by: Changqing Li <changqing.li@windriver.com>
37 1 file changed, 2 insertions(+), 1 deletion(-) 37 1 file changed, 2 insertions(+), 1 deletion(-)
38 38
39diff --git a/snmplib/scapi.c b/snmplib/scapi.c 39diff --git a/snmplib/scapi.c b/snmplib/scapi.c
40index 43caddf..c09deb0 100644 40index 8ad1d70d90..8c6882d9ab 100644
41--- a/snmplib/scapi.c 41--- a/snmplib/scapi.c
42+++ b/snmplib/scapi.c 42+++ b/snmplib/scapi.c
43@@ -1253,7 +1253,6 @@ sc_encrypt(const oid * privtype, size_t privtypelen, 43@@ -1251,7 +1251,6 @@ sc_encrypt(const oid * privtype, size_t privtypelen,
44 44
45 QUITFUN(SNMPERR_GENERR, sc_encrypt_quit); 45 QUITFUN(SNMPERR_GENERR, sc_encrypt_quit);
46 } 46 }
@@ -48,7 +48,7 @@ index 43caddf..c09deb0 100644
48 48
49 memset(my_iv, 0, sizeof(my_iv)); 49 memset(my_iv, 0, sizeof(my_iv));
50 50
51@@ -1263,6 +1262,8 @@ sc_encrypt(const oid * privtype, size_t privtypelen, 51@@ -1261,6 +1260,8 @@ sc_encrypt(const oid * privtype, size_t privtypelen,
52 /* 52 /*
53 * now calculate the padding needed 53 * now calculate the padding needed
54 */ 54 */
@@ -58,5 +58,5 @@ index 43caddf..c09deb0 100644
58 plast = (int) ptlen - (pad_size - pad); 58 plast = (int) ptlen - (pad_size - pad);
59 if (pad == pad_size) 59 if (pad == pad_size)
60-- 60--
612.7.4 612.26.2
62 62
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 74b0c12e05..fb773e6388 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,7 @@
1net-snmp: add knob whether nlist.h are checked 1From a1134a31d417cc05a1fdb094f613a00a7a5e7ac5 Mon Sep 17 00:00:00 2001
2From: Chong Lu <Chong.Lu@windriver.com>
3Date: Thu, 28 May 2020 09:46:34 -0500
4Subject: [PATCH] net-snmp: add knob whether nlist.h are checked
2 5
3Previously, it still was checked when there was no nlish.h in sysroots directory. 6Previously, it still was checked when there was no nlish.h in sysroots directory.
4Add knob to decide whether nlist.h are checked or not. 7Add knob to decide whether nlist.h are checked or not.
@@ -7,14 +10,14 @@ Upstream-status: Pending
7 10
8Signed-off-by: Chong Lu <Chong.Lu@windriver.com> 11Signed-off-by: Chong Lu <Chong.Lu@windriver.com>
9--- 12---
10 configure.d/config_os_headers | 2 ++ 13 configure.d/config_os_headers | 2 ++
11 1 file changed, 2 insertions(+) 14 1 file changed, 2 insertions(+)
12 15
13diff --git a/configure.d/config_os_headers b/configure.d/config_os_headers 16diff --git a/configure.d/config_os_headers b/configure.d/config_os_headers
14index d903f58..a05d30e 100644 17index 2fdb5a35d6..af997461d5 100644
15--- a/configure.d/config_os_headers 18--- a/configure.d/config_os_headers
16+++ b/configure.d/config_os_headers 19+++ b/configure.d/config_os_headers
17@@ -31,6 +31,7 @@ AC_CHECK_HEADERS([getopt.h pthread.h regex.h ] dnl 20@@ -32,6 +32,7 @@ AC_CHECK_HEADERS([getopt.h pthread.h regex.h ] dnl
18 [sys/un.h ]) 21 [sys/un.h ])
19 22
20 # Library and Agent: 23 # Library and Agent:
@@ -22,7 +25,7 @@ index d903f58..a05d30e 100644
22 AC_CHECK_HEADERS([nlist.h],,,[ 25 AC_CHECK_HEADERS([nlist.h],,,[
23 AC_INCLUDES_DEFAULT 26 AC_INCLUDES_DEFAULT
24 [ 27 [
25@@ -38,6 +39,7 @@ AC_INCLUDES_DEFAULT 28@@ -39,6 +40,7 @@ AC_INCLUDES_DEFAULT
26 #define LIBBSD_DISABLE_DEPRECATED 1 29 #define LIBBSD_DISABLE_DEPRECATED 1
27 #endif 30 #endif
28 ]]) 31 ]])
@@ -31,5 +34,5 @@ index d903f58..a05d30e 100644
31 # Library: 34 # Library:
32 AC_CHECK_HEADERS([fcntl.h io.h kstat.h ] dnl 35 AC_CHECK_HEADERS([fcntl.h io.h kstat.h ] dnl
33-- 36--
341.7.9.5 372.26.2
35 38
generated by cgit v1.2.3-54-g00ecf (git 2.39.0) at 2025-10-22 17:47:02 +0000