--- rpms/smeserver-phpki-ng/contribs10/smeserver-phpki-ng.spec 2020/11/26 16:22:16 1.2 +++ rpms/smeserver-phpki-ng/contribs10/smeserver-phpki-ng.spec 2022/12/13 07:31:23 1.19 @@ -4,7 +4,7 @@ Name: smeserver-phpki-ng Version: 0.3 -Release: 2%{?dist} +Release: 15%{?dist} Summary: php integration into SME server Group: Applications/System @@ -16,6 +16,13 @@ Source: %{name}-%{version}.tar.x #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 +Patch5: smeserver-phpki-ng-0.3-bz12228-12198-11873-12229.patch +Patch6: smeserver-phpki-ng-0.3-bz11438-takey.patch +Patch7: smeserver-phpki-ng-0.3-httpd-typos.patch BuildRoot: %{_tmppath}/%{name}-%{version} BuildArch: noarch @@ -23,11 +30,15 @@ BuildArch: noarch BuildRequires: e-smith-devtools Requires: mod_auth_tkt +Requires: openvpn Requires: e-smith-base Requires: phpki-ng Requires: php-process Requires: e-smith-manager >= 2.6.0-22 -Obsoletes: smeserver-phpki +Requires: e-smith-apache >= 2.6.0-19 +Requires: smeserver-php >= 3.0.0-43 +Provides: smeserver-phpki +#Obsoletes: smeserver-phpki %description PHPki is an Open Source Web application for managing a multi-agency PKI for HIPAA compliance. @@ -37,6 +48,52 @@ This package contains specific configura %changelog +* Tue Dec 13 2022 Jean-Philippe Pialasse 0.3-15.sme +- fix typo preventing httpd-pki to start 2 + +* Sun Nov 20 2022 Jean-Philippe Pialasse 0.3-14.sme +- fix typo preventing httpd-pki to start + +* Fri Nov 18 2022 Jean-Philippe Pialasse 0.3-13.sme +- add some more needed bins which cat and egrep [SME: 11438] + +* Fri Nov 18 2022 Jean-Philippe Pialasse 0.3-11.sme +- fix missing takey [SME: 11438] + +* Fri Nov 18 2022 Jean-Philippe Pialasse 0.3-10.sme +- ease migration from smeserver-phpki smeserver-phpki-ng using Provides [SME: 12222] +- fix ownership on migration (backup/restore) [SME: 12228] +- remove /var/service/httpd-pki [SME: 12229] +- remove old logrotate [SME: 11873] +- remove /var/log/phpki and /var/log/httpd-pki [SME: 12198] + +* Tue Oct 04 2022 John Crisp 0.3-9.sme +- Fix spec file versioning + +* Sat Jul 30 2022 Brian Read 0.3-8.sme +- Re-build and link to latest devtools [SME: 11997] + +* Thu Jul 21 2022 Jean-Philippe Pialasse 0.3-7.sme +- add to core backup [SME: 12021] +- httpd 2.4 access syntax [SME: 12054] + +* Thu Aug 05 2021 John Crisp 0.3-6.sme +- remove modules from patch file [SME: 11402] + +* Sun Mar 07 2021 John Crisp 0.3-5.sme +- modify dirs in spec file + +* Thu Feb 25 2021 Jean-Philipe Pialasse 0.3-4.sme +- configure php73 pool [SME: 11207] + tidy httpd.conf file + reuse phpki user and group + +* 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] @@ -84,32 +141,40 @@ This package contains specific configura %prep %setup -q -n %{name}-%{version} %patch0 -p1 -#%patch1 -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 +%patch5 -p1 +rm -rf root/var/service/httpd-pki +rm -rf root/var/log/phpki +%patch6 -p1 +%patch7 -p1 %build perl createlinks %install -%{__mkdir_p} $RPM_BUILD_ROOT/var/service/httpd-pki/supervise -%{__mkdir_p} $RPM_BUILD_ROOT/var/service/httpd-pki/log/supervise -%{__mkdir_p} $RPM_BUILD_ROOT/var/log/httpd-pki %{__mkdir_p} $RPM_BUILD_ROOT/var/lib/php/pki-session (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)' \ - --file /var/service/httpd-pki/run 'attr(0700,root,root)' \ - --dir /var/service/httpd-pki/supervise 'attr(0700,root,root)' \ - --dir /var/service/httpd-pki/log 'attr(0755,root,root)' \ - --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)' \ > %{name}-%{version}-filelist +%post %clean rm -rf $RPM_BUILD_ROOT