From 279a2616337febe144336f8e1129449a225fcde4 Mon Sep 17 00:00:00 2001 From: Jose V Beneyto Date: Fri, 29 Jan 2010 09:00:08 +0100 Subject: [PATCH] dcron: updated to 4.4 --- dcron/.footprint | 7 +++--- dcron/.md5sum | 7 +++--- dcron/Pkgfile | 19 +++++++-------- dcron/crond | 2 +- dcron/crontab | 10 ++++---- dcron/dcron-3.2.patch | 54 ------------------------------------------- dcron/runjobs | 0 7 files changed, 22 insertions(+), 77 deletions(-) mode change 100755 => 100644 dcron/crond delete mode 100644 dcron/dcron-3.2.patch mode change 100755 => 100644 dcron/runjobs diff --git a/dcron/.footprint b/dcron/.footprint index f935ab1..b5f567d 100644 --- a/dcron/.footprint +++ b/dcron/.footprint @@ -10,19 +10,20 @@ drwxr-xr-x root/root etc/rc.d/ -rwxr-xr-x root/root etc/rc.d/crond drwxr-xr-x root/root usr/ drwxr-xr-x root/root usr/bin/ --rwsr-xr-x root/root usr/bin/crontab +-rwsr-x--- root/users usr/bin/crontab drwxr-xr-x root/root usr/man/ drwxr-xr-x root/root usr/man/man1/ -rw-r--r-- root/root usr/man/man1/crontab.1.gz drwxr-xr-x root/root usr/man/man8/ -rw-r--r-- root/root usr/man/man8/crond.8.gz drwxr-xr-x root/root usr/sbin/ --rwxr-xr-x root/root usr/sbin/crond +-rwx------ root/root usr/sbin/crond -rwxr-xr-x root/root usr/sbin/runjobs drwxr-xr-x root/root var/ drwxr-xr-x root/root var/log/ --rw-r--r-- root/root var/log/cron (EMPTY) +-rw-r----- root/root var/log/cron (EMPTY) drwxr-xr-x root/root var/spool/ drwxr-xr-x root/root var/spool/cron/ +drwxr-xr-x root/root var/spool/cron/cronstamps/ drwx------ root/root var/spool/cron/crontabs/ -rw------- root/root var/spool/cron/crontabs/root diff --git a/dcron/.md5sum b/dcron/.md5sum index 5fbddfb..827fc5e 100644 --- a/dcron/.md5sum +++ b/dcron/.md5sum @@ -1,5 +1,4 @@ -1a208f09e660c72f0117185289b2c109 crond -55a87345232a1f52588867b5c0c0fd40 crontab -adf3ad8cb05ea391b9a9169ddcccaba4 dcron-3.2.patch -c2c816deb389b4bfb00761f26afe3efd dcron32.tgz +ad98b4e165a805ffad4396830dfd7e14 crond +3596a4fa9cf63bdf130fd533ca7703d4 crontab +02d848ba043a9df5bf2102a9f4bc04bd dcron-4.4.tar.gz d80b27b1b9532890136c14d30e2a0d2b runjobs diff --git a/dcron/Pkgfile b/dcron/Pkgfile index 2d059fb..ab9c4d0 100644 --- a/dcron/Pkgfile +++ b/dcron/Pkgfile @@ -5,17 +5,16 @@ # Depends on: name=dcron -version=3.2 -release=2 -source=(http://apollo.backplane.com/FreeSrc/dcron32.tgz \ - crontab runjobs crond $name-$version.patch) +version=4.4 +release=1 +source=(http://www.jimpryor.net/linux/releases/$name-$version.tar.gz \ + crontab runjobs crond) build() { - cd $name - patch -p1 -i $SRC/$name-$version.patch + cd $name-$version - make CC=$CC - make DESTDIR=$PKG install + make CC=$CC PREFIX=/usr + make DESTDIR=$PKG MANDIR=/usr/man CRONTAB_GROUP=users install install -d $PKG/var/{spool/cron,log} install -d $PKG/etc/{cron.d,cron/{hourly,daily,weekly,monthly}} @@ -23,9 +22,11 @@ build() { install -m 600 $SRC/crontab $PKG/var/spool/cron/crontabs/root ln -s ../var/spool/cron/crontabs/root $PKG/etc/crontab - install -D -m 755 $SRC/crond $PKG/etc/rc.d/crond install -D -m 755 $SRC/runjobs $PKG/usr/sbin/runjobs + install -d $PKG/etc/cron/{hourly,daily,weekly,monthly} + install -d $PKG/var/log touch $PKG/var/log/cron + chmod 0640 $PKG/var/log/cron } diff --git a/dcron/crond b/dcron/crond old mode 100755 new mode 100644 index 8790e32..656b892 --- a/dcron/crond +++ b/dcron/crond @@ -5,7 +5,7 @@ case $1 in start) - /usr/sbin/crond >> /var/log/cron 2>&1 + /usr/sbin/crond -l info -L /var/log/cron ;; stop) killall -q /usr/sbin/crond diff --git a/dcron/crontab b/dcron/crontab index d2ea4f4..6cf0d18 100644 --- a/dcron/crontab +++ b/dcron/crontab @@ -1,12 +1,10 @@ # # /etc/crontab: crond(8) configuration # -# The format of this file: -# Min Hour Day Month DayOfWeek Command -00 20 * * * /usr/sbin/runjobs /etc/cron/daily -05 20 * * mon /usr/sbin/runjobs /etc/cron/weekly -10 20 1 * * /usr/sbin/runjobs /etc/cron/monthly -15 * * * * /usr/sbin/runjobs /etc/cron/hourly +@hourly ID=sys.hourly /usr/sbin/runjobs /etc/cron/hourly +@daily ID=sys.daily /usr/sbin/runjobs /etc/cron/daily +@weekly ID=sys.weekly /usr/sbin/runjobs /etc/cron/weekly +@monthly ID=sys.monthly /usr/sbin/runjobs /etc/cron/monthly # End of file diff --git a/dcron/dcron-3.2.patch b/dcron/dcron-3.2.patch deleted file mode 100644 index 9e2719f..0000000 --- a/dcron/dcron-3.2.patch +++ /dev/null @@ -1,54 +0,0 @@ -diff -Nru dcron.orig/Makefile dcron/Makefile ---- dcron.orig/Makefile 2008-09-24 10:10:19.000000000 +0200 -+++ dcron/Makefile 2008-09-24 14:48:17.000000000 +0200 -@@ -3,7 +3,7 @@ - - DESTDIR ?= /usr/local - CC = gcc --CFLAGS = -O2 -Wall -Wstrict-prototypes -+CFLAGS += -Wall -Wstrict-prototypes -D_GNU_SOURCE -DSENDMAIL="\"/usr/sbin/sendmail\"" - LIB = - SRCS = main.c subs.c database.c job.c - OBJS = main.o subs.o database.o job.o -@@ -15,12 +15,10 @@ - all: ${PROTOS} crond crontab - - crond: ${OBJS} -- ${CC} ${CFLAGS} -o crond ${OBJS} ${LIB} -- strip crond -+ ${CC} ${CFLAGS} -o crond ${OBJS} ${LIB} ${LDFLAGS} - - crontab: ${D_OBJS} -- ${CC} ${CFLAGS} -o crontab ${D_OBJS} -- strip crontab -+ ${CC} ${CFLAGS} -o crontab ${D_OBJS} ${LDFLAGS} - - protos.h: ${SRCS} ${D_SRCS} - fgrep -h Prototype ${SRCS} ${D_SRCS} >protos.h -@@ -32,10 +30,10 @@ - rm -f *.o dcron.tgz ${PROTOS} - - install: -- install -o root -g wheel -m 0755 crond ${DESTDIR}/sbin/crond -- install -o root -g wheel -m 4755 crontab ${DESTDIR}/bin/crontab -- install -o root -g wheel -m 0644 crontab.1 ${DESTDIR}/man/man1/crontab.1 -- install -o root -g wheel -m 0644 crond.8 ${DESTDIR}/man/man8/crond.8 -+ install -o root -g root -m 0755 -D crond $(DESTDIR)/usr/sbin/crond -+ install -o root -g root -m 4755 -D crontab $(DESTDIR)/usr/bin/crontab -+ install -o root -g root -m 0644 -D crontab.1 $(DESTDIR)/usr/man/man1/crontab.1 -+ install -o root -g root -m 0644 -D crond.8 $(DESTDIR)/usr/man/man8/crond.8 - - # dillon-specific - # -diff -Nru dcron.orig/subs.c dcron/subs.c ---- dcron.orig/subs.c 2008-09-24 10:10:19.000000000 +0200 -+++ dcron/subs.c 2008-09-24 14:44:30.000000000 +0200 -@@ -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)); - } diff --git a/dcron/runjobs b/dcron/runjobs old mode 100755 new mode 100644 -- 2.26.2