[cron] Add sendmail wrapper so it's possible to redirect mail output without recompiling

Also tweaked compilation a bit

4 files changed, 36 insertions, 6 deletions

diff --git a/remote/modules/cron/cron.build b/remote/modules/cron/cron.build
index 2f18b138..fc364347 100644
--- a/remote/modules/cron/cron.build
+++ b/remote/modules/cron/cron.build
@@ -4,22 +4,22 @@
 fetch_source() {
 
 	# use our own patched source
-	local TARBALL="vixie-cron-4.1-crondir-support.tgz"
+	local TARBALL="vixie-cron-4.1-openslx.tgz"
 	[ ! -e "${TARBALL}" ] && perror "${TARBALL} not found under ${MODULE_DIR}."
 
 	mkdir "${MODULE_DIR}/src" || perror "Could not create ${MODULE_DIR}/src"
-	tar xvfz "${TARBALL}" -C "${MODULE_DIR}/src" || perror "Could not extract ${TARBALL} to ${MODULE_DIR}/src"
+	tar xfz "${TARBALL}" -C "${MODULE_DIR}/src" || perror "Could not extract ${TARBALL} to ${MODULE_DIR}/src"
 }
 
 build() {
 
 	# compilation
 	cd "${MODULE_DIR}/src" || perror "Could not cd to '${MODULE_DIR}/src'. Did fetch_source work?"
-	make || perror "Could not compile cron using 'make'."
+	make cron || perror "Could not compile cron using 'make'."
 
-	# installation
-	mkdir -p "${MODULE_BUILD_DIR}"/{usr/bin,usr/sbin}
-	DESTDIR="${MODULE_BUILD_DIR}" make install || perror "Could not 'make install' to ${MODULE_BUILD_DIR}"
+	# copy to build dir, since there are no shared libs linked in
+	mkdir -p "${MODULE_BUILD_DIR}/usr/sbin"
+	cp "$MODULE_DIR/src/cron" "$MODULE_BUILD_DIR/usr/sbin/" || perror "Could copy cron binary to ${MODULE_BUILD_DIR}"
 
 	cd - &>/dev/null
 }
diff --git a/remote/modules/cron/data/opt/openslx/scripts/cron-sendmail b/remote/modules/cron/data/opt/openslx/scripts/cron-sendmail
new file mode 100755
index 00000000..3ce2a19d
--- /dev/null
+++ b/remote/modules/cron/data/opt/openslx/scripts/cron-sendmail
@@ -0,0 +1,30 @@
+#!/bin/ash
+
+. /opt/openslx/config
+
+if [ "x$SLX_CRON_MAIL" = "xslxlog" ]; then
+	# slxlog handling - special case
+	TMP=$(mktemp)
+	cat > "$TMP"
+
+	SUBJ=$(grep '^Subject: .*$' "$TMP" | cut -c 10-)
+
+	if [ -n "$SUBJ" ]; then
+		slxlog "cron" "$SUBJ" "$TMP"
+	fi
+
+	rm -f -- "$TMP"
+elif [ -n "$SLX_CRON_MAIL" ] && [ -x "$SLX_CRON_MAIL" ]; then
+	# see if SLX_CRON_MAIL is a valid binary and use that
+	$SLX_CRON_MAIL $@
+elif which sendmail 2> /dev/null; then
+	# fallback to sendmail
+	sendmail $@
+elif which logger 2> /dev/null; then
+	# nothing worked, write to syslog if logger is present
+	TMP=$(mktemp /tmp/cron.XXXXXXXX)
+	cat > "$TMP"
+	chmod 0600 "$TMP"
+	logger "cron tried to mail, but no mailer found! Mail dumped to $TMP"
+fi
+
diff --git a/remote/modules/cron/vixie-cron-4.1-crondir-support.tgz b/remote/modules/cron/vixie-cron-4.1-crondir-support.tgz
deleted file mode 100644
index ca660f5d..00000000
--- a/remote/modules/cron/vixie-cron-4.1-crondir-support.tgz
+++ /dev/null
diff --git a/remote/modules/cron/vixie-cron-4.1-openslx.tgz b/remote/modules/cron/vixie-cron-4.1-openslx.tgz
new file mode 100644
index 00000000..2a9929d4
--- /dev/null
+++ b/remote/modules/cron/vixie-cron-4.1-openslx.tgz