From b5f4c940227b9a7051c381688636d59f67864f93 Mon Sep 17 00:00:00 2001 From: root Date: Fri, 17 May 2013 01:53:16 -0700 Subject: Fri May 17 01:52:35 PDT 2013 --- core/logrotate/PKGBUILD | 8 +++++--- core/logrotate/logrotate.cron.daily | 10 +++++----- 2 files changed, 10 insertions(+), 8 deletions(-) (limited to 'core/logrotate') diff --git a/core/logrotate/PKGBUILD b/core/logrotate/PKGBUILD index f010b1da0..f2760dfb8 100644 --- a/core/logrotate/PKGBUILD +++ b/core/logrotate/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 184326 2013-05-06 09:32:38Z pierre $ +# $Id: PKGBUILD 185626 2013-05-16 13:54:50Z pierre $ # Maintainer: Pierre Schmitz pkgname=logrotate pkgver=3.8.4 -pkgrel=1 +pkgrel=2 pkgdesc="Rotates system logs automatically" arch=('i686' 'x86_64') url="https://fedorahosted.org/logrotate/" @@ -21,7 +21,7 @@ md5sums=('7be7f1eabea33a1d0483438a6e33d634' 'cd76976b5ce37d328b452c806b55a015' 'e76526bcd6fc33c9d921e1cb1eff1ffb' '86209d257c8b8bc0ae34d6f6ef057c0f' - 'aa8ac8283908b6114483a293adcb650f') + '3909380f8a55fa160f62ed976a8bef4b') build() { cd "$srcdir/${pkgname}-${pkgver}" @@ -40,7 +40,9 @@ check() { package() { cd "$srcdir/${pkgname}-${pkgver}" make PREFIX="$pkgdir" MANDIR="/usr/share/man" install + mv ${pkgdir}/usr/sbin ${pkgdir}/usr/bin + install -dm755 "$pkgdir/etc/logrotate.d" install -Dm644 "$srcdir/logrotate.conf" "$pkgdir/etc/logrotate.conf" install -Dm744 "$srcdir/logrotate.cron.daily" "$pkgdir/etc/cron.daily/logrotate" } diff --git a/core/logrotate/logrotate.cron.daily b/core/logrotate/logrotate.cron.daily index ee0eeeb48..37d9e534c 100755 --- a/core/logrotate/logrotate.cron.daily +++ b/core/logrotate/logrotate.cron.daily @@ -9,16 +9,16 @@ IONICE_CLASS=2 # 0-7 (for IONICE_CLASS 1 and 2 only), 0=highest, 7=lowest IONICE_PRIORITY=7 -CMD_LOGROTATE="/usr/sbin/logrotate /etc/logrotate.conf" - +CMD_LOGROTATE="/usr/bin/logrotate /etc/logrotate.conf" + if [ -x /usr/bin/nice ]; then CMD_LOGROTATE="/usr/bin/nice -n ${NICE:-19} ${CMD_LOGROTATE}" fi - + if [ -x /usr/bin/ionice ]; then CMD_LOGROTATE="/usr/bin/ionice -c ${IONICE_CLASS:-2} -n ${IONICE_PRIORITY:-7} ${CMD_LOGROTATE}" fi - + ${CMD_LOGROTATE} - + exit 0 -- cgit v1.2.3-54-g00ecf