diff --git a/.openvswitch.metadata b/.openvswitch.metadata index af1aabc..8e71823 100644 --- a/.openvswitch.metadata +++ b/.openvswitch.metadata @@ -1,5 +1,5 @@ -002450621b33c5690060345b0aac25bc2426d675 SOURCES/docutils-0.12.tar.gz -e704a36f712c1c81f253f77d1bd7c60d85b8a7ff SOURCES/dpdk-19.11.1.tar.xz -0c5f78212173d2cac286f8f78aa95ebdea9e2444 SOURCES/openvswitch-2.13.0.tar.gz -d34f96421a86004aa5d26ecf975edefd09f948b1 SOURCES/Pygments-1.4.tar.gz -6beb30f18ffac3de7689b7fd63e9a8a7d9c8df3a SOURCES/Sphinx-1.1.3.tar.gz +002450621b33c5690060345b0aac25bc2426d675 SOURCES/docutils-0.12.tar.gz +0c5f78212173d2cac286f8f78aa95ebdea9e2444 SOURCES/openvswitch-2.13.0.tar.gz +d34f96421a86004aa5d26ecf975edefd09f948b1 SOURCES/Pygments-1.4.tar.gz +6beb30f18ffac3de7689b7fd63e9a8a7d9c8df3a SOURCES/Sphinx-1.1.3.tar.gz +435b0b3a5da6d7417d318050e5b50ac400354c60 SOURCES/dpdk-19.11.tar.xz diff --git a/SOURCES/openvswitch-2.13.0.patch b/SOURCES/openvswitch-2.13.0.patch index afa2297..834b6d5 100644 --- a/SOURCES/openvswitch-2.13.0.patch +++ b/SOURCES/openvswitch-2.13.0.patch @@ -900,12 +900,18 @@ index b279303d18..b3b56cd50e 100644 boot.sh \ poc/builders/Vagrantfile \ diff --git a/NEWS b/NEWS -index dab94e924d..86d6e0a3d8 100644 +index dab94e924d..51601cc726 100644 --- a/NEWS +++ b/NEWS -@@ -1,3 +1,30 @@ -+v2.13.2 - xx xxx xxxx +@@ -1,3 +1,36 @@ ++v2.13.3 - xx xxx xxxx +--------------------- ++ ++v2.13.2 - 13 Jan 2021 ++--------------------- ++ - Bug fixes ++ - LLDP: ++ * Security fixes for CVE-2015-8011 and CVE-2020-27827. + - IPsec: + * Fixed support of strongswan 5.7+ in ovs-monitor-ipsec. + * Add option '--no-cleanup' to allow ovs-monitor-ipsec to stop without @@ -934,7 +940,7 @@ index dab94e924d..86d6e0a3d8 100644 v2.13.0 - 14 Feb 2020 --------------------- - OVN: -@@ -43,6 +70,9 @@ v2.13.0 - 14 Feb 2020 +@@ -43,6 +76,9 @@ v2.13.0 - 14 Feb 2020 - 'ovs-appctl dpctl/dump-flows' can now show offloaded=partial for partially offloaded flows, dp:dpdk for fully offloaded by dpdk, and type filter supports new filters: "dpdk" and "partially-offloaded". @@ -944,7 +950,7 @@ index dab94e924d..86d6e0a3d8 100644 v2.12.0 - 03 Sep 2019 --------------------- -@@ -117,9 +147,6 @@ v2.12.0 - 03 Sep 2019 +@@ -117,9 +153,6 @@ v2.12.0 - 03 Sep 2019 * Add support for conntrack zone-based timeout policy. - 'ovs-dpctl dump-flows' is no longer suitable for dumping offloaded flows. 'ovs-appctl dpctl/dump-flows' should be used instead. @@ -1051,7 +1057,7 @@ index c1470ccc6b..12fd6c4a51 100644 dnl OVS_PTHREAD_SET_NAME dnl diff --git a/configure.ac b/configure.ac -index 92b52f6712..72aa36b443 100644 +index 92b52f6712..46adc5cb81 100644 --- a/configure.ac +++ b/configure.ac @@ -13,7 +13,7 @@ @@ -1059,7 +1065,7 @@ index 92b52f6712..72aa36b443 100644 AC_PREREQ(2.63) -AC_INIT(openvswitch, 2.13.0, bugs@openvswitch.org) -+AC_INIT(openvswitch, 2.13.2, bugs@openvswitch.org) ++AC_INIT(openvswitch, 2.13.3, bugs@openvswitch.org) AC_CONFIG_SRCDIR([datapath/datapath.c]) AC_CONFIG_MACRO_DIR([m4]) AC_CONFIG_AUX_DIR([build-aux]) @@ -1537,15 +1543,21 @@ index 23118e8b63..05ccfb9288 100644 *saddr = fl6.saddr; if (use_cache) diff --git a/debian/changelog b/debian/changelog -index 8e075bc98b..d803cf10d1 100644 +index 8e075bc98b..793fc8b93c 100644 --- a/debian/changelog +++ b/debian/changelog -@@ -1,3 +1,15 @@ +@@ -1,3 +1,21 @@ ++openvswitch (2.13.3-1) unstable; urgency=low ++ [ Open vSwitch team ] ++ * New upstream version ++ ++ -- Open vSwitch team Wed, 13 Jan 2021 11:26:36 -0500 ++ +openvswitch (2.13.2-1) unstable; urgency=low + [ Open vSwitch team ] + * New upstream version + -+ -- Open vSwitch team Thu, 30 Jul 2020 00:25:23 +0200 ++ -- Open vSwitch team Wed, 13 Jan 2021 11:26:36 -0500 + +openvswitch (2.13.1-1) unstable; urgency=low + [ Open vSwitch team] @@ -39886,6 +39898,27 @@ index 5b5c96d727..f9c732886f 100644 if (!del_err) { /* Delete from hw success, so old flow was offloaded. +diff --git a/lib/ipf.c b/lib/ipf.c +index 446e89d13c..c20bcc0b33 100644 +--- a/lib/ipf.c ++++ b/lib/ipf.c +@@ -1153,7 +1153,7 @@ ipf_post_execute_reass_pkts(struct ipf *ipf, + /* Inner batch loop is constant time since batch size is <= + * NETDEV_MAX_BURST. */ + DP_PACKET_BATCH_REFILL_FOR_EACH (pb_idx, pb_cnt, pkt, pb) { +- if (pkt == rp->list->reass_execute_ctx) { ++ if (rp && pkt == rp->list->reass_execute_ctx) { + for (int i = 0; i <= rp->list->last_inuse_idx; i++) { + rp->list->frag_list[i].pkt->md.ct_label = pkt->md.ct_label; + rp->list->frag_list[i].pkt->md.ct_mark = pkt->md.ct_mark; +@@ -1206,6 +1206,7 @@ ipf_post_execute_reass_pkts(struct ipf *ipf, + ipf_reassembled_list_remove(rp); + dp_packet_delete(rp->pkt); + free(rp); ++ rp = NULL; + } else { + dp_packet_batch_refill(pb, pkt, pb_idx); + } diff --git a/lib/jsonrpc.c b/lib/jsonrpc.c index ed748dbde7..e74771e2bc 100644 --- a/lib/jsonrpc.c @@ -40055,7 +40088,7 @@ index a44114e8dc..d75d66b863 100644 #endif /* jsonrpc.h */ diff --git a/lib/lldp/lldp.c b/lib/lldp/lldp.c -index 74f747fcdc..e5755307fb 100644 +index 74f747fcdc..18afbab9a7 100644 --- a/lib/lldp/lldp.c +++ b/lib/lldp/lldp.c @@ -59,7 +59,7 @@ VLOG_DEFINE_THIS_MODULE(lldp); @@ -40166,7 +40199,21 @@ index 74f747fcdc..e5755307fb 100644 CHECK_TLV_SIZE(2, "TTL"); chassis->c_ttl = PEEK_UINT16; ttl_received = true; -@@ -481,6 +530,11 @@ lldp_decode(struct lldpd *cfg OVS_UNUSED, char *frame, int s, +@@ -464,10 +513,13 @@ lldp_decode(struct lldpd *cfg OVS_UNUSED, char *frame, int s, + b = xzalloc(tlv_size + 1); + PEEK_BYTES(b, tlv_size); + if (tlv_type == LLDP_TLV_PORT_DESCR) { ++ free(port->p_descr); + port->p_descr = b; + } else if (tlv_type == LLDP_TLV_SYSTEM_NAME) { ++ free(chassis->c_name); + chassis->c_name = b; + } else { ++ free(chassis->c_descr); + chassis->c_descr = b; + } + break; +@@ -481,6 +533,11 @@ lldp_decode(struct lldpd *cfg OVS_UNUSED, char *frame, int s, case LLDP_TLV_MGMT_ADDR: CHECK_TLV_SIZE(1, "Management address"); addr_str_length = PEEK_UINT8; @@ -40178,7 +40225,7 @@ index 74f747fcdc..e5755307fb 100644 CHECK_TLV_SIZE(1 + addr_str_length, "Management address"); PEEK_BYTES(addr_str_buffer, addr_str_length); addr_length = addr_str_length - 1; -@@ -505,7 +559,7 @@ lldp_decode(struct lldpd *cfg OVS_UNUSED, char *frame, int s, +@@ -505,7 +562,7 @@ lldp_decode(struct lldpd *cfg OVS_UNUSED, char *frame, int s, break; case LLDP_TLV_ORG: @@ -40187,7 +40234,7 @@ index 74f747fcdc..e5755307fb 100644 PEEK_BYTES(orgid, sizeof orgid); tlv_subtype = PEEK_UINT8; if (memcmp(dot1, orgid, sizeof orgid) == 0) { -@@ -625,6 +679,7 @@ lldp_decode(struct lldpd *cfg OVS_UNUSED, char *frame, int s, +@@ -625,6 +682,7 @@ lldp_decode(struct lldpd *cfg OVS_UNUSED, char *frame, int s, VLOG_WARN("unknown tlv (%d) received on %s", tlv_type, hardware->h_ifname); @@ -43458,6 +43505,19 @@ index c94f2f5358..15eec6d4c0 100644 # For RHEL 7.2, 7.4, 7.6, 7.7, and 7.8 if [ -x "%{_datadir}/openvswitch/scripts/ovs-kmod-manage.sh" ]; then %{_datadir}/openvswitch/scripts/ovs-kmod-manage.sh +diff --git a/rhel/openvswitch.spec.in b/rhel/openvswitch.spec.in +index b0383ed75e..ee8b3c9eac 100644 +--- a/rhel/openvswitch.spec.in ++++ b/rhel/openvswitch.spec.in +@@ -39,7 +39,7 @@ BuildRequires: checkpolicy, selinux-policy-devel + BuildRequires: autoconf, automake, libtool + BuildRequires: python3-sphinx + BuildRequires: unbound-devel +-BuildRequires: unwind-devel ++BuildRequires: libunwind-devel + + %bcond_without check + %bcond_with check_datapath_kernel diff --git a/rhel/usr_lib_systemd_system_ovsdb-server.service b/rhel/usr_lib_systemd_system_ovsdb-server.service index 4c170c09b4..98338b9dfb 100644 --- a/rhel/usr_lib_systemd_system_ovsdb-server.service diff --git a/SPECS/openvswitch2.13.spec b/SPECS/openvswitch2.13.spec index 889d6a2..5a3c20a 100644 --- a/SPECS/openvswitch2.13.spec +++ b/SPECS/openvswitch2.13.spec @@ -59,7 +59,7 @@ Summary: Open vSwitch Group: System Environment/Daemons daemon/database/utilities URL: http://www.openvswitch.org/ Version: 2.13.0 -Release: 79%{?commit0:.%{date}git%{shortcommit0}}%{?commit1:dpdk%{shortcommit1}}%{?dist} +Release: 80%{?commit0:.%{date}git%{shortcommit0}}%{?commit1:dpdk%{shortcommit1}}%{?dist} # Nearly all of openvswitch is ASL 2.0. The bugtool is LGPLv2+, and the # lib/sflow*.[ch] files are SISSL @@ -703,6 +703,10 @@ exit 0 %endif %changelog +* Thu Jan 14 2021 Open vSwitch CI - 2.13.0-80 +- Merging upstream branch-2.13 + [b7a6e48410649f2d0029baaf499a5cf0619f4f34] + * Wed Jan 06 2021 Open vSwitch CI - 2.13.0-79 - Merging upstream branch-2.13 [86c9f9af773d8564a7d26e4e80fba389617fab17]