summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Mair-Keimberger <m.mairkeimberger@gmail.com>2019-09-28 09:43:31 +0200
committerAaron Bauman <bman@gentoo.org>2019-11-07 21:43:37 -0500
commit7d4d8077fec0e0c72332ceeb76f869e057ec979d (patch)
tree082d1018a594cbef03ccf5543d47660df3642645
parentdev-tex/pgf: remove unused patch(es) (diff)
downloadgentoo-7d4d8077fec0e0c72332ceeb76f869e057ec979d.tar.gz
gentoo-7d4d8077fec0e0c72332ceeb76f869e057ec979d.tar.bz2
gentoo-7d4d8077fec0e0c72332ceeb76f869e057ec979d.zip
sys-block/open-iscsi: remove unused patches
Signed-off-by: Michael Mair-Keimberger <m.mairkeimberger@gmail.com> Closes: https://github.com/gentoo/gentoo/pull/13067 Signed-off-by: Aaron Bauman <bman@gentoo.org>
-rw-r--r--sys-block/open-iscsi/files/open-iscsi-2.0.876-musl-fixes.patch92
-rw-r--r--sys-block/open-iscsi/files/open-iscsi-2.0.876-space_in_node-mode.patch28
-rw-r--r--sys-block/open-iscsi/files/open-iscsi-2.0.876_p20180814-musl-fixes.patch85
3 files changed, 0 insertions, 205 deletions
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 <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/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 <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. */
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 <lduncan@suse.com>
-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 <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. */