rpms/iscsi-initiator-utils
5
0
Fork 0
Code Issues Pull Requests Releases Activity

update for upstream fixes

Browse Source 
minimal packaging for libopeniscsiusr
This commit is contained in:
Chris Leech 2018-05-25 10:58:13 -07:00
parent e8d2112810
commit 54e364e33d
29 changed files with 285 additions and 150 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.gitignore vendored
View File

@ -3,3 +3,4 @@
/open-iscsi-4c9d6f9.tar.gz /open-iscsi-4c9d6f9.tar.gz
/open-iscsi-4c1f2d9.tar.gz /open-iscsi-4c1f2d9.tar.gz
/open-iscsi-86e8892.tar.gz /open-iscsi-86e8892.tar.gz
/open-iscsi-4ef9261.tar.gz

12
0001-idmb_rec_write-check-for-tpgt-first.patch
View File

@ -1,7 +1,7 @@
From ea8792d568c8d308fde2234c18983b131b0247d5 Mon Sep 17 00:00:00 2001 From dbec0a5b7737142f8a1462cdf826c35a78e899b2 Mon Sep 17 00:00:00 2001
From: Chris Leech <cleech@redhat.com> From: Chris Leech <cleech@redhat.com>
Date: Tue, 13 Aug 2013 10:59:44 -0700 Date: Tue, 13 Aug 2013 10:59:44 -0700
Subject: [PATCH 01/22] idmb_rec_write, check for tpgt first Subject: [PATCH 01/32] idmb_rec_write, check for tpgt first
Factor out the check for a tpgt to a single place, before going crazy on Factor out the check for a tpgt to a single place, before going crazy on
the rec files. Makes flow of this function easier to follow, and preps the rec files. Makes flow of this function easier to follow, and preps
@ -11,10 +11,10 @@ for splitting it up.
1 file changed, 5 insertions(+), 13 deletions(-) 1 file changed, 5 insertions(+), 13 deletions(-)
diff --git a/usr/idbm.c b/usr/idbm.c diff --git a/usr/idbm.c b/usr/idbm.c
index 5532202cb959..b5b86269f6bf 100644 index 830189f571ea..ab3577878e86 100644
--- a/usr/idbm.c --- a/usr/idbm.c
+++ b/usr/idbm.c +++ b/usr/idbm.c
@@ -2049,6 +2049,10 @@ static int idbm_rec_write(node_rec_t *rec) @@ -2042,6 +2042,10 @@ static int idbm_rec_write(node_rec_t *rec)
if (rc) if (rc)
goto free_portal; goto free_portal;
@ -25,7 +25,7 @@ index 5532202cb959..b5b86269f6bf 100644
rc = stat(portal, &statb); rc = stat(portal, &statb);
if (rc) { if (rc) {
rc = 0; rc = 0;
@@ -2057,22 +2061,10 @@ static int idbm_rec_write(node_rec_t *rec) @@ -2050,22 +2054,10 @@ static int idbm_rec_write(node_rec_t *rec)
* set the tgpt. In new versions you must pass all the info in * set the tgpt. In new versions you must pass all the info in
* from the start * from the start
*/ */
@ -50,5 +50,5 @@ index 5532202cb959..b5b86269f6bf 100644
* Old style portal as a file, but with tpgt. Let's update it. * Old style portal as a file, but with tpgt. Let's update it.
*/ */
-- --
2.14.3 2.14.4

18
0002-idbm_rec_write-seperate-old-and-new-style-writes.patch
View File

@ -1,7 +1,7 @@
From ca58932fdba91911ceb7fe59bff3206c073671cf Mon Sep 17 00:00:00 2001 From b9d89091daab823eb2dc72c6c568af7897f83137 Mon Sep 17 00:00:00 2001
From: Chris Leech <cleech@redhat.com> From: Chris Leech <cleech@redhat.com>
Date: Tue, 13 Aug 2013 11:34:31 -0700 Date: Tue, 13 Aug 2013 11:34:31 -0700
Subject: [PATCH 02/22] idbm_rec_write, seperate old and new style writes Subject: [PATCH 02/32] idbm_rec_write, seperate old and new style writes
Duplicates a small bit of code, but easier to understand and extened. Duplicates a small bit of code, but easier to understand and extened.
--- ---
@ -9,10 +9,10 @@ Duplicates a small bit of code, but easier to understand and extened.
1 file changed, 79 insertions(+), 37 deletions(-) 1 file changed, 79 insertions(+), 37 deletions(-)
diff --git a/usr/idbm.c b/usr/idbm.c diff --git a/usr/idbm.c b/usr/idbm.c
index b5b86269f6bf..d69a5c5c41a2 100644 index ab3577878e86..21ff61ab2bd8 100644
--- a/usr/idbm.c --- a/usr/idbm.c
+++ b/usr/idbm.c +++ b/usr/idbm.c
@@ -2008,7 +2008,7 @@ mkdir_portal: @@ -2001,7 +2001,7 @@ mkdir_portal:
return f; return f;
} }
@ -21,7 +21,7 @@ index b5b86269f6bf..d69a5c5c41a2 100644
{ {
struct stat statb; struct stat statb;
FILE *f; FILE *f;
@@ -2020,38 +2020,8 @@ static int idbm_rec_write(node_rec_t *rec) @@ -2013,38 +2013,8 @@ static int idbm_rec_write(node_rec_t *rec)
log_error("Could not alloc portal"); log_error("Could not alloc portal");
return ISCSI_ERR_NOMEM; return ISCSI_ERR_NOMEM;
} }
@ -60,7 +60,7 @@ index b5b86269f6bf..d69a5c5c41a2 100644
rc = stat(portal, &statb); rc = stat(portal, &statb);
if (rc) { if (rc) {
@@ -2072,11 +2042,11 @@ static int idbm_rec_write(node_rec_t *rec) @@ -2065,11 +2035,11 @@ static int idbm_rec_write(node_rec_t *rec)
log_error("Could not convert %s: %s", portal, log_error("Could not convert %s: %s", portal,
strerror(errno)); strerror(errno));
rc = ISCSI_ERR_IDBM; rc = ISCSI_ERR_IDBM;
@ -71,10 +71,10 @@ index b5b86269f6bf..d69a5c5c41a2 100644
rc = ISCSI_ERR_INVAL; rc = ISCSI_ERR_INVAL;
- goto unlock; - goto unlock;
+ goto free_portal; + goto free_portal;
} }
mkdir_portal: mkdir_portal:
@@ -2087,24 +2057,96 @@ mkdir_portal: @@ -2080,24 +2050,96 @@ mkdir_portal:
log_error("Could not make dir %s: %s", log_error("Could not make dir %s: %s",
portal, strerror(errno)); portal, strerror(errno));
rc = ISCSI_ERR_IDBM; rc = ISCSI_ERR_IDBM;
@ -176,5 +176,5 @@ index b5b86269f6bf..d69a5c5c41a2 100644
free_portal: free_portal:
free(portal); free(portal);
-- --
2.14.3 2.14.4

16
0003-idbw_rec_write-pick-tpgt-from-existing-record.patch
View File

