From 046a4ee535d5e382e538b71fce37de6bdea795cb Mon Sep 17 00:00:00 2001
From: panxiaohe <panxh.life@foxmail.com>
Date: Fri, 4 Jun 2021 17:45:03 +0800
Subject: [PATCH] fix fixfiles -N date function and add gcc to BuildRequires

---
 fix-fixfiles-N-date-function-two.patch | 25 +++++++++++++++++++++++++
 fix-fixfiles-N-date-function.patch     | 25 +++++++++++++++++++++++++
 policycoreutils.spec                   | 10 +++++++++-
 3 files changed, 59 insertions(+), 1 deletion(-)
 create mode 100644 fix-fixfiles-N-date-function-two.patch
 create mode 100644 fix-fixfiles-N-date-function.patch

diff --git a/fix-fixfiles-N-date-function-two.patch b/fix-fixfiles-N-date-function-two.patch
new file mode 100644
index 0000000..08b5973
--- /dev/null
+++ b/fix-fixfiles-N-date-function-two.patch
@@ -0,0 +1,25 @@
+From 86e2c2a2594650cc37de9f135f294df285b4678b Mon Sep 17 00:00:00 2001
+From: openEuler Buildteam <buildteam@openeuler.org>
+Date: Fri, 4 Jun 2021 15:28:24 +0800
+Subject: [PATCH] fix fixfiles -N date function
+
+---
+ policycoreutils-3.1/scripts/fixfiles | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/policycoreutils-3.1/scripts/fixfiles b/policycoreutils-3.1/scripts/fixfiles
+index 8f5926a..21a1152 100755
+--- a/policycoreutils-3.1/scripts/fixfiles
++++ b/policycoreutils-3.1/scripts/fixfiles
+@@ -151,7 +151,7 @@ newer() {
+     shift
+     LogReadOnly
+     for m in `echo $FILESYSTEMSRW`; do
+-	find $m -mount -newermt $DATE -print0 2>/dev/null | ${RESTORECON} ${FORCEFLAG} ${VERBOSE} $* -i -0 -f -
++	find $m -mount -newermt "$DATE" -print0 2>/dev/null | ${RESTORECON} ${FORCEFLAG} ${VERBOSE} $* -i -0 -f -
+     done;
+ }
+ 
+-- 
+1.8.3.1
+
diff --git a/fix-fixfiles-N-date-function.patch b/fix-fixfiles-N-date-function.patch
new file mode 100644
index 0000000..6c25eb0
--- /dev/null
+++ b/fix-fixfiles-N-date-function.patch
@@ -0,0 +1,25 @@
+From a1a6e90353e7a549cbe446cdecafc7eba9a1f7ca Mon Sep 17 00:00:00 2001
+From: openEuler Buildteam <buildteam@openeuler.org>
+Date: Fri, 4 Jun 2021 15:26:41 +0800
+Subject: [PATCH] fix fixfiles -N date function
+
+---
+ policycoreutils-3.1/scripts/fixfiles | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/policycoreutils-3.1/scripts/fixfiles b/policycoreutils-3.1/scripts/fixfiles
+index 5d77703..8f5926a 100755
+--- a/policycoreutils-3.1/scripts/fixfiles
++++ b/policycoreutils-3.1/scripts/fixfiles
+@@ -147,7 +147,7 @@ done
+ # Find files newer then the passed in date and fix the label
+ #
+ newer() {
+-    DATE=$1
++    DATE="$1 $2"
+     shift
+     LogReadOnly
+     for m in `echo $FILESYSTEMSRW`; do
+-- 
+1.8.3.1
+
diff --git a/policycoreutils.spec b/policycoreutils.spec
index 2b5f240..03b7720 100644
--- a/policycoreutils.spec
+++ b/policycoreutils.spec
@@ -3,7 +3,7 @@
 
 Name:      policycoreutils
 Version:   3.1
-Release:   6
+Release:   7
 Summary:   Policy core utilities of selinux
 License:   GPLv2
 URL:       https://github.com/SELinuxProject
@@ -19,6 +19,10 @@ Source9:   selinux-autorelabel-mark.service
 Source10:  selinux-autorelabel.target
 Source11:  selinux-autorelabel-generator.sh
 
+Patch0:    fix-fixfiles-N-date-function.patch
+Patch1:    fix-fixfiles-N-date-function-two.patch
+
+BuildRequires: gcc
 BuildRequires: pam-devel libsepol-static >= 3.1 libsemanage-static >= 3.1 libselinux-devel >= 3.1  libcap-devel audit-libs-devel  gettext
 BuildRequires: desktop-file-utils dbus-devel dbus-glib-devel python3-devel libcap-ng-devel
 BuildRequires: systemd systemd-units
@@ -262,6 +266,10 @@ find %{buildroot}%{python3_sitelib} %{buildroot}%{python3_sitearch} \
 %{_mandir}/*
 
 %changelog
+* Fri Jun 4 2021 panxiaohe <panxiaohe@huawei.com> - 3.1-7
+- add gcc to BuildRequires
+- fix fixfiles -N date function
+
 * Sun Dec 13 2020 huaxinlu <1539327763@qq.com> - 3.1-6
 - add obsoletes of python2-policycoreutils
 
-- 
Gitee