summaryrefslogtreecommitdiffstats
path: root/source/a
diff options
context:
space:
mode:
Diffstat (limited to '')
-rwxr-xr-xsource/a/logrotate/logrotate.SlackBuild2
-rw-r--r--source/a/logrotate/logrotate.slackware.diff41
-rw-r--r--source/a/logrotate/logrotate.url2
-rwxr-xr-xsource/ap/nano/nano.SlackBuild2
4 files changed, 22 insertions, 25 deletions
diff --git a/source/a/logrotate/logrotate.SlackBuild b/source/a/logrotate/logrotate.SlackBuild
index e948d0ad6..404d48318 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 3336e1f80..338ae19a0 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 3ef0dd640..9cf1060df 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
diff --git a/source/ap/nano/nano.SlackBuild b/source/ap/nano/nano.SlackBuild
index 56561f6db..46a4db593 100755
--- a/source/ap/nano/nano.SlackBuild
+++ b/source/ap/nano/nano.SlackBuild
@@ -155,7 +155,7 @@ chmod 644 $PKG/etc/nanorc.new
mkdir -p $PKG/usr/doc/${PKGNAM}-$VERSION
cp -a \
ABOUT-NLS AUTHORS BUGS COPYING* IMPROVEMENTS INSTALL NEWS README* THANKS TODO UPGRADE \
- doc/faq.html doc/nanorc.sample \
+ doc/faq.html doc/nanorc.sample doc/sample.nanorc \
$PKG/usr/doc/${PKGNAM}-$VERSION
# If there's a ChangeLog, installing at least part of the recent history