@ -1,7 +1,7 @@
From f5cb52d3b964fea4d634e3130e3e9e1f4ad7d924 Mon Sep 17 00:00:00 2001 From 7ba6464018daac1b150335bb73d272761d2cbfe5 Mon Sep 17 00:00:00 2001
From: Chris Leech <cleech@redhat.com> From: Chris Leech <cleech@redhat.com>
Date: Tue, 13 Aug 2013 12:39:07 -0700 Date: Tue, 13 Aug 2013 12:39:07 -0700
Subject: [PATCH 03/22] idbw_rec_write, pick tpgt from existing record Subject: [PATCH 03/32] idbw_rec_write, pick tpgt from existing record
On a static add (-m node -o new) without a user specified tpgt, looks On a static add (-m node -o new) without a user specified tpgt, looks
for existing new style records with tpgt before creating an old style for existing new style records with tpgt before creating an old style
@ -12,18 +12,18 @@ updated new style record instead.
1 file changed, 40 insertions(+) 1 file changed, 40 insertions(+)
diff --git a/usr/idbm.c b/usr/idbm.c diff --git a/usr/idbm.c b/usr/idbm.c
index d69a5c5c41a2..e36826432cef 100644 index 21ff61ab2bd8..cd705fa2b033 100644
--- a/usr/idbm.c --- a/usr/idbm.c
+++ b/usr/idbm.c +++ b/usr/idbm.c
@@ -27,6 +27,7 @@ @@ -28,6 +28,7 @@
#include <errno.h>
#include <dirent.h> #include <dirent.h>
#include <limits.h> #include <limits.h>
#include <fcntl.h>
+#include <glob.h> +#include <glob.h>
#include <sys/stat.h> #include <sys/stat.h>
#include <sys/file.h> #include <sys/file.h>
@@ -162,6 +163,8 @@ static struct idbm *db; @@ -163,6 +164,8 @@ static struct idbm *db;
_n++; \ _n++; \
} while(0) } while(0)
@ -32,7 +32,7 @@ index d69a5c5c41a2..e36826432cef 100644
static void static void
idbm_recinfo_discovery(discovery_rec_t *r, recinfo_t *ri) idbm_recinfo_discovery(discovery_rec_t *r, recinfo_t *ri)
{ {
@@ -2084,12 +2087,49 @@ static int idbm_rec_write_old(node_rec_t *rec) @@ -2077,12 +2080,49 @@ static int idbm_rec_write_old(node_rec_t *rec)
FILE *f; FILE *f;
char *portal; char *portal;
int rc = 0; int rc = 0;
@ -83,5 +83,5 @@ index d69a5c5c41a2..e36826432cef 100644
rec->name, rec->conn[0].address, rec->conn[0].port); rec->name, rec->conn[0].address, rec->conn[0].port);
-- --
2.14.3 2.14.4

6
0004-update-systemd-service-files-add-iscsi.service-for-s.patch
View File

@ -1,7 +1,7 @@
From d32c2d688d0186e5729b75be35b0474f2c6a3b85 Mon Sep 17 00:00:00 2001 From 33076c9c1e975ea3225923d66ae24648c0c82a7f Mon Sep 17 00:00:00 2001
From: Chris Leech <cleech@redhat.com> From: Chris Leech <cleech@redhat.com>
Date: Wed, 19 Dec 2012 15:07:36 -0800 Date: Wed, 19 Dec 2012 15:07:36 -0800
Subject: [PATCH 04/22] update systemd service files, add iscsi.service for Subject: [PATCH 04/32] update systemd service files, add iscsi.service for
starting sessions on boot starting sessions on boot
Signed-off-by: Chris Leech <cleech@redhat.com> Signed-off-by: Chris Leech <cleech@redhat.com>
@ -89,5 +89,5 @@ index 832451d7a0ce..58a8d1239996 100644
[Socket] [Socket]
ListenStream=@ISCSIADM_ABSTRACT_NAMESPACE ListenStream=@ISCSIADM_ABSTRACT_NAMESPACE
-- --
2.14.3 2.14.4

6
0005-iscsi-boot-related-service-file-updates.patch
View File

@ -1,7 +1,7 @@
From 761c85d71a09a4b07d361351006520599f6db31c Mon Sep 17 00:00:00 2001 From 5dd8fc7d27204a3461b33defed1e0bb4331c7663 Mon Sep 17 00:00:00 2001
From: Chris Leech <cleech@redhat.com> From: Chris Leech <cleech@redhat.com>
Date: Mon, 19 Aug 2013 07:18:25 -0700 Date: Mon, 19 Aug 2013 07:18:25 -0700
Subject: [PATCH 05/22] iscsi boot related service file updates Subject: [PATCH 05/32] iscsi boot related service file updates
make sure iscsid gets started if there are any boot sessions running make sure iscsid gets started if there are any boot sessions running
add reload target to fix double session problem when restarting from NM add reload target to fix double session problem when restarting from NM
@ -71,5 +71,5 @@ index c68475c44de5..000000000000
-done < $SESSION_FILE -done < $SESSION_FILE
- -
-- --
2.14.3 2.14.4

10
0006-update-initscripts-and-docs.patch
View File

@ -1,7 +1,7 @@
From c1fcc406734bf5eab0472193ea5e0247d3710250 Mon Sep 17 00:00:00 2001 From 2e6f564ebb3c85cb9a457d282b845374776a54ae Mon Sep 17 00:00:00 2001
From: Chris Leech <cleech@redhat.com> From: Chris Leech <cleech@redhat.com>
Date: Mon, 19 Nov 2012 16:37:13 -0800 Date: Mon, 19 Nov 2012 16:37:13 -0800
Subject: [PATCH 06/22] update initscripts and docs Subject: [PATCH 06/32] update initscripts and docs
--- ---
README | 10 ++++------ README | 10 ++++------
@ -105,10 +105,10 @@ index fee11482a09b..3539ac4cd578 100644
# For multipath configurations, you may want more than one session to be # For multipath configurations, you may want more than one session to be
# created on each iface record. If node.session.nr_sessions is greater # created on each iface record. If node.session.nr_sessions is greater
diff --git a/usr/idbm.c b/usr/idbm.c diff --git a/usr/idbm.c b/usr/idbm.c
index e36826432cef..c476d45f87c6 100644 index cd705fa2b033..0aa3870a76fd 100644
--- a/usr/idbm.c --- a/usr/idbm.c
+++ b/usr/idbm.c +++ b/usr/idbm.c
@@ -517,9 +517,13 @@ idbm_recinfo_node(node_rec_t *r, recinfo_t *ri) @@ -518,9 +518,13 @@ idbm_recinfo_node(node_rec_t *r, recinfo_t *ri)
IDBM_SHOW, "None", "CRC32C", "CRC32C,None", IDBM_SHOW, "None", "CRC32C", "CRC32C,None",
"None,CRC32C", num, 1); "None,CRC32C", num, 1);
sprintf(key, CONN_DATA_DIGEST, i); sprintf(key, CONN_DATA_DIGEST, i);
@ -123,5 +123,5 @@ index e36826432cef..c476d45f87c6 100644
__recinfo_int_o2(key, ri, r, conn[i].iscsi.IFMarker, IDBM_SHOW, __recinfo_int_o2(key, ri, r, conn[i].iscsi.IFMarker, IDBM_SHOW,
"No", "Yes", num, 1); "No", "Yes", num, 1);
-- --
2.14.3 2.14.4

