diff --git a/cronie-1.4.6.tar.xz b/cronie-1.4.6.tar.xz deleted file mode 100644 index 9cecde9..0000000 --- a/cronie-1.4.6.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:e8c67cb6267eb9fd303107425533105a88b90b844a77588941bdd6582f6516a5 -size 157052 diff --git a/cronie-1.4.7.tar.gz b/cronie-1.4.7.tar.gz new file mode 100644 index 0000000..29dc35a --- /dev/null +++ b/cronie-1.4.7.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:83bae15ae5504454ba74f4142f5db3aa22be594327fea19d2534f65803137fbd +size 209297 diff --git a/cronie-nheader_lines.diff b/cronie-nheader_lines.diff index b4ebd03..6edc12a 100644 --- a/cronie-nheader_lines.diff +++ b/cronie-nheader_lines.diff @@ -1,3 +1,5 @@ +Index: src/crontab.c +=================================================================== --- src/crontab.c.orig +++ src/crontab.c @@ -38,7 +38,7 @@ @@ -9,7 +11,7 @@ enum opt_t {opt_unknown, opt_list, opt_delete, opt_edit, opt_replace, opt_hostset, opt_hostget}; -@@ -433,7 +433,7 @@ static char *host_specific_filename(char +@@ -429,7 +429,7 @@ static char *host_specific_filename(char static void edit_cmd(void) { char n[MAX_FNAME], q[MAX_TEMPSTR], *editor; FILE *f; @@ -18,7 +20,7 @@ struct stat statbuf; struct utimbuf utimebuf; WAIT_T waiter; -@@ -485,13 +485,25 @@ static void edit_cmd(void) { +@@ -481,13 +481,25 @@ static void edit_cmd(void) { } Set_LineNum(1) @@ -29,7 +31,7 @@ - /* copy the rest of the crontab (if any) to the temp file. - */ - if (EOF != ch) -+ ++ + /* ignore the top few comments since we probably put them there. + */ + x = 0; @@ -51,15 +53,15 @@ while (EOF != (ch = get_char(f))) putc(ch, NewCrontab); -@@ -699,6 +711,7 @@ static int replace_cmd(void) { +@@ -695,6 +707,7 @@ static int replace_cmd(void) { int error = 0; entry *e; uid_t file_owner; + time_t now = time(NULL); - char **envp = env_init(); + char **envp; char *safename; -@@ -732,10 +745,10 @@ static int replace_cmd(void) { +@@ -724,10 +737,10 @@ static int replace_cmd(void) { * * VERY IMPORTANT: make sure NHEADER_LINES agrees with this code. */ @@ -70,7 +72,7 @@ + fprintf(tmp, "# DO NOT EDIT THIS FILE - edit the master and reinstall.\n"); + fprintf(tmp, "# (%s installed on %-24.24s)\n", Filename, ctime(&now)); + fprintf(tmp, "# (Cronie version %s)\n", CRON_VERSION); -+ ++ #ifdef WITH_SELINUX if (selinux_context) fprintf(tmp, "SELINUX_ROLE_TYPE=%s\n", selinux_context); diff --git a/cronie.changes b/cronie.changes index 59de016..cd297de 100644 --- a/cronie.changes +++ b/cronie.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Wed Apr 27 16:56:21 UTC 2011 - vcizek@novell.com + +- update to 1.4.7 + many bugs fixed (including bnc#690166) + ------------------------------------------------------------------- Thu Feb 24 12:33:31 UTC 2011 - vcizek@novell.com diff --git a/cronie.spec b/cronie.spec index 448cd2d..564f33c 100644 --- a/cronie.spec +++ b/cronie.spec @@ -21,7 +21,7 @@ %define cron_configs \{/etc/init.d/cron,/etc/pam.d/crond,/etc/crontab,/etc/cron.deny,/etc/omc/srvinfo.d/cron.xml\} Name: cronie -BuildRequires: audit-devel libselinux-devel pam-devel xz +BuildRequires: audit-devel libselinux-devel pam-devel Url: https://fedorahosted.org/cronie/ License: MIT and BSD and GPLv2 Group: System/Daemons @@ -29,11 +29,11 @@ Recommends: smtp_daemon Recommends: postfix AutoReqProv: on PreReq: permissions %fillup_prereq %insserv_prereq cron sysvinit(syslog) -Version: 1.4.6 +Version: 1.4.7 Release: 7 %{expand: %%define cronie_version %version} Summary: Cron Daemon -Source0: %name-%version.tar.xz +Source0: %name-%version.tar.gz Source1: cron.init Source2: run-crons Source3: sample.root