--- rpms/smeserver-clamav/sme10/smeserver-clamav.spec	2021/04/07 21:05:46	1.10
+++ rpms/smeserver-clamav/sme10/smeserver-clamav.spec	2021/12/20 14:43:14	1.15
@@ -1,10 +1,10 @@
-# $Id: smeserver-clamav.spec,v 1.9 2021/01/08 22:25:52 jpp Exp $
+# $Id: smeserver-clamav.spec,v 1.14 2021/11/15 18:20:56 jpp Exp $
 
 Summary: SME Server module to configure clamav
 %define name smeserver-clamav
 Name: %{name}
 %define version 2.7.0
-%define release 6
+%define release 11
 Version: %{version}
 Release: %{release}%{?dist}
 License: GPL
@@ -13,6 +13,8 @@ Source: %{name}-%{version}.tar.xz
 Patch0: smeserver-clamav-2.7.0-bz11103-improvements.patch
 Patch1: smeserver-clamav-2.7.0-bz11313-clamdtop.patch
 Patch2: smeserver-clamav-2.7.0-bz11520-clamd2scan.conf.patch
+Patch3: smeserver-clamav-2.7.0-bz11755-identify-freshclam-error.patch
+Patch4: smeserver-clamav-2.7.0-bz11695-properties.patch
 
 BuildRoot: /var/tmp/%{name}-%{version}-%{release}-buildroot
 BuildArchitectures: noarch
@@ -35,6 +37,24 @@ BuildRequires: e-smith-devtools
 SME Server enhancement to configure and run clamd and freshclam
 
 %changelog
+* Mon Dec 20 2021 Jean-Philippe Pialasse <tests@pialasse.com> 2.7.0-11.sme
+- rename property ArchiveBlockEncrypted to AlertEncrypted as per upstream [SME: 11695]
+  added properties AlertBrokenExecutables AlertExceedsMax AlertOLE2Macros 
+  AlertPartitionIntersection AlertPhishingCloak and AlertPhishingSSLMismatch
+  with default no
+  added property HeuristicAlerts with default yes
+- fix noise on centos2sme [SME: 11474]
+
+* Mon Nov 15 2021 Jean-Philippe Pialasse <tests@pialasse.com> 2.7.0-10.sme
+- identify from which server is freshclam error [SME: 11755]
+  fix from  Graeme Fleming 
+
+* Wed Jun 09 2021 Jean-Philippe Pialasse <tests@pialasse.com> 2.7.0-9.sme
+- fix typo in logrotate [SME: 11608]
+
+* Sun Apr 18 2021 Jean-Philippe Pialasse <tests@pialasse.com> 2.7.0-8.sme
+- fix typo and missing +x [SME: 11520]
+
 * Wed Apr 07 2021 Jean-Philippe Pialasse <tests@pialasse.com> 2.7.0-6.sme
 - fix issues with non epel standard scan.conf [SME: 11520]
   move clamd.conf to scan.conf
@@ -392,6 +412,7 @@ rm -rf root/etc/e-smith/templates/usr/li
 rm -rf root/usr/lib/systemd/system/freshclam.service.d
 %patch1 -p1
 %patch2 -p1
+%patch3 -p1
 
 %build
 perl createlinks
@@ -411,20 +432,18 @@ if [ $1 -gt 1 ] ; then
 fi
 %post
 # removing old conf file
-if [[ -f /etc/clam.d/clamd.conf ]]; then
-   rm -f /etc/clam.d/clamd.conf
+if [[ -f /etc/clamd.d/clamd.conf ]]; then
+   rm -f /etc/clamd.d/clamd.conf
 fi
 
 #echo "Changing freshclam log owners"
 if [[ -d /var/log/freshclam ]]; then 
   chown -R clamupdate:clamupdate /var/log/freshclam;
-  chown -R clamupdate:clamupdate /var/log/freshclam/*;
 fi
 
 #echo "Changing clamd log owners"
 if [[ -d /var/log/clamd ]]; then 
   chown -R clamscan:clamscan /var/log/clamd;
-  chown -R clamscan:clamscan /var/log/clamd/*;
 fi
 
 %install
@@ -435,6 +454,7 @@ rm -rf $RPM_BUILD_ROOT
   --dir /var/log/freshclam 'attr(2755,clamupdate,clamupdate)' \
   --dir /var/log/clamd 'attr(2755,clamscan,clamscan)' \
   --dir /var/spool/clamav/quarantine 'attr(2750,clamscan,clamscan)' \
+  --file /sbin/clamdscan 'attr(0755,root,root)' \
   --file /sbin/e-smith/freshclam-update-failed 'attr(0755,root,root)' \
   --file /sbin/e-smith/freshclam-update-ok 'attr(0755,root,root)' \
   --file /sbin/e-smith/smeserver-clamscan 'attr(0755,root,root)' \