[arch-commits] CVS update of core/base/logrotate (PKGBUILD logrotate.conf)

[Aaron Griffin]

    Date: Tuesday, January 8, 2008 @ 01:41:25
  Author: aaron
    Path: /home/cvs-core/core/base/logrotate

Modified: PKGBUILD (1.18 -> 1.19) logrotate.conf (1.2 -> 1.3)

upgpkg: logrotate 3.7.5-1
    Version bump to 3.7.5
FS#6911 - Remove mailx as a dependency
FS#5855 - Simple update via CVS based url
FS#8264 - Ignore pacnew/pacsave files spit out in the include dir


----------------+
 PKGBUILD       |   32 ++++++++++++++++++++++----------
 logrotate.conf |    5 +++--
 2 files changed, 25 insertions(+), 12 deletions(-)


Index: core/base/logrotate/PKGBUILD
diff -u core/base/logrotate/PKGBUILD:1.18 core/base/logrotate/PKGBUILD:1.19
--- core/base/logrotate/PKGBUILD:1.18	Thu Nov 15 19:02:34 2007
+++ core/base/logrotate/PKGBUILD	Tue Jan  8 01:41:25 2008
@@ -1,23 +1,35 @@
-# $Id: PKGBUILD,v 1.18 2007/11/16 00:02:34 daniel Exp $
-# Maintainer: judd <jvinet at zeroflux.org>
-# Committer: Judd Vinet <jvinet at zeroflux.org>
+# $Id: PKGBUILD,v 1.19 2008/01/08 06:41:25 aaron Exp $
+# Maintainer: Aaron Griffin <aaron at archlinux.org>
+# Contributor: Judd Vinet <jvinet at zeroflux.org>
+
 pkgname=logrotate
-pkgver=3.7.1
-pkgrel=5
+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' 'mailx')
+depends=('popt' 'cron' 'gzip')
 backup=('etc/logrotate.conf')
-source=(ftp://ftp.archlinux.org/other/${pkgname}/${pkgname}-${pkgver}.tar.gz logrotate.conf logrotate.cron.daily)
-md5sums=('552639142e163745f6bcd4f1f3816d8a' '4a06c3f73d290f25630b11a796fa8270'\
+
+# The source is apparently a CVS checkout only. Create the tarball like so:
+# cvs -d :pserver:anonymous at rhlinux.redhat.com:/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() {
-  rm -rf ${startdir}/pkg/*
   cd $startdir/src/${pkgname}-${pkgver}
-  make clean || return 1
+
+  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
Index: core/base/logrotate/logrotate.conf
diff -u core/base/logrotate/logrotate.conf:1.2 core/base/logrotate/logrotate.conf:1.3
--- core/base/logrotate/logrotate.conf:1.2	Tue Jan  8 01:12:45 2008
+++ core/base/logrotate/logrotate.conf	Tue Jan  8 01:41:25 2008
@@ -14,11 +14,12 @@
 # Logs are moved into directory for rotation
 # olddir /var/log/archive
 
-# Arch packages drop log rotation information into this directory
-include /etc/logrotate.d
 # 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