From 4365442ff0f741b09043a2a15c36d244878d4dad Mon Sep 17 00:00:00 2001 From: Open vSwitch CI Date: Nov 16 2024 06:39:23 +0000 Subject: Import openvswitch3.4-3.4.0-17 from Fast DataPath --- diff --git a/SOURCES/openvswitch-3.4.0.patch b/SOURCES/openvswitch-3.4.0.patch index 24571a9..dd313aa 100644 --- a/SOURCES/openvswitch-3.4.0.patch +++ b/SOURCES/openvswitch-3.4.0.patch @@ -457,12 +457,16 @@ index 7054cf559e..e7c8b96d49 100644 ``lpr``, ``news``, ``uucp``, ``clock``, ``ftp``, ``ntp``, ``audit``, ``alert``, ``clock2``, ``local0``, ``local1``, ``local2``, diff --git a/NEWS b/NEWS -index 944c95a8d7..faa159cbb6 100644 +index 944c95a8d7..d242de803e 100644 --- a/NEWS +++ b/NEWS -@@ -1,3 +1,8 @@ -+v3.4.1 - xx xxx xxxx +@@ -1,3 +1,12 @@ ++v3.4.2 - xx xxx xxxx +-------------------- ++ ++v3.4.1 - 15 Nov 2024 ++-------------------- ++ - Bug fixes + - DPDK: + * OVS validated with DPDK 23.11.2. + @@ -470,7 +474,7 @@ index 944c95a8d7..faa159cbb6 100644 -------------------- - Option '--mlockall' now only locks memory pages on fault, if possible. diff --git a/configure.ac b/configure.ac -index 3e39120af8..f5d9648f0d 100644 +index 3e39120af8..d88a2432f7 100644 --- a/configure.ac +++ b/configure.ac @@ -13,7 +13,7 @@ @@ -478,20 +482,26 @@ index 3e39120af8..f5d9648f0d 100644 AC_PREREQ(2.63) -AC_INIT(openvswitch, 3.4.0, bugs@openvswitch.org) -+AC_INIT(openvswitch, 3.4.1, bugs@openvswitch.org) ++AC_INIT(openvswitch, 3.4.2, bugs@openvswitch.org) AC_CONFIG_SRCDIR([vswitchd/ovs-vswitchd.c]) AC_CONFIG_MACRO_DIR([m4]) AC_CONFIG_AUX_DIR([build-aux]) diff --git a/debian/changelog b/debian/changelog -index b9f9b404bf..c5396cc09c 100644 +index b9f9b404bf..5211c58c0b 100644 --- a/debian/changelog +++ b/debian/changelog -@@ -1,3 +1,9 @@ +@@ -1,3 +1,15 @@ ++openvswitch (3.4.2-1) unstable; urgency=low ++ [ Open vSwitch team ] ++ * New upstream version ++ ++ -- Open vSwitch team Fri, 15 Nov 2024 14:34:16 +0100 ++ +openvswitch (3.4.1-1) unstable; urgency=low + [ Open vSwitch team ] + * New upstream version + -+ -- Open vSwitch team Thu, 15 Aug 2024 14:59:36 +0200 ++ -- Open vSwitch team Fri, 15 Nov 2024 14:34:16 +0100 + openvswitch (3.4.0-1) unstable; urgency=low diff --git a/SPECS/openvswitch3.4.spec b/SPECS/openvswitch3.4.spec index 0e1d94a..4fd27c2 100644 --- a/SPECS/openvswitch3.4.spec +++ b/SPECS/openvswitch3.4.spec @@ -57,7 +57,7 @@ Summary: Open vSwitch Group: System Environment/Daemons daemon/database/utilities URL: http://www.openvswitch.org/ Version: 3.4.0 -Release: 16%{?dist} +Release: 17%{?dist} # Nearly all of openvswitch is ASL 2.0. The bugtool is LGPLv2+, and the # lib/sflow*.[ch] files are SISSL @@ -770,6 +770,13 @@ exit 0 %endif %changelog +* Sat Nov 16 2024 Open vSwitch CI - 3.4.0-17 +- Merging upstream branch-3.4 [RH git: 4def588584] + Commit list: + c25085f3d7 Prepare for 3.4.2. + 22a6b1110a Set release date for 3.4.1. + + * Fri Nov 15 2024 Open vSwitch CI - 3.4.0-16 - Merging upstream branch-3.4 [RH git: ee85c64e6a] Commit list: