3 files changed, 28 insertions, 58 deletions
diff --git a/source/a/logrotate/logrotate.SlackBuild b/source/a/logrotate/logrotate.SlackBuild
index 76cc34abe..e38f27152 100755
--- a/source/a/logrotate/logrotate.SlackBuild
+++ b/source/a/logrotate/logrotate.SlackBuild
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-# Copyright 2008, 2009  Patrick J. Volkerding, Sebeka, Minnesota, USA
+# Copyright 2008, 2009, 2012  Patrick J. Volkerding, Sebeka, Minnesota, USA
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -20,7 +20,7 @@
 #  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
-VERSION=${VERSION:-3.7.8}
+VERSION=${VERSION:-3.8.2}
 BUILD=${BUILD:-1}
 
 # Automatically determine the architecture we're building on:
@@ -68,7 +68,7 @@ find . \
 zcat $CWD/logrotate.slackware.diff.gz | patch -p1 || exit 1
 
 make clean
-make EXTRA_CFLAGS="$SLKCFLAGS" || exit 1
+make RPM_OPT_FLAGS="$SLKCFLAGS" || exit 1
 strip logrotate
 
 mkdir -p $PKG/usr/sbin
@@ -87,14 +87,19 @@ mkdir -p $PKG/etc/cron.daily
 zcat $CWD/logrotate.cron.gz > $PKG/etc/cron.daily/logrotate
 chmod 0755 $PKG/etc/cron.daily/logrotate
 
-# Create the state directory
-mkdir -p $PKG/var/lib/logrotate
-
 mkdir -p $PKG/usr/doc/logrotate-$VERSION
 cp -a \
   CHANGES COPYING READM* \
     $PKG/usr/doc/logrotate-$VERSION
 
+# If there's a ChangeLog, installing at least part of the recent history
+# is useful, but don't let it get totally out of control:
+if [ -r ChangeLog ]; then
+  DOCSDIR=$(echo $PKG/usr/doc/*-$VERSION)
+  cat ChangeLog | head -n 1000 > $DOCSDIR/ChangeLog
+  touch -r ChangeLog $DOCSDIR/ChangeLog
+fi
+
 mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
 
diff --git a/source/a/logrotate/logrotate.cron b/source/a/logrotate/logrotate.cron
index f91b3adda..acdf65c2d 100644
--- a/source/a/logrotate/logrotate.cron
+++ b/source/a/logrotate/logrotate.cron
@@ -1,3 +1,3 @@
 #!/bin/sh
-/usr/sbin/logrotate /etc/logrotate.conf
-[ $? != 0 ] && /usr/bin/logger -t logrotate "ALERT - exited abnormally."
+/usr/sbin/logrotate /etc/logrotate.conf \
+ || { /usr/bin/logger -t logrotate "ALERT - exited abnormally." && false ; }
diff --git a/source/a/logrotate/logrotate.slackware.diff b/source/a/logrotate/logrotate.slackware.diff
index e9126cee3..6fa0436dc 100644
--- a/source/a/logrotate/logrotate.slackware.diff
+++ b/source/a/logrotate/logrotate.slackware.diff
@@ -1,60 +1,25 @@
-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",
+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-*"
-+static char *defTabooExts[] = { ".new", ".orig", ".old", ".bak",
-+    ".rpmsave", ".rpmorig", "~", ",v", ".rpmnew", ".swp", ".cfsaved", 
-+    ".rhn-cfg-tmp-*"
++    ".rpmnew", ".swp", ".cfsaved", ".rhn-cfg-tmp-*",
++    ".new", ".old", ".orig", ".bak"
  };
  static int defTabooCount = sizeof(defTabooExts) / sizeof(char *);
  
-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 -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 @@
+diff -Nur logrotate-3.8.0.orig//logrotate.8 logrotate-3.8.0/logrotate.8
+--- logrotate-3.8.0.orig//logrotate.8	2011-06-21 03:12:02.000000000 -0500
++++ logrotate-3.8.0/logrotate.8	2011-08-22 15:56:12.247672243 -0500
+@@ -472,7 +472,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, ~, .cfsaved and .rhn-cfg-tmp-*.
-+contains .new, .orig, .bak, .old, .rpmorig, .rpmsave, ,v, .swp, .rpmnew, ~, .cfsaved and .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-*
++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
  \fBweekly\fR
-@@ -459,7 +459,7 @@
- .SH FILES
- .PD 0
- .TP 27
--\fI/var/lib/logrotate.status\fR
-+\fI/var/lib/logrotate/status\fR
- Default state file.
- .TP 27
- \fI/etc/logrotate.conf\fR