diff --git a/SOURCES/openvswitch-3.1.0.patch b/SOURCES/openvswitch-3.1.0.patch index 3d65485..7b63dd3 100644 --- a/SOURCES/openvswitch-3.1.0.patch +++ b/SOURCES/openvswitch-3.1.0.patch @@ -196,6 +196,19 @@ index 09df61826..b81744ec9 100755 if [ "$CC" = "clang" ]; then make CFLAGS="$CFLAGS -Wno-error=unused-command-line-argument" +diff --git a/.cirrus.yml b/.cirrus.yml +index 952d96431..48931fa08 100644 +--- a/.cirrus.yml ++++ b/.cirrus.yml +@@ -3,7 +3,7 @@ freebsd_build_task: + freebsd_instance: + matrix: + image_family: freebsd-12-4-snap +- image_family: freebsd-13-1-snap ++ image_family: freebsd-13-2-snap + cpu: 4 + memory: 4G + diff --git a/.github/workflows/build-and-test.yml b/.github/workflows/build-and-test.yml index 82675b973..8e71b9533 100644 --- a/.github/workflows/build-and-test.yml diff --git a/SPECS/openvswitch3.1.spec b/SPECS/openvswitch3.1.spec index 34824a7..7dbd957 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: 41%{?dist} +Release: 42%{?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 +* Mon Aug 07 2023 Open vSwitch CI - 3.1.0-42 +- Merging upstream branch-3.1 [RH git: 3669a14c78] + Commit list: + 70ce7a3cc6 cirrus: Update to FreeBSD 13.2. + + * Fri Aug 04 2023 Open vSwitch CI - 3.1.0-41 - Merging upstream branch-3.1 [RH git: 9864a17a73] Commit list: