--- rpms/phpki/contribs9/phpki.spec	2013/11/11 17:01:19	1.1
+++ rpms/phpki/contribs9/phpki.spec	2020/04/02 12:39:02	1.8
@@ -1,10 +1,10 @@
-# $Id: phpki.spec,v 1.1 2013/05/24 22:17:29 unnilennium Exp $
+# $Id: phpki.spec,v 1.7 2020/04/02 10:29:40 jcrisp Exp $
 # Authority: vip-ire
 # Name: Daniel Berteaud
 
 %define 	name phpki
 %define 	version 0.82
-%define 	release 16
+%define 	release 23
 Summary: 	Phpki is a simple certificate management suite
 Name: 		%{name}
 Version: 	%{version}
@@ -31,13 +31,19 @@ Patch14:	phpki-0.82-empty_pass_php_5.2.p
 Patch15:	phpki-0.82-update_crl_via_cron.patch
 Patch16:	phpki-0.82-use_sha1.patch
 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
+Patch22:	phpki-0.82-fix-dates-2.patch
+Patch23:	phpki-0.82-fix-dates-3.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
@@ -50,6 +56,33 @@ With it, you may create and centrally ma
 e-mail clients, SSL servers, and VPN applications.
 
 %changelog
+* Thu Apr 02 2020 John Crisp <jcrisp@safeandsoundit.co.uk> 0.82-23.sme
+- Add secondary date sort after Status sort
+
+* Thu Apr 02 2020 John Crisp <jcrisp@safeandsoundit.co.uk> 0.82-22.sme
+- Add the patch file which I forgot
+
+* Thu Apr 02 2020 John Crisp <jcrisp@safeandsoundit.co.uk> 0.82-21.sme
+- Modify the dates fix to sort digitally
+
+* Tue Mar 03 2020 John Crisp <jcrisp@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]
+
+* Mon Oct 8 2018 Daniel B. <daniel@firewall-services.com> 0.82-18.sme
+- Fix potential XSS with unsafe use of PHP_SELF [SME: 10626]
+
+* Thu Sep 6 2018 brian r. <brianr@bjsystems.co.uk> 0.82-17.sme
+- Replace use of ereg by preg_replace as per deprecated in php 5.3 and removed in 7.0
+- [SME: 10622]
+
 * Mon Dec 12 2011 Daniel B. <daniel@firewall-services.com> 0.82-16.sme
 - Remove php-posix dependency (not available, nor needed on SME 7.x) [SME: 6805]
 
@@ -129,6 +162,12 @@ e-mail clients, SSL servers, and VPN app
 %patch15 -p1
 %patch16 -p1
 %patch17 -p1
+%patch18 -p1
+%patch19 -p1
+%patch20 -p1
+%patch21 -p1
+%patch22 -p1
+%patch23 -p1
 
 %build
 %{__mkdir_p} root/opt/phpki/html