diff --git a/omd/packages/net-snmp/net-snmp.make b/omd/packages/net-snmp/net-snmp.make index 3f4d4cba9c1..816b977337f 100644 --- a/omd/packages/net-snmp/net-snmp.make +++ b/omd/packages/net-snmp/net-snmp.make @@ -2,7 +2,7 @@ NET_SNMP := net-snmp NET_SNMP_VERS := 5.9.1 NET_SNMP_DIR := $(NET_SNMP)-$(NET_SNMP_VERS) # Increase this to enforce a recreation of the build cache -NET_SNMP_BUILD_ID := 5 +NET_SNMP_BUILD_ID := 6 # The cached package contains the python major/minor version, so include this in the cache name in order to trigger # a rebuild on a python version change. NET_SNMP_BUILD_ID := $(NET_SNMP_BUILD_ID)-python$(PYTHON_MAJOR_DOT_MINOR) @@ -33,6 +33,7 @@ $(NET_SNMP_BUILD): $(NET_SNMP_PATCHING) $(PYTHON_CACHE_PKG_PROCESS) $(PERL_MODUL --with-mibdirs="\$$HOME/local/share/snmp/mibs:\$$HOME/share/snmp/mibs:/usr/share/snmp/mibs" \ --with-defaults \ --disable-scripts \ + --with-openssl=$(PACKAGE_OPENSSL_DESTDIR) \ --prefix="/" && $(MAKE) $(TOUCH) $@ diff --git a/omd/packages/net-snmp/patches/0012-Ensure-correct-openssl-version.dif b/omd/packages/net-snmp/patches/0012-Ensure-correct-openssl-version.dif deleted file mode 100644 index f8a24e3020c..00000000000 --- a/omd/packages/net-snmp/patches/0012-Ensure-correct-openssl-version.dif +++ /dev/null @@ -1,24 +0,0 @@ -Subject: Ensure correct openssl version - -The dev package does not depend on openssl headers which means 1.0.2 and 1.1.0 -can be installed. If cert_util.h functionality is used by 3rd party then it -should be ensured that it is linked and compiled against 1.0.2. - -Signed-off-by: Sebastian Andrzej Siewior ---- - include/net-snmp/library/cert_util.h | 4 ++++ - 1 file changed, 4 insertions(+) - ---- a/include/net-snmp/library/cert_util.h -+++ b/include/net-snmp/library/cert_util.h -@@ -9,6 +9,10 @@ - #error "must include before cert_util.h" - #endif - -+#if OPENSSL_VERSION_NUMBER >= 0x10100000 -+#error This needs to be compiled against openssl 1.0.2. -+#endif -+ - #ifdef __cplusplus - extern "C" { - #endif