From 23b3b9c637a62131655e387d7b6d4c30aecb48f9c4b0606a9bfb5fbc2c02ee22 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Cristian=20Rodr=C3=ADguez?= <crrodriguez@opensuse.org>
Date: Mon, 6 Jun 2011 18:21:17 +0000
Subject: [PATCH] Accepting request 72736 from
 home:vitezslav_cizek:branches:Base:System

- Mention possibility of disabling logging to syslog in a crontab
  manual.
- Better error report, when ^ tried as an unprivileged user

OBS-URL: https://build.opensuse.org/request/show/72736
OBS-URL: https://build.opensuse.org/package/show/Base:System/cronie?expand=0&rev=80
---
 cronie-1.4.7-disable_logging.patch | 27 +++++++++++++++++++++++++++
 cronie.changes                     |  7 +++++++
 cronie.spec                        |  3 +++
 3 files changed, 37 insertions(+)
 create mode 100644 cronie-1.4.7-disable_logging.patch

diff --git a/cronie-1.4.7-disable_logging.patch b/cronie-1.4.7-disable_logging.patch
new file mode 100644
index 0000000..3785ec2
--- /dev/null
+++ b/cronie-1.4.7-disable_logging.patch
@@ -0,0 +1,27 @@
+Index: cronie-1.4.7/man/crontab.5
+===================================================================
+--- cronie-1.4.7.orig/man/crontab.5
++++ cronie-1.4.7/man/crontab.5
+@@ -203,6 +203,9 @@ fields.  Use the first three letters of
+ day or month (case does not matter).  Ranges or
+ lists of names are not allowed.
+ .PP
++If the uid of the owner is 0 (root), he can put a "-" as first character of a crontab entry.
++This will prevent cron from writing a syslog message about this command getting executed.
++.PP
+ The "sixth" field (the rest of the line) specifies the command to be
+ run.
+ The entire command portion of the line, up to a newline or a "%"
+Index: cronie-1.4.7/src/entry.c
+===================================================================
+--- cronie-1.4.7.orig/src/entry.c
++++ cronie-1.4.7/src/entry.c
+@@ -110,7 +110,7 @@ entry *load_entry(FILE * file, void (*er
+ 			e->flags |= DONT_LOG;
+ 		else {
+ 			log_it("CRON", getpid(), "ERROR", "Only privileged user can disable logging", 0);
+-			ecode = e_option;
++			ecode = e_minute;
+ 			goto eof;
+ 		}
+ 		ch = get_char(file);
diff --git a/cronie.changes b/cronie.changes
index 08cb7f1..949149f 100644
--- a/cronie.changes
+++ b/cronie.changes
@@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+Mon Jun  6 08:51:11 UTC 2011 - vcizek@novell.com
+
+- Mention possibility of disabling logging to syslog in a crontab 
+  manual.
+- Better error report, when ^ tried as an unprivileged user
+
 -------------------------------------------------------------------
 Wed May 11 08:27:14 UTC 2011 - vcizek@novell.com
 
diff --git a/cronie.spec b/cronie.spec
index 33a1e1f..73ec899 100644
--- a/cronie.spec
+++ b/cronie.spec
@@ -52,6 +52,8 @@ Patch4:         %name-nheader_lines.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
+# PATCH-FIX-UPSTREAM mention logging disabling for a command in man
+Patch7:         cronie-1.4.7-disable_logging.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
@@ -95,6 +97,7 @@ overloaded in settings.
 %patch4
 %patch5 -p1
 %patch6 -p1
+%patch7 -p1
 cp %{S:7} ./cron_to_cronie.README
 
 %build