X-Git-Url: http://git.pld-linux.org/?p=packages%2Fcronie.git;a=blobdiff_plain;f=cronie.spec;h=1082eda67e055f13beefd310da6cc45735fe4d9e;hp=cc717c4ffa02463dc1c03fcb0018abb7af013561;hb=ced4ed8fe1fcd10b6e5c018e788c51fdd48d8be9;hpb=ee9a7f9a782c7a48504f328ddff150e2d6abf332 diff --git a/cronie.spec b/cronie.spec index cc717c4..1082eda 100644 --- a/cronie.spec +++ b/cronie.spec @@ -1,15 +1,14 @@ # TODO # - update paths in manuals (create .in files and send upstream) # - make /etc/pam.d independant of sysconfdir (configure-able option and send upstream) -# - https://fedorahosted.org/cronie/changeset/272c4a5c417bfa6e04148fc35a4fe4c6956b17e1 -# should we follow it too? our pam contains cron.{allow,deny} listfile rules, -# cronie itself checks these files so safe to drop? +# - syslog output (-s) writes two bytes of garbage to syslog instead of actual data: +# Mar 3 09:30:01 ravenous CROND[2528]: 4ÿ # # Conditional build: %bcond_without inotify # without inotify support %if "%{pld_release}" == "ac" -%bcond_with selinux # without SELinux support -%bcond_with audit # without audit support +%bcond_with selinux # with SELinux support +%bcond_with audit # with audit support %else %bcond_without selinux # without SELinux support %bcond_without audit # without audit support @@ -17,20 +16,20 @@ Summary: Cron daemon for executing programs at set times Name: cronie -Version: 1.4.3 +Version: 1.5.0 Release: 1 License: MIT and BSD and GPL v2 Group: Daemons Source0: https://fedorahosted.org/releases/c/r/cronie/%{name}-%{version}.tar.gz -# Source0-md5: 2393b3e5828fc09d9acf04dfd7796ab9 +# Source0-md5: 9db75e1884d83a45e002d145c6c54d45 Source1: %{name}.init Source2: cron.logrotate Source3: cron.sysconfig Source4: %{name}.crontab Source5: %{name}.pam +Source6: crond.service Patch0: inotify-nosys.patch -Patch1: %{name}-nosyscrontab.patch -Patch2: sendmail-path.patch +Patch1: sendmail-path.patch URL: https://fedorahosted.org/cronie/ %{?with_audit:BuildRequires: audit-libs-devel} BuildRequires: autoconf @@ -38,28 +37,31 @@ BuildRequires: automake %{?with_selinux:BuildRequires: libselinux-devel} BuildRequires: pam-devel BuildRequires: rpm >= 4.4.9-56 -BuildRequires: rpmbuild(macros) >= 1.268 +BuildRequires: rpmbuild(macros) >= 1.647 Requires(post): fileutils Requires(post,preun): /sbin/chkconfig -Requires(post,preun): rc-scripts Requires(postun): /usr/sbin/groupdel Requires(pre): /usr/bin/getgid Requires(pre): /usr/sbin/groupadd Requires: /bin/run-parts -Requires: /sbin/chkconfig Requires: psmisc >= 20.1 -Requires: rc-scripts +Requires: rc-scripts >= 0.4.3.0 +%if "%{pld_release}" != "ac" +Requires(post,preun,postun): systemd-units >= 38 +Requires: systemd-units >= 38} +%endif %{?with_inotify:Requires: uname(release) >= 2.6.13} Provides: crondaemon Provides: crontabs = 1.7 Provides: group(crontab) %if "%{pld_release}" == "th" -Provides: vixie-cron = 4:4.4 +Provides: vixie-cron = 4.3-1 %endif Obsoletes: crondaemon +Obsoletes: cronie-systemd Obsoletes: crontabs %if "%{pld_release}" == "th" -Obsoletes: vixie-cron <= 4:4.3 +Obsoletes: vixie-cron < 4.3-1 %endif BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) @@ -84,7 +86,6 @@ however this could be overloaded in settings. %setup -q %patch0 -p1 %patch1 -p1 -%patch2 -p1 %build %{__aclocal} @@ -95,17 +96,23 @@ however this could be overloaded in settings. SYSCRONTAB=/etc/crontab \ SYS_CROND_DIR=/etc/cron.d \ --sysconfdir=/etc/cron \ + --with-editor=/bin/vi \ --with-pam \ --with%{!?with_selinux:out}-selinux \ --with%{!?with_audit:out}-audit \ --with%{!?with_inotify:out}-inotify \ + --disable-syscrontab \ +%if "%{cc_version}" >= "3.4" + --enable-pie \ +%endif + --enable-relro \ --enable-anacron %{__make} %install rm -rf $RPM_BUILD_ROOT -install -d $RPM_BUILD_ROOT{/var/{log,spool/{ana,}cron},%{_mandir}} \ +install -d $RPM_BUILD_ROOT{/var/{log,spool/{ana,}cron},%{_mandir},%{systemdunitdir}}\ $RPM_BUILD_ROOT/etc/{rc.d/init.d,logrotate.d,sysconfig} \ $RPM_BUILD_ROOT%{_sysconfdir}/{cron,cron.{d,hourly,daily,weekly,monthly},pam.d} @@ -113,12 +120,21 @@ install -d $RPM_BUILD_ROOT{/var/{log,spool/{ana,}cron},%{_mandir}} \ pamdir=/etc/pam.d \ DESTDIR=$RPM_BUILD_ROOT +cp -p %{SOURCE5} crond.pam + +%if %{without audit} +# remove recording user's login uid to the process attribute +%{__sed} -i -e '/pam_loginuid.so/d' crond.pam +%endif + install -p %{SOURCE1} $RPM_BUILD_ROOT/etc/rc.d/init.d/crond cp -a contrib/0anacron $RPM_BUILD_ROOT/etc/cron.hourly/0anacron +cp -a contrib/anacrontab $RPM_BUILD_ROOT/etc/cron/anacrontab cp -a %{SOURCE2} $RPM_BUILD_ROOT/etc/logrotate.d/cron cp -a %{SOURCE3} $RPM_BUILD_ROOT/etc/sysconfig/cron cp -a %{SOURCE4} $RPM_BUILD_ROOT/etc/cron.d/crontab -cp -a %{SOURCE5} $RPM_BUILD_ROOT/etc/pam.d/crond +cp -a crond.pam $RPM_BUILD_ROOT/etc/pam.d/crond +cp -a %{SOURCE6} $RPM_BUILD_ROOT%{systemdunitdir}/crond.service touch $RPM_BUILD_ROOT/var/log/cron @@ -141,43 +157,59 @@ rm -rf $RPM_BUILD_ROOT %post if [ ! -f /var/log/cron ]; then - umask 027 - touch /var/log/cron - chgrp crontab /var/log/cron - chmod 660 /var/log/cron + install -m 660 -g crontab /dev/null /var/log/cron fi /sbin/chkconfig --add crond %service crond restart "Cron Daemon" +%systemd_post crond.service %preun if [ "$1" = "0" ]; then %service crond stop /sbin/chkconfig --del crond fi +%systemd_preun crond.service %postun if [ "$1" = "0" ]; then %groupremove crontab fi +%systemd_reload + +%triggerpostun -- cronie < 1.4.8-13 +if [ -f /etc/sysconfig/cron ]; then + . /etc/sysconfig/cron + __CROND_ARGS= + [ "$CROND_SYSLOG_RESULT" = "yes" ] && __CROND_ARGS="-s" + [ -n "$CROND_MAIL_PROG" ] && __CROND_ARGS="$__CROND_ARGS -m $CROND_MAIL_PROG" + if [ -n "$__CROND_ARGS" ]; then + %{__cp} -f /etc/sysconfig/cron{,.rpmsave} + echo >>/etc/sysconfig/cron + echo "# Added by rpm trigger" >>/etc/sysconfig/cron + echo "CROND_ARGS=\"$CROND_ARGS $__CROND_ARGS\"" >>/etc/sysconfig/cron + fi +fi +%systemd_trigger crond.service -%triggerpostun -- hc-cron -# reinstall crond init.d links, which could be different -/sbin/chkconfig --del crond -/sbin/chkconfig --add crond - -%triggerun -- vixie-cron +%triggerun -- hc-cron,fcron,vixie-cron < 4.3-1 # Prevent preun from crond from working chmod a-x /etc/rc.d/init.d/crond -%triggerpostun -- vixie-cron +%triggerpostun -- hc-cron,fcron,vixie-cron < 4.3-1 # Restore what triggerun removed chmod 754 /etc/rc.d/init.d/crond +# reinstall crond init.d links, which could be different +/sbin/chkconfig --del crond /sbin/chkconfig --add crond %files %defattr(644,root,root,755) %doc AUTHORS ChangeLog README -%attr(750,root,crontab) %dir %{_sysconfdir}/cron* +%attr(750,root,crontab) %dir /etc/cron +%attr(750,root,crontab) %dir /etc/cron.daily +%attr(750,root,crontab) %dir /etc/cron.hourly +%attr(750,root,crontab) %dir /etc/cron.monthly +%attr(750,root,crontab) %dir /etc/cron.weekly %attr(640,root,crontab) %config(noreplace,missingok) /etc/cron.d/crontab %attr(640,root,crontab) %config(noreplace,missingok) %verify(not md5 mtime size) %{_sysconfdir}/cron/cron.allow %attr(640,root,crontab) %config(noreplace,missingok) %verify(not md5 mtime size) %{_sysconfdir}/cron/cron.deny @@ -185,6 +217,7 @@ chmod 754 /etc/rc.d/init.d/crond %config(noreplace) %verify(not md5 mtime size) /etc/pam.d/crond %attr(754,root,root) /etc/rc.d/init.d/crond %attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) /etc/logrotate.d/cron +%{systemdunitdir}/crond.service %attr(755,root,root) %{_sbindir}/crond %attr(2755,root,crontab) %{_bindir}/crontab @@ -200,6 +233,7 @@ chmod 754 /etc/rc.d/init.d/crond %defattr(644,root,root,755) %attr(755,root,root) %{_sbindir}/anacron %attr(755,root,root) %{_sysconfdir}/cron.hourly/0anacron +%attr(640,root,crontab) %config(noreplace,missingok) %verify(not md5 mtime size) /etc/cron/anacrontab %{_mandir}/man5/anacrontab.5* %{_mandir}/man8/anacron.8*