--- rpms/e-smith-proxy/sme10/e-smith-proxy.spec	2017/04/12 21:24:57	1.6
+++ rpms/e-smith-proxy/sme10/e-smith-proxy.spec	2021/03/16 18:52:33	1.9
@@ -1,10 +1,10 @@
-# $Id: e-smith-proxy.spec,v 1.5 2017/04/10 18:56:22 unnilennium Exp $
+# $Id: e-smith-proxy.spec,v 1.8 2020/12/11 20:35:23 michel Exp $
 
 Summary: e-smith server and gateway - proxy module
 %define name e-smith-proxy
 Name: %{name}
 %define version 5.6.0
-%define release 6
+%define release 9
 Version: %{version}
 Release: %{release}%{?dist}
 License: GPL
@@ -14,6 +14,10 @@ Patch0: e-smith-proxy-5.6.0-MANAGER.patc
 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
+
 BuildRoot: /var/tmp/%{name}-%{version}-%{release}-buildroot
 BuildArchitectures: noarch
 Requires: e-smith-base
@@ -30,6 +34,18 @@ AutoReqProv: no
 e-smith server and gateway software - proxy module.
 
 %changelog
+* 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]
+
+* Mon Nov 30 2020 Michel Begue <mab974@gmail.com> 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 <tests@pialasse.com> 5.6.0-6.sme
 - fix disabling smtp proxy via SM doesn't work [SME: 9639]
 
@@ -65,10 +81,10 @@ e-smith server and gateway software - pr
 * Fri Sep 23 2011 Jonathan Martens <smeserver-contribs@snetram.nl> 5.2.0-5.sme
 - Fix SMTP proxy wording in server-manager [SME: 6178]
 
-* Sun Sep 25 2010 Shad L. Lords <slords@mail.com> 5.2.0-4.sme
+* Sat Sep 25 2010 Shad L. Lords <slords@mail.com> 5.2.0-4.sme
 - Fix missed enabled->transparent mapping [SME: 5574]
 
-* Sun Sep 25 2010 Shad L. Lords <slords@mail.com> 5.2.0-3.sme
+* Sat Sep 25 2010 Shad L. Lords <slords@mail.com> 5.2.0-3.sme
 - Change enabled to transparent for mail proxy [SME: 5574]
 
 * Thu Mar 25 2010 Federico Simoncelli <federico.simoncelli@gmail.com> 5.2.0-2.sme
@@ -716,6 +732,12 @@ e-smith server and gateway software - pr
 %patch1 -p1
 %patch2 -p1
 %patch3 -p1
+%patch4 -p1
+%patch5 -p1
+%patch6 -p1
+
+rm -rf root/var/service/squid/
+mkdir -p root/usr/lib/systemd/system/squid.service.d 
 
 %build
 perl createlinks
@@ -725,19 +747,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)