wallenstein/void-packages
1
0
Fork 0
mirror of https://github.com/void-linux/void-packages.git synced 2025-04-18 23:27:01 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

open-iscsi: update to 2.1.0.

Browse source
This commit is contained in:
Leah Neukirchen 2019-11-15 13:49:49 +01:00
parent 2fbf32f3bc
commit 27832d7f06
2 changed files with 58 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

55
srcpkgs/open-iscsi/patches/libressl.patch Normal file
View file

@ -0,0 +1,55 @@
--- usr/auth.c.orig
+++ 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,8 +750,10 @@
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 +902,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)) {
@@ -1823,9 +1826,11 @@
EVP_MD_CTX *context = EVP_MD_CTX_new();
int i = 0;
+#if 0
if (EVP_DigestInit_ex(context, EVP_sha3_256(), NULL)) {
value_list[i++] = AUTH_CHAP_ALG_SHA3_256;
}
+#endif
if (EVP_DigestInit_ex(context, EVP_sha256(), NULL)) {
value_list[i++] = AUTH_CHAP_ALG_SHA256;
}

6
srcpkgs/open-iscsi/template
View file

@ -1,7 +1,7 @@
# Template file for 'open-iscsi'
pkgname=open-iscsi
version=2.0.878
revision=2
version=2.1.0
revision=1
conf_files="/etc/iscsi/iscsid.conf /etc/iscsi/initiatorname.iscsi"
build_style=gnu-configure
hostmakedepends="automake libtool pkg-config"
@ -11,7 +11,7 @@ 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=5aeef0069c4a9d7f288269bcf56588d09a3c529a35f865f16dd8119ab8672208
checksum=5b381b6a74bef3ca57cd8d5fa7a3ff07d45c8009b0e4aac5ba3a811ff0c48ee4
case "$XBPS_TARGET_MACHINE" in
*-musl) CFLAGS+="-D_LINUX_IF_ETHER_H";;