upgrade logrotate to CentOS 7.5 version

Story: 2003389
Task: 24483

Change-Id: I6772a2193c281006cdd78974b711bc500ae38327
Signed-off-by: zhipengl <zhipengs.liu@intel.com>

logging/logrotate/centos/meta_patches/0001-Update-package-versioning-for-TIS-format.patch

@@ -1,7 +1,7 @@
-From 2f9511e04b5af2b214b949acf9577eaa95153a60 Mon Sep 17 00:00:00 2001
+From ebe97c306c3251fc4ba58110ad4f0fa709d04969 Mon Sep 17 00:00:00 2001
 From: Scott Little <scott.little@windriver.com>
 Date: Mon, 2 Oct 2017 16:22:44 -0400
-Subject: [PATCH 2/2] WRS: 0001-Update-package-versioning-for-TIS-format.patch
+Subject: [PATCH] WRS: 0001-Update-package-versioning-for-TIS-format.patch
 
 Conflicts:
 	SPECS/logrotate.spec
@@ -10,18 +10,18 @@ Conflicts:
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/SPECS/logrotate.spec b/SPECS/logrotate.spec
-index 1b4e4e3..46e17e8 100644
+index c22af07..0dbde7d 100644
 --- a/SPECS/logrotate.spec
 +++ b/SPECS/logrotate.spec
 @@ -1,7 +1,7 @@
  Summary: Rotates, compresses, removes and mails system log files
  Name: logrotate
  Version: 3.8.6
--Release: 14%{?dist}
-+Release: 14.el7%{?_tis_dist}.%{tis_patch_ver}
+-Release: 15%{?dist}
++Release: 15.el7%{?_tis_dist}.%{tis_patch_ver}
  License: GPL+
  Group: System Environment/Base
- Url: https://fedorahosted.org/logrotate/
+ URL: https://github.com/logrotate/logrotate
 -- 
-1.9.1
+2.7.4
 

logging/logrotate/centos/patches/0001-createOutputFile-rename-already-existing-file.patch

@@ -1,6 +1,6 @@
-From e43ef5ea3ba1faffad5af528d37ac910e5c0407f Mon Sep 17 00:00:00 2001
+From cbd37cc302ed71fb27cb0af0293e949698ee4309 Mon Sep 17 00:00:00 2001
 From: Don Penney <don.penney@windriver.com>
-Date: Fri, 19 Jan 2018 23:17:55 -0500
+Date: Wed, 22 Aug 2018 00:13:32 +0800
 Subject: [PATCH] createOutputFile: rename already existing file
 
 Upstream patch:
@@ -20,7 +20,7 @@ Closes #23
  create mode 100644 test/test-config.72.in
 
 diff --git a/logrotate.c b/logrotate.c
-index 20f6ea5..42c3eeb 100644
+index e056ccd..e415164 100644
 --- a/logrotate.c
 +++ b/logrotate.c
 @@ -395,8 +395,24 @@ static int runScript(struct logInfo *log, char *logfn, char *script)
@@ -51,10 +51,10 @@ index 20f6ea5..42c3eeb 100644
  	fd = open(fileName, (flags | O_EXCL | O_NOFOLLOW),
  		(S_IRUSR | S_IWUSR) & sb->st_mode);
 diff --git a/test/test b/test/test
-index 54d57d2..755e582 100755
+index bcdfe05..b47ac6a 100755
 --- a/test/test
 +++ b/test/test
-@@ -1586,5 +1586,31 @@ EOF
+@@ -1586,6 +1586,32 @@ EOF
  rm -rf testdir adir
  rm -rf testdir bdir
  
@@ -84,8 +84,9 @@ index 54d57d2..755e582 100755
 +test.log.3.gz 1 first
 +EOF
 +
- cleanup
+ cleanup 73
  
+ # ------------------------------- Test 73 ------------------------------------
 diff --git a/test/test-config.72.in b/test/test-config.72.in
 new file mode 100644
 index 0000000..9fe50a2
@@ -100,5 +101,5 @@ index 0000000..9fe50a2
 +    create
 +}
 -- 
-1.8.3.1
+2.7.4
 

logging/logrotate/centos/srpm_path

@@ -1 +1 @@
-mirror:Source/logrotate-3.8.6-14.el7.src.rpm
+mirror:Source/logrotate-3.8.6-15.el7.src.rpm