--- rpms/phpki/contribs7/phpki.spec	2009/03/02 23:38:37	1.1
+++ rpms/phpki/contribs7/phpki.spec	2010/05/28 09:49:57	1.7
@@ -1,11 +1,14 @@
+# $Id: phpki.spec,v 1.5 2009/08/26 17:49:59 vip-ire Exp $
+# Authority: vip-ire
+# Name: Daniel Berteaud
+
 %define 	name phpki
 %define 	version 0.82
-%define 	release 7
+%define 	release 12
 Summary: 	Phpki is a simple certificate management suite
 Name: 		%{name}
 Version: 	%{version}
 Release: 	%{release}%{?dist}
-Distribution: 	SME Server
 License: 	GNU GPL version 2
 URL: 		http://sourceforge.net/projects/phpki/
 Group: 		SMEserver/addon
@@ -23,10 +26,15 @@ 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
 
-Packager: 	Daniel B.  <daniel@firewall-services.com>
 BuildArch: 	noarch
 BuildRoot: 	/var/tmp/%{name}-%{version}
+
+BuildRequires:  e-smith-devtools
+
 Requires: 	e-smith-release >= 7.0
 Requires: 	php
 Requires: 	openssl
@@ -40,6 +48,22 @@ With it, you may create and centrally ma
 e-mail clients, SSL servers, and VPN applications.
 
 %changelog
+* 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]
+
+* Tue Mar 03 2009 Daniel B. <daniel@firewall-services.com> [0.82-8]
+- Add e-smith-devtools as a dependencie
+
 * Tue Jan 20 2009 Daniel B. <daniel@firewall-services.com> [0.82-7]
 - Don't replace config file on upgrades
 
@@ -85,13 +109,28 @@ e-mail clients, SSL servers, and VPN app
 %patch10 -p1
 %patch11 -p1
 %patch12 -p1
+%patch13 -p1
+%patch14 -p1
+%patch15 -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
@@ -108,6 +147,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)' \
@@ -137,9 +177,15 @@ if [ $1 == 1 ]; then
 header(\"Location: ./../index.php\");
 ?>
 " > /opt/phpki/html/ca/index.php
-
 fi
 
 %postun
+# Remove the links to index.php after uninstall
+if [ $1 == 0 ]; then
+    %{__rm} -f /opt/phpki/html/index.php
+    %{__rm} -f /opt/phpki/html/setup.php
+    %{__rm} -f /opt/phpki/html/ca/index.php
+fi
+
 
 true