wallenstein/void-packages
1
0
Fork 0
mirror of https://github.com/void-linux/void-packages.git synced 2025-06-07 15:43:49 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

open-iscsi: update to 2.1.1.

Browse source
This commit is contained in:
Leah Neukirchen 2020-03-03 17:26:52 +01:00
parent 195df9c84a
commit 72093002dc
3 changed files with 32 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
srcpkgs/open-iscsi/patches/fix-musl.patch
View file

@ -40,3 +40,13 @@ Later check this flag and error out, if it is set.
rc = ISCSI_ERR_INVAL; rc = ISCSI_ERR_INVAL;
goto free_ifaces; goto free_ifaces;
} }
--- usr/mgmt_ipc.c.orig
+++ usr/mgmt_ipc.c
@@ -22,6 +22,7 @@
* See the file COPYING included with this distribution for more details.
*/
#include <stdlib.h>
+#include <string.h>
#include <errno.h>
#include <unistd.h>
#include <pwd.h>

23
srcpkgs/open-iscsi/patches/libressl.patch
View file

@ -21,7 +21,7 @@
chap_algorithm == AUTH_CHAP_ALG_SHA256 || chap_algorithm == AUTH_CHAP_ALG_SHA256 ||
chap_algorithm == AUTH_CHAP_ALG_SHA1 || chap_algorithm == AUTH_CHAP_ALG_SHA1 ||
chap_algorithm == AUTH_CHAP_ALG_MD5) chap_algorithm == AUTH_CHAP_ALG_MD5)
@@ -748,8 +750,10 @@ @@ -748,9 +750,11 @@
case AUTH_CHAP_ALG_SHA256: case AUTH_CHAP_ALG_SHA256:
client->chap_challenge_len = AUTH_CHAP_SHA256_RSP_LEN; client->chap_challenge_len = AUTH_CHAP_SHA256_RSP_LEN;
break; break;
@ -32,7 +32,8 @@
+#endif +#endif
} }
return; return;
@@ -899,7 +902,7 @@ }
@@ -899,7 +903,7 @@
client->local_state = AUTH_LOCAL_STATE_ERROR; client->local_state = AUTH_LOCAL_STATE_ERROR;
client->dbg_status = AUTH_DBG_STATUS_CHAP_ALG_REJECT; client->dbg_status = AUTH_DBG_STATUS_CHAP_ALG_REJECT;
break; break;
@ -41,15 +42,19 @@
(client->negotiated_chap_alg != AUTH_CHAP_ALG_SHA256) && (client->negotiated_chap_alg != AUTH_CHAP_ALG_SHA256) &&
(client->negotiated_chap_alg != AUTH_CHAP_ALG_SHA1) && (client->negotiated_chap_alg != AUTH_CHAP_ALG_SHA1) &&
(client->negotiated_chap_alg != AUTH_CHAP_ALG_MD5)) { (client->negotiated_chap_alg != AUTH_CHAP_ALG_MD5)) {
@@ -1823,9 +1826,11 @@ @@ -1849,6 +1853,7 @@
EVP_MD_CTX *context = EVP_MD_CTX_new(); "SHA256 due to crypto lib configuration");
int i = 0; }
break;
+#if 0 +#if 0
case AUTH_CHAP_ALG_SHA3_256:
if (EVP_DigestInit_ex(context, EVP_sha3_256(), NULL)) { if (EVP_DigestInit_ex(context, EVP_sha3_256(), NULL)) {
value_list[i++] = AUTH_CHAP_ALG_SHA3_256; value_list[i++] = AUTH_CHAP_ALG_SHA3_256;
@@ -1857,6 +1862,7 @@
"SHA3-256 due to crypto lib configuration");
} }
break;
+#endif +#endif
if (EVP_DigestInit_ex(context, EVP_sha256(), NULL)) { case ~0:
value_list[i++] = AUTH_CHAP_ALG_SHA256; /* unset value in array, just ignore */
} break;

6
srcpkgs/open-iscsi/template
View file

@ -1,6 +1,6 @@
# Template file for 'open-iscsi' # Template file for 'open-iscsi'
pkgname=open-iscsi pkgname=open-iscsi
version=2.1.0 version=2.1.1
revision=1 revision=1
conf_files="/etc/iscsi/iscsid.conf /etc/iscsi/initiatorname.iscsi" conf_files="/etc/iscsi/iscsid.conf /etc/iscsi/initiatorname.iscsi"
build_style=gnu-configure build_style=gnu-configure
@ -11,10 +11,10 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
license="GPL-2.0-or-later" license="GPL-2.0-or-later"
homepage="http://www.open-iscsi.com/" homepage="http://www.open-iscsi.com/"
distfiles="https://github.com/${pkgname}/${pkgname}/archive/${version}.tar.gz" distfiles="https://github.com/${pkgname}/${pkgname}/archive/${version}.tar.gz"
checksum=5b381b6a74bef3ca57cd8d5fa7a3ff07d45c8009b0e4aac5ba3a811ff0c48ee4 checksum=dfc1ea37f230f9d116f5b39c795b35be43002d65c81330ccd3878786532b811b
case "$XBPS_TARGET_MACHINE" in case "$XBPS_TARGET_MACHINE" in
*-musl) CFLAGS+="-D_LINUX_IF_ETHER_H";; *-musl) CFLAGS+="-D_LINUX_IF_ETHER_H -Wno-error=format -Wno-error=cpp";;
esac esac
post_extract() { post_extract() {
sed -i '1i#include <fcntl.h>' usr/idbm.c sed -i '1i#include <fcntl.h>' usr/idbm.c