--- rpms/phpki-ng/contribs10/phpki-ng.spec	2022/12/14 18:32:49	1.15
+++ rpms/phpki-ng/contribs10/phpki-ng.spec	2022/12/28 20:13:45	1.18
@@ -4,7 +4,7 @@
 
 %define 	name phpki-ng
 %define 	version 0.84
-%define 	release 14
+%define 	release 16
 Summary: 	Phpki is a simple certificate management suite
 Name: 		%{name}
 Version: 	%{version}
@@ -23,6 +23,7 @@ Patch6:         phpki-ng-0.84-fix-downlo
 Patch7:         phpki-ng-0.84-fix-html-syntax-in-help.patch
 Patch8:         phpki-ng-0.84-fix-final-redirect.patch
 Patch9:		phpki-ng-bz12272-bz12273-crl-whitespacepass.patch
+Patch10:	phpki-ng-bz12274-regex-secu.patch
 
 BuildArch: 	noarch
 BuildRoot: 	/var/tmp/%{name}-%{version}
@@ -45,6 +46,12 @@ With it, you may create and centrally ma
 e-mail clients, SSL servers, and VPN applications.
 
 %changelog
+* Sat Dec 17 2022 Jean-Philippe Pialasse <tests@pialasse.com> 0.84-16.sme
+- add dl_crl_pem.php [SME: 12272]
+
+* Wed Dec 14 2022 Jean-Philippe Pialasse <tests@pialasse.com> 0.84-15.sme
+- fix regex and potential code injection [SME: 12274]
+
 * Wed Dec 14 2022 Jean-Philippe Pialasse <tests@pialasse.com> 0.84-14.sme
 - add easy and safe access to crl download [SME: 12272]
 - fix revoke certificate failing on whitespace pass [SME: 12273]
@@ -217,6 +224,7 @@ e-mail clients, SSL servers, and VPN app
 %patch7 -p1
 %patch8 -p1
 %patch9 -p1
+%patch10 -p1
 
 %build
 %{__mkdir_p} root/opt/phpki/html
@@ -266,6 +274,12 @@ cd ..
 rm -rf $RPM_BUILD_ROOT
 
 %pre
+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
+
 echo "******************************************************"
 echo "* "
 echo "*       !!! IMPORTANT - READ THIS NOW !!! "
@@ -312,13 +326,6 @@ else
 fi
 
 
-
-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
-
 %preun