From bac6394fc769c19e06e8671974bdca5da0773a7a Mon Sep 17 00:00:00 2001
From: amak <amak.git@outlook.com>
Date: Sun, 31 Oct 2021 23:27:44 +1100
Subject: [PATCH] ulogd: move logs to subdir, update logrotate file, add
 conf_files

---
 srcpkgs/ulogd/files/ulogd.logrotate | 8 ++++----
 srcpkgs/ulogd/template              | 8 ++++++--
 2 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/srcpkgs/ulogd/files/ulogd.logrotate b/srcpkgs/ulogd/files/ulogd.logrotate
index c50479d92cfb..d403a26b1605 100644
--- a/srcpkgs/ulogd/files/ulogd.logrotate
+++ b/srcpkgs/ulogd/files/ulogd.logrotate
@@ -1,9 +1,9 @@
-/var/log/ulog.log /var/log/ulog.pcap {
-    missingok
+/var/log/ulogd/* {
     compress
+    missingok
+    notifempty
     sharedscripts
-    create 640 _ulogd adm
     postrotate
-	sv hup ulogd
+        sv hup ulogd
     endscript
 }
diff --git a/srcpkgs/ulogd/template b/srcpkgs/ulogd/template
index 55e9ae34a0e1..e3e37330dabc 100644
--- a/srcpkgs/ulogd/template
+++ b/srcpkgs/ulogd/template
@@ -1,7 +1,7 @@
 # Template file for 'ulogd'
 pkgname=ulogd
 version=2.0.7
-revision=2
+revision=3
 build_style=gnu-configure
 configure_args="--sbindir=/usr/bin"
 hostmakedepends="pkg-config automake"
@@ -13,10 +13,14 @@ license="GPL-2.0-only"
 homepage="http://www.netfilter.org/projects/ulogd/"
 distfiles="${homepage}/files/${pkgname}-${version}.tar.bz2"
 checksum=990a05494d9c16029ba0a83f3b7294fc05c756546b8d60d1c1572dc25249a92b
-CFLAGS="-D_GNU_SOURCE"
+conf_files="/etc/ulogd.conf /etc/logrotate.d/ulogd"
+make_dirs="/var/log/ulogd 0750 root adm"
 system_accounts="_ulogd"
 
+CFLAGS="-D_GNU_SOURCE"
+
 post_install() {
+	vsed -i -e "s:/var/log:/var/log/ulogd:g" ulogd.conf
 	vinstall ulogd.conf 644 etc
 	vinstall ${FILESDIR}/ulogd.logrotate 644 etc/logrotate.d ulogd
 	vsv ulogd