diff options
Diffstat (limited to 'source/a/dcron')
| -rwxr-xr-x | source/a/dcron/dcron.SlackBuild | 20 | ||||
| -rw-r--r-- | source/a/dcron/dcron.update.during.long.running.jobs.diff | 19 | ||||
| -rw-r--r-- | source/a/dcron/defs.h._DEFAULT_SOURCE.diff | 11 |
3 files changed, 43 insertions, 7 deletions
diff --git a/source/a/dcron/dcron.SlackBuild b/source/a/dcron/dcron.SlackBuild index 243c0cc80..9d5a6d7f3 100755 --- a/source/a/dcron/dcron.SlackBuild +++ b/source/a/dcron/dcron.SlackBuild @@ -1,6 +1,6 @@ #!/bin/sh -# Copyright 2009, 2010, 2012 Patrick J. Volkerding, Sebeka, MN, USA +# Copyright 2009, 2010, 2012, 2016 Patrick J. Volkerding, Sebeka, MN, USA # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -21,12 +21,12 @@ # 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:-4} +BUILD=${BUILD:-5} # Automatically determine the architecture we're building on: if [ -z "$ARCH" ]; then case "$( uname -m )" in - i?86) export ARCH=i486 ;; + i?86) export ARCH=i586 ;; arm*) export ARCH=arm ;; # Unless $ARCH is already set, use uname -m for all other archs: *) export ARCH=$( uname -m ) ;; @@ -37,8 +37,8 @@ CWD=$(pwd) TMP=${TMP:-/tmp} PKG=$TMP/package-dcron -if [ "$ARCH" = "i486" ]; then - SLKCFLAGS="-O2 -march=i486 -mtune=i686" +if [ "$ARCH" = "i586" ]; then + SLKCFLAGS="-O2 -march=i586 -mtune=i686" LIBDIRSUFFIX="" elif [ "$ARCH" = "s390" ]; then SLKCFLAGS="-O2" @@ -64,13 +64,19 @@ find . \ -exec chmod 644 {} \; # Define TMPDIR as /var/spool/cron instead of /tmp -zcat $CWD/defs.h.TMPDIR.diff.gz | patch -p1 || exit 1 +zcat $CWD/defs.h.TMPDIR.diff.gz | patch -p1 --verbose || exit 1 # Fix problem where user creates /var/spool/cron/crontabs/<user>.new # 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/crontab.c.O_EXCL.diff.gz | patch -p1 || exit 1 +zcat $CWD/crontab.c.O_EXCL.diff.gz | patch -p1 --verbose || exit 1 + +# Running jobs should not block cron.update: +zcat $CWD/dcron.update.during.long.running.jobs.diff.gz | patch -p1 --verbose || exit 1 + +# Change _BSD_SOURCE to _DEFAULT_SOURCE for recent glibc: +zcat $CWD/defs.h._DEFAULT_SOURCE.diff.gz | patch -p1 --verbose || exit 1 CFLAGS+="$SLKCFLAGS" make || exit 1 strip --strip-unneeded crond crontab diff --git a/source/a/dcron/dcron.update.during.long.running.jobs.diff b/source/a/dcron/dcron.update.during.long.running.jobs.diff new file mode 100644 index 000000000..cd1297c73 --- /dev/null +++ b/source/a/dcron/dcron.update.during.long.running.jobs.diff @@ -0,0 +1,19 @@ + Update main.c + +Removed bug where cron.update is not picked up while jobs are still running. (We have long running cronjobs and experienced long overdue cron.update files) + +diff --git a/main.c b/main.c +index 595f07a..0eba280 100644 +--- a/main.c ++++ b/main.c +@@ -338,7 +338,8 @@ main(int ac, char **av) + SynchronizeDir(SCDir, "root", 0); + ReadTimestamps(NULL); + } +- } else { ++ } ++ if (rescan < 60) { + CheckUpdates(CDir, NULL, t1, t2); + CheckUpdates(SCDir, "root", t1, t2); + } + diff --git a/source/a/dcron/defs.h._DEFAULT_SOURCE.diff b/source/a/dcron/defs.h._DEFAULT_SOURCE.diff new file mode 100644 index 000000000..8d17b33a8 --- /dev/null +++ b/source/a/dcron/defs.h._DEFAULT_SOURCE.diff @@ -0,0 +1,11 @@ +--- ./defs.h.orig 2016-05-10 12:56:47.127582837 -0500 ++++ ./defs.h 2016-05-10 12:59:31.059577597 -0500 +@@ -17,7 +17,7 @@ + */ + + #define _XOPEN_SOURCE 1 +-#define _BSD_SOURCE 1 ++#define _DEFAULT_SOURCE 1 + + #include <sys/types.h> + #include <sys/stat.h> |