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 --- sys-block/open-iscsi/Manifest | 3 - .../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 -------------------- 4 files changed, 208 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') diff --git a/sys-block/open-iscsi/Manifest b/sys-block/open-iscsi/Manifest index 96b01745d520..68f34eb917ed 100644 --- a/sys-block/open-iscsi/Manifest +++ b/sys-block/open-iscsi/Manifest @@ -10,9 +10,6 @@ AUX open-iscsi-2.0.874-musl-ethtool-compat.patch 2230 BLAKE2B fada90cbf8173364b7 AUX open-iscsi-2.0.874-musl-fixes.patch 1478 BLAKE2B a58a8eec59c7dd05e121ab8213dad21d21cb33c91e8b4763816ce6fccc8f9d8f57d9e7bd246e3417e78da0ce61cade5a29433b2b44d025875cd2199dee2e6353 SHA512 264313bc8de01bcad1db858c0b99ca2c294c22eb1b2693e0445083a895afd0cdc9178ff2dad5de18628a6e61723ad5d2e0c0d4789ce07ccae131f575747aa382 AUX open-iscsi-2.0.875-include-sysmacros.patch 603 BLAKE2B 9c3fcf3bfd0a2ee04c31dd01dbb50680bc9bb434523f0e298d55b762be11f0cd4ef5c7b254466859f755f9e733e8ceaa54795f7dc57518c5136be5ff8001cffe SHA512 686698edc063fbdc47f07dea76ef95e8ae1038eeb3f012f4b6bc098cb0740e9988fc45779e921f4f01ef418d505f194c427308927c67d7af06e03e12b1ae9064 AUX open-iscsi-2.0.876-Makefiles.patch 1416 BLAKE2B e953a6b5b802feae3068322782f3cd278c878814100fb37bee81400bed76096f08d01575e42d71538ae76086261dccc65104e3df19f3e36e3e660726cdbd3ec5 SHA512 f6038dc8c8d2a31528844f348bc8144616b69bf97f01986a4481b3a81de4bc896204a48c290f8b156d1e85ffd792439251fd52a498d053ed84d21d8b07d1d240 -AUX open-iscsi-2.0.876-musl-fixes.patch 2323 BLAKE2B c69d973bdc48adc1f4f8e5680f8cf108172f708889bb740cd7960f09dd48ee29d6ccdbf6f1ed08579838fc1913cd3c8ee0b9325714e793de5884eb6faea0e161 SHA512 2224465ba4ae0f8eb195a1181304e17285c6501320f1458b6eb9d092a19c08bdedb08e8b88bfc319eb878a18fb1b487842719fa24f69f5885b1ba7845197fe12 -AUX open-iscsi-2.0.876-space_in_node-mode.patch 901 BLAKE2B 440b58f2ba96d99ef0fe132d301ac138b1e5bd903bffc215e498f7124f30f0d395f473124b718cbedf2035fe29993cc5d87ee125e4c3b3794b741ec285e10aa1 SHA512 89718e2d098fe774553fbb86c244f427da7d0ed64818b83d2d0213f1cce5c7bdf0f57f79e1dc1511ab9ff29fee1f11cce1713a004cde989fdccbbf9a728d2eba -AUX open-iscsi-2.0.876_p20180814-musl-fixes.patch 2057 BLAKE2B 6dea839a582be9e096ec35cd61eaf173300353e71bf2df57ca420c2a7921e91282fbd206815cbdf5baab8ffe499b86412092680bc4b9342fa1796d5a2fc502ed SHA512 10db0c0123342797824ec241d0769b431ce10aaca32d0242ebee98258e6236ee5492afc8b8a20a9842339fbb4a0c7c4c7c158b4d0c6651890d4c1af9e81733bd AUX open-iscsi-2.0.877-optional_systemd.patch 2308 BLAKE2B 32ad0dd559cae999e5fa1cd2164a825bc7c17bfea07d8ab3ffc9bd469d14538b4ec469f241daed9dfcc376a11dd29dc15d0e14bc2b3d59667719b13e27571ffb SHA512 ed00b9155f623ccc6f871247f0388d7f453997b8ce5c04aba38eab36d5379c6e94896e3a0d6b16fe9ed52b96694ddb9b5e07b8bb9051940b4f4274a89ffb7c1c AUX open-iscsi-2.0.877-pkgconfig.patch 2882 BLAKE2B f763ae55aa0bc9e7d2f525a069bd7b35cc8f71fa51c5251ef1ca917373cf963f3ad26418bd72f68cadaa1678f86c9f246070a4ae03fc21fa49b52428a30b6290 SHA512 0da14100fa93fd256d6f6cbe4126be1f2fb874d3570fcdc09e8cb77052cc98413d8bde2bcaca6b7bc286b2494f8cca7c707813ecd4f290cc63cc8aa2ea8347af DIST open-iscsi-2.0-873.tar.gz 667069 BLAKE2B edb427f8483c31499cdde644bbf8d658952952fa8d52a232537e7e6ec71d2d237dcd4e8759de21b65cac757678c7d71c22bd2fe71ed1e7ac152ae8396f080061 SHA512 4e67116cb7dd49381c9279645e5a661f05596ae6be3b832772089828b3764ca2d04b5dea1bcc337071efb52c3c75a6fb943136c659ee59500f3a198ed0dcea6b 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