From 6dcb503d8839c0f6312e3eeab942780fd7005749 Mon Sep 17 00:00:00 2001
From: Jean-Philippe Pialasse <jpp@koozali.org>
Date: Wed, 17 Apr 2024 21:46:30 -0400
Subject: [PATCH] * Wed Apr 17 2024 Jean-Philippe Pialasse <jpp@koozali.org>
 11.0.0-8.sme - move ulogd.service and tmpfile.d to service package [SME:
 12538]

---
 root/usr/lib/systemd/system/ulogd.service | 17 -----------------
 root/usr/lib/tmpfiles.d/ulog.conf         |  1 -
 smeserver-packetfilter.spec               |  7 +++++--
 3 files changed, 5 insertions(+), 20 deletions(-)
 delete mode 100644 root/usr/lib/systemd/system/ulogd.service
 delete mode 100644 root/usr/lib/tmpfiles.d/ulog.conf

diff --git a/root/usr/lib/systemd/system/ulogd.service b/root/usr/lib/systemd/system/ulogd.service
deleted file mode 100644
index 75e45e0..0000000
--- a/root/usr/lib/systemd/system/ulogd.service
+++ /dev/null
@@ -1,17 +0,0 @@
-[Unit]
-Description=Netfilter Userspace Logging Daemon
-Before=masq.service
-
-[Service]
-User=root
-Group=root
-Restart=always
-TimeoutSec=0
-Type=forking
-
-PIDFile=/run/ulog/ulogd.pid
-ExecStart=/usr/sbin/ulogd --daemon --uid ulog --pidfile /run/ulog/ulogd.pid
-ExecReload=/bin/kill -HUP $MAINPID
-
-[Install]
-WantedBy=sme-server.target multi-user.target
diff --git a/root/usr/lib/tmpfiles.d/ulog.conf b/root/usr/lib/tmpfiles.d/ulog.conf
deleted file mode 100644
index 2ec73b4..0000000
--- a/root/usr/lib/tmpfiles.d/ulog.conf
+++ /dev/null
@@ -1 +0,0 @@
-d /run/ulog 2755 ulog ulog
diff --git a/smeserver-packetfilter.spec b/smeserver-packetfilter.spec
index cf391a3..cf8541e 100644
--- a/smeserver-packetfilter.spec
+++ b/smeserver-packetfilter.spec
@@ -4,7 +4,7 @@ Summary: smeserver server and gateway - packetfilter add-on
 %define name smeserver-packetfilter
 Name: %{name}
 %define version 11.0.0
-%define release 7
+%define release 8
 Version: %{version}
 Release: %{release}%{?dist}
 License: GPL
@@ -14,7 +14,7 @@ Source: %{name}-%{version}.tar.xz
 BuildRoot: /var/tmp/%{name}-%{version}-%{release}-buildroot
 BuildArchitectures: noarch
 Requires: smeserver-base >= 5.8.0-49
-Requires: ulogd >= 2
+Requires: ulogd >= 2.0.7-2
 Requires: daemontools
 Requires: iptables
 BuildRequires: smeserver-devtools
@@ -27,6 +27,9 @@ Provides: e-smith-packetfilter
 smeserver server and gateway software - packetfilter add-on
 
 %changelog
+* Wed Apr 17 2024 Jean-Philippe Pialasse <jpp@koozali.org> 11.0.0-8.sme
+- move ulogd.service and tmpfile.d to service package [SME: 12538]
+
 * Sat Apr 13 2024 Jean-Philippe Pialasse <jpp@koozali.org> 11.0.0-7.sme
 - move post-transaction-actions [SME: 12534]