From 5d677c0a902c7b0ae17481376e2c3ac42b142fc8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Josef=20=C5=98=C3=ADdk=C3=BD?= <jridky@redhat.com>
Date: Mon, 26 Feb 2024 16:38:33 +0100
Subject: [PATCH] Resolves: RHEL-26443 - fix FTBFS in com2sec tests

---
 net-snmp-5.9.4-test-fix.patch | 29 +++++++++++++++++++++++++++++
 net-snmp.spec                 |  7 ++++++-
 2 files changed, 35 insertions(+), 1 deletion(-)
 create mode 100644 net-snmp-5.9.4-test-fix.patch

diff --git a/net-snmp-5.9.4-test-fix.patch b/net-snmp-5.9.4-test-fix.patch
new file mode 100644
index 0000000..43fa8cc
--- /dev/null
+++ b/net-snmp-5.9.4-test-fix.patch
@@ -0,0 +1,29 @@
+diff -ruNp a/testing/fulltests/support/simple_eval_tools.sh b/testing/fulltests/support/simple_eval_tools.sh
+--- a/testing/fulltests/support/simple_eval_tools.sh	2024-02-26 14:36:03.641432345 +0100
++++ b/testing/fulltests/support/simple_eval_tools.sh	2024-02-26 14:38:15.946855878 +0100
+@@ -525,7 +525,6 @@ STARTPROG() {
+     if test -f $CFG_FILE; then
+ 	COMMAND="$COMMAND -C -c $CFG_FILE"
+     fi
+-    COMMAND="$COMMAND -f"
+     if [ "x$PORT_SPEC" != "x" ]; then
+         COMMAND="$COMMAND $PORT_SPEC"
+     fi
+@@ -537,10 +536,13 @@ STARTPROG() {
+         OUTPUTENVVARS $LOG_FILE.command
+         echo $COMMAND >> $LOG_FILE.command
+     fi
+-    {
+-	{ $COMMAND; } >$LOG_FILE.stdout 2>&1
+-	echo $? >$LOG_FILE.exitcode
+-    } &
++    if [ "x$OSTYPE" = "xmsys" ]; then
++      $COMMAND > $LOG_FILE.stdout 2>&1 &
++      ## COMMAND="cmd.exe //c start //min $COMMAND"
++      ## start $COMMAND > $LOG_FILE.stdout 2>&1
++    else
++      $COMMAND > $LOG_FILE.stdout 2>&1
++    fi
+ }
+ 
+ #------------------------------------ -o-
diff --git a/net-snmp.spec b/net-snmp.spec
index 888a078..7a97f6b 100644
--- a/net-snmp.spec
+++ b/net-snmp.spec
@@ -10,7 +10,7 @@
 Summary:    A collection of SNMP protocol tools and libraries
 Name:       net-snmp
 Version:    5.9.4
-Release:    3%{?dist}
+Release:    4%{?dist}
 Epoch:      1
 
 License:    Net-SNMP and OpenSSL
@@ -50,6 +50,7 @@ Patch20:    net-snmp-5.9.1-remove-des.patch
 Patch21:    net-snmp-libs-misunderstanding.patch
 Patch22:    net-snmp-5.9-ipv6-disable-leak.patch
 Patch23:    net-snmp-5.9-rpmdb.patch
+Patch24:    net-snmp-5.9.4-test-fix.patch
 
 # Modern RPM API means at least EL6
 Patch101:   net-snmp-5.8-modern-rpm-api.patch
@@ -239,6 +240,7 @@ cp %{SOURCE10} .
 %patch 21 -p1
 %patch 22 -p1 -b .ipv6-disable-leak
 %patch 23 -p1 -b .rpmdbpatch
+%patch 24 -p1 -b .test-fix
 
 %patch 101 -p1 -b .modern-rpm-api
 %patch 102 -p1
@@ -509,6 +511,9 @@ LD_LIBRARY_PATH=%{buildroot}/%{_libdir} make test
 %{_libdir}/libnetsnmptrapd*.so.%{soname}*
 
 %changelog
+* Mon Feb 26 2024 Josef Ridky <jridky@redhat.com> - 1:5.9.4-4
+- Fix FTBFS in com2sec tests (RHEL-26443)
+
 * Thu Jan 25 2024 Fedora Release Engineering <releng@fedoraproject.org> - 1:5.9.4-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild