diff --git a/SOURCES/cronie-check-config-param.patch b/SOURCES/cronie-check-config-param.patch new file mode 100644 index 0000000..2863e1f --- /dev/null +++ b/SOURCES/cronie-check-config-param.patch @@ -0,0 +1,30 @@ +diff -up cronie-1.4.11/anacron/readtab.c.bla cronie-1.4.11/anacron/readtab.c +--- cronie-1.4.11/anacron/readtab.c.bla 2013-07-18 14:27:08.000000000 +0200 ++++ cronie-1.4.11/anacron/readtab.c 2014-01-27 17:47:41.362138084 +0100 +@@ -271,7 +271,8 @@ parse_tab_line(char *line) + if (strncmp(env_var, "START_HOURS_RANGE", 17) == 0) + { + r = match_rx("^([[:digit:]]+)-([[:digit:]]+)$", value, 2, &from, &to); +- if ((r == -1) || (from == NULL) || (to == NULL)) goto reg_invalid; ++ if (r == -1) goto reg_err; ++ if (r == 0) goto reg_invalid; + range_start = atoi(from); + range_stop = atoi(to); + if (range_stop < range_start) { +@@ -282,6 +283,8 @@ parse_tab_line(char *line) + } + if (strncmp(env_var, "RANDOM_DELAY", 12) == 0) { + r = match_rx("^([[:digit:]]+)$", value, 0); ++ if (r == -1) goto reg_err; ++ if (r == 0) goto reg_invalid; + if (r != -1) { + int i = random(); + double x = 0; +@@ -289,7 +292,6 @@ parse_tab_line(char *line) + random_number = (int)x; + Debug(("Randomized delay set: %d", random_number)); + } +- else goto reg_invalid; + } + if (strncmp(env_var, "PREFERRED_HOUR", 14) == 0) { + r = match_rx("^([[:digit:]]+)$", value, 1, &pref_hour); diff --git a/SPECS/cronie.spec b/SPECS/cronie.spec index a396f84..f882751 100644 --- a/SPECS/cronie.spec +++ b/SPECS/cronie.spec @@ -6,7 +6,7 @@ Summary: Cron daemon for executing programs at set times Name: cronie Version: 1.4.11 -Release: 5%{?dist} +Release: 11%{?dist} License: MIT and BSD and ISC and GPLv2+ Group: System Environment/Base URL: https://fedorahosted.org/cronie @@ -15,6 +15,7 @@ Patch0: cronie-systemd.patch Patch1: cronie-1.4.11-fcntl_locking.patch Patch2: cronie-1.4.11-pamenv.patch Patch3: cronie-1.4.11-man-debug.patch +Patch4: cronie-check-config-param.patch Requires: dailyjobs @@ -83,6 +84,7 @@ extra features. %patch1 -p1 %patch2 -p1 %patch3 -p1 +%patch4 -p1 %build %configure \ @@ -207,6 +209,28 @@ exit 0 %attr(0644,root,root) %{_sysconfdir}/cron.d/dailyjobs %changelog +* Mon Jan 27 2014 Marcela Mašláňová - 1.4.11-11 +- now it's work even on ppc64, all checks working correctly +- Related: rhbz#1031384 + +* Fri Jan 24 2014 Daniel Mach - 1.4.11-10 +- Mass rebuild 2014-01-24 + +* Wed Jan 22 2014 Marcela Mašláňová - 1.4.11-9 +- fix coverity warnings about dead code. Incorrect checking of values. +- Related: rhbz#1031384 + +* Mon Jan 20 2014 Marcela Mašláňová - 1.4.11-8 +- anacron do not execute jobs run from command line +- Related: rhbz#1031384 + +* Wed Jan 08 2014 Marcela Mašláňová - 1.4.11-7 +- anacron segfaults with certain config data +- Resolves: rhbz#1031384 + +* Fri Dec 27 2013 Daniel Mach - 1.4.11-6 +- Mass rebuild 2013-12-27 + * Tue Oct 15 2013 Marcela Mašláňová - 1.4.11-5 - Cronie doesn't work when is executed as stand alone without systemd (for debuging issues)