Hello community, here is the log from the commit of package lxc for openSUSE:Leap:15.2 checked in at 2020-04-08 12:49:21 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Leap:15.2/lxc (Old) and /work/SRC/openSUSE:Leap:15.2/.lxc.new.3248 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "lxc" Wed Apr 8 12:49:21 2020 rev:19 rq:791874 version:4.0.0 Changes: -------- --- /work/SRC/openSUSE:Leap:15.2/lxc/lxc.changes 2020-04-05 17:07:41.826253434 +0200 +++ /work/SRC/openSUSE:Leap:15.2/.lxc.new.3248/lxc.changes 2020-04-08 12:49:49.798387478 +0200 @@ -1,0 +2,6 @@ +Tue Apr 7 01:19:17 UTC 2020 - Aleksa Sarai <[email protected]> + +- Fix mis-use of %suse_version when we actually want to check against + %sle_version when determining whether lxc-user-nic should be setuid. + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ lxc.spec ++++++ --- /var/tmp/diff_new_pack.EmD8an/_old 2020-04-08 12:49:50.210387693 +0200 +++ /var/tmp/diff_new_pack.EmD8an/_new 2020-04-08 12:49:50.214387695 +0200 @@ -1,7 +1,7 @@ # # spec file for package lxc # -# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2020 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -15,17 +15,16 @@ # Please submit bugfixes or comments via https://bugs.opensuse.org/ # + # On pre-15 SLE versions, _sharedstatedir was /usr/com -- which is just wrong. -%if 0%{suse_version} < 1500 +%if 0%{?suse_version} < 1500 %define _sharedstatedir /var/lib %endif # In later versions of openSUSE's permissions config, lxc-user-nic was # whitelisted with a setuid bit enabled -- but in order to allow building on # old distros we must not make it setuid on pre-15.1 distros. See bsc#988348. -# -# NOTE: For some reason, it looks like Leap 15.1 always has suse_version 1500? -%if 0%{suse_version} <= 1500 +%if 0%{suse_version} <= 1500 && 0%{?sle_version} < 150100 %define old_permissions 1 %endif %define setuid_mode 0%{!?old_permissions:4}750 @@ -38,7 +37,7 @@ Name: lxc Version: 4.0.0 Release: 0 -Url: http://linuxcontainers.org/ +URL: http://linuxcontainers.org/ Summary: Userspace tools for Linux kernel containers License: LGPL-2.1-or-later Group: System/Management @@ -54,23 +53,23 @@ Patch2: 0002-cgroups-fix-uninitialized-transient_len-warning.patch # FIX-UPSTREAM: Backport of https://github.com/lxc/lxc/pull/3349 . Patch3: 0003-cgroups-fix-build-warning-on-GCC-7.patch -BuildRequires: gcc BuildRequires: automake -BuildRequires: libtool -BuildRequires: pkg-config -BuildRequires: libgnutls-devel +BuildRequires: gcc BuildRequires: libapparmor-devel -BuildRequires: libselinux-devel BuildRequires: libcap-devel +BuildRequires: libgnutls-devel +BuildRequires: libselinux-devel +BuildRequires: libtool BuildRequires: pam-devel +BuildRequires: pkg-config %ifarch %ix86 x86_64 BuildRequires: libseccomp-devel %endif -BuildRequires: libxslt -BuildRequires: fdupes +BuildRequires: bash-completion BuildRequires: docbook-utils BuildRequires: docbook2x -BuildRequires: bash-completion +BuildRequires: fdupes +BuildRequires: libxslt BuildRequires: pkgconfig(systemd) Requires: libcap-progs Requires: lxcfs @@ -105,7 +104,7 @@ # Older SLE versions didn't have -abstractions but instead had -profiles # (though Leap has -abstractions regardless of it being based on SLE). We only # need them to not have to own /etc/apparmor.d/abstractions. -%if 0%{?is_opensuse} || %{?suse_version} >= 1500 +%if 0%{?is_opensuse} || 0%{?suse_version} >= 1500 BuildRequires: apparmor-abstractions %else BuildRequires: apparmor-profiles @@ -125,6 +124,7 @@ %package bash-completion Summary: Bash Completion for %{name} +License: LGPL-2.1-or-later Group: System/Management Requires: %{name} = %{version} Supplements: packageand(%{name}:bash-completion)
