--- rpms/e-smith-apache/sme10/e-smith-apache.spec 2020/06/27 19:27:40 1.13 +++ rpms/e-smith-apache/sme10/e-smith-apache.spec 2022/07/25 08:51:14 1.25 @@ -1,10 +1,10 @@ -# $Id: e-smith-apache.spec,v 1.12 2020/06/27 17:26:20 jpp Exp $ +# $Id: e-smith-apache.spec,v 1.24 2022/07/25 08:24:04 jpp Exp $ Summary: e-smith server and gateway - apache module %define name e-smith-apache Name: %{name} %define version 2.6.0 -%define release 10 +%define release 21 Version: %{version} Release: %{release}%{?dist} License: GPL @@ -17,6 +17,12 @@ Patch3: e-smith-apache-2.6.0-bz10459-Cip Patch4: e-smith-apache-2.6.0-bz10867-remove-php3-refs.patch Patch5: e-smith-apache-2.6.0-bz10966-remove-hardcoded-ports.patch Patch6: e-smith-apache-2.6.0-bz8693-SNI.patch +Patch7: e-smith-apache-2.6.0-bz11123-bz11111-systemd-update.patch +Patch8: e-smith-apache-2.6.0-bz10826-defaultSSLCert-if-file-does-not-exist.patch +Patch9: e-smith-apache-2.6.0-bz11551-httpsForceLocalOnly.patch +Patch10: e-smith-apache-2.6.0-bz11760-moremodules.patch +Patch11: e-smith-apache-2.6.0-bz11867.patch +Patch12: e-smith-apache-2.6.0-bz9375-Require.patch BuildRoot: /var/tmp/%{name}-%{version}-%{release}-buildroot BuildArchitectures: noarch @@ -29,7 +35,12 @@ Obsoletes: distcache <= 1.4.5 Obsoletes: mod_auth_external Obsoletes: e-smith-proxypass Obsoletes: e-smith-apache-proxy -Conflicts: e-smith-ibays < 1.0.2 +# for the new httpd 2.4 syntax +Conflicts: e-smith-ibays < 2.6.0-19 +Conflicts: smeserver-horde < 1.0.0-32 +Conflicts: smeserver-php < 3.0.0-43 +Conflicts: e-smith-proxy < 5.6.0-11 +Conflicts: e-smith-manager < 2.8.0-36 AutoReqProv: no BuildRequires: e-smith-devtools >= 1.11.0-12 @@ -45,6 +56,13 @@ e-smith server and gateway software - ap %patch4 -p1 %patch5 -p1 %patch6 -p1 +%patch7 -p1 +rm -rf root/var/service/ root/service/ root/etc/rc.d/init.d/httpd-e-smith +%patch8 -p1 +%patch9 -p1 +%patch10 -p1 +%patch11 -p1 +%patch12 -p1 %build perl createlinks @@ -54,6 +72,7 @@ rm -rf $RPM_BUILD_ROOT (cd root ; find . -depth -print | cpio -dump $RPM_BUILD_ROOT) /sbin/e-smith/genfilelist $RPM_BUILD_ROOT \ + --file /sbin/e-smith/systemd/httpd-e-smith-prepare 'attr(0554,root,root)' \ --dir /var/service/httpd-e-smith 'attr(01755,root,root)' \ --file /var/service/httpd-e-smith/down 'attr(0644,root,root)' \ --file /var/service/httpd-e-smith/run 'attr(0755,root,root)' \ @@ -67,8 +86,54 @@ rm -rf $RPM_BUILD_ROOT %files -f e-smith-%{version}-filelist %defattr(-,root,root) +%pre +# ease the transition between runit and systemd +if [ $1 -gt 1 ] ; then + if [ -e /var/service/httpd-e-smith/run ] ; then + /usr/bin/sv d httpd-e-smith + fi +fi %changelog +* Mon Jul 25 2022 Jean-Philippe Pialasse 2.6.0-22.sme +- reverting last change [SME: 9375] +- add conflict on older ibays, php, horde, proxy, manager rpms + +* Sun Jul 24 2022 Jean-Philipe Pialasse 2.6.0-20.sme +- removing mod_access_compat [SME: 9375] + +* Sat Apr 16 2022 Jean-Philippe Pialasse 2.6.0-19.sme +- convert httpd 2.2 allow,deny to Require for 2.4 [SME: 9375] +- use maxsize, not size [SME: 11867] + +* Fri Feb 18 2022 Jean-Philippe Pialasse 2.6.0-18.sme +- use logrotate.d instead of event action [SME: 11867] + use size to force log rotate before normal delay + +* Mon Nov 15 2021 Jean-Philippe Pialasse 2.6.0-16.sme +- add modules ldap authnz_ldap and proxy_wstunnel [SME: 11760] + previously provided by webapps-common + +* Thu Sep 16 2021 Jean-Philippe Pialasse 2.6.0-15.sme +- fix httpd-e-smith failing to start on reboot in private server-gateway mode [SME: 11596] + +* Tue Mar 30 2021 Jean-Philippe Pialasse 2.6.0-14.sme +- add possibility to force https on LAN only [SME: 11511] + usefull for VPN over port 443 + +* Thu Dec 10 2020 Jean-Philipe Pialasse 2.6.0-13.sme +- prevent httpd to fail if modSSL defined certs does not exist [SME: 10826] + default on self generated cert + +* Wed Dec 09 2020 Jean-Philipe Pialasse 2.6.0-12.sme +- create-update event [SME: 11123] +- move httpd-e-smith to systemd [SME: 11111] + changed sigusr1 used in events to reload as defined in the unit file +- give a logger to httpd-e-smith : journald [SME: 1416] + +* Sat Jun 27 2020 Jean-Philipe Pialasse 2.6.0-11.sme +- set default SSLStrictSNIVHostCheck to off [SME: 8693] + * Sat Jun 27 2020 Jean-Philipe Pialasse 2.6.0-10.sme - add SNI support for individual certificates per VirtualHosts [SME: 8693]