From 74b7b712bcfc70a063c689e4941ee50e782c6d72 Mon Sep 17 00:00:00 2001 From: Open vSwitch CI Date: Feb 27 2025 19:27:02 +0000 Subject: Import openvswitch3.2-3.2.0-120 from Fast DataPath --- diff --git a/SOURCES/openvswitch-3.2.0.patch b/SOURCES/openvswitch-3.2.0.patch index f877a68..c0c895b 100644 --- a/SOURCES/openvswitch-3.2.0.patch +++ b/SOURCES/openvswitch-3.2.0.patch @@ -520,12 +520,16 @@ index db341504d3..23c3417a70 100644 @if cmp -s $(@F).tmp $@; then \ touch $@; \ diff --git a/NEWS b/NEWS -index a3a5c2e4a2..2449077574 100644 +index a3a5c2e4a2..71e4da3e3a 100644 --- a/NEWS +++ b/NEWS -@@ -1,3 +1,32 @@ -+v3.2.5 - xx xxx xxxx +@@ -1,3 +1,36 @@ ++v3.2.6 - xx xxx xxxx +-------------------- ++ ++v3.2.5 - 27 Feb 2025 ++-------------------- ++ - Bug fixes + - DPDK: + * OVS validated with DPDK 22.11.7. + @@ -1562,7 +1566,7 @@ index ee5553f456..3e937910be 100755 sys.exit(1) for line in s.splitlines(): diff --git a/configure.ac b/configure.ac -index 320509c5fc..ca58cdbc0a 100644 +index 320509c5fc..e6f7e6e709 100644 --- a/configure.ac +++ b/configure.ac @@ -13,7 +13,7 @@ @@ -1570,7 +1574,7 @@ index 320509c5fc..ca58cdbc0a 100644 AC_PREREQ(2.63) -AC_INIT(openvswitch, 3.2.0, bugs@openvswitch.org) -+AC_INIT(openvswitch, 3.2.5, bugs@openvswitch.org) ++AC_INIT(openvswitch, 3.2.6, bugs@openvswitch.org) AC_CONFIG_SRCDIR([vswitchd/ovs-vswitchd.c]) AC_CONFIG_MACRO_DIR([m4]) AC_CONFIG_AUX_DIR([build-aux]) @@ -1607,15 +1611,21 @@ index a354f007fd..185a06b03e 100644 - CLEANFILES += $(srcdir)/datapath-windows/include/OvsDpInterface.h diff --git a/debian/changelog b/debian/changelog -index 8757e5cb28..c40b240ba8 100644 +index 8757e5cb28..bb2c331090 100644 --- a/debian/changelog +++ b/debian/changelog -@@ -1,3 +1,33 @@ +@@ -1,3 +1,39 @@ ++openvswitch (3.2.6-1) unstable; urgency=low ++ [ Open vSwitch team ] ++ * New upstream version ++ ++ -- Open vSwitch team Thu, 27 Feb 2025 14:57:46 +0100 ++ +openvswitch (3.2.5-1) unstable; urgency=low + [ Open vSwitch team ] + * New upstream version + -+ -- Open vSwitch team Fri, 15 Nov 2024 14:33:59 +0100 ++ -- Open vSwitch team Thu, 27 Feb 2025 14:57:46 +0100 + +openvswitch (3.2.4-1) unstable; urgency=low + [ Open vSwitch team ] diff --git a/SPECS/openvswitch3.2.spec b/SPECS/openvswitch3.2.spec index e0fcbe6..576c500 100644 --- a/SPECS/openvswitch3.2.spec +++ b/SPECS/openvswitch3.2.spec @@ -57,7 +57,7 @@ Summary: Open vSwitch Group: System Environment/Daemons daemon/database/utilities URL: http://www.openvswitch.org/ Version: 3.2.0 -Release: 119%{?dist} +Release: 120%{?dist} # Nearly all of openvswitch is ASL 2.0. The bugtool is LGPLv2+, and the # lib/sflow*.[ch] files are SISSL @@ -763,6 +763,13 @@ exit 0 %endif %changelog +* Thu Feb 27 2025 Open vSwitch CI - 3.2.0-120 +- Merging upstream branch-3.2 [RH git: 3e91737540] + Commit list: + 226eab26b0 Prepare for 3.2.6. + d9485c5982 Set release date for 3.2.5. + + * Wed Feb 26 2025 Open vSwitch CI - 3.2.0-119 - Merging upstream branch-3.2 [RH git: dde2299284] Commit list: