--- rpms/e-smith-packetfilter/sme10/e-smith-packetfilter.spec	2021/03/03 20:29:35	1.6
+++ rpms/e-smith-packetfilter/sme10/e-smith-packetfilter.spec	2021/03/05 05:12:32	1.10
@@ -1,10 +1,10 @@
-# $Id: e-smith-packetfilter.spec,v 1.5 2021/02/13 04:48:27 jpp Exp $
+# $Id: e-smith-packetfilter.spec,v 1.9 2021/03/05 05:04:13 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 5
+%define release 6
 Version: %{version}
 Release: %{release}%{?dist}
 License: GPL
@@ -13,21 +13,27 @@ Source: %{name}-%{version}.tar.xz
 Patch0: e-smith-packetfilter-2.6.0-bz11122-bz11089-systemd-event.patch
 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
 
 BuildRoot: /var/tmp/%{name}-%{version}-%{release}-buildroot
 BuildArchitectures: noarch
 Requires: e-smith-base >= 5.8.0-49
-Requires: ulogd >= 1.24
+Requires: ulogd >= 22
 Requires: daemontools
 Requires: iptables
 BuildRequires: e-smith-devtools
 Obsoletes: e-smith-ipmasq
 AutoReqProv: no
+Requires(pre): /usr/sbin/useradd
 
 %description
 e-smith server and gateway software - packetfilter add-on
 
 %changelog
+* 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]
+
 * Wed Mar 03 2021 Jean-Philipe Pialasse <tests@pialasse.com> 2.6.0-5.sme
 - remove pptpd last references [SME: 11420]
 
@@ -836,6 +842,8 @@ e-smith server and gateway software - pa
 %patch0 -p1
 %patch1 -p1
 %patch2 -p1
+%patch3 -p1
+rm -rf root/var/service/ulogd
 
 %build
 perl createlinks
@@ -853,18 +861,33 @@ done
 (cd root   ; find . -depth -print | cpio -dump $RPM_BUILD_ROOT)
 mkdir -p $RPM_BUILD_ROOT/var/log/iptables
 mkdir -p $RPM_BUILD_ROOT/service
-ln -s /var/service/ulogd $RPM_BUILD_ROOT/service/ulogd
+#ln -s /var/service/ulogd $RPM_BUILD_ROOT/service/ulogd
 /sbin/e-smith/genfilelist $RPM_BUILD_ROOT \
-    --dir /var/service/ulogd 'attr(1755,root,root)' \
-    --file /var/service/ulogd/run 'attr(0755,root,root)' \
-    --dir /var/service/ulogd/log 'attr(0755,root,root)' \
-    --file /var/service/ulogd/log/run 'attr(0755,root,root)' \
-    --dir /var/log/iptables 'attr(0755,smelog,smelog)' \
+    --dir /var/log/iptables 'attr(0755,ulog,ulog)' \
  > e-smith-%{version}-filelist
 echo "%doc COPYING"          >> e-smith-%{version}-filelist
+#    --dir /var/service/ulogd 'attr(1755,root,root)' \
+#    --file /var/service/ulogd/run 'attr(0755,root,root)' \
+#    --dir /var/service/ulogd/log 'attr(0755,root,root)' \
+#    --file /var/service/ulogd/log/run 'attr(0755,root,root)' \
 
 %clean 
 rm -rf $RPM_BUILD_ROOT
 
+%pre
+if [ $1 -gt 1 ] ; then
+  if [ -e /var/service/ulogd/run ] ; then
+        /usr/bin/sv d ulogd
+        /usr/bin/sv d ulogd/log
+  fi
+fi
+
+/usr/sbin/groupadd \
+  -g 1010 -o ulog 2>/dev/null || :
+
+/usr/sbin/useradd \
+  -u 1010 -g 1010 -c 'ulogd user' -d /var/log/ulogd \
+  -M -s /bin/false ulog  || :
+
 %files -f e-smith-%{version}-filelist
 %defattr(-,root,root)