diff options
| author |   Thomas Deutschmann <whissi@gentoo.org> | 2018-09-08 20:31:21 +0200 |
|---|---|---|
| committer | Thomas Deutschmann <whissi@gentoo.org> | 2018-09-08 20:39:47 +0200 |
| commit | f6b63795ab790ba89aecbe08c831be87b02ea780 (patch) | |
| tree | 91510365daab44251a2802e9bb507577273832c6 /sys-block/open-iscsi/files | |
| parent | xfce-extra/tumbler: Bump to 0.2.2 (diff) | |
| download | gentoo-f6b63795ab790ba89aecbe08c831be87b02ea780.tar.gz gentoo-f6b63795ab790ba89aecbe08c831be87b02ea780.tar.bz2 gentoo-f6b63795ab790ba89aecbe08c831be87b02ea780.zip | |
sys-block/open-iscsi: add snapshot version to allow building against gcc-8
Closes: https://bugs.gentoo.org/660970
Package-Manager: Portage-2.3.49, Repoman-2.3.10
Diffstat (limited to 'sys-block/open-iscsi/files')
| -rw-r--r-- | sys-block/open-iscsi/files/open-iscsi-2.0.876_p20180814-musl-fixes.patch | 85 |
1 files changed, 85 insertions, 0 deletions
diff --git a/sys-block/open-iscsi/files/open-iscsi-2.0.876_p20180814-musl-fixes.patch b/sys-block/open-iscsi/files/open-iscsi-2.0.876_p20180814-musl-fixes.patch new file mode 100644 index 000000000000..68b1bca7c7cd --- /dev/null +++ b/sys-block/open-iscsi/files/open-iscsi-2.0.876_p20180814-musl-fixes.patch @@ -0,0 +1,85 @@ +--- a/usr/idbm.c ++++ b/usr/idbm.c +@@ -27,2 +27,3 @@ + #include <errno.h> ++#include <fcntl.h> + #include <dirent.h> +--- a/usr/iscsiadm.c ++++ b/usr/iscsiadm.c +@@ -3269,2 +3269,3 @@ + int do_discover = 0, sub_mode = -1; ++ int argerror = 0; + int portal_type = -1; +@@ -3458,2 +3459,5 @@ + usage(0); ++ case '?': ++ log_error("unrecognized character '%c'", optopt); ++ argerror = 1; + } +@@ -3473,4 +3477,3 @@ + +- if (optopt) { +- log_error("unrecognized character '%c'", optopt); ++ if (argerror) { + rc = ISCSI_ERR_INVAL; +--- a/iscsiuio/src/unix/libs/bnx2x.c ++++ b/iscsiuio/src/unix/libs/bnx2x.c +@@ -44,3 +44,3 @@ + #include <linux/sockios.h> +-#include <linux/ethtool.h> ++#include "ethtool-compat.h" + #include <sys/mman.h> +--- /dev/null ++++ b/iscsiuio/src/unix/libs/ethtool-compat.h +@@ -0,0 +1,51 @@ ++/* ++ * ethtool-compat.h: adopted from ++ # ethtool.h: Defines for Linux ethtool. ++ * ++ * Copyright (C) 1998 David S. Miller (davem@redhat.com) ++ * Copyright 2001 Jeff Garzik <jgarzik@pobox.com> ++ * Portions Copyright 2001 Sun Microsystems (thockin@sun.com) ++ * Portions Copyright 2002 Intel (eli.kupermann@intel.com, ++ * christopher.leech@intel.com, ++ * scott.feldman@intel.com) ++ * Portions Copyright (C) Sun Microsystems 2008 ++ */ ++ ++#include <linux/types.h> ++#include <netinet/if_ether.h> ++ ++#define ETHTOOL_FWVERS_LEN 32 ++#define ETHTOOL_BUSINFO_LEN 32 ++#define ETHTOOL_EROMVERS_LEN 32 ++ ++struct ethtool_drvinfo { ++ __u32 cmd; ++ char driver[32]; ++ char version[32]; ++ char fw_version[ETHTOOL_FWVERS_LEN]; ++ char bus_info[ETHTOOL_BUSINFO_LEN]; ++ char erom_version[ETHTOOL_EROMVERS_LEN]; ++ char reserved2[12]; ++ __u32 n_priv_flags; ++ __u32 n_stats; ++ __u32 testinfo_len; ++ __u32 eedump_len; ++ __u32 regdump_len; ++}; ++ ++struct ethtool_tcpip4_spec { ++ __be32 ip4src; ++ __be32 ip4dst; ++ __be16 psrc; ++ __be16 pdst; ++ __u8 tos; ++}; ++ ++struct ethtool_ah_espip4_spec { ++ __be32 ip4src; ++ __be32 ip4dst; ++ __be32 spi; ++ __u8 tos; ++}; ++ ++#define ETHTOOL_GDRVINFO 0x00000003 /* Get driver info. */ |