add patches from fedora f40 to fix tests with new versions of openssl and python

SPECS/openvswitch/0001-tests-Fix-SSL-db-implementation-test-with-openssl-3..patch

@@ -0,0 +1,38 @@
+From 7c4c453945ce68b04f36162637dac8a651a1601a Mon Sep 17 00:00:00 2001
+Message-ID: <7c4c453945ce68b04f36162637dac8a651a1601a.1709801660.git.tredaelli@redhat.com>
+From: Timothy Redaelli <tredaelli@redhat.com>
+Date: Tue, 5 Mar 2024 19:50:10 +0100
+Subject: [PATCH] tests: Fix "SSL db: implementation" test with openssl >
+ 3.2.0.
+
+In OpenSSL 3.2.0 (81b741f) all the "alert" error messages was updated to
+replace "sslv3" with "ssl/tls".
+
+This commit updates the "SSL db: implementation" test to support both the
+pre-openssl 3.2.0 error message: "sslv3 alert certificate unknown" and the
+post-openssl 3.2.0 error message: "ssl/tls alert certificate unknown".
+
+Signed-off-by: Timothy Redaelli <tredaelli@redhat.com>
+---
+ tests/ovsdb-server.at | 4 +++-
+ 1 file changed, 3 insertions(+), 1 deletion(-)
+
+diff --git a/tests/ovsdb-server.at b/tests/ovsdb-server.at
+index b8ccc4c8e..35447a52e 100644
+--- a/tests/ovsdb-server.at
++++ b/tests/ovsdb-server.at
+@@ -936,8 +936,10 @@ AT_CHECK_UNQUOTED(
+   [ignore])
+ # The error message for being unable to negotiate a shared ciphersuite
+ # is 'sslv3 alert handshake failure'. This is not the clearest message.
++# In openssl 3.2.0 all the error messages was updated to replace "sslv3" with
++# "ssl/tls".
+ AT_CHECK_UNQUOTED(
+-  [grep "sslv3 alert handshake failure" output], [0],
++  [grep -E "(sslv3|ssl/tls) alert handshake failure" output], [0],
+   [stdout],
+   [ignore])
+ OVSDB_SERVER_SHUTDOWN(["
+-- 
+2.44.0
+

SPECS/openvswitch/0001-tests-Fix-compatibility-issue-with-Python-3.13-in-vl.patch

@@ -0,0 +1,42 @@
+From 9185793e75435d890f18d391eaaeab0ade6f1415 Mon Sep 17 00:00:00 2001
+Message-ID: <9185793e75435d890f18d391eaaeab0ade6f1415.1716386938.git.tredaelli@redhat.com>
+From: Frode Nordahl <fnordahl@ubuntu.com>
+Date: Mon, 8 Apr 2024 23:24:14 +0200
+Subject: [PATCH] tests: Fix compatibility issue with Python 3.13 in vlog.at.
+
+The vlog - Python3 test makes use of output from Python
+Tracebacks in its test assertion.
+
+In Python 3.13 a line with tophat (``^``) markers is added below
+Tracebacks from calls to assert [0], which makes the test fail.
+This change of behavior is also backported to the Python 3.12 and
+3.11 stable branches [1].
+
+Strip lines containing one or more occurrence of the ``^``
+character from the output before performing the test assertions.
+
+0: https://github.com/python/cpython/pull/105935
+1: https://github.com/python/cpython/issues/116034
+
+Reported-at: https://launchpad.net/bugs/2060434
+Signed-off-by: Frode Nordahl <fnordahl@ubuntu.com>
+Signed-off-by: Ilya Maximets <i.maximets@ovn.org>
+---
+ tests/vlog.at | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/tests/vlog.at b/tests/vlog.at
+index 785014956..efe91479a 100644
+--- a/tests/vlog.at
++++ b/tests/vlog.at
+@@ -8,6 +8,7 @@ AT_CHECK([$PYTHON3 $srcdir/test-vlog.py --log-file log_file \
+
+ AT_CHECK([sed -e 's/.*-.*-.*T..:..:..Z |//' \
+ -e 's/File ".*", line [[0-9]][[0-9]]*,/File <name>, line <number>,/' \
++-e '/\^\+/d' \
+ stderr_log], [0], [dnl
+   0  | module_0 | EMER | emergency
+   1  | module_0 | ERR | error
+-- 
+2.45.0
+

SPECS/openvswitch/openvswitch.spec

@@ -20,7 +20,7 @@
 Summary:           Open vSwitch daemon/database/utilities
 Name:              openvswitch
 Version:           3.3.0
-Release:           1%{?dist}
+Release:           2%{?dist}
 License:           ASL 2.0 AND LGPLv2+ AND SISSL
 Vendor:            Microsoft Corporation
 Distribution:      Azure Linux
@@ -32,6 +32,8 @@ Source1:           openvswitch.sysusers
 # ovs-patches
 
 # OVS (including OVN) backports (0 - 300)
+Patch0: 0001-tests-Fix-SSL-db-implementation-test-with-openssl-3..patch
+Patch10: 0001-tests-Fix-compatibility-issue-with-Python-3.13-in-vl.patch
 
 BuildRequires: gcc gcc-c++ make
 BuildRequires: autoconf automake libtool
@@ -394,7 +396,7 @@ fi
 %{_sbindir}/ovs-bugtool
 %{_mandir}/man8/ovs-dpctl-top.8*
 %{_mandir}/man8/ovs-bugtool.8*
-%doc LICENSE
+%license LICENSE
 
 %files test
 %{_bindir}/ovs-pcap
@@ -495,13 +497,18 @@ fi
 %{_mandir}/man8/ovs-vswitchd.8*
 %{_mandir}/man8/ovs-parse-backtrace.8*
 %{_udevrulesdir}/91-vfio.rules
-%doc LICENSE NOTICE README.rst NEWS rhel/README.RHEL.rst
+%license LICENSE NOTICE
+%doc README.rst NEWS rhel/README.RHEL.rst
 /var/lib/openvswitch
 %attr(750,openvswitch,openvswitch) %verify(not owner group) /var/log/openvswitch
 %ghost %attr(755,root,root) %verify(not owner group) %{_rundir}/openvswitch
 %{_sysusersdir}/openvswitch.conf
 
 %changelog
+* Thu Jan 08 2026 Tobias Brick <tobiasb@microsoft.com> - 3.3.0-2
+- Add patches from fedora f40 to fix tests with new versions of openssl and python.
+- Update to use correct locations for license files.
+
 * Wed Feb 21 2024 Thien Trung Vuong <tvuong@microsoft.com> - 3.3.0-1
 - Update to version 3.3.0