[logrotate] reformat patches

Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>

25 files changed, 258 insertions, 143 deletions

diff --git a/patches/logrotate-3.7.1/compressutime.patch b/patches/logrotate-3.7.1/compressutime.patch
index e2da5cba2..4fbc90424 100644
--- a/patches/logrotate-3.7.1/compressutime.patch
+++ b/patches/logrotate-3.7.1/compressutime.patch
@@ -1,7 +1,13 @@
 Preserve mtime/atime on compression. (Closes: #286957)
 
---- ./logrotate.c	2005-09-03 14:07:42.000000000 +0100
-+++ /tmp/dpep-work.m2M7hf/logrotate-3.7.1/logrotate.c	2005-09-03 14:08:14.000000000 +0100
+---
+ logrotate.c |    9 +++++++++
+ 1 file changed, 9 insertions(+)
+
+Index: logrotate-3.7.1/logrotate.c
+===================================================================
+--- logrotate-3.7.1.orig/logrotate.c
++++ logrotate-3.7.1/logrotate.c
 @@ -12,6 +12,8 @@
  #include <time.h>
  #include <unistd.h>
@@ -11,7 +17,7 @@ Preserve mtime/atime on compression. (Closes: #286957)
  
  #ifdef WITH_SELINUX
  #include <selinux/selinux.h>
-@@ -120,6 +122,7 @@
+@@ -120,6 +122,7 @@ static int removeLogFile(char * name) {
  static int compressLogFile(char * name, logInfo * log, struct stat *sb) {
      char * compressedName;
      const char ** fullCommand;
@@ -19,7 +25,7 @@ Preserve mtime/atime on compression. (Closes: #286957)
      int inFile;
      int outFile;
      int i;
-@@ -190,6 +193,12 @@
+@@ -190,6 +193,12 @@ static int compressLogFile(char * name, 
  	message(MESS_ERROR, "failed to compress log %s\n", name);
  	return 1;
      }
diff --git a/patches/logrotate-3.7.1/configparse.patch b/patches/logrotate-3.7.1/configparse.patch
index a86eadb39..471f025d8 100644
--- a/patches/logrotate-3.7.1/configparse.patch
+++ b/patches/logrotate-3.7.1/configparse.patch
@@ -1,11 +1,15 @@
 # Loosens the config syntax checking to allow more flexibility.
 #  (Closes: #95617,#95630)
 
+---
+ config.c |    4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
 Index: logrotate-3.7.1/config.c
 ===================================================================
---- logrotate-3.7.1.orig/config.c	2006-04-08 20:46:40.250457779 +0100
-+++ logrotate-3.7.1/config.c	2006-04-08 20:48:15.188228344 +0100
-@@ -768,7 +768,7 @@
+--- logrotate-3.7.1.orig/config.c
++++ logrotate-3.7.1/config.c
+@@ -768,7 +768,7 @@ static int readConfigFile(const char * c
  
  		    while (*start) {
  			chptr = start;
@@ -14,7 +18,7 @@ Index: logrotate-3.7.1/config.c
  			    chptr++;
  
  			tabooExts = realloc(tabooExts, sizeof(*tabooExts) * 
-@@ -780,7 +780,7 @@
+@@ -780,7 +780,7 @@ static int readConfigFile(const char * c
  			tabooCount++;
  
  			start = chptr;
diff --git a/patches/logrotate-3.7.1/cpp-crossbuild.patch b/patches/logrotate-3.7.1/cpp-crossbuild.patch
index 783e405ce..f1bc31717 100644
--- a/patches/logrotate-3.7.1/cpp-crossbuild.patch
+++ b/patches/logrotate-3.7.1/cpp-crossbuild.patch
@@ -6,11 +6,15 @@ dpkg-cross sets CPP variable, and compilation failures, because
 the executable 'cpp' does not accept multiple input files.
 
 
+---
+ Makefile |    2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
 Index: logrotate-3.7.1/Makefile
 ===================================================================
---- logrotate-3.7.1.orig/Makefile	2003-10-09 21:05:07.000000000 +0100
-+++ logrotate-3.7.1/Makefile	2006-04-08 21:21:31.333853922 +0100
-@@ -88,7 +88,7 @@
+--- logrotate-3.7.1.orig/Makefile
++++ logrotate-3.7.1/Makefile
+@@ -88,7 +88,7 @@ clean:
  	rm -f $(OBJS) $(PROG) core* .depend
  
  depend:
diff --git a/patches/logrotate-3.7.1/datehack.patch b/patches/logrotate-3.7.1/datehack.patch
index fa58fbd43..c36a7a657 100644
--- a/patches/logrotate-3.7.1/datehack.patch
+++ b/patches/logrotate-3.7.1/datehack.patch
@@ -1,11 +1,15 @@
 No longer consider state file dates before 1996 as fatal errors.
 (Closes: #65534)
 
+---
+ logrotate.c |    2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
 Index: logrotate-3.7.1/logrotate.c
 ===================================================================
---- logrotate-3.7.1.orig/logrotate.c	2006-04-08 20:46:40.217463729 +0100
-+++ logrotate-3.7.1/logrotate.c	2006-04-08 20:52:51.770419373 +0100
-@@ -1145,7 +1145,7 @@
+--- logrotate-3.7.1.orig/logrotate.c
++++ logrotate-3.7.1/logrotate.c
+@@ -1145,7 +1145,7 @@ static int readState(char * stateFilenam
  	}
  	
  	/* Hack to hide earlier bug */
diff --git a/patches/logrotate-3.7.1/deb-config-h.patch b/patches/logrotate-3.7.1/deb-config-h.patch
index 3e78b509b..0958d8995 100644
--- a/patches/logrotate-3.7.1/deb-config-h.patch
+++ b/patches/logrotate-3.7.1/deb-config-h.patch
@@ -1,10 +1,14 @@
 Fix locations of STATEFILE and DEFAULT_MAIL_COMMAND for Debian.
 
 
+---
+ config.h |    4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
 Index: logrotate-3.7.1/config.h
 ===================================================================
---- logrotate-3.7.1.orig/config.h	2006-04-08 20:26:13.052651364 +0100
-+++ logrotate-3.7.1/config.h	2006-04-08 20:51:24.180005096 +0100
+--- logrotate-3.7.1.orig/config.h
++++ logrotate-3.7.1/config.h
 @@ -20,7 +20,7 @@
   * Default settings for Linux - leave these last.
   */
diff --git a/patches/logrotate-3.7.1/deb-taboos.patch b/patches/logrotate-3.7.1/deb-taboos.patch
index 7d3d0f88d..39fc315ac 100644
--- a/patches/logrotate-3.7.1/deb-taboos.patch
+++ b/patches/logrotate-3.7.1/deb-taboos.patch
@@ -2,10 +2,14 @@ Fix the taboo list to avoid .dpkg-old, etc.
 
 
 
+---
+ config.c |    2 ++
+ 1 file changed, 2 insertions(+)
+
 Index: logrotate-3.7.1/config.c
 ===================================================================
---- logrotate-3.7.1.orig/config.c	2006-04-08 20:46:40.147476352 +0100
-+++ logrotate-3.7.1/config.c	2006-04-08 20:48:26.323326011 +0100
+--- logrotate-3.7.1.orig/config.c
++++ logrotate-3.7.1/config.c
 @@ -30,6 +30,8 @@
  #endif
  
diff --git a/patches/logrotate-3.7.1/dst.patch b/patches/logrotate-3.7.1/dst.patch
index 08538eb4c..ae408e3e3 100644
--- a/patches/logrotate-3.7.1/dst.patch
+++ b/patches/logrotate-3.7.1/dst.patch
@@ -18,11 +18,15 @@ with the day of the last rotation, 01:00 AM.  This can be solved by
 setting lastRotated.tm_isdst correctly prior to the mktime() call.
 
 
+---
+ logrotate.c |    1 +
+ 1 file changed, 1 insertion(+)
+
 Index: logrotate-3.7.1/logrotate.c
 ===================================================================
---- logrotate-3.7.1.orig/logrotate.c	2006-04-08 21:36:03.268110593 +0100
-+++ logrotate-3.7.1/logrotate.c	2006-04-08 21:36:11.342764986 +0100
-@@ -78,6 +78,7 @@
+--- logrotate-3.7.1.orig/logrotate.c
++++ logrotate-3.7.1/logrotate.c
+@@ -78,6 +78,7 @@ static logState * findState(const char *
  	states[i].lastRotated.tm_mon = now.tm_mon;
  	states[i].lastRotated.tm_mday = now.tm_mday;
  	states[i].lastRotated.tm_year = now.tm_year;
diff --git a/patches/logrotate-3.7.1/man-189243.patch b/patches/logrotate-3.7.1/man-189243.patch
index 46a5e4acc..2f454cff4 100644
--- a/patches/logrotate-3.7.1/man-189243.patch
+++ b/patches/logrotate-3.7.1/man-189243.patch
@@ -1,8 +1,14 @@
 Fix location of killall in the examples. (Closes: #189243)
 
---- /home/pm/deb/logrotate/logrotate-3.7/logrotate.8	2004-02-11 21:18:23.000000000 +0000
-+++ logrotate-3.7/logrotate.8	2004-02-11 21:18:54.000000000 +0000
-@@ -83,7 +83,7 @@
+---
+ logrotate.8 |    4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+Index: logrotate-3.7.1/logrotate.8
+===================================================================
+--- logrotate-3.7.1.orig/logrotate.8
++++ logrotate-3.7.1/logrotate.8
+@@ -83,7 +83,7 @@ compress
      rotate 5
      weekly
      postrotate
@@ -11,7 +17,7 @@ Fix location of killall in the examples. (Closes: #189243)
      endscript
  }
  
-@@ -93,7 +93,7 @@
+@@ -93,7 +93,7 @@ compress
      size=100k
      sharedscripts
      postrotate
diff --git a/patches/logrotate-3.7.1/man-333996.patch b/patches/logrotate-3.7.1/man-333996.patch
index 11c2731db..b815da26b 100644
--- a/patches/logrotate-3.7.1/man-333996.patch
+++ b/patches/logrotate-3.7.1/man-333996.patch
@@ -5,11 +5,15 @@ The manpage contains several sentences with the same mistake:
 the use of "then" instead of "than".
 
 
+---
+ logrotate.8 |   12 ++++++------
+ 1 file changed, 6 insertions(+), 6 deletions(-)
+
 Index: logrotate-3.7.1/logrotate.8
 ===================================================================
---- logrotate-3.7.1.orig/logrotate.8	2006-04-08 21:47:40.000000000 +0100
-+++ logrotate-3.7.1/logrotate.8	2006-04-08 21:48:43.456864197 +0100
-@@ -125,7 +125,7 @@
+--- logrotate-3.7.1.orig/logrotate.8
++++ logrotate-3.7.1/logrotate.8
+@@ -125,7 +125,7 @@ The next section defines the parameters 
  \fI/var/log/httpd/access.log\fR and \fI/var/log/httpd/error.log\fR.
  Each is rotated whenever it grows over 100k in size, and the old log
  files are mailed (uncompressed) to www@my.org after going through 5
@@ -18,7 +22,7 @@ Index: logrotate-3.7.1/logrotate.8
  the \fBpostrotate\fR script will only be run once (after the old logs 
  have been compressed), not once for each
  log which is rotated. Note that log file names may be enclosed in
-@@ -135,7 +135,7 @@
+@@ -135,7 +135,7 @@ characters supported.
  
  The last section defines the parameters for all of the files in
  \fI/var/log/news\fR. Each file is rotated on a monthly basis.  This is
@@ -27,7 +31,7 @@ Index: logrotate-3.7.1/logrotate.8
  one file, the log files are not compressed.
  
  Please use wildcards with caution.  If you specify *, \fBlogrotate\fR will
-@@ -366,7 +366,7 @@
+@@ -366,7 +366,7 @@ appear inside a log file definition. See
  \fBrotate \fIcount\fR
  Log files are rotated \fIcount\fR times before being removed or mailed to the
  address specified in a \fBmail\fR directive. If \fIcount\fR is 0, old versions
@@ -36,7 +40,7 @@ Index: logrotate-3.7.1/logrotate.8
  
  .TP
  \fBsharedscripts\fR
-@@ -381,7 +381,7 @@
+@@ -381,7 +381,7 @@ option and implies \fBcreate\fR option.
  
  .TP
  \fBsize \fIsize\fR[\fBG\fR|\fBM\fR|\fBk\fR]
@@ -45,7 +49,7 @@ Index: logrotate-3.7.1/logrotate.8
  \fIsize\fR is followed by \fIM\fR, the size if assumed to be in megabytes.
  If the \fIG\fR suffix is used, the size is in gigabytes.
  If the \fIk\fR suffix is used, the size is in kilobytes. So \fBsize 100\fR,
-@@ -408,8 +408,8 @@
+@@ -408,8 +408,8 @@ not commas.
  
  .TP
  \fBweekly\fR
diff --git a/patches/logrotate-3.7.1/man-lastaction.patch b/patches/logrotate-3.7.1/man-lastaction.patch
index 9babc4dfb..41804150e 100644
--- a/patches/logrotate-3.7.1/man-lastaction.patch
+++ b/patches/logrotate-3.7.1/man-lastaction.patch
@@ -1,11 +1,15 @@
 Fix typo in the lastaction section of the manpage. It refers to itself 
 rather than to firstaction.
 
+---
+ logrotate.8 |    2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
 Index: logrotate-3.7.1/logrotate.8
 ===================================================================
---- logrotate-3.7.1.orig/logrotate.8	2006-04-08 21:11:37.760424103 +0100
-+++ logrotate-3.7.1/logrotate.8	2006-04-08 21:13:28.917607025 +0100
-@@ -359,7 +359,7 @@
+--- logrotate-3.7.1.orig/logrotate.8
++++ logrotate-3.7.1/logrotate.8
+@@ -359,7 +359,7 @@ The lines between \fBlastaction\fR and \
  must appear on lines by themselves) are executed once after all log
  files that match the wildcarded pattern are rotated, after postrotate script
  is run and only if at least one log is rotated. These directives may only
diff --git a/patches/logrotate-3.7.1/man-mailtypo.patch b/patches/logrotate-3.7.1/man-mailtypo.patch
index 578d6694a..c5638131d 100644
--- a/patches/logrotate-3.7.1/man-mailtypo.patch
+++ b/patches/logrotate-3.7.1/man-mailtypo.patch
@@ -1,11 +1,15 @@
 Fix the markup on the "mail" part of the manpage (Closes: #300644)
 
 
+---
+ logrotate.8 |    2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
 Index: logrotate-3.7.1/logrotate.8
 ===================================================================
---- logrotate-3.7.1.orig/logrotate.8	2006-04-08 21:14:56.187543069 +0100
-+++ logrotate-3.7.1/logrotate.8	2006-04-08 21:16:19.525257240 +0100
-@@ -45,7 +45,7 @@
+--- logrotate-3.7.1.orig/logrotate.8
++++ logrotate-3.7.1/logrotate.8
+@@ -45,7 +45,7 @@ by hand, as the new files will be create
  correctly.
  
  .TP
diff --git a/patches/logrotate-3.7.1/man-overriden.patch b/patches/logrotate-3.7.1/man-overriden.patch
index 3a7cceacb..fae01acd0 100644
--- a/patches/logrotate-3.7.1/man-overriden.patch
+++ b/patches/logrotate-3.7.1/man-overriden.patch
@@ -1,11 +1,15 @@
 Fix manpage typo (Closes: #310337)
 
 
+---
+ logrotate.8 |    2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
 Index: logrotate-3.7.1/logrotate.8
 ===================================================================
---- logrotate-3.7.1.orig/logrotate.8	2006-04-08 21:13:28.917607025 +0100
-+++ logrotate-3.7.1/logrotate.8	2006-04-08 21:14:56.187543069 +0100
-@@ -329,7 +329,7 @@
+--- logrotate-3.7.1.orig/logrotate.8
++++ logrotate-3.7.1/logrotate.8
+@@ -329,7 +329,7 @@ must be on the same physical device as t
  and is assumed to be relative to the directory holding the log file
  unless an absolute path name is specified. When this option is used all
  old versions of the log end up in \fIdirectory\fR.  This option may be
diff --git a/patches/logrotate-3.7.1/man-rh-1.patch b/patches/logrotate-3.7.1/man-rh-1.patch
index c4c6d8fd7..bb5358396 100644
--- a/patches/logrotate-3.7.1/man-rh-1.patch
+++ b/patches/logrotate-3.7.1/man-rh-1.patch
@@ -1,12 +1,16 @@
 Fixes from upstream 3.7.1-4:
  * Typo and missing information in man page (#139346)
 
+---
+ logrotate.8 |    5 +++--
+ 1 file changed, 3 insertions(+), 2 deletions(-)
+
 Index: logrotate-3.7.1/logrotate.8
 ===================================================================
---- logrotate-3.7.1.orig/logrotate.8	2006-04-08 21:16:19.525257240 +0100
-+++ logrotate-3.7.1/logrotate.8	2006-04-08 21:17:39.954145340 +0100
-@@ -126,7 +126,8 @@
- Each is rotated whenever it grows over 100k is size, and the old log
+--- logrotate-3.7.1.orig/logrotate.8
++++ logrotate-3.7.1/logrotate.8
+@@ -126,7 +126,8 @@ The next section defines the parameters 
+ Each is rotated whenever it grows over 100k in size, and the old log
  files are mailed (uncompressed) to www@my.org after going through 5
  rotations, rather then being removed. The \fBsharedscripts\fR means that
 -the \fBpostrotate\fR script will only be run once, not once for each
@@ -15,7 +19,7 @@ Index: logrotate-3.7.1/logrotate.8
  log which is rotated. Note that log file names may be enclosed in
  quotes (and that quotes are required if the name contains spaces).
  Normal shell quoting rules apply, with \fB'\fR, \fB"\fR, and \fB\\\fR
-@@ -384,7 +385,7 @@
+@@ -376,7 +377,7 @@ times for log file entries which match m
  are only run once, no matter how many logs match the wildcarded pattern.
  However, if none of the logs in the pattern require rotating, the scripts
  will not be run at all. This option overrides the \fBnosharedscripts\fR
@@ -23,4 +27,4 @@ Index: logrotate-3.7.1/logrotate.8
 +option and implies \fBcreate\fR option.
  
  .TP
- \fBstart \fIcount\fR
+ \fBsize \fIsize\fR[\fBG\fR|\fBM\fR|\fBk\fR]
diff --git a/patches/logrotate-3.7.1/man-sizetypo.patch b/patches/logrotate-3.7.1/man-sizetypo.patch
index ea9154c34..5cdb3f859 100644
--- a/patches/logrotate-3.7.1/man-sizetypo.patch
+++ b/patches/logrotate-3.7.1/man-sizetypo.patch
@@ -1,8 +1,14 @@
 Fix manpage typo in the size example.
 
---- /home/pm/deb/logrotate/logrotate-3.7/logrotate.8	2004-09-13 22:50:08.000000000 +0100
-+++ logrotate-3.7/logrotate.8	2004-09-13 22:50:25.000000000 +0100
-@@ -90,7 +90,7 @@
+---
+ logrotate.8 |    2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+Index: logrotate-3.7.1/logrotate.8
+===================================================================
+--- logrotate-3.7.1.orig/logrotate.8
++++ logrotate-3.7.1/logrotate.8
+@@ -90,7 +90,7 @@ compress
  "/var/log/httpd/access.log" /var/log/httpd/error.log {
      rotate 5
      mail www@my.org
diff --git a/patches/logrotate-3.7.1/man-startcount.patch b/patches/logrotate-3.7.1/man-startcount.patch
index 5553e6f74..c940114b4 100644
--- a/patches/logrotate-3.7.1/man-startcount.patch
+++ b/patches/logrotate-3.7.1/man-startcount.patch
@@ -1,11 +1,15 @@
 Inconsistency in manpage logrotate(8), start directive
 (Closes: #290628)
 
+---
+ logrotate.8 |    2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
 Index: logrotate-3.7.1/logrotate.8
 ===================================================================
---- logrotate-3.7.1.orig/logrotate.8	2006-04-08 21:09:24.530501346 +0100
-+++ logrotate-3.7.1/logrotate.8	2006-04-08 21:11:37.760424103 +0100
-@@ -392,7 +392,7 @@
+--- logrotate-3.7.1.orig/logrotate.8
++++ logrotate-3.7.1/logrotate.8
+@@ -392,7 +392,7 @@ This is the number to use as the base fo
  you specify 0, the logs will be created with a .0 extension as they are
  rotated from the original log files.  If you specify 9, log files will
  be created with a .9, skipping 0-8.  Files will still be rotated the
diff --git a/patches/logrotate-3.7.1/manpage.patch b/patches/logrotate-3.7.1/manpage.patch
index 0a43dbf1f..af469c381 100644
--- a/patches/logrotate-3.7.1/manpage.patch
+++ b/patches/logrotate-3.7.1/manpage.patch
@@ -4,10 +4,14 @@ Patches from: J S Bygott <jsb_no_spm@jsbygott.fsnet.co.uk>
 General fixes to manpages.
 
 
+---
+ logrotate.8 |  151 +++++++++++++++++++++++++++++++++---------------------------
+ 1 file changed, 84 insertions(+), 67 deletions(-)
+
 Index: logrotate-3.7.1/logrotate.8
 ===================================================================
---- logrotate-3.7.1.orig/logrotate.8	2006-04-08 21:43:29.280038309 +0100
-+++ logrotate-3.7.1/logrotate.8	2006-04-08 21:45:53.721194620 +0100
+--- logrotate-3.7.1.orig/logrotate.8
++++ logrotate-3.7.1/logrotate.8
 @@ -3,7 +3,8 @@
  .SH NAME
  logrotate \- rotates, compresses, and mails system logs
@@ -18,7 +22,7 @@ Index: logrotate-3.7.1/logrotate.8
  .SH DESCRIPTION
  \fBlogrotate\fR is designed to ease administration of systems that generate
  large numbers of log files.  It allows automatic rotation, compression, 
-@@ -11,16 +12,16 @@
+@@ -11,16 +12,16 @@ removal, and mailing of log files.  Each
  weekly, monthly, or when it grows too large.
  .P
  Normally, \fBlogrotate\fR is run as a daily cron job.  It will not modify
@@ -40,7 +44,7 @@ Index: logrotate-3.7.1/logrotate.8
  is given on the command line, every file in that directory is used as
  a config file.
  .P
-@@ -36,37 +37,42 @@
+@@ -36,37 +37,42 @@ Turns on debug mode and implies \fB-v\fR
  be made to the logs or to the \fBlogrotate\fR state file.
  
  .TP
@@ -91,7 +95,7 @@ Index: logrotate-3.7.1/logrotate.8
  
  .nf
  .ta +3i
-@@ -77,7 +83,7 @@
+@@ -77,7 +83,7 @@ compress
      rotate 5
      weekly
      postrotate
@@ -100,7 +104,7 @@ Index: logrotate-3.7.1/logrotate.8
      endscript
  }
  
-@@ -87,7 +93,7 @@
+@@ -87,7 +93,7 @@ compress
      size=100k
      sharedscripts
      postrotate
@@ -109,7 +113,7 @@ Index: logrotate-3.7.1/logrotate.8
      endscript
  }
  
-@@ -97,7 +103,7 @@
+@@ -97,7 +103,7 @@ compress
      olddir /var/log/news/old
      missingok
      postrotate
@@ -118,7 +122,7 @@ Index: logrotate-3.7.1/logrotate.8
      endscript
      nocompress
  }
-@@ -107,9 +113,9 @@
+@@ -107,9 +113,9 @@ compress
  The first few lines set global options; in the example, logs are
  compressed after they are rotated.  Note that comments may appear
  anywhere in the config file as long as the first non-whitespace
@@ -130,7 +134,7 @@ Index: logrotate-3.7.1/logrotate.8
  \fI/var/log/messages\fR. The log will go through five weekly rotations before
  being removed. After the log file has been rotated (but before the old
  version of the log has been compressed), the command 
-@@ -117,13 +123,13 @@
+@@ -117,13 +123,13 @@ version of the log has been compressed),
  
  The next section defines the parameters for both
  \fI/var/log/httpd/access.log\fR and \fI/var/log/httpd/error.log\fR.
@@ -148,7 +152,7 @@ Index: logrotate-3.7.1/logrotate.8
  characters supported.
  
  The last section defines the parameters for all of the files in
-@@ -135,29 +141,33 @@
+@@ -135,29 +141,33 @@ Please use wildcards with caution.  If y
  rotate all files, including previously rotated ones.  A way around this
  is to use the \fBolddir\fR directive or a more exact wildcard (such as *.log).
  
@@ -188,7 +192,7 @@ Index: logrotate-3.7.1/logrotate.8
  
  .TP
  \fBcompressoptions\fR
-@@ -174,9 +184,9 @@
+@@ -174,9 +184,9 @@ as the old log file stays in place.
  
  .TP
  \fBcopytruncate\fR
@@ -201,7 +205,7 @@ Index: logrotate-3.7.1/logrotate.8
  and thus might continue writing (appending) to the previous log file forever.
  Note that there is a very small time slice between copying the file and
  truncating it, so some logging data might be lost.
-@@ -188,7 +198,7 @@
+@@ -188,7 +198,7 @@ as the old log file stays in place.
  Immediately after rotation (before the \fBpostrotate\fR script is run)
  the log file is created (with the same name as the log file just rotated).
  \fImode\fR specifies the mode for the log file in octal (the same
@@ -210,7 +214,7 @@ Index: logrotate-3.7.1/logrotate.8
  log file, and \fIgroup\fR specifies the group the log file will belong
  to. Any of the log file attributes may be omitted, in which case those
  attributes for the new file will use the same values as the original log
-@@ -207,20 +217,20 @@
+@@ -207,20 +217,20 @@ instead of simply adding a number.
  .TP
  \fBdelaycompress\fR
  Postpone compression of the previous log file to the next rotation cycle.
@@ -236,7 +240,7 @@ Index: logrotate-3.7.1/logrotate.8
  
  .TP
  \fBinclude \fIfile_or_directory\fR
-@@ -231,12 +241,12 @@
+@@ -231,12 +241,12 @@ before processing of the including file 
  which are ignored are files which are not regular files (such as
  directories and named pipes) and files whose names end with one of
  the taboo extensions, as specified by the \fBtabooext\fR directive.
@@ -251,7 +255,7 @@ Index: logrotate-3.7.1/logrotate.8
  no mail should be generated by a particular log, the \fBnomail\fR directive
  may be used.
  
-@@ -268,8 +278,7 @@
+@@ -268,8 +278,7 @@ Log files are rotated the first time \fB
  
  .TP
  \fBnocompress\fR
@@ -261,7 +265,7 @@ Index: logrotate-3.7.1/logrotate.8
  
  .TP
  \fBnocopy\fR
-@@ -292,7 +301,7 @@
+@@ -292,7 +301,7 @@ Do not postpone compression of the previ
  
  .TP
  \fBnomail\fR
@@ -270,7 +274,7 @@ Index: logrotate-3.7.1/logrotate.8
  
  .TP
  \fBnomissingok\fR
-@@ -300,12 +309,12 @@
+@@ -300,12 +309,12 @@ If a log file does not exist, issue an e
  
  .TP
  \fBnoolddir\fR
@@ -285,7 +289,7 @@ Index: logrotate-3.7.1/logrotate.8
  is rotated (this is the default, and overrides the \fBsharedscripts\fR
  option).
  
-@@ -326,16 +335,15 @@
+@@ -326,16 +335,15 @@ overriden by the \fBnoolddir\fR option.
  \fBpostrotate\fR/\fBendscript\fR
  The lines between \fBpostrotate\fR and \fBendscript\fR (both of which
  must appear on lines by themselves) are executed after the log file is
@@ -305,7 +309,7 @@ Index: logrotate-3.7.1/logrotate.8
  
  .TP
  \fBfirstaction\fR/\fBendscript\fR
-@@ -351,33 +359,34 @@
+@@ -351,33 +359,34 @@ The lines between \fBlastaction\fR and \
  must appear on lines by themselves) are executed once after all log
  files that match the wildcarded pattern are rotated, after postrotate script
  is run and only if at least one log is rotated. These directives may only
@@ -352,7 +356,7 @@ Index: logrotate-3.7.1/logrotate.8
  \fBstart \fIcount\fR
  This is the number to use as the base for rotation. For example, if
  you specify 0, the logs will be created with a .0 extension as they are
-@@ -388,18 +397,21 @@
+@@ -388,18 +397,21 @@ number of times specified with the \fBco
  .TP
  \fBtabooext\fR [+] \fIlist\fR
  The current taboo extension list is changed (see the \fBinclude\fR directive
@@ -379,7 +383,7 @@ Index: logrotate-3.7.1/logrotate.8
  
  .SH FILES
  .PD 0
-@@ -411,11 +423,16 @@
+@@ -411,11 +423,16 @@ Default state file.
  Configuration options.
  
  .SH SEE ALSO
diff --git a/patches/logrotate-3.7.1/ptx-timeext.patch b/patches/logrotate-3.7.1/ptx-timeext.patch
index 8931e3ab6..1c043b32c 100644
--- a/patches/logrotate-3.7.1/ptx-timeext.patch
+++ b/patches/logrotate-3.7.1/ptx-timeext.patch
@@ -1,7 +1,14 @@
-Index: logrotate.h
+---
+ config.c    |    8 ++++++++
+ logrotate.8 |    8 ++++++++
+ logrotate.c |   49 +++++++++++++++++++++++++++++++++++++------------
+ logrotate.h |    1 +
+ 4 files changed, 54 insertions(+), 12 deletions(-)
+
+Index: logrotate-3.7.1/logrotate.h
 ===================================================================
---- a/logrotate.h.orig
-+++ b/logrotate.h
+--- logrotate-3.7.1.orig/logrotate.h
++++ logrotate-3.7.1/logrotate.h
 @@ -16,6 +16,7 @@
  #define LOG_FLAG_SHAREDSCRIPTS	(1 << 7)
  #define LOG_FLAG_COPY		(1 << 8)
@@ -10,10 +17,10 @@ Index: logrotate.h
  
  #define NO_FORCE_ROTATE 0
  #define FORCE_ROTATE    1
-Index: config.c
+Index: logrotate-3.7.1/config.c
 ===================================================================
---- a/config.c.orig
-+++ b/config.c
+--- logrotate-3.7.1.orig/config.c
++++ logrotate-3.7.1/config.c
 @@ -521,6 +521,14 @@ static int readConfigFile(const char * c
  		newlog->flags &= ~LOG_FLAG_DATEEXT;
  
@@ -29,10 +36,10 @@ Index: config.c
  	    } else if (!strcmp(start, "noolddir")) {
  		newlog->oldDir = NULL;
  
-Index: logrotate.8
+Index: logrotate-3.7.1/logrotate.8
 ===================================================================
---- a/logrotate.8.orig
-+++ b/logrotate.8
+--- logrotate-3.7.1.orig/logrotate.8
++++ logrotate-3.7.1/logrotate.8
 @@ -216,6 +216,14 @@ Archive old versions of log files adding
  instead of simply adding a number.
  
@@ -48,10 +55,10 @@ Index: logrotate.8
  \fBdelaycompress\fR
  Postpone compression of the previous log file to the next rotation cycle.
  This only has effect when used in combination with \fBcompress\fR.
-Index: logrotate.c
+Index: logrotate-3.7.1/logrotate.c
 ===================================================================
---- a/logrotate.c.orig
-+++ b/logrotate.c
+--- logrotate-3.7.1.orig/logrotate.c
++++ logrotate-3.7.1/logrotate.c
 @@ -542,7 +542,7 @@ int rotateSingleLog(logInfo * log, int l
  
      alloc_size = strlen(dirName) + strlen(baseName) + 
diff --git a/patches/logrotate-3.7.1/rh-dateext.patch b/patches/logrotate-3.7.1/rh-dateext.patch
index 7efbf896f..b1ccecd30 100644
--- a/patches/logrotate-3.7.1/rh-dateext.patch
+++ b/patches/logrotate-3.7.1/rh-dateext.patch
@@ -1,10 +1,17 @@
 Enhance logrotate with "dateext".
 From RedHat patches
 
+---
+ config.c    |    8 ++
+ logrotate.8 |    5 +
+ logrotate.c |  177 +++++++++++++++++++++++++++++++++++++++++++++++++++++-------
+ logrotate.h |    1 
+ 4 files changed, 173 insertions(+), 18 deletions(-)
+
 Index: logrotate-3.7.1/logrotate.h
 ===================================================================
---- logrotate-3.7.1.orig/logrotate.h	2006-04-08 20:32:36.772133783 +0100
-+++ logrotate-3.7.1/logrotate.h	2006-04-08 20:36:00.250859767 +0100
+--- logrotate-3.7.1.orig/logrotate.h
++++ logrotate-3.7.1/logrotate.h
 @@ -15,6 +15,7 @@
  #define LOG_FLAG_MAILFIRST	(1 << 6)
  #define LOG_FLAG_SHAREDSCRIPTS	(1 << 7)
@@ -15,8 +22,8 @@ Index: logrotate-3.7.1/logrotate.h
  #define FORCE_ROTATE    1
 Index: logrotate-3.7.1/logrotate.c
 ===================================================================
---- logrotate-3.7.1.orig/logrotate.c	2006-04-08 20:32:36.773133590 +0100
-+++ logrotate-3.7.1/logrotate.c	2006-04-08 20:36:00.254859022 +0100
+--- logrotate-3.7.1.orig/logrotate.c
++++ logrotate-3.7.1/logrotate.c
 @@ -11,6 +11,7 @@
  #include <sys/wait.h>
  #include <time.h>
@@ -25,7 +32,7 @@ Index: logrotate-3.7.1/logrotate.c
  
  #ifdef WITH_SELINUX
  #include <selinux/selinux.h>
-@@ -22,6 +23,10 @@
+@@ -22,6 +23,10 @@ int selinux_enabled=0;
  #include "log.h"
  #include "logrotate.h"
  
@@ -36,7 +43,7 @@ Index: logrotate-3.7.1/logrotate.c
  typedef struct {
      char * fn;
      struct tm lastRotated;	/* only tm.mon, tm_mday, tm_year are good! */
-@@ -42,6 +47,14 @@
+@@ -42,6 +47,14 @@ int debug = 0;
  char * mailCommand = DEFAULT_MAIL_COMMAND;
  time_t nowSecs = 0;
  
@@ -51,7 +58,7 @@ Index: logrotate-3.7.1/logrotate.c
  static logState * findState(const char * fn, struct stateSet * sip) {
      int i;
      logState * states = sip->states;
-@@ -121,6 +134,17 @@
+@@ -121,6 +134,17 @@ static int runScript(char * logfn, char 
      return rc;
  }
  
@@ -69,7 +76,7 @@ Index: logrotate-3.7.1/logrotate.c
  static int compressLogFile(char * name, logInfo * log, struct stat *sb) {
      char * compressedName;
      const char ** fullCommand;
-@@ -265,6 +289,25 @@
+@@ -265,6 +289,25 @@ static int mailLog(char * logFile, char 
      return rc;
  }
  
@@ -95,7 +102,7 @@ Index: logrotate-3.7.1/logrotate.c
  static int copyTruncate(char * currLog, char * saveLog, struct stat * sb, int flags) {
      char buf[BUFSIZ];
      int fdcurr = -1, fdsave = -1;
-@@ -479,6 +522,9 @@
+@@ -479,6 +522,9 @@ int rotateSingleLog(logInfo * log, int l
      char * baseName;
      char * dirName;
      char * firstRotated;
@@ -105,7 +112,7 @@ Index: logrotate-3.7.1/logrotate.c
      size_t alloc_size;
      int rotateCount = log->rotateCount ? log->rotateCount : 1;
      int logStart = (log->logStart == -1) ? 1 : log->logStart;
-@@ -509,7 +555,7 @@
+@@ -509,7 +555,7 @@ int rotateSingleLog(logInfo * log, int l
  
      alloc_size = strlen(dirName) + strlen(baseName) + 
                   strlen(log->files[logNum]) + strlen(fileext) +
@@ -114,7 +121,7 @@ Index: logrotate-3.7.1/logrotate.c
      
      oldName = alloca(alloc_size);
      newName = alloca(alloc_size);
-@@ -531,25 +577,106 @@
+@@ -531,25 +577,106 @@ int rotateSingleLog(logInfo * log, int l
      /* First compress the previous log when necessary */
      if (log->flags & LOG_FLAG_COMPRESS &&
          log->flags & LOG_FLAG_DELAYCOMPRESS) {
@@ -231,7 +238,7 @@ Index: logrotate-3.7.1/logrotate.c
      sprintf(firstRotated, "%s/%s.%d%s%s", dirName, baseName,
              logStart, fileext, 
  	    (log->flags & LOG_FLAG_DELAYCOMPRESS) ? "" : compext);
-@@ -599,12 +726,27 @@
+@@ -599,12 +726,27 @@ int rotateSingleLog(logInfo * log, int l
                  hasErrors = 1;
  	    }
  	}
@@ -263,7 +270,7 @@ Index: logrotate-3.7.1/logrotate.c
      
      /* if the last rotation doesn't exist, that's okay */
      if (!debug && access(disposeName, F_OK)) {
-@@ -613,9 +755,6 @@
+@@ -613,9 +755,6 @@ int rotateSingleLog(logInfo * log, int l
          disposeName = NULL;
      } 
      
@@ -273,7 +280,7 @@ Index: logrotate-3.7.1/logrotate.c
      if (!hasErrors) {
          if (log->pre && !(log->flags & LOG_FLAG_SHAREDSCRIPTS)) {
              message(MESS_DEBUG, "running prerotate script\n");
-@@ -761,6 +900,8 @@
+@@ -761,6 +900,8 @@ int rotateSingleLog(logInfo * log, int l
  	  }
  	}
  #endif
@@ -284,9 +291,9 @@ Index: logrotate-3.7.1/logrotate.c
  
 Index: logrotate-3.7.1/config.c
 ===================================================================
---- logrotate-3.7.1.orig/config.c	2006-04-08 20:32:36.774133397 +0100
-+++ logrotate-3.7.1/config.c	2006-04-08 20:36:00.256858650 +0100
-@@ -511,6 +511,14 @@
+--- logrotate-3.7.1.orig/config.c
++++ logrotate-3.7.1/config.c
+@@ -511,6 +511,14 @@ static int readConfigFile(const char * c
  		newlog->flags &= ~LOG_FLAG_IFEMPTY;
  
  		*endtag = oldchar, start = endtag;
@@ -303,9 +310,9 @@ Index: logrotate-3.7.1/config.c
  
 Index: logrotate-3.7.1/logrotate.8
 ===================================================================
---- logrotate-3.7.1.orig/logrotate.8	2006-04-08 20:32:36.775133204 +0100
-+++ logrotate-3.7.1/logrotate.8	2006-04-08 20:36:00.257858464 +0100
-@@ -200,6 +200,11 @@
+--- logrotate-3.7.1.orig/logrotate.8
++++ logrotate-3.7.1/logrotate.8
+@@ -200,6 +200,11 @@ file for the omitted attributes. This op
  Log files are rotated every day.
  
  .TP
diff --git a/patches/logrotate-3.7.1/rh-maxage.patch b/patches/logrotate-3.7.1/rh-maxage.patch
index 03d15a102..49087c457 100644
--- a/patches/logrotate-3.7.1/rh-maxage.patch
+++ b/patches/logrotate-3.7.1/rh-maxage.patch
@@ -1,11 +1,18 @@
 Enhance logrotate with "maxage".
 From upstream RedHat patch.
 
+---
+ config.c    |   15 +++++++++++++++
+ logrotate.8 |    6 ++++++
+ logrotate.c |   25 +++++++++++++++++++++++--
+ logrotate.h |    1 +
+ 4 files changed, 45 insertions(+), 2 deletions(-)
+
 Index: logrotate-3.7.1/logrotate.c
 ===================================================================
---- logrotate-3.7.1.orig/logrotate.c	2006-04-08 20:38:58.277761983 +0100
-+++ logrotate-3.7.1/logrotate.c	2006-04-08 20:38:58.314755223 +0100
-@@ -640,7 +640,10 @@
+--- logrotate-3.7.1.orig/logrotate.c
++++ logrotate-3.7.1/logrotate.c
+@@ -640,7 +640,10 @@ int rotateSingleLog(logInfo * log, int l
  	     * the date in their name */
  	    for (i = 0; i < globResult.gl_pathc; i++) {
  		if( !stat((globResult.gl_pathv)[i],&fst_buf) ) {
@@ -17,7 +24,7 @@ Index: logrotate-3.7.1/logrotate.c
  			if ( mail_out != -1 ) {
  			    if (!hasErrors && log->logAddress) {
  				char * mailFilename = (globResult.gl_pathv)[mail_out];
-@@ -670,6 +673,22 @@
+@@ -670,6 +673,22 @@ int rotateSingleLog(logInfo * log, int l
  	globfree(&globResult);
  	free(glob_pattern);
      } else {
@@ -40,7 +47,7 @@ Index: logrotate-3.7.1/logrotate.c
  
      sprintf(oldName, "%s/%s.%d%s%s", dirName, baseName,
              logStart + rotateCount, fileext, compext);
-@@ -1188,7 +1207,9 @@
+@@ -1188,7 +1207,9 @@ static int readState(char * stateFilenam
  
  int main(int argc, const char ** argv) {
      logInfo defConfig = { NULL, NULL, 0, NULL, ROT_SIZE, 
@@ -53,9 +60,9 @@ Index: logrotate-3.7.1/logrotate.c
  			  /* first, last */ NULL, NULL,
 Index: logrotate-3.7.1/logrotate.h
 ===================================================================
---- logrotate-3.7.1.orig/logrotate.h	2006-04-08 20:38:58.274762531 +0100
-+++ logrotate-3.7.1/logrotate.h	2006-04-08 20:38:58.315755040 +0100
-@@ -35,6 +35,7 @@
+--- logrotate-3.7.1.orig/logrotate.h
++++ logrotate-3.7.1/logrotate.h
+@@ -35,6 +35,7 @@ typedef struct {
      enum { ROT_DAYS, ROT_WEEKLY, ROT_MONTHLY, ROT_SIZE, ROT_FORCE } criterium;
      unsigned int threshhold;
      int rotateCount;
@@ -65,9 +72,9 @@ Index: logrotate-3.7.1/logrotate.h
      char * logAddress;
 Index: logrotate-3.7.1/config.c
 ===================================================================
---- logrotate-3.7.1.orig/config.c	2006-04-08 20:38:58.279761617 +0100
-+++ logrotate-3.7.1/config.c	2006-04-08 20:38:58.317754675 +0100
-@@ -678,6 +678,21 @@
+--- logrotate-3.7.1.orig/config.c
++++ logrotate-3.7.1/config.c
+@@ -678,6 +678,21 @@ static int readConfigFile(const char * c
  		    }
  		    *endtag = oldchar, start = endtag;
  		}
@@ -91,9 +98,9 @@ Index: logrotate-3.7.1/config.c
  			configFile, lineNum);
 Index: logrotate-3.7.1/logrotate.8
 ===================================================================
---- logrotate-3.7.1.orig/logrotate.8	2006-04-08 20:38:58.280761435 +0100
-+++ logrotate-3.7.1/logrotate.8	2006-04-08 20:38:58.318754492 +0100
-@@ -251,6 +251,12 @@
+--- logrotate-3.7.1.orig/logrotate.8
++++ logrotate-3.7.1/logrotate.8
+@@ -251,6 +251,12 @@ When using the \fBmail\fR command, mail 
  instead of the just-rotated file (this is the default).
  
  .TP
diff --git a/patches/logrotate-3.7.1/rh-noTMPDIR.patch b/patches/logrotate-3.7.1/rh-noTMPDIR.patch
index 2b277f940..73e5fa717 100644
--- a/patches/logrotate-3.7.1/rh-noTMPDIR.patch
+++ b/patches/logrotate-3.7.1/rh-noTMPDIR.patch
@@ -1,11 +1,15 @@
 Do not use tmpfile to run script anymore (Closes: #149270)
 From RedHat patches.
 
+---
+ logrotate.c |   31 +------------------------------
+ 1 file changed, 1 insertion(+), 30 deletions(-)
+
 Index: logrotate-3.7.1/logrotate.c
 ===================================================================
---- logrotate-3.7.1.orig/logrotate.c	2006-04-08 20:38:58.314755223 +0100
-+++ logrotate-3.7.1/logrotate.c	2006-04-08 20:42:11.628324134 +0100
-@@ -88,10 +88,7 @@
+--- logrotate-3.7.1.orig/logrotate.c
++++ logrotate-3.7.1/logrotate.c
+@@ -88,10 +88,7 @@ static logState * findState(const char *
  }
  
  static int runScript(char * logfn, char * script) {
@@ -16,7 +20,7 @@ Index: logrotate-3.7.1/logrotate.c
  
      if (debug) {
  	message(MESS_DEBUG, "running script with arg %s: \"%s\"\n", 
-@@ -99,38 +96,12 @@
+@@ -99,38 +96,12 @@ static int runScript(char * logfn, char 
  	return 0;
      }
  
diff --git a/patches/logrotate-3.7.1/rh-selinux.patch b/patches/logrotate-3.7.1/rh-selinux.patch
index 0e1a3bbdf..6798ce0b2 100644
--- a/patches/logrotate-3.7.1/rh-selinux.patch
+++ b/patches/logrotate-3.7.1/rh-selinux.patch
@@ -2,10 +2,14 @@ Add selinux_getenforce() calls to work when not in enforcing mode
 - use security_getenforce() instead of selinux_getenforcemode
 From RedHat patches.
 
+---
+ logrotate.c |  126 +++++++++++++++++++++++++++++++++---------------------------
+ 1 file changed, 71 insertions(+), 55 deletions(-)
+
 Index: logrotate-3.7.1/logrotate.c
 ===================================================================
---- logrotate-3.7.1.orig/logrotate.c	2006-04-08 20:42:37.114533654 +0100
-+++ logrotate-3.7.1/logrotate.c	2006-04-08 20:44:17.311634566 +0100
+--- logrotate-3.7.1.orig/logrotate.c
++++ logrotate-3.7.1/logrotate.c
 @@ -17,6 +17,7 @@
  #include <selinux/selinux.h>
  static security_context_t prev_context=NULL;
@@ -14,7 +18,7 @@ Index: logrotate-3.7.1/logrotate.c
  #endif
  
  #include "basenames.h"
-@@ -293,38 +294,43 @@
+@@ -293,38 +294,43 @@ static int copyTruncate(char * currLog, 
  	    return 1;
  	}
  #ifdef WITH_SELINUX
@@ -86,7 +90,7 @@ Index: logrotate-3.7.1/logrotate.c
  	}
  #endif
  	if (fdsave < 0) {
-@@ -672,28 +678,34 @@
+@@ -672,28 +678,34 @@ int rotateSingleLog(logInfo * log, int l
  	    (log->flags & LOG_FLAG_DELAYCOMPRESS) ? "" : compext);
      
  #ifdef WITH_SELINUX
@@ -143,7 +147,7 @@ Index: logrotate-3.7.1/logrotate.c
      }
  #endif
      for (i = rotateCount + logStart - 1; (i >= 0) && !hasErrors; i--) {
-@@ -883,11 +895,11 @@
+@@ -883,11 +895,11 @@ int rotateSingleLog(logInfo * log, int l
      
  #ifdef WITH_SELINUX
  	if (selinux_enabled) {
@@ -160,7 +164,7 @@ Index: logrotate-3.7.1/logrotate.c
  	}
  #endif
      free(dirName);
-@@ -1249,6 +1261,10 @@
+@@ -1249,6 +1261,10 @@ int main(int argc, const char ** argv) {
  	exit(1);
      }
  
diff --git a/patches/logrotate-3.7.1/script-argument.patch b/patches/logrotate-3.7.1/script-argument.patch
index 86ac656b0..cfc48a803 100644
--- a/patches/logrotate-3.7.1/script-argument.patch
+++ b/patches/logrotate-3.7.1/script-argument.patch
@@ -3,11 +3,15 @@ Closes: #330783
 Allow the use of $1 in scripts.
 
 
+---
+ logrotate.c |    2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
 Index: logrotate-3.7.1/logrotate.c
 ===================================================================
---- logrotate-3.7.1.orig/logrotate.c	2006-04-08 21:47:41.000000000 +0100
-+++ logrotate-3.7.1/logrotate.c	2006-04-08 22:01:23.722498089 +0100
-@@ -101,7 +101,7 @@
+--- logrotate-3.7.1.orig/logrotate.c
++++ logrotate-3.7.1/logrotate.c
+@@ -101,7 +101,7 @@ static int runScript(char * logfn, char 
      }
  
      if (!fork()) {
diff --git a/patches/logrotate-3.7.1/scripterrors.patch b/patches/logrotate-3.7.1/scripterrors.patch
index 628897582..ff1619230 100644
--- a/patches/logrotate-3.7.1/scripterrors.patch
+++ b/patches/logrotate-3.7.1/scripterrors.patch
@@ -1,11 +1,15 @@
 Give error messages identifying log file on script errors
 (Closes: #122691, #195790, #222050, #306020)
 
+---
+ logrotate.c |    7 ++++---
+ 1 file changed, 4 insertions(+), 3 deletions(-)
+
 Index: logrotate-3.7.1/logrotate.c
 ===================================================================
---- logrotate-3.7.1.orig/logrotate.c	2006-04-08 21:03:38.961646055 +0100
-+++ logrotate-3.7.1/logrotate.c	2006-04-08 21:05:20.850933782 +0100
-@@ -770,8 +770,8 @@
+--- logrotate-3.7.1.orig/logrotate.c
++++ logrotate-3.7.1/logrotate.c
+@@ -770,8 +770,8 @@ int rotateSingleLog(logInfo * log, int l
          if (log->pre && !(log->flags & LOG_FLAG_SHAREDSCRIPTS)) {
              message(MESS_DEBUG, "running prerotate script\n");
              if (runScript(log->files[logNum], log->pre)) {
@@ -16,7 +20,7 @@ Index: logrotate-3.7.1/logrotate.c
                  hasErrors = 1;
  	    }
          }
-@@ -853,7 +853,8 @@
+@@ -853,7 +853,8 @@ int rotateSingleLog(logInfo * log, int l
  	    !(log->flags & LOG_FLAG_SHAREDSCRIPTS)) {
              message(MESS_DEBUG, "running postrotate script\n");
              if (runScript(log->files[logNum], log->post)) {
diff --git a/patches/logrotate-3.7.1/taboo-to-debug.patch b/patches/logrotate-3.7.1/taboo-to-debug.patch
index d4086d354..dd78d643e 100644
--- a/patches/logrotate-3.7.1/taboo-to-debug.patch
+++ b/patches/logrotate-3.7.1/taboo-to-debug.patch
@@ -1,10 +1,14 @@
 Quietens the taboo list from ERROR to a DEBUG (Closes: #249073)
 
+---
+ config.c |    2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
 Index: logrotate-3.7.1/config.c
 ===================================================================
---- logrotate-3.7.1.orig/config.c	2006-04-08 20:48:47.169764580 +0100
-+++ logrotate-3.7.1/config.c	2006-04-08 20:49:55.460798704 +0100
-@@ -149,7 +149,7 @@
+--- logrotate-3.7.1.orig/config.c
++++ logrotate-3.7.1/config.c
+@@ -149,7 +149,7 @@ static int checkFile(const char * fname)
      for (i = 0; i < tabooCount; i++) {
  	if (!strcmp(fname + strlen(fname) - strlen(tabooExts[i]),
  	    tabooExts[i])) {
diff --git a/patches/logrotate-3.7.1/uncompressChild-warning.patch b/patches/logrotate-3.7.1/uncompressChild-warning.patch
index b8fde6e69..1b8de68f2 100644
--- a/patches/logrotate-3.7.1/uncompressChild-warning.patch
+++ b/patches/logrotate-3.7.1/uncompressChild-warning.patch
@@ -1,8 +1,12 @@
+---
+ logrotate.c |    2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
 Index: logrotate-3.7.1/logrotate.c
 ===================================================================
---- logrotate-3.7.1.orig/logrotate.c	2006-04-08 22:58:51.000000000 +0100
-+++ logrotate-3.7.1/logrotate.c	2006-04-08 23:01:00.459602124 +0100
-@@ -209,7 +209,7 @@
+--- logrotate-3.7.1.orig/logrotate.c
++++ logrotate-3.7.1/logrotate.c
+@@ -209,7 +209,7 @@ static int compressLogFile(char * name, 
  static int mailLog(char * logFile, char * mailCommand, char * uncompressCommand, 
  		   char * address, char * subject) {
      int mailInput;