diff --git a/0001-python-c-ext-Fix-memory-leak-in-Parser_finish.patch b/0001-python-c-ext-Fix-memory-leak-in-Parser_finish.patch deleted file mode 100644 index e6557b1..0000000 --- a/0001-python-c-ext-Fix-memory-leak-in-Parser_finish.patch +++ /dev/null @@ -1,28 +0,0 @@ -From e120ff1f8e4dbb0b889b26e0be082376a32090bc Mon Sep 17 00:00:00 2001 -From: Eric Lapointe -Date: Wed, 31 Oct 2018 12:11:42 -0400 -Subject: [PATCH] python-c-ext: Fix memory leak in Parser_finish - -The memory returned by json_parser_finish needs to be freed by the caller. - -Signed-off-by: Eric Lapointe -Signed-off-by: Ben Pfaff ---- - python/ovs/_json.c | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/python/ovs/_json.c b/python/ovs/_json.c -index 8b8402025..ef7bb4b8e 100644 ---- a/python/ovs/_json.c -+++ b/python/ovs/_json.c -@@ -170,6 +170,7 @@ Parser_finish(json_ParserObject * self) - json = json_parser_finish(self->_parser); - self->_parser = NULL; - obj = json_to_python(json); -+ json_destroy(json); - return obj; - } - --- -2.16.4 - diff --git a/_service b/_service new file mode 100644 index 0000000..41e5eb1 --- /dev/null +++ b/_service @@ -0,0 +1,15 @@ + + + https://github.com/openvswitch/ovs + git + .git + 2.11.0+git%cd.%h + ad83fc9ab6119abc14a46bdf71de020da02aefec + openvswitch + + + openvswitch-*.tar + gz + + + diff --git a/openvswitch-2.10.1.tar.gz b/openvswitch-2.10.1.tar.gz deleted file mode 100644 index abcf3e0..0000000 --- a/openvswitch-2.10.1.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:4f93c764295952848a924271250d7c6a6a53747d0019ef6ff880aa8ea6897c80 -size 7522058 diff --git a/openvswitch-2.11.0+git20190123.ad83fc9ab.tar.gz b/openvswitch-2.11.0+git20190123.ad83fc9ab.tar.gz new file mode 100644 index 0000000..3d3be66 --- /dev/null +++ b/openvswitch-2.11.0+git20190123.ad83fc9ab.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:2055e1e4f5586cb4732b465df7de39ba968ce83e26cbbe22eaf115fc0a1f3346 +size 5654398 diff --git a/openvswitch.changes b/openvswitch.changes index 9db5203..94ec4b0 100644 --- a/openvswitch.changes +++ b/openvswitch.changes @@ -1,3 +1,58 @@ +------------------------------------------------------------------- +Thu Jan 24 16:52:16 UTC 2019 - jcaamano@suse.com + +- Fixed package name libopenvswitch-2_10-0 to libopenvswitch-2_11-0 + +------------------------------------------------------------------- +Thu Jan 24 11:34:15 UTC 2019 - Jaime Caamaño (jcaamano@suse.com) + +- Version bump to 2.11.0+git20190123.ad83fc9ab. Some of the changes are: + * Linux datapath: + - Support for the kernel versions 4.16.x and 4.17.x. + * OpenFlow: + - OFPMP_TABLE_FEATURES_REQUEST can now modify table features. + * ovs-ofctl: + - "mod-table" command can now change OpenFlow table names. + * The environment variable OVS_SYSLOG_METHOD, if set, is now used + as the default syslog method. + * The environment variable OVS_CTL_TIMEOUT, if set, is now used + as the default timeout for control utilities. + * ovn: + - OVN-SB schema changed: duplicated IP with same Encapsulation type + is not allowed any more. Please refer to + Documentation/intro/install/ovn-upgrades.rst for the instructions + in case there are problems encountered when upgrading from an earlier + version. + - New support for IPSEC encrypted tunnels between hypervisors. + - ovn-ctl: allow passing user:group ids to the OVN daemons. + - IPAM/MACAM: + * add the capability to dynamically assign just L2 addresses + * add the capability to specify a static ip address and get the L2 one + allocated dynamically using the following syntax: + ovn-nbctl lsp-set-addresses "dynamic " + * DPDK: + - Add support for DPDK 18.11 + - Add support for port representors. + * Userspace datapath: + - Add option for simple round-robin based Rxq to PMD assignment. + It can be set with pmd-rxq-assign. + - Add support for Auto load balancing of PMDs (experimental) + - Added new per-port configurable option to manage EMC: + 'other_config:emc-enable'. + * Add 'symmetric_l3' hash function. + * OVS now honors 'updelay' and 'downdelay' for bonds with LACP configured. + * ovs-vswitchd: + - New configuration option "offload-rebalance", that enables dynamic + rebalancing of offloaded flows. + * The environment variable OVS_RESOLV_CONF, if set, is now used + as the DNS server configuration file. + * RHEL packaging: + - OVN packages are split from OVS packages. A new spec + file - ovn-fedora.spec.in is added to generate OVN packages. +- Remove upstreamed patch: + * 0001-python-c-ext-Fix-memory-leak-in-Parser_finish.patch +- Remove DISABLE_RESTART_ON_UPDATE and DISABLE_STOP_ON_REMOVAL options (bsc#1117483). + ------------------------------------------------------------------- Sun Jan 20 07:58:20 UTC 2019 - Thomas Bechtold diff --git a/openvswitch.spec b/openvswitch.spec index 8907664..e7a57c0 100644 --- a/openvswitch.spec +++ b/openvswitch.spec @@ -12,7 +12,7 @@ # license that conforms to the Open Source Definition (Version 1.9) # published by the Open Source Initiative. -# Please submit bugfixes or comments via https://bugs.opensuse.org/ +# Please submit bugfixes or comments via http://bugs.opensuse.org/ # # needssslcertforbuild @@ -22,7 +22,7 @@ %if ! %{defined _fillupdir} %define _fillupdir %{_localstatedir}/adm/fillup-templates %endif -%define lname libopenvswitch-2_10-0 +%define lname libopenvswitch-2_11-0 %ifarch aarch64 x86_64 %{ix86} %if 0%{?suse_version} # DPDK enabled only SUSE/openSUSE @@ -41,7 +41,7 @@ # Disable building the external kernel datapath by default %bcond_with kmp Name: openvswitch -Version: 2.10.1 +Version: 2.11.0+git20190123.ad83fc9ab Release: 0 Summary: A multilayer virtual network switch # All code is Apache-2.0 except @@ -50,11 +50,9 @@ Summary: A multilayer virtual network switch License: Apache-2.0 AND LGPL-2.1-only AND SISSL Group: Productivity/Networking/System Url: http://openvswitch.org/ -Source0: http://openvswitch.org/releases/openvswitch-%{version}.tar.gz +Source0: openvswitch-%{version}.tar.gz Source1: preamble Source89: Module.supported.updates -# PATCH-FIX-UPSTREAM: 0001-python-c-ext-Fix-memory-leak-in-Parser_finish.patch -Patch0: 0001-python-c-ext-Fix-memory-leak-in-Parser_finish.patch BuildRequires: autoconf BuildRequires: automake BuildRequires: graphviz @@ -114,10 +112,9 @@ Suggests: openvswitch-kmp %if %{with dpdk} # We need to be a bit strict with the dpdk version since # it's very possible for DPDK to change it's API between -# releases. This version currently requires >=17.XX and -# < 18.05 -BuildRequires: dpdk-devel < 18.05 -BuildRequires: dpdk-devel >= 17.05 +# releases. This version currently requires 18.11. +BuildRequires: dpdk-devel = 18.11 +BuildRequires: libmnl-devel BuildRequires: libnuma-devel BuildRequires: libpcap-devel %endif @@ -320,10 +317,9 @@ performance and connectivity issues in Open vSwitch setup. %prep %setup -q -n openvswitch-%{version} -%patch0 -p1 %build -set -- * .travis* .mailmap +set -- * .travis* .mailmap .cirrus.yml mkdir source mv "$@" source/ mkdir obj @@ -552,7 +548,6 @@ fi # admin decide when it's the best time for an OvS restart. # 5771f476573445710834234a6a9f7bd999a027e7 ("fedora: do not restart the service on a pkg upgrade") %if 0%{?suse_version} - export DISABLE_RESTART_ON_UPDATE=yes %service_del_postun ovsdb-server.service %service_del_postun ovs-vswitchd.service %service_del_postun openvswitch.service @@ -593,7 +588,6 @@ exit 0 %preun # This prevents networking breakages on package removals. -export DISABLE_STOP_ON_REMOVAL=yes %if 0%{?suse_version} %service_del_preun ovsdb-server.service %service_del_preun ovs-vswitchd.service @@ -672,7 +666,6 @@ export DISABLE_STOP_ON_REMOVAL=yes %preun ovn-central # This prevents networking breakages on package removals. -export DISABLE_STOP_ON_REMOVAL=yes %if 0%{?suse_version} %service_del_preun ovn-northd.service %else @@ -689,7 +682,6 @@ export DISABLE_STOP_ON_REMOVAL=yes %preun ovn-host # This prevents networking breakages on package removals. -export DISABLE_STOP_ON_REMOVAL=yes %if 0%{?suse_version} %service_del_preun ovn-controller.service %else @@ -706,7 +698,6 @@ export DISABLE_STOP_ON_REMOVAL=yes %preun ovn-vtep # This prevents networking breakages on package removals. -export DISABLE_STOP_ON_REMOVAL=yes %if 0%{?suse_version} %service_del_preun ovn-controller-vtep.service %else @@ -736,7 +727,6 @@ export DISABLE_STOP_ON_REMOVAL=yes %postun ovn-common -p /sbin/ldconfig %postun ovn-host %if 0%{?suse_version} - export DISABLE_RESTART_ON_UPDATE=yes %service_del_postun ovn-controller.service %else %if 0%{?systemd_postun:1} @@ -748,7 +738,6 @@ export DISABLE_STOP_ON_REMOVAL=yes %postun ovn-vtep %if 0%{?suse_version} - export DISABLE_RESTART_ON_UPDATE=yes %service_del_postun ovn-controller-vtep.service %else %if 0%{?systemd_postun:1} @@ -760,7 +749,6 @@ export DISABLE_STOP_ON_REMOVAL=yes %preun test # This prevents networking breakages on package removals. -export DISABLE_STOP_ON_REMOVAL=yes %if 0%{?suse_version} %service_del_preun openvswitch-testcontroller %else @@ -777,7 +765,6 @@ export DISABLE_STOP_ON_REMOVAL=yes %postun test %if 0%{?suse_version} - export DISABLE_RESTART_ON_UPDATE=yes %service_del_postun openvswitch-testcontroller %else %if 0%{?systemd_postun:1} @@ -819,6 +806,7 @@ export DISABLE_STOP_ON_REMOVAL=yes %{_datadir}/openvswitch/scripts/ovs-ctl %{_datadir}/openvswitch/scripts/ovs-kmod-ctl %{_datadir}/openvswitch/scripts/ovs-lib +%{_datadir}/openvswitch/scripts/ovs-monitor-ipsec %{_datadir}/openvswitch/scripts/ovs-save %{_datadir}/openvswitch/vswitch.ovsschema %{_mandir}/man1/ovsdb-client.1%{?ext_man} @@ -826,6 +814,7 @@ export DISABLE_STOP_ON_REMOVAL=yes %{_mandir}/man1/ovsdb-tool.1%{?ext_man} %{_mandir}/man5/ovs-vswitchd.conf.db.5%{?ext_man} %{_mandir}/man5/ovsdb-server.5%{?ext_man} +%{_mandir}/man7/ovs-actions.7%{?ext_man} %{_mandir}/man7/ovs-fields.7%{?ext_man} %{_mandir}/man8/ovs-appctl.8%{?ext_man} %{_mandir}/man8/ovs-bugtool.8%{?ext_man}