Difuse/packages
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge pull request #13076 from neheb/opn

Browse source 
open-iscsi: fix compilation with musl 1.2.0
This commit is contained in:
Rosen Penev 2020-08-12 11:19:59 -07:00 committed by GitHub
commit ed08dbb6fe
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 14 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
net/open-iscsi/Makefile
View file

@ -5,7 +5,7 @@ include $(TOPDIR)/rules.mk
PKG_NAME:=open-iscsi PKG_NAME:=open-iscsi
PKG_VERSION:=2.1.1 PKG_VERSION:=2.1.1
PKG_RELEASE:=1 PKG_RELEASE:=2
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
PKG_SOURCE_URL:=https://codeload.github.com/open-iscsi/open-iscsi/tar.gz/$(PKG_VERSION)? PKG_SOURCE_URL:=https://codeload.github.com/open-iscsi/open-iscsi/tar.gz/$(PKG_VERSION)?

17
net/open-iscsi/patches/0004-idbw_rec_write-pick-tpgt-from-existing-record.patch
View file

@ -23,7 +23,18 @@ index b6193e7..2208c4a 100644
#include <sys/stat.h> #include <sys/stat.h>
#include <sys/file.h> #include <sys/file.h>
#include <inttypes.h> #include <inttypes.h>
@@ -202,6 +203,8 @@ static struct int_list_tbl { @@ -44,6 +45,10 @@
#include "fw_context.h"
#include "iscsi_err.h"
+#ifndef GLOB_ONLYDIR
+#define GLOB_ONLYDIR 0x100
+#endif
+
#define IDBM_HIDE 0 /* Hide parameter when print. */
#define IDBM_SHOW 1 /* Show parameter when print. */
#define IDBM_MASKED 2 /* Show "stars" instead of real value when print */
@@ -202,6 +207,8 @@ static struct int_list_tbl {
{ "SHA3-256", AUTH_CHAP_ALG_SHA3_256 }, { "SHA3-256", AUTH_CHAP_ALG_SHA3_256 },
}; };
@ -32,7 +43,7 @@ index b6193e7..2208c4a 100644
static void static void
idbm_recinfo_discovery(discovery_rec_t *r, recinfo_t *ri) idbm_recinfo_discovery(discovery_rec_t *r, recinfo_t *ri)
{ {
@@ -2206,12 +2209,49 @@ static int idbm_rec_write_old(node_rec_t *rec) @@ -2206,12 +2213,49 @@ static int idbm_rec_write_old(node_rec_t *rec)
FILE *f; FILE *f;
char *portal; char *portal;
int rc = 0; int rc = 0;
@ -82,6 +93,4 @@ index b6193e7..2208c4a 100644
snprintf(portal, PATH_MAX, "%s/%s/%s,%d", NODE_CONFIG_DIR, snprintf(portal, PATH_MAX, "%s/%s/%s,%d", NODE_CONFIG_DIR,
rec->name, rec->conn[0].address, rec->conn[0].port); rec->name, rec->conn[0].address, rec->conn[0].port);
--
2.21.1