Fix zkg state dir

4 files changed, 46 insertions, 8 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 6db6fa18693f..2ade707a79ff 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = zeek
 	pkgdesc = A network analysis framework
 	pkgver = 4.2.0
-	pkgrel = 1
+	pkgrel = 2
 	url = https://zeek.org
 	arch = x86_64
 	license = BSD
@@ -21,9 +21,11 @@ pkgbase = zeek
 	source = https://download.zeek.org/zeek-4.2.0.tar.gz
 	source = https://download.zeek.org/zeek-4.2.0.tar.gz.asc
 	source = zeek.tmpfiles.conf
+	source = 0001-Make-ZKG-state-dir-configurable.patch
 	validpgpkeys = 962FD2187ED5A1DD82FC478A33F15EAEF8CB8019
 	sha256sums = 8d9a028ca9fec7ad4a9e48a763e296052384cf402ea4cd371577bff183c27451
 	sha256sums = SKIP
-	sha256sums = 4a6fd49e4c71f3e192617f3bd12e018925bec52a4a30099369e77f1419d55d61
+	sha256sums = af5b7e14caae88122d0e6dd29539ae77ed3388c70a12ea0ed73c9a3f6de16d91
+	sha256sums = e9950f5772ce7df9ac63cd2b11367f2ae032f2eebcef64ba5b979335a19a12f5
 
 pkgname = zeek
diff --git a/0001-Make-ZKG-state-dir-configurable.patch b/0001-Make-ZKG-state-dir-configurable.patch
new file mode 100644
index 000000000000..cb5f5514e643
--- /dev/null
+++ b/0001-Make-ZKG-state-dir-configurable.patch
@@ -0,0 +1,27 @@
+From ee09a378dd1a94809c419c5d9a980dbc99af3590 Mon Sep 17 00:00:00 2001
+From: KokaKiwi <kokakiwi+aur@kokakiwi.net>
+Date: Fri, 18 Mar 2022 17:13:20 +0100
+Subject: [PATCH] Make ZKG state dir configurable
+
+---
+ CMakeLists.txt | 4 +++-
+ 1 file changed, 3 insertions(+), 1 deletion(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 0f36d4c05..fe353da36 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -580,7 +580,9 @@ if ( INSTALL_ZKG )
+     # An etc/zkg directory for zkg's config file simplifies zkg's
+     # config file code.
+     set(ZEEK_ZKG_CONFIG_DIR "${ZEEK_ETC_INSTALL_DIR}/zkg")
+-    set(ZEEK_ZKG_STATE_DIR "${ZEEK_ROOT_DIR}/var/lib/zkg")
++    if ( NOT ZEEK_ZKG_STATE_DIR )
++        set(ZEEK_ZKG_STATE_DIR "${ZEEK_ROOT_DIR}/var/lib/zkg")
++    endif ()
+ 
+     configure_file(
+         ${CMAKE_CURRENT_SOURCE_DIR}/zkg-config.in
+-- 
+2.35.1
+
diff --git a/PKGBUILD b/PKGBUILD
index 8a2c71f26c2f..3d47a64c0eab 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,7 +3,7 @@
 
 pkgname=zeek
 pkgver=4.2.0
-pkgrel=1
+pkgrel=2
 pkgdesc="A network analysis framework"
 arch=('x86_64')
 url="https://zeek.org"
@@ -11,19 +11,28 @@ license=('BSD')
 depends=(zlib libpcap bash libmaxminddb python)
 makedepends=(cmake swig bison flex openssl geoip gperftools shadow)
 source=("https://download.zeek.org/zeek-$pkgver.tar.gz"{,.asc}
-        zeek.tmpfiles.conf)
+        zeek.tmpfiles.conf
+        0001-Make-ZKG-state-dir-configurable.patch)
 sha256sums=('8d9a028ca9fec7ad4a9e48a763e296052384cf402ea4cd371577bff183c27451'
             'SKIP'
-            '4a6fd49e4c71f3e192617f3bd12e018925bec52a4a30099369e77f1419d55d61')
+            'af5b7e14caae88122d0e6dd29539ae77ed3388c70a12ea0ed73c9a3f6de16d91'
+            'e9950f5772ce7df9ac63cd2b11367f2ae032f2eebcef64ba5b979335a19a12f5')
 validpgpkeys=(
   962FD2187ED5A1DD82FC478A33F15EAEF8CB8019 # The Zeek Team <info@zeek.org>
 )
 
+prepare() {
+  cd "zeek-$pkgver"
+
+  patch -Np1 -i "$srcdir/0001-Make-ZKG-state-dir-configurable.patch"
+}
+
 build() {
   cmake -B build -S "zeek-$pkgver" \
     -D CMAKE_INSTALL_PREFIX=/usr \
-    -D ZEEK_PYTHON_PREFIX=/usr \
-    -D ZEEK_ETC_INSTALL_DIR=/etc \
+    -D ZEEK_PYTHON_PREFIX:PATH=/usr \
+    -D ZEEK_ETC_INSTALL_DIR:PATH=/etc \
+    -D ZEEK_ZKG_STATE_DIR:PATH=/var/lib/zkg \
     -D BINARY_PACKAGING_MODE=ON \
     -D BUILD_SHARED_LIBS=ON \
     -D BUILD_STATIC_BINPAC=ON \
diff --git a/zeek.tmpfiles.conf b/zeek.tmpfiles.conf
index 5c8c14d84886..6752b2acd6bd 100644
--- a/zeek.tmpfiles.conf
+++ b/zeek.tmpfiles.conf
@@ -1 +1 @@
-d /var/lib/zeek 0755 - - -
+d /var/lib/zkg 0755 - - -