--- rpms/phpki-ng/contribs10/phpki-ng.spec	2021/03/08 13:37:51	1.3
+++ rpms/phpki-ng/contribs10/phpki-ng.spec	2021/08/05 10:48:00	1.12
@@ -4,7 +4,7 @@
 
 %define 	name phpki-ng
 %define 	version 0.84
-%define 	release 3
+%define 	release 11
 Summary: 	Phpki is a simple certificate management suite
 Name: 		%{name}
 Version: 	%{version}
@@ -16,6 +16,11 @@ Group: 		SMEserver/addon
 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
+Patch5:         phpki-ng-0.84-fix-html-directory-check.patch
+Patch6:         phpki-ng-0.84-fix-download-cert.patch
+Patch7:         phpki-ng-0.84-fix-html-syntax-in-help.patch
 
 BuildArch: 	noarch
 BuildRoot: 	/var/tmp/%{name}-%{version}
@@ -38,13 +43,46 @@ With it, you may create and centrally ma
 e-mail clients, SSL servers, and VPN applications.
 
 %changelog
+* Thu Aug 05 2021 John Crisp <jcrisp@safeandsoundit.co.uk> 0.84-11.sme
+- Fix html syntax error in help - Thanks Mauro De Carolis [SME: 11688]
+
+* Tue Apr 06 2021 John Crisp <jcrisp@safeandsoundit.co.uk> 0.84-10.sme
+- And tidy up the copying wording. [SME: 11192]
+- Credit to Terry Fage for persisting with testing
+
+* Mon Apr 05 2021 John Crisp <jcrisp@safeandsoundit.co.uk> 0.84-9.sme
+- Really fix the copy this time [SME: 11192]
+
+* Sat Apr 03 2021 John Crisp <jcrisp@safeandsoundit.co.uk> 0.84-8.sme
+- copy phpki-store as a backup instead of move [SME: 11192]
+
+* Thu Apr 01 2021 John Crisp <jcrisp@safeandsoundit.co.uk> 0.84-7.sme
+- Fix broken Download Certificate in Cert generation [SME: 11513]
+
+* Thu Mar 18 2021 John Crisp <jcrisp@safeandsoundit.co.uk> 0.84-6.sme
+- Update html header info [SME: 11192]
+- Remove obsolete align
+- Remove accidentally duplicated html
+- Fix typo
+- Fix directory check
+- move function flush_exec to functions file
+
+* 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 ctreation notification [SME: 11437]
-- Bit of file fomatting
+- Add Certificate creation notification [SME: 11437]
+- Bit of file formatting
 
-* Wed Mar 07 2021 John Crisp <jcrisp@safeandsoundit.co.uk> 0.84-2.sme
+* 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]
@@ -158,6 +196,11 @@ e-mail clients, SSL servers, and VPN app
 %setup  -c -n %{name}
 %patch1 -p1
 %patch2 -p1
+%patch3 -p1
+%patch4 -p1
+%patch5 -p1
+%patch6 -p1
+%patch7 -p1
 
 %build
 %{__mkdir_p} root/opt/phpki/html
@@ -216,10 +259,10 @@ echo "*  This contrib now has higher lev
 echo "* "
 echo "*  We cannot upgrade your existing certificates"
 echo "* "
-echo "*  If we detect an existing certificate store"
-echo "*  we are going to move it"
+echo "*  If you have existing certificates you want to use"
+echo "*  then start with a new CA, backup up, and then restore"
+echo "*  your phpki-store directory in /opt/phpki"
 echo "* "
-echo "*  You can then start with a new CA and certificates"
 echo "******************************************************"
 echo ""
 
@@ -228,16 +271,17 @@ if [ -d /opt/phpki/phpki-store ] ; then
     RANDOM=$$
     PHPKIDIR=$(( 1 + $RANDOM%99999 ))
     echo "Number is $PHPKIDIR"
-    echo "moving from /opt/phpki/phpki-store to /opt/phpki/phpki-store.$PHPKIDIR"
-    mv /opt/phpki/phpki-store "/opt/phpki/phpki-store.$PHPKIDIR"
-    echo "Directory moved...continuing installaton"
+    echo "Copying from /opt/phpki/phpki-store to /opt/phpki/phpki-store.$PHPKIDIR"
+    /bin/cp -pr /opt/phpki/phpki-store "/opt/phpki/phpki-store.$PHPKIDIR"
+    echo "Directory copied...continuing installaton"
 else
     echo "No directory detected...continuing installaton"
 fi
 
-echo "Creating phpki user"
+
 
 if ! /usr/bin/id phpki &>/dev/null; then
+echo "Creating phpki user"
 	/usr/sbin/useradd -c 'Phpki User' -s /sbin/nologin -r -d /opt/phpki/phpki-store phpki &>/dev/null || \
 		%logmsg "Unexpected error adding user \"phpki\". Abort installation."
 fi