commit cron for openSUSE:Factory
Hello community, here is the log from the commit of package cron for openSUSE:Factory checked in at Mon Nov 23 11:38:26 CET 2009. -------- --- cron/cron.changes 2009-11-03 20:16:38.000000000 +0100 +++ /mounts/work_src_done/STABLE/cron/cron.changes 2009-11-20 10:16:28.000000000 +0100 @@ -1,0 +2,12 @@ +Wed Nov 18 17:18:44 UTC 2009 - mseben@novell.com + +- added pam conversion function (reworked pam.diff) fate#306386 + +------------------------------------------------------------------- +Wed Nov 18 14:39:49 UTC 2009 - mseben@novell.com + +- modified run-crons script : added support for new SEND_OUTPUT_ON_NO_ERROR + sysconfig option to block status mails from cron jobs with empty + output (fate#305279) + +------------------------------------------------------------------- calling whatdependson for head-i586 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ cron.spec ++++++ --- /var/tmp/diff_new_pack.qWslGz/_old 2009-11-23 11:35:59.000000000 +0100 +++ /var/tmp/diff_new_pack.qWslGz/_new 2009-11-23 11:35:59.000000000 +0100 @@ -28,7 +28,7 @@ AutoReqProv: on PreReq: permissions %fillup_prereq %insserv_prereq Version: 4.1 -Release: 203 +Release: 204 Summary: Cron Daemon Source0: vixie-%name-%version.tar.bz2 Source1: %name.init ++++++ run-crons ++++++ --- /var/tmp/diff_new_pack.qWslGz/_old 2009-11-23 11:35:59.000000000 +0100 +++ /var/tmp/diff_new_pack.qWslGz/_new 2009-11-23 11:35:59.000000000 +0100 @@ -216,14 +216,15 @@ STATUS="" if test ! -e $SPOOL/$BASE ; then - CONTROL_MAIL=$TMPDIR/run-crons.$$ + CONTROL_MAIL=$TMPDIR/run-crons_mail.$$ + JOB_OUTPUT=$TMPDIR/run-crons_output.$$ echo "running ${TIME_EXT} cronjob scripts" >> ${CONTROL_MAIL} echo "" >> ${CONTROL_MAIL} touch $SPOOL/$BASE - run_scripts ${CRONDIR} ${TIME_EXT} >> ${CONTROL_MAIL} 2>&1 + run_scripts ${CRONDIR} ${TIME_EXT} >> ${JOB_OUTPUT} 2>&1 TITLE="cronjob@$HOSTNAME - ${TIME_EXT}" if [ -n "${STATUS}" ] ; then TITLE="${TITLE} - ${STATUS}" @@ -231,10 +232,12 @@ TITLE="${TITLE} - OK" fi if [ -n "${STATUS}" -o "$SEND_MAIL_ON_NO_ERROR" = "yes" ] ; then - mail ${SEND_TO} -s "${TITLE}" < ${CONTROL_MAIL} + cat ${CONTROL_MAIL} ${JOB_OUTPUT} | mail ${SEND_TO} -s "${TITLE}" + elif [ -s ${JOB_OUTPUT} -a "$SEND_OUTPUT_ON_NO_ERROR" = "yes" ] ; then + cat ${CONTROL_MAIL} ${JOB_OUTPUT} | mail ${SEND_TO} -s "${TITLE}" fi - rm -f ${CONTROL_MAIL} + rm -f ${CONTROL_MAIL} ${JOB_OUTPUT} fi done fi ++++++ vixie-cron-4.1-pam.diff ++++++ --- /var/tmp/diff_new_pack.qWslGz/_old 2009-11-23 11:35:59.000000000 +0100 +++ /var/tmp/diff_new_pack.qWslGz/_new 2009-11-23 11:35:59.000000000 +0100 @@ -58,15 +58,13 @@ =================================================================== --- vixie-cron-4.1.orig/do_command.c +++ vixie-cron-4.1/do_command.c -@@ -25,9 +25,47 @@ static char rcsid[] = "$Id: do_command.c +@@ -25,9 +25,72 @@ static char rcsid[] = "$Id: do_command.c #include "cron.h" +#ifdef WITH_PAM +static pam_handle_t *pamh = NULL; -+static const struct pam_conv conv = { -+ NULL -+}; ++ +#define PAM_FAIL_CHECK if (retcode != PAM_SUCCESS) { \ + fprintf(stderr,"\n%s\n",pam_strerror(pamh, retcode)); \ + syslog(LOG_ERR,"%s",pam_strerror(pamh, retcode)); \ @@ -77,6 +75,33 @@ static void child_process(entry *, user *); static int safe_p(const char *, const char *); ++static int ++cron_conv(int num_msg, const struct pam_message **msgm, ++ struct pam_response **response, void *appdata_ptr) ++{ ++ struct pam_message**m = msgm; ++ int i; ++ ++ for (i = 0; i < num_msg; i++) { ++ switch (m[i]->msg_style) { ++ case PAM_ERROR_MSG: ++ case PAM_TEXT_INFO: ++ if (m[i]->msg != NULL) { ++ log_it("CRON", getpid(), "pam_message", m[i]->msg); ++ } ++ break; ++ default: ++ break; ++ } ++ } ++ return (0); ++} ++ ++static const struct pam_conv conv = { ++ cron_conv, NULL ++}; ++ ++ +/* Build up the job environment from the PAM environment plus the + crontab environment */ +static char ** build_env(char **cronenv) @@ -106,7 +131,7 @@ void do_command(entry *e, user *u) { Debug(DPROC, ("[%ld] do_command(%s, (%s,%ld,%ld))\n", -@@ -65,6 +103,10 @@ child_process(entry *e, user *u) { +@@ -65,6 +128,10 @@ child_process(entry *e, user *u) { int stdin_pipe[2], stdout_pipe[2]; char *input_data, *usernm, *mailto; int children = 0; @@ -117,7 +142,7 @@ Debug(DPROC, ("[%ld] child_process('%s')\n", (long)getpid(), e->cmd)) -@@ -134,6 +176,19 @@ child_process(entry *e, user *u) { +@@ -134,6 +201,19 @@ child_process(entry *e, user *u) { *p = '\0'; } @@ -137,7 +162,7 @@ /* fork again, this time so we can exec the user's command. */ switch (fork()) { -@@ -514,6 +569,12 @@ child_process(entry *e, user *u) { +@@ -514,6 +594,12 @@ child_process(entry *e, user *u) { Debug(DPROC, (", dumped core")) Debug(DPROC, ("\n")) } ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org
participants (1)
-
root@Hilbert.suse.de