Hello community,
here is the log from the commit of package cronie for openSUSE:Factory checked
in at 2013-10-08 10:45:24
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/cronie (Old)
and /work/SRC/openSUSE:Factory/.cronie.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "cronie"
Changes:
--------
--- /work/SRC/openSUSE:Factory/cronie/cronie.changes 2013-09-13
14:44:02.000000000 +0200
+++ /work/SRC/openSUSE:Factory/.cronie.new/cronie.changes 2013-10-08
10:45:26.000000000 +0200
@@ -1,0 +2,7 @@
+Wed Sep 25 16:02:13 UTC 2013 - vdziewie...@suse.com
+
+- Update to 1.4.11
+- I removed these patches: cronie-1.4.8-bug_756197.diff
+bug-786096_cronie-fdleak.diff, since those issuas appear to have
+been addressed upstream.
+-------------------------------------------------------------------
Old:
----
bug-786096_cronie-fdleak.diff
cronie-1.4.8-bug_756197.diff
cronie-1.4.8.tar.gz
New:
----
cronie-1.4.11.tar.gz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ cronie.spec ++++++
--- /var/tmp/diff_new_pack.na9m0L/_old 2013-10-08 10:45:27.000000000 +0200
+++ /var/tmp/diff_new_pack.na9m0L/_new 2013-10-08 10:45:27.000000000 +0200
@@ -29,7 +29,7 @@
Suggests: postfix
PreReq: permissions %fillup_prereq %insserv_prereq cron
%{?systemd_requires}
-Version: 1.4.8
+Version: 1.4.11
Release: 0
%{expand: %%define cronie_version %version}
Summary: Cron Daemon
@@ -56,10 +56,7 @@
Patch7: cronie-1.4.7-disable_logging.patch
# PATCH-FIX-UPSTREAM use run-crons instead of run-parts for anacron
(bnc#689494)
Patch8: cronie-anacron-1.4.7-run-crons.patch
-Patch9: cronie-1.4.8-bug_756197.diff
Patch10: cronie-nofork-nopid.patch
-# PATCH-FIX-UPSTREAM bnc#786096
-Patch11: bug-786096_cronie-fdleak.diff
Patch12: cronie-piddir.patch
Conflicts: cron <= 4.1
# When finish update protection of sles11 we could uncomment line bellow and
drop all
@@ -103,10 +100,8 @@
%patch5 -p1
%patch7 -p1
%patch8 -p1
-%patch9
cp %{S:7} ./cron_to_cronie.README
%patch10
-%patch11 -p1
%patch12 -p1
%build
# fill macro CRON_VERSION it is used in top three lines of crontab file,should
be reworked
++++++ cronie-1.4.8.tar.gz -> cronie-1.4.11.tar.gz ++++++
++++ 10771 lines of diff (skipped)
++++++ cronie-1.4.7-disable_logging.patch ++++++
--- /var/tmp/diff_new_pack.na9m0L/_old 2013-10-08 10:45:27.000000000 +0200
+++ /var/tmp/diff_new_pack.na9m0L/_new 2013-10-08 10:45:27.000000000 +0200
@@ -1,22 +1,22 @@
-Index: cronie-1.4.7/man/crontab.5
+Index: cronie-1.4.11/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.
+--- cronie-1.4.11.orig/man/crontab.5
++++ cronie-1.4.11/man/crontab.5
+@@ -213,6 +213,9 @@ Names can also be used for the 'month' a
+ first three letters of the particular 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 "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
+ character, will be executed by /bin/sh or by the shell specified in the
+Index: cronie-1.4.11/src/entry.c
===================================================================
---- cronie-1.4.7.orig/src/entry.c
-+++ cronie-1.4.7/src/entry.c
-@@ -105,13 +105,18 @@ entry *load_entry(FILE * file, void (*er
+--- cronie-1.4.11.orig/src/entry.c
++++ cronie-1.4.11/src/entry.c
+@@ -121,13 +121,18 @@ entry *load_entry(FILE * file, void (*er
if (ch == '-') {
/* if we are editing system crontab or user uid is 0 (root)
* we are allowed to disable logging
@@ -38,9 +38,9 @@
}
ch = get_char(file);
if (ch == EOF)
-@@ -371,9 +376,9 @@ entry *load_entry(FILE * file, void (*er
+@@ -401,9 +406,9 @@ entry *load_entry(FILE * file, void (*er
- Debug(DPARS, ("load_entry()...returning successfully\n"))
+ Debug(DPARS, ("load_entry()...returning successfully\n"));
- /* success, fini, return pointer to the entry we just created...
- */
++++++ cronie-nheader_lines.diff ++++++
--- /var/tmp/diff_new_pack.na9m0L/_old 2013-10-08 10:45:27.000000000 +0200
+++ /var/tmp/diff_new_pack.na9m0L/_new 2013-10-08 10:45:27.000000000 +0200
@@ -2,25 +2,25 @@
===================================================================
--- src/crontab.c.orig
+++ src/crontab.c
-@@ -38,7 +38,7 @@
- # include <selinux/av_permissions.h>
- #endif
+@@ -65,7 +65,7 @@
+ #include "pathnames.h"
+ #include "structs.h"
-#define NHEADER_LINES 0
+#define NHEADER_LINES 3
enum opt_t {opt_unknown, opt_list, opt_delete, opt_edit, opt_replace,
opt_hostset, opt_hostget};
-@@ -429,7 +429,7 @@ static char *host_specific_filename(char
- static void edit_cmd(void) {
- char n[MAX_FNAME], q[MAX_TEMPSTR], *editor;
+@@ -475,7 +475,7 @@ static void edit_cmd(void) {
+ char n[MAX_FNAME], q[MAX_TEMPSTR];
+ const char *editor;
FILE *f;
- int ch = '\0', t;
+ int ch = '\0', t, x;
struct stat statbuf;
struct utimbuf utimebuf;
WAIT_T waiter;
-@@ -481,13 +481,25 @@ static void edit_cmd(void) {
+@@ -527,13 +527,25 @@ static void edit_cmd(void) {
}
Set_LineNum(1)
@@ -53,7 +53,7 @@
while (EOF != (ch = get_char(f)))
putc(ch, NewCrontab);
-@@ -695,6 +707,7 @@ static int replace_cmd(void) {
+@@ -741,6 +753,7 @@ static int replace_cmd(void) {
int error = 0;
entry *e;
uid_t file_owner;
@@ -61,7 +61,7 @@
char **envp;
char *safename;
-@@ -724,10 +737,10 @@ static int replace_cmd(void) {
+@@ -770,10 +783,10 @@ static int replace_cmd(void) {
*
* VERY IMPORTANT: make sure NHEADER_LINES agrees with this code.
*/
++++++ cronie-nofork-nopid.patch ++++++
--- /var/tmp/diff_new_pack.na9m0L/_old 2013-10-08 10:45:27.000000000 +0200
+++ /var/tmp/diff_new_pack.na9m0L/_new 2013-10-08 10:45:27.000000000 +0200
@@ -1,6 +1,8 @@
+Index: src/misc.c
+===================================================================
--- src/misc.c.orig
+++ src/misc.c
-@@ -293,6 +293,8 @@ void acquire_daemonlock(int closeflag) {
+@@ -311,6 +311,8 @@ void acquire_daemonlock(int closeflag) {
return;
}
@@ -9,14 +11,3 @@
if (fd == -1) {
pidfile = _PATH_CRON_PID;
/* Initial mode is 0600 to prevent flock() race/DoS. */
---- src/cron.c.orig
-+++ src/cron.c
-@@ -600,7 +600,7 @@ static void sigchld_handler(int x) {
- }
-
- static void quit(int x) {
-- (void) unlink(_PATH_CRON_PID);
-+ if(NoFork == 0) unlink(_PATH_CRON_PID);
- _exit(0);
- }
-
--
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org
