[packages/selinux-restorecond] up to 3.6

[atler]

commit 9aafd8edf3ee294e54fbc068d298b27f28d570a2
Author: Jan Palus <atler at pld-linux.org>
Date:   Tue Jan 9 21:42:54 2024 +0100

    up to 3.6

 restorecond-init.patch   | 14 ++++++++------
 selinux-restorecond.spec | 13 ++++++-------
 2 files changed, 14 insertions(+), 13 deletions(-)
---
diff --git a/selinux-restorecond.spec b/selinux-restorecond.spec
index 15b10ea..34356d9 100644
--- a/selinux-restorecond.spec
+++ b/selinux-restorecond.spec
@@ -1,24 +1,24 @@
 Summary:	restorecond - daemon which corrects contexts of newly created files
 Summary(pl.UTF-8):	restorecond - demon poprawiający konteksty nowo tworzonych plików
 Name:		selinux-restorecond
-Version:	3.1
-Release:	2
+Version:	3.6
+Release:	1
 License:	GPL v2+
 Group:		Daemons
 #Source0Download: https://github.com/SELinuxProject/selinux/wiki/Releases
-Source0:	https://github.com/SELinuxProject/selinux/releases/download/20200710/restorecond-%{version}.tar.gz
-# Source0-md5:	8daf761739a150a7a29bb491726a6cd9
+Source0:	https://github.com/SELinuxProject/selinux/releases/download/%{version}/restorecond-%{version}.tar.gz
+# Source0-md5:	5a57dbc759c8a71dcba618f0b4b0f9e7
 Patch0:		restorecond-init.patch
 URL:		https://github.com/SELinuxProject/selinux/wiki
 BuildRequires:	glib2-devel >= 1:2.26
 BuildRequires:	glibc-devel >= 6:2.4
 BuildRequires:	pkgconfig
 BuildRequires:	pcre-devel
-BuildRequires:	libselinux-devel >= 3.1
+BuildRequires:	libselinux-devel >= 3.6
 BuildRequires:	rpmbuild(macros) >= 2.011
 Requires(post,preun):	/sbin/chkconfig
 Requires(post,preun):	systemd-units >= 1:250.1
-Requires:	libselinux >= 3.1
+Requires:	libselinux >= 3.6
 Requires:	rc-scripts
 Requires:	systemd-units >= 1:250.1
 Obsoletes:	policycoreutils-restorecond < 2.7
@@ -100,6 +100,5 @@ fi
 %attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) /etc/selinux/restorecond.conf
 %attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) /etc/selinux/restorecond_user.conf
 %{_mandir}/man8/restorecond.8*
-%lang(ru) %{_mandir}/ru/man8/restorecond.8*
 %{_sysconfdir}/xdg/autostart/restorecond.desktop
 %{_datadir}/dbus-1/services/org.selinux.Restorecond.service
diff --git a/restorecond-init.patch b/restorecond-init.patch
index 5f57ef1..9e4a321 100644
--- a/restorecond-init.patch
+++ b/restorecond-init.patch
@@ -1,6 +1,6 @@
---- restorecond-2.7/restorecond.init.orig	2017-08-04 15:31:00.000000000 +0200
-+++ restorecond-2.7/restorecond.init	2017-11-17 20:25:02.319336381 +0100
-@@ -26,35 +26,41 @@
+--- restorecond-3.6/restorecond.init.orig	2023-12-13 15:46:22.000000000 +0100
++++ restorecond-3.6/restorecond.init	2024-01-09 21:16:15.574881043 +0100
+@@ -26,6 +26,8 @@
  # Source function library.
  . /etc/rc.d/init.d/functions
  
@@ -9,7 +9,9 @@
  [ -x /usr/sbin/selinuxenabled ] && /usr/sbin/selinuxenabled || exit 7
  
  # Check that we are root ... so non-root users stop here
- test $EUID = 0  || exit 4
+@@ -35,30 +37,34 @@
+ 	test `id -u` = 0  || exit 4
+ fi
  
 -test -x /usr/sbin/restorecond  || exit 5
  test -f /etc/selinux/restorecond.conf  || exit 6
@@ -51,7 +53,7 @@
  }
  
  restart() 
-@@ -63,6 +69,16 @@
+@@ -67,6 +73,16 @@
      start
  }
  
@@ -68,7 +70,7 @@
  # See how we were called.
  case "$1" in
    start)
-@@ -75,14 +91,17 @@
+@@ -79,14 +95,17 @@
  	status restorecond
  	RETVAL=$?
  	;;
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/selinux-restorecond.git/commitdiff/9aafd8edf3ee294e54fbc068d298b27f28d570a2