From 82050043fa46faf913d7702adc75e1e70482cd60 Mon Sep 17 00:00:00 2001 From: "Martin, Chen" Date: Wed, 26 Dec 2018 10:49:56 +0800 Subject: [PATCH] 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 --- ...01-Update-package-versioning-for-TIS-format.patch | 4 ++-- .../meta_patches/0002-Add-upstream-patches.patch | 12 ++++++------ logging/logrotate/centos/srpm_path | 2 +- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/logging/logrotate/centos/meta_patches/0001-Update-package-versioning-for-TIS-format.patch b/logging/logrotate/centos/meta_patches/0001-Update-package-versioning-for-TIS-format.patch index b5361a125..19fdeb77d 100644 --- a/logging/logrotate/centos/meta_patches/0001-Update-package-versioning-for-TIS-format.patch +++ b/logging/logrotate/centos/meta_patches/0001-Update-package-versioning-for-TIS-format.patch @@ -15,8 +15,8 @@ index c22af07..0dbde7d 100644 Summary: Rotates, compresses, removes and mails system log files Name: logrotate Version: 3.8.6 --Release: 15%{?dist} -+Release: 15.el7%{?_tis_dist}.%{tis_patch_ver} +-Release: 17%{?dist} ++Release: 17.el7%{?_tis_dist}.%{tis_patch_ver} License: GPL+ Group: System Environment/Base URL: https://github.com/logrotate/logrotate diff --git a/logging/logrotate/centos/meta_patches/0002-Add-upstream-patches.patch b/logging/logrotate/centos/meta_patches/0002-Add-upstream-patches.patch index 271eda812..7096e018c 100644 --- a/logging/logrotate/centos/meta_patches/0002-Add-upstream-patches.patch +++ b/logging/logrotate/centos/meta_patches/0002-Add-upstream-patches.patch @@ -11,9 +11,9 @@ diff --git a/SPECS/logrotate.spec b/SPECS/logrotate.spec index 0eac8bf..99a22ac 100644 --- a/SPECS/logrotate.spec +++ b/SPECS/logrotate.spec -@@ -48,6 +48,9 @@ Patch17: logrotate-3.8.6-config-mode-err.patch - # fix #1483800 - update references to project page - Patch18: logrotate-3.8.6-upstream-url.patch +@@ -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 @@ -21,9 +21,9 @@ index 0eac8bf..99a22ac 100644 Requires: coreutils >= 5.92 popt BuildRequires: libselinux-devel popt-devel libacl-devel acl BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -@@ -85,6 +88,9 @@ log files on your system. - %patch17 -p1 - %patch18 -p1 +@@ -93,6 +96,9 @@ log files on your system. + %patch19 -p1 + %patch20 -p1 +%patch10001 -p1 +%patch10002 -p1 diff --git a/logging/logrotate/centos/srpm_path b/logging/logrotate/centos/srpm_path index b0dd56aac..4f7dfdd7c 100644 --- a/logging/logrotate/centos/srpm_path +++ b/logging/logrotate/centos/srpm_path @@ -1 +1 @@ -mirror:Source/logrotate-3.8.6-15.el7.src.rpm +mirror:Source/logrotate-3.8.6-17.el7.src.rpm