diff --git a/SOURCES/openvswitch-2.11.3.patch b/SOURCES/openvswitch-2.11.3.patch index 61f46ec..7b8d7c2 100644 --- a/SOURCES/openvswitch-2.11.3.patch +++ b/SOURCES/openvswitch-2.11.3.patch @@ -234,10 +234,10 @@ index eb6af0a719..14d0cbec9f 100644 configure_script: diff --git a/.github/workflows/build-and-test.yml b/.github/workflows/build-and-test.yml new file mode 100644 -index 0000000000..8131a27cb6 +index 0000000000..f7a4ef2b9f --- /dev/null +++ b/.github/workflows/build-and-test.yml -@@ -0,0 +1,160 @@ +@@ -0,0 +1,162 @@ +name: Build and Test + +on: [push, pull_request] @@ -340,6 +340,8 @@ index 0000000000..8131a27cb6 + - name: checkout + uses: actions/checkout@v2 + ++ - name: update APT cache ++ run: sudo apt update || true + - name: install common dependencies + run: sudo apt install -y ${{ env.dependencies }} + - name: install libunbound @@ -17404,7 +17406,7 @@ index 3b6890e952..1d33fcbb8d 100644 case OVS_ACTION_ATTR_TUNNEL_PUSH: case OVS_ACTION_ATTR_TUNNEL_POP: diff --git a/lib/odp-util.c b/lib/odp-util.c -index d41c9369f2..0d85186e2d 100644 +index d41c9369f2..5b04adf0ed 100644 --- a/lib/odp-util.c +++ b/lib/odp-util.c @@ -131,6 +131,8 @@ odp_action_len(uint16_t type) @@ -17416,7 +17418,17 @@ index d41c9369f2..0d85186e2d 100644 case OVS_ACTION_ATTR_UNSPEC: case __OVS_ACTION_ATTR_MAX: -@@ -1042,6 +1044,42 @@ format_odp_set_nsh(struct ds *ds, const struct nlattr *attr) +@@ -378,7 +380,8 @@ format_odp_push_nsh_action(struct ds *ds, + break; + } + default: +- OVS_NOT_REACHED(); ++ ds_put_cstr(ds, ","); ++ break; + } + ds_put_format(ds, ")"); + } +@@ -1042,6 +1045,42 @@ format_odp_set_nsh(struct ds *ds, const struct nlattr *attr) ds_put_cstr(ds, "))"); } @@ -17459,7 +17471,7 @@ index d41c9369f2..0d85186e2d 100644 static void format_odp_action(struct ds *ds, const struct nlattr *a, -@@ -1181,6 +1219,12 @@ format_odp_action(struct ds *ds, const struct nlattr *a, +@@ -1181,6 +1220,12 @@ format_odp_action(struct ds *ds, const struct nlattr *a, case OVS_ACTION_ATTR_POP_NSH: ds_put_cstr(ds, "pop_nsh()"); break; @@ -17472,7 +17484,7 @@ index d41c9369f2..0d85186e2d 100644 case OVS_ACTION_ATTR_UNSPEC: case __OVS_ACTION_ATTR_MAX: default: -@@ -1380,14 +1424,20 @@ parse_odp_userspace_action(const char *s, struct ofpbuf *actions) +@@ -1380,14 +1425,20 @@ parse_odp_userspace_action(const char *s, struct ofpbuf *actions) int n1 = -1; if (ovs_scan(&s[n], ",tunnel_out_port=%"SCNi32")%n", &tunnel_out_port, &n1)) { @@ -17499,7 +17511,7 @@ index d41c9369f2..0d85186e2d 100644 goto out; } } -@@ -2397,6 +2447,52 @@ parse_odp_action(const char *s, const struct simap *port_names, +@@ -2397,6 +2448,52 @@ parse_odp_action(const char *s, const struct simap *port_names, } } @@ -17552,7 +17564,7 @@ index d41c9369f2..0d85186e2d 100644 { int retval; -@@ -2433,6 +2529,7 @@ odp_actions_from_string(const char *s, const struct simap *port_names, +@@ -2433,6 +2530,7 @@ odp_actions_from_string(const char *s, const struct simap *port_names, size_t old_size; if (!strcasecmp(s, "drop")) { @@ -17560,7 +17572,7 @@ index d41c9369f2..0d85186e2d 100644 return 0; } -@@ -5185,13 +5282,16 @@ erspan_to_attr(struct ofpbuf *a, const void *data_) +@@ -5185,13 +5283,16 @@ erspan_to_attr(struct ofpbuf *a, const void *data_) do { \ len = 0; @@ -17584,7 +17596,7 @@ index d41c9369f2..0d85186e2d 100644 } #define SCAN_FIELD_NESTED__(NAME, TYPE, SCAN_AS, ATTR, FUNC) \ -@@ -5757,26 +5857,28 @@ odp_flow_key_from_flow__(const struct odp_flow_key_parms *parms, +@@ -5757,26 +5858,28 @@ odp_flow_key_from_flow__(const struct odp_flow_key_parms *parms, if (flow->ct_nw_proto) { if (parms->support.ct_orig_tuple && flow->dl_type == htons(ETH_TYPE_IP)) { @@ -17631,7 +17643,7 @@ index d41c9369f2..0d85186e2d 100644 } } if (parms->support.recirc) { -@@ -5986,6 +6088,10 @@ odp_key_from_dp_packet(struct ofpbuf *buf, const struct dp_packet *packet) +@@ -5986,6 +6089,10 @@ odp_key_from_dp_packet(struct ofpbuf *buf, const struct dp_packet *packet) nl_msg_put_u32(buf, OVS_KEY_ATTR_PRIORITY, md->skb_priority); @@ -17642,7 +17654,7 @@ index d41c9369f2..0d85186e2d 100644 if (flow_tnl_dst_is_set(&md->tunnel)) { tun_key_to_attr(buf, &md->tunnel, &md->tunnel, NULL, NULL); } -@@ -6957,15 +7063,18 @@ odp_key_fitness_to_string(enum odp_key_fitness fitness) +@@ -6957,15 +7064,18 @@ odp_key_fitness_to_string(enum odp_key_fitness fitness) /* Appends an OVS_ACTION_ATTR_USERSPACE action to 'odp_actions' that specifies * Netlink PID 'pid'. If 'userdata' is nonnull, adds a userdata attribute @@ -17666,7 +17678,7 @@ index d41c9369f2..0d85186e2d 100644 { size_t userdata_ofs; size_t offset; -@@ -6973,6 +7082,9 @@ odp_put_userspace_action(uint32_t pid, +@@ -6973,6 +7083,9 @@ odp_put_userspace_action(uint32_t pid, offset = nl_msg_start_nested(odp_actions, OVS_ACTION_ATTR_USERSPACE); nl_msg_put_u32(odp_actions, OVS_USERSPACE_ATTR_PID, pid); if (userdata) { @@ -17676,7 +17688,7 @@ index d41c9369f2..0d85186e2d 100644 userdata_ofs = odp_actions->size + NLA_HDRLEN; /* The OVS kernel module before OVS 1.11 and the upstream Linux kernel -@@ -6998,9 +7110,16 @@ odp_put_userspace_action(uint32_t pid, +@@ -6998,9 +7111,16 @@ odp_put_userspace_action(uint32_t pid, if (include_actions) { nl_msg_put_flag(odp_actions, OVS_USERSPACE_ATTR_ACTIONS); } diff --git a/SPECS/openvswitch2.11.spec b/SPECS/openvswitch2.11.spec index a0fc4bd..3e3450b 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: 79%{?dist} +Release: 80%{?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 +* Thu Jan 21 2021 Open vSwitch CI - 2.11.3-80 +- Merging upstream branch-2.11 + [b8354bd06233b96923cc18f7b8d769f0164d89c3] + * Thu Jan 14 2021 Open vSwitch CI - 2.11.3-79 - Merging upstream branch-2.11 [f41ec7e05b34518090771eafc1ca17f297c5f520]