diff --git a/dbus-libexec.patch b/dbus-libexec.patch new file mode 100644 index 0000000..e5bebee --- /dev/null +++ b/dbus-libexec.patch @@ -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) diff --git a/permissions.changes b/permissions.changes index 928c59c..f467562 100644 --- a/permissions.changes +++ b/permissions.changes @@ -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 diff --git a/permissions.spec b/permissions.spec index d18a0a0..5ddf44e 100644 --- a/permissions.spec +++ b/permissions.spec @@ -28,17 +28,20 @@ Group: Productivity/Security URL: http://github.com/openSUSE/permissions Source: permissions-%{VERSION_DATE}.tar.xz Source1: fix_version.sh +Patch0: dbus-libexec.patch BuildRequires: gcc-c++ BuildRequires: libcap-devel BuildRequires: libcap-progs BuildRequires: tclap +# test suite +BuildRequires: python3-base Requires: chkstat Requires: permissions-config Recommends: permissions-doc Provides: aaa_base:%{_datadir}/permissions %prep -%setup -q -n permissions-%{VERSION_DATE} +%autosetup -p1 -n permissions-%{VERSION_DATE} %build 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 %make_install fillupdir=%{_fillupdir} -# regression tests disabled for the moment, needs adjustment for the new /usr/share world -#%check -#tests/regtest.py +%check +tests/regtest.py --skip-make > /dev/null %description Permission settings of files and directories depending on the local