--- rpms/e-smith-proxy/sme10/e-smith-proxy.spec 2021/10/22 02:06:17 1.10 +++ rpms/e-smith-proxy/sme10/e-smith-proxy.spec 2023/02/06 05:06:15 1.13 @@ -1,10 +1,10 @@ -# $Id: e-smith-proxy.spec,v 1.9 2021/03/16 18:52:33 jpp Exp $ +# $Id: e-smith-proxy.spec,v 1.12 2022/04/17 18:59:57 jpp Exp $ Summary: e-smith server and gateway - proxy module %define name e-smith-proxy Name: %{name} %define version 5.6.0 -%define release 10 +%define release 12 Version: %{version} Release: %{release}%{?dist} License: GPL @@ -18,6 +18,8 @@ Patch4: e-smith-proxy-5.6.0-bz11116_syst Patch5: e-smith-proxy-5.6.0-events_update-bz9419.patch Patch6: e-smith-proxy-5.6.0-bz9692-cleanup.patch Patch7: e-smith-proxy-5.6.0-bz11713-networksystemd.patch +Patch8: e-smith-proxy-5.6.0-bz11944.patch +Patch9: e-smith-proxy-5.6.0-bz11454-pidfile.patch BuildRoot: /var/tmp/%{name}-%{version}-%{release}-buildroot BuildArchitectures: noarch @@ -26,6 +28,7 @@ Requires: squid Requires: e-smith-lib >= 1.15.1-19 Requires: iptables Requires: e-smith-formmagick >= 1.4.0-9 +Requires: e-smith-apache >= 2.6.0-19 Requires: e-smith-email >= 5.2.0-5 BuildRequires: e-smith-devtools Obsoletes: e-smith-transproxy @@ -35,6 +38,12 @@ AutoReqProv: no e-smith server and gateway software - proxy module. %changelog +* Mon Feb 06 2023 Jean-Philippe Pialasse 5.6.0-12.sme +- fix issues where pid file is not removed [SME: 11454] + +* Sun Apr 17 2022 Jean-Philippe Pialasse 5.6.0-11.sme +- use httpd 2.4 access control syntax [SME: 11944] + * Thu Oct 21 2021 Jean-Philippe Pialasse 5.6.0-10.sme - fix squid starting before network [SME: 11713] also dropin file not expanded on install fixed @@ -741,9 +750,12 @@ e-smith server and gateway software - pr %patch5 -p1 %patch6 -p1 %patch7 -p1 +%patch8 -p1 +%patch9 -p1 rm -rf root/var/service/squid/ mkdir -p root/usr/lib/systemd/system/squid.service.d +rm -rf root/var/log/squid.run %build perl createlinks