Change-Id: I30e0c9235b3d43b1d6566361396fb6a97fd00d01
Reviewed-on: http://photon-jenkins.eng.vmware.com:8082/1757
Tested-by: gerrit-photon <photon-checkins@vmware.com>
Reviewed-by: suezzelur <anishs@vmware.com>
| ... | ... |
@@ -1,21 +1,22 @@ |
| 1 |
-Summary: Cron Daemon |
|
| 2 |
-Name: cronie |
|
| 3 |
-Version: 1.5.0 |
|
| 4 |
-Release: 10%{?dist}
|
|
| 5 |
-License: GPLv2+ and MIT and BSD and ISC |
|
| 6 |
-URL: https://fedorahosted.org/cronie |
|
| 7 |
-Source0: https://fedorahosted.org/releases/c/r/cronie/%{name}-%{version}.tar.gz
|
|
| 1 |
+Summary: Cron Daemon |
|
| 2 |
+Name: cronie |
|
| 3 |
+Version: 1.5.0 |
|
| 4 |
+Release: 11%{?dist}
|
|
| 5 |
+License: GPLv2+ and MIT and BSD and ISC |
|
| 6 |
+URL: https://fedorahosted.org/cronie |
|
| 7 |
+Source0: https://fedorahosted.org/releases/c/r/cronie/%{name}-%{version}.tar.gz
|
|
| 8 | 8 |
%define sha1 cronie=bbf154a6db7c9802664d1f0397b5e7ae9a9618e4 |
| 9 |
-Source1: run-parts.sh |
|
| 10 |
-Group: System Environment/Base |
|
| 11 |
-Vendor: VMware, Inc. |
|
| 12 |
-Distribution: Photon |
|
| 13 |
-BuildRequires: libselinux-devel |
|
| 14 |
-BuildRequires: Linux-PAM |
|
| 9 |
+Source1: run-parts.sh |
|
| 10 |
+Patch0: cronie_fix_pam_configuration.patch |
|
| 11 |
+Group: System Environment/Base |
|
| 12 |
+Vendor: VMware, Inc. |
|
| 13 |
+Distribution: Photon |
|
| 14 |
+BuildRequires: libselinux-devel |
|
| 15 |
+BuildRequires: Linux-PAM |
|
| 15 | 16 |
BuildRequires: systemd |
| 16 | 17 |
Requires: systemd |
| 17 |
-Requires: libselinux |
|
| 18 |
-Requires: Linux-PAM |
|
| 18 |
+Requires: libselinux |
|
| 19 |
+Requires: Linux-PAM |
|
| 19 | 20 |
%description |
| 20 | 21 |
Cronie contains the standard UNIX daemon crond that runs specified programs at |
| 21 | 22 |
scheduled times and related tools. It is based on the original cron and |
| ... | ... |
@@ -24,6 +25,7 @@ SELinux. |
| 24 | 24 |
%prep |
| 25 | 25 |
%setup -q |
| 26 | 26 |
sed -i "s/\/usr\/sbin\/anacron -s/\/usr\/sbin\/anacron -s -S \/var\/spool\/anacron/" contrib/0anacron |
| 27 |
+%patch0 -p1 |
|
| 27 | 28 |
%build |
| 28 | 29 |
autoreconf |
| 29 | 30 |
./configure \ |
| ... | ... |
@@ -104,26 +106,28 @@ make -k check |& tee %{_specdir}/%{name}-check-log || %{nocheck}
|
| 104 | 104 |
/var/spool/anacron/cron.monthly |
| 105 | 105 |
/var/spool/anacron/cron.weekly |
| 106 | 106 |
%changelog |
| 107 |
+* Mon Aug 29 2016 Divya Thaluru <dthaluru@vmware.com> 1.5.0-11 |
|
| 108 |
+- Fixed pam configuration for crond |
|
| 107 | 109 |
* Thu Aug 4 2016 Divya Thaluru <dthaluru@vmware.com> 1.5.0-10 |
| 108 | 110 |
- Added logic to not replace conf files in upgrade scenario |
| 109 |
-* Tue May 24 2016 Priyesh Padmavilasom <ppadmavilasom@vmware.com> 1.5.0-9 |
|
| 110 |
-- GA - Bump release of all rpms |
|
| 111 |
-* Tue May 3 2016 Divya Thaluru <dthaluru@vmware.com> 1.5.0-8 |
|
| 112 |
-- Fixing spec file to handle rpm upgrade scenario correctly |
|
| 113 |
-* Thu Mar 24 2016 Xiaolin Li <xiaolinl@vmware.com> 1.5.0-7 |
|
| 114 |
-- Add run-parts command. |
|
| 115 |
-* Fri Mar 04 2016 Anish Swaminathan <anishs@vmware.com> 1.5.0-6 |
|
| 116 |
-- Add folders to sysconfdir. |
|
| 117 |
-* Mon Feb 08 2016 Anish Swaminathan <anishs@vmware.com> 1.5.0-5 |
|
| 118 |
-- Change default sysconfdir. |
|
| 119 |
-* Thu Dec 10 2015 Xiaolin Li <xiaolinl@vmware.com> 1.5.0-4 |
|
| 120 |
-- Add systemd to Requires and BuildRequires. |
|
| 121 |
-- Use systemctl to enable/disable service. |
|
| 122 |
-* Mon Nov 30 2015 Xiaolin Li <xiaolinl@vmware.com> 1.5.0-3 |
|
| 123 |
-- Symlink cron.service to crond.service. |
|
| 124 |
-- And move the /usr/etc/pam.d/crond to /etc/pam.d/crond |
|
| 125 |
-* Thu Nov 12 2015 Xiaolin Li <xiaolinl@vmware.com> 1.5.0-2 |
|
| 126 |
-- Add crond to systemd service. |
|
| 127 |
-* Wed Jun 17 2015 Divya Thaluru <dthaluru@vmware.com> 1.5.0-1 |
|
| 128 |
-- Initial build. First version |
|
| 111 |
+* Tue May 24 2016 Priyesh Padmavilasom <ppadmavilasom@vmware.com> 1.5.0-9 |
|
| 112 |
+- GA - Bump release of all rpms |
|
| 113 |
+* Tue May 3 2016 Divya Thaluru <dthaluru@vmware.com> 1.5.0-8 |
|
| 114 |
+- Fixing spec file to handle rpm upgrade scenario correctly |
|
| 115 |
+* Thu Mar 24 2016 Xiaolin Li <xiaolinl@vmware.com> 1.5.0-7 |
|
| 116 |
+- Add run-parts command. |
|
| 117 |
+* Fri Mar 04 2016 Anish Swaminathan <anishs@vmware.com> 1.5.0-6 |
|
| 118 |
+- Add folders to sysconfdir. |
|
| 119 |
+* Mon Feb 08 2016 Anish Swaminathan <anishs@vmware.com> 1.5.0-5 |
|
| 120 |
+- Change default sysconfdir. |
|
| 121 |
+* Thu Dec 10 2015 Xiaolin Li <xiaolinl@vmware.com> 1.5.0-4 |
|
| 122 |
+- Add systemd to Requires and BuildRequires. |
|
| 123 |
+- Use systemctl to enable/disable service. |
|
| 124 |
+* Mon Nov 30 2015 Xiaolin Li <xiaolinl@vmware.com> 1.5.0-3 |
|
| 125 |
+- Symlink cron.service to crond.service. |
|
| 126 |
+- And move the /usr/etc/pam.d/crond to /etc/pam.d/crond |
|
| 127 |
+* Thu Nov 12 2015 Xiaolin Li <xiaolinl@vmware.com> 1.5.0-2 |
|
| 128 |
+- Add crond to systemd service. |
|
| 129 |
+* Wed Jun 17 2015 Divya Thaluru <dthaluru@vmware.com> 1.5.0-1 |
|
| 130 |
+- Initial build. First version |
|
| 129 | 131 |
|
| 130 | 132 |
new file mode 100644 |
| ... | ... |
@@ -0,0 +1,13 @@ |
| 0 |
+--- a/pam/crond 2010-08-13 05:31:07.000000000 -0700 |
|
| 1 |
+@@ -4,7 +4,7 @@ |
|
| 2 |
+ # |
|
| 3 |
+ # No PAM authentication called, auth modules not needed |
|
| 4 |
+ account required pam_access.so |
|
| 5 |
+-account include password-auth |
|
| 6 |
++account include system-account |
|
| 7 |
+ session required pam_loginuid.so |
|
| 8 |
+-session include password-auth |
|
| 9 |
+-auth include password-auth |
|
| 10 |
++session include system-session |
|
| 11 |
++auth include system-auth |