--- rpms/e-smith-proxy/sme10/e-smith-proxy.spec	2020/12/11 20:35:23	1.8
+++ rpms/e-smith-proxy/sme10/e-smith-proxy.spec	2022/04/17 18:59:57	1.12
@@ -1,10 +1,10 @@
-# $Id: e-smith-proxy.spec,v 1.7 2020/12/01 16:03:46 michel 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 8
+%define release 11
 Version: %{version}
 Release: %{release}%{?dist}
 License: GPL
@@ -16,6 +16,10 @@ Patch2: e-smith-proxy-5.6.0.bz79.redirec
 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
@@ -23,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
@@ -32,6 +37,16 @@ AutoReqProv: no
 e-smith server and gateway software - proxy module.
 
 %changelog
+* Sun Apr 17 2022 Jean-Philippe Pialasse <tests@pialasse.com> 5.6.0-11.sme
+- use httpd 2.4 access control syntax [SME: 11944]
+
+* Thu Oct 21 2021 Jean-Philippe Pialasse <tests@pialasse.com> 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 <tests@pialasse.com> 5.6.0-9.sme
+- cleanup in /etc/rc.d and /var/service/squid  [SME: 9692]
+
 * Thu Dec 10 2020 Michel Begue <mab974@gmail.com> 2.6.0-8.sme
 - fix actions for e-smith-proxy-update event [SME: 11116]
 - add intercept for squid [SME: 9419]
@@ -729,9 +744,13 @@ e-smith server and gateway software - pr
 %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
@@ -755,5 +774,10 @@ echo "%doc COPYING" >> %{name}-%{version
 %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)