--- rpms/phpki-ng/contribs10/phpki-ng.spec	2020/11/24 16:17:15	1.1
+++ rpms/phpki-ng/contribs10/phpki-ng.spec	2021/03/09 00:18:24	1.6
@@ -4,7 +4,7 @@
 
 %define 	name phpki-ng
 %define 	version 0.84
-%define 	release 1
+%define 	release 5
 Summary: 	Phpki is a simple certificate management suite
 Name: 		%{name}
 Version: 	%{version}
@@ -14,14 +14,18 @@ URL: 		http://sourceforge.net/projects/p
 Group: 		SMEserver/addon
 #wget 		http://www.fooweb.com/downloads/foo-3.6.431.tar.gz
 Source: 	%{name}-%{version}.tar.gz
+Patch1:         phpki-ng-0.84-fix-for-php74-code-tidy.patch
+Patch2:         phpki-ng-0.84-fix-pregmatch-revoke-certs.patch
+Patch3:         phpki-ng-0.84-fix-crl.patch
+Patch4:         phpki-ng-0.84-fix-missing-slash-certtype-detection.patch
 
 BuildArch: 	noarch
 BuildRoot: 	/var/tmp/%{name}-%{version}
 
 BuildRequires:  e-smith-devtools
 
-Requires: 	e-smith-release >= 9.0
-Requires: 	php
+Requires: 	e-smith-release >= 10.0
+Requires: 	php74-php-fpm
 Requires: 	openssl
 Requires: 	openvpn
 Conflicts:	phpki
@@ -30,13 +34,36 @@ AutoReqProv: 	no
 %description
 http://sourceforge.net/projects/phpki/
 https://github.com/radicand/phpki
+https://github.com/reetp/phpki
 PHPki is an Open Source Web application for managing a multi-agency PKI for HIPAA compliance.
 With it, you may create and centrally manage X.509 certificates for use with S/MIME enabled 
 e-mail clients, SSL servers, and VPN applications.
 
 %changelog
+* Tue Mar 09 2021 John Crisp <jcrisp@safeandsoundit.co.uk> 0.84-5.sme
+- Fix missing / [SME:11435]
+- Update cert type detection for renew [SME: 11436]
+- Code formatting
+
+* Mon Mar 08 2021 John Crisp <jcrisp@safeandsoundit.co.uk> 0.84-4.sme
+- Fix crl creation [SME: 11141]
+- Extra notes in setup page
+
+* Mon Mar 08 2021 John Crisp <jcrisp@safeandsoundit.co.uk> 0.84-3.sme
+- Fix Typo in certificate password [SME: 11435]
+- Fix typos and preg_match issues [SME: 11436]
+- Add Certificate creation notification [SME: 11437]
+- Bit of file formatting
+
+* Wed Mar 03 2021 John Crisp <jcrisp@safeandsoundit.co.uk> 0.84-2.sme
+- Change version to 0.84
+- Fix undefined constant errors [SME: 11397]
+- fix tempdir [SME: 11398]
+- update code to be PHP 7.4+ compliant
+- format with CodeSniff to PSR2
+
 * Wed Apr 01 2020 John Crisp <jcrisp@safeandsoundit.co.uk> 0.84-1.sme
-- Rename to php-ng 0.84
+- Rename to php-ng 0.84 [SME: 11192]
 - Fix date sorting in certificates
 
 * Thu Mar 19 2020 John Crisp <jcrisp@safeandsoundit.co.uk> 0.83-9.sme
@@ -68,7 +95,7 @@ e-mail clients, SSL servers, and VPN app
 * Fri Feb 28 2020 John Crisp <jcrisp@safeandsoundit.co.uk> 0.83-1.sme
 - Update to 0.83 
 
-* Sat Nov 17 2018 Terry Fage <tfage@yahoo.com.au> 
+* 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
@@ -140,6 +167,10 @@ e-mail clients, SSL servers, and VPN app
 
 %prep
 %setup  -c -n %{name}
+%patch1 -p1
+%patch2 -p1
+%patch3 -p1
+%patch4 -p1
 
 %build
 %{__mkdir_p} root/opt/phpki/html
@@ -154,7 +185,7 @@ cat <<"HERE" > root/%{_sysconfdir}/cron.
 #!/bin/bash
 
 cd /opt/phpki/bin
-php ./gen_crl.php 2>&1 > /dev/null
+/usr/bin/php74 ./gen_crl.php 2>&1 > /dev/null
 
 HERE