diff --git a/.gitignore b/.gitignore index 64d945c..ebad5a0 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,3 @@ /totpcgi-0.5.3.tar.bz2 /totpcgi-0.5.4.tar.bz2 +/totpcgi-0.5.5.tar.bz2 diff --git a/sources b/sources index 42c2df3..f5147ef 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -7793cd8e6f13826d8614a282065a27c7 totpcgi-0.5.4.tar.bz2 +a8effcd4fc09c98e632c28ccbd99f5f4 totpcgi-0.5.5.tar.bz2 diff --git a/totpcgi.spec b/totpcgi.spec index 64a2efb..019e6a8 100644 --- a/totpcgi.spec +++ b/totpcgi.spec @@ -10,13 +10,13 @@ %define fixfiles_dirs %{_localstatedir}/www/totpcgi %{_localstatedir}/www/totpcgi-provisioning %{_localstatedir}/lib/totpcgi %{_sysconfdir}/totpcgi Name: totpcgi -Version: 0.5.4 +Version: 0.5.5 Release: 1%{?dist} Summary: A centralized totp solution based on google-authenticator License: GPLv2+ URL: https://github.com/mricon/totp-cgi -Source0: https://github.com/downloads/mricon/totp-cgi/%{name}-%{version}.tar.bz2 +Source0: https://github.com/mricon/totp-cgi/releases/download/0.5.5/totpcgi-0.5.5.tar.bz2 BuildArch: noarch @@ -89,7 +89,7 @@ install -m 0640 conf/*.conf %{buildroot}%{_sysconfdir}/totpcgi/ install -m 0640 conf/templates/*.html %{buildroot}%{_sysconfdir}/totpcgi/templates/ # Create the state directory -mkdir -p -m 0700 %{buildroot}%{_localstatedir}/lib/totpcgi +mkdir -p -m 0770 %{buildroot}%{_localstatedir}/lib/totpcgi # Create the CGI dirs mkdir -p -m 0751 \ @@ -114,8 +114,8 @@ install -m 0644 contrib/vhost-totpcgi-provisioning.conf \ # Install totpprov script and manpage mkdir -p -m 0755 %{buildroot}%{_bindir} install -m 0755 contrib/totpprov.py %{buildroot}%{_bindir}/totpprov -mkdir -p -m 0755 %{buildroot}%{_mandir}/man5 -install -m 0644 contrib/totpprov.5 %{buildroot}%{_mandir}/man5/ +mkdir -p -m 0755 %{buildroot}%{_mandir}/man1 +install -m 0644 contrib/totpprov.1 %{buildroot}%{_mandir}/man1/ # Install SELinux files for selinuxvariant in %{selinux_variants} @@ -147,6 +147,11 @@ fi if [ -f /sbin/fixfiles ] ; then /sbin/fixfiles -R totpcgi-provisioning restore || : fi +# make sure /var/lib/totpcgi is 0770 totpcgiprov:totpcgi +chown -R %{totpcgiprovuser}:%{totpcgiuser} %{_localstatedir}/lib/totpcgi || : +chmod 0770 %{_localstatedir}/lib/totpcgi || : +# make sure state files are accessible to provisioning +chmod 0660 %{_localstatedir}/lib/totpcgi/*.json >/dev/null 2>&1 || : %post selinux for selinuxvariant in %{selinux_variants} @@ -174,7 +179,7 @@ fi %attr(-, %{totpcgiuser}, %{totpcgiuser}) %{_localstatedir}/www/totpcgi/*.cgi %config(noreplace) %attr(-, -, %{totpcgiuser}) %{_sysconfdir}/totpcgi/totpcgi.conf %config(noreplace) %{_sysconfdir}/httpd/conf.d/totpcgi.conf -%attr(-, %{totpcgiuser}, %{totpcgiuser}) %{_localstatedir}/lib/totpcgi +%attr(-, %{totpcgiprovuser}, %{totpcgiuser}) %{_localstatedir}/lib/totpcgi %files -n python-totpcgi %doc COPYING @@ -200,6 +205,9 @@ fi %changelog +* Fri Sep 20 2013 Konstantin Ryabitsev - 0.5.5-1 +- Upstream 0.5.5 with new features. + * Mon Dec 03 2012 Konstantin Ryabitsev - 0.5.4-1 - Upstream 0.5.4 with security fixes.