summaryrefslogtreecommitdiff
path: root/sys-block
diff options
context:
space:
mode:
authorV3n3RiX <venerix@redcorelinux.org>2019-05-07 11:18:59 +0100
committerV3n3RiX <venerix@redcorelinux.org>2019-05-07 11:18:59 +0100
commita2810985afabcc31d3eace5e61d8ea25b852ba17 (patch)
treed254e77a7aeadd875db2dc73532da78094238ffd /sys-block
parenteab5731cdf11d4ae8cdf111461d46fd96c5bdd37 (diff)
gentoo resync : 07.05.2019
Diffstat (limited to 'sys-block')
-rw-r--r--sys-block/Manifest.gzbin11377 -> 11367 bytes
-rw-r--r--sys-block/open-iscsi/Manifest10
-rw-r--r--sys-block/open-iscsi/files/musl-fixes.patch64
-rw-r--r--sys-block/open-iscsi/files/open-iscsi-2.0.874-include-sysmacros.patch20
-rw-r--r--sys-block/open-iscsi/files/open-iscsi-2.0.875-include-sysmacros.patch21
-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/open-iscsi-2.0.873-r2.ebuild111
-rw-r--r--sys-block/open-iscsi/open-iscsi-2.0.873-r3.ebuild114
-rw-r--r--sys-block/open-iscsi/open-iscsi-2.0.874-r2.ebuild122
-rw-r--r--sys-block/open-iscsi/open-iscsi-2.0.876_p20180814-r1.ebuild (renamed from sys-block/open-iscsi/open-iscsi-2.0.876_p20180814.ebuild)3
-rw-r--r--sys-block/open-isns/Manifest2
-rw-r--r--sys-block/open-isns/open-isns-0.99.ebuild46
12 files changed, 80 insertions, 461 deletions
diff --git a/sys-block/Manifest.gz b/sys-block/Manifest.gz
index ad710e49d3c9..62a60642d17e 100644
--- a/sys-block/Manifest.gz
+++ b/sys-block/Manifest.gz
Binary files differ
diff --git a/sys-block/open-iscsi/Manifest b/sys-block/open-iscsi/Manifest
index 03576333ee80..97234889eafb 100644
--- a/sys-block/open-iscsi/Manifest
+++ b/sys-block/open-iscsi/Manifest
@@ -3,27 +3,21 @@ AUX initiatorname.iscsi 1152 BLAKE2B 32ddfef007a3cef2c22c6f49319587065d527000d0d
AUX iscsid-conf.d 422 BLAKE2B 2871024472d5308b395aeb8c67f7b47aed4618790295d3ef7e51aaddd32f12fafbe1b8542fc8a34d5da0233a26ee557c7e9613fa8436d9c9312a9e2f6902a1e5 SHA512 d197bbe2ce610cc2d4a1269c8d7a067ca5e3b0f3d8bb0804c2c39e0cf512bcbf7b5de45b7d6ffd5cf918dc395c7cf32c40e64b4348d00a4d0223ee44c463709a
AUX iscsid-init.d 2094 BLAKE2B e13fc820e74a79e3c1f220b827c3188b6cb3bc149f450e3ee668d851faacd59e1e44b51250ba3f53a321d287eb81b580a332605226564269dbcd3e2762c0c95e SHA512 a5544e35da3433dfde96984d2e5783991d961554b8843f4f96d4317a38d7534864882342633ed0dc15c2f9e49a419e51958593b0de1ce84644938dafabe392fc
AUX iscsidev.sh 2119 BLAKE2B 60d71177fa788b942ece6d1a1d17b9157956ccd5a1781b022a56da6f13c9dc8485008fd3c6530ae9b798ce3034c9cc3c960d43a196bfb06b73746390a8af91e7 SHA512 b4ed7fad25e3f000134a77f3aea2702f03ff75e99ecf49e580085127ab58de5a64bea9c4fc2ae5b324deafd0a860494d1a8dc1223db7d3679b960552f0c00813
-AUX musl-fixes.patch 1779 BLAKE2B af41f00f38b7af6b1583b27f69aba831180ecff5be6818441cc4f814b3a909cf2a4de36350a8feafb3ebc313703c0229fa7414a1411bf2c9bbe5558dedd5434a SHA512 e45ce5deec9d3861568e0be3390827da525b523b6d0a47a99f85becb4416e3a26f5e17f077a891c43ae90e621fa8d357123b9b3573a731788fac2c12b40239a6
AUX open-iscsi-2.0.873-Makefiles.patch 5441 BLAKE2B 62e50709bc2241fb12dc4c31982e323b4d766997470bb141fd209afde7db936141fe3138cc894eddf0676a1ce4aa45332c73e520806953719b9ffaa14431abb1 SHA512 8dd3433db748f2fd0da0ab6a1059d7058eb09c527e9d039e768bc359a6b665da3e5c13463c32f35d7c630a3b901a689315ece3adb88cccabe452352658705f33
AUX open-iscsi-2.0.873-memset.patch 680 BLAKE2B 52ce4e6f1ad919334c154205bf335a3dcfe6e3c499cb4db06ec3775af33c91175caf776bb9b1efcec6fcbd57328cf80037d42d18f0b03c7a2c7ba9ecd2df2df7 SHA512 1fb0615d443ce913409f5e6e3cc217149c2586cf1b4175d34512337929c1e2209391808e8f2192742d2f3bfb382e21eaa90e596b6c3e3383ee1a5b735a30fd9b
AUX open-iscsi-2.0.874-Makefiles.patch 4087 BLAKE2B cba133471f1c22987cd8be4e7ea4629ef415f8a50da81fc53068745a85fff1aae0f82d9401035b3066906e9cab7d307249402bacc8cd767bf46d8d1a740061fb SHA512 c535a45c627aaa8fd168d4c96f782090b9ae829003ec59c6ead7f34d15f4e52c71916aa014209ac35fd3b29296bb46b603d8df2072be463c5fcc90338784665c
-AUX open-iscsi-2.0.874-include-sysmacros.patch 416 BLAKE2B a1f0f6c336528ba02ea755819c75850dcb5b718e2aafcffe7193fa352d5180736cc68418d0208418bff1eac373495b6f62d4becf1ef43b2f394ac65c97d56f4d SHA512 bc4d4a104447c2da989467ad7c74ce7850ad924c5a81407b517fa5a6cf0270ec07b2b953b1c657cb84a94444563f7658e7f013fe8ceadb2e886008e0e2e8f052
AUX open-iscsi-2.0.874-musl-ethtool-compat.patch 2230 BLAKE2B fada90cbf8173364b795be4756805ac0ae45575b785796d6aec9eb6781003974b0d4450e758d42e45778672ba053122b533d8e56bb9c8db1fbf31aa7e8bfe6dc SHA512 09a3b828773e0d7c5d98f8ba8c0683bd1ef5fd83860fafaa75d89cce9e09cebc68bfaea62091aeadeb1d1adfe5318c0af9bfa0a74f2d802568abe1a59b4ebf03
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
DIST open-iscsi-2.0-873.tar.gz 667069 BLAKE2B edb427f8483c31499cdde644bbf8d658952952fa8d52a232537e7e6ec71d2d237dcd4e8759de21b65cac757678c7d71c22bd2fe71ed1e7ac152ae8396f080061 SHA512 4e67116cb7dd49381c9279645e5a661f05596ae6be3b832772089828b3764ca2d04b5dea1bcc337071efb52c3c75a6fb943136c659ee59500f3a198ed0dcea6b
-DIST open-iscsi-2.0.874.tar.gz 625039 BLAKE2B 39e4b818b1c977d43aa6490acd4d65e688c8cd03a7ae4c03d18d6b81aa76773b0a1227b3e8d975f2a14108075bb680434ded5337db296839bd5be012130df9df SHA512 66d8a52b6401229d51873f1ee0f4e7259a8ed584800403a41741c7eeedc0ec21a2b116671cb7259f60918d083ffb46d76860236a1b10fbb94a4c1d61bddae1ae
DIST open-iscsi-2.0.875.tar.gz 635121 BLAKE2B 34a7083087c53ed0e59d293d26efe166b09c5ea18b6022869cc9ff3d2edb2fb8b69e2c1ce6c9011bd20fc590b02dafd6d7c13d8bfa1eae6408c4bace13992e5e SHA512 1709011d7d12d3dd9278a0d775af064d5f7da37357f35d6d5c5b3aa8ec16385c28b201b1261f4581dbbbbca3d815015ed8696e1694aa19f3231132f90d1e5b36
DIST open-iscsi-2.0.876.tar.gz 576111 BLAKE2B 2fbe4f37e91730d15bad77feeb9a418a8bbf709582598571a5905080eb60649f3ece6a52e9cf94a28128f2b0bc30093e67f6a47624545243b10bcebe318750ac SHA512 f9319016bd6abf3bf675ad050b0489095a21db58c93f9baaca6adc239129ad08f8e18ed96c91c36406e5c42d35118e67dfde6d3c37e97027467c4472db3b2422
DIST open-iscsi-2.0.876_p20180814.tar.gz 602779 BLAKE2B 8403d69ef43c868a009e1b7bf6e67ea0ecc0d10113b842e1f853a759398f56bb447f6c6ce5474bb2f4e9dfe59d9effc5eea58a1e7da9bbfd81c370eba1759edc SHA512 d79b3025888a8b6db944c86abb13940a6c75fe10166d79ab7e242fc108603e86a81c2ea3448318a45f0e51d89d45a21bda5ab43cf75ff759007e1949030ad0bf
EBUILD open-iscsi-2.0.873-r1.ebuild 2545 BLAKE2B c6b89937392718933e75616429acab05e7be548457b9aadaa1be77863dc8ed66e3acbaf482a320479b9c7f73507425615af86839209e2e956e08a12061097a41 SHA512 11de4116925ebe35a63ee19bb49a87bccff3c2648f3ea94ea05726d48cb0fe950a3aae9420b697c51f9f1387cea9075dfbffbeae7ca20af1e411769c34610339
-EBUILD open-iscsi-2.0.873-r2.ebuild 3251 BLAKE2B 795d8c65c1cd02f4d891750809f51dd3ef876e11caa382b7cee606bd624e511bfcc1ecd97875aebd9ce03d4d08859832bdfadc0e675e28444df26231407f7ece SHA512 476a6b0bdbfd789292bebb31ca4e9b594268fcd9a77924e1c885afe651880336755c62ac1dcc953eeda889c69d7bbfe85c88687d2356b238d0680de6ae367613
-EBUILD open-iscsi-2.0.873-r3.ebuild 3304 BLAKE2B 9cf11c61e50fca885d59bfd625db48f483d89ee7d1a0fe2eaeece59e6d4b56cf4bcfe092ca1e36c70371e9e1b58c178adb25a2ddd545554831714a56625a4f7f SHA512 14c3afdf5b5ed0f2b315fc2908c5e8886433669cef7e3f0f67eede9e01313cae47f0a71e78b4ba78404e48cd02359b543c9d644852f0c380146c77cddc44cd52
-EBUILD open-iscsi-2.0.874-r2.ebuild 3666 BLAKE2B 05affe10aa1657fbfe9aee479f5ba48c20c2877eb77dae3439bc5588efc12e8851ee03b6884c04fc5a32073ea06643a6ce4e8c0216b492c0e9f762ee2268eb27 SHA512 7104db5ae04c1abc3553cf83ddc027c83d32523a1979fcebaa2c0f4e57b02ef800c88babdb4bdf2930335b79d185bd9269015676d40faf83cca95b1387c8816e
EBUILD open-iscsi-2.0.875.ebuild 3713 BLAKE2B b3ec80066fd3c7bf72e56361e59213ba8b8a4d57e777394e5842458620a712c14ad93cc1b69f47f266360570cc6c63be94582ea3f460730ef920320a5635c397 SHA512 8af21fe4129b7af58f2e126bb5c6f8e7f6b764246686dd2a7c80e13ea90f691bcb6722a8a4a6d688d096fa7d414fd52c0a214d7c1212d40495bbbddd241b7132
EBUILD open-iscsi-2.0.876.ebuild 3620 BLAKE2B 62aa39170d32cea0f523cf148fa3770fc027b4db72d719996c5621062be9e9f593c95bf3b4a108ae62c13a172a84dc96ffa6587e3e3f51f9635af10abb3a0d6a SHA512 1bb4f8e5e98b93a704242a89e40b692f83dac92497fe018fd87fd635d2a289b7597874fdfa02004b3fd01e2809e45ea514c2a9f86d8ee29c12533bb2638785ff
-EBUILD open-iscsi-2.0.876_p20180814.ebuild 3720 BLAKE2B 3c79355c91913be2b77b5150c3828e70f08938c6911e96121920fe7d0cc86caa2303580b97d33c2f7b7a84333935f54969eddb14361fb513ca086d8ff286ad26 SHA512 df58eff2caabc6afd4a1ad416bbac464c7f6cb5e8cfa2ccf4b6dc0b971f00e091bfbb2e17a50781b858586ca01e9146bf2dca9ac56d7b46a1305664f728fc2b9
+EBUILD open-iscsi-2.0.876_p20180814-r1.ebuild 3779 BLAKE2B b781e9f244e37563113547b2c8e1a5bffd3f3b6fce0ddbac6853a0bedccbced4dcaa2893bc53d90e43663777b384ec0216f634af2096d042a450f5d3d4e015b2 SHA512 aa0bc1df9b116ad9f233706e741ad56bde58204b01572a520f3af6017567a9929939d47df527b40841d6ba2e01a0a0472621167e31f62e7de377f49cec39d44a
MISC metadata.xml 458 BLAKE2B 34a2a9b03797454b48ace319f383d85da5f9fe0f14afa1f1da1dc9afc535a2e1aeddaea0df27811b77fd3099b5754ee0755d49491157ed1e141fc2078c258389 SHA512 bd5e104acd3e07b8965b4eacb7b397b75448fc31b7359f17ee4e24af18fcd00ecd0c64001d42b7a542790151678b9dd02bad9513a69986c60cf91cceebfe86c3
diff --git a/sys-block/open-iscsi/files/musl-fixes.patch b/sys-block/open-iscsi/files/musl-fixes.patch
deleted file mode 100644
index f101eda6ddeb..000000000000
--- a/sys-block/open-iscsi/files/musl-fixes.patch
+++ /dev/null
@@ -1,64 +0,0 @@
---- ./utils/open-isns/isns.h.orig
-+++ ./utils/open-isns/isns.h
-@@ -13,6 +13,7 @@
- #include <sys/socket.h>
- #include <netinet/in.h>
- #include <stdio.h>
-+#include <time.h>
-
- #include <isns-proto.h>
- #include "types.h"
---- ./utils/fwparam_ibft/fwparam_ppc.c.orig
-+++ ./utils/fwparam_ibft/fwparam_ppc.c
-@@ -356,7 +356,7 @@
- * 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;
---- ./usr/idbm.c.orig
-+++ ./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>
---- ./usr/iscsiadm.c.orig 2012-05-21 02:59:24.000000000 +0200
-+++ ./usr/iscsiadm.c 2016-07-20 22:00:54.430451701 +0200
-@@ -2403,6 +2403,7 @@ main(int argc, char **argv)
- int tpgt = PORTAL_GROUP_TAG_UNKNOWN, killiscsid=-1, do_show=0;
- int packet_size=32, ping_count=1, ping_interval=0;
- int do_discover = 0, sub_mode = -1;
-+ int argerror = 0;
- struct sigaction sa_old;
- struct sigaction sa_new;
- struct list_head ifaces;
-@@ -2553,7 +2554,11 @@ main(int argc, char **argv)
- return 0;
- case 'h':
- usage(0);
-- }
-+
-+ case '?':
-+ log_error("unrecognized character '%c'", optopt);
-+ argerror = 1;
-+ }
-
- if (name && value) {
- param = idbm_alloc_user_param(name, value);
-@@ -2568,8 +2573,7 @@ main(int argc, char **argv)
- }
- }
-
-- if (optopt) {
-- log_error("unrecognized character '%c'", optopt);
-+ if (argerror) {
- rc = ISCSI_ERR_INVAL;
- goto free_ifaces;
-
diff --git a/sys-block/open-iscsi/files/open-iscsi-2.0.874-include-sysmacros.patch b/sys-block/open-iscsi/files/open-iscsi-2.0.874-include-sysmacros.patch
deleted file mode 100644
index 05d5d1239cb5..000000000000
--- a/sys-block/open-iscsi/files/open-iscsi-2.0.874-include-sysmacros.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- a/iscsiuio/src/unix/libs/bnx2.c
-+++ b/iscsiuio/src/unix/libs/bnx2.c
-@@ -46,6 +46,7 @@
- #include <sys/user.h>
- #include <fcntl.h>
- #include <unistd.h>
-+#include <sys/sysmacros.h>
-
- #include "config.h"
-
---- a/iscsiuio/src/unix/libs/bnx2x.c
-+++ b/iscsiuio/src/unix/libs/bnx2x.c
-@@ -50,6 +50,7 @@
- #include <sys/user.h>
- #include <fcntl.h>
- #include <unistd.h>
-+#include <sys/sysmacros.h>
-
- #include "config.h"
-
diff --git a/sys-block/open-iscsi/files/open-iscsi-2.0.875-include-sysmacros.patch b/sys-block/open-iscsi/files/open-iscsi-2.0.875-include-sysmacros.patch
deleted file mode 100644
index 7c19a1e6ba23..000000000000
--- a/sys-block/open-iscsi/files/open-iscsi-2.0.875-include-sysmacros.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-From 6d68ef5871c94c6ebbbe6e6b1fe0bc2dce711052 Mon Sep 17 00:00:00 2001
-From: Lee Duncan <lduncan@suse.com>
-Date: Sat, 2 Dec 2017 14:19:26 -0800
-Subject: [PATCH] Include <sys/sysmacros.h> to properly define minor()
-
----
- iscsiuio/src/unix/libs/qedi.c | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/iscsiuio/src/unix/libs/qedi.c b/iscsiuio/src/unix/libs/qedi.c
-index c6ff6e77..b81fecdf 100644
---- a/iscsiuio/src/unix/libs/qedi.c
-+++ b/iscsiuio/src/unix/libs/qedi.c
-@@ -58,6 +58,7 @@
- #include <sys/user.h>
- #include <fcntl.h>
- #include <unistd.h>
-+#include <sys/sysmacros.h>
-
- #include "config.h"
-
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
new file mode 100644
index 000000000000..1b72eec79450
--- /dev/null
+++ b/sys-block/open-iscsi/files/open-iscsi-2.0.876-space_in_node-mode.patch
@@ -0,0 +1,28 @@
+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/open-iscsi-2.0.873-r2.ebuild b/sys-block/open-iscsi/open-iscsi-2.0.873-r2.ebuild
deleted file mode 100644
index 4ea93fca3377..000000000000
--- a/sys-block/open-iscsi/open-iscsi-2.0.873-r2.ebuild
+++ /dev/null
@@ -1,111 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit versionator linux-info eutils flag-o-matic toolchain-funcs udev
-
-MY_P="${PN}-$(replace_version_separator 2 "-")"
-
-DESCRIPTION="A performant, transport independent, multi-platform implementation of RFC3720"
-HOMEPAGE="http://www.open-iscsi.com/"
-SRC_URI="http://www.open-iscsi.org/bits/${MY_P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
-IUSE="debug slp +tcp infiniband rdma"
-
-DEPEND="slp? ( net-libs/openslp ) infiniband? ( sys-fabric/ofed )"
-RDEPEND="${DEPEND}
- sys-fs/lsscsi
- sys-apps/util-linux"
-REQUIRED_USE="infiniband? ( rdma ) || ( rdma tcp )"
-S="${WORKDIR}/${MY_P}"
-
-pkg_setup() {
- linux-info_pkg_setup
-
- if kernel_is -lt 2 6 16; then
- die "Sorry, your kernel must be 2.6.16-rc5 or newer!"
- fi
-
- # Needs to be done, as iscsid currently only starts, when having the iSCSI
- # support loaded as module. Kernel builtin options don't work. See this for
- # more information:
- # https://groups.google.com/group/open-iscsi/browse_thread/thread/cc10498655b40507/fd6a4ba0c8e91966
- # If there's a new release, check whether this is still valid!
- TCP_MODULES="SCSI_ISCSI_ATTRS ISCSI_TCP"
- RDMA_MODULES="INFINIBAND_ISER"
- INFINIBAND_MODULES="INFINIBAND_IPOIB INIBAND_USER_MAD INFINIBAND_USER_ACCESS"
- CONFIG_CHECK_MODULES="tcp? ( ${TCP_MODULES} ) rdma? ( ${RDMA_MODULES} ) infiniband? ( ${INFINIBAND_MODULES} )"
- if linux_config_exists; then
- if use tcp; then
- for module in ${TCP_MODULES}; do
- linux_chkconfig_module ${module} || ewarn "${module} needs to be built as module (builtin doesn't work)"
- done
- fi
- if use infiniband; then
- for module in ${INFINIBAND_MODULES}; do
- linux_chkconfig_module ${module} || ewarn "${module} needs to be built as module (builtin doesn't work)"
- done
- fi
- if use rdma; then
- for module in ${RDMA_MODULES}; do
- linux_chkconfig_module ${module} || ewarn "${module} needs to be built as module (builtin doesn't work)"$
- done
- fi
- fi
-}
-
-src_prepare() {
- epatch "${FILESDIR}"/${P}-Makefiles.patch
- epatch "${FILESDIR}"/${P}-memset.patch
-
- sed -i -e 's:^\(iscsid.startup\)\s*=.*:\1 = /usr/sbin/iscsid:' etc/iscsid.conf || die
-}
-
-src_configure() {
- use debug && append-cppflags -DDEBUG_TCP -DDEBUG_SCSI
- append-lfs-flags
-
- cd utils/open-isns || die
-
- # SSL (--with-security) is broken
- econf $(use_with slp) \
- --without-security
-}
-
-src_compile() {
- # Stuffing CPPFLAGS into CFLAGS isn't entirely correct, but the build
- # is messed up already here, so it's not making it that much worse.
- KSRC="${KV_DIR}" CFLAGS="" \
- emake \
- OPTFLAGS="${CFLAGS} ${CPPFLAGS}" \
- AR="$(tc-getAR)" CC="$(tc-getCC)" \
- user
-}
-
-src_install() {
- emake DESTDIR="${ED}" sbindir="/usr/sbin" install
-
- dodoc README THANKS
-
- docinto test/
- dodoc test/*
-
- insinto /etc/iscsi
- newins "${FILESDIR}"/initiatorname.iscsi initiatorname.iscsi.example
-
- # udev pieces
- udev_dorules "${FILESDIR}"/99-iscsi.rules
- exeinto /etc/udev/scripts
- doexe "${FILESDIR}"/iscsidev.sh
-
- newconfd "${FILESDIR}"/iscsid-conf.d iscsid
- newinitd "${FILESDIR}"/iscsid-init.d iscsid
-
- keepdir /var/db/iscsi
- fperms 700 /var/db/iscsi
- fperms 600 /etc/iscsi/iscsid.conf
-}
diff --git a/sys-block/open-iscsi/open-iscsi-2.0.873-r3.ebuild b/sys-block/open-iscsi/open-iscsi-2.0.873-r3.ebuild
deleted file mode 100644
index 72734745c811..000000000000
--- a/sys-block/open-iscsi/open-iscsi-2.0.873-r3.ebuild
+++ /dev/null
@@ -1,114 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit versionator linux-info eutils flag-o-matic toolchain-funcs udev
-
-MY_P="${PN}-$(replace_version_separator 2 "-")"
-
-DESCRIPTION="A performant, transport independent, multi-platform implementation of RFC3720"
-HOMEPAGE="http://www.open-iscsi.com/"
-SRC_URI="http://www.open-iscsi.org/bits/${MY_P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
-IUSE="debug slp +tcp infiniband rdma"
-
-DEPEND="slp? ( net-libs/openslp ) infiniband? ( sys-fabric/ofed )"
-RDEPEND="${DEPEND}
- sys-fs/lsscsi
- sys-apps/util-linux"
-REQUIRED_USE="infiniband? ( rdma ) || ( rdma tcp )"
-S="${WORKDIR}/${MY_P}"
-
-pkg_setup() {
- linux-info_pkg_setup
-
- if kernel_is -lt 2 6 16; then
- die "Sorry, your kernel must be 2.6.16-rc5 or newer!"
- fi
-
- # Needs to be done, as iscsid currently only starts, when having the iSCSI
- # support loaded as module. Kernel builtin options don't work. See this for
- # more information:
- # https://groups.google.com/group/open-iscsi/browse_thread/thread/cc10498655b40507/fd6a4ba0c8e91966
- # If there's a new release, check whether this is still valid!
- TCP_MODULES="SCSI_ISCSI_ATTRS ISCSI_TCP"
- RDMA_MODULES="INFINIBAND_ISER"
- INFINIBAND_MODULES="INFINIBAND_IPOIB INIBAND_USER_MAD INFINIBAND_USER_ACCESS"
- CONFIG_CHECK_MODULES="tcp? ( ${TCP_MODULES} ) rdma? ( ${RDMA_MODULES} ) infiniband? ( ${INFINIBAND_MODULES} )"
- if linux_config_exists; then
- if use tcp; then
- for module in ${TCP_MODULES}; do
- linux_chkconfig_module ${module} || ewarn "${module} needs to be built as module (builtin doesn't work)"
- done
- fi
- if use infiniband; then
- for module in ${INFINIBAND_MODULES}; do
- linux_chkconfig_module ${module} || ewarn "${module} needs to be built as module (builtin doesn't work)"
- done
- fi
- if use rdma; then
- for module in ${RDMA_MODULES}; do
- linux_chkconfig_module ${module} || ewarn "${module} needs to be built as module (builtin doesn't work)"$
- done
- fi
- fi
-}
-
-src_prepare() {
- epatch "${FILESDIR}"/${P}-Makefiles.patch
- epatch "${FILESDIR}"/${P}-memset.patch
- epatch "${FILESDIR}"/musl-fixes.patch
-
- epatch_user
-
- sed -i -e 's:^\(iscsid.startup\)\s*=.*:\1 = /usr/sbin/iscsid:' etc/iscsid.conf || die
-}
-
-src_configure() {
- use debug && append-cppflags -DDEBUG_TCP -DDEBUG_SCSI
- append-lfs-flags
-
- cd utils/open-isns || die
-
- # SSL (--with-security) is broken
- econf $(use_with slp) \
- --without-security
-}
-
-src_compile() {
- # Stuffing CPPFLAGS into CFLAGS isn't entirely correct, but the build
- # is messed up already here, so it's not making it that much worse.
- KSRC="${KV_DIR}" CFLAGS="" \
- emake \
- OPTFLAGS="${CFLAGS} ${CPPFLAGS}" \
- AR="$(tc-getAR)" CC="$(tc-getCC)" \
- user
-}
-
-src_install() {
- emake DESTDIR="${ED}" sbindir="/usr/sbin" install
-
- dodoc README THANKS
-
- docinto test/
- dodoc test/*
-
- insinto /etc/iscsi
- newins "${FILESDIR}"/initiatorname.iscsi initiatorname.iscsi.example
-
- # udev pieces
- udev_dorules "${FILESDIR}"/99-iscsi.rules
- exeinto /etc/udev/scripts
- doexe "${FILESDIR}"/iscsidev.sh
-
- newconfd "${FILESDIR}"/iscsid-conf.d iscsid
- newinitd "${FILESDIR}"/iscsid-init.d iscsid
-
- keepdir /var/db/iscsi
- fperms 700 /var/db/iscsi
- fperms 600 /etc/iscsi/iscsid.conf
-}
diff --git a/sys-block/open-iscsi/open-iscsi-2.0.874-r2.ebuild b/sys-block/open-iscsi/open-iscsi-2.0.874-r2.ebuild
deleted file mode 100644
index 24e8be24de11..000000000000
--- a/sys-block/open-iscsi/open-iscsi-2.0.874-r2.ebuild
+++ /dev/null
@@ -1,122 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit autotools versionator linux-info flag-o-matic toolchain-funcs udev systemd
-
-DESCRIPTION="A performant, transport independent, multi-platform implementation of RFC3720"
-HOMEPAGE="http://www.open-iscsi.com/"
-SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
-IUSE="debug infiniband +tcp rdma"
-
-DEPEND="sys-block/open-isns:=
- infiniband? ( sys-fabric/ofed )"
-RDEPEND="${DEPEND}
- sys-fs/lsscsi
- sys-apps/util-linux"
-REQUIRED_USE="infiniband? ( rdma ) || ( rdma tcp )"
-
-PATCHES=(
- "${FILESDIR}/${P}-Makefiles.patch"
- "${FILESDIR}/${P}-musl-fixes.patch"
- "${FILESDIR}/${P}-musl-ethtool-compat.patch"
- "${FILESDIR}/${P}-include-sysmacros.patch"
-)
-
-pkg_setup() {
- linux-info_pkg_setup
-
- if kernel_is -lt 2 6 16; then
- die "Sorry, your kernel must be 2.6.16-rc5 or newer!"
- fi
-
- # Needs to be done, as iscsid currently only starts, when having the iSCSI
- # support loaded as module. Kernel builtin options don't work. See this for
- # more information:
- # https://groups.google.com/group/open-iscsi/browse_thread/thread/cc10498655b40507/fd6a4ba0c8e91966
- # If there's a new release, check whether this is still valid!
- TCP_MODULES="SCSI_ISCSI_ATTRS ISCSI_TCP"
- RDMA_MODULES="INFINIBAND_ISER"
- INFINIBAND_MODULES="INFINIBAND_IPOIB INIBAND_USER_MAD INFINIBAND_USER_ACCESS"
- CONFIG_CHECK_MODULES="tcp? ( ${TCP_MODULES} ) rdma? ( ${RDMA_MODULES} ) infiniband? ( ${INFINIBAND_MODULES} )"
- if linux_config_exists; then
- if use tcp; then
- for module in ${TCP_MODULES}; do
- linux_chkconfig_module ${module} || ewarn "${module} needs to be built as module (builtin doesn't work)"
- done
- fi
- if use infiniband; then
- for module in ${INFINIBAND_MODULES}; do
- linux_chkconfig_module ${module} || ewarn "${module} needs to be built as module (builtin doesn't work)"
- done
- fi
- if use rdma; then
- for module in ${RDMA_MODULES}; do
- linux_chkconfig_module ${module} || ewarn "${module} needs to be built as module (builtin doesn't work)"$
- done
- fi
- fi
-}
-
-src_prepare() {
- sed -i -e 's:^\(iscsid.startup\)\s*=.*:\1 = /usr/sbin/iscsid:' etc/iscsid.conf || die
- default
-
- pushd iscsiuio >/dev/null || die
- eautoreconf
- popd >/dev/null || die
-}
-
-src_configure() {
- use debug && append-cppflags -DDEBUG_TCP -DDEBUG_SCSI
- append-lfs-flags
-}
-
-src_compile() {
- # Stuffing CPPFLAGS into CFLAGS isn't entirely correct, but the build
- # is messed up already here, so it's not making it that much worse.
- KSRC="${KV_DIR}" CFLAGS="" \
- emake \
- OPTFLAGS="${CFLAGS} ${CPPFLAGS}" \
- AR="$(tc-getAR)" CC="$(tc-getCC)" \
- user
-}
-
-src_install() {
- emake DESTDIR="${ED}" sbindir="/usr/sbin" install
- # Upstream make is not deterministic, per bug #601514
- rm -f "${ED}"/etc/initiatorname.iscsi
-
- dodoc README THANKS
-
- docinto test/
- dodoc test/*
-
- insinto /etc/iscsi
- newins "${FILESDIR}"/initiatorname.iscsi initiatorname.iscsi.example
-
- newconfd "${FILESDIR}"/iscsid-conf.d iscsid
- newinitd "${FILESDIR}"/iscsid-init.d iscsid
-
- systemd_dounit "${S%/}"/etc/systemd/iscsid.service
-
- keepdir /var/db/iscsi
- fperms 700 /var/db/iscsi
- fperms 600 /etc/iscsi/iscsid.conf
-}
-
-pkg_postinst() {
- in='/etc/iscsi/initiatorname.iscsi'
- if [ ! -f "${EROOT}${in}" -a -f "${EROOT}${in}.example" ]; then
- {
- cat "${EROOT}${in}.example"
- echo "# InitiatorName generated by ${CATEGORY}/${PF} at $(date -uR)"
- echo "InitiatorName=$(${ROOT}/usr/sbin/iscsi-iname)"
- } >> "${EROOT}${in}.tmp" && mv -f "${EROOT}${in}.tmp" "${EROOT}${in}"
- fi
-}
diff --git a/sys-block/open-iscsi/open-iscsi-2.0.876_p20180814.ebuild b/sys-block/open-iscsi/open-iscsi-2.0.876_p20180814-r1.ebuild
index b111b48a68e6..8d18bfc1ed40 100644
--- a/sys-block/open-iscsi/open-iscsi-2.0.876_p20180814.ebuild
+++ b/sys-block/open-iscsi/open-iscsi-2.0.876_p20180814-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI="6"
@@ -27,6 +27,7 @@ REQUIRED_USE="infiniband? ( rdma ) || ( rdma tcp )"
PATCHES=(
"${FILESDIR}/${PN}-2.0.876_p20180814-musl-fixes.patch"
"${FILESDIR}/${PN}-2.0.876-Makefiles.patch"
+ "${FILESDIR}/${PN}-2.0.876-space_in_node-mode.patch" #685190
)
S="${WORKDIR}/${PN}-${MY_COMMIT}"
diff --git a/sys-block/open-isns/Manifest b/sys-block/open-isns/Manifest
index 87b2927107e6..10c963fc0def 100644
--- a/sys-block/open-isns/Manifest
+++ b/sys-block/open-isns/Manifest
@@ -3,6 +3,8 @@ AUX open-isns-0.97-ossl-1.1.patch 1133 BLAKE2B 0649413cd3a9f8684a0c7a2982d4afdeb
AUX open-isns-0.98-libressl-compatibility.patch 463 BLAKE2B ed542e70bbd96b78b2e339dd7eced0b4edf87af62b189fc02ae431946161bb6385ffd2f8d6cf0f60edcc2092e9b57e2272e7e2fa4da0eb8f80c2a19f7d02e75e SHA512 dfce1df2699e24085f4c88340d5fb7e3f878d182608301c79b0f5736b0e29f3c79b0d37650d925cc06d429b59e9697b634ab1d16706fabbdf4b443bdcf4c9bc3
DIST open-isns-0.97.tar.gz 278317 BLAKE2B 7083b3ebef78a5afb35e8cc31e86674b407eb48224139745142238f559e95ceca8755e570031559bdf29ec691947693303e07b8f81b915a3b7f2396329bbd2b3 SHA512 78c934162d5a1d093bccd49449d4ef369b896d34309d76b4963d643a699640617c4fe064388c481c35b9be26e012f19713f3aad378af9ad88fa94c3d300e919d
DIST open-isns-0.98.tar.gz 278410 BLAKE2B f90df85de4d5fd2abdcd267e3c873dff62fcac523ee280e21def057eca366bbba21c2b3bfbf5cc0798b8d0f3b0d5028ebb49000cccc850abdfb85142a7b66c34 SHA512 04263b9ace9d272f4e3776c4e1a034815475590d4b4864217a6200fcd5baea391cd788723db3c17fe0d764efc9769a70a3d2167b00e5998fb4bcb8d5fe2547ed
+DIST open-isns-0.99.tar.gz 282831 BLAKE2B 7140daf08fda894bcbed3e25b122909ad0ed86b4f3db2e42a23b97480dea554194d2a33a3ebdf4e2017a57c2023dd8589f2e2fcfa60470cc3a6a3fbfb0d0ccbc SHA512 90a2297535c5e939f83c761173ce5f5f88e68adc31e41e833b23d07b6dc6959572ae7184db0084b861918199a877b251ebae4b4a7456fdd8c93400dc8457adc9
EBUILD open-isns-0.97.ebuild 891 BLAKE2B 4fc42c97068e57edc634ea5bcf40f561834d4d56d49f5c7b061cdf1a904271c169b0a63334f1c10d722b1a25a4b160a7b4e8be5c9a3c4224757709f4e4c7fad3 SHA512 098c8d16bbafa1168cf1f233fdfd787b47103b103a065939fb41e447a309f7943e54dde6b45c6569c2cf19508167df4b84c40c0b8f4edbb3bd622cc495c6d0cb
EBUILD open-isns-0.98.ebuild 932 BLAKE2B 3c3f0899b893697b850b1087b811faf8b1e8806c68a53a7f3d4736afd019eeee6e41caebc0ec9ebc0097a74507720e2cd9859cb0cae1917493f3257752cf6100 SHA512 ee768bb3d6232627d507ae796f34ae466eff4662e1c29b5dfe7f9531dff67aa9d4681ff1041e141d583ecd875abdcda1b9217b2e58bbb729180e1603a826eb64
+EBUILD open-isns-0.99.ebuild 1092 BLAKE2B 1e0ce4502ab428063bae59b56a2f6df6353fcbaf839e37c4fb5a6602be2e70c3f41bc8a8fbd98c680a84a70452fd46043b3f90a2e9e6d650fb8beff287ca6e70 SHA512 56a48b518e7d8316cc77c92cf8160fe792920a781f4e0f30f861e3803a0e228f913f579eaeb92d41df38d94af966687d72e12dc84fcec9892c227d64f236f914
MISC metadata.xml 342 BLAKE2B 428bf589c8161595c69d65533c0df938c71d69fa6d56b1e4ac2a14bf528d5b93645fc667d3f8b698d4e28ca874c1ffbffb7d4daef712ffc79f5e10e542bf53e7 SHA512 a056b81c2e162e8b13a54f463476fea5f203b9929aeef07629b600d8f11eda26fe0402aec5e56a411e544b39d6c38a5766f773d4a699c72680f11f8dffc4bced
diff --git a/sys-block/open-isns/open-isns-0.99.ebuild b/sys-block/open-isns/open-isns-0.99.ebuild
new file mode 100644
index 000000000000..e9c2b890b984
--- /dev/null
+++ b/sys-block/open-isns/open-isns-0.99.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit flag-o-matic
+
+DESCRIPTION="iSNS server and client for Linux"
+HOMEPAGE="https://github.com/open-iscsi/open-isns"
+SRC_URI="https://github.com/open-iscsi/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
+IUSE="debug libressl slp ssl static"
+
+DEPEND="
+ ssl? (
+ !libressl? ( dev-libs/openssl:0= )
+ libressl? ( dev-libs/libressl:0= )
+ )
+ slp? ( net-libs/openslp )"
+RDEPEND="${DEPEND}"
+
+PATCHES=( "${FILESDIR}/${PN}-0.98-libressl-compatibility.patch" )
+
+src_configure() {
+ use debug && append-cppflags -DDEBUG_TCP -DDEBUG_SCSI
+ append-lfs-flags
+ local myeconfargs=(
+ $(use_with slp)
+ $(use_with ssl security)
+ $(use_enable !static shared)
+ )
+ econf "${myeconfargs[@]}"
+}
+
+src_install() {
+ default
+ emake DESTDIR="${D}" install_hdrs
+ emake DESTDIR="${D}" install_lib
+ keepdir /var/lib/${PN/open-}
+ if ! use static ; then
+ find "${ED}" -type f -name "*.a" -delete || die
+ fi
+}