Hello community, here is the log from the commit of package openvswitch for openSUSE:Factory checked in at 2020-09-29 19:05:38 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/openvswitch (Old) and /work/SRC/openSUSE:Factory/.openvswitch.new.4249 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "openvswitch" Tue Sep 29 19:05:38 2020 rev:52 rq:838587 version:unknown Changes: -------- --- /work/SRC/openSUSE:Factory/openvswitch/openvswitch.changes 2020-09-04 11:14:06.319090839 +0200 +++ /work/SRC/openSUSE:Factory/.openvswitch.new.4249/openvswitch.changes 2020-09-29 19:05:46.974052592 +0200 @@ -1,0 +2,7 @@ +Tue Sep 29 10:41:30 UTC 2020 - Jaime Caamaño Ruiz <[email protected]> + +- Fix wrong default directories for OVS python utilities (bsc#1176273). +- Add upstream patches to fix openvswitch-ipsec service (bsc#1176273). + * 0001-ipsec-Fix-Strongswan-configuration-syntax.patch + +------------------------------------------------------------------- @@ -4 +11 @@ -- Update openvswitch to 2.13.0. For a list of changes, check +- Update openvswitch to 2.14.0. For a list of changes, check New: ---- 0001-ipsec-Fix-Strongswan-configuration-syntax.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ openvswitch.spec ++++++ --- /var/tmp/diff_new_pack.J68k37/_old 2020-09-29 19:05:47.694053319 +0200 +++ /var/tmp/diff_new_pack.J68k37/_new 2020-09-29 19:05:47.698053323 +0200 @@ -70,6 +70,8 @@ Patch3: 0001-rhel-Fix-reload-of-OVS_USER_ID-on-startup.patch # PATCH-FIX-OPENSUSE: 0001-Use-double-hash-for-OVS_USER_ID-comment.patch Patch4: 0001-Use-double-hash-for-OVS_USER_ID-comment.patch +# PATCH-FIX-UPSTREAM: 0001-ipsec-Fix-Strongswan-configuration-syntax.patch +Patch5: 0001-ipsec-Fix-Strongswan-configuration-syntax.patch #OVN patches # PATCH-FIX-OPENSUSE: 0001-Run-ovn-as-openvswitch-openvswitch.patch Patch20: 0001-Run-ovn-as-openvswitch-openvswitch.patch @@ -261,6 +263,7 @@ # OVN preambles from now on, overwrites Version and URL %package -n ovn Version: %{ovn_version} +Release: 0 Summary: Open Virtual Network diagnostic utilities License: Apache-2.0 Group: Productivity/Networking/System @@ -285,6 +288,7 @@ %package -n ovn-central Version: %{ovn_version} +Release: 0 Summary: Open Virtual Network support for Open vSwitch License: Apache-2.0 Group: Productivity/Networking/System @@ -293,8 +297,8 @@ Requires: ovn = %{ovn_version} # openvswitch-ovn has been split into openvswitch-ovn-{central,common,docker,host,vtep} Provides: %{name}-dpdk-ovn:%{_bindir}/ovn-northd -Provides: %{name}-ovn:%{_bindir}/ovn-northd Provides: %{name}-ovn-central = %{ovn_version} +Provides: %{name}-ovn:%{_bindir}/ovn-northd Obsoletes: %{name}-ovn-central < 2.13.0 %description -n ovn-central @@ -302,6 +306,7 @@ %package -n ovn-host Version: %{ovn_version} +Release: 0 Summary: Open Virtual Network support for Open vSwitch License: Apache-2.0 Group: Productivity/Networking/System @@ -310,8 +315,8 @@ Requires: ovn = %{ovn_version} # openvswitch-ovn has been split into openvswitch-ovn-{central,common,docker,host,vtep} Provides: %{name}-dpdk-ovn:%{_bindir}/ovn-controller -Provides: %{name}-ovn:%{_bindir}/ovn-controller Provides: %{name}-ovn-host = %{ovn_version} +Provides: %{name}-ovn:%{_bindir}/ovn-controller Obsoletes: %{name}-ovn-host < 2.13.0 %description -n ovn-host @@ -319,6 +324,7 @@ %package -n ovn-vtep Version: %{ovn_version} +Release: 0 Summary: Open Virtual Network VTEP controller for Open vSwitch License: Apache-2.0 Group: Productivity/Networking/System @@ -327,8 +333,8 @@ Requires: ovn = %{ovn_version} # openvswitch-ovn has been split into openvswitch-ovn-{central,common,docker,host,vtep} Provides: %{name}-dpdk-ovn:%{_bindir}/ovn-controller-vtep -Provides: %{name}-ovn:%{_bindir}/ovn-controller-vtep Provides: %{name}-ovn-vtep = %{ovn_version} +Provides: %{name}-ovn:%{_bindir}/ovn-controller-vtep Obsoletes: %{name}-ovn-vtep < 2.13.0 %description -n ovn-vtep @@ -336,6 +342,7 @@ %package -n ovn-docker Version: %{ovn_version} +Release: 0 Summary: Docker network plugins for OVN License: Apache-2.0 Group: Productivity/Networking/System @@ -345,8 +352,8 @@ Requires: python3-openvswitch = %{ovs_version} # openvswitch-ovn has been split into openvswitch-ovn-{central,common,docker,host,vtep} Provides: %{name}-dpdk-ovn:%{_bindir}/ovn-docker-overlay-driver -Provides: %{name}-ovn:%{_bindir}/ovn-docker-overlay-driver Provides: %{name}-ovn-docker = %{ovn_version} +Provides: %{name}-ovn:%{_bindir}/ovn-docker-overlay-driver Obsoletes: %{name}-ovn-docker < 2.13.0 %description -n ovn-docker @@ -354,6 +361,7 @@ %package -n ovn-doc Version: %{ovn_version} +Release: 0 Summary: Open Virtual Network Documentation License: Apache-2.0 Group: System/Libraries @@ -364,6 +372,7 @@ %package -n %{ovn_lname} Version: %{ovn_version} +Release: 0 Summary: Open Virtual Network core libraries License: Apache-2.0 Group: System/Libraries @@ -373,6 +382,7 @@ %package -n ovn-devel Version: %{ovn_version} +Release: 0 Summary: Development files for Open Virtual Network License: Apache-2.0 Group: Development/Libraries/C and C++ @@ -390,6 +400,7 @@ %patch2 -p1 %patch3 -p1 %patch4 -p1 +%patch5 -p1 cd %{ovn_dir} %patch20 -p1 @@ -514,7 +525,6 @@ done %endif - # Install OVS dist files on temp buildroot. mkdir -p buildroot/ovs pushd %ovs_dir @@ -525,7 +535,6 @@ rm -f buildroot/ovs%{_libdir}/*.a rm -f buildroot/ovs%{_libdir}/*.la - # Install OVN dist files on temp build root. mkdir -p buildroot/ovn pushd %ovn_dir @@ -548,7 +557,6 @@ cp -an buildroot/ovn/* %{buildroot}/ cp -an buildroot/ovs/* %{buildroot}/ - # Install OVS additional files pushd %ovs_dir @@ -630,12 +638,10 @@ # Python subpackage # Build on a temporary directory. mkdir python3-ovs && pushd $_ -cp -a ../%{ovs_dir}/python/* $(pwd)/ - # Some build files are in sources while others are generated directly on -# buildroot as part of make_install (dirs.py), so update the former with the -# latter. -cp -an %{buildroot}%{_datadir}/openvswitch/python/* $(pwd)/ +# buildroot as part of make_install (dirs.py). Copy them first. +cp -an ../buildroot/ovs%{_datadir}/openvswitch/python/* $(pwd)/ +cp -an ../%{ovs_dir}/python/* $(pwd)/ rm -rf %{buildroot}%{_datadir}/openvswitch/python export LDFLAGS="${LDFLAGS} -L %{buildroot}%{_libdir}" @@ -655,7 +661,6 @@ # Done with OVS additional files. popd - # Install OVN aditional files. pushd %ovn_dir ++++++ 0001-ipsec-Fix-Strongswan-configuration-syntax.patch ++++++ >From 0723a7b85fa446bbe372567f9e06869041982e9b Mon Sep 17 00:00:00 2001 From: Boleslaw Tokarski <[email protected]> Date: Wed, 8 Apr 2020 11:47:20 +0100 Subject: [PATCH 1/2] ipsec: Fix Strongswan configuration syntax. Strongswan seems to have .opt files in the source tree with the dotted option syntax. It seems that up until version 5.6, the syntax was also accepted by Strongswan. However, the .opt files are converted to .conf files during Strongswan build, and the dotted syntax is no longer accepted by Strongswan (tested on 5.8.2). The effect was that the ovs ipsec monitor fails to start Strongswan, since that complains with: /etc/strongswan.d/ovs.conf:4: syntax error, unexpected ., expecting : or '{' or '=' [.] This commit fixes the configuration file provided to Strongswan to .conf syntax. Signed-off-by: Boleslaw Tokarski <[email protected]> Signed-off-by: Ilya Maximets <[email protected]> --- ipsec/ovs-monitor-ipsec.in | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) diff --git a/ipsec/ovs-monitor-ipsec.in b/ipsec/ovs-monitor-ipsec.in index 37e370324..da8b92b6c 100755 --- a/ipsec/ovs-monitor-ipsec.in +++ b/ipsec/ovs-monitor-ipsec.in @@ -145,10 +145,18 @@ class StrongSwanHelper(object): """This class does StrongSwan specific configurations.""" STRONGSWAN_CONF = """%s -charon.plugins.kernel-netlink.set_proto_port_transport_sa = yes -charon.plugins.kernel-netlink.xfrm_ack_expires = 10 -charon.load_modular = yes -charon.plugins.gcm.load = yes +charon { + plugins { + kernel-netlink { + set_proto_port_transport_sa = yes + xfrm_ack_expires = 10 + } + gcm { + load = yes + } + } + load_modular = yes +} """ % (FILE_HEADER) CONF_HEADER = """%s -- 2.26.2