14
0007-use-var-for-config.patch
View File

@ -1,7 +1,7 @@
From 1f89448f9c2338112129b16534a6d66f8ab47b98 Mon Sep 17 00:00:00 2001 From 478527833bdb8ebc9f4523c54e544b244bfe76f1 Mon Sep 17 00:00:00 2001
From: Chris Leech <cleech@redhat.com> From: Chris Leech <cleech@redhat.com>
Date: Mon, 19 Nov 2012 16:38:45 -0800 Date: Mon, 19 Nov 2012 16:38:45 -0800
Subject: [PATCH 07/22] use var for config Subject: [PATCH 07/32] use var for config
--- ---
README | 33 ++++++++++++++++----------------- README | 33 ++++++++++++++++-----------------
@ -181,10 +181,10 @@ index a82805e28fb9..758a47c2d1fe 100644
.SH "SEE ALSO" .SH "SEE ALSO"
diff --git a/usr/idbm.c b/usr/idbm.c diff --git a/usr/idbm.c b/usr/idbm.c
index c476d45f87c6..a853c2d0c5c2 100644 index 0aa3870a76fd..ec33ce905dc1 100644
--- a/usr/idbm.c --- a/usr/idbm.c
+++ b/usr/idbm.c +++ b/usr/idbm.c
@@ -2933,9 +2933,9 @@ free_info: @@ -2926,9 +2926,9 @@ free_info:
int idbm_init(idbm_get_config_file_fn *fn) int idbm_init(idbm_get_config_file_fn *fn)
{ {
/* make sure root db dir is there */ /* make sure root db dir is there */
@ -198,7 +198,7 @@ index c476d45f87c6..a853c2d0c5c2 100644
return errno; return errno;
} }
diff --git a/usr/idbm.h b/usr/idbm.h diff --git a/usr/idbm.h b/usr/idbm.h
index 411dd8230ece..211532f74f09 100644 index b83c0bb1cca8..2b05d7871be9 100644
--- a/usr/idbm.h --- a/usr/idbm.h
+++ b/usr/idbm.h +++ b/usr/idbm.h
@@ -29,12 +29,13 @@ @@ -29,12 +29,13 @@
@ -222,7 +222,7 @@ index 411dd8230ece..211532f74f09 100644
#define ISNS_CONFIG_NAME "isns_config" #define ISNS_CONFIG_NAME "isns_config"
diff --git a/usr/iface.h b/usr/iface.h diff --git a/usr/iface.h b/usr/iface.h
index e3c1b6824de4..b2bdd4c4f0b8 100644 index 6c06f7f7d450..c8b9de9a7c3a 100644
--- a/usr/iface.h --- a/usr/iface.h
+++ b/usr/iface.h +++ b/usr/iface.h
@@ -21,8 +21,9 @@ @@ -21,8 +21,9 @@
@ -237,5 +237,5 @@ index e3c1b6824de4..b2bdd4c4f0b8 100644
struct iface_rec; struct iface_rec;
struct list_head; struct list_head;
-- --
2.14.3 2.14.4

22
0008-use-red-hat-for-name.patch
View File

