diff options
| author | Leonardo Arena <rnalrd@alpinelinux.org> | 2019-08-12 10:02:48 +0000 |
|---|---|---|
| committer | Leonardo Arena <rnalrd@alpinelinux.org> | 2019-11-15 09:34:43 +0000 |
| commit | 653c61b661708b8b92f1d38a3d90cffde6c7eda1 (patch) | |
| tree | d773bca3a36eda0c18f9a45f9e7418431e58180f /main/open-iscsi/musl-fixes.patch | |
| parent | f2be8a534419972d669bcececb53ff04adbcff90 (diff) | |
| download | aports-653c61b661708b8b92f1d38a3d90cffde6c7eda1.tar.bz2 aports-653c61b661708b8b92f1d38a3d90cffde6c7eda1.tar.xz | |
main/open-iscsi: upgrade to 2.1.0
Add openrc subpkg
Diffstat (limited to 'main/open-iscsi/musl-fixes.patch')
| -rw-r--r-- | main/open-iscsi/musl-fixes.patch | 66 |
1 files changed, 6 insertions, 60 deletions
diff --git a/main/open-iscsi/musl-fixes.patch b/main/open-iscsi/musl-fixes.patch index 5a3158e5df..d5176f80b9 100644 --- a/main/open-iscsi/musl-fixes.patch +++ b/main/open-iscsi/musl-fixes.patch @@ -1,53 +1,15 @@ -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 <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> - #include <errno.h> -+#include <fcntl.h> - #include <dirent.h> - #include <limits.h> - #include <sys/stat.h> -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) +--- a/usr/iscsiadm.c 2016-09-29 20:33:24.000000000 +0200 ++++ b/usr/iscsiadm.c 2017-01-08 03:03:20.648496369 +0100 +@@ -3263,7 +3263,8 @@ int packet_size=32, ping_count=1, ping_interval=0; int do_discover = 0, sub_mode = -1; int portal_type = -1; + int timeout = ISCSID_REQ_TIMEOUT; + int argerror = 0; struct sigaction sa_old; struct sigaction sa_new; struct list_head ifaces; -@@ -3426,6 +3427,11 @@ main(int argc, char **argv) +@@ -3426,6 +3427,11 @@ break; case 'h': usage(0); @@ -59,7 +21,7 @@ index 9602f6c..ba6e873 100644 } if (name && value) { -@@ -3441,8 +3447,7 @@ main(int argc, char **argv) +@@ -3441,8 +3446,7 @@ } } @@ -69,19 +31,3 @@ index 9602f6c..ba6e873 100644 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 - |