pool/cronie
SHA256
2
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Accepting request 70100 from Base:System

Browse Source 
- 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:
Sascha Peilicke 2011-05-16 07:16:58 +00:00 committed by Git OBS Bridge
commit c5c7628daa
3 changed files with 29 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
cronie-1.4.7-syslog_output.patch Normal file
View 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...

5
cronie.changes
View File

@ -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

5
cronie.spec
View File

@ -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 ||: