From 6290a0b7e7efc0ca1678831915e0cb4abd8f76bdeaaebc25e77ee0ecd2a41f0a Mon Sep 17 00:00:00 2001 From: Johannes Segitz Date: Tue, 14 Jul 2020 14:13:43 +0000 Subject: [PATCH 1/2] Accepting request 820924 from home:jsegitz:branches:security:SELinux - Update to version 3.1 * `restorecond_user.service` - new systemd user service which runs `restorecond -u` OBS-URL: https://build.opensuse.org/request/show/820924 OBS-URL: https://build.opensuse.org/package/show/security:SELinux/restorecond?expand=0&rev=16 --- restorecond-3.0.tar.gz | 3 --- restorecond-3.1.tar.gz | 3 +++ restorecond.changes | 7 +++++++ restorecond.spec | 9 +++++---- 4 files changed, 15 insertions(+), 7 deletions(-) delete mode 100644 restorecond-3.0.tar.gz create mode 100644 restorecond-3.1.tar.gz diff --git a/restorecond-3.0.tar.gz b/restorecond-3.0.tar.gz deleted file mode 100644 index b0abb35..0000000 --- a/restorecond-3.0.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:32a92c9f4bf48c613f9f467ced58d8c369eec8892239cd44d5d0e139b41926dc -size 18797 diff --git a/restorecond-3.1.tar.gz b/restorecond-3.1.tar.gz new file mode 100644 index 0000000..e3f0573 --- /dev/null +++ b/restorecond-3.1.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:82ca45099685a45d718f11f8859963c1ba83d98e510312cbf0b7dc5664c60ad0 +size 18939 diff --git a/restorecond.changes b/restorecond.changes index 01655da..38ea7cb 100644 --- a/restorecond.changes +++ b/restorecond.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Tue Jul 14 08:32:09 UTC 2020 - Johannes Segitz + +- Update to version 3.1 + * `restorecond_user.service` - new systemd user service which runs + `restorecond -u` + ------------------------------------------------------------------- Tue May 12 06:50:33 UTC 2020 - Johannes Segitz diff --git a/restorecond.spec b/restorecond.spec index 23215e6..9b85154 100644 --- a/restorecond.spec +++ b/restorecond.spec @@ -16,15 +16,15 @@ # -%define libselinux_ver 3.0 +%define libselinux_ver 3.1 Name: restorecond -Version: 3.0 +Version: 3.1 Release: 0 Summary: Daemon to restore SELinux contexts License: GPL-2.0-or-later Group: Productivity/Security URL: https://github.com/SELinuxProject/selinux.git -Source0: https://github.com/SELinuxProject/selinux/releases/download/20191204/restorecond-%{version}.tar.gz +Source0: https://github.com/SELinuxProject/selinux/releases/download/20200710/restorecond-%{version}.tar.gz BuildRequires: dbus-1-glib-devel BuildRequires: libselinux-devel >= %{libselinux_ver} Requires: libselinux1 >= %{libselinux_ver} @@ -41,7 +41,7 @@ export CFLAGS="%optflags" %make_build LSPP_PRIV=y all %install -make DESTDIR=%{buildroot} SHLIBDIR=/%{_lib} install +make DESTDIR=%{buildroot} SHLIBDIR=/%{_lib} SYSTEMDSYSTEMUNITDIR=/usr/lib/systemd/system SYSTEMDUSERUNITDIR=/usr/lib/systemd/user install rm %{buildroot}%{_sysconfdir}/rc.d/init.d/restorecond ln -s /sbin/service %{buildroot}%{_sbindir}/rcrestorecond @@ -62,6 +62,7 @@ ln -s /sbin/service %{buildroot}%{_sbindir}/rcrestorecond %config(noreplace) %{_sysconfdir}/selinux/restorecond_user.conf %{_sysconfdir}/xdg/autostart/restorecond.desktop %{_unitdir}/restorecond.service +/usr/lib/systemd/user/restorecond_user.service %{_sbindir}/restorecond %{_sbindir}/rcrestorecond From 0e867f8f06a96f58fcc913c95e182c12f058abc16fae29e89563968992a065cf Mon Sep 17 00:00:00 2001 From: Johannes Segitz Date: Thu, 16 Jul 2020 06:40:33 +0000 Subject: [PATCH 2/2] Accepting request 821224 from home:jsegitz:branches:security:SELinux - Use proper macros for SYSTEMDSYSTEMUNITDIR and SYSTEMDUSERUNITDIR OBS-URL: https://build.opensuse.org/request/show/821224 OBS-URL: https://build.opensuse.org/package/show/security:SELinux/restorecond?expand=0&rev=17 --- restorecond.changes | 5 +++++ restorecond.spec | 4 ++-- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/restorecond.changes b/restorecond.changes index 38ea7cb..70c5e58 100644 --- a/restorecond.changes +++ b/restorecond.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Wed Jul 15 14:27:05 UTC 2020 - Johannes Segitz + +- Use proper macros for SYSTEMDSYSTEMUNITDIR and SYSTEMDUSERUNITDIR + ------------------------------------------------------------------- Tue Jul 14 08:32:09 UTC 2020 - Johannes Segitz diff --git a/restorecond.spec b/restorecond.spec index 9b85154..f64c2c2 100644 --- a/restorecond.spec +++ b/restorecond.spec @@ -41,7 +41,7 @@ export CFLAGS="%optflags" %make_build LSPP_PRIV=y all %install -make DESTDIR=%{buildroot} SHLIBDIR=/%{_lib} SYSTEMDSYSTEMUNITDIR=/usr/lib/systemd/system SYSTEMDUSERUNITDIR=/usr/lib/systemd/user install +make DESTDIR=%{buildroot} SHLIBDIR=/%{_lib} SYSTEMDSYSTEMUNITDIR=%{_unitdir} SYSTEMDUSERUNITDIR=%{_userunitdir} install rm %{buildroot}%{_sysconfdir}/rc.d/init.d/restorecond ln -s /sbin/service %{buildroot}%{_sbindir}/rcrestorecond @@ -62,7 +62,7 @@ ln -s /sbin/service %{buildroot}%{_sbindir}/rcrestorecond %config(noreplace) %{_sysconfdir}/selinux/restorecond_user.conf %{_sysconfdir}/xdg/autostart/restorecond.desktop %{_unitdir}/restorecond.service -/usr/lib/systemd/user/restorecond_user.service +%{_userunitdir}/restorecond_user.service %{_sbindir}/restorecond %{_sbindir}/rcrestorecond