--- rpms/phpki/contribs9/phpki.spec	2018/11/17 13:20:42	1.4
+++ rpms/phpki/contribs9/phpki.spec	2020/03/03 14:55:34	1.5
@@ -1,10 +1,10 @@
-# $Id: phpki.spec,v 1.3 2018/10/08 07:35:31 dani Exp $
+# $Id: phpki.spec,v 1.4 2018/11/17 13:20:42 jcrisp Exp $
 # Authority: vip-ire
 # Name: Daniel Berteaud
 
 %define 	name phpki
 %define 	version 0.82
-%define 	release 19
+%define 	release 20
 Summary: 	Phpki is a simple certificate management suite
 Name: 		%{name}
 Version: 	%{version}
@@ -34,13 +34,14 @@ Patch17:	phpki-0.82-ca_admin_users.patch
 Patch18:	phpki-0.82.bz10622.fixphpwarnings.patch
 Patch19:        phpki-0.82-potential_xss_php_self.patch
 Patch20:	phpki-0.82-fix-preg_match.patch
+Patch21:        phpki-0.82-fix-dates.patch
 
 BuildArch: 	noarch
 BuildRoot: 	/var/tmp/%{name}-%{version}
 
 BuildRequires:  e-smith-devtools
 
-Requires: 	e-smith-release >= 7.0
+Requires: 	e-smith-release >= 9.0
 Requires: 	php
 Requires: 	openssl
 Requires: 	openvpn
@@ -53,6 +54,14 @@ With it, you may create and centrally ma
 e-mail clients, SSL servers, and VPN applications.
 
 %changelog
+* Tue Mar 03 2020 John Crisp <jcrsip@safeandsoundit.co.uk> 0.82-20.sme
+- Backporting some fixes from 0.83+
+- Fix start/finish/revoke dates
+- expand preg match statements
+- Fix some formatting
+- Bump the required release version
+- Fix country code check [SME:8911]
+
 * Sat Nov 17 2018 Terry Fage <tfage@yahoo.com.au> 0.82-19.sme
 - Fix preg_match warnings [SME:10622]
 
@@ -145,6 +154,7 @@ e-mail clients, SSL servers, and VPN app
 %patch18 -p1
 %patch19 -p1
 %patch20 -p1
+%patch21 -p1
 
 %build
 %{__mkdir_p} root/opt/phpki/html