--- 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 2021/02/13 14:20:05 1.4 @@ -4,16 +4,20 @@ Name: smeserver-phpki-ng Version: 0.3 -Release: 1%{?dist} +Release: 3%{?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 + BuildRoot: %{_tmppath}/%{name}-%{version} BuildArch: noarch @@ -34,6 +38,15 @@ This package contains specific configura %changelog +* Sat Feb 13 2021 Brian Read 0.3-3.sme +- Set execution bit on /opt/phpki/html/ca in spec file[SME: 11207] + +* Tue Feb 09 2021 Brian Read 0.3-3.sme +- Add-in-systemd-startup [SME: 11207] + +* Thu Nov 26 2020 Brian Read 0.3-2.sme +- Add in Loadmodules needed to pki-conf/httpd.conf [SME: 11207] + * Fri Apr 03 2020 John Crisp 0.3-1.sme - New release for phpki-ng-0.84 based on phpki-0.83 @@ -77,7 +90,8 @@ This package contains specific configura %prep %setup -q -n %{name}-%{version} -#%patch0 -p1 +%patch0 -p1 +%patch1 -p1 #%patch1 -p1 %build @@ -92,6 +106,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)' \ @@ -104,6 +121,9 @@ perl createlinks --dir /var/lib/php/pki-session '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