summaryrefslogtreecommitdiff
path: root/source/a/logrotate/logrotate.slackware.diff
diff options
context:
space:
mode:
authorPatrick J Volkerding <volkerdi@slackware.com>2018-05-28 19:12:29 +0000
committerEric Hameleers <alien@slackware.com>2018-05-31 23:39:35 +0200
commit646a5c1cbfd95873950a87b5f75d52073a967023 (patch)
treeb8b8d2ab3b0d432ea69ad1a64d1c789649d65020 /source/a/logrotate/logrotate.slackware.diff
parentd31c50870d0bee042ce660e445c9294a59a3a65b (diff)
downloadcurrent-646a5c1cbfd95873950a87b5f75d52073a967023.tar.gz
Mon May 28 19:12:29 UTC 201820180528191229
a/pkgtools-15.0-noarch-13.txz: Rebuilt. installpkg: default line length for --terselength is the number of columns. removepkg: added --terse mode. upgradepkg: default line length for --terselength is the number of columns. upgradepkg: accept -option in addition to --option. ap/vim-8.1.0026-x86_64-1.txz: Upgraded. d/bison-3.0.5-x86_64-1.txz: Upgraded. e/emacs-26.1-x86_64-1.txz: Upgraded. kde/kopete-4.14.3-x86_64-8.txz: Rebuilt. Recompiled against libidn-1.35. n/conntrack-tools-1.4.5-x86_64-1.txz: Upgraded. n/libnetfilter_conntrack-1.0.7-x86_64-1.txz: Upgraded. n/libnftnl-1.1.0-x86_64-1.txz: Upgraded. n/links-2.16-x86_64-2.txz: Rebuilt. Rebuilt to enable X driver for -g mode. n/lynx-2.8.9dev.19-x86_64-1.txz: Upgraded. n/nftables-0.8.5-x86_64-1.txz: Upgraded. n/p11-kit-0.23.11-x86_64-1.txz: Upgraded. n/ulogd-2.0.7-x86_64-1.txz: Upgraded. n/whois-5.3.1-x86_64-1.txz: Upgraded. xap/network-manager-applet-1.8.12-x86_64-1.txz: Upgraded. xap/vim-gvim-8.1.0026-x86_64-1.txz: Upgraded.
Diffstat (limited to 'source/a/logrotate/logrotate.slackware.diff')
-rw-r--r--source/a/logrotate/logrotate.slackware.diff56
1 files changed, 37 insertions, 19 deletions
diff --git a/source/a/logrotate/logrotate.slackware.diff b/source/a/logrotate/logrotate.slackware.diff
index 9e5160f3..3336e1f8 100644
--- a/source/a/logrotate/logrotate.slackware.diff
+++ b/source/a/logrotate/logrotate.slackware.diff
@@ -1,24 +1,42 @@
-diff -Nur logrotate-3.8.0.orig//config.c logrotate-3.8.0/config.c
---- logrotate-3.8.0.orig//config.c 2011-06-21 03:12:02.000000000 -0500
-+++ logrotate-3.8.0/config.c 2011-08-22 15:53:25.199625138 -0500
-@@ -86,7 +86,8 @@
- static char *defTabooExts[] = { ".rpmsave", ".rpmorig", "~", ",v",
- ".disabled", ".dpkg-old", ".dpkg-dist", ".dpkg-new", ".cfsaved",
- ".ucf-old", ".ucf-dist", ".ucf-new",
-- ".rpmnew", ".swp", ".cfsaved", ".rhn-cfg-tmp-*"
-+ ".rpmnew", ".swp", ".cfsaved", ".rhn-cfg-tmp-*",
-+ ".new", ".old", ".orig", ".bak"
+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 @@
+ .IR .ucf\-dist ,
+ .IR .ucf\-new ,
+ .IR .ucf\-old ,
++.IR .new
++.IR .old
++.IR .orig
++.IR .bak
+ .IR ~
---- logrotate-3.8.6/logrotate.8.orig 2013-08-02 16:28:41.591589317 +0700
-+++ logrotate-3.8.6/logrotate.8 2013-08-02 16:29:09.280202548 +0700
-@@ -506,7 +506,7 @@
- for information on the taboo extensions). If a + precedes the list of
- extensions, the current taboo extension list is augmented, otherwise it
- is replaced. At startup, the taboo extension list
--contains .rpmsave, .rpmorig, ~, .disabled, .dpkg\-old, .dpkg\-dist, .dpkg\-new, .cfsaved, .ucf\-old, .ucf\-dist, .ucf\-new, .rpmnew, .swp, .cfsaved, .rhn\-cfg\-tmp\-*
-+contains .rpmsave, .rpmorig, ~, .disabled, .dpkg\-old, .dpkg\-dist, .dpkg\-new, .cfsaved, .ucf\-old, .ucf\-dist, .ucf\-new, .rpmnew, .swp, .cfsaved, .rhn\-cfg\-tmp\-*, .new, .old, .orig, .bak
+ .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 @@
+ .IR .ucf\-dist ,
+ .IR .ucf\-new ,
+ .IR .ucf\-old ,
++.IR .new
++.IR .old
++.IR .orig
++.IR .bak
+ .IR ~
.TP
- \fBweekly\fR