@ -1,12 +1,26 @@
From f5c1f745983869aefea5a089b78b629aa87c0fb3 Mon Sep 17 00:00:00 2001 From ea35362504329e7fe86f4af17a88bed009c5069c Mon Sep 17 00:00:00 2001
From: Chris Leech <cleech@redhat.com> From: Chris Leech <cleech@redhat.com>
Date: Mon, 19 Nov 2012 16:40:04 -0800 Date: Mon, 19 Nov 2012 16:40:04 -0800
Subject: [PATCH 08/22] use red hat for name Subject: [PATCH 08/32] use red hat for name
--- ---
doc/iscsi-iname.8 | 2 +-
utils/iscsi-iname.c | 2 +- utils/iscsi-iname.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-) 2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/doc/iscsi-iname.8 b/doc/iscsi-iname.8
index a55d666d1af3..dd77ed9f3165 100644
--- a/doc/iscsi-iname.8
+++ b/doc/iscsi-iname.8
@@ -14,7 +14,7 @@ generates a unique iSCSI node name on every invocation.
Display help
.TP
.BI [-p=]\fIprefix\fP
-Use the prefix passed in instead of the default "iqn.2005-03.org.open-iscsi"
+Use the prefix passed in instead of the default "iqn.1994-05.com.redhat"
.SH AUTHORS
Open-iSCSI project <http://www.open-iscsi.com/>
diff --git a/utils/iscsi-iname.c b/utils/iscsi-iname.c diff --git a/utils/iscsi-iname.c b/utils/iscsi-iname.c
index 6347edc46293..cb2f6c8b8651 100644 index 6347edc46293..cb2f6c8b8651 100644
--- a/utils/iscsi-iname.c --- a/utils/iscsi-iname.c
@ -21,5 +35,5 @@ index 6347edc46293..cb2f6c8b8651 100644
/* try to feed some entropy from the pool to MD5 in order to get /* try to feed some entropy from the pool to MD5 in order to get
-- --
2.14.3 2.14.4

14
0009-libiscsi.patch
View File

@ -1,7 +1,7 @@
From 4eddf9bc59660d39ae6feee8358c3de5029b6c9a Mon Sep 17 00:00:00 2001 From ef17e73261b386a21e231aa702c65e58ee8f65cc Mon Sep 17 00:00:00 2001
From: rpm-build <rpm-build> From: rpm-build <rpm-build>
Date: Mon, 26 Jan 2015 12:57:11 -0800 Date: Mon, 26 Jan 2015 12:57:11 -0800
Subject: [PATCH 09/22] libiscsi Subject: [PATCH 09/32] libiscsi
--- ---
Makefile | 2 + Makefile | 2 +
@ -45,7 +45,7 @@ Subject: [PATCH 09/22] libiscsi
create mode 100644 libiscsi/tests/test_set_auth.c create mode 100644 libiscsi/tests/test_set_auth.c
diff --git a/Makefile b/Makefile diff --git a/Makefile b/Makefile
index 33a23f9e3efa..6c94ca96016e 100644 index c533e9d0d016..80afe86d6558 100644
--- a/Makefile --- a/Makefile
+++ b/Makefile +++ b/Makefile
@@ -52,6 +52,7 @@ user: iscsiuio/Makefile @@ -52,6 +52,7 @@ user: iscsiuio/Makefile
@ -3964,10 +3964,10 @@ index 8001af6fe452..02b77f02b644 100644
int discovery_fw(void *data, struct iface_rec *iface, int discovery_fw(void *data, struct iface_rec *iface,
struct list_head *rec_list) struct list_head *rec_list)
diff --git a/usr/idbm.c b/usr/idbm.c diff --git a/usr/idbm.c b/usr/idbm.c
index a853c2d0c5c2..9c9c2598a6b0 100644 index ec33ce905dc1..6b651765f19e 100644
--- a/usr/idbm.c --- a/usr/idbm.c
+++ b/usr/idbm.c +++ b/usr/idbm.c
@@ -1716,9 +1716,9 @@ int idbm_print_all_discovery(int info_level) @@ -1709,9 +1709,9 @@ int idbm_print_all_discovery(int info_level)
* fn should return -1 if it skipped the rec, an ISCSI_ERR error code if * fn should return -1 if it skipped the rec, an ISCSI_ERR error code if
* the operation failed or 0 if fn was run successfully. * the operation failed or 0 if fn was run successfully.
*/ */
@ -3981,7 +3981,7 @@ index a853c2d0c5c2..9c9c2598a6b0 100644
DIR *iface_dirfd; DIR *iface_dirfd;
struct dirent *iface_dent; struct dirent *iface_dent;
diff --git a/usr/idbm.h b/usr/idbm.h diff --git a/usr/idbm.h b/usr/idbm.h
index 211532f74f09..1918b142542b 100644 index 2b05d7871be9..b9b1810f78f2 100644
--- a/usr/idbm.h --- a/usr/idbm.h
+++ b/usr/idbm.h +++ b/usr/idbm.h
@@ -102,6 +102,9 @@ struct rec_op_data { @@ -102,6 +102,9 @@ struct rec_op_data {
@ -4006,5 +4006,5 @@ index 47857dd9b0ca..fb8e96552551 100644
+ +
#endif /* ISCSI_IPC_H */ #endif /* ISCSI_IPC_H */
-- --
2.14.3 2.14.4

8
0010-remove-the-offload-boot-supported-ifdef.patch
View File

@ -1,14 +1,14 @@
From 39f702aa77c9f5ffefccae9788006d08ec7f30a4 Mon Sep 17 00:00:00 2001 From 71b576b10a03651f67173d19883a929e91a3423a Mon Sep 17 00:00:00 2001
From: Chris Leech <cleech@redhat.com> From: Chris Leech <cleech@redhat.com>
Date: Mon, 19 Nov 2012 17:09:24 -0800 Date: Mon, 19 Nov 2012 17:09:24 -0800
Subject: [PATCH 10/22] remove the offload boot supported ifdef Subject: [PATCH 10/32] remove the offload boot supported ifdef
--- ---
usr/iface.c | 7 +------ usr/iface.c | 7 +------
1 file changed, 1 insertion(+), 6 deletions(-) 1 file changed, 1 insertion(+), 6 deletions(-)
diff --git a/usr/iface.c b/usr/iface.c diff --git a/usr/iface.c b/usr/iface.c
index 44c098650b9e..129c4002dc63 100644 index 137138f5af67..889fe8cd8202 100644
--- a/usr/iface.c --- a/usr/iface.c
+++ b/usr/iface.c +++ b/usr/iface.c
@@ -993,6 +993,7 @@ int iface_setup_from_boot_context(struct iface_rec *iface, @@ -993,6 +993,7 @@ int iface_setup_from_boot_context(struct iface_rec *iface,
@ -41,5 +41,5 @@ index 44c098650b9e..129c4002dc63 100644
return 0; return 0;
-- --
2.14.3 2.14.4

6
0011-iscsiuio-systemd-unit-files.patch
View File

@ -1,7 +1,7 @@
From f8cb83bf6967fea8b7f0a4fc95a99df1986f7f15 Mon Sep 17 00:00:00 2001 From f16f7f90721c9d6965e48c7338a600d23b58e19d Mon Sep 17 00:00:00 2001
From: Chris Leech <cleech@redhat.com> From: Chris Leech <cleech@redhat.com>
Date: Tue, 22 Jan 2013 14:27:12 -0800 Date: Tue, 22 Jan 2013 14:27:12 -0800
Subject: [PATCH 11/22] iscsiuio systemd unit files Subject: [PATCH 11/32] iscsiuio systemd unit files
--- ---
etc/systemd/iscsiuio.service | 17 +++++++++++++++++ etc/systemd/iscsiuio.service | 17 +++++++++++++++++
@ -49,5 +49,5 @@ index 000000000000..d42cedc161a3
+[Install] +[Install]
+WantedBy=sockets.target +WantedBy=sockets.target
-- --
2.14.3 2.14.4

6
0012-Don-t-check-for-autostart-sessions-if-iscsi-is-not-u.patch
View File

@ -1,7 +1,7 @@
From 3e34fefae3f44bfd1ee24931663b92ff4f76d3ad Mon Sep 17 00:00:00 2001 From 9807bf0a042238891f2008a5a6d70acfd6724b12 Mon Sep 17 00:00:00 2001
From: Chris Leech <cleech@redhat.com> From: Chris Leech <cleech@redhat.com>
Date: Tue, 28 May 2013 13:12:27 -0700 Date: Tue, 28 May 2013 13:12:27 -0700
Subject: [PATCH 12/22] Don't check for autostart sessions if iscsi is not used Subject: [PATCH 12/32] Don't check for autostart sessions if iscsi is not used
(bug #951951) (bug #951951)
Change conditional startup in iscsi.service to check for a non-empty Change conditional startup in iscsi.service to check for a non-empty
@ -26,5 +26,5 @@ index 0309e2fc9892..d5712bd3779b 100644
[Service] [Service]
Type=oneshot Type=oneshot
-- --
2.14.3 2.14.4

6
0013-Revert-iscsiadm-return-error-when-login-fails.patch
View File

@ -1,7 +1,7 @@
From fc947d9c6d995455456cc68a22911ff336ddd4a7 Mon Sep 17 00:00:00 2001 From 6629618e3581cbe632b7408a49437270bc04a8d4 Mon Sep 17 00:00:00 2001
From: Chris Leech <cleech@redhat.com> From: Chris Leech <cleech@redhat.com>
Date: Mon, 24 Feb 2014 09:33:33 -0800 Date: Mon, 24 Feb 2014 09:33:33 -0800
Subject: [PATCH 13/22] Revert "iscsiadm: return error when login fails" Subject: [PATCH 13/32] Revert "iscsiadm: return error when login fails"
This reverts commit fc2a8e9a2911bc76f961fe3e4a159fab9b8b9691. This reverts commit fc2a8e9a2911bc76f961fe3e4a159fab9b8b9691.
@ -30,5 +30,5 @@ index 596085b1f640..07f587d2bafb 100644
} }
-- --
2.14.3 2.14.4

10
0014-update-handling-of-boot-sessions.patch
View File

@ -1,7 +1,7 @@
From ae822182f7106f2382a499924aed455dd66f417c Mon Sep 17 00:00:00 2001 From c7b743486c6a499a037744760846abdb42959808 Mon Sep 17 00:00:00 2001
From: Chris Leech <cleech@redhat.com> From: Chris Leech <cleech@redhat.com>
Date: Wed, 26 Feb 2014 16:33:48 -0800 Date: Wed, 26 Feb 2014 16:33:48 -0800
Subject: [PATCH 14/22] update handling of boot sessions Subject: [PATCH 14/32] update handling of boot sessions
force start iscsiuio if needed, socket activation does not seem to be force start iscsiuio if needed, socket activation does not seem to be
working for recovery working for recovery
@ -10,7 +10,7 @@ working for recovery
1 file changed, 23 insertions(+), 6 deletions(-) 1 file changed, 23 insertions(+), 6 deletions(-)
diff --git a/etc/systemd/iscsi-mark-root-nodes b/etc/systemd/iscsi-mark-root-nodes diff --git a/etc/systemd/iscsi-mark-root-nodes b/etc/systemd/iscsi-mark-root-nodes
index 157be62b4041..60dcd70e49fd 100644 index 157be62b4041..6bddf6c5ccc1 100644
--- a/etc/systemd/iscsi-mark-root-nodes --- a/etc/systemd/iscsi-mark-root-nodes
+++ b/etc/systemd/iscsi-mark-root-nodes +++ b/etc/systemd/iscsi-mark-root-nodes
@@ -1,13 +1,30 @@ @@ -1,13 +1,30 @@
@ -35,7 +35,7 @@ index 157be62b4041..60dcd70e49fd 100644
-systemctl start iscsid.service -systemctl start iscsid.service
+ start_iscsid=1 + start_iscsid=1
+ +
+ if [ "$transport" = bnx2i ]; then + if [ "$transport" = bnx2i ] || [ "$transport" = qedi ]; then
+ start_iscsiuio=1 + start_iscsiuio=1
+ fi + fi
+done < <( $ISCSIADM -m session ) +done < <( $ISCSIADM -m session )
@ -51,5 +51,5 @@ index 157be62b4041..60dcd70e49fd 100644
+fi +fi
-- --
2.14.3 2.14.4

6
0015-update-iscsi.service-for-boot-session-recovery.patch
View File

@ -1,7 +1,7 @@
From 5d8761566bba29ab92cfe2e06245ea55ad8bdb33 Mon Sep 17 00:00:00 2001 From f349a706ec083574fbf7ed1e479fdfebde7023b8 Mon Sep 17 00:00:00 2001
From: Chris Leech <cleech@redhat.com> From: Chris Leech <cleech@redhat.com>
Date: Fri, 14 Mar 2014 09:22:21 -0700 Date: Fri, 14 Mar 2014 09:22:21 -0700
Subject: [PATCH 15/22] update iscsi.service for boot session recovery Subject: [PATCH 15/32] update iscsi.service for boot session recovery
--- ---
etc/systemd/iscsi.service | 5 +++-- etc/systemd/iscsi.service | 5 +++--
@ -30,5 +30,5 @@ index d5712bd3779b..3de76c5b07ec 100644
ExecReload=/sbin/iscsiadm -m node --loginall=automatic ExecReload=/sbin/iscsiadm -m node --loginall=automatic
-- --
2.14.3 2.14.4

6
0016-updates-to-iscsi.service.patch
View File

@ -1,7 +1,7 @@
From 638e6f13dc199c2800ad19b5a206dd5305c3cadf Mon Sep 17 00:00:00 2001 From 954ab51516734aaeed01a195a6e70b825b0bf10a Mon Sep 17 00:00:00 2001
From: Chris Leech <cleech@redhat.com> From: Chris Leech <cleech@redhat.com>
Date: Wed, 17 Sep 2014 09:58:39 -0700 Date: Wed, 17 Sep 2014 09:58:39 -0700
Subject: [PATCH 16/22] updates to iscsi.service Subject: [PATCH 16/32] updates to iscsi.service
Resolves: #1126524 Resolves: #1126524
Resolves: #1111925 Resolves: #1111925
@ -37,5 +37,5 @@ index 3de76c5b07ec..ad7be34d5918 100644
[Install] [Install]
WantedBy=sysinit.target WantedBy=sysinit.target
-- --
2.14.3 2.14.4

6
0017-make-session-shutdown-a-seperate-service.patch.patch
View File

@ -1,7 +1,7 @@
From 55a9d630239bebbc5410f3d2f2485ff8f82873a3 Mon Sep 17 00:00:00 2001 From 3815643d7db65487fa2b7058dd612ddf2549f85a Mon Sep 17 00:00:00 2001
From: rpm-build <rpm-build> From: rpm-build <rpm-build>
Date: Tue, 13 Jan 2015 16:30:01 -0800 Date: Tue, 13 Jan 2015 16:30:01 -0800
Subject: [PATCH 17/22] make-session-shutdown-a-seperate-service.patch Subject: [PATCH 17/32] make-session-shutdown-a-seperate-service.patch
--- ---
etc/systemd/iscsi-shutdown.service | 14 ++++++++++++++ etc/systemd/iscsi-shutdown.service | 14 ++++++++++++++
@ -51,5 +51,5 @@ index ad7be34d5918..27369568bf35 100644
[Install] [Install]
-- --
2.14.3 2.14.4

6
0018-Add-macros-to-release-GIL-lock.patch
View File

@ -1,7 +1,7 @@
From 16248312077c5d9b015a09e86743710be69ec0e6 Mon Sep 17 00:00:00 2001 From bd26fd7e7f91e5c4c6903c3d7e1a375a14261a48 Mon Sep 17 00:00:00 2001
From: Jiri Konecny <jkonecny@redhat.com> From: Jiri Konecny <jkonecny@redhat.com>
Date: Mon, 11 May 2015 13:16:26 +0200 Date: Mon, 11 May 2015 13:16:26 +0200
Subject: [PATCH 18/22] Add macros to release GIL lock Subject: [PATCH 18/32] Add macros to release GIL lock
Other threads are blocked when GIL is not released before the time consuming Other threads are blocked when GIL is not released before the time consuming
functions. functions.
@ -52,5 +52,5 @@ index 88008538f04f..40b59553a28e 100644
libiscsi_get_error_string(context)); libiscsi_get_error_string(context));
return NULL; return NULL;
-- --
2.14.3 2.14.4

10
0019-libiscsi-introduce-sessions-API.patch
View File

@ -1,7 +1,7 @@
From a9522cd93a4040ce3edbf61babf66c36e9379d22 Mon Sep 17 00:00:00 2001 From 7671cd56d36a76e954318cbdce3f08fc40aa3fe4 Mon Sep 17 00:00:00 2001
From: Peter Hatina <phatina@redhat.com> From: Peter Hatina <phatina@redhat.com>
Date: Mon, 5 Oct 2015 16:50:36 -0700 Date: Mon, 5 Oct 2015 16:50:36 -0700
Subject: [PATCH 19/22] libiscsi introduce sessions API Subject: [PATCH 19/32] libiscsi introduce sessions API
--- ---
libiscsi/libiscsi.c | 125 ++++++++++++++++++++++++++++++++++++++++++++++++++++ libiscsi/libiscsi.c | 125 ++++++++++++++++++++++++++++++++++++++++++++++++++++
@ -242,7 +242,7 @@ index 756590e14d8b..a9891f48b7d6 100644
* *
* Set the given nodes iSCSI parameter named by \e parameter to value \e value. * Set the given nodes iSCSI parameter named by \e parameter to value \e value.
diff --git a/usr/iscsi_sysfs.c b/usr/iscsi_sysfs.c diff --git a/usr/iscsi_sysfs.c b/usr/iscsi_sysfs.c
index 0cc55b97bde9..276b95d6869c 100644 index fdc26c7bd9ba..80b7b0210fd1 100644
--- a/usr/iscsi_sysfs.c --- a/usr/iscsi_sysfs.c
+++ b/usr/iscsi_sysfs.c +++ b/usr/iscsi_sysfs.c
@@ -3,6 +3,7 @@ @@ -3,6 +3,7 @@
@ -253,7 +253,7 @@ index 0cc55b97bde9..276b95d6869c 100644
* *
* This program is free software; you can redistribute it and/or modify * This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published * it under the terms of the GNU General Public License as published
@@ -1145,6 +1146,11 @@ free_info: @@ -1146,6 +1147,11 @@ free_info:
return rc; return rc;
} }
@ -286,5 +286,5 @@ index cdcefa65f683..12ad87f96c8c 100644
int *nr_found, int *nr_found,
iscsi_sysfs_iface_op_fn *fn); iscsi_sysfs_iface_op_fn *fn);
-- --
2.14.3 2.14.4

