diff --git a/SOURCES/cronie-1.4.11-empty-var.patch b/SOURCES/cronie-1.4.11-empty-var.patch new file mode 100644 index 0000000..1fc00e8 --- /dev/null +++ b/SOURCES/cronie-1.4.11-empty-var.patch @@ -0,0 +1,12 @@ +diff -up cronie-1.4.11/src/env.c.empty-var cronie-1.4.11/src/env.c +--- cronie-1.4.11/src/env.c.empty-var 2017-03-07 15:17:14.604948015 +0100 ++++ cronie-1.4.11/src/env.c 2017-09-15 15:38:24.275112187 +0200 +@@ -255,7 +255,7 @@ int load_env(char *envstr, FILE * f) { + abort(); + } + } +- if (state != FINI && !(state == VALUE && !quotechar)) { ++ if (state != FINI && state != EQ2 && !(state == VALUE && !quotechar)) { + Debug(DPARS, ("load_env, not an env var, state = %d\n", state)); + fseek(f, filepos, 0); + Set_LineNum(fileline); diff --git a/SOURCES/cronie-1.4.11-no-pam.patch b/SOURCES/cronie-1.4.11-no-pam.patch new file mode 100644 index 0000000..c042c19 --- /dev/null +++ b/SOURCES/cronie-1.4.11-no-pam.patch @@ -0,0 +1,23 @@ +diff -up cronie-1.4.11/src/security.c.no-pam cronie-1.4.11/src/security.c +--- cronie-1.4.11/src/security.c.no-pam 2017-03-07 15:17:14.610948157 +0100 ++++ cronie-1.4.11/src/security.c 2017-09-15 09:36:26.709112459 +0200 +@@ -86,6 +86,7 @@ static int cron_open_pam_session(struct + if (pam_session_opened != 0) \ + pam_close_session(pamh, PAM_SILENT); \ + pam_end(pamh, retcode); \ ++ pamh = NULL; \ + } \ + return(retcode); } + #endif +@@ -221,7 +222,10 @@ void cron_close_pam(void) { + pam_setcred(pamh, PAM_DELETE_CRED | PAM_SILENT); + pam_close_session(pamh, PAM_SILENT); + } +- pam_end(pamh, PAM_SUCCESS); ++ if (pamh != NULL) { ++ pam_end(pamh, PAM_SUCCESS); ++ pamh = NULL; ++ } + #endif + } + diff --git a/SPECS/cronie.spec b/SPECS/cronie.spec index 8508969..a9259c9 100644 --- a/SPECS/cronie.spec +++ b/SPECS/cronie.spec @@ -6,11 +6,12 @@ Summary: Cron daemon for executing programs at set times Name: cronie Version: 1.4.11 -Release: 17%{?dist} +Release: 19%{?dist} License: MIT and BSD and ISC and GPLv2+ Group: System Environment/Base -URL: https://fedorahosted.org/cronie -Source0: https://fedorahosted.org/releases/c/r/cronie/%{name}-%{version}.tar.gz +URL: https://github.com/cronie-crond/cronie +Source0: https://github.com/cronie-crond/cronie/releases/download/cronie-%{version}/cronie-%{version}.tar.gz + Patch0: cronie-systemd.patch Patch1: cronie-1.4.11-fcntl_locking.patch Patch2: cronie-1.4.11-pamenv.patch @@ -24,6 +25,8 @@ Patch9: cronie-1.4.11-anacron-mailto.patch Patch10: cronie-1.4.11-crontab-root.patch Patch11: cronie-1.4.11-man-file.patch Patch12: cronie-1.4.11-selinux-user.patch +Patch13: cronie-1.4.11-no-pam.patch +Patch14: cronie-1.4.11-empty-var.patch Requires: dailyjobs @@ -101,6 +104,8 @@ extra features. %patch10 -p1 -b .root %patch11 -p1 -b .man-file %patch12 -p1 -b .selinux-user +%patch13 -p1 -b .no-pam +%patch14 -p1 -b .empty-var %build %configure \ @@ -225,7 +230,14 @@ exit 0 %attr(0644,root,root) %config(noreplace) %{_sysconfdir}/cron.d/dailyjobs %changelog -* Wed Mar 29 2017 Tomáš Mráz - 1.4.11-18 +* Mon Oct 16 2017 Tomáš Mráz - 1.4.11-19 +- fix URL and source URL of the package (#1501726) + +* Fri Sep 15 2017 Tomáš Mráz - 1.4.11-18 +- fix regression - spurious PAM log message from crontab (#1479064) +- allow empty variables in crontabs (#1439217) + +* Wed Mar 29 2017 Tomáš Mráz - 1.4.11-17 - make anacron not to contradict itself in syslog (job output does not have to be necessarily mailed)