summaryrefslogtreecommitdiff
path: root/source/a/logrotate/logrotate.slackware.diff
diff options
context:
space:
mode:
Diffstat (limited to 'source/a/logrotate/logrotate.slackware.diff')
-rw-r--r--source/a/logrotate/logrotate.slackware.diff63
1 files changed, 37 insertions, 26 deletions
diff --git a/source/a/logrotate/logrotate.slackware.diff b/source/a/logrotate/logrotate.slackware.diff
index 77b8aad6..e9126cee 100644
--- a/source/a/logrotate/logrotate.slackware.diff
+++ b/source/a/logrotate/logrotate.slackware.diff
@@ -1,44 +1,55 @@
-diff -u -r --new-file logrotate-3.7.4.orig/config.c logrotate-3.7.4/config.c
---- logrotate-3.7.4.orig/config.c 2006-07-24 07:08:04.000000000 -0500
-+++ logrotate-3.7.4/config.c 2006-09-21 01:07:50.000000000 -0500
-@@ -29,7 +29,7 @@
+diff -Nur logrotate-3.7.8.orig/Makefile logrotate-3.7.8/Makefile
+--- logrotate-3.7.8.orig/Makefile 2008-05-19 05:25:54.000000000 -0500
++++ logrotate-3.7.8/Makefile 2009-05-09 23:25:12.060201375 -0500
+@@ -1,7 +1,7 @@
+ VERSION = $(shell awk '/Version:/ { print $$2 }' logrotate.spec)
+ OS_NAME = $(shell uname -s)
+ LFS = $(shell echo `getconf LFS_CFLAGS 2>/dev/null`)
+-CFLAGS = -Wall -D_GNU_SOURCE -D$(OS_NAME) -DVERSION=\"$(VERSION)\" $(RPM_OPT_FLAGS) $(LFS)
++CFLAGS = -Wall $(EXTRA_CFLAGS) -D_GNU_SOURCE -D$(OS_NAME) -DVERSION=\"$(VERSION)\" $(RPM_OPT_FLAGS) $(LFS)
+ PROG = logrotate
+ MAN = logrotate.8
+ LOADLIBES = -lpopt
+diff -Nur logrotate-3.7.8.orig/config.c logrotate-3.7.8/config.c
+--- logrotate-3.7.8.orig/config.c 2008-06-02 05:26:14.000000000 -0500
++++ logrotate-3.7.8/config.c 2009-05-09 23:53:36.748287318 -0500
+@@ -33,8 +33,9 @@
#define isblank(c) ( (c) == ' ' || (c) == '\t' ) ? 1 : 0
#endif
-static char *defTabooExts[] = { ".rpmsave", ".rpmorig", "~", ",v",
-+static char *defTabooExts[] = { ".new", ".rpmsave", ".rpmorig", "~", ",v",
- ".rpmnew", ".swp"
+- ".rpmnew", ".swp", ".cfsaved", ".rhn-cfg-tmp-*"
++static char *defTabooExts[] = { ".new", ".orig", ".old", ".bak",
++ ".rpmsave", ".rpmorig", "~", ",v", ".rpmnew", ".swp", ".cfsaved",
++ ".rhn-cfg-tmp-*"
};
static int defTabooCount = sizeof(defTabooExts) / sizeof(char *);
-diff -u -r --new-file logrotate-3.7.4.orig/config.h logrotate-3.7.4/config.h
---- logrotate-3.7.4.orig/config.h 2005-11-12 13:07:56.000000000 -0600
-+++ logrotate-3.7.4/config.h 2006-09-21 01:08:02.000000000 -0500
-@@ -36,5 +36,5 @@
- #endif
- #ifndef STATEFILE
--#define STATEFILE "/var/lib/logrotate.status"
+diff -Nur logrotate-3.7.8.orig/config.h logrotate-3.7.8/config.h
+--- logrotate-3.7.8.orig/config.h 2005-11-12 13:07:56.000000000 -0600
++++ logrotate-3.7.8/config.h 2009-05-09 23:58:17.040241145 -0500
+@@ -13,7 +13,7 @@
+ #define DEFAULT_MAIL_COMMAND "/usr/bin/mailx"
+ #define COMPRESS_COMMAND "/usr/local/bin/gzip"
+ #define UNCOMPRESS_COMMAND "/usr/local/bin/gunzip"
+-#define STATEFILE "/var/log/logrotate.status"
+#define STATEFILE "/var/lib/logrotate/status"
#endif
-diff -u -r --new-file logrotate-3.7.4.orig/logrotate.8 logrotate-3.7.4/logrotate.8
---- logrotate-3.7.4.orig/logrotate.8 2006-05-17 09:46:51.000000000 -0500
-+++ logrotate-3.7.4/logrotate.8 2006-09-21 01:07:14.000000000 -0500
-@@ -1,4 +1,4 @@
--.TH LOGROTATE 8 "Wed Nov 5 2002" "Red Hat Linux" "System Administrator's Manual"
-+.TH LOGROTATE 8 "Wed Nov 5 2002" "Linux" "System Administrator's Manual"
- .SH NAME
- logrotate \- rotates, compresses, and mails system logs
- .SH SYNOPSIS
-@@ -410,7 +410,7 @@
+
+ /*
+diff -Nur logrotate-3.7.8.orig/logrotate.8 logrotate-3.7.8/logrotate.8
+--- logrotate-3.7.8.orig/logrotate.8 2008-12-06 08:05:40.000000000 -0600
++++ logrotate-3.7.8/logrotate.8 2009-05-09 23:56:45.137687740 -0500
+@@ -442,7 +442,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 .rpmorig, .rpmsave, ,v, .swp, .rpmnew, and ~.
-+contains .new, .rpmorig, .rpmsave, ,v, .swp, .rpmnew, and ~.
+-contains .rpmorig, .rpmsave, ,v, .swp, .rpmnew, ~, .cfsaved and .rhn-cfg-tmp-*.
++contains .new, .orig, .bak, .old, .rpmorig, .rpmsave, ,v, .swp, .rpmnew, ~, .cfsaved and .rhn-cfg-tmp-*.
.TP
\fBweekly\fR
-@@ -427,7 +427,7 @@
+@@ -459,7 +459,7 @@
.SH FILES
.PD 0
.TP 27