Compare commits
No commits in common. "c8" and "imports/c9/iscsi-initiator-utils-6.2.1.4-2.git2a8f9d8.el9" have entirely different histories.
c8
...
imports/c9
2
.gitignore
vendored
2
.gitignore
vendored
@ -1 +1 @@
|
||||
SOURCES/open-iscsi-095f59c.tar.gz
|
||||
SOURCES/open-iscsi-2a8f9d8.tar.gz
|
||||
|
||||
@ -1 +1 @@
|
||||
d6947b76f161a0adcc6d984ed43a82c99e319578 SOURCES/open-iscsi-095f59c.tar.gz
|
||||
548252927c20ea605def18014cbafa377b1b104d SOURCES/open-iscsi-2a8f9d8.tar.gz
|
||||
|
||||
@ -0,0 +1,28 @@
|
||||
From 432bbf979ee66ee29bb92e35fd6e3ffb948563e3 Mon Sep 17 00:00:00 2001
|
||||
From: Lee Duncan <lduncan@suse.com>
|
||||
Date: Wed, 29 Sep 2021 11:48:16 -0700
|
||||
Subject: [PATCH] Remove dependences from iscsi-init.service
|
||||
|
||||
Since iscsid.service depends on it but disables
|
||||
default dependencies, iscsi-init.service must
|
||||
also disable default dependencies, or a dependency
|
||||
loop can be created.
|
||||
---
|
||||
etc/systemd/iscsi-init.service | 1 +
|
||||
1 file changed, 1 insertion(+)
|
||||
|
||||
diff --git a/etc/systemd/iscsi-init.service b/etc/systemd/iscsi-init.service
|
||||
index e058ff0..eab4ff2 100644
|
||||
--- a/etc/systemd/iscsi-init.service
|
||||
+++ b/etc/systemd/iscsi-init.service
|
||||
@@ -1,6 +1,7 @@
|
||||
[Unit]
|
||||
Description=One time configuration for iscsi.service
|
||||
ConditionPathExists=!/etc/iscsi/initiatorname.iscsi
|
||||
+DefaultDependencies=no
|
||||
Before=iscsid.service
|
||||
|
||||
[Service]
|
||||
--
|
||||
2.33.0
|
||||
|
||||
@ -1,16 +1,16 @@
|
||||
From 28e3ef5c630b8433eaad176a53c98af05a994f36 Mon Sep 17 00:00:00 2001
|
||||
From fd538429be486d057b092e3b9c148add2c5ea9c2 Mon Sep 17 00:00:00 2001
|
||||
From: rpm-build <rpm-build>
|
||||
Date: Tue, 4 Jun 2019 13:23:32 -0700
|
||||
Subject: [PATCH 01/23] unit file tweaks
|
||||
Subject: [PATCH 1/1] unit file tweaks
|
||||
|
||||
---
|
||||
etc/systemd/iscsi-mark-root-nodes | 34 ++++++++++++++++++++++++++++++
|
||||
etc/systemd/iscsi-onboot.service | 15 +++++++++++++
|
||||
etc/systemd/iscsi-shutdown.service | 15 +++++++++++++
|
||||
etc/systemd/iscsi.service | 16 +++++++-------
|
||||
etc/systemd/iscsid.service | 6 ++----
|
||||
etc/systemd/iscsid.service | 3 +--
|
||||
etc/systemd/iscsiuio.service | 4 +---
|
||||
6 files changed, 75 insertions(+), 15 deletions(-)
|
||||
6 files changed, 74 insertions(+), 13 deletions(-)
|
||||
create mode 100755 etc/systemd/iscsi-mark-root-nodes
|
||||
create mode 100644 etc/systemd/iscsi-onboot.service
|
||||
create mode 100644 etc/systemd/iscsi-shutdown.service
|
||||
@ -98,10 +98,10 @@ index 0000000..caee933
|
||||
+ExecStart=-/usr/bin/true
|
||||
+ExecStop=-/usr/sbin/iscsiadm -m node --logoutall=all
|
||||
diff --git a/etc/systemd/iscsi.service b/etc/systemd/iscsi.service
|
||||
index 5e394b9..26e557d 100644
|
||||
index 5e394b9..175cb2c 100644
|
||||
--- a/etc/systemd/iscsi.service
|
||||
+++ b/etc/systemd/iscsi.service
|
||||
@@ -1,17 +1,17 @@
|
||||
@@ -1,18 +1,18 @@
|
||||
[Unit]
|
||||
Description=Login and scanning of iSCSI devices
|
||||
Documentation=man:iscsiadm(8) man:iscsid(8)
|
||||
@ -112,7 +112,7 @@ index 5e394b9..26e557d 100644
|
||||
+DefaultDependencies=no
|
||||
+Before=remote-fs-pre.target
|
||||
+After=network.target network-online.target iscsid.service iscsiuio.service systemd-remount-fs.service
|
||||
+Wants=network-online.target remote-fs-pre.target iscsi-shutdown.service
|
||||
+Wants=remote-fs-pre.target iscsi-shutdown.service
|
||||
+ConditionDirectoryNotEmpty=/var/lib/iscsi/nodes
|
||||
|
||||
[Service]
|
||||
@ -121,25 +121,23 @@ index 5e394b9..26e557d 100644
|
||||
-ExecStop=/sbin/iscsiadm -m node --logoutall=automatic
|
||||
-ExecStop=/sbin/iscsiadm -m node --logoutall=manual
|
||||
-SuccessExitStatus=21 15
|
||||
RemainAfterExit=true
|
||||
+ExecStart=-/usr/sbin/iscsiadm -m node --loginall=automatic
|
||||
+ExecReload=-/usr/sbin/iscsiadm -m node --loginall=automatic
|
||||
+SuccessExitStatus=21
|
||||
RemainAfterExit=true
|
||||
|
||||
[Install]
|
||||
WantedBy=remote-fs.target
|
||||
diff --git a/etc/systemd/iscsid.service b/etc/systemd/iscsid.service
|
||||
index 3fd7dd3..3958dae 100644
|
||||
index 3fd7dd3..324c593 100644
|
||||
--- a/etc/systemd/iscsid.service
|
||||
+++ b/etc/systemd/iscsid.service
|
||||
@@ -2,15 +2,13 @@
|
||||
Description=Open-iSCSI
|
||||
Documentation=man:iscsid(8) man:iscsiuio(8) man:iscsiadm(8)
|
||||
@@ -4,13 +4,12 @@ Documentation=man:iscsid(8) man:iscsiuio(8) man:iscsiadm(8)
|
||||
DefaultDependencies=no
|
||||
-After=network-online.target iscsiuio.service iscsi-init.service
|
||||
+After=network.target network-online.target iscsiuio.service
|
||||
After=network-online.target iscsiuio.service iscsi-init.service
|
||||
Before=remote-fs-pre.target
|
||||
-Wants=remote-fs-pre.target
|
||||
-Requires=iscsi-init.service
|
||||
Requires=iscsi-init.service
|
||||
|
||||
[Service]
|
||||
Type=notify
|
||||
@ -173,5 +171,5 @@ index 923e019..fc0be93 100644
|
||||
Restart=on-failure
|
||||
|
||||
--
|
||||
2.31.1
|
||||
2.26.3
|
||||
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
From 9823d8ead9e2d91765e4af39d906e25acd4e2a04 Mon Sep 17 00:00:00 2001
|
||||
From 0bb22b50dbaa7ac44e8eb244a73a66efbd98632c Mon Sep 17 00:00:00 2001
|
||||
From: Chris Leech <cleech@redhat.com>
|
||||
Date: Tue, 13 Aug 2013 11:34:31 -0700
|
||||
Subject: [PATCH 3/3] idbm_rec_write, seperate old and new style writes
|
||||
Subject: [PATCH 1/1] idbm_rec_write, seperate old and new style writes
|
||||
|
||||
Duplicates a small bit of code, but easier to understand and extened.
|
||||
---
|
||||
@ -155,7 +155,7 @@ index efdda75..307a01a 100644
|
||||
+
|
||||
+ snprintf(portal, PATH_MAX, "%s", NODE_CONFIG_DIR);
|
||||
+ if (access(portal, F_OK) != 0) {
|
||||
+ if (mkdir(portal, 0770) != 0) {
|
||||
+ if (mkdir(portal, 0660) != 0) {
|
||||
+ log_error("Could not make %s: %s", portal,
|
||||
+ strerror(errno));
|
||||
+ rc = ISCSI_ERR_IDBM;
|
||||
@ -165,7 +165,7 @@ index efdda75..307a01a 100644
|
||||
+
|
||||
+ snprintf(portal, PATH_MAX, "%s/%s", NODE_CONFIG_DIR, rec->name);
|
||||
+ if (access(portal, F_OK) != 0) {
|
||||
+ if (mkdir(portal, 0770) != 0) {
|
||||
+ if (mkdir(portal, 0660) != 0) {
|
||||
+ log_error("Could not make %s: %s", portal,
|
||||
+ strerror(errno));
|
||||
+ rc = ISCSI_ERR_IDBM;
|
||||
@ -189,5 +189,5 @@ index efdda75..307a01a 100644
|
||||
idbm_unlock();
|
||||
free_portal:
|
||||
--
|
||||
2.31.1
|
||||
2.26.3
|
||||
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
From e6ab14371300e45c4f03efa64917f7601675f01d Mon Sep 17 00:00:00 2001
|
||||
From f7c6a7381a38ca59fd7a9a64e5f54cf5c16995ad Mon Sep 17 00:00:00 2001
|
||||
From: Chris Leech <cleech@redhat.com>
|
||||
Date: Mon, 19 Nov 2012 16:38:45 -0800
|
||||
Subject: [PATCH 1/1] use var for config
|
||||
@ -251,5 +251,5 @@ index 6c06f7f..c8b9de9 100644
|
||||
struct iface_rec;
|
||||
struct list_head;
|
||||
--
|
||||
2.31.1
|
||||
2.26.3
|
||||
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
From c455d7ff3a2fa37cdd5b43616db975aef336a007 Mon Sep 17 00:00:00 2001
|
||||
From 6de09f82e86db0500a59017a473c944877a80516 Mon Sep 17 00:00:00 2001
|
||||
From: Chris Leech <cleech@redhat.com>
|
||||
Date: Wed, 5 Jun 2019 09:08:39 -0700
|
||||
Subject: [PATCH 1/1] Coverity scan fixes
|
||||
@ -96,5 +96,5 @@ index dc54fec..fde8894 100644
|
||||
if ((control_fd = ipc->ctldev_open()) < 0) {
|
||||
log_close(log_pid);
|
||||
--
|
||||
2.31.1
|
||||
2.26.3
|
||||
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
From 8bcaf32662ff762c2cab3d4b1f96c38965304e30 Mon Sep 17 00:00:00 2001
|
||||
From b50ab4a08a12593985b14aece5f689e485647b1c Mon Sep 17 00:00:00 2001
|
||||
From: rpm-build <rpm-build>
|
||||
Date: Wed, 16 Oct 2019 23:17:20 -0700
|
||||
Subject: [PATCH 1/1] fix upstream build breakage of iscsiuio LDFLAGS
|
||||
@ -8,7 +8,7 @@ Subject: [PATCH 1/1] fix upstream build breakage of iscsiuio LDFLAGS
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/iscsiuio/configure.ac b/iscsiuio/configure.ac
|
||||
index 9b85448..1b9fb27 100644
|
||||
index 9b85448..5dc188b 100644
|
||||
--- a/iscsiuio/configure.ac
|
||||
+++ b/iscsiuio/configure.ac
|
||||
@@ -72,7 +72,7 @@ AC_ARG_WITH([systemd],
|
||||
@ -16,10 +16,10 @@ index 9b85448..1b9fb27 100644
|
||||
esac],[with_libsystemd=auto])
|
||||
AS_IF([test "$with_libsystemd" != no],[
|
||||
- PKG_CHECK_MODULES([LIBSYSTEMD],[libsystemd],[LDFLAGS=$LIBSYSTEMD_LIBS],[
|
||||
+ PKG_CHECK_MODULES([LIBSYSTEMD],[libsystemd],[LDFLAGS="${LDFLAGS} $LIBSYSTEMD_LIBS"],[
|
||||
+ PKG_CHECK_MODULES([LIBSYSTEMD],[libsystemd],[LDFLAGS="$LDFLAGS $LIBSYSTEMD_LIBS"],[
|
||||
if test "$with_libsystemd" = yes; then
|
||||
AC_MSG_ERROR([could not find libsystemd using pkg-config])
|
||||
else
|
||||
--
|
||||
2.31.1
|
||||
2.26.3
|
||||
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
From a7c0b325c7ce5c4bd72ddcf7022f42bd8cfc9e90 Mon Sep 17 00:00:00 2001
|
||||
From 53886d75a93ee1747d84187a0498abcf6cebd210 Mon Sep 17 00:00:00 2001
|
||||
From: Chris Leech <cleech@redhat.com>
|
||||
Date: Mon, 21 Jan 2013 15:43:36 -0800
|
||||
Subject: [PATCH 1/1] use Red Hat version string to match RPM package version
|
||||
@ -8,7 +8,7 @@ Subject: [PATCH 1/1] use Red Hat version string to match RPM package version
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/usr/version.h b/usr/version.h
|
||||
index 3c68989..31b6f05 100644
|
||||
index 3c68989..8af23a4 100644
|
||||
--- a/usr/version.h
|
||||
+++ b/usr/version.h
|
||||
@@ -6,7 +6,7 @@
|
||||
@ -16,10 +16,10 @@ index 3c68989..31b6f05 100644
|
||||
* some other maintainer could merge a patch without going through us
|
||||
*/
|
||||
-#define ISCSI_VERSION_STR "2.1.4"
|
||||
+#define ISCSI_VERSION_STR "6.2.1.4-1"
|
||||
+#define ISCSI_VERSION_STR "6.2.1.4"
|
||||
#define ISCSI_VERSION_FILE "/sys/module/scsi_transport_iscsi/version"
|
||||
|
||||
#endif
|
||||
--
|
||||
2.31.1
|
||||
2.26.3
|
||||
|
||||
|
||||
@ -1,42 +0,0 @@
|
||||
From b9bf7cea4769efa73e6de9b13a8d1833d2ac3d92 Mon Sep 17 00:00:00 2001
|
||||
From: Chris Leech <cleech@redhat.com>
|
||||
Date: Wed, 16 Jun 2021 09:55:06 -0700
|
||||
Subject: [PATCH 1/1] iscsistart: fix null pointer deref before exit
|
||||
|
||||
Fixes regression caused by "open-iscsi: Clean user_param list when
|
||||
process exit" Which is a shame, as not freeing a memory at process exit
|
||||
doesn't really hurt anything.
|
||||
|
||||
Same change as "Fix iscsiadm segfault when exiting" applied to iscsiadm.
|
||||
|
||||
Fixes: b532ad67d495d42026165a26515c645995d23f18
|
||||
Signed-off-by: Chris Leech <cleech@redhat.com>
|
||||
---
|
||||
usr/iscsistart.c | 4 ++--
|
||||
1 file changed, 2 insertions(+), 2 deletions(-)
|
||||
|
||||
diff --git a/usr/iscsistart.c b/usr/iscsistart.c
|
||||
index 206cd4c..7eb573e 100644
|
||||
--- a/usr/iscsistart.c
|
||||
+++ b/usr/iscsistart.c
|
||||
@@ -361,7 +361,7 @@ int main(int argc, char *argv[])
|
||||
struct boot_context *context, boot_context;
|
||||
struct sigaction sa_old;
|
||||
struct sigaction sa_new;
|
||||
- struct user_param *param;
|
||||
+ struct user_param *param, *tmp_param;
|
||||
int control_fd, mgmt_ipc_fd, err;
|
||||
pid_t pid;
|
||||
|
||||
@@ -556,7 +556,7 @@ int main(int argc, char *argv[])
|
||||
mgmt_ipc_close(mgmt_ipc_fd);
|
||||
free_initiator();
|
||||
sysfs_cleanup();
|
||||
- list_for_each_entry(param, &user_params, list) {
|
||||
+ list_for_each_entry_safe(param, tmp_param, &user_params, list) {
|
||||
list_del(¶m->list);
|
||||
idbm_free_user_param(param);
|
||||
}
|
||||
--
|
||||
2.31.1
|
||||
|
||||
68
SOURCES/0024-minor-service-file-updates.patch
Normal file
68
SOURCES/0024-minor-service-file-updates.patch
Normal file
@ -0,0 +1,68 @@
|
||||
From b8c6c1f3bed0e5fcc0d02c56834fa60850a11b5f Mon Sep 17 00:00:00 2001
|
||||
From: Chris Leech <cleech@redhat.com>
|
||||
Date: Thu, 18 Feb 2021 14:04:32 -0800
|
||||
Subject: [PATCH 1/1] minor service file updates
|
||||
|
||||
Intended use is with system presets to enable the following:
|
||||
iscsi.service - login of automatic node records
|
||||
iscsid.socket - start iscsid as needed for all iSCSI sessions
|
||||
iscsiuio.socket - start iscsiuio as needed for bnx2i or qedi
|
||||
iscsi-onboot.service - special handling of initramfs sessions
|
||||
|
||||
The following are started automatically as needed:
|
||||
iscsid.service - needed for all iSCSI sessions
|
||||
iscsiuio.service - needed for bnx2i or qedi offload
|
||||
iscsi-init.service - create an iSCSI name if missing before starting iscsid
|
||||
iscsi-shutdown.service - ensure all non-boot sessions logout at shutdown
|
||||
---
|
||||
etc/systemd/iscsi-init.service | 1 +
|
||||
etc/systemd/iscsi.service | 2 +-
|
||||
etc/systemd/iscsid.service | 3 +--
|
||||
3 files changed, 3 insertions(+), 3 deletions(-)
|
||||
|
||||
diff --git a/etc/systemd/iscsi-init.service b/etc/systemd/iscsi-init.service
|
||||
index e058ff0..c3370ec 100644
|
||||
--- a/etc/systemd/iscsi-init.service
|
||||
+++ b/etc/systemd/iscsi-init.service
|
||||
@@ -1,6 +1,7 @@
|
||||
[Unit]
|
||||
Description=One time configuration for iscsi.service
|
||||
ConditionPathExists=!/etc/iscsi/initiatorname.iscsi
|
||||
+Before=iscsid.service
|
||||
|
||||
[Service]
|
||||
Type=oneshot
|
||||
diff --git a/etc/systemd/iscsi.service b/etc/systemd/iscsi.service
|
||||
index 175cb2c..6c542d2 100644
|
||||
--- a/etc/systemd/iscsi.service
|
||||
+++ b/etc/systemd/iscsi.service
|
||||
@@ -4,7 +4,7 @@ Documentation=man:iscsiadm(8) man:iscsid(8)
|
||||
DefaultDependencies=no
|
||||
Before=remote-fs-pre.target
|
||||
After=network.target network-online.target iscsid.service iscsiuio.service systemd-remount-fs.service
|
||||
-Wants=remote-fs-pre.target iscsi-shutdown.service
|
||||
+Wants=remote-fs-pre.target
|
||||
ConditionDirectoryNotEmpty=/var/lib/iscsi/nodes
|
||||
|
||||
[Service]
|
||||
diff --git a/etc/systemd/iscsid.service b/etc/systemd/iscsid.service
|
||||
index 324c593..df0bd83 100644
|
||||
--- a/etc/systemd/iscsid.service
|
||||
+++ b/etc/systemd/iscsid.service
|
||||
@@ -4,7 +4,7 @@ Documentation=man:iscsid(8) man:iscsiuio(8) man:iscsiadm(8)
|
||||
DefaultDependencies=no
|
||||
After=network-online.target iscsiuio.service iscsi-init.service
|
||||
Before=remote-fs-pre.target
|
||||
-Requires=iscsi-init.service
|
||||
+Requires=iscsi-init.service iscsi-shutdown.service
|
||||
|
||||
[Service]
|
||||
Type=notify
|
||||
@@ -15,4 +15,3 @@ Restart=on-failure
|
||||
|
||||
[Install]
|
||||
WantedBy=multi-user.target
|
||||
-Also=iscsid.socket
|
||||
--
|
||||
2.26.3
|
||||
|
||||
@ -1,22 +1,17 @@
|
||||
%global open_iscsi_version 2.1
|
||||
%global open_iscsi_build 4
|
||||
%global commit0 095f59ca464220eae285de6b5f2ee31185a6a84c
|
||||
%global commit0 2a8f9d81d0d6b5094c3fe9c686e2afb2ec27058a
|
||||
%global shortcommit0 %(c=%{commit0}; echo ${c:0:7})
|
||||
|
||||
%if 0%{?rhel} > 7
|
||||
# Disable python2 build by default
|
||||
%bcond_with python2
|
||||
%else
|
||||
%bcond_without python2
|
||||
%endif
|
||||
|
||||
Summary: iSCSI daemon and utility programs
|
||||
Name: iscsi-initiator-utils
|
||||
Version: 6.%{open_iscsi_version}.%{open_iscsi_build}
|
||||
Release: 8.git%{shortcommit0}%{?dist}
|
||||
Group: System Environment/Daemons
|
||||
Release: 2.git%{shortcommit0}%{?dist}
|
||||
License: GPLv2+
|
||||
URL: http://www.open-iscsi.org
|
||||
URL: https://github.com/open-iscsi/open-iscsi
|
||||
Source0: https://github.com/open-iscsi/open-iscsi/archive/%{commit0}.tar.gz#/open-iscsi-%{shortcommit0}.tar.gz
|
||||
Source4: 04-iscsi
|
||||
Source5: iscsi-tmpfiles.conf
|
||||
@ -44,7 +39,8 @@ Patch0020: 0020-fix-upstream-build-breakage-of-iscsiuio-LDFLAGS.patch
|
||||
Patch0021: 0021-use-Red-Hat-version-string-to-match-RPM-package-vers.patch
|
||||
Patch0022: 0022-iscsi_if.h-replace-zero-length-array-with-flexible-a.patch
|
||||
Patch0023: 0023-stop-using-Werror-for-now.patch
|
||||
Patch0024: 0024-iscsistart-fix-null-pointer-deref-before-exit.patch
|
||||
Patch0024: 0024-minor-service-file-updates.patch
|
||||
Patch0025: 0001-Remove-dependences-from-iscsi-init.service.patch
|
||||
|
||||
BuildRequires: flex bison doxygen kmod-devel systemd-units
|
||||
BuildRequires: autoconf automake libtool libmount-devel openssl-devel
|
||||
@ -67,30 +63,8 @@ as well as the utility programs used to manage it. iSCSI is a protocol
|
||||
for distributed disk access using SCSI commands sent over Internet
|
||||
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
|
||||
Summary: Userspace configuration daemon required for some iSCSI hardware
|
||||
Group: System Environment/Daemons
|
||||
License: BSD
|
||||
Requires: %{name} = %{version}-%{release}
|
||||
|
||||
@ -100,7 +74,6 @@ for some iSCSI offload hardware.
|
||||
|
||||
%package devel
|
||||
Summary: Development files for %{name}
|
||||
Group: Development/Libraries
|
||||
Requires: %{name} = %{version}-%{release}
|
||||
|
||||
%description devel
|
||||
@ -111,7 +84,6 @@ developing applications that use %{name}.
|
||||
%package -n python2-%{name}
|
||||
%{?python_provide:%python_provide python2-%{name}}
|
||||
Summary: Python %{python2_version} bindings to %{name}
|
||||
Group: Development/Libraries
|
||||
Requires: %{name} = %{version}-%{release}
|
||||
BuildRequires: python2-devel
|
||||
BuildRequires: python2-setuptools
|
||||
@ -125,10 +97,10 @@ libiscsi interface for interacting with %{name}
|
||||
%package -n python3-%{name}
|
||||
%{?python_provide:%python_provide python3-%{name}}
|
||||
Summary: Python %{python3_version} bindings to %{name}
|
||||
Group: Development/Libraries
|
||||
Requires: %{name} = %{version}-%{release}
|
||||
BuildRequires: python3-devel
|
||||
BuildRequires: python3-setuptools
|
||||
BuildRequires: make
|
||||
|
||||
%description -n python3-%{name}
|
||||
The %{name}-python3 package contains Python %{python3_version} bindings to the
|
||||
@ -141,6 +113,8 @@ libiscsi interface for interacting with %{name}
|
||||
%{__sed} -i -e 's|^exec_prefix = /$|exec_prefix = %{_exec_prefix}|' Makefile
|
||||
|
||||
%build
|
||||
# avoid undefined references linking failures
|
||||
%undefine _ld_as_needed
|
||||
|
||||
# configure sub-packages from here
|
||||
# letting the top level Makefile do it will lose setting from rpm
|
||||
@ -187,7 +161,7 @@ touch $RPM_BUILD_ROOT%{_rundir}/lock/iscsi/lock
|
||||
|
||||
%{__install} -d $RPM_BUILD_ROOT%{_unitdir}
|
||||
%{__install} -pm 644 etc/systemd/iscsi.service $RPM_BUILD_ROOT%{_unitdir}
|
||||
# %%{__install} -pm 644 etc/systemd/iscsi-init.service $RPM_BUILD_ROOT%%{_unitdir}
|
||||
%{__install} -pm 644 etc/systemd/iscsi-init.service $RPM_BUILD_ROOT%{_unitdir}
|
||||
%{__install} -pm 644 etc/systemd/iscsi-onboot.service $RPM_BUILD_ROOT%{_unitdir}
|
||||
%{__install} -pm 644 etc/systemd/iscsi-shutdown.service $RPM_BUILD_ROOT%{_unitdir}
|
||||
%{__install} -pm 644 etc/systemd/iscsid.service $RPM_BUILD_ROOT%{_unitdir}
|
||||
@ -225,37 +199,20 @@ popd
|
||||
|
||||
|
||||
%post
|
||||
/sbin/ldconfig
|
||||
%systemd_post iscsi.service iscsid.service iscsid.socket iscsi-onboot.service iscsi-init.service iscsi-shutdown.service
|
||||
|
||||
%systemd_post iscsi.service iscsi-onboot.service iscsi-shutdown.service iscsid.service iscsid.socket
|
||||
%preun
|
||||
%systemd_preun iscsi.service iscsid.service iscsid.socket iscsi-onboot.service iscsi-init.service iscsi-shutdown.service
|
||||
|
||||
if [ $1 -eq 1 ]; then
|
||||
if [ ! -f %{_sysconfdir}/iscsi/initiatorname.iscsi ]; then
|
||||
echo "InitiatorName=`/usr/sbin/iscsi-iname`" > %{_sysconfdir}/iscsi/initiatorname.iscsi
|
||||
fi
|
||||
# enable socket activation and persistant session startup by default
|
||||
/bin/systemctl enable iscsi.service >/dev/null 2>&1 || :
|
||||
/bin/systemctl enable iscsi-onboot.service >/dev/null 2>&1 || :
|
||||
/bin/systemctl enable iscsid.socket >/dev/null 2>&1 || :
|
||||
fi
|
||||
%postun
|
||||
%systemd_postun iscsi.service iscsid.service iscsid.socket iscsi-onboot.service iscsi-init.service iscsi-shutdown.service
|
||||
|
||||
%post iscsiuio
|
||||
%systemd_post iscsiuio.service iscsiuio.socket
|
||||
|
||||
if [ $1 -eq 1 ]; then
|
||||
/bin/systemctl enable iscsiuio.socket >/dev/null 2>&1 || :
|
||||
fi
|
||||
|
||||
%preun
|
||||
%systemd_preun iscsi.service iscsi-onboot.service iscsi-shutdown.service iscsid.service iscsiuio.service iscsid.socket iscsiuio.socket
|
||||
|
||||
%preun iscsiuio
|
||||
%systemd_preun iscsiuio.service iscsiuio.socket
|
||||
|
||||
%postun
|
||||
/sbin/ldconfig
|
||||
%systemd_postun iscsi.service iscsi-onboot.service iscsi-shutdown.service iscsid.service iscsiuio.service iscsid.socket iscsiuio.socket
|
||||
|
||||
%postun iscsiuio
|
||||
%systemd_postun iscsiuio.service iscsiuio.socket
|
||||
|
||||
@ -284,11 +241,6 @@ if [ $1 -gt 0 ]; then
|
||||
systemctl start iscsi-shutdown.service >/dev/null 2>&1 || :
|
||||
fi
|
||||
|
||||
%triggerpostun -- iscsi-initiator-utils < 6.2.0.878-4
|
||||
# added in 6.2.0.878-0, needs to be enabled during an upgrade
|
||||
if [ $1 -gt 0 ]; then
|
||||
/bin/systemctl enable iscsi-onboot.service >/dev/null 2>&1 || :
|
||||
fi
|
||||
|
||||
%files
|
||||
%doc README
|
||||
@ -299,11 +251,11 @@ fi
|
||||
%dir %{_sharedstatedir}/iscsi/slp
|
||||
%dir %{_sharedstatedir}/iscsi/ifaces
|
||||
%dir %{_sharedstatedir}/iscsi/send_targets
|
||||
%ghost %attr(0700, -, -) %{_rundir}/lock/iscsi
|
||||
%ghost %attr(0600, -, -) %{_rundir}/lock/iscsi/lock
|
||||
%ghost %attr(0700, root, root) %{_rundir}/lock/iscsi
|
||||
%ghost %attr(0600, root, root) %{_rundir}/lock/iscsi/lock
|
||||
%{_unitdir}/iscsi.service
|
||||
%{_unitdir}/iscsi-onboot.service
|
||||
# %%{_unitdir}/iscsi-init.service
|
||||
%{_unitdir}/iscsi-init.service
|
||||
%{_unitdir}/iscsi-shutdown.service
|
||||
%{_unitdir}/iscsid.service
|
||||
%{_unitdir}/iscsid.socket
|
||||
@ -321,26 +273,7 @@ fi
|
||||
%{_mandir}/man8/iscsiadm.8.gz
|
||||
%{_mandir}/man8/iscsid.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_node.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
|
||||
%{_sbindir}/iscsiuio
|
||||
@ -353,6 +286,13 @@ fi
|
||||
%doc libiscsi/html
|
||||
%{_libdir}/libiscsi.so
|
||||
%{_includedir}/libiscsi.h
|
||||
%{_libdir}/libopeniscsiusr.so
|
||||
%{_includedir}/libopeniscsiusr.h
|
||||
%{_includedir}/libopeniscsiusr_common.h
|
||||
%{_includedir}/libopeniscsiusr_iface.h
|
||||
%{_includedir}/libopeniscsiusr_node.h
|
||||
%{_includedir}/libopeniscsiusr_session.h
|
||||
%{_libdir}/pkgconfig/libopeniscsiusr.pc
|
||||
|
||||
%if %{with python2}
|
||||
%files -n python2-%{name}
|
||||
@ -364,63 +304,95 @@ fi
|
||||
%{python3_sitearch}/*
|
||||
|
||||
%changelog
|
||||
* Thu Jun 15 2023 Chris Leech <cleech@redhat.com> - 6.2.1.4-8.git095f59c
|
||||
- fix gating test
|
||||
* Mon Nov 01 2021 Chris Leech <cleech@redhat.com> - 6.2.1.4-2.git2a8f9d8
|
||||
- 2016482: iscsi-init.service modified to work in initramfs
|
||||
|
||||
* Thu Jun 15 2023 Chris Leech <cleech@redhat.com> - 6.2.1.4-7.git095f59c
|
||||
- move tests to tmt framework
|
||||
* Wed Aug 11 2021 Chris Leech <cleech@redhat.com> - 6.2.1.4-1.git2a8f9d8
|
||||
- new upstream
|
||||
- iscsiuio fixes for newer upstream bnx2x driver having version removed
|
||||
|
||||
* Tue Jun 13 2023 Chris Leech <cleech@redhat.com> - 6.2.1.4-6.git095f59c
|
||||
- restore missing gating tests
|
||||
* Mon Aug 09 2021 Mohan Boddu <mboddu@redhat.com> - 6.2.1.2-8.gita8fcb37
|
||||
- Rebuilt for IMA sigs, glibc 2.34, aarch64 flags
|
||||
Related: rhbz#1991688
|
||||
|
||||
* Wed Jun 07 2023 Chris Leech <cleech@redhat.com> - 6.2.1.4-5.git095f59c
|
||||
- 2131090 fix idbm patch to not overwrite upstream changes in file mode
|
||||
* Wed Jun 16 2021 Mohan Boddu <mboddu@redhat.com> - 6.2.1.2-7.gita8fcb37
|
||||
- Rebuilt for RHEL 9 BETA for openssl 3.0
|
||||
Related: rhbz#1971065
|
||||
|
||||
* Mon Aug 09 2021 Chris Leech <cleech@redhat.com> - 6.2.1.4-4.git095f59c
|
||||
- 1755907 set proper attr in rpm db for lockfiles, fixes rpm verificiation warning
|
||||
* Fri Apr 16 2021 Mohan Boddu <mboddu@redhat.com> - 6.2.1.2-6.gita8fcb37
|
||||
- Rebuilt for RHEL 9 BETA on Apr 15th 2021. Related: rhbz#1947937
|
||||
|
||||
* Wed Jun 16 2021 Chris Leech <cleech@redhat.com> - 6.2.1.4-3.git095f59c
|
||||
- coverity found a use-after-free regression in iscsistart
|
||||
* Thu Feb 18 2021 Chris Leech <cleech@redhat.com> - 6.2.1.2-5.gita8fcb37
|
||||
- unit file changes
|
||||
|
||||
* Mon Jun 14 2021 Chris Leech <cleech@redhat.com> - 6.2.1.4-2.git095f59c
|
||||
- 1924768 fix unit files for el8, not using iscsi-init
|
||||
* Tue Jan 26 2021 Fedora Release Engineering <releng@fedoraproject.org> - 6.2.1.2-4.gita8fcb37
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
|
||||
|
||||
* Fri Mar 12 2021 Chris Leech <cleech@redhat.com> - 6.2.1.2-1.gita8fcb37
|
||||
- 1924768 iscsiadm -m sessions fails when racing against session login/logout
|
||||
* Thu Nov 05 2020 Chris Leech <cleech@redhat.com> - 6.2.1.2-3.gita8fcb37
|
||||
- add libopeniscsiusr content to iscsi-initiator-utils-devel
|
||||
|
||||
* Thu Aug 20 2020 Chris Leech - 6.2.0.878-5.gitd791ce0
|
||||
- 1849931, 1869438 go back to MD5 CHAP only by default
|
||||
new CHAP modes can cause issue with some targets,
|
||||
so SHA1/SHA256/SHA3-256 modes must be configured to enable now
|
||||
* Mon Sep 21 2020 Chris Leech <cleech@redhat.com> - 6.2.1.2-1.git13e7f58
|
||||
- iscsiadm overflow regression when discovering many targets at once
|
||||
- check for invalid session id during stop connection
|
||||
- add ability to attempt target logins asynchronously
|
||||
|
||||
* Tue Mar 24 2020 Chris Leech <cleech@redhat.com> - 6.2.0.878-3.gitd791ce0
|
||||
- 1801577 new service file not enabled on upgrade, spec change to use triggers for that
|
||||
* Tue Aug 11 2020 Christian Glombek <cglombek@redhat.com> - 6.2.1.2-0.git802688d
|
||||
- Update to upstream v2.1.2
|
||||
- Remove systemctl enable calls, as this is now handled by Fedora presets
|
||||
- per the guidelines
|
||||
- Remove initiator name generation, as this is now handled by an init service
|
||||
- Install ghost lockfile and dir to /run instead of /var
|
||||
- Rebased/fixed up patches
|
||||
- Fixed macros in comments and comments after macros
|
||||
- Merged service-file-tweaks.patch and
|
||||
- improve-systemd-service-files-for-boot-session-handl.patch
|
||||
- into unit-file-tweaks.patch
|
||||
- Fixes: https://bugzilla.redhat.com/show_bug.cgi?id=1493296
|
||||
- Fixes: https://bugzilla.redhat.com/show_bug.cgi?id=1729740
|
||||
- Fixes: https://bugzilla.redhat.com/show_bug.cgi?id=1834509
|
||||
|
||||
* Mon Feb 17 2020 Chris Leech <cleech@redhat.com> - 6.2.0.878-3.gitd791ce0
|
||||
- 1801577 missing spec file changes from 6.2.0.878-0 causing iSCSI boot regression
|
||||
* Tue Jul 28 2020 Fedora Release Engineering <releng@fedoraproject.org> - 6.2.1.1-0.gitac87641.2
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
|
||||
|
||||
* Mon Jan 20 2020 Chris Leech <cleech@redhat.com> - 6.2.0.878-2.gitd791ce0
|
||||
- 1786015 fix IPv6 discovery regression in iscsiuio
|
||||
* Tue May 26 2020 Miro Hrončok <mhroncok@redhat.com> - 6.2.1.1-0.gitac87641.1
|
||||
- Rebuilt for Python 3.9
|
||||
|
||||
* Wed Jan 08 2020 Chris Leech <cleech@redhat.com> - 6.2.0.878-1.gitd791ce0
|
||||
- 1788233 added node.session.auth.chap_algs configuration setting
|
||||
* Mon Mar 02 2020 Chris Leech <cleech@redhat.com> - 6.2.1.1-0.gitac87641
|
||||
- rebase to new upstream v2.1.1
|
||||
- enhanced CHAP options are now a configuration to deal with broken targets (#1774746)
|
||||
|
||||
* Thu Nov 07 2019 Chris Leech <cleech@redhat.com> - 6.2.0.878-0.gitd791ce0
|
||||
- 1761940 iSCSI CHAP authentication not function with FIPS enabled
|
||||
- Service file improvements forward ported from RHEL 7.8
|
||||
- various static analysis fixes from upstream
|
||||
* Sun Mar 01 2020 Adam Williamson <awilliam@redhat.com> - 6.2.1.0-2.git4440e57
|
||||
- Backport upstream d3daa7a2 to fix bz #1774746
|
||||
|
||||
* Wed Jun 05 2019 Chris Leech <cleech@redhat.com> - 6.2.0.877-1.gitf71581b
|
||||
- fix Covscan reported issues from upstream patches
|
||||
* Mon Feb 24 2020 Than Ngo <than@redhat.com> - 6.2.1.0-1.git4440e57
|
||||
- upstream patch to support gcc -fno-common option
|
||||
|
||||
* Tue Jun 04 2019 Chris Leech <cleech@redhat.com> - 6.2.0.877-0.gitf71581b
|
||||
- 1665317 update to latest upstream for iscsiuio enhancements
|
||||
* Wed Jan 29 2020 Fedora Release Engineering <releng@fedoraproject.org> - 6.2.1.0-0.git4440e57.1
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
|
||||
|
||||
* Thu Feb 21 2019 Chris Leech <cleech@redhat.com> - 6.2.0.876-7.gitf3c8e90
|
||||
- 1647826: fix sysfs and output format regressions in libopeniscsi code
|
||||
* Tue Nov 19 2019 Chris Leech <cleech@redhat.com> - 6.2.1.0-0.git4440e57
|
||||
- update to upstream v2.1.0
|
||||
|
||||
* Thu Jan 03 2019 Chris Leech <cleech@redhat.com> - 6.2.0.876-6.gitf3c8e90
|
||||
- 1650402: fix missing space in node display output
|
||||
* Thu Aug 22 2019 Lubomir Rintel <lkundrak@v3.sk> - 6.2.0.876-12.gitf3c8e90
|
||||
- Move the NetworkManager dispatcher script out of /etc
|
||||
|
||||
* Mon Aug 19 2019 Miro Hrončok <mhroncok@redhat.com> - 6.2.0.876-11.gitf3c8e90
|
||||
- Rebuilt for Python 3.8
|
||||
|
||||
* Thu Jul 25 2019 Fedora Release Engineering <releng@fedoraproject.org> - 6.2.0.876-10.gitf3c8e90
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
|
||||
|
||||
* Thu May 30 2019 Chris Leech <cleech@redhat.com> - 6.2.0.876-9.gitf3c8e90
|
||||
- FTBFS: %%systemd_postun scriptlets need service files as an argument
|
||||
|
||||
* Tue Feb 12 2019 Igor Gnatenko <ignatenkobrain@fedoraproject.org> - 6.2.0.876-8.gitf3c8e90
|
||||
- Remove obsolete scriptlets
|
||||
|
||||
* Fri Feb 01 2019 Fedora Release Engineering <releng@fedoraproject.org> - 6.2.0.876-7.gitf3c8e90
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
|
||||
|
||||
* Thu Jan 10 2019 Miro Hrončok <mhroncok@redhat.com> - 6.2.0.876-6.gitf3c8e90
|
||||
- Disable python2 build
|
||||
|
||||
* Tue Jul 10 2018 Chris Leech <cleech@redhat.com> - 6.2.0.876-5.gitf3c8e90
|
||||
- iscsiuio: add mutex to protect netlink buffer for pass-through xmit
|
||||
@ -439,6 +411,7 @@ fi
|
||||
* 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)
|
||||
- Conditionalize the python2 subpackage [Charalampos Stratakis <cstratak@redhat.com>]
|
||||
|
||||
* Tue Jun 19 2018 Chris Leech <cleech@redhat.com> - 6.2.0.876-1.git24580ad
|
||||
- rebase to upstream 2.0.876
|
||||
@ -446,9 +419,6 @@ fi
|
||||
* Tue Jun 19 2018 Miro Hrončok <mhroncok@redhat.com> - 6.2.0.874-10.git86e8892
|
||||
- Rebuilt for Python 3.7
|
||||
|
||||
* Mon May 28 2018 Charalampos Stratakis <cstratak@redhat.com> - 6.2.0.874-10.git86e8892
|
||||
- Conditionalize the python2 subpackage
|
||||
|
||||
* Wed Feb 07 2018 Fedora Release Engineering <releng@fedoraproject.org> - 6.2.0.874-9.git86e8892
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild
|
||||
|
||||
|
||||
Loading…
Reference in New Issue
Block a user