[packages/net-snmp] - fix building with openssl 3.0.0, rel 6

baggins baggins at pld-linux.org
Tue Oct 5 22:18:37 CEST 2021


commit bfed5516ddf1fd9b0132605d5b762f20fef61e30
Author: Jan Rękorajski <baggins at pld-linux.org>
Date:   Tue Oct 5 22:18:16 2021 +0200

    - fix building with openssl 3.0.0, rel 6

 net-snmp.spec  |  4 +++-
 openssl3.patch | 24 ++++++++++++++++++++++++
 2 files changed, 27 insertions(+), 1 deletion(-)
---
diff --git a/net-snmp.spec b/net-snmp.spec
index 36d53b7..dbc3c19 100644
--- a/net-snmp.spec
+++ b/net-snmp.spec
@@ -25,7 +25,7 @@ Summary(ru.UTF-8):	Набор утилит для протокола SNMP от U
 Summary(uk.UTF-8):	Набір утиліт для протоколу SNMP від UC-Davis
 Name:		net-snmp
 Version:	5.9
-Release:	5
+Release:	6
 License:	BSD-like
 Group:		Networking/Daemons
 Source0:	http://downloads.sourceforge.net/net-snmp/%{name}-%{version}.tar.gz
@@ -54,6 +54,7 @@ Patch12:	%{name}-TCP_STATS_CACHE_TIMEOUT.patch
 Patch13:	%{name}-logging.patch
 Patch14:	%{name}-Remove-U64-typedef.patch
 Patch15:	1314610.patch
+Patch16:	openssl3.patch
 URL:		http://www.net-snmp.org/
 BuildRequires:	autoconf >= 2.63
 BuildRequires:	automake
@@ -478,6 +479,7 @@ SNMP dla trzech wersji tego protokołu (SNMPv3, SNMPv2c, SNMPv1).
 %patch13 -p1
 %patch14 -p1
 %patch15 -p1
+%patch16 -p1
 
 %{__sed} -E -i -e '1s,#!\s*/usr/bin/env\s+perl(\s|$),#!%{__perl}\1,' \
       perl/SNMP/examples/pingmib.pl
diff --git a/openssl3.patch b/openssl3.patch
new file mode 100644
index 0000000..ad30114
--- /dev/null
+++ b/openssl3.patch
@@ -0,0 +1,24 @@
+--- net-snmp-5.9/configure.d/config_os_libs2~	2020-08-14 23:41:47.000000000 +0200
++++ net-snmp-5.9/configure.d/config_os_libs2	2021-10-05 22:08:41.470701151 +0200
+@@ -338,7 +338,7 @@
+             LIBS="$netsnmp_save_LIBS"
+         fi
+         netsnmp_save_LIBS="$LIBS"
+-        LIBS="-lssl"
++        LIBS="-lssl -lcrypto"
+         AC_CHECK_FUNCS([TLS_method TLSv1_method DTLS_method DTLSv1_method]dnl
+                        [SSL_library_init SSL_load_error_strings]dnl
+ 		       [ERR_get_error_all])
+--- net-snmp-5.9/snmplib/snmp_openssl.c~	2020-08-14 23:41:47.000000000 +0200
++++ net-snmp-5.9/snmplib/snmp_openssl.c	2021-10-05 22:13:02.946834772 +0200
+@@ -901,8 +901,8 @@
+     unsigned long err;
+     for (err = ERR_get_error(); err; err = ERR_get_error()) {
+         snmp_log(LOG_ERR,"%s: %ld\n", prefix ? prefix: "openssl error", err);
+-        snmp_log(LOG_ERR, "library=%d, function=%d, reason=%d\n",
+-                 ERR_GET_LIB(err), ERR_GET_FUNC(err), ERR_GET_REASON(err));
++        snmp_log(LOG_ERR, "library=%d, reason=%d\n",
++                 ERR_GET_LIB(err), ERR_GET_REASON(err));
+     }
+ }
+ #endif /* NETSNMP_FEATURE_REMOVE_OPENSSL_ERR_LOG */
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/net-snmp.git/commitdiff/bfed5516ddf1fd9b0132605d5b762f20fef61e30



More information about the pld-cvs-commit mailing list