[arch-commits] Commit in dcron/trunk (7 files)

Paul Mattal paul at archlinux.org
Mon Jan 11 04:02:26 UTC 2010


    Date: Sunday, January 10, 2010 @ 23:02:26
  Author: paul
Revision: 62684

upgpkg: dcron 4.1-1
    upstream update to 4.1; many new features

Modified:
  dcron/trunk/PKGBUILD
Deleted:
  dcron/trunk/crond
  dcron/trunk/crond.logrotate
  dcron/trunk/dcron-3.1.patch
  dcron/trunk/dcron-3.2.patch
  dcron/trunk/root.crontab
  dcron/trunk/run-cron

-----------------+
 PKGBUILD        |   65 +++++++++++++++++++++++-------------------------------
 crond           |   37 ------------------------------
 crond.logrotate |    5 ----
 dcron-3.1.patch |   33 ---------------------------
 dcron-3.2.patch |   12 ---------
 root.crontab    |   12 ---------
 run-cron        |   14 -----------
 7 files changed, 28 insertions(+), 150 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2010-01-10 23:51:31 UTC (rev 62683)
+++ PKGBUILD	2010-01-11 04:02:26 UTC (rev 62684)
@@ -1,45 +1,36 @@
-# $Id$
-# Maintainer: judd <jvinet at zeroflux.org>
+# Maintainer: Paul Mattal <paul.archlinux.org>
+
 pkgname=dcron
-pkgver=3.2
-pkgrel=4
-pkgdesc="Dillon's Cron Daemon"
+pkgver=4.1
+pkgrel=1
+pkgdesc="dillon's lightweight cron daemon"
 arch=(i686 x86_64)
 license=('GPL')
-groups=('base')
-url="http://apollo.backplane.com/FreeSrc/"
-backup=(var/spool/cron/root)
+url="http://www.jimpryor.net/linux/dcron"
+backup=(var/spool/cron/root etc/rc.d/crond etc/logrotate.d/crond)
 depends=('glibc')
 provides=('cron')
-source=(http://apollo.backplane.com/FreeSrc/dcron32.tgz
-        dcron-3.1.patch
-        root.crontab
-        crond
-        crond.logrotate
-        run-cron
-        dcron-3.2.patch)
-md5sums=('c2c816deb389b4bfb00761f26afe3efd'
-         '2f0c3f7497a12c8826c9be3f87843fcd'
-         '7fcc06b13708ebd667711b1fbf62ee6e'
-         'd7edac165ef19ebb9d0089bdc218b53a'
-         'aeabcd5e4924d1a7593c8782d1068c86'
-         '5ff0cdcb9ec99778938ac6ef26800327'
-         '44afe7dc25324baa21bdca37b9842514')
+source=("http://www.jimpryor.net/linux/releases/${pkgname}-${pkgver}.tar.gz")
+md5sums=('07167517b9383972587e20ec23f2dc12')
 
+
 build() {
-  cd $srcdir/dcron
-  patch -Np1 -i ../dcron-3.1.patch || return 1
-  patch -Np1 -i ../dcron-3.2.patch || return 1
-  make || return 1
-  install -D -m4755 crontab $pkgdir/usr/bin/crontab
-  install -D -m755 crond $pkgdir/usr/sbin/crond
-  install -D -m644 crontab.1 $pkgdir/usr/share/man/man1/crontab.1
-  install -D -m644 crond.8 $pkgdir/usr/share/man/man8/crond.8
-  mkdir -p $pkgdir/var/spool/cron $pkgdir/etc/cron.d
-  mkdir -p $pkgdir/etc/{rc.d,cron.hourly,cron.daily,cron.weekly,cron.monthly}
-  install -D -m0600 ../root.crontab $pkgdir/var/spool/cron/root
-  install -D -m755 ../crond $pkgdir/etc/rc.d/crond
-  install -D -m644 ../crond.logrotate $pkgdir/etc/logrotate.d/crond
-  install -D -m755 ../run-cron $pkgdir/usr/sbin/run-cron
-}
+	cd "$srcdir/${pkgname}-${pkgver}"
 
+	make || return 1
+	make DESTDIR="$pkgdir" PREFIX=/usr install || return 1
+
+	# default make install sets root/wheel
+	chgrp root $pkgdir/{etc/cron.d,usr/sbin/crond,var/spool/cron,var/spool/cronstamps}
+	chgrp -R root $pkgdir/usr/share/man
+	# by default, any member of group "users" can edit their own crontab
+	chgrp users $pkgdir/usr/bin/crontab
+	chmod u+s $pkgdir/usr/bin/crontab
+
+	install -d -m755 $pkgdir/etc/cron.{hourly,daily,weekly,monthly} || return 1
+	install -D -m755 extra/crond.rc $pkgdir/etc/rc.d/crond || return 1
+	install -D -m755 extra/run-cron $pkgdir/usr/sbin/run-cron || return 1
+	install -D -m0600 extra/root.crontab $pkgdir/var/spool/cron/root || return 1
+	install -D -m644 extra/crond.logrotate $pkgdir/etc/logrotate.d/crond || return 1
+
+}

