From f2f5cf88e1fde78fa372f4baecaed21c83fcfb8a Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Sun, 15 Sep 2019 15:41:00 +0200
Subject: [PATCH] open-iscsi: update to 2.0.878.

---
 srcpkgs/open-iscsi/patches/ether.patch      | 10 ----------
 srcpkgs/open-iscsi/patches/fix-musl-2.patch | 10 ----------
 srcpkgs/open-iscsi/template                 | 20 +++++++++++---------
 3 files changed, 11 insertions(+), 29 deletions(-)
 delete mode 100644 srcpkgs/open-iscsi/patches/ether.patch
 delete mode 100644 srcpkgs/open-iscsi/patches/fix-musl-2.patch

diff --git a/srcpkgs/open-iscsi/patches/ether.patch b/srcpkgs/open-iscsi/patches/ether.patch
deleted file mode 100644
index 03dcacc750f..00000000000
--- a/srcpkgs/open-iscsi/patches/ether.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- iscsiuio/src/unix/libs/qedi.c.orig
-+++ iscsiuio/src/unix/libs/qedi.c
-@@ -46,6 +46,7 @@
- #include <errno.h>
- #include <stdio.h>
- #include <string.h>
-+#include <netinet/if_ether.h>
- #include <arpa/inet.h>
- #include <linux/types.h>
- #include <linux/sockios.h>
diff --git a/srcpkgs/open-iscsi/patches/fix-musl-2.patch b/srcpkgs/open-iscsi/patches/fix-musl-2.patch
deleted file mode 100644
index 9841ed9ed9d..00000000000
--- a/srcpkgs/open-iscsi/patches/fix-musl-2.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- libopeniscsiusr/iface.c.orig	2018-01-25 05:03:12.126607300 +0100
-+++ libopeniscsiusr/iface.c	2018-01-25 05:03:24.741754982 +0100
-@@ -30,6 +30,7 @@
- #include <netdb.h>
- #include <assert.h>
- #include <inttypes.h>
-+#include <limits.h>
- 
- #include "libopeniscsiusr/libopeniscsiusr.h"
- #include "misc.h"
diff --git a/srcpkgs/open-iscsi/template b/srcpkgs/open-iscsi/template
index 0482757e1ca..c6d1f79e726 100644
--- a/srcpkgs/open-iscsi/template
+++ b/srcpkgs/open-iscsi/template
@@ -1,17 +1,17 @@
 # Template file for 'open-iscsi'
 pkgname=open-iscsi
-version=2.0.876
-revision=2
+version=2.0.878
+revision=1
 conf_files="/etc/iscsi/iscsid.conf /etc/iscsi/initiatorname.iscsi"
 build_style=gnu-configure
 hostmakedepends="automake libtool"
-makedepends="libisns-devel libmount-devel libressl-devel"
+makedepends="libisns-devel libkmod-devel libmount-devel libressl-devel"
 short_desc="Open-iSCSI userland tools"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
-license="GPL-2"
+license="GPL-2.0-or-later"
 homepage="http://www.open-iscsi.com/"
 distfiles="https://github.com/${pkgname}/${pkgname}/archive/${version}.tar.gz"
-checksum=9f01327d5e100ed794dc5083fc18dc4a06a0c29c77b252e21abd1b8f56edd9a7
+checksum=5aeef0069c4a9d7f288269bcf56588d09a3c529a35f865f16dd8119ab8672208
 
 case "$XBPS_TARGET_MACHINE" in
 	*-musl) CFLAGS+="-D_LINUX_IF_ETHER_H";;
@@ -20,15 +20,17 @@ post_extract() {
 	sed -i '1i#include <fcntl.h>' usr/idbm.c
 	sed -i 's/(__compar_fn_t)//' utils/fwparam_ibft/fwparam_ppc.c
 	sed -i '/CC.*-o/s/$/ $(LDFLAGS)/' utils/Makefile usr/Makefile
-	sed -i 's,<linux/if_ether.h>,<netinet/if_ether.h>,g' usr/iscsi_net_util.c
-	sed -i '1i#include <netinet/if_ether.h>' iscsiuio/src/unix/libs/bnx2x.c
 	sed -i 's/lib64/lib/g' libopeniscsiusr/Makefile
+	sed -i 's,<linux/if_ether.h>,<netinet/if_ether.h>,g' usr/iscsi_net_util.c
+	sed -i '1i#include <netinet/if_ether.h>' iscsiuio/src/unix/libs/bnx2x.c libopeniscsiusr/misc.c
 }
 do_configure() {
-	( cd iscsiuio && autoreconf -fi && ./configure ${configure_args} )
+	( cd iscsiuio && autoreconf -fi && ./configure ${configure_args} CFLAGS="-DNO_SYSTEMD" )
 }
 do_build() {
-	make ${makejobs} CC="$CC" OPTFLAGS="$CFLAGS" LDFLAGS="$LDFLAGS"
+	make ${makejobs} CC="$CC" \
+		OPTFLAGS="$CFLAGS $(pkg-config --cflags libkmod) -DNO_SYSTEMD" \
+		LDFLAGS="$LDFLAGS $(pkg-config --libs libkmod)" NO_SYSTEMD=1
 }
 do_install() {
 	make install exec_prefix=/usr sbindir=/usr/bin DESTDIR="$DESTDIR"