--- rpms/phpki/contribs7/phpki.spec	2009/03/23 12:35:20	1.4
+++ rpms/phpki/contribs7/phpki.spec	2011/10/26 10:15:15	1.10
@@ -1,10 +1,10 @@
-# $Id: phpki.spec,v 1.3 2009/03/03 18:36:43 vip-ire Exp $
+# $Id: phpki.spec,v 1.9 2011/06/29 11:11:58 vip-ire Exp $
 # Authority: vip-ire
 # Name: Daniel Berteaud
 
 %define 	name phpki
 %define 	version 0.82
-%define 	release 9
+%define 	release 15
 Summary: 	Phpki is a simple certificate management suite
 Name: 		%{name}
 Version: 	%{version}
@@ -26,6 +26,11 @@ Patch9: 	phpki-0.82-display_root_pem.pat
 Patch10:	phpki-0.82-disable_download_after_create.patch
 Patch11:	phpki-0.82-remove_security_warning.patch
 Patch12:	phpki-0.82-remove_email_from_upload_file_name.patch2
+Patch13:	phpki-0.82-ca_help.patch
+Patch14:	phpki-0.82-empty_pass_php_5.2.patch
+Patch15:	phpki-0.82-update_crl_via_cron.patch
+Patch16:	phpki-0.82-use_sha1.patch
+Patch17:	phpki-0.82-ca_admin_users.patch
 
 BuildArch: 	noarch
 BuildRoot: 	/var/tmp/%{name}-%{version}
@@ -34,6 +39,7 @@ BuildRequires:  e-smith-devtools
 
 Requires: 	e-smith-release >= 7.0
 Requires: 	php
+Requires:	php-posix
 Requires: 	openssl
 Requires: 	openvpn
 AutoReqProv: 	no
@@ -45,6 +51,25 @@ With it, you may create and centrally ma
 e-mail clients, SSL servers, and VPN applications.
 
 %changelog
+* Wed Oct 26 2011 Daniel B. <daniel@firewall-services.com> 0.82-15.sme
+- Requires php-posix
+
+* Wed Jun 29 2011 Daniel B. <daniel@firewall-services.com> 0.82-14.sme
+- Don't check issuer (everyone allowed to access /ca can manage
+  all the certificates, access to /ca is controlled by apache)
+
+* Tue Mar 15 2011 Daniel B. <daniel@firewall-services.com> 0.82-13.sme
+- Replace md5 with sha1 for signing
+
+* Fri May 28 2010 Daniel B. <daniel@firewall-services.com> [0.82-12]
+- Weekly update the CRL via cron so MS Crypto API will be happy
+
+* Thu Mar 18 2010 Daniel B. <daniel@firewall-services.com> [0.82-11]
+- Fixe empty password with PHP 5.2 (SME 8b5)
+
+* Wed Aug 26 2009 Daniel B. <daniel@firewall-services.com> [0.82-10]
+- Fixe links for CA help page
+
 * Mon Mar 23 2009 Daniel B. <daniel@firewall-services.com> [0.82-9]
 - Remove links after uninstall so you can easily re-install the contrib
   later [SME: 5091]
@@ -97,13 +122,30 @@ e-mail clients, SSL servers, and VPN app
 %patch10 -p1
 %patch11 -p1
 %patch12 -p1
+%patch13 -p1
+%patch14 -p1
+%patch15 -p1
+%patch16 -p1
+%patch17 -p1
 
 %build
-#drop in an unchanged .tgz, if required rename directory here, eg remove version number.
 %{__mkdir_p} root/opt/phpki/html
 %{__mkdir_p} root/opt/phpki/phpki-store
+%{__mkdir_p} root/opt/phpki/bin
+%{__mkdir_p} root/%{_sysconfdir}/cron.weekly/
+%{__mv} %{name}-%{version}/gen_crl.php root/opt/phpki/bin/
 %{__mv} %{name}-%{version}/* root/opt/phpki/html/
 
+
+cat <<"HERE" > root/%{_sysconfdir}/cron.weekly/phpki_update_crl
+#!/bin/bash
+
+cd /opt/phpki/bin
+php ./gen_crl.php 2>&1 > /dev/null
+
+HERE
+
+
 # Remove links to setup page so upgrades can be done smoothly
 %{__rm} -f root/opt/phpki/html/index.php
 %{__rm} -f root/opt/phpki/html/ca/index.php
@@ -120,6 +162,7 @@ rm -f %{name}-%{version}-filelist
 /sbin/e-smith/genfilelist $RPM_BUILD_ROOT \
    --file '/opt/phpki/html/config.php' 'attr(660,root,phpki) %config(noreplace)' \
    --file '/opt/phpki/html/openssl.cnf' 'attr(660,root,phpki) %config(noreplace)' \
+   --file '%{_sysconfdir}/cron.weekly/phpki_update_crl' 'attr(744,root,root)' \
    --dir  '/opt/phpki/html' 'attr(770,root,phpki)' \
    --dir  '/opt/phpki/html/ca' 'attr(770,root,phpki)' \
    --dir  '/opt/phpki/phpki-store' 'attr(750,phpki,phpki)' \