Accepting request 70100 from Base:System
- corrected job output via syslog (bnc#692871) (forwarded request 70024 from vitezslav_cizek) OBS-URL: https://build.opensuse.org/request/show/70100 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/cronie?expand=0&rev=23
This commit is contained in:
commit
c5c7628daa
20
cronie-1.4.7-syslog_output.patch
Normal file
20
cronie-1.4.7-syslog_output.patch
Normal file
@ -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...
|
@ -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
|
Wed Apr 27 16:56:21 UTC 2011 - vcizek@novell.com
|
||||||
|
|
||||||
|
@ -50,6 +50,8 @@ Patch3: %name-pam_config.diff
|
|||||||
Patch4: %name-nheader_lines.diff
|
Patch4: %name-nheader_lines.diff
|
||||||
# we use cron.pid instead of crond.pid
|
# we use cron.pid instead of crond.pid
|
||||||
Patch5: %name-crond_pid.diff
|
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
|
Conflicts: cron <= 4.1
|
||||||
# When finish update protection of sles11 we could uncomment line bellow and drop all
|
# When finish update protection of sles11 we could uncomment line bellow and drop all
|
||||||
# ugly hacks with subpackage cron needed for proper update proces
|
# ugly hacks with subpackage cron needed for proper update proces
|
||||||
@ -92,6 +94,7 @@ overloaded in settings.
|
|||||||
%patch3 -p1
|
%patch3 -p1
|
||||||
%patch4
|
%patch4
|
||||||
%patch5 -p1
|
%patch5 -p1
|
||||||
|
%patch6 -p1
|
||||||
cp %{S:7} ./cron_to_cronie.README
|
cp %{S:7} ./cron_to_cronie.README
|
||||||
|
|
||||||
%build
|
%build
|
||||||
@ -156,7 +159,7 @@ fi
|
|||||||
if [ -e /var/run/update_from_old_cron ]; then
|
if [ -e /var/run/update_from_old_cron ]; then
|
||||||
set 2
|
set 2
|
||||||
%restart_on_update cron
|
%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
|
# 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"
|
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 ||:
|
%__mv /etc/init.d/cron /etc/init.d/cron.bk ||:
|
||||||
|
Loading…
Reference in New Issue
Block a user