6
0020-use-Red-Hat-version-string-to-match-RPM-package-vers.patch
View File

@ -1,7 +1,7 @@
From 5972521ca52b9cbfc3a5afb3b64609b8dfecf204 Mon Sep 17 00:00:00 2001 From 92aac85cf423d1c566d324255a86de0116d33015 Mon Sep 17 00:00:00 2001
From: Chris Leech <cleech@redhat.com> From: Chris Leech <cleech@redhat.com>
Date: Mon, 21 Jan 2013 15:43:36 -0800 Date: Mon, 21 Jan 2013 15:43:36 -0800
Subject: [PATCH 20/22] use Red Hat version string to match RPM package version Subject: [PATCH 20/32] use Red Hat version string to match RPM package version
--- ---
usr/version.h | 2 +- usr/version.h | 2 +-
@ -21,5 +21,5 @@ index 4dfef4ccfb77..1334d47c6bb3 100644
#endif #endif
-- --
2.14.3 2.14.4

6
0021-libiscsi-fix-discovery-request-timeout-regression.patch
View File

@ -1,7 +1,7 @@
From f1705fa7d9f27b392f14a371553de7b01582e9ed Mon Sep 17 00:00:00 2001 From 1aa35262d566d829d711bc746f944dee5c2d9e7a Mon Sep 17 00:00:00 2001
From: rpm-build <rpm-build> From: rpm-build <rpm-build>
Date: Tue, 28 Feb 2017 09:00:41 -0800 Date: Tue, 28 Feb 2017 09:00:41 -0800
Subject: [PATCH 21/22] libiscsi: fix discovery request timeout regression Subject: [PATCH 21/32] libiscsi: fix discovery request timeout regression
--- ---
libiscsi/libiscsi.c | 2 ++ libiscsi/libiscsi.c | 2 ++
@ -28,5 +28,5 @@ index 755c18ca8e3b..bb17dfcafded 100644
rc = idbm_bind_ifaces_to_nodes(discovery_fw, &drec, &ifaces, &rec_list); rc = idbm_bind_ifaces_to_nodes(discovery_fw, &drec, &ifaces, &rec_list);
if (rc) { if (rc) {
-- --
2.14.3 2.14.4

6
0022-libiscsi-format-security-build-errors.patch
View File

@ -1,7 +1,7 @@
From 18745aa7e3052cefaf58ed7862bfe10d078a9331 Mon Sep 17 00:00:00 2001 From 1b2b6b683bd7ca3a7030889daf8c326dda797319 Mon Sep 17 00:00:00 2001
From: rpm-build <rpm-build> From: rpm-build <rpm-build>
Date: Tue, 28 Feb 2017 10:06:42 -0800 Date: Tue, 28 Feb 2017 10:06:42 -0800
Subject: [PATCH 22/22] libiscsi format-security build errors Subject: [PATCH 22/32] libiscsi format-security build errors
--- ---
libiscsi/libiscsi.c | 5 +++-- libiscsi/libiscsi.c | 5 +++--
@ -31,5 +31,5 @@ index bb17dfcafded..7003388e3346 100644
} }
-- --
2.14.3 2.14.4

