--- rpms/e-smith-packetfilter/sme10/e-smith-packetfilter.spec	2021/03/05 04:43:29	1.8
+++ rpms/e-smith-packetfilter/sme10/e-smith-packetfilter.spec	2021/04/07 20:07:51	1.14
@@ -1,10 +1,10 @@
-# $Id: e-smith-packetfilter.spec,v 1.7 2021/03/04 21:43:34 jpp Exp $
+# $Id: e-smith-packetfilter.spec,v 1.13 2021/03/05 07:03:44 jpp Exp $
 
 Summary: e-smith server and gateway - packetfilter add-on
 %define name e-smith-packetfilter
 Name: %{name}
 %define version 2.6.0
-%define release 6
+%define release 7
 Version: %{version}
 Release: %{release}%{?dist}
 License: GPL
@@ -14,11 +14,12 @@ Patch0: e-smith-packetfilter-2.6.0-bz111
 Patch1: e-smith-packetfilter-2.6.0-bz11251-drop-pptpd.patch
 Patch2: e-smith-packetfilter-2.6.0-bz11420.patch
 Patch3: e-smith-packetfilter-2.6.0bz11426-ulogd.patch
+Patch4: e-smith-packetfilter-2.6.0-bz11528-bz11451.patch
 
 BuildRoot: /var/tmp/%{name}-%{version}-%{release}-buildroot
 BuildArchitectures: noarch
 Requires: e-smith-base >= 5.8.0-49
-Requires: ulogd >= 1.24
+Requires: ulogd >= 2
 Requires: daemontools
 Requires: iptables
 BuildRequires: e-smith-devtools
@@ -30,6 +31,10 @@ Requires(pre): /usr/sbin/useradd
 e-smith server and gateway software - packetfilter add-on
 
 %changelog
+* Wed Apr 07 2021 Jean-Philippe Pialasse <tests@pialasse.com> 2.6.0-7.sme
+- fix dropin file not expanded on initial installation [SME: 11528]
+- fix noise on logrotate, doing a restart instead of reload [SME: 11451] 
+
 * Thu Mar 04 2021 Jean-Philipe Pialasse <tests@pialasse.com> 2.6.0-6.sme
 - move ulogd to systemd [SME: 11426]
 - require ulogd 2 [SME: 11426]
@@ -844,6 +849,9 @@ e-smith server and gateway software - pa
 %patch2 -p1
 %patch3 -p1
 rm -rf root/var/service/ulogd
+mkdir -p root/run/ulog
+%patch4 -p1
+
 
 %build
 perl createlinks
@@ -864,6 +872,7 @@ mkdir -p $RPM_BUILD_ROOT/service
 #ln -s /var/service/ulogd $RPM_BUILD_ROOT/service/ulogd
 /sbin/e-smith/genfilelist $RPM_BUILD_ROOT \
     --dir /var/log/iptables 'attr(0755,ulog,ulog)' \
+    --dir /run/ulog 'attr(2755,ulog,ulog)' \
  > e-smith-%{version}-filelist
 echo "%doc COPYING"          >> e-smith-%{version}-filelist
 #    --dir /var/service/ulogd 'attr(1755,root,root)' \