mirror of
https://github.com/void-linux/void-packages.git
synced 2025-06-05 22:53:51 +02:00
open-iscsi: update to 2.1.1.
This commit is contained in:
parent
195df9c84a
commit
72093002dc
3 changed files with 32 additions and 17 deletions
|
@ -40,3 +40,13 @@ Later check this flag and error out, if it is set.
|
|||
rc = ISCSI_ERR_INVAL;
|
||||
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>
|
||||
|
|
|
@ -21,7 +21,7 @@
|
|||
chap_algorithm == AUTH_CHAP_ALG_SHA256 ||
|
||||
chap_algorithm == AUTH_CHAP_ALG_SHA1 ||
|
||||
chap_algorithm == AUTH_CHAP_ALG_MD5)
|
||||
@@ -748,8 +750,10 @@
|
||||
@@ -748,9 +750,11 @@
|
||||
case AUTH_CHAP_ALG_SHA256:
|
||||
client->chap_challenge_len = AUTH_CHAP_SHA256_RSP_LEN;
|
||||
break;
|
||||
|
@ -30,9 +30,10 @@
|
|||
client->chap_challenge_len = AUTH_CHAP_SHA3_256_RSP_LEN;
|
||||
break;
|
||||
+#endif
|
||||
}
|
||||
return;
|
||||
@@ -899,7 +902,7 @@
|
||||
}
|
||||
return;
|
||||
}
|
||||
@@ -899,7 +903,7 @@
|
||||
client->local_state = AUTH_LOCAL_STATE_ERROR;
|
||||
client->dbg_status = AUTH_DBG_STATUS_CHAP_ALG_REJECT;
|
||||
break;
|
||||
|
@ -41,15 +42,19 @@
|
|||
(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;
|
||||
|
||||
@@ -1849,6 +1853,7 @@
|
||||
"SHA256 due to crypto lib configuration");
|
||||
}
|
||||
break;
|
||||
+#if 0
|
||||
if (EVP_DigestInit_ex(context, EVP_sha3_256(), NULL)) {
|
||||
value_list[i++] = AUTH_CHAP_ALG_SHA3_256;
|
||||
}
|
||||
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
|
||||
if (EVP_DigestInit_ex(context, EVP_sha256(), NULL)) {
|
||||
value_list[i++] = AUTH_CHAP_ALG_SHA256;
|
||||
}
|
||||
case ~0:
|
||||
/* unset value in array, just ignore */
|
||||
break;
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
# Template file for 'open-iscsi'
|
||||
pkgname=open-iscsi
|
||||
version=2.1.0
|
||||
version=2.1.1
|
||||
revision=1
|
||||
conf_files="/etc/iscsi/iscsid.conf /etc/iscsi/initiatorname.iscsi"
|
||||
build_style=gnu-configure
|
||||
|
@ -11,10 +11,10 @@ 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=5b381b6a74bef3ca57cd8d5fa7a3ff07d45c8009b0e4aac5ba3a811ff0c48ee4
|
||||
checksum=dfc1ea37f230f9d116f5b39c795b35be43002d65c81330ccd3878786532b811b
|
||||
|
||||
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
|
||||
post_extract() {
|
||||
sed -i '1i#include <fcntl.h>' usr/idbm.c
|
||||
|
|
Loading…
Add table
Reference in a new issue