diff --git a/SOURCES/openvswitch-3.1.0.patch b/SOURCES/openvswitch-3.1.0.patch index b0d6f19..75a5bbb 100644 --- a/SOURCES/openvswitch-3.1.0.patch +++ b/SOURCES/openvswitch-3.1.0.patch @@ -201,7 +201,7 @@ index 09df61826f..b81744ec9b 100755 if [ "$CC" = "clang" ]; then make CFLAGS="$CFLAGS -Wno-error=unused-command-line-argument" diff --git a/.cirrus.yml b/.cirrus.yml -index 952d964315..8db385f002 100644 +index 952d964315..d73154a971 100644 --- a/.cirrus.yml +++ b/.cirrus.yml @@ -2,8 +2,8 @@ freebsd_build_task: @@ -211,7 +211,7 @@ index 952d964315..8db385f002 100644 - image_family: freebsd-12-4-snap - image_family: freebsd-13-1-snap + image_family: freebsd-13-3-snap -+ image_family: freebsd-14-0-snap ++ image_family: freebsd-14-1-snap cpu: 4 memory: 4G diff --git a/SPECS/openvswitch3.1.spec b/SPECS/openvswitch3.1.spec index c1904e1..0d65673 100644 --- a/SPECS/openvswitch3.1.spec +++ b/SPECS/openvswitch3.1.spec @@ -57,7 +57,7 @@ Summary: Open vSwitch Group: System Environment/Daemons daemon/database/utilities URL: http://www.openvswitch.org/ Version: 3.1.0 -Release: 121%{?dist} +Release: 122%{?dist} # Nearly all of openvswitch is ASL 2.0. The bugtool is LGPLv2+, and the # lib/sflow*.[ch] files are SISSL @@ -754,6 +754,12 @@ exit 0 %endif %changelog +* Wed Jul 03 2024 Open vSwitch CI - 3.1.0-122 +- Merging upstream branch-3.1 [RH git: b98fa1fefc] + Commit list: + abdbd25a0c cirrus: Update to FreeBSD 14.1. + + * Tue Jul 02 2024 Michael Santana - 3.1.0-121 - netdev-offload-tc: Reserve lower tc prio for vlan ethertype. [RH git: fbbb88704b] The cited commit reserved lower tc priorities for IP ethertypes in order