From bb76f84d1ae8600d666ae27b0dff27c59e169a86 Mon Sep 17 00:00:00 2001
From: Timo Reichl <thetredev@gmail.com>
Date: Sun, 19 Mar 2023 17:40:05 +0100
Subject: [PATCH] open-iscsi: Add runit service

Signed-off-by: Timo Reichl <thetredev@gmail.com>
---
 srcpkgs/open-iscsi/files/iscsid/run | 3 +++
 srcpkgs/open-iscsi/template         | 7 ++++++-
 2 files changed, 9 insertions(+), 1 deletion(-)
 create mode 100755 srcpkgs/open-iscsi/files/iscsid/run

diff --git a/srcpkgs/open-iscsi/files/iscsid/run b/srcpkgs/open-iscsi/files/iscsid/run
new file mode 100755
index 000000000000..6fc13d24a8a5
--- /dev/null
+++ b/srcpkgs/open-iscsi/files/iscsid/run
@@ -0,0 +1,3 @@
+#!/bin/sh
+exec 2>&1
+exec iscsid -f
diff --git a/srcpkgs/open-iscsi/template b/srcpkgs/open-iscsi/template
index a146dae7a7b2..5044dd5db96c 100644
--- a/srcpkgs/open-iscsi/template
+++ b/srcpkgs/open-iscsi/template
@@ -1,7 +1,7 @@
 # Template file for 'open-iscsi'
 pkgname=open-iscsi
 version=2.1.8
-revision=1
+revision=2
 conf_files="/etc/iscsi/iscsid.conf /etc/iscsi/initiatorname.iscsi"
 build_style=gnu-configure
 hostmakedepends="automake libtool pkg-config"
@@ -16,22 +16,27 @@ checksum=9565bdf6b68b223e1e0d455d9a04d7536724a3f5b5a254e9398d06b2a0c6b6d2
 case "$XBPS_TARGET_MACHINE" in
 	*-musl) CFLAGS+=" -D_LINUX_IF_ETHER_H -Wno-error=format -Wno-error=cpp";;
 esac
+
 post_extract() {
 	vsed -i -e '/CC.*-o/s/$/ $(LDFLAGS)/' utils/Makefile usr/Makefile
 	vsed -i -e 's/lib64/lib/g' libopeniscsiusr/Makefile
 	vsed -i -e 's,<linux/if_ether.h>,<netinet/if_ether.h>,g' usr/iscsi_net_util.c
 	vsed -i -e '1i#include <netinet/if_ether.h>' iscsiuio/src/unix/libs/bnx2x.c libopeniscsiusr/misc.c
 }
+
 do_configure() {
 	( cd iscsiuio && autoreconf -fi && ./configure ${configure_args} CFLAGS="-DNO_SYSTEMD" )
 }
+
 do_build() {
 	make ${makejobs} CC="$CC" \
 		OPTFLAGS="$CFLAGS $(pkg-config --cflags libkmod) -pthread -DNO_SYSTEMD" \
 		LDFLAGS="$LDFLAGS $(pkg-config --libs libkmod) -pthread" NO_SYSTEMD=1
 }
+
 do_install() {
 	make install exec_prefix=/usr SBINDIR=/usr/bin RULESDIR=/usr/lib/udev/rules.d DESTDIR="$DESTDIR"
+	vsv iscsid
 
 	rm -rf ${DESTDIR}/usr/lib/systemd