--- rpms/phpki-ng/contribs10/phpki-ng.spec	2021/03/09 00:18:24	1.6
+++ rpms/phpki-ng/contribs10/phpki-ng.spec	2021/04/06 00:24:42	1.11
@@ -4,7 +4,7 @@
 
 %define 	name phpki-ng
 %define 	version 0.84
-%define 	release 5
+%define 	release 10
 Summary: 	Phpki is a simple certificate management suite
 Name: 		%{name}
 Version: 	%{version}
@@ -18,6 +18,8 @@ Patch1:         phpki-ng-0.84-fix-for-ph
 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
 
 BuildArch: 	noarch
 BuildRoot: 	/var/tmp/%{name}-%{version}
@@ -40,6 +42,27 @@ With it, you may create and centrally ma
 e-mail clients, SSL servers, and VPN applications.
 
 %changelog
+* Tue Apr 06 2021 John Crisp <jcrisp@safeandsoundit.co.uk> 0.84-9.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]
@@ -171,6 +194,8 @@ e-mail clients, SSL servers, and VPN app
 %patch2 -p1
 %patch3 -p1
 %patch4 -p1
+%patch5 -p1
+%patch6 -p1
 
 %build
 %{__mkdir_p} root/opt/phpki/html
@@ -229,10 +254,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 ""
 
@@ -241,16 +266,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