From 47b0e0208e3d8a7b91a0838c194902f18397097d Mon Sep 17 00:00:00 2001
From: Patrick J Volkerding <volkerdi@slackware.com>
Date: Fri, 14 Dec 2018 01:49:19 +0000
Subject: Fri Dec 14 01:49:19 UTC 2018

a/kernel-generic-4.19.9-x86_64-1.txz:  Upgraded.
a/kernel-huge-4.19.9-x86_64-1.txz:  Upgraded.
a/kernel-modules-4.19.9-x86_64-1.txz:  Upgraded.
a/logrotate-3.15.0-x86_64-1.txz:  Upgraded.
d/cmake-3.13.2-x86_64-1.txz:  Upgraded.
d/kernel-headers-4.19.9-x86-1.txz:  Upgraded.
d/python-setuptools-40.6.3-x86_64-1.txz:  Upgraded.
k/kernel-source-4.19.9-noarch-1.txz:  Upgraded.
l/gtk+3-3.24.2-x86_64-1.txz:  Upgraded.
l/libedit-20181209_3.1-x86_64-1.txz:  Upgraded.
l/python-six-1.12.0-x86_64-2.txz:  Rebuilt.
n/bind-9.12.3_P1-x86_64-1.txz:  Upgraded.
n/curl-7.63.0-x86_64-1.txz:  Upgraded.
n/ipset-7.1-x86_64-1.txz:  Upgraded.
n/libassuan-2.5.2-x86_64-1.txz:  Upgraded.
x/xf86-input-void-1.4.1-x86_64-1.txz:  Upgraded.
x/xterm-339-x86_64-1.txz:  Upgraded.
xap/gparted-0.33.0-x86_64-1.txz:  Upgraded.
isolinux/initrd.img:  Rebuilt.
kernels/*:  Upgraded.
usb-and-pxe-installers/usbboot.img:  Rebuilt.
---
 source/a/logrotate/logrotate.SlackBuild     |  2 +-
 source/a/logrotate/logrotate.slackware.diff | 41 +++++++++++++----------------
 source/a/logrotate/logrotate.url            |  2 +-
 3 files changed, 21 insertions(+), 24 deletions(-)

(limited to 'source/a/logrotate')

diff --git a/source/a/logrotate/logrotate.SlackBuild b/source/a/logrotate/logrotate.SlackBuild
index e948d0ad..404d4831 100755
--- a/source/a/logrotate/logrotate.SlackBuild
+++ b/source/a/logrotate/logrotate.SlackBuild
@@ -24,7 +24,7 @@ cd $(dirname $0) ; CWD=$(pwd)
 
 PKGNAM=logrotate
 VERSION=${VERSION:-$(echo $PKGNAM-*.tar.xz | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
-BUILD=${BUILD:-2}
+BUILD=${BUILD:-1}
 
 NUMJOBS=${NUMJOBS:-" -j$(expr $(nproc) + 1) "}
 
diff --git a/source/a/logrotate/logrotate.slackware.diff b/source/a/logrotate/logrotate.slackware.diff
index 3336e1f8..338ae19a 100644
--- a/source/a/logrotate/logrotate.slackware.diff
+++ b/source/a/logrotate/logrotate.slackware.diff
@@ -1,21 +1,6 @@
-diff -Nur logrotate-3.13.0.orig/config.c logrotate-3.13.0/config.c
---- logrotate-3.13.0.orig/config.c	2017-10-12 09:05:41.000000000 -0500
-+++ logrotate-3.13.0/config.c	2017-11-18 02:28:03.757579985 -0600
-@@ -143,6 +143,10 @@
- 	".ucf-dist",
- 	".ucf-new",
- 	".ucf-old",
-+	".new",
-+	".old",
-+	".orig",
-+	".bak",
- 	"~"
- };
- static int defTabooCount = sizeof(defTabooExts) / sizeof(char *);
-diff -Nur logrotate-3.13.0.orig/logrotate.8 logrotate-3.13.0/logrotate.8
---- logrotate-3.13.0.orig/logrotate.8	2017-10-13 01:25:51.000000000 -0500
-+++ logrotate-3.13.0/logrotate.8	2017-11-18 02:28:03.756579975 -0600
-@@ -589,6 +589,10 @@
+--- ./logrotate.8.orig	2018-12-04 09:10:46.000000000 -0600
++++ ./logrotate.8	2018-12-13 18:26:31.756882880 -0600
+@@ -608,6 +608,10 @@
  .IR .ucf\-dist ,
  .IR .ucf\-new ,
  .IR .ucf\-old ,
@@ -26,10 +11,9 @@ diff -Nur logrotate-3.13.0.orig/logrotate.8 logrotate-3.13.0/logrotate.8
  .IR ~
  
  .TP
-diff -Nur logrotate-3.13.0.orig/logrotate.8.in logrotate-3.13.0/logrotate.8.in
---- logrotate-3.13.0.orig/logrotate.8.in	2017-10-12 09:05:41.000000000 -0500
-+++ logrotate-3.13.0/logrotate.8.in	2017-11-18 02:28:03.756579975 -0600
-@@ -589,6 +589,10 @@
+--- ./logrotate.8.in.orig	2018-08-09 04:17:37.000000000 -0500
++++ ./logrotate.8.in	2018-12-13 18:27:14.471878890 -0600
+@@ -608,6 +608,10 @@
  .IR .ucf\-dist ,
  .IR .ucf\-new ,
  .IR .ucf\-old ,
@@ -40,3 +24,16 @@ diff -Nur logrotate-3.13.0.orig/logrotate.8.in logrotate-3.13.0/logrotate.8.in
  .IR ~
  
  .TP
+--- ./config.c.orig	2018-10-05 10:01:21.000000000 -0500
++++ ./config.c	2018-12-13 18:25:29.650888682 -0600
+@@ -149,6 +149,10 @@
+     ".ucf-dist",
+     ".ucf-new",
+     ".ucf-old",
++    ".new",
++    ".old",
++    ".orig",
++    ".bak",
+     "~"
+ };
+ static const int defTabooCount = sizeof(defTabooExts) / sizeof(char *);
diff --git a/source/a/logrotate/logrotate.url b/source/a/logrotate/logrotate.url
index 3ef0dd64..9cf1060d 100644
--- a/source/a/logrotate/logrotate.url
+++ b/source/a/logrotate/logrotate.url
@@ -1 +1 @@
-https://github.com/logrotate/logrotate/releases/download/3.14.0/logrotate-3.14.0.tar.xz
+https://github.com/logrotate/logrotate/releases/download/3.15.0/logrotate-3.15.0.tar.xz
-- 
cgit v1.2.3