pool/cronie
SHA256
4
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Accepting request 1041108 from home:schubi2:pam_usr_etc

Browse Source 
- Migration PAM settings to /usr/etc: Saving user changed
  configuration files in /etc and restoring them while an RPM
  update.
- Removed update support from 4.1 vixie-cron which is really old.

OBS-URL: https://build.opensuse.org/request/show/1041108
OBS-URL: https://build.opensuse.org/package/show/Base:System/cronie?expand=0&rev=207
This commit is contained in:
Danilo Spinella 2022-12-13 09:23:40 +00:00 committed by Git OBS Bridge
parent 466ad1fa5a
commit cc22649b87
2 changed files with 30 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
cronie.changes
View File

@ -1,3 +1,11 @@
-------------------------------------------------------------------
Wed Dec 7 10:11:32 UTC 2022 - Stefan Schubert <schubi@suse.com>
- Migration PAM settings to /usr/etc: Saving user changed
configuration files in /etc and restoring them while an RPM
update.
- Removed update support from 4.1 vixie-cron which is really old.
-------------------------------------------------------------------
Wed May 11 09:17:27 UTC 2022 - Danilo Spinella <danilo.spinella@suse.com>

40
cronie.spec
View File

@ -148,34 +148,34 @@ touch %{buildroot}%{_localstatedir}/spool/anacron/cron.daily
touch %{buildroot}%{_localstatedir}/spool/anacron/cron.weekly
touch %{buildroot}%{_localstatedir}/spool/anacron/cron.monthly
%pre -n cron
# Check if we are doing update from 4.1 vixie-cron.
# The -h does report garbage on vixie cron.
check_cron_mail_feature=`%{_sbindir}/cron -h 2>&1 | %{_bindir}/grep mail`
if [ -e %{_sbindir}/cron -a -z "${check_cron_mail_feature}" ]; then
touch %{_localstatedir}/run/update_from_old_cron
for conf in %{cron_configs} ; do
cp "$conf" "$conf.rpmbk"
done
fi
exit 0
%if 0%{?suse_version} > 1500
mkdir -p %{buildroot}%{_distconfdir}/pam.d
mv %{buildroot}%{_sysconfdir}/pam.d/crond %{buildroot}%{_distconfdir}/pam.d/
%endif
%pre
%if 0%{?suse_version} > 1500
# Prepare for migration to /usr/etc; save any old .rpmsave
for i in pam.d/crond ; do
test -f %{_sysconfdir}/${i}.rpmsave && mv -v %{_sysconfdir}/${i}.rpmsave %{_sysconfdir}/${i}.rpmsave.old ||:
done
%endif
%service_add_pre cron.service
%post
# Move the old cron configurations back if we were updating
if [ -e %{_localstatedir}/run/update_from_old_cron ]; then
for conf in %{cron_configs} ; do
mv "$conf.rpmbk" "$conf"
done
rm %{_localstatedir}/run/update_from_old_cron
fi
%set_permissions %{_sysconfdir}/crontab %{_bindir}/crontab
%{fillup_only -n cron}
%service_add_post cron.service
exit 0
%if 0%{?suse_version} > 1500
%posttrans
# Migration to /usr/etc, restore just created .rpmsave
for i in pam.d/crond ; do
test -f %{_sysconfdir}/${i}.rpmsave && mv -v %{_sysconfdir}/${i}.rpmsave %{_sysconfdir}/${i} ||:
done
%endif
%verifyscript
%verify_permissions -e %{_sysconfdir}/crontab -e %{_bindir}/crontab
@ -210,7 +210,11 @@ exit 0
%dir %attr(700,root,root) %{_localstatedir}/spool/cron
%dir %attr(700,root,root) %{_localstatedir}/spool/cron/tabs
%dir %{_localstatedir}/spool/cron/lastrun
%if 0%{?suse_version} > 1500
%{_distconfdir}/pam.d/crond
%else
%config %{_sysconfdir}/pam.d/crond
%endif
%verify(not mode) %config(noreplace) %{_sysconfdir}/crontab
%config(noreplace) %{_sysconfdir}/cron.deny
%{_mandir}/man1/crontab.1%{?ext_man}