explicitly link netsnmp to our openssl build

remove patch that wants to ensure version 1.0.2 CMK-14374 Change-Id: I4ee51ab80706b5da9373352c1a5d92305512462f
HeinleinSupport · Nov 15, 2023 · 0415ad5 · 0415ad5
1 parent ba2276b
commit 0415ad5
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 25 deletions.
diff --git 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