[arch-commits] Commit in cronie/trunk (PKGBUILD conf.d crontab rc.d run-cron)

[Gaetan Bisson]

    Date: Tuesday, April 26, 2011 @ 21:06:09
  Author: bisson
Revision: 120885

packaging improvements: use vanilla conf files, use anacron, use run-parts

Modified:
  cronie/trunk/PKGBUILD
  cronie/trunk/rc.d
Deleted:
  cronie/trunk/conf.d
  cronie/trunk/crontab
  cronie/trunk/run-cron

----------+
 PKGBUILD |   26 ++++++++++++--------------
 conf.d   |    1 -
 crontab  |   10 ----------
 rc.d     |    2 +-
 run-cron |   19 -------------------
 5 files changed, 13 insertions(+), 45 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2011-04-26 22:09:45 UTC (rev 120884)
+++ PKGBUILD	2011-04-27 01:06:09 UTC (rev 120885)
@@ -3,27 +3,24 @@
 
 pkgname='cronie'
 pkgver=1.4.7
-pkgrel=4
+pkgrel=5
 pkgdesc='Daemon that runs specified programs at scheduled times and related tools'
 url='https://fedorahosted.org/cronie/'
 license=('custom:BSD')
 arch=('i686' 'x86_64')
-depends=('pam')
+depends=('pam' 'bash' 'run-parts')
 
 source=("https://fedorahosted.org/releases/c/r/${pkgname}/${pkgname}-${pkgver}.tar.gz"
-        'crontab'
-        'conf.d'
         'pam.d'
-        'rc.d'
-        'run-cron')
+        'rc.d')
 sha1sums=('c6644ba0e58bcb14e0bb3f925e3e8cc3f0d47a7f'
-          'c2aae6a8f2634af8c751c6a3a9507ba02403569d'
-          '69d1e76af4efa5dddb10170008a8f51f5c9486e9'
           '6d8aef6880935b3dcc3e28481111d036544eeae5'
-          '4d6f14eae01154b6997926fa0eb5c1673a3f3321'
-          '53e732ca5748766f33dac09a9e0653f3d069f78e')
+          'c08c040ed5cb12bc4fd15639a5242d31ec247ef5')
 
-backup=(etc/{crontab,cron.deny,{conf.d,pam.d}/crond})
+backup=('etc/anacrontab'
+        'etc/conf.d/crond'
+        'etc/pam.d/crond'
+        'etc/cron.deny')
 
 conflicts=('dcron')
 replaces=('dcron')
@@ -54,10 +51,11 @@
 	chmod u+s "${pkgdir}"/usr/bin/crontab
 
 	install -Dm755 ../rc.d "${pkgdir}"/etc/rc.d/crond
-	install -Dm755 ../run-cron "${pkgdir}"/usr/bin/run-cron
-	install -Dm644 ../conf.d "${pkgdir}"/etc/conf.d/crond
 	install -Dm644 ../pam.d "${pkgdir}"/etc/pam.d/crond
-	install -Dm644 ../crontab "${pkgdir}"/etc/crontab
+	install -Dm644 crond.sysconfig "${pkgdir}"/etc/conf.d/crond
+	install -Dm644 contrib/0hourly "${pkgdir}"/etc/cron.d/0hourly
+	install -Dm755 contrib/0anacron "${pkgdir}"/etc/cron.hourly/0anacron
+	install -Dm644 contrib/anacrontab "${pkgdir}"/etc/anacrontab
 	touch "${pkgdir}"/etc/cron.deny
 
 	install -Dm644 COPYING "${pkgdir}"/usr/share/licenses/cronie/COPYING

Deleted: conf.d
===================================================================
--- conf.d	2011-04-26 22:09:45 UTC (rev 120884)
+++ conf.d	2011-04-27 01:06:09 UTC (rev 120885)
@@ -1 +0,0 @@
-CROND_ARGS=""

Deleted: crontab
===================================================================
--- crontab	2011-04-26 22:09:45 UTC (rev 120884)
+++ crontab	2011-04-27 01:06:09 UTC (rev 120885)
@@ -1,10 +0,0 @@
-PATH=/sbin:/bin:/usr/sbin:/usr/bin
-SHELL=/bin/bash
-HOME=/var/empty
-
-# Minute Hour Date Month Wday User Command
-
-11  *  *  *  *  root  run-cron /etc/cron.hourly
-21  4  *  *  *  root  run-cron /etc/cron.daily
-41  4  *  *  0  root  run-cron /etc/cron.weekly
-51  4  1  *  *  root  run-cron /etc/cron.monthly

Modified: rc.d
===================================================================
--- rc.d	2011-04-26 22:09:45 UTC (rev 120884)
+++ rc.d	2011-04-27 01:06:09 UTC (rev 120885)
@@ -10,7 +10,7 @@
 case "$1" in
 start)
 	stat_busy "Starting $name daemon"
-	[[ -z "$PID" ]] && /usr/sbin/crond $CROND_ARGS &>/dev/null \
+	[[ -z "$PID" ]] && /usr/sbin/crond $CRONDARGS &>/dev/null \
 	&& { add_daemon $name; stat_done; } \
 	|| { stat_fail; exit 1; }
 	;;

Deleted: run-cron
===================================================================
--- run-cron	2011-04-26 22:09:45 UTC (rev 120884)
+++ run-cron	2011-04-27 01:06:09 UTC (rev 120885)
@@ -1,19 +0,0 @@
-#!/bin/bash
-
-set +e
-
-[[ $# -lt 1 ]] && { echo "Usage: $0 <dir>"; exit 1; }
-
-[[ ! -d $1 ]] && { echo "Not a directory: $1"; exit 1; }
-
-for i in $1/*[^~,] ; do
-	[[ $i = *.pacorig ]] && continue
-	[[ $i = *.pacsave ]] && continue
-	[[ $i = *.pacnew ]] && continue
-	[[ $i = *.swp ]] && continue
-	[[ $i = *,v ]] && continue
-	[[ -d $i ]] && continue
-	[[ -x $i ]] && $i 2>&1 | awk "(NR==1) {print \"$i:\n\"} {print}"
-done
-
-exit 0