From f41d1c60f10a3d5133b469d3036d2aae1cfdea5f Mon Sep 17 00:00:00 2001 From: CentOS Sources Date: Sat, 16 Oct 2021 04:19:57 +0000 Subject: [PATCH] import cronie-1.5.2-6.el8 --- SOURCES/cronie-1.5.2-create-pid-files.patch | 26 +++++++++++++++++++ .../cronie-1.5.2-use-pam-system-auth.patch | 26 +++++++++++++++++++ SPECS/cronie.spec | 22 +++++++++++++--- 3 files changed, 70 insertions(+), 4 deletions(-) create mode 100644 SOURCES/cronie-1.5.2-create-pid-files.patch create mode 100644 SOURCES/cronie-1.5.2-use-pam-system-auth.patch diff --git a/SOURCES/cronie-1.5.2-create-pid-files.patch b/SOURCES/cronie-1.5.2-create-pid-files.patch new file mode 100644 index 0000000..526a897 --- /dev/null +++ b/SOURCES/cronie-1.5.2-create-pid-files.patch @@ -0,0 +1,26 @@ +From 0570c2cd979bc9ce1da6a873089e89dbca900a1f Mon Sep 17 00:00:00 2001 +From: Tomas Mraz +Date: Tue, 7 May 2019 14:45:53 +0200 +Subject: [PATCH] Revert "Avoid creating pid files when crond doesn't fork" + +This reverts commit 5b285b46b88dc63689c6a56542cb2ba81f861b66. +The PID file is useful to avoid running multiple crond instances +at once. +--- + src/misc.c | 3 --- + 1 file changed, 3 deletions(-) + +diff --git a/src/misc.c b/src/misc.c +index 42153b8..faf6ffb 100644 +--- a/src/misc.c ++++ b/src/misc.c +@@ -315,9 +315,6 @@ void acquire_daemonlock(int closeflag) { + return; + } + +- if (NoFork == 1) +- return; //move along, nothing to do here... +- + if (fd == -1) { + pidfile = _PATH_CRON_PID; + /* Initial mode is 0600 to prevent flock() race/DoS. */ diff --git a/SOURCES/cronie-1.5.2-use-pam-system-auth.patch b/SOURCES/cronie-1.5.2-use-pam-system-auth.patch new file mode 100644 index 0000000..d2588a5 --- /dev/null +++ b/SOURCES/cronie-1.5.2-use-pam-system-auth.patch @@ -0,0 +1,26 @@ +From 978a00ea7ac92852c153ebb3b2152886730ca51c Mon Sep 17 00:00:00 2001 +From: Marcel Plch +Date: Fri, 7 Dec 2018 15:01:19 +0100 +Subject: [PATCH] Use system-auth instead of password-auth for PAM + authentication (#25) + +--- + pam/crond | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) + +diff --git a/pam/crond b/pam/crond +index 91964aa..560529d 100644 +--- a/pam/crond ++++ b/pam/crond +@@ -4,8 +4,8 @@ + # + # Although no PAM authentication is called, auth modules + # are used for credential setting +-auth include password-auth ++auth include system-auth + account required pam_access.so +-account include password-auth ++account include system-auth + session required pam_loginuid.so +-session include password-auth ++session include system-auth diff --git a/SPECS/cronie.spec b/SPECS/cronie.spec index b7002cf..645bc8a 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.5.2 -Release: 4%{?dist} +Release: 6%{?dist} License: MIT and BSD and ISC and GPLv2+ Group: System Environment/Base URL: https://github.com/cronie-crond/cronie @@ -44,6 +44,10 @@ Patch1: fix-unsafe-code.patch Patch2: cronie-1.5.2-context-role.patch # Make systemd restart crond when it fails. Patch3: cronie-1.5.2-restart-on-failure.patch +# Revert "Avoid creating pid files when crond doesn't fork" +Patch4: cronie-1.5.2-create-pid-files.patch +# Use system-auth in PAM (rhbz#2005526) +Patch5: cronie-1.5.2-use-pam-system-auth.patch %description Cronie contains the standard UNIX daemon crond that runs specified programs at @@ -90,6 +94,8 @@ extra features. %patch1 -p1 %patch2 -p1 %patch3 -p1 +%patch4 -p1 +%patch5 -p1 %build %configure \ @@ -218,6 +224,14 @@ exit 0 %attr(0644,root,root) %config(noreplace) %{_sysconfdir}/cron.d/dailyjobs %changelog +* Mon Sep 20 2021 Jan Staněk - 1.5.2-6 +- Use system-auth for PAM authentication + Resolves: rhbz#2005526 + +* Fri Sep 03 2021 Jan Staněk - 1.5.2-5 +- Create PID files even when crond does not fork + Resolves: rhbz#1926300 + * Wed Jun 12 2019 Marcel Plch - 1.5.2-4 - Make crond restart on failure - Resolves: rhbz#1715137 @@ -422,7 +436,7 @@ exit 0 - update to 1.4.6 * Fri Aug 13 2010 Marcela Mašláňová - 1.4.5-4 -- 623908 fix fd leak in anacron, which caused denail of prelink +- 623908 fix fd leak in anacron, which caused denail of prelink and others * Mon Aug 9 2010 Marcela Mašláňová - 1.4.5-2 @@ -498,7 +512,7 @@ exit 0 - add sendmail file into requirement, cause it's needed some MTA * Thu Sep 18 2008 Marcela Maslanova - 1.2-2 -- 462252 /etc/sysconfig/crond does not need to be executable +- 462252 /etc/sysconfig/crond does not need to be executable * Thu Jun 26 2008 Marcela Maslanova - 1.2-1 - update to 1.2 @@ -525,7 +539,7 @@ exit 0 - 431366 after reboot wasn't cron in chkconfig * Tue Feb 5 2008 Marcela Maslanova - 1.0-3 -- 431366 trigger part => after update from vixie-cron on cronie will +- 431366 trigger part => after update from vixie-cron on cronie will be daemon running. * Wed Jan 30 2008 Marcela Maslanova - 1.0-2