Date: Tuesday, May 14, 2013 @ 02:23:55 Author: seblu Revision: 90795 upgpkg: fcron 3.1.2-3
Modified: fcron/trunk/PKGBUILD fcron/trunk/run-cron ----------+ PKGBUILD | 59 ++++++++++++++++++++++++++--------------------------------- run-cron | 10 +++++----- 2 files changed, 31 insertions(+), 38 deletions(-) Modified: PKGBUILD =================================================================== --- PKGBUILD 2013-05-14 00:21:11 UTC (rev 90794) +++ PKGBUILD 2013-05-14 00:23:55 UTC (rev 90795) @@ -2,61 +2,66 @@ # Contributor: Giorgio Lando <lando at imap dot cc> # Contributor: Sergej Pupykin # Contributor: Thomas Bächler +# Contributor: Sébastien Luttringer # Maintainer: Thorsten Töpper <atsutane...@freethoughts.de> pkgname=fcron pkgver=3.1.2 -pkgrel=2 +pkgrel=3 pkgdesc='Feature-rich cron implementation' arch=(i686 x86_64) -url="http://fcron.free.fr"; +url='http://fcron.free.fr' license=('GPL') depends=('pam') makedepends=('smtp-server' 'vi') -optdepends=('smtp-server: to receive mails from cron jobs') +optdepends=('smtp-server: to receive mails from cron jobs' + 'vi: default editor for fcrontab') provides=('cron') conflicts=('dcron') -backup=(etc/fcron/fcron.conf etc/fcron/fcron.allow etc/fcron/fcron.deny \ - var/spool/fcron/systab var/spool/fcron/systab.orig) +backup=('etc/fcron/fcron.conf' + 'etc/fcron/fcron.allow' + 'etc/fcron/fcron.deny' + 'var/spool/fcron/systab' + 'var/spool/fcron/systab.orig') options=('emptydirs' '!makeflags') -source=(http://fcron.free.fr/archives/$pkgname-$pkgver.src.tar.gz \ - systab systab.orig run-cron) +source=("http://fcron.free.fr/archives/$pkgname-$pkgver.src.tar.gz"; + 'systab' + 'systab.orig' + 'run-cron') md5sums=('36bf213e15f3a480f2274f8e46cced0a' '938722c6654ef7b07f4aa10001905ba1' 'bfb7daa22ebe22b9917e455c1ca4a382' - '5ff0cdcb9ec99778938ac6ef26800327') + '524eba827447a6b7ef7515eedf305698') build() { - cd "$srcdir/$pkgname-$pkgver" + cd $pkgname-$pkgver ./configure --prefix=/usr \ + --sbindir=/usr/bin \ --sysconfdir=/etc/fcron \ --with-answer-all=no \ --with-boot-install=no \ --with-username=root \ --with-groupname=root \ --datarootdir=/usr/share \ - --datadir=/usr/share \ + --datadir=/usr/share \ --with-docdir=/usr/share/doc \ --localstatedir=/var \ --with-systemdsystemunitdir=/usr/lib/systemd/system \ --with-piddir=/run \ - --with-editor=/usr/bin/vi \ + --with-editor=/usr/bin/vi \ --with-sendmail=/usr/sbin/sendmail make - - # Temporary bugfix make install expects the file in the files directory. - # cp script/fcron.init.systemd files } package() { - cd "$srcdir/$pkgname-$pkgver" - + cd $pkgname-$pkgver + make DESTDIR="$pkgdir/" install install -D -m644 "$srcdir/$pkgname-$pkgver/files/fcron.pam" "$pkgdir/etc/pam.d/fcron" - + install -D -m644 "$srcdir/$pkgname-$pkgver/files/fcrontab.pam" "$pkgdir/etc/pam.d/fcrontab" # Install default fcrontab so that fcron can completely replace dcron - + install -D -m644 "$srcdir/systab" "$pkgdir/var/spool/fcron/systab" # In order to preserve the systab crontab in any case it is better to have # it in non-binary form too @@ -67,30 +72,18 @@ install -d -m755 "$pkgdir/etc/cron.hourly" install -d -m755 "$pkgdir/etc/cron.monthly" install -d -m755 "$pkgdir/etc/cron.weekly" - - # Make files readable for all users - #35088 - chmod 644 "$pkgdir/etc/fcron/fcron.allow" - chmod 644 "$pkgdir/etc/fcron/fcron.conf" - chmod 644 "$pkgdir/etc/fcron/fcron.deny" - chmod 755 "$pkgdir/usr/bin/fcrondyn" - chmod 755 "$pkgdir/usr/bin/fcronsighup" - chmod 755 "$pkgdir/usr/bin/fcrontab" - chmod 755 "$pkgdir/usr/sbin/fcron" - chmod 755 "$pkgdir/var/spool/fcron" - # Install run-cron script to make fcron run without dcron - install -D -m755 "$srcdir/run-cron" "$pkgdir/usr/sbin/run-cron" + install -D -m755 "$srcdir/run-cron" "$pkgdir/usr/bin/run-cron" # avoid conflict with filesystem>=2012.06 - rmdir "$pkgdir/var/run" || true - rmdir "$pkgdir/run" || true + rmdir "$pkgdir"/{var/,}run # avoid conflict with libbsd - #31259 rm "$pkgdir/usr/share/man/man3/bitstring.3" \ "$pkgdir/usr/share/man/fr/man3/bitstring.3" rmdir --ignore-fail-on-non-empty "$pkgdir/usr/share/man/man3" \ - "$pkgdir/usr/share/man/fr/man3" || true + "$pkgdir/usr/share/man/fr/man3" } # vim:set ts=2 sw=2 et: Modified: run-cron =================================================================== --- run-cron 2013-05-14 00:21:11 UTC (rev 90794) +++ run-cron 2013-05-14 00:23:55 UTC (rev 90795) @@ -1,14 +1,14 @@ -#!/bin/sh +#!/bin/bash -if [ -z $1 ]; then +if [[ -z "$1" ]]; then echo "Usage: $0 crondir" exit 1 fi -for cron in $1/* ; do - if [ -x $cron ]; then - $cron +for cron in "$1"/* ; do + if [[ -x "$cron" ]]; then + "$cron" fi done unset cron
