diff options
| author | Mikhail Kolesnik <mike@openbunker.org> | 2010-12-23 20:30:30 +0200 |
|---|---|---|
| committer | Mikhail Kolesnik <mike@openbunker.org> | 2010-12-23 20:30:30 +0200 |
| commit | 5df188a83bcc2c2006e984ec777b17921506880c (patch) | |
| tree | 9480d6edfa3053212433cb9e5d84ae2173e8dca9 /logrotate | |
| parent | 1c56a4b44742d820ce2988413c5b2324d85799a5 (diff) | |
| download | contrib-5df188a83bcc2c2006e984ec777b17921506880c.tar.gz contrib-5df188a83bcc2c2006e984ec777b17921506880c.tar.xz | |
logrotate: update to 3.7.9
Diffstat (limited to 'logrotate')
| -rw-r--r-- | logrotate/.footprint | 2 | ||||
| -rw-r--r-- | logrotate/.md5sum | 4 | ||||
| -rw-r--r-- | logrotate/Pkgfile | 11 | ||||
| -rw-r--r-- | logrotate/logrotate-config.h.diff | 19 | ||||
| -rw-r--r-- | logrotate/logrotate-paths.diff | 40 |
5 files changed, 48 insertions, 28 deletions
diff --git a/logrotate/.footprint b/logrotate/.footprint index 42a277ac3..31dd01e54 100644 --- a/logrotate/.footprint +++ b/logrotate/.footprint @@ -6,6 +6,8 @@ drwxr-xr-x root/root etc/cron/hourly/ drwxr-xr-x root/root etc/logrotate.d/ drwxr-xr-x root/root usr/ drwxr-xr-x root/root usr/man/ +drwxr-xr-x root/root usr/man/man5/ +-rw-r--r-- root/root usr/man/man5/logrotate.conf.5.gz drwxr-xr-x root/root usr/man/man8/ -rw-r--r-- root/root usr/man/man8/logrotate.8.gz drwxr-xr-x root/root usr/sbin/ diff --git a/logrotate/.md5sum b/logrotate/.md5sum index 3614de7f2..db81119b7 100644 --- a/logrotate/.md5sum +++ b/logrotate/.md5sum @@ -1,3 +1,3 @@ -b3589bea6d8d5afc8a84134fddaae973 logrotate-3.7.8.tar.gz -1f71da44e71f2c2f87f7200481685b83 logrotate-config.h.diff +eeba9dbca62a9210236f4b83195e4ea5 logrotate-3.7.9.tar.gz +f8e748d1f348b315cce548c78bd4dc9b logrotate-paths.diff 453190f4497a810fd48c90b0ce148788 logrotate.conf diff --git a/logrotate/Pkgfile b/logrotate/Pkgfile index a705fe105..8361960e3 100644 --- a/logrotate/Pkgfile +++ b/logrotate/Pkgfile @@ -4,19 +4,16 @@ # Depends on: popt name=logrotate -version=3.7.8 +version=3.7.9 release=1 -#source=(https://fedorahosted.org/releases/l/o/$name/$name-$version.tar.gz \ -# $name.conf) -source=(http://www.sfr-fresh.com/unix/privat/$name-$version.tar.gz \ - $name.conf logrotate-config.h.diff) +source=(https://fedorahosted.org/releases/l/o/$name/$name-$version.tar.gz + $name.conf logrotate-paths.diff) build() { cd $name-$version - patch -p1 -i $SRC/logrotate-config.h.diff + patch -p1 -i $SRC/logrotate-paths.diff make make PREFIX=$PKG install - mkdir -p $PKG/etc/$name.d mkdir -p $PKG/var/state/logrotate install -D -m 750 examples/$name.cron $PKG/etc/cron/hourly/$name diff --git a/logrotate/logrotate-config.h.diff b/logrotate/logrotate-config.h.diff deleted file mode 100644 index eebc0cf25..000000000 --- a/logrotate/logrotate-config.h.diff +++ /dev/null @@ -1,19 +0,0 @@ -diff -Nru logrotate-3.7.7-orig/config.h logrotate-3.7.7/config.h ---- logrotate-3.7.7-orig/config.h 2005-11-12 21:07:56.000000000 +0200 -+++ logrotate-3.7.7/config.h 2008-11-11 17:32:02.635392207 +0200 -@@ -20,7 +20,7 @@ - * Default settings for Linux - leave these last. - */ - #ifndef DEFAULT_MAIL_COMMAND --#define DEFAULT_MAIL_COMMAND "/bin/mail" -+#define DEFAULT_MAIL_COMMAND "/usr/bin/mail" - #endif - - #ifndef COMPRESS_COMMAND -@@ -36,5 +36,5 @@ - #endif - - #ifndef STATEFILE --#define STATEFILE "/var/lib/logrotate.status" -+#define STATEFILE "/var/state/logrotate/logrotate.status" - #endif diff --git a/logrotate/logrotate-paths.diff b/logrotate/logrotate-paths.diff new file mode 100644 index 000000000..609907a93 --- /dev/null +++ b/logrotate/logrotate-paths.diff @@ -0,0 +1,40 @@ +diff -Nru logrotate-3.7.9-orig/config.h logrotate-3.7.9/config.h +--- logrotate-3.7.9-orig/config.h 2010-12-23 20:21:54.000000000 +0200 ++++ logrotate-3.7.9/config.h 2010-12-23 20:24:13.000000000 +0200 +@@ -20,7 +20,7 @@ + * Default settings for Linux - leave these last. + */ + #ifndef DEFAULT_MAIL_COMMAND +-#define DEFAULT_MAIL_COMMAND "/bin/mail" ++#define DEFAULT_MAIL_COMMAND "/usr/bin/mail" + #endif + + #ifndef COMPRESS_COMMAND +@@ -36,5 +36,5 @@ + #endif + + #ifndef STATEFILE +-#define STATEFILE "/var/lib/logrotate.status" ++#define STATEFILE "/var/state/logrotate/logrotate.status" + #endif +diff -Nru logrotate-3.7.9-orig/logrotate.8 logrotate-3.7.9/logrotate.8 +--- logrotate-3.7.9-orig/logrotate.8 2010-12-23 20:21:54.000000000 +0200 ++++ logrotate-3.7.9/logrotate.8 2010-12-23 20:23:32.000000000 +0200 +@@ -55,7 +55,7 @@ + \fB-s, -\-state <statefile>\fR + Tells \fBlogrotate\fR to use an alternate state file. This is useful + if logrotate is being run as a different user for various sets of +-log files. The default state file is \fI/var/lib/logrotate.status\fR. ++log files. The default state file is \fI/var/state/logrotate/logrotate.status\fR. + + .TP + \fB-\-usage\fR +@@ -473,7 +473,7 @@ + .SH FILES + .PD 0 + .TP 27 +-\fI/var/lib/logrotate.status\fR ++\fI/var/state/logrotate/logrotate.status\fR + Default state file. + .TP 27 + \fI/etc/logrotate.conf\fR |