--- rpms/e-smith-proxy/sme10/e-smith-proxy.spec 2016/05/12 21:12:35 1.3 +++ rpms/e-smith-proxy/sme10/e-smith-proxy.spec 2022/04/17 18:59:57 1.12 @@ -1,16 +1,25 @@ -# $Id: e-smith-proxy.spec,v 1.2 2016/03/31 12:36:16 unnilennium Exp $ +# $Id: e-smith-proxy.spec,v 1.11 2022/04/17 18:59:18 jpp Exp $ Summary: e-smith server and gateway - proxy module %define name e-smith-proxy Name: %{name} %define version 5.6.0 -%define release 3 +%define release 11 Version: %{version} Release: %{release}%{?dist} License: GPL Group: Networking/Daemons Source: %{name}-%{version}.tar.xz Patch0: e-smith-proxy-5.6.0-MANAGER.patch +Patch1: e-smith-proxy-5.6.0-set_file_desc_limit.patch +Patch2: e-smith-proxy-5.6.0.bz79.redirect.squid.related.syslog.patch +Patch3: e-smith-proxy-5.6.0.bz9639.disablingSMTPproxyFromManager.patch +Patch4: e-smith-proxy-5.6.0-bz11116_systemd.patch +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 + BuildRoot: /var/tmp/%{name}-%{version}-%{release}-buildroot BuildArchitectures: noarch Requires: e-smith-base @@ -18,6 +27,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 @@ -27,6 +37,34 @@ AutoReqProv: no e-smith server and gateway software - proxy module. %changelog +* 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 + +* Tue Mar 16 2021 Jean-Philippe Pialasse 5.6.0-9.sme +- cleanup in /etc/rc.d and /var/service/squid [SME: 9692] + +* Thu Dec 10 2020 Michel Begue 2.6.0-8.sme +- fix actions for e-smith-proxy-update event [SME: 11116] +- add intercept for squid [SME: 9419] + +* Mon Nov 30 2020 Michel Begue 2.6.0-7.sme +- move squid service to systemd [SME: 11116] +- add e-smith-proxy-update event [SME: 11151] +- fix bogus dates here + +* Wed Apr 12 2017 Jean-Philipe Pialasse 5.6.0-6.sme +- fix disabling smtp proxy via SM doesn't work [SME: 9639] + +* Mon Apr 10 2017 Jean-Philipe Pialasse 5.6.0-5.sme +- redirect squid syslog messages to /var/log/squid/squid.log [SME: 79] + +* Thu Jan 5 2017 Daniel Berteaud 5.6.0-4.sme +- Allow custom file descriptor limit, and set default to 4096 [SME: 9912] + * Thu May 12 2016 Daniel Berteaud 5.6.0-3.sme - Rebuild for [SME: 9393] @@ -53,10 +91,10 @@ e-smith server and gateway software - pr * Fri Sep 23 2011 Jonathan Martens 5.2.0-5.sme - Fix SMTP proxy wording in server-manager [SME: 6178] -* Sun Sep 25 2010 Shad L. Lords 5.2.0-4.sme +* Sat Sep 25 2010 Shad L. Lords 5.2.0-4.sme - Fix missed enabled->transparent mapping [SME: 5574] -* Sun Sep 25 2010 Shad L. Lords 5.2.0-3.sme +* Sat Sep 25 2010 Shad L. Lords 5.2.0-3.sme - Change enabled to transparent for mail proxy [SME: 5574] * Thu Mar 25 2010 Federico Simoncelli 5.2.0-2.sme @@ -701,8 +739,18 @@ e-smith server and gateway software - pr %prep %setup %patch0 -p1 - - +%patch1 -p1 +%patch2 -p1 +%patch3 -p1 +%patch4 -p1 +%patch5 -p1 +%patch6 -p1 +%patch7 -p1 +%patch8 -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 @@ -712,19 +760,24 @@ rm -rf $RPM_BUILD_ROOT (cd root ; find . -depth -print | cpio -dump $RPM_BUILD_ROOT) rm -f %{name}-%{version}-%{release}-filelist /sbin/e-smith/genfilelist $RPM_BUILD_ROOT \ - --dir '/var/service/squid' 'attr(1755,root,root)' \ - --file '/var/service/squid/down' 'attr(0644,root,root)' \ - --file '/var/service/squid/run' 'attr(0755,root,root)' \ - --dir '/var/service/squid/supervise' 'attr(0700,root,root)' \ - --dir '/var/service/squid/log' 'attr(1755,root,root)' \ - --file '/var/service/squid/log/run' 'attr(0755,root,root)' \ - --dir '/var/service/squid/log/supervise' 'attr(0700,root,root)' \ - --dir '/var/log/squid.run' 'attr(0750,smelog,root)' \ > %{name}-%{version}-%{release}-filelist +# --dir '/var/service/squid' 'attr(1755,root,root)' \ +# --file '/var/service/squid/down' 'attr(0644,root,root)' \ +# --file '/var/service/squid/run' 'attr(0755,root,root)' \ +# --dir '/var/service/squid/supervise' 'attr(0700,root,root)' \ +# --dir '/var/service/squid/log' 'attr(1755,root,root)' \ +# --file '/var/service/squid/log/run' 'attr(0755,root,root)' \ +# --dir '/var/service/squid/log/supervise' 'attr(0700,root,root)' \ +# --dir '/var/log/squid.run' 'attr(0750,smelog,root)' \ echo "%doc COPYING" >> %{name}-%{version}-%{release}-filelist %clean rm -rf $RPM_BUILD_ROOT +%post +if [ -d /var/service/squid ]; then + rm -rf /var/service/squid +fi + %files -f %{name}-%{version}-%{release}-filelist %defattr(-,root,root)