summaryrefslogtreecommitdiffstats
path: root/source/a/dcron
diff options
context:
space:
mode:
author Patrick J Volkerding <volkerdi@slackware.com>2012-09-26 01:10:42 +0000
committer Eric Hameleers <alien@slackware.com>2018-05-31 22:51:55 +0200
commit9664bee729d487bcc0a0bc35859f8e13d5421c75 (patch)
treeb428a16618e36ed864a8d76ea3435e19a452bf90 /source/a/dcron
parent75a4a592e5ccda30715f93563d741b83e0dcf39e (diff)
downloadcurrent-9664bee729d487bcc0a0bc35859f8e13d5421c75.tar.gz
current-9664bee729d487bcc0a0bc35859f8e13d5421c75.tar.xz
Slackware 14.0slackware-14.0
Wed Sep 26 01:10:42 UTC 2012 Slackware 14.0 x86_64 stable is released! We're perfectionists here at Slackware, so this release has been a long time a-brewing. But we think you'll agree that it was worth the wait. Slackware 14.0 combines modern components, ease of use, and flexible configuration... our "KISS" philosophy demands it. The ISOs are off to be replicated, a 6 CD-ROM 32-bit set and a dual-sided 32-bit/64-bit x86/x86_64 DVD. Please consider supporting the Slackware project by picking up a copy from store.slackware.com. We're taking pre-orders now, and offer a discount if you sign up for a subscription. Thanks to everyone who helped make this happen. The Slackware team, the upstream developers, and (of course) the awesome Slackware user community. Have fun! :-)
Diffstat (limited to 'source/a/dcron')
-rw-r--r--source/a/dcron/crontab.c.O_EXCL.diff5
-rw-r--r--source/a/dcron/crontab.root4
-rwxr-xr-xsource/a/dcron/dcron.SlackBuild9
-rw-r--r--source/a/dcron/dcron.manpage.paths.diff65
-rw-r--r--source/a/dcron/defs.h.TMPDIR.diff5
-rw-r--r--source/a/dcron/run-parts5
6 files changed, 12 insertions, 81 deletions
diff --git a/source/a/dcron/crontab.c.O_EXCL.diff b/source/a/dcron/crontab.c.O_EXCL.diff
index 7acd5ce29..f705487ec 100644
--- a/source/a/dcron/crontab.c.O_EXCL.diff
+++ b/source/a/dcron/crontab.c.O_EXCL.diff
@@ -1,5 +1,6 @@
---- ./crontab.c.orig 2010-01-18 09:27:31.000000000 -0600
-+++ ./crontab.c 2010-02-11 16:38:03.000000000 -0600
+diff -Nur dcron-4.5.orig//crontab.c dcron-4.5/crontab.c
+--- dcron-4.5.orig//crontab.c 2011-05-01 07:22:09.000000000 -0500
++++ dcron-4.5/crontab.c 2011-08-22 16:26:46.778225447 -0500
@@ -199,7 +199,7 @@
* Read from repFd, write to fd for "$CDir/$USER.new"
*/
diff --git a/source/a/dcron/crontab.root b/source/a/dcron/crontab.root
index b5b425628..5b0ce8cbf 100644
--- a/source/a/dcron/crontab.root
+++ b/source/a/dcron/crontab.root
@@ -1,7 +1,7 @@
# If you don't want the output of a cron job mailed to you, you have to direct
# any output to /dev/null. We'll do this here since these jobs should run
-# properly on a newly installed system, but if they don't the average newbie
-# might get quite perplexed about getting strange mail every 5 minutes. :^)
+# properly on a newly installed system. If a script fails, run-parts will
+# mail a notice to root.
#
# Run the hourly, daily, weekly, and monthly cron jobs.
# Jobs that need different timing may be entered into the crontab as before,
diff --git a/source/a/dcron/dcron.SlackBuild b/source/a/dcron/dcron.SlackBuild
index f67f869ff..243c0cc80 100755
--- a/source/a/dcron/dcron.SlackBuild
+++ b/source/a/dcron/dcron.SlackBuild
@@ -1,6 +1,6 @@
#!/bin/sh
-# Copyright 2009, 2010 Patrick J. Volkerding, Sebeka, MN, USA
+# Copyright 2009, 2010, 2012 Patrick J. Volkerding, Sebeka, MN, USA
# All rights reserved.
#
# Redistribution and use of this script, with or without modification, is
@@ -21,7 +21,7 @@
# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
VERSION=${VERSION:-$(echo dcron-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
-BUILD=${BUILD:-1}
+BUILD=${BUILD:-4}
# Automatically determine the architecture we're building on:
if [ -z "$ARCH" ]; then
@@ -70,10 +70,7 @@ zcat $CWD/defs.h.TMPDIR.diff.gz | patch -p1 || exit 1
# using 'crontab -', exits with control-c, and then crontab refuses to
# overwrite the junk file. It would be better if dcron would wipe
# the junk file in the event it were not closed correctly, but oh well.
-zcat $CWD/patches/crontab.c.O_EXCL.diff.gz | patch -p1 || exit 1
-
-# Get the directory names under /var/spool/ right in the manpages:
-zcat $CWD/dcron.manpage.paths.diff.gz | patch -p1 --verbose || exit 1
+zcat $CWD/crontab.c.O_EXCL.diff.gz | patch -p1 || exit 1
CFLAGS+="$SLKCFLAGS" make || exit 1
strip --strip-unneeded crond crontab
diff --git a/source/a/dcron/dcron.manpage.paths.diff b/source/a/dcron/dcron.manpage.paths.diff
deleted file mode 100644
index afd9c3d16..000000000
--- a/source/a/dcron/dcron.manpage.paths.diff
+++ /dev/null
@@ -1,65 +0,0 @@
---- ./crond.8.orig 2010-01-18 09:29:25.000000000 -0600
-+++ ./crond.8 2010-02-11 17:22:36.000000000 -0600
-@@ -17,13 +17,13 @@
- .RE
- .TP
- .B -c dir
--directory of per-user crontabs (defaults to /var/spool/cron)
-+directory of per-user crontabs (defaults to /var/spool/cron/crontabs)
- .RS
- .RE
- .TP
- .B -t dir
- directory of timestamps for \@freq and FREQ=\&... jobs (defaults to
--/var/spool/cronstamps)
-+/var/spool/cron/cronstamps)
- .RS
- .RE
- .TP
-@@ -172,7 +172,7 @@
- \f[B]crontab\f[] notifies \f[B]crond\f[] that a user's crontab file
- has been modified (or created or deleted) through the
- \[lq]cron.update\[rq] file, which resides in the per-user crontabs
--directory (usually /var/spool/cron).
-+directory (usually /var/spool/cron/crontabs).
- \f[B]crontab\f[] appends the filename of the modified crontab file
- to \[lq]cron.update\[rq]; and \f[B]crond\f[] inspects this file to
- determine when to reparse or otherwise update its internal list of
-@@ -180,7 +180,7 @@
- .PP
- Whenever a \[lq]cron.update\[rq] file is seen, \f[B]crond\f[] also
- re-reads timestamp files from its timestamp directory (usually
--/var/spool/cronstamps).
-+/var/spool/cron/cronstamps).
- Normally these will just mirror \f[B]crond\f[]'s own internal
- representations, but this mechanism could be used to manually
- notify \f[B]crond\f[] that you've externally updated the
-@@ -210,7 +210,7 @@
- crontab to /etc/cron.d/foo.
- .PP
- The superuser has a per-user crontab along with other users.
--It usually resides at /var/spool/cron/root.
-+It usually resides at /var/spool/cron/crontabs/root.
- .PP
- Users can only have a crontab if they have an entry in /etc/passwd;
- however they do not need to have login shell privileges.
---- ./crontab.1.orig 2010-01-18 09:29:25.000000000 -0600
-+++ ./crontab.1 2010-02-11 17:23:13.000000000 -0600
-@@ -45,7 +45,7 @@
- different user and/or crontab directory.
- .PP
- The superuser also has his or her own per-user crontab, saved as
--/var/spool/cron/root.
-+/var/spool/cron/crontabs/root.
- .PP
- Unlike other cron daemons, this crond/crontab package doesn't try
- to do everything under the sun.
-@@ -117,7 +117,7 @@
- The formats \@hourly, \@daily, \@weekly, \@monthly, and \@yearly
- need to update timestamp files when their jobs have been run.
- The timestamp files are saved as
--/var/spool/cronstamps/user.jobname.
-+/var/spool/cron/cronstamps/user.jobname.
- So for all of these formats, the cron command needs a jobname,
- given by prefixing the command with \f[B]ID=jobname\f[].
- (This syntax was chosen to maximize the chance that our crontab
diff --git a/source/a/dcron/defs.h.TMPDIR.diff b/source/a/dcron/defs.h.TMPDIR.diff
index 6263843b2..698f4ebc0 100644
--- a/source/a/dcron/defs.h.TMPDIR.diff
+++ b/source/a/dcron/defs.h.TMPDIR.diff
@@ -1,5 +1,6 @@
---- ./defs.h.orig 2010-01-15 20:17:04.000000000 -0600
-+++ ./defs.h 2010-02-11 16:39:33.000000000 -0600
+diff -Nur dcron-4.5.orig//defs.h dcron-4.5/defs.h
+--- dcron-4.5.orig//defs.h 2011-05-01 07:22:09.000000000 -0500
++++ dcron-4.5/defs.h 2011-08-22 16:28:35.343956248 -0500
@@ -73,7 +73,7 @@
#define CRONUPDATE "cron.update"
#endif
diff --git a/source/a/dcron/run-parts b/source/a/dcron/run-parts
index 247d8c6e1..65c778f36 100644
--- a/source/a/dcron/run-parts
+++ b/source/a/dcron/run-parts
@@ -39,10 +39,7 @@ for SCRIPT in $1/* ; do
fi
# If we've made it this far, then run the script if it's executable:
if [ -x $SCRIPT ]; then
- echo "$SCRIPT:"
- echo
- $SCRIPT 2>&1
- echo
+ $SCRIPT || echo "$SCRIPT failed."
fi
done