diff --git a/SOURCES/openvswitch-2.11.3.patch b/SOURCES/openvswitch-2.11.3.patch index 58b68f9..1ac7eff 100644 --- a/SOURCES/openvswitch-2.11.3.patch +++ b/SOURCES/openvswitch-2.11.3.patch @@ -203,7 +203,7 @@ index 0000000000..4725fd829d +brew update || true +brew uninstall libtool && brew install libtool || true diff --git a/.cirrus.yml b/.cirrus.yml -index eb6af0a719..14d0cbec9f 100644 +index eb6af0a719..1bf81a983a 100644 --- a/.cirrus.yml +++ b/.cirrus.yml @@ -2,21 +2,21 @@ freebsd_build_task: @@ -212,7 +212,7 @@ index eb6af0a719..14d0cbec9f 100644 matrix: - image: freebsd-12-0-release-amd64 - image: freebsd-11-2-release-amd64 -+ image_family: freebsd-12-1-snap ++ image_family: freebsd-12-2-snap + image_family: freebsd-11-4-snap cpu: 4 memory: 8G @@ -757,13 +757,19 @@ index ff1f94b484..4f9f1866c0 100644 boot.sh \ poc/builders/Vagrantfile \ diff --git a/NEWS b/NEWS -index f177d7efc1..531ce37d85 100644 +index f177d7efc1..d6e05238ed 100644 --- a/NEWS +++ b/NEWS -@@ -1,3 +1,26 @@ -+v2.11.6 - xx xxx xxxx +@@ -1,3 +1,32 @@ ++v2.11.7 - xx xxx xxxx +--------------------- + ++v2.11.6 - 10 Feb 2021 ++--------------------- ++ - Bug fixes ++ - Security: ++ * Fixed packet parsing vulnerability CVE-2020-35498. ++ +v2.11.5 - 13 Jan 2021 +--------------------- + - Bug fixes @@ -883,7 +889,7 @@ index 9f6ca7b2cb..85641745ee 100755 manpages=`cd $distdir && echo *` diff --git a/configure.ac b/configure.ac -index 45ff8cb07e..90f8e1f0d9 100644 +index 45ff8cb07e..945996a3ca 100644 --- a/configure.ac +++ b/configure.ac @@ -13,7 +13,7 @@ @@ -891,7 +897,7 @@ index 45ff8cb07e..90f8e1f0d9 100644 AC_PREREQ(2.63) -AC_INIT(openvswitch, 2.11.3, bugs@openvswitch.org) -+AC_INIT(openvswitch, 2.11.6, bugs@openvswitch.org) ++AC_INIT(openvswitch, 2.11.7, bugs@openvswitch.org) AC_CONFIG_SRCDIR([datapath/datapath.c]) AC_CONFIG_MACRO_DIR([m4]) AC_CONFIG_AUX_DIR([build-aux]) @@ -1316,15 +1322,21 @@ index 9d77d98271..715388d838 100644 { struct inet6_skb_parm h; diff --git a/debian/changelog b/debian/changelog -index d08cfbfd91..f7af0ad68e 100644 +index d08cfbfd91..d1e4505c49 100644 --- a/debian/changelog +++ b/debian/changelog -@@ -1,3 +1,21 @@ +@@ -1,3 +1,27 @@ ++openvswitch (2.11.7-1) unstable; urgency=low ++ [ Open vSwitch team ] ++ * New upstream version ++ ++ -- Open vSwitch team Wed, 10 Feb 2021 16:07:06 +0100 ++ +openvswitch (2.11.6-1) unstable; urgency=low + [ Open vSwitch team ] + * New upstream version + -+ -- Open vSwitch team Wed, 13 Jan 2021 11:26:35 -0500 ++ -- Open vSwitch team Wed, 10 Feb 2021 16:07:06 +0100 + +openvswitch (2.11.5-1) unstable; urgency=low + [ Open vSwitch team ] diff --git a/SPECS/openvswitch2.11.spec b/SPECS/openvswitch2.11.spec index fb41e04..58895df 100644 --- a/SPECS/openvswitch2.11.spec +++ b/SPECS/openvswitch2.11.spec @@ -66,7 +66,7 @@ Summary: Open vSwitch Group: System Environment/Daemons daemon/database/utilities URL: http://www.openvswitch.org/ Version: 2.11.3 -Release: 84%{?dist} +Release: 85%{?dist} # Nearly all of openvswitch is ASL 2.0. The bugtool is LGPLv2+, and the # lib/sflow*.[ch] files are SISSL @@ -745,6 +745,10 @@ exit 0 %changelog +* Wed Feb 10 2021 Open vSwitch CI - 2.11.3-85 +- Merging upstream branch-2.11 + [4351a9b51261d2079765dac654466202a4bd6a16] + * Fri Feb 05 2021 Open vSwitch CI - 2.11.3-84 - Merging upstream branch-2.11 [a4f1272cee605e664aaea91ae28daff5a24857d6]