integ/logging/logrotate/centos/meta_patches/0002-Add-upstream-patches.patch
Martin, Chen 82050043fa rebase logrotate patch to CentOS 7.6 version
Test:
Pass build and multi-node deploy test

Depends-On: https://review.openstack.org/627322/

Story: 2004522
Task: 28409

Change-Id: Ide5022fab8c0d04971348ef9fffe5890a0fe2cde
Signed-off-by: Martin, Chen <haochuan.z.chen@intel.com>
2018-12-26 10:51:26 +08:00

37 lines
1.1 KiB
Diff

From dfd8e1c325e43cc8a5eb5ba939e355f89515a1d3 Mon Sep 17 00:00:00 2001
From: Don Penney <don.penney@windriver.com>
Date: Fri, 19 Jan 2018 23:04:46 -0500
Subject: Add upstream patches
---
SPECS/logrotate.spec | 6 ++++++
1 file changed, 6 insertions(+)
diff --git a/SPECS/logrotate.spec b/SPECS/logrotate.spec
index 0eac8bf..99a22ac 100644
--- a/SPECS/logrotate.spec
+++ b/SPECS/logrotate.spec
@@ -54,6 +54,9 @@ Patch19: logrotate-3.8.6-monthly-dst.patch
# fix #1374550 - unlink destination file when rotation fails
Patch20: logrotate-3.8.6-unlink-on-failure.patch
+Patch10001: 0001-createOutputFile-rename-already-existing-file.patch
+Patch10002: 0002-createOutputFile-eliminate-stat-open-TOCTOU-race.patch
+
Requires: coreutils >= 5.92 popt
BuildRequires: libselinux-devel popt-devel libacl-devel acl
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -93,6 +96,9 @@ log files on your system.
%patch19 -p1
%patch20 -p1
+%patch10001 -p1
+%patch10002 -p1
+
%build
make %{?_smp_mflags} RPM_OPT_FLAGS="$RPM_OPT_FLAGS" WITH_SELINUX=yes WITH_ACL=yes
--
2.7.4