--- rpms/smeserver-phpki-ng/contribs10/smeserver-phpki-ng.spec	2020/11/24 16:28:22	1.1
+++ rpms/smeserver-phpki-ng/contribs10/smeserver-phpki-ng.spec	2022/10/04 09:59:47	1.13
@@ -4,16 +4,23 @@
 
 Name:		smeserver-phpki-ng
 Version:        0.3
-Release: 	1%{?dist}
+Release: 	9%{?dist}
 Summary:        php integration into SME server
 
 Group:          Applications/System
 License:        GPL
 URL:            http://phpki.sourceforge.net/
 Source:         %{name}-%{version}.tar.xz
+
 #Patch0:        smeserver-phpki-0.2-fix_redirect_with_user-manager_and_sso.patch
 #Patch1:        smeserver-phpki-0.2.bz10267.updatetktauth.patch
 
+Patch0:         smeserver-phpki-ng-0.3-Add-extra-Loadmodules-to-httpd-conf.patch
+Patch1:         smeserver-phpki-ng-0.3-Add-in-systemd-startup.patch
+Patch2: 	smeserver-phpki-ng-0.3-php73pool.patch
+Patch3: 	smeserver-phpki-ng-0.3-bz12021-backup.patch
+Patch4: 	smeserver-phpki-ng-0.3-bz12054-httpd24.patch
+
 BuildRoot:      %{_tmppath}/%{name}-%{version}
 BuildArch:      noarch
 
@@ -24,6 +31,8 @@ Requires:	e-smith-base
 Requires:	phpki-ng
 Requires:	php-process
 Requires: 	e-smith-manager >= 2.6.0-22
+Requires: 	e-smith-apache >= 2.6.0-19
+Requires:       smeserver-php >= 3.0.0-43
 Obsoletes:	smeserver-phpki
 
 %description
@@ -34,6 +43,36 @@ This package contains specific configura
 
 
 %changelog
+* Tue Oct 04 2022 John Crisp <jcrisp@safeandsoundit.co.uk> 0.3-9.sme
+- Fix spec file versioning
+
+* Sat Jul 30 2022 Brian Read <brianr@bjsystems.co.uk> 0.3-8.sme
+- Re-build and link to latest devtools [SME: 11997]
+
+* Thu Jul 21 2022 Jean-Philippe Pialasse <tests@pialasse.com> 0.3-7.sme
+- add to core backup [SME: 12021]
+- httpd 2.4 access syntax [SME: 12054]
+
+* Thu Aug 05 2021 John Crisp <jcrisp@safeandsoundit.co.uk> 0.3-6.sme
+- remove modules from patch file [SME: 11402]
+
+* Sun Mar 07 2021 John Crisp <jcrisp@safeandsoundit.co.uk> 0.3-5.sme
+- modify dirs in spec file
+
+* Thu Feb 25 2021 Jean-Philipe Pialasse <tests@pialasse.com> 0.3-4.sme
+- configure php73 pool [SME: 11207]
+  tidy httpd.conf file
+  reuse phpki user and group
+
+* Sat Feb 13 2021 Brian Read <brianr@bjsystems.co.uk> 0.3-3.sme
+- Set execution bit on /opt/phpki/html/ca in spec file[SME: 11207]
+
+* Tue Feb 09 2021 Brian Read <brianr@bjsystems.co.uk> 0.3-3.sme
+- Add-in-systemd-startup [SME: 11207]
+
+* Thu Nov 26 2020 Brian Read <brianr@bjsystems.co.uk> 0.3-2.sme
+- Add in Loadmodules needed to pki-conf/httpd.conf [SME: 11207]
+
 * Fri Apr 03 2020 John Crisp <jcrisp@safeandsoundit.co.uk> 0.3-1.sme
 - New release for phpki-ng-0.84 based on phpki-0.83
 
@@ -77,8 +116,14 @@ This package contains specific configura
 
 %prep
 %setup -q -n %{name}-%{version}
-#%patch0 -p1
-#%patch1 -p1
+%patch0 -p1
+%patch1 -p1
+%patch2 -p1
+mkdir -p root/var/lib/php/phpki/{tmp,session,opcache}
+rm -rf root/var/lib/php/pki-session
+mkdir -p root/var/log/phpki
+%patch3 -p1
+%patch4 -p1
 
 %build
 perl createlinks
@@ -92,6 +137,9 @@ perl createlinks
 
 
 (cd root   ; /usr/bin/find . -depth -print | /bin/cpio -dump $RPM_BUILD_ROOT)
+
+chmod +x $RPM_BUILD_ROOT/usr/sbin/systemd/httpd-pki
+
 /bin/rm -f %{name}-%{version}-filelist
 /sbin/e-smith/genfilelist $RPM_BUILD_ROOT \
 	--dir /var/service/httpd-pki 'attr(01755,root,root)' \
@@ -101,9 +149,16 @@ perl createlinks
         --file /var/service/httpd-pki/log/run 'attr(0755,root,root)' \
         --dir /var/service/httpd-pki/log/supervise 'attr(0700,root,root)' \
         --dir /var/log/httpd-pki 'attr(0750,smelog,smelog)' \
-        --dir /var/lib/php/pki-session 'attr(0770,root,phpki)' \
+        --dir /var/lib/php/phpki 'attr(0770,root,phpki)' \
+        --dir /var/lib/php/phpki/session 'attr(0770,root,phpki)' \
+        --dir /var/lib/php/phpki/opcache 'attr(0770,root,phpki)' \
+        --dir /var/lib/php/phpki/tmp 'attr(0770,root,phpki)' \
+	--dir /var/log/phpki/tmp 'attr(0770,root,phpki)' \
 	> %{name}-%{version}-filelist
 
+%post
+chmod +x /opt/phpki/html/
+chmod +x /opt/phpki/html/ca
 
 %clean
 rm -rf $RPM_BUILD_ROOT