Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package openvswitch for openSUSE:Factory checked in at 2022-04-11 23:48:08 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/openvswitch (Old) and /work/SRC/openSUSE:Factory/.openvswitch.new.1900 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "openvswitch" Mon Apr 11 23:48:08 2022 rev:59 rq:967690 version:2.17.0 Changes: -------- --- /work/SRC/openSUSE:Factory/openvswitch/openvswitch.changes 2022-03-14 19:37:49.598181076 +0100 +++ /work/SRC/openSUSE:Factory/.openvswitch.new.1900/openvswitch.changes 2022-04-11 23:49:50.662659187 +0200 @@ -1,0 +2,27 @@ +Sun Apr 3 13:12:28 UTC 2022 - Ferdinand Thiessen <r...@fthiessen.de> + +- Mention openvswitch-rpmlintrc as Source in spec file + +------------------------------------------------------------------- +Mon Mar 14 13:55:07 UTC 2022 - Ferdinand Thiessen <r...@fthiessen.de> + +- Fix installation of files shared with OVN (required for building + OVN without openvswitch sources), remove custom installation + of internal headers from SPEC-install section and use patches + (for upstreaming) instead. + * install-ovsdb-tools.patch + * Added 0001-openvswitch-merge-compiler.h-files-into-one-file.patch + * Added 0002-build-Seperated-common-used-headers.patch +- Enabled check section / running testsuite by default to validate + build result. There must no problems with the testsuite anymore as + upstream runs it by CI and checked before release of a new version. +- Renamed 0001-Don-t-change-permissions-of-dev-hugepages.patch to + Don-t-change-permissions-of-dev-hugepages.patch +- Renamed 0001-Run-openvswitch-as-openvswitch-openvswitch.patch to + Run-openvswitch-as-openvswitch-openvswitch.patch +- Renamed 0001-Use-double-hash-for-OVS_USER_ID-comment.patch to + Use-double-hash-for-OVS_USER_ID-comment.patch +- Rebased 0001-Use-strongswan-for-openvswitch-ipsec-service.patch to + Use-strongswan-for-openvswitch-ipsec-service.patch + +------------------------------------------------------------------- Old: ---- 0001-Don-t-change-permissions-of-dev-hugepages.patch 0001-Run-openvswitch-as-openvswitch-openvswitch.patch 0001-Use-double-hash-for-OVS_USER_ID-comment.patch 0001-Use-strongswan-for-openvswitch-ipsec-service.patch New: ---- 0001-openvswitch-merge-compiler.h-files-into-one-file.patch 0002-build-Seperated-common-used-headers.patch Don-t-change-permissions-of-dev-hugepages.patch Run-openvswitch-as-openvswitch-openvswitch.patch Use-double-hash-for-OVS_USER_ID-comment.patch Use-strongswan-for-openvswitch-ipsec-service.patch openvswitch-rpmlintrc ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ openvswitch.spec ++++++ --- /var/tmp/diff_new_pack.5CqUkO/_old 2022-04-11 23:49:51.434650380 +0200 +++ /var/tmp/diff_new_pack.5CqUkO/_new 2022-04-11 23:49:51.438650334 +0200 @@ -30,8 +30,7 @@ %bcond_with dpdk %endif # The testsuite is somewhat fragile for continuous testing in OBS -# but keep it here as an option -%bcond_with check +%bcond_without check # Disable building the external kernel datapath by default %bcond_with kmp %define lname libopenvswitch-2_17-0 @@ -48,30 +47,35 @@ Source0: http://openvswitch.org/releases/openvswitch-%{version}.tar.gz Source2: preamble Source89: Module.supported.updates +Source99: openvswitch-rpmlintrc # PATCH-FIX-OPENSUSE: Use-strongswan-for-openvswitch-ipsec-service.patch -Patch0: 0001-Use-strongswan-for-openvswitch-ipsec-service.patch -# PATCH-FIX-OPENSUSE: 0001-Run-openvswitch-as-openvswitch-openvswitch.patch -Patch1: 0001-Run-openvswitch-as-openvswitch-openvswitch.patch -# PATCH-FIX-OPENSUSE: 0001-Don-t-change-permissions-of-dev-hugepages.patch -Patch2: 0001-Don-t-change-permissions-of-dev-hugepages.patch -# PATCH-FIX-OPENSUSE: 0001-Use-double-hash-for-OVS_USER_ID-comment.patch -Patch3: 0001-Use-double-hash-for-OVS_USER_ID-comment.patch +Patch0: Use-strongswan-for-openvswitch-ipsec-service.patch +# PATCH-FIX-OPENSUSE: Run-openvswitch-as-openvswitch-openvswitch.patch +Patch1: Run-openvswitch-as-openvswitch-openvswitch.patch +# PATCH-FIX-OPENSUSE: Don-t-change-permissions-of-dev-hugepages.patch +Patch2: Don-t-change-permissions-of-dev-hugepages.patch +# PATCH-FIX-OPENSUSE: Use-double-hash-for-OVS_USER_ID-comment.patch +Patch3: Use-double-hash-for-OVS_USER_ID-comment.patch # PATCH-FEATURE-UPSTREAM install-ovsdb-tools.patch -- Install some tools required for building OVN Patch4: install-ovsdb-tools.patch +Patch5: 0001-openvswitch-merge-compiler.h-files-into-one-file.patch +Patch6: 0002-build-Seperated-common-used-headers.patch +# Python subpackage +BuildRequires: %{python_module devel} BuildRequires: %{python_module setuptools} +BuildRequires: python-rpm-macros +# Main package BuildRequires: autoconf BuildRequires: automake BuildRequires: fdupes BuildRequires: graphviz -BuildRequires: libcap-ng-devel -BuildRequires: libopenssl-devel BuildRequires: libtool BuildRequires: make BuildRequires: pkgconfig -BuildRequires: python -BuildRequires: python-rpm-macros +BuildRequires: python3 BuildRequires: python3-Sphinx BuildRequires: unbound-devel +BuildRequires: pkgconfig(libcap-ng) BuildRequires: pkgconfig(openssl) Requires: modutils # ovs-ctl / ovs-pki use /usr/bin/uuidgen: @@ -162,6 +166,8 @@ License: Apache-2.0 Group: Development/Libraries/C and C++ Requires: %{lname} = %{version} +# Required for ovsdb-ildc +Requires: python3-ovs = %{version} Provides: %{name}-dpdk-devel = %{version} Obsoletes: %{name}-dpdk-devel < 2.7.0 @@ -310,12 +316,14 @@ %if %{with check} touch resolv.conf export OVS_RESOLV_CONF=$(pwd)/resolv.conf +mv python/build python/pb +ln -s _build.tmp python/build # Recheck tests before we declare them broken. If that fails, dump # the log and exit. >2.5.0 uses the RECHECK env variable so this # needs to be taken into consideration for future releases. -if ! make check TESTSUITEFLAGS="%{?_smp_mflags}" && - ! make check TESTSUITEFLAGS='--recheck'; then +if ! make check-am TESTSUITEFLAGS="%{?_smp_mflags}" && + ! make check-am TESTSUITEFLAGS='--recheck'; then cat tests/testsuite.log exit 1 fi @@ -339,18 +347,10 @@ # Remove static libraries and libtool files rm -f %{buildroot}%{_libdir}/*.{l,}a -# Install extra headers not included with 'make install' -copy_headers() { - src=$1 - dst=%{buildroot}/$2 - install -d -m 0755 $dst - install -m 0644 $src/*.h $dst -} -copy_headers include/sparse %{_includedir}/openvswitch/sparse -copy_headers include/sparse/arpa %{_includedir}/openvswitch/sparse/arpa -copy_headers include/sparse/netinet %{_includedir}/openvswitch/sparse/netinet -copy_headers include/sparse/sys %{_includedir}/openvswitch/sparse/sys -copy_headers lib %{_includedir}/openvswitch/lib +# Fix installation path +mkdir -p %{buildroot}/%{_datadir}/bash-completion/completions/ +mv %{buildroot}/%{_sysconfdir}/bash_completion.d/ovs-* %{buildroot}/%{_datadir}/bash-completion/completions/ +chmod 0644 %{buildroot}/%{_datadir}/bash-completion/completions/* # Install systemd files for service in openvswitch \ @@ -366,10 +366,6 @@ install -D -m 644 rhel/usr_share_openvswitch_scripts_systemd_sysconfig.template \ %{buildroot}%{_fillupdir}/sysconfig.openvswitch -# Fix installation path -mkdir -p %{buildroot}/%{_datadir}/bash-completion/completions/ -mv %{buildroot}/%{_sysconfdir}/bash_completion.d/ovs-* %{buildroot}/%{_datadir}/bash-completion/completions/ - install -d -m 0755 %{buildroot}/%{_rundir}/openvswitch install -d -m 0755 %{buildroot}%{_sysconfdir}/logrotate.d install -d -m 0755 %{buildroot}%{_localstatedir}/log/openvswitch @@ -402,7 +398,7 @@ make python/ovs/dirs.py pushd python export LDFLAGS="${LDFLAGS} -L %{buildroot}%{_libdir}" -export CPPFLAGS="-I ../../include" +export CPPFLAGS="-I %{buildroot}%{_includedir} -I %{buildroot}%{_includedir}/openvswitch" %python_build %python_install popd ++++++ 0001-openvswitch-merge-compiler.h-files-into-one-file.patch ++++++ ++++ 1203 lines (skipped) ++++++ 0002-build-Seperated-common-used-headers.patch ++++++ ++++ 11817 lines (skipped) ++++++ Don-t-change-permissions-of-dev-hugepages.patch ++++++ >From e54cce931bafa12176989a5d59e3839f1bcfdf0c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jaime=20Caama=C3=B1o=20Ruiz?= <jcaam...@suse.com> Date: Wed, 6 May 2020 16:32:28 +0200 Subject: [PATCH 1/2] Don't change permissions of /dev/hugepages For SLES/openSUSE, don't change permissions of /dev/hugepages as that is a system path. Sysadmin shoudl mount hugepages on a path and permission of his choosing if OVS either manually or via hugeadm. --- rhel/usr_lib_systemd_system_ovs-vswitchd.service.in | 4 ---- 1 file changed, 4 deletions(-) diff --git a/rhel/usr_lib_systemd_system_ovs-vswitchd.service.in b/rhel/usr_lib_systemd_system_ovs-vswitchd.service.in index ff43dae96..08355d950 100644 --- a/rhel/usr_lib_systemd_system_ovs-vswitchd.service.in +++ b/rhel/usr_lib_systemd_system_ovs-vswitchd.service.in @@ -16,10 +16,6 @@ EnvironmentFile=/etc/openvswitch/default.conf EnvironmentFile=-/etc/sysconfig/openvswitch EnvironmentFile=-/run/openvswitch.useropts LimitSTACK=2M -@begin_dpdk@ -ExecStartPre=-/bin/sh -c '/usr/bin/chown :$${OVS_USER_ID##*:} /dev/hugepages' -ExecStartPre=-/usr/bin/chmod 0775 /dev/hugepages -@end_dpdk@ ExecStart=/usr/share/openvswitch/scripts/ovs-ctl \ --no-ovsdb-server --no-monitor --system-id=random \ ${OVS_USER_OPT} \ -- 2.16.4 ++++++ Run-openvswitch-as-openvswitch-openvswitch.patch ++++++ >From 4de3a6e6fc67125a900913598344881c0b0bed71 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jaime=20Caama=C3=B1o=20Ruiz?= <jcaam...@suse.com> Date: Fri, 8 May 2020 11:15:57 +0200 Subject: [PATCH] Run openvswitch as openvswitch:openvswitch Change default run configuration to unprivilieged user openvswitch and group openvswitch. Expect any further customization from user in sysconfig/openvswitch, including setting it back to privileged root:root configuration. --- rhel/etc_logrotate.d_openvswitch | 2 +- rhel/etc_openvswitch_default.conf | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/rhel/etc_logrotate.d_openvswitch b/rhel/etc_logrotate.d_openvswitch index f4302ffbc..eaf1fd5bf 100644 --- a/rhel/etc_logrotate.d_openvswitch +++ b/rhel/etc_logrotate.d_openvswitch @@ -6,7 +6,7 @@ # without warranty of any kind. /var/log/openvswitch/*.log { - su root root + su openvswitch openvswitch daily compress sharedscripts diff --git a/rhel/etc_openvswitch_default.conf b/rhel/etc_openvswitch_default.conf index c74417db6..20d1f5f54 100644 --- a/rhel/etc_openvswitch_default.conf +++ b/rhel/etc_openvswitch_default.conf @@ -1,5 +1,4 @@ # DO NOT EDIT THIS FILE # The following is the *default* configuration for the openvswitch user ID. -# This is for backward compatibility. -OVS_USER_ID="root:root" +OVS_USER_ID="openvswitch:openvswitch" -- 2.16.4 ++++++ Use-double-hash-for-OVS_USER_ID-comment.patch ++++++ >From e007ba2d276530db6aa8a242b069f356395cd8e5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jaime=20Caama=C3=B1o=20Ruiz?= <jcaam...@suse.com> Date: Mon, 15 Jun 2020 15:15:53 +0200 Subject: [PATCH] Use double hash for OVS_USER_ID comment --- rhel/usr_share_openvswitch_scripts_systemd_sysconfig.template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/rhel/usr_share_openvswitch_scripts_systemd_sysconfig.template b/rhel/usr_share_openvswitch_scripts_systemd_sysconfig.template index c467d02db..10b841679 100644 --- a/rhel/usr_share_openvswitch_scripts_systemd_sysconfig.template +++ b/rhel/usr_share_openvswitch_scripts_systemd_sysconfig.template @@ -28,4 +28,4 @@ OPTIONS="" # Uncomment and set the OVS User/Group value -#OVS_USER_ID="openvswitch:openvswitch" +## OVS_USER_ID="openvswitch:openvswitch" -- 2.26.1 ++++++ Use-strongswan-for-openvswitch-ipsec-service.patch ++++++ >From f786cf97880bdf1ebed65db2f560ff15f1f29413 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jaime=20Caama=C3=B1o=20Ruiz?= <jcaam...@suse.com> Date: Mon, 28 Oct 2019 15:14:19 +0100 Subject: [PATCH] Use strongswan for openvswitch-ipsec service Since libreswan is not packaged for Leap/SLES, use strongswan for the time being. --- rhel/usr_lib_systemd_system_openvswitch-ipsec.service | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff -Nur openvswitch-2.17.0/rhel/usr_lib_systemd_system_openvswitch-ipsec.service new/rhel/usr_lib_systemd_system_openvswitch-ipsec.service --- openvswitch-2.17.0/rhel/usr_lib_systemd_system_openvswitch-ipsec.service 2022-02-17 23:15:55.257680736 +0100 +++ new/rhel/usr_lib_systemd_system_openvswitch-ipsec.service 2022-02-26 02:22:12.429785364 +0100 @@ -7,7 +7,7 @@ Type=forking PIDFile=/run/openvswitch/ovs-monitor-ipsec.pid ExecStart=/usr/share/openvswitch/scripts/ovs-ctl \ - --ike-daemon=libreswan start-ovs-ipsec + --ike-daemon=strongswan start-ovs-ipsec ExecStop=/usr/share/openvswitch/scripts/ovs-ctl stop-ovs-ipsec [Install] ++++++ openvswitch-rpmlintrc ++++++ addFilter("E: backup-file-in-package /etc/openvswitch/\.conf\.db\.~lock~")