Deleted: crond
===================================================================
--- crond	2010-01-10 23:51:31 UTC (rev 62683)
+++ crond	2010-01-11 04:02:26 UTC (rev 62684)
@@ -1,37 +0,0 @@
-#!/bin/bash
-
-. /etc/rc.conf
-. /etc/rc.d/functions
-
-PID=`pidof -o %PPID /usr/sbin/crond`
-case "$1" in
-  start)
-    stat_busy "Starting Cron Daemon"
-    [ -z "$PID" ] && /usr/sbin/crond >>/var/log/crond 2>&1
-    if [ $? -gt 0 ]; then
-      stat_fail
-    else
-      PID=`pidof -o %PPID /usr/sbin/crond`
-      echo $PID >/var/run/crond.pid
-      add_daemon crond
-      stat_done
-    fi
-    ;;
-  stop)
-    stat_busy "Stopping Cron Daemon"
-    [ ! -z "$PID" ]  && kill $PID &>/dev/null
-    if [ $? -gt 0 ]; then
-      stat_fail
-    else
-      rm_daemon crond
-      stat_done
-    fi
-    ;;
-  restart)
-    $0 stop
-    $0 start
-    ;;
-  *)
-    echo "usage: $0 {start|stop|restart}"  
-esac
-exit 0

Deleted: crond.logrotate
===================================================================
--- crond.logrotate	2010-01-10 23:51:31 UTC (rev 62683)
+++ crond.logrotate	2010-01-11 04:02:26 UTC (rev 62684)
@@ -1,5 +0,0 @@
-/var/log/crond {
-   sharedscripts
-   copytruncate
-   missingok
-}

Deleted: dcron-3.1.patch
===================================================================
--- dcron-3.1.patch	2010-01-10 23:51:31 UTC (rev 62683)
+++ dcron-3.1.patch	2010-01-11 04:02:26 UTC (rev 62684)
@@ -1,33 +0,0 @@
-diff -Naur dcron-orig/defs.h dcron/defs.h
---- dcron-orig/defs.h	2006-04-29 10:20:58.000000000 -0700
-+++ dcron/defs.h	2006-05-04 18:40:05.000000000 -0700
-@@ -28,7 +28,7 @@
- #define arysize(ary)	(sizeof(ary)/sizeof((ary)[0]))
- 
- #ifndef CRONTABS
--#define CRONTABS	"/var/spool/cron/crontabs"
-+#define CRONTABS	"/var/spool/cron"
- #endif
- #ifndef SCRONTABS
- #define SCRONTABS	"/etc/cron.d"
-@@ -44,7 +44,7 @@
- #if defined(__DragonFly__)
- #define SENDMAIL	"/usr/sbin/sendmail"
- #else
--#define SENDMAIL	"/usr/lib/sendmail"
-+#define SENDMAIL	"/usr/sbin/sendmail"
- #endif
- #endif
- 
-diff -Naur dcron-orig/subs.c dcron/subs.c
---- dcron-orig/subs.c	2006-04-27 10:29:56.000000000 -0700
-+++ dcron/subs.c	2006-05-04 18:40:19.000000000 -0700
-@@ -79,7 +79,7 @@
- 
-     buf[0] = 0;
-     if (useDate)
--	strftime(buf, 128, "%d-%b-%y %H:%M  ", tp);
-+	strftime(buf, 128, "%d-%b-%Y %H:%M  ", tp);
-     vsnprintf(buf + strlen(buf), nmax, ctl, va);
-     return(strlen(buf));
- }

Deleted: dcron-3.2.patch
===================================================================
--- dcron-3.2.patch	2010-01-10 23:51:31 UTC (rev 62683)
+++ dcron-3.2.patch	2010-01-11 04:02:26 UTC (rev 62684)
@@ -1,12 +0,0 @@
-diff -Naur dcron-orig/job.c dcron/job.c
---- dcron-orig/job.c	2009-04-24 16:35:20.000000000 +0400
-+++ dcron/job.c	2009-04-24 16:35:41.000000000 +0400
-@@ -213,7 +213,7 @@
- 	/*
- 	 * note: 8 is a file descriptor
- 	 */
--	logfd(8, "unable to exec %s %s, user %s, output to sink null", 
-+	logfd(8, "unable to exec %s %s, user %s, output to sink null\n", 
- 	    SENDMAIL,
- 	    SENDMAIL_ARGS,
- 	    file->cf_UserName

Deleted: root.crontab
===================================================================
--- root.crontab	2010-01-10 23:51:31 UTC (rev 62683)
+++ root.crontab	2010-01-11 04:02:26 UTC (rev 62684)
@@ -1,12 +0,0 @@
-#
-# DO NOT EDIT THIS FILE MANUALLY!! USE crontab -e INSTEAD.
-#
-
-# <minute> <hour> <day> <month> <dow> <command>
-
-
-01 * * * *  /usr/sbin/run-cron /etc/cron.hourly
-02 00 * * * /usr/sbin/run-cron /etc/cron.daily
-22 00 * * 0 /usr/sbin/run-cron /etc/cron.weekly
-42 00 1 * * /usr/sbin/run-cron /etc/cron.monthly
-

Deleted: run-cron
===================================================================
--- run-cron	2010-01-10 23:51:31 UTC (rev 62683)
+++ run-cron	2010-01-11 04:02:26 UTC (rev 62684)
@@ -1,14 +0,0 @@
-#!/bin/sh
-
-
-if [ -z $1 ]; then
-   echo "Usage: $0 crondir"
-   exit 1
-fi
-
-for cron in $1/* ; do
-  if [ -x $cron ]; then
-     $cron
-  fi
-done
-unset cron




More information about the arch-commits mailing list