SHA256
1
0
forked from pool/permissions

Accepting request 815294 from home:mkraus:branches:Base:System

- dbus-1: adjust to new libexec dir location (bsc#1171164). This is
  temporarily done through the patch in dbus-libexec.patch because
  we are not completely certain the stability of current git.
- run chkstat test suite during RPM build

OBS-URL: https://build.opensuse.org/request/show/815294
OBS-URL: https://build.opensuse.org/package/show/Base:System/permissions?expand=0&rev=266
This commit is contained in:
Malte Kraus 2020-06-16 16:20:27 +00:00 committed by Git OBS Bridge
parent 2c673b8f18
commit c23ecff997
3 changed files with 50 additions and 4 deletions

36
dbus-libexec.patch Normal file
View File

@ -0,0 +1,36 @@
Index: permissions-20200526/profiles/permissions.easy
===================================================================
--- permissions-20200526.orig/profiles/permissions.easy
+++ permissions-20200526/profiles/permissions.easy
@@ -267,6 +267,7 @@
/lib64/dbus-1/dbus-daemon-launch-helper root:messagebus 4750
# dbus-1 in /usr #1056764)
/usr/lib/dbus-1/dbus-daemon-launch-helper root:messagebus 4750
+/usr/libexec/dbus-1/dbus-daemon-launch-helper root:messagebus 4750
/usr/lib64/dbus-1/dbus-daemon-launch-helper root:messagebus 4750
# policycoreutils (#440596)
Index: permissions-20200526/profiles/permissions.paranoid
===================================================================
--- permissions-20200526.orig/profiles/permissions.paranoid
+++ permissions-20200526/profiles/permissions.paranoid
@@ -278,6 +278,7 @@
/lib64/dbus-1/dbus-daemon-launch-helper root:messagebus 0750
# dbus-1 in /usr #1056764)
/usr/lib/dbus-1/dbus-daemon-launch-helper root:messagebus 0750
+/usr/libexec/dbus-1/dbus-daemon-launch-helper root:messagebus 0750
/usr/lib64/dbus-1/dbus-daemon-launch-helper root:messagebus 0750
# policycoreutils (#440596)
Index: permissions-20200526/profiles/permissions.secure
===================================================================
--- permissions-20200526.orig/profiles/permissions.secure
+++ permissions-20200526/profiles/permissions.secure
@@ -308,6 +308,7 @@
/lib64/dbus-1/dbus-daemon-launch-helper root:messagebus 4750
# dbus-1 in /usr #1056764)
/usr/lib/dbus-1/dbus-daemon-launch-helper root:messagebus 4750
+/usr/libexec/dbus-1/dbus-daemon-launch-helper root:messagebus 4750
/usr/lib64/dbus-1/dbus-daemon-launch-helper root:messagebus 4750
# policycoreutils (#440596)

View File

@ -1,3 +1,11 @@
-------------------------------------------------------------------
Tue Jun 16 13:23:23 UTC 2020 - malte.kraus@suse.com
- dbus-1: adjust to new libexec dir location (bsc#1171164). This is
temporarily done through the patch in dbus-libexec.patch because
we are not completely certain the stability of current git.
- run chkstat test suite during RPM build
------------------------------------------------------------------- -------------------------------------------------------------------
Tue May 26 13:03:52 UTC 2020 - matthias.gerstner@suse.com Tue May 26 13:03:52 UTC 2020 - matthias.gerstner@suse.com

View File

@ -28,17 +28,20 @@ Group: Productivity/Security
URL: http://github.com/openSUSE/permissions URL: http://github.com/openSUSE/permissions
Source: permissions-%{VERSION_DATE}.tar.xz Source: permissions-%{VERSION_DATE}.tar.xz
Source1: fix_version.sh Source1: fix_version.sh
Patch0: dbus-libexec.patch
BuildRequires: gcc-c++ BuildRequires: gcc-c++
BuildRequires: libcap-devel BuildRequires: libcap-devel
BuildRequires: libcap-progs BuildRequires: libcap-progs
BuildRequires: tclap BuildRequires: tclap
# test suite
BuildRequires: python3-base
Requires: chkstat Requires: chkstat
Requires: permissions-config Requires: permissions-config
Recommends: permissions-doc Recommends: permissions-doc
Provides: aaa_base:%{_datadir}/permissions Provides: aaa_base:%{_datadir}/permissions
%prep %prep
%setup -q -n permissions-%{VERSION_DATE} %autosetup -p1 -n permissions-%{VERSION_DATE}
%build %build
make %{?_smp_mflags} CFLAGS="-W -Wall %{optflags}" FSCAPS_DEFAULT_ENABLED=0 make %{?_smp_mflags} CFLAGS="-W -Wall %{optflags}" FSCAPS_DEFAULT_ENABLED=0
@ -46,9 +49,8 @@ make %{?_smp_mflags} CFLAGS="-W -Wall %{optflags}" FSCAPS_DEFAULT_ENABLED=0
%install %install
%make_install fillupdir=%{_fillupdir} %make_install fillupdir=%{_fillupdir}
# regression tests disabled for the moment, needs adjustment for the new /usr/share world %check
#%check tests/regtest.py --skip-make > /dev/null
#tests/regtest.py
%description %description
Permission settings of files and directories depending on the local Permission settings of files and directories depending on the local