From eee751dec1203ea663901db74c71dcc13f674c49 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Sat, 17 Jun 2023 15:56:15 +0200
Subject: [PATCH] open-iscsi: update to 2.1.9.

---
 srcpkgs/open-iscsi/patches/libressl.patch | 60 -----------------------
 srcpkgs/open-iscsi/template               |  8 +--
 2 files changed, 4 insertions(+), 64 deletions(-)
 delete mode 100644 srcpkgs/open-iscsi/patches/libressl.patch

diff --git a/srcpkgs/open-iscsi/patches/libressl.patch b/srcpkgs/open-iscsi/patches/libressl.patch
deleted file mode 100644
index 5fce5bf341d..00000000000
--- a/srcpkgs/open-iscsi/patches/libressl.patch
+++ /dev/null
@@ -1,60 +0,0 @@
---- a/usr/auth.c
-+++ b/usr/auth.c
-@@ -182,9 +182,11 @@
- 	case AUTH_CHAP_ALG_SHA256:
- 		digest = EVP_sha256();
- 		break;
-+#if 0
- 	case AUTH_CHAP_ALG_SHA3_256:
- 		digest = EVP_sha3_256();
- 		break;
-+#endif
- 	}
- 
- 	if (*context == NULL)
-@@ -335,7 +337,7 @@
- acl_chk_chap_alg_optn(int chap_algorithm)
- {
- 	if (chap_algorithm == AUTH_OPTION_NONE ||
--	    chap_algorithm == AUTH_CHAP_ALG_SHA3_256 ||
-+//	    chap_algorithm == AUTH_CHAP_ALG_SHA3_256 ||
- 	    chap_algorithm == AUTH_CHAP_ALG_SHA256 ||
- 	    chap_algorithm == AUTH_CHAP_ALG_SHA1 ||
- 	    chap_algorithm == AUTH_CHAP_ALG_MD5)
-@@ -748,9 +750,11 @@
- 				case AUTH_CHAP_ALG_SHA256:
- 					client->chap_challenge_len = AUTH_CHAP_SHA256_RSP_LEN;
- 					break;
-+#if 0
- 				case AUTH_CHAP_ALG_SHA3_256:
- 					client->chap_challenge_len = AUTH_CHAP_SHA3_256_RSP_LEN;
- 					break;
-+#endif
- 				}
- 				return;
- 			}
-@@ -899,7 +903,7 @@
- 			client->local_state = AUTH_LOCAL_STATE_ERROR;
- 			client->dbg_status = AUTH_DBG_STATUS_CHAP_ALG_REJECT;
- 			break;
--		} else if ((client->negotiated_chap_alg != AUTH_CHAP_ALG_SHA3_256) &&
-+		} else if (// (client->negotiated_chap_alg != AUTH_CHAP_ALG_SHA3_256) &&
- 			   (client->negotiated_chap_alg != AUTH_CHAP_ALG_SHA256) &&
- 			   (client->negotiated_chap_alg != AUTH_CHAP_ALG_SHA1) &&
- 			   (client->negotiated_chap_alg != AUTH_CHAP_ALG_MD5)) {
-@@ -1849,6 +1853,7 @@
- 				            "SHA256 due to crypto lib configuration");
- 			}
- 			break;
-+#if 0
- 		case AUTH_CHAP_ALG_SHA3_256:
- 			if (EVP_DigestInit_ex(context, EVP_sha3_256(), NULL)) {
- 				value_list[i++] = AUTH_CHAP_ALG_SHA3_256;
-@@ -1857,6 +1862,7 @@
- 				            "SHA3-256 due to crypto lib configuration");
- 			}
- 			break;
-+#endif
- 		case ~0:
- 			/* unset value in array, just ignore */
- 			break;
diff --git a/srcpkgs/open-iscsi/template b/srcpkgs/open-iscsi/template
index a146dae7a7b..f3de701055f 100644
--- a/srcpkgs/open-iscsi/template
+++ b/srcpkgs/open-iscsi/template
@@ -1,6 +1,6 @@
 # Template file for 'open-iscsi'
 pkgname=open-iscsi
-version=2.1.8
+version=2.1.9
 revision=1
 conf_files="/etc/iscsi/iscsid.conf /etc/iscsi/initiatorname.iscsi"
 build_style=gnu-configure
@@ -10,11 +10,11 @@ short_desc="Open-iSCSI userland tools"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="GPL-2.0-or-later"
 homepage="http://www.open-iscsi.com/"
-distfiles="https://github.com/${pkgname}/${pkgname}/archive/${version}.tar.gz"
-checksum=9565bdf6b68b223e1e0d455d9a04d7536724a3f5b5a254e9398d06b2a0c6b6d2
+distfiles="https://github.com/open-iscsi/open-iscsi/archive/${version}.tar.gz"
+checksum=60e2a1e3058a8af7f702e86a5a0511b05b8754d29d3d2df4e0e301399b5cf70a
 
 case "$XBPS_TARGET_MACHINE" in
-	*-musl) CFLAGS+=" -D_LINUX_IF_ETHER_H -Wno-error=format -Wno-error=cpp";;
+	*-musl) CFLAGS+=" -DGLOB_ONLYDIR=0 -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