6
0023-libiscsi-fix-build-to-use-libopeniscsiusr.patch
View File

@ -1,7 +1,7 @@
From ae3c1ddf846ce40960de9c6ef024577d69ccb1e0 Mon Sep 17 00:00:00 2001 From b0d26441cebf6f1d78a2b4523ee9c348578b3d91 Mon Sep 17 00:00:00 2001
From: rpm-build <rpm-build> From: rpm-build <rpm-build>
Date: Thu, 24 May 2018 15:17:05 -0700 Date: Thu, 24 May 2018 15:17:05 -0700
Subject: [PATCH 1/1] libiscsi fix build to use libopeniscsiusr Subject: [PATCH 23/32] libiscsi fix build to use libopeniscsiusr
--- ---
libiscsi/Makefile | 6 ++++-- libiscsi/Makefile | 6 ++++--
@ -32,5 +32,5 @@ index 317a7ec4db30..1196bb5c0cf4 100644
# Flags for the tests # Flags for the tests
-- --
2.14.3 2.14.4

16
0025-dont-install-scripts.patch → 0024-dont-install-scripts.patch
View File

@ -1,11 +1,14 @@
commit 873379c560fb5e014afa53d05dab7145635ac3c4 From 09485b397990aca06d5e98a855bab2444c9ec572 Mon Sep 17 00:00:00 2001
Author: Chris Leech <cleech@redhat.com> From: rpm-build <rpm-build>
Date: Thu May 24 15:53:35 2018 -0700 Date: Fri, 25 May 2018 09:39:07 -0700
Subject: [PATCH 24/32] dont install scripts
dont install scripts ---
Makefile | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/Makefile b/Makefile diff --git a/Makefile b/Makefile
index 8d6f5d8ef102..9422b62b53b1 100644 index 80afe86d6558..a35082daa9f9 100644
--- a/Makefile --- a/Makefile
+++ b/Makefile +++ b/Makefile
@@ -99,7 +99,7 @@ install_udev_rules: @@ -99,7 +99,7 @@ install_udev_rules:
@ -17,3 +20,6 @@ index 8d6f5d8ef102..9422b62b53b1 100644
$(INSTALL) -d $(DESTDIR)$(sbindir) $(INSTALL) -d $(DESTDIR)$(sbindir)
$(INSTALL) -m 755 $^ $(DESTDIR)$(sbindir) $(INSTALL) -m 755 $^ $(DESTDIR)$(sbindir)
--
2.14.4

40
0024-libopeniscsiusr-temp-disable-gcc-errors.patch
View File

@ -1,40 +0,0 @@
From db7fe07bc108ea30beb4f54a42c67df428f8862a Mon Sep 17 00:00:00 2001
From: rpm-build <rpm-build>
Date: Thu, 24 May 2018 15:41:34 -0700
Subject: [PATCH 1/1] libopeniscsiusr: temp disable gcc errors
---
Makefile | 2 +-
libopeniscsiusr/Makefile | 3 ++-
2 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/Makefile b/Makefile
index 6c94ca96016e..8d6f5d8ef102 100644
--- a/Makefile
+++ b/Makefile
@@ -7,7 +7,7 @@
DESTDIR ?=
prefix = /usr
-exec_prefix = /
+exec_prefix = /usr
sbindir = $(exec_prefix)/sbin
bindir = $(exec_prefix)/bin
mandir = $(prefix)/share/man
diff --git a/libopeniscsiusr/Makefile b/libopeniscsiusr/Makefile
index 8b9b523c1d96..0df30f8c34f0 100644
--- a/libopeniscsiusr/Makefile
+++ b/libopeniscsiusr/Makefile
@@ -42,7 +42,8 @@ EXTRA_MAN_FILES = libopeniscsiusr.h.3
OBJS = context.o misc.o session.o sysfs.o iface.o
CFLAGS ?= -O2 -g
-CFLAGS += -Wall -Werror -Wextra -fvisibility=hidden -fPIC
+CFLAGS += -Wall -Werror -Wextra -fvisibility=hidden -fPIC \
+ -Wno-format-truncation -Wno-stringop-truncation
LIBADD =
--
2.14.3

