logrotate PKGBUILD updated

diff --git a/base/logrotate/PKGBUILD b/base/logrotate/PKGBUILD
dissimilarity index 75%
index 421cdbb..86bfb20 100644 (file)
--- a/base/logrotate/PKGBUILD
+++ b/base/logrotate/PKGBUILD
@@ -1,25 +1,37 @@
-# $Id: PKGBUILD,v 1.18 2007/11/16 00:02:34 daniel Exp $
-# Maintainer: judd <[email protected]>
-# Committer: Judd Vinet <[email protected]>
-pkgname=logrotate
-pkgver=3.7.1
-pkgrel=5
-pkgdesc="Rotates system logs automatically"
-arch=(i686 x86_64)
-license=('GPL')
-groups=('base')
-depends=('popt' 'cron' 'mailx')
-backup=('etc/logrotate.conf')
-source=(ftp://ftp.archlinux.org/other/${pkgname}/${pkgname}-${pkgver}.tar.gz logrotate.conf logrotate.cron.daily)
-md5sums=('552639142e163745f6bcd4f1f3816d8a' '4a06c3f73d290f25630b11a796fa8270'\
-         '8e23d5d4cc29b1e055b24df87e355cdc')
-
-build() {
-  rm -rf ${startdir}/pkg/*
-  cd ${startdir}/src/${pkgname}-${pkgver}
-  make clean || return 1
-  make || return 1
-  make PREFIX=${startdir}/pkg install
-  install -D -m644 ../logrotate.conf ${startdir}/pkg/etc/logrotate.conf
-  install -D -m744 ../logrotate.cron.daily ${startdir}/pkg/etc/cron.daily/logrotate
-}
+# $Id: PKGBUILD,v 1.19 2008/01/08 06:41:25 aaron Exp $
+# Maintainer: Aaron Griffin <[email protected]>
+# Contributor: Judd Vinet <[email protected]>
+
+pkgname=logrotate
+pkgver=3.7.5
+pkgrel=1
+pkgdesc="Rotates system logs automatically"
+url='http://rhlinux.redhat.com'
+arch=(i686 x86_64)
+license=('GPL')
+groups=('base')
+depends=('popt' 'cron' 'gzip')
+backup=('etc/logrotate.conf')
+
+# The source is apparently a CVS checkout only. Create the tarball like so:
+# cvs -d :pserver:[email protected]:/usr/local/CVS co logrotate
+# cd logrotate/
+# make create-archive
+# Ensure this tarball is places in other/logrotate/
+
+source=(ftp://ftp.archlinux.org/other/logrotate/${pkgname}-${pkgver}.tar.gz
+        logrotate.conf logrotate.cron.daily)
+md5sums=('a1a3ea2f1d80e67e902c024bbdef616a'
+         'c8b915903825befc401797b7620f249e'
+         '8e23d5d4cc29b1e055b24df87e355cdc')
+
+build() {
+  cd $startdir/src/${pkgname}-${pkgver}
+
+  sed -i 's|#define DEFAULT_MAIL_COMMAND .*|#define DEFAULT_MAIL_COMMAND "/usr/bin/mail"|'\
+    config.h
+  make || return 1
+  make PREFIX=$startdir/pkg install
+  install -D -m644 ../logrotate.conf $startdir/pkg/etc/logrotate.conf
+  install -D -m744 ../logrotate.cron.daily $startdir/pkg/etc/cron.daily/logrotate
+}

diff --git a/base/logrotate/logrotate.conf b/base/logrotate/logrotate.conf
index 46b0cc3..fde947b 100644 (file)
--- a/base/logrotate/logrotate.conf
+++ b/base/logrotate/logrotate.conf
@@ -14,10 +14,12 @@ create
 # Logs are moved into directory for rotation
 # olddir /var/log/archive
 
+# Ignore pacman saved files
+tabooext + .pacorig .pacnew .pacsave
+
 # Arch packages drop log rotation information into this directory
 include /etc/logrotate.d
 
-
 /var/log/wtmp {
     monthly
     create 0664 root root