From 77398e424e45d9e98c1cef3c43bdadb9d56e81ef Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sun, 10 Nov 2019 13:21:36 +0000 Subject: gentoo resync : 10.11.2019 --- .../files/open-iscsi-2.0.876-musl-fixes.patch | 92 ---------------------- .../open-iscsi-2.0.876-space_in_node-mode.patch | 28 ------- .../open-iscsi-2.0.876_p20180814-musl-fixes.patch | 85 -------------------- 3 files changed, 205 deletions(-) delete mode 100644 sys-block/open-iscsi/files/open-iscsi-2.0.876-musl-fixes.patch delete mode 100644 sys-block/open-iscsi/files/open-iscsi-2.0.876-space_in_node-mode.patch delete mode 100644 sys-block/open-iscsi/files/open-iscsi-2.0.876_p20180814-musl-fixes.patch (limited to 'sys-block/open-iscsi/files') diff --git a/sys-block/open-iscsi/files/open-iscsi-2.0.876-musl-fixes.patch b/sys-block/open-iscsi/files/open-iscsi-2.0.876-musl-fixes.patch deleted file mode 100644 index 7bb0c5d6e779..000000000000 --- a/sys-block/open-iscsi/files/open-iscsi-2.0.876-musl-fixes.patch +++ /dev/null @@ -1,92 +0,0 @@ ---- a/usr/idbm.c -+++ b/usr/idbm.c -@@ -27,2 +27,3 @@ - #include -+#include - #include ---- 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/utils/fwparam_ibft/fwparam_ppc.c -+++ b/utils/fwparam_ibft/fwparam_ppc.c -@@ -358,3 +358,3 @@ - */ -- qsort(niclist, nic_count, sizeof(char *), (__compar_fn_t)nic_cmp); -+ qsort(niclist, nic_count, sizeof(char *), (int (*)(const void *, const void *))nic_cmp); - ---- a/iscsiuio/src/unix/libs/bnx2x.c -+++ b/iscsiuio/src/unix/libs/bnx2x.c -@@ -44,3 +44,3 @@ - #include --#include -+#include "ethtool-compat.h" - #include ---- /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 -+ * 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 -+#include -+ -+#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. */ diff --git a/sys-block/open-iscsi/files/open-iscsi-2.0.876-space_in_node-mode.patch b/sys-block/open-iscsi/files/open-iscsi-2.0.876-space_in_node-mode.patch deleted file mode 100644 index 1b72eec79450..000000000000 --- a/sys-block/open-iscsi/files/open-iscsi-2.0.876-space_in_node-mode.patch +++ /dev/null @@ -1,28 +0,0 @@ -From baa0cb45cfcf10a81283c191b0b236cd1a2f66ee Mon Sep 17 00:00:00 2001 -From: Lee Duncan -Date: Fri, 12 Oct 2018 09:57:20 -0700 -Subject: [PATCH] Restore space in node-mode level 0 output - -As part of the libopeniscsiusr update, the output -of "iscsiadm -m node" dropped a space that needs to -be between the portal and the target, for proper -parsing. - -Fixes: 87ea50a1c3a97 ---- - usr/iscsiadm.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/usr/iscsiadm.c b/usr/iscsiadm.c -index e3ba03c8..25c6cdc0 100644 ---- a/usr/iscsiadm.c -+++ b/usr/iscsiadm.c -@@ -683,7 +683,7 @@ static int login_portals(struct node_rec *pattern_rec) - - static void print_node_flat(struct iscsi_node *node) - { -- printf("%s,%" PRIu16 "%s\n", -+ printf("%s,%" PRIu16 " %s\n", - iscsi_node_portal_get(node), - iscsi_node_tpgt_get(node), - iscsi_node_target_name_get(node)); 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 deleted file mode 100644 index 68b1bca7c7cd..000000000000 --- a/sys-block/open-iscsi/files/open-iscsi-2.0.876_p20180814-musl-fixes.patch +++ /dev/null @@ -1,85 +0,0 @@ ---- a/usr/idbm.c -+++ b/usr/idbm.c -@@ -27,2 +27,3 @@ - #include -+#include - #include ---- 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 --#include -+#include "ethtool-compat.h" - #include ---- /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 -+ * 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 -+#include -+ -+#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. */ -- cgit v1.2.3