996f18d0e8
When do Centos 7.5 upgraded, some patches didn't resolve and cause the fuzzy in the line numbers of the patches. And it may cause .orig file is created when do patch. And this .orig file will lead to rpm packaging failure due to the unexpected and unpackaged .orig file. Please visit below link to get more detail info: https://bugs.launchpad.net/starlingx/+bug/1794611 Solution: Safest solution is to de-fuzz our patches. Story: 2003389 Task: 26755 Change-Id: I5a0d830d8bc8ec5c85959bb1b4c243e8c56764c1 Signed-off-by: slin14 <shuicheng.lin@intel.com>
33 lines
943 B
Diff
33 lines
943 B
Diff
From 6944018ddd79b3b131b91eb1b5e569db5d73e952 Mon Sep 17 00:00:00 2001
|
|
From: Don Penney <don.penney@windriver.com>
|
|
Date: Fri, 19 Jan 2018 23:38:21 -0500
|
|
Subject: Add su patch
|
|
|
|
---
|
|
SPECS/logrotate.spec | 2 ++
|
|
1 file changed, 2 insertions(+)
|
|
|
|
diff --git a/SPECS/logrotate.spec b/SPECS/logrotate.spec
|
|
index 99a22ac..ba5fa45 100644
|
|
--- a/SPECS/logrotate.spec
|
|
+++ b/SPECS/logrotate.spec
|
|
@@ -51,6 +51,7 @@ Patch18: logrotate-3.8.6-upstream-url.patch
|
|
|
|
Patch10001: 0001-createOutputFile-rename-already-existing-file.patch
|
|
Patch10002: 0002-createOutputFile-eliminate-stat-open-TOCTOU-race.patch
|
|
+Patch10003: 0003-Add-su-root-to-logrotate.conf.patch
|
|
|
|
Requires: coreutils >= 5.92 popt
|
|
BuildRequires: libselinux-devel popt-devel libacl-devel acl
|
|
@@ -91,6 +92,7 @@ log files on your system.
|
|
|
|
%patch10001 -p1
|
|
%patch10002 -p1
|
|
+%patch10003 -p1
|
|
|
|
%build
|
|
make %{?_smp_mflags} RPM_OPT_FLAGS="$RPM_OPT_FLAGS" WITH_SELINUX=yes WITH_ACL=yes
|
|
--
|
|
2.7.4
|
|
|