From d4b4976ad3cbb7d7a2837df24b89913a1b9b00266b9e382bc4eea8ab0f785a93 Mon Sep 17 00:00:00 2001 From: OBS User buildservice-autocommit Date: Mon, 2 May 2011 10:09:50 +0000 Subject: [PATCH 1/2] Updating link to change in openSUSE:Factory/cronie revision 22.0 OBS-URL: https://build.opensuse.org/package/show/Base:System/cronie?expand=0&rev=c15a737c6b6a688d368949d77e7ddc04 --- cronie.spec | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/cronie.spec b/cronie.spec index 564f33c..9a2a060 100644 --- a/cronie.spec +++ b/cronie.spec @@ -30,7 +30,7 @@ Recommends: postfix AutoReqProv: on PreReq: permissions %fillup_prereq %insserv_prereq cron sysvinit(syslog) Version: 1.4.7 -Release: 7 +Release: 1 %{expand: %%define cronie_version %version} Summary: Cron Daemon Source0: %name-%version.tar.gz @@ -68,7 +68,7 @@ started automatically. %package -n cron License: MIT and BSD and GPLv2 Version: 4.2 -Release: 9 +Release: 10 Summary: Auxiliary package Group: System/Daemons Requires: %{name} = %{cronie_version}-%{release} From 8b9d4f5ec45224abda504f383898dfc7283aa51d87bced60082bbeb21d9a48da Mon Sep 17 00:00:00 2001 From: Dirk Mueller Date: Thu, 12 May 2011 11:12:22 +0000 Subject: [PATCH 2/2] Accepting request 70024 from home:vitezslav_cizek:branches:Base:System - corrected job output via syslog (bnc#692871) OBS-URL: https://build.opensuse.org/request/show/70024 OBS-URL: https://build.opensuse.org/package/show/Base:System/cronie?expand=0&rev=78 --- cronie-1.4.7-syslog_output.patch | 20 ++++++++++++++++++++ cronie.changes | 5 +++++ cronie.spec | 5 ++++- 3 files changed, 29 insertions(+), 1 deletion(-) create mode 100644 cronie-1.4.7-syslog_output.patch diff --git a/cronie-1.4.7-syslog_output.patch b/cronie-1.4.7-syslog_output.patch new file mode 100644 index 0000000..050e9b5 --- /dev/null +++ b/cronie-1.4.7-syslog_output.patch @@ -0,0 +1,20 @@ +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... diff --git a/cronie.changes b/cronie.changes index cd297de..08cb7f1 100644 --- a/cronie.changes +++ b/cronie.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Wed May 11 08:27:14 UTC 2011 - vcizek@novell.com + +- corrected job output via syslog (bnc#692871) + ------------------------------------------------------------------- Wed Apr 27 16:56:21 UTC 2011 - vcizek@novell.com diff --git a/cronie.spec b/cronie.spec index 9a2a060..2d68730 100644 --- a/cronie.spec +++ b/cronie.spec @@ -50,6 +50,8 @@ Patch3: %name-pam_config.diff 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 @@ -92,6 +94,7 @@ overloaded in settings. %patch3 -p1 %patch4 %patch5 -p1 +%patch6 -p1 cp %{S:7} ./cron_to_cronie.README %build @@ -156,7 +159,7 @@ fi 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 ||: