--- rpms/e-smith-proxy/sme10/e-smith-proxy.spec	2021/03/16 18:52:33	1.9
+++ 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.8 2020/12/11 20:35:23 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 9
+%define release 11
 Version: %{version}
 Release: %{release}%{?dist}
 License: GPL
@@ -17,6 +17,8 @@ Patch3: e-smith-proxy-5.6.0.bz9639.disab
 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
@@ -25,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
@@ -34,6 +37,13 @@ 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]
 
@@ -735,9 +745,12 @@ e-smith server and gateway software - pr
 %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