109
0028-use-var-lib-iscsi-in-libopeniscsiusr.patch Normal file
View File

@ -0,0 +1,109 @@
From 089cd6910d9f0d1e459e1d8d00b754843437526d Mon Sep 17 00:00:00 2001
From: rpm-build <rpm-build>
Date: Wed, 30 May 2018 16:08:30 -0700
Subject: [PATCH 28/28] use /var/lib/iscsi in libopeniscsiusr
---
libopeniscsiusr/idbm.h | 3 ++-
libopeniscsiusr/iface.c | 2 +-
libopeniscsiusr/libopeniscsiusr/libopeniscsiusr.h | 8 ++++----
libopeniscsiusr/libopeniscsiusr/libopeniscsiusr_iface.h | 2 +-
libopeniscsiusr/node.h | 2 +-
5 files changed, 9 insertions(+), 8 deletions(-)
diff --git a/libopeniscsiusr/idbm.h b/libopeniscsiusr/idbm.h
index 3fd0864a797d..c84d332ff949 100644
--- a/libopeniscsiusr/idbm.h
+++ b/libopeniscsiusr/idbm.h
@@ -31,7 +31,8 @@
#include "libopeniscsiusr/libopeniscsiusr_common.h"
#define ISCSI_CONFIG_ROOT "/etc/iscsi/"
-#define IFACE_CONFIG_DIR ISCSI_CONFIG_ROOT"ifaces"
+#define ISCSI_VAR_LIB "/var/lib/iscsi/"
+#define IFACE_CONFIG_DIR ISCSI_VAR_LIB"ifaces"
#define AUTH_STR_MAX_LEN 256
#define BOOT_NAME_MAXLEN 256
#define IDBM_DUMP_SIZE 8192
diff --git a/libopeniscsiusr/iface.c b/libopeniscsiusr/iface.c
index e2355bc0fff0..cd9dd7326ae6 100644
--- a/libopeniscsiusr/iface.c
+++ b/libopeniscsiusr/iface.c
@@ -383,7 +383,7 @@ int iscsi_default_iface_setup(struct iscsi_context *ctx)
_good(_iscsi_hids_get(ctx, &hids, &hid_count), rc, out);
for (i = 0; i < hid_count; ++i) {
- /* Create /etc/iscsi/ifaces/<iface_name> file if not found
+ /* Create /var/lib/iscsi/ifaces/<iface_name> file if not found
*/
_good(_iscsi_ifaces_get_from_sysfs(ctx, hids[i], &ifaces, &iface_count),
rc, out);
diff --git a/libopeniscsiusr/libopeniscsiusr/libopeniscsiusr.h b/libopeniscsiusr/libopeniscsiusr/libopeniscsiusr.h
index 439590249212..81582da9e1e6 100644
--- a/libopeniscsiusr/libopeniscsiusr/libopeniscsiusr.h
+++ b/libopeniscsiusr/libopeniscsiusr/libopeniscsiusr.h
@@ -339,7 +339,7 @@ __DLL_EXPORT void iscsi_session_free(struct iscsi_session *se);
* * bnx2i
*
* It will also create configuration files for iSCSI hardware offload cards in
- * /etc/iscsi/ifaces/<iface_name>.
+ * /var/lib/iscsi/ifaces/<iface_name>.
*
* @ctx:
* Pointer of 'struct iscsi_context'.
@@ -369,7 +369,7 @@ __DLL_EXPORT int iscsi_default_iface_setup(struct iscsi_context *ctx);
* Retrieves all iSCSI interfaces. For the properties of 'struct iscsi_iface',
* please refer to the functions defined in 'libopeniscsiusr_iface.h' file.
* The returned results contains default iSCSI interfaces(iser and iscsi_tcp)
- * and iSCSI interfaces configured in "/etc/iscsi/ifaces/".
+ * and iSCSI interfaces configured in "/var/lib/iscsi/ifaces/".
* Illegal configuration file will be skipped and warned.
* To generate iSCSI interface configuration when new card installed, please
* use iscsi_default_iface_setup().
@@ -427,7 +427,7 @@ __DLL_EXPORT void iscsi_ifaces_free(struct iscsi_iface **ifaces,
* iscsi_iface_get() - Retrieve specified iSCSI interface.
*
* Retrieves specified iSCSI interfaces by reading configuration from
- * "/etc/iscsi/iface/<iface_name>".
+ * "/var/lib/iscsi/iface/<iface_name>".
* To generate iSCSI interface configuration when new card installed, please
* use iscsi_default_iface_setup().
* Illegal configuration file will be treated as error LIBISCSI_ERR_IDBM.
@@ -438,7 +438,7 @@ __DLL_EXPORT void iscsi_ifaces_free(struct iscsi_iface **ifaces,
* If this pointer is NULL, your program will be terminated by assert.
* @iface_name:
* String. Name of iSCSI interface. Also the file name of configuration
- * file "/etc/iscsi/iface/<iface_name>".
+ * file "/var/lib/iscsi/iface/<iface_name>".
* If this pointer is NULL or empty string, your program will be terminated
* by assert.
* @iface:
diff --git a/libopeniscsiusr/libopeniscsiusr/libopeniscsiusr_iface.h b/libopeniscsiusr/libopeniscsiusr/libopeniscsiusr_iface.h
index a1a255246d20..95b01602fb37 100644
--- a/libopeniscsiusr/libopeniscsiusr/libopeniscsiusr_iface.h
+++ b/libopeniscsiusr/libopeniscsiusr/libopeniscsiusr_iface.h
@@ -182,7 +182,7 @@ __DLL_EXPORT const char *iscsi_iface_name_get(struct iscsi_iface *iface);
*
* Dump all configurations of specified iSCSI interface. Will skip empty
* configuration so that output string could be saved directly to
- * /etc/iscsi/ifaces/<iface_name> file.
+ * /var/lib/iscsi/ifaces/<iface_name> file.
*
* @iface:
* Pointer of 'struct iscsi_iface'.
diff --git a/libopeniscsiusr/node.h b/libopeniscsiusr/node.h
index 39e07b3befae..9eba7fa6077c 100644
--- a/libopeniscsiusr/node.h
+++ b/libopeniscsiusr/node.h
@@ -44,7 +44,7 @@ struct iscsi_node {
char portal[NI_MAXHOST * 2];
};
-#define NODE_CONFIG_DIR ISCSI_CONFIG_ROOT"nodes"
+#define NODE_CONFIG_DIR ISCSI_VAR_LIB"nodes"
/* Might be public in the future */
__DLL_LOCAL void iscsi_node_free(struct iscsi_node *node);
--
2.14.4

55
iscsi-initiator-utils.spec
View File

@ -1,6 +1,6 @@
%global open_iscsi_version 2.0 %global open_iscsi_version 2.0
%global open_iscsi_build 876 %global open_iscsi_build 876
%global commit0 24580adc4c174bbc5dde3ae7594a46d57635e906 %global commit0 4ef926185f300dc34593261ab8f9de39a32f80cb
%global shortcommit0 %(c=%{commit0}; echo ${c:0:7}) %global shortcommit0 %(c=%{commit0}; echo ${c:0:7})
Summary: iSCSI daemon and utility programs Summary: iSCSI daemon and utility programs
@ -37,12 +37,13 @@ Patch0020: 0020-use-Red-Hat-version-string-to-match-RPM-package-vers.patch
Patch0021: 0021-libiscsi-fix-discovery-request-timeout-regression.patch Patch0021: 0021-libiscsi-fix-discovery-request-timeout-regression.patch
Patch0022: 0022-libiscsi-format-security-build-errors.patch Patch0022: 0022-libiscsi-format-security-build-errors.patch
Patch0023: 0023-libiscsi-fix-build-to-use-libopeniscsiusr.patch Patch0023: 0023-libiscsi-fix-build-to-use-libopeniscsiusr.patch
Patch0024: 0024-libopeniscsiusr-temp-disable-gcc-errors.patch Patch0024: 0024-dont-install-scripts.patch
Patch0025: 0025-dont-install-scripts.patch Patch0028: 0028-use-var-lib-iscsi-in-libopeniscsiusr.patch
BuildRequires: flex bison python2-devel python3-devel python2-setuptools doxygen kmod-devel systemd-units BuildRequires: flex bison python2-devel python3-devel python2-setuptools doxygen kmod-devel systemd-units
BuildRequires: autoconf automake libtool libmount-devel openssl-devel BuildRequires: autoconf automake libtool libmount-devel openssl-devel
BuildRequires: isns-utils-devel BuildRequires: isns-utils-devel
BuildRequires: git
# For dir ownership # For dir ownership
Requires: %{name}-iscsiuio >= %{version}-%{release} Requires: %{name}-iscsiuio >= %{version}-%{release}
Requires(post): systemd Requires(post): systemd
@ -58,6 +59,27 @@ as well as the utility programs used to manage it. iSCSI is a protocol
for distributed disk access using SCSI commands sent over Internet for distributed disk access using SCSI commands sent over Internet
Protocol networks. Protocol networks.
# I don't think we're ready to expose these just yet
# For now just add the needed library to the base package
#%package -n libopeniscsiusr
#Summary: library providing access to Open-iSCSI initiator functionality
#Group: Development/Libraries
#License: BSD
#%description -n libopeniscsiusr
#The libopeniscsiusr library provides a C API for access to the Open-iSCSI
#initiator. It is used by the Open-iSCSI command line tools.
#%package -n libopeniscsiusr-devel
#Summary: Development files for libopeniscsiusr
#Group: Development/Libraries
#Requires: libopeniscsiusr = %{version}-%{release}
#%description -n libopeniscsiusr-devel
#The libopeniscsiusr-devel package contains libraries and header files for
#developing applications that use libopeniscsiusr.
%package iscsiuio %package iscsiuio
Summary: Userspace configuration daemon required for some iSCSI hardware Summary: Userspace configuration daemon required for some iSCSI hardware
Group: System Environment/Daemons Group: System Environment/Daemons
@ -95,7 +117,7 @@ The %{name}-python3 package contains Python %{python3_version} bindings to the
libiscsi interface for interacting with %{name} libiscsi interface for interacting with %{name}
%prep %prep
%autosetup -p1 -n open-iscsi-%{commit0} %autosetup -p1 -n open-iscsi-%{commit0} -Sgit_am
# change exec_prefix, there's no easy way to override # change exec_prefix, there's no easy way to override
%{__sed} -i -e 's|^exec_prefix = /$|exec_prefix = %{_exec_prefix}|' Makefile %{__sed} -i -e 's|^exec_prefix = /$|exec_prefix = %{_exec_prefix}|' Makefile
@ -118,7 +140,7 @@ popd
%install %install
%{__make} DESTDIR=%{?buildroot} install_programs install_doc install_etc %{__make} DESTDIR=%{?buildroot} install_programs install_doc install_etc install_libopeniscsiusr
# upstream makefile doesn't get everything the way we like it # upstream makefile doesn't get everything the way we like it
#rm $RPM_BUILD_ROOT%{_sbindir}/iscsi_discovery #rm $RPM_BUILD_ROOT%{_sbindir}/iscsi_discovery
rm $RPM_BUILD_ROOT%{_mandir}/man8/iscsi_discovery.8 rm $RPM_BUILD_ROOT%{_mandir}/man8/iscsi_discovery.8
@ -262,6 +284,25 @@ fi
%{_mandir}/man8/iscsiadm.8.gz %{_mandir}/man8/iscsiadm.8.gz
%{_mandir}/man8/iscsid.8.gz %{_mandir}/man8/iscsid.8.gz
%{_mandir}/man8/iscsistart.8.gz %{_mandir}/man8/iscsistart.8.gz
# until we decide to setup libopeniscsiusr as a subpkg for real
%{_libdir}/libopeniscsiusr.so.*
%exclude %{_libdir}/libopeniscsiusr.so
%exclude %{_includedir}/libopeniscsiusr.h
%exclude %{_includedir}/libopeniscsiusr_common.h
%exclude %{_includedir}/libopeniscsiusr_iface.h
%exclude %{_includedir}/libopeniscsiusr_session.h
%exclude %{_libdir}/pkgconfig/libopeniscsiusr.pc
# %files -n libopeniscsiusr
# %{_libdir}/libopeniscsiusr.so.*
#
# %files -n libopeniscsiusr-devel
# %{_libdir}/libopeniscsiusr.so
# %{_includedir}/libopeniscsiusr.h
# %{_includedir}/libopeniscsiusr_common.h
# %{_includedir}/libopeniscsiusr_iface.h
# %{_includedir}/libopeniscsiusr_session.h
# %{_libdir}/pkgconfig/libopeniscsiusr.pc
%files iscsiuio %files iscsiuio
%{_sbindir}/iscsiuio %{_sbindir}/iscsiuio
@ -282,6 +323,10 @@ fi
%{python3_sitearch}/* %{python3_sitearch}/*
%changelog %changelog
* Tue Jun 19 2018 Chris Leech <cleech@redhat.com> - 6.2.0.876-1.git4ef9261
- pull in post 2.0.876 tagged fixes from upstream git
- minimal packaging of libopeniscsiusr (internal use only, no dev package yet)
* Tue Jun 19 2018 Chris Leech <cleech@redhat.com> - 6.2.0.876-1.git24580ad * Tue Jun 19 2018 Chris Leech <cleech@redhat.com> - 6.2.0.876-1.git24580ad
- rebase to upstream 2.0.876 - rebase to upstream 2.0.876

2
sources
View File

@ -1 +1 @@
SHA512 (open-iscsi-86e8892.tar.gz) = bdbce29d98e92d112f804271cd2e28be27378533e5a934004d852d6874fc1fa86228faa7ce20dd2a392731d78ec010c7b8303aa139c4552ff4b8d06a750ba450 SHA512 (open-iscsi-4ef9261.tar.gz) = dbdaccdea249490e840709cb7b2f3482218f765ff92471161baf1f3bb2bc91154864ac3f87fb486fa622fd2c2f9de62f34f0440769de17a75dcb4c91f2450820