Hello community, here is the log from the commit of package cronie for openSUSE:11.4 checked in at Tue May 17 00:25:06 CEST 2011.
-------- --- old-versions/11.4/UPDATES/all/cronie/cronie.changes 2011-04-28 10:40:54.000000000 +0200 +++ 11.4/cronie/cronie.changes 2011-05-16 12:11:18.000000000 +0200 @@ -1,0 +2,5 @@ +Mon May 16 10:01:16 UTC 2011 - [email protected] + +- corrected job output via syslog (bnc#692871) + +------------------------------------------------------------------- calling whatdependson for 11.4-i586 New: ---- cronie-1.4.7-syslog_output.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ cronie.spec ++++++ --- /var/tmp/diff_new_pack.Ue7PLt/_old 2011-05-17 00:24:29.000000000 +0200 +++ /var/tmp/diff_new_pack.Ue7PLt/_new 2011-05-17 00:24:29.000000000 +0200 @@ -30,7 +30,7 @@ AutoReqProv: on PreReq: permissions %fillup_prereq %insserv_prereq cron sysvinit(syslog) Version: 1.4.7 -Release: 9.<RELEASE19> +Release: 9.<RELEASE21> %{expand: %%define cronie_version %version} Summary: Cron Daemon Source0: %name-%version.tar.gz @@ -50,6 +50,8 @@ Patch4: %name-nheader_lines.diff # we use cron.pid instead of crond.pid Patch5: %name-crond_pid.diff +# PATCH-FIX-UPSTREAM cronie-1.4.7-syslog_output.patch bnc#692871 +Patch6: cronie-1.4.7-syslog_output.patch Conflicts: cron <= 4.1 # When finish update protection of sles11 we could uncomment line bellow and drop all # ugly hacks with subpackage cron needed for proper update proces @@ -68,10 +70,10 @@ %package -n cron License: MIT and BSD and GPLv2 Version: 4.2 -Release: 9.<RELEASE19> +Release: 9.<RELEASE21> Summary: Auxiliary package Group: System/Daemons -Requires: %{name} = %{cronie_version} +Requires: %{name} = %{cronie_version}-%{release} %description -n cron Auxiliary package, needed for proper update from vixie-cron 4.1 to cronie 1.4.4 @@ -92,6 +94,7 @@ %patch3 -p1 %patch4 %patch5 -p1 +%patch6 -p1 cp %{S:7} ./cron_to_cronie.README %build @@ -156,7 +159,7 @@ if [ -e /var/run/update_from_old_cron ]; then set 2 %restart_on_update cron - # in %postun restart_on_update call try-restart but we don't have init script in this phase when + # in %%postun restart_on_update call try-restart but we don't have init script in this phase when # we are doing "ugly" update, but don't panic, it produces only warning to stderr echo "Please ignore message about missing init script(from postun) - when occurs, we will install init script later with cronie package" %__mv /etc/init.d/cron /etc/init.d/cron.bk ||: ++++++ cronie-1.4.7-syslog_output.patch ++++++ Index: cronie-1.4.7/src/do_command.c =================================================================== --- cronie-1.4.7.orig/src/do_command.c +++ cronie-1.4.7/src/do_command.c @@ -480,7 +480,6 @@ static int child_process(entry * e, user bytes++; if (mail) putc(ch, mail); - } #if defined(SYSLOG) if (SyslogOutput) { logbuf[bufidx++] = ch; @@ -494,6 +493,7 @@ static int child_process(entry * e, user } } #endif + } /* only close pipe if we opened it -- i.e., we're * mailing... ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
