aboutsummaryrefslogtreecommitdiffstats
path: root/main/open-iscsi/musl-fixes.patch
diff options
context:
space:
mode:
authorLeonardo Arena <rnalrd@alpinelinux.org>2017-05-25 10:13:56 +0000
committerLeonardo Arena <rnalrd@alpinelinux.org>2017-05-25 10:23:02 +0000
commit0acd32966d0410e030e316b0a2225712a40d2708 (patch)
treef9ae772849579bbe636dd56f86dba77779f79083 /main/open-iscsi/musl-fixes.patch
parentf876db89859e4ef206cc6adfb6bca2faea90bc39 (diff)
downloadaports-0acd32966d0410e030e316b0a2225712a40d2708.tar.gz
aports-0acd32966d0410e030e316b0a2225712a40d2708.tar.bz2
aports-0acd32966d0410e030e316b0a2225712a40d2708.tar.xz
main/open-iscsi: upgrade to 2.0.874
Diffstat (limited to 'main/open-iscsi/musl-fixes.patch')
-rw-r--r--main/open-iscsi/musl-fixes.patch91
1 files changed, 57 insertions, 34 deletions
diff --git a/main/open-iscsi/musl-fixes.patch b/main/open-iscsi/musl-fixes.patch
index f101eda6dd..5a3158e5df 100644
--- a/main/open-iscsi/musl-fixes.patch
+++ b/main/open-iscsi/musl-fixes.patch
@@ -1,26 +1,19 @@
---- ./utils/open-isns/isns.h.orig
-+++ ./utils/open-isns/isns.h
-@@ -13,6 +13,7 @@
- #include <sys/socket.h>
- #include <netinet/in.h>
+diff --git a/iscsiuio/src/unix/libs/bnx2x.c b/iscsiuio/src/unix/libs/bnx2x.c
+index 19cbcec..ad2d6ba 100644
+--- a/iscsiuio/src/unix/libs/bnx2x.c
++++ b/iscsiuio/src/unix/libs/bnx2x.c
+@@ -36,6 +36,7 @@
+ * bnx2x.c - bnx2x user space driver
+ *
+ */
++#include <netinet/if_ether.h>
+ #include <errno.h>
#include <stdio.h>
-+#include <time.h>
-
- #include <isns-proto.h>
- #include "types.h"
---- ./utils/fwparam_ibft/fwparam_ppc.c.orig
-+++ ./utils/fwparam_ibft/fwparam_ppc.c
-@@ -356,7 +356,7 @@
- * Sort the nics into "natural" order. The proc fs
- * device-tree has them in somewhat random, or reversed order.
- */
-- qsort(niclist, nic_count, sizeof(char *), (__compar_fn_t)nic_cmp);
-+ qsort(niclist, nic_count, sizeof(char *), (int (*)(const void *, const void *))nic_cmp);
-
- snprintf(prefix, sizeof(prefix), "%s/%s", devtree, "aliases");
- dev_count = 0;
---- ./usr/idbm.c.orig
-+++ ./usr/idbm.c
+ #include <string.h>
+diff --git a/usr/idbm.c b/usr/idbm.c
+index 3b8a5a2..579b145 100644
+--- a/usr/idbm.c
++++ b/usr/idbm.c
@@ -25,6 +25,7 @@
#include <stdlib.h>
#include <string.h>
@@ -29,30 +22,44 @@
#include <dirent.h>
#include <limits.h>
#include <sys/stat.h>
---- ./usr/iscsiadm.c.orig 2012-05-21 02:59:24.000000000 +0200
-+++ ./usr/iscsiadm.c 2016-07-20 22:00:54.430451701 +0200
-@@ -2403,6 +2403,7 @@ main(int argc, char **argv)
- int tpgt = PORTAL_GROUP_TAG_UNKNOWN, killiscsid=-1, do_show=0;
+diff --git a/usr/iscsi_net_util.c b/usr/iscsi_net_util.c
+index 06df9b3..777e4e2 100644
+--- a/usr/iscsi_net_util.c
++++ b/usr/iscsi_net_util.c
+@@ -30,7 +30,7 @@
+ #include <linux/sockios.h>
+ #include <linux/if_vlan.h>
+ #include <net/if_arp.h>
+-#include <linux/if_ether.h>
++#include <netinet/if_ether.h>
+
+ #include "sysdeps.h"
+ #include "ethtool-copy.h"
+diff --git a/usr/iscsiadm.c b/usr/iscsiadm.c
+index 9602f6c..ba6e873 100644
+--- a/usr/iscsiadm.c
++++ b/usr/iscsiadm.c
+@@ -3263,6 +3263,7 @@ main(int argc, char **argv)
int packet_size=32, ping_count=1, ping_interval=0;
int do_discover = 0, sub_mode = -1;
+ int portal_type = -1;
+ int argerror = 0;
struct sigaction sa_old;
struct sigaction sa_new;
struct list_head ifaces;
-@@ -2553,7 +2554,11 @@ main(int argc, char **argv)
- return 0;
+@@ -3426,6 +3427,11 @@ main(int argc, char **argv)
+ break;
case 'h':
usage(0);
-- }
-+
++ break;
+ case '?':
+ log_error("unrecognized character '%c'", optopt);
+ argerror = 1;
-+ }
++ break;
+ }
if (name && value) {
- param = idbm_alloc_user_param(name, value);
-@@ -2568,8 +2573,7 @@ main(int argc, char **argv)
+@@ -3441,8 +3447,7 @@ main(int argc, char **argv)
}
}
@@ -61,4 +68,20 @@
+ if (argerror) {
rc = ISCSI_ERR_INVAL;
goto free_ifaces;
-
+ }
+diff --git a/utils/fwparam_ibft/fwparam_ppc.c b/utils/fwparam_ibft/fwparam_ppc.c
+index c298b8c..da14ee2 100644
+--- a/utils/fwparam_ibft/fwparam_ppc.c
++++ b/utils/fwparam_ibft/fwparam_ppc.c
+@@ -356,7 +356,7 @@ static int loop_devs(const char *devtree)
+ * Sort the nics into "natural" order. The proc fs
+ * device-tree has them in somewhat random, or reversed order.
+ */
+- qsort(niclist, nic_count, sizeof(char *), (__compar_fn_t)nic_cmp);
++ qsort(niclist, nic_count, sizeof(char *), (int (*)(const void *, const void *))nic_cmp);
+
+ snprintf(prefix, sizeof(prefix), "%s/%s", devtree, "aliases");
+ dev_count = 0;
+--
+2.13.0
+