[packages/open-iscsi] - updated to 2.1.7, adjusted patches
qboosh
qboosh at pld-linux.org
Thu May 19 06:37:11 CEST 2022
commit e621921b91ef836f1021678878e738af997b7d87
Author: Jakub Bogusz <qboosh at pld-linux.org>
Date: Thu May 19 06:37:48 2022 +0200
- updated to 2.1.7, adjusted patches
...emove-dependences-from-iscsi-init.service.patch | 28 --------------
0001-unit-file-tweaks.patch | 30 +++++++--------
0005-update-initscripts-and-docs.patch | 36 +++++++++---------
0008-libiscsi.patch | 34 +++++++++--------
...libiscsi-fix-build-to-use-libopeniscsiusr.patch | 9 ++---
...i-fix-build-against-latest-upstream-again.patch | 8 ++--
...stream-build-breakage-of-iscsiuio-LDFLAGS.patch | 25 -------------
0023-stop-using-Werror-for-now.patch | 10 ++---
0024-minor-service-file-updates.patch | 24 ++++++------
open-iscsi-libiscsi.patch | 12 +++---
open-iscsi-systemd.patch | 43 ++++++++--------------
open-iscsi.spec | 22 +++++++----
12 files changed, 111 insertions(+), 170 deletions(-)
---
diff --git a/open-iscsi.spec b/open-iscsi.spec
index 1bc271d..cbabe7f 100644
--- a/open-iscsi.spec
+++ b/open-iscsi.spec
@@ -6,13 +6,13 @@
Summary: iSCSI - SCSI over IP
Summary(pl.UTF-8): iSCSI - SCSI po IP
Name: open-iscsi
-Version: 2.1.4
+Version: 2.1.7
Release: 1
License: GPL v2
Group: Networking/Daemons
#Source0Download: https://github.com/open-iscsi/open-iscsi/releases
Source0: https://github.com/open-iscsi/open-iscsi/archive/%{version}/%{name}-%{version}.tar.gz
-# Source0-md5: e17f1924c1d64342773eae630e15c519
+# Source0-md5: 87f37b0968ff91ed0253d53d497da4cb
Source1: %{name}.init
Source2: %{name}.sysconfig
Source3: %{name}-devices.init
@@ -33,12 +33,12 @@ Patch15: 0015-remove-the-offload-boot-supported-ifdef.patch
Patch16: 0016-Revert-iscsiadm-return-error-when-login-fails.patch
# dont-install-scripts, use-var-lib-iscsi-in-libopeniscsiusr skipped
Patch19: 0019-Coverity-scan-fixes.patch
-Patch20: 0020-fix-upstream-build-breakage-of-iscsiuio-LDFLAGS.patch
+# fix-upstream-build-breakage-of-iscsiuio-LDFLAGS obsolete in 2.1.7
# use-Red-Hat-version-string-to-match-RPM-package-vers skipped
Patch22: 0022-iscsi_if.h-replace-zero-length-array-with-flexible-a.patch
Patch23: 0023-stop-using-Werror-for-now.patch
Patch24: 0024-minor-service-file-updates.patch
-Patch25: 0001-Remove-dependences-from-iscsi-init.service.patch
+# Remove-dependences-from-iscsi-init.service obsolete in 2.1.7
# PLD specific
Patch100: %{name}-systemd.patch
Patch101: %{name}-libiscsi.patch
@@ -139,11 +139,9 @@ Interfejs Pythona 3 do biblioteki Open-iSCSI.
%patch15 -p1
%patch16 -p1
%patch19 -p1
-%patch20 -p1
%patch22 -p1
%patch23 -p1
%patch24 -p1
-%patch25 -p1
%patch100 -p1
%patch101 -p1
@@ -178,15 +176,18 @@ install -d $RPM_BUILD_ROOT%{_sysconfdir}/iscsi/{nodes,send_targets,static,isns,s
$RPM_BUILD_ROOT%{systemdunitdir} \
$RPM_BUILD_ROOT{/sbin,/lib/systemd/pld-helpers.d}
-%{__make} -j1 install_programs install_doc install_etc install_libopeniscsiusr \
- DESTDIR=$RPM_BUILD_ROOT
+%{__make} -j1 install_programs install_doc install_etc install_libopeniscsiusr install_iscsiuio \
+ DESTDIR=$RPM_BUILD_ROOT \
+ RULESDIR=/lib/udev/rules.d
:> $RPM_BUILD_ROOT%{_sysconfdir}/iscsi/initiatorname.iscsi
install %{SOURCE1} $RPM_BUILD_ROOT/etc/rc.d/init.d/iscsid
cp -p %{SOURCE2} $RPM_BUILD_ROOT/etc/sysconfig/iscsi
install %{SOURCE3} $RPM_BUILD_ROOT/etc/rc.d/init.d/iscsi
+# or use upstream file instead?
cp -p %{SOURCE4} $RPM_BUILD_ROOT/etc/logrotate.d/iscsiuio
+%{__rm} $RPM_BUILD_ROOT/etc/logrotate.d/iscsiuiolog
install usr/iscsistart $RPM_BUILD_ROOT%{_sbindir}
cp -p doc/iscsistart.8 $RPM_BUILD_ROOT%{_mandir}/man8
@@ -272,6 +273,7 @@ fi
%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) /etc/logrotate.d/iscsiuio
%attr(754,root,root) /etc/rc.d/init.d/iscsi
%attr(754,root,root) /etc/rc.d/init.d/iscsid
+/lib/udev/rules.d/50-iscsi-firmware-login.rules
%{systemdunitdir}/iscsi.service
%{systemdunitdir}/iscsi-init.service
%{systemdunitdir}/iscsi-onboot.service
@@ -281,6 +283,7 @@ fi
%{systemdunitdir}/iscsiuio.service
%{systemdunitdir}/iscsiuio.socket
%attr(755,root,root) /lib/systemd/pld-helpers.d/iscsi-mark-root-nodes
+%attr(755,root,root) %{_sbindir}/brcm_iscsiuio
%attr(755,root,root) %{_sbindir}/iscsi-gen-initiatorname
%attr(755,root,root) %{_sbindir}/iscsi-iname
%attr(755,root,root) %{_sbindir}/iscsi_discovery
@@ -290,6 +293,7 @@ fi
%attr(755,root,root) %{_sbindir}/iscsid
%attr(755,root,root) %{_sbindir}/iscsistart
%attr(755,root,root) %{_sbindir}/iscsiuio
+%{_mandir}/man8/iscsi-gen-initiatorname.8*
%{_mandir}/man8/iscsi-iname.8*
%{_mandir}/man8/iscsi_discovery.8*
%{_mandir}/man8/iscsi_fw_login.8*
@@ -311,6 +315,8 @@ fi
%{_includedir}/libopeniscsi.h
%{_includedir}/libopeniscsiusr*.h
%{_pkgconfigdir}/libopeniscsiusr.pc
+%{_mandir}/man3/iscsi_*.3*
+%{_mandir}/man3/libopeniscsiusr.h.3*
%if %{with python2}
%files -n python-pyiscsi
diff --git a/0001-Remove-dependences-from-iscsi-init.service.patch b/0001-Remove-dependences-from-iscsi-init.service.patch
deleted file mode 100644
index 66c4cc4..0000000
--- a/0001-Remove-dependences-from-iscsi-init.service.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-From 432bbf979ee66ee29bb92e35fd6e3ffb948563e3 Mon Sep 17 00:00:00 2001
-From: Lee Duncan <lduncan at 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
-
diff --git a/0001-unit-file-tweaks.patch b/0001-unit-file-tweaks.patch
index 743dccd..b32e41e 100644
--- a/0001-unit-file-tweaks.patch
+++ b/0001-unit-file-tweaks.patch
@@ -99,8 +99,8 @@ index 0000000..caee933
+ExecStop=-/usr/sbin/iscsiadm -m node --logoutall=all
diff --git a/etc/systemd/iscsi.service b/etc/systemd/iscsi.service
index 5e394b9..175cb2c 100644
---- a/etc/systemd/iscsi.service
-+++ b/etc/systemd/iscsi.service
+--- a/etc/systemd/iscsi.service.template
++++ b/etc/systemd/iscsi.service.template
@@ -1,18 +1,18 @@
[Unit]
Description=Login and scanning of iSCSI devices
@@ -117,21 +117,21 @@ index 5e394b9..175cb2c 100644
[Service]
Type=oneshot
--ExecStart=/sbin/iscsiadm -m node --loginall=automatic -W
--ExecStop=/sbin/iscsiadm -m node --logoutall=automatic
--ExecStop=/sbin/iscsiadm -m node --logoutall=manual
+-ExecStart=@SBINDIR@/iscsiadm -m node --loginall=automatic -W
+-ExecStop=@SBINDIR@/iscsiadm -m node --logoutall=automatic
+-ExecStop=@SBINDIR@/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
++ExecStart=- at SBINDIR@/iscsiadm -m node --loginall=automatic
++ExecReload=- at SBINDIR@/iscsiadm -m node --loginall=automatic
+SuccessExitStatus=21
[Install]
WantedBy=remote-fs.target
diff --git a/etc/systemd/iscsid.service b/etc/systemd/iscsid.service
index 3fd7dd3..324c593 100644
---- a/etc/systemd/iscsid.service
-+++ b/etc/systemd/iscsid.service
+--- a/etc/systemd/iscsid.service.template
++++ b/etc/systemd/iscsid.service.template
@@ -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
@@ -142,15 +142,15 @@ index 3fd7dd3..324c593 100644
[Service]
Type=notify
NotifyAccess=main
--ExecStart=/sbin/iscsid -f
-+ExecStart=/usr/sbin/iscsid -f
+-ExecStart=@SBINDIR@/iscsid -f
++ExecStart=@SBINDIR@/iscsid -f
KillMode=mixed
Restart=on-failure
diff --git a/etc/systemd/iscsiuio.service b/etc/systemd/iscsiuio.service
index 923e019..fc0be93 100644
---- a/etc/systemd/iscsiuio.service
-+++ b/etc/systemd/iscsiuio.service
+--- a/etc/systemd/iscsiuio.service.template
++++ b/etc/systemd/iscsiuio.service.template
@@ -2,17 +2,15 @@
Description=iSCSI UserSpace I/O driver
Documentation=man:iscsiuio(8)
@@ -165,8 +165,8 @@ index 923e019..fc0be93 100644
[Service]
Type=notify
NotifyAccess=main
--ExecStart=/sbin/iscsiuio -f
-+ExecStart=/usr/sbin/iscsiuio -f
+-ExecStart=@SBINDIR@/iscsiuio -f
++ExecStart=@SBINDIR@/iscsiuio -f
KillMode=mixed
Restart=on-failure
diff --git a/0005-update-initscripts-and-docs.patch b/0005-update-initscripts-and-docs.patch
index 7d487a5..9736b5f 100644
--- a/0005-update-initscripts-and-docs.patch
+++ b/0005-update-initscripts-and-docs.patch
@@ -53,38 +53,36 @@ diff --git a/etc/iscsid.conf b/etc/iscsid.conf
index f21ed3d..420145b 100644
--- a/etc/iscsid.conf
+++ b/etc/iscsid.conf
-@@ -19,8 +19,8 @@
+@@ -19,7 +19,7 @@
# the time then leave this attribute commented out.
#
- # Default for Fedora and RHEL. (uncomment to activate).
+ # Default for Fedora and RHEL. Uncomment to activate.
-# iscsid.startup = /bin/systemctl start iscsid.socket iscsiuio.socket
--#
+iscsid.startup = /bin/systemctl start iscsid.socket iscsiuio.socket
-+#
- # Default if you are not using systemd (uncomment to activate)
- # iscsid.startup = /usr/bin/service start iscsid
+ #
+ # Default for Debian and Ubuntu. Uncomment to activate.
+ # iscsid.startup = /bin/systemctl start iscsid.socket
+@@ -42,10 +42,10 @@
+ #*****************
-@@ -41,8 +41,8 @@
- # To request that the iscsi initd scripts startup a session set to "automatic".
- # node.startup = automatic
+ # To request that the iscsi service scripts startup a session, use "automatic":
+-# node.startup = automatic
++node.startup = automatic
#
--# To manually startup the session set to "manual". The default is manual.
+ # To manually startup the session, use "manual". The default is manual.
-node.startup = manual
-+# To manually startup the session set to "manual". The default is automatic.
-+node.startup = automatic
++# node.startup = manual
# For "automatic" startup nodes, setting this to "Yes" will try logins on each
# available iface until one succeeds, and then stop. The default "No" will try
-@@ -271,28 +271,27 @@ node.conn[0].iscsi.MaxXmitDataSegmentLength = 0
- discovery.sendtargets.iscsi.MaxRecvDataSegmentLength = 32768
+@@ -279,28 +279,25 @@ discovery.sendtargets.iscsi.MaxRecvDataS
# To allow the targets to control the setting of the digest checking,
--# with the initiator requesting a preference of enabling the checking, uncomment# one or both of the following lines:
-+# with the initiator requesting a preference of enabling the checking, uncomment
-+# the following lines (Data digests are not supported.):
+ # with the initiator requesting a preference of enabling the checking,
+-# uncomment one or both of the following lines:
++# uncomment the following line (Data digests are not supported.):
#node.conn[0].iscsi.HeaderDigest = CRC32C,None
-#node.conn[0].iscsi.DataDigest = CRC32C,None
-+
#
# To allow the targets to control the setting of the digest checking,
# with the initiator requesting a preference of disabling the checking,
@@ -110,7 +108,7 @@ index f21ed3d..420145b 100644
+node.conn[0].iscsi.HeaderDigest = None
# 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
index f1e5c88..0f0f17a 100644
--- a/usr/idbm.c
diff --git a/0008-libiscsi.patch b/0008-libiscsi.patch
index 39d1a84..72a264e 100644
--- a/0008-libiscsi.patch
+++ b/0008-libiscsi.patch
@@ -48,28 +48,28 @@ diff --git a/Makefile b/Makefile
index 7b445a5..4ab091f 100644
--- a/Makefile
+++ b/Makefile
-@@ -65,6 +65,7 @@ user: iscsiuio/Makefile
- $(MAKE) -C usr
- $(MAKE) -C utils
- $(MAKE) -C iscsiuio
-+ $(MAKE) -C libiscsi
+@@ -56,6 +56,7 @@ user: iscsiuio/Makefile
+ $(MAKE) $(MFLAGS) -C utils
+ $(MAKE) $(MFLAGS) -C etc
+ $(MAKE) $(MFLAGS) -C iscsiuio
++ $(MAKE) $(MFLAGS) -C libiscsi
+ $(MAKE) $(MFLAGS) -C doc
@echo
@echo "Compilation complete Output file"
- @echo "----------------------------------- ----------------"
-@@ -85,6 +86,7 @@ iscsiuio/configure iscsiuio/Makefile.in: iscsiuio/configure.ac iscsiuio/Makefile
+@@ -77,6 +78,7 @@ iscsiuio/configure: iscsiuio/configure.a
force: ;
clean:
-+ $(MAKE) -C libiscsi clean
- $(MAKE) -C utils/sysdeps clean
- $(MAKE) -C utils/fwparam_ibft clean
- $(MAKE) -C utils clean
++ $(MAKE) $(MFLAGS) -C libiscsi clean
+ $(MAKE) $(MFLAGS) -C utils/sysdeps clean
+ $(MAKE) $(MFLAGS) -C utils clean
+ $(MAKE) $(MFLAGS) -C usr clean
diff --git a/libiscsi/Makefile b/libiscsi/Makefile
new file mode 100644
index 0000000..53f9746
--- /dev/null
+++ b/libiscsi/Makefile
-@@ -0,0 +1,65 @@
+@@ -0,0 +1,67 @@
+# This Makefile will work only with GNU make.
+
+ifeq ($(TOPDIR),)
@@ -77,10 +77,12 @@ index 0000000..53f9746
+endif
+
+OSNAME=$(shell uname -s)
++etcdir = /etc
++DBROOT ?= $(etcdir)/iscsi
+OPTFLAGS ?= -O2 -g
+WARNFLAGS ?= -Wall -Wstrict-prototypes
+CFLAGS = $(OPTFLAGS) $(WARNFLAGS) -I../include -I../usr \
-+ -D$(OSNAME) -fPIC -D_GNU_SOURCE -fvisibility=hidden
++ -D$(OSNAME) -DISCSI_DB_ROOT=\"$(DBROOT)\" -fPIC -D_GNU_SOURCE -fvisibility=hidden
+LIB = libiscsi.so.0
+TESTS = tests/test_discovery_sendtargets tests/test_discovery_firmware
+TESTS += tests/test_login tests/test_logout tests/test_params
@@ -114,7 +116,7 @@ index 0000000..53f9746
+ mkdir -p usr-objs
+ $(CC) $(CFLAGS) -c $< -o $@
+
-+fw-objs/%.o: ../utils/fwparam_ibft/%.c
++fw-objs/%.o: ../usr/fwparam_ibft/%.c
+ mkdir -p fw-objs
+ $(CC) $(CFLAGS) -c $< -o $@
+
@@ -3917,15 +3919,15 @@ diff --git a/usr/Makefile b/usr/Makefile
index 21bb154..885243a 100644
--- a/usr/Makefile
+++ b/usr/Makefile
-@@ -37,7 +37,7 @@ PKG_CONFIG = /usr/bin/pkg-config
+@@ -46,7 +46,7 @@ PKG_CONFIG ?= /usr/bin/pkg-config
CFLAGS ?= -O2 -g
WARNFLAGS ?= -Wall -Wextra -Werror -Wstrict-prototypes -fno-common
CFLAGS += $(WARNFLAGS) -I../include -I. -D_GNU_SOURCE \
- -I$(TOPDIR)/libopeniscsiusr
+ -I$(TOPDIR)/libopeniscsiusr -DISNS_ENABLE
CFLAGS += $(shell $(PKG_CONFIG) --cflags libkmod)
+ CFLAGS += $(shell $(PKG_CONFIG) --cflags libsystemd)
ISCSI_LIB = -L$(TOPDIR)/libopeniscsiusr -lopeniscsiusr
- LDFLAGS += $(shell $(PKG_CONFIG) --libs libkmod)
diff --git a/usr/discovery.c b/usr/discovery.c
index 7dec696..2cf1838 100644
--- a/usr/discovery.c
diff --git a/0013-libiscsi-fix-build-to-use-libopeniscsiusr.patch b/0013-libiscsi-fix-build-to-use-libopeniscsiusr.patch
index 9b3c34b..80e6c01 100644
--- a/0013-libiscsi-fix-build-to-use-libopeniscsiusr.patch
+++ b/0013-libiscsi-fix-build-to-use-libopeniscsiusr.patch
@@ -11,18 +11,17 @@ diff --git a/libiscsi/Makefile b/libiscsi/Makefile
index 53f9746..f2cf248 100644
--- a/libiscsi/Makefile
+++ b/libiscsi/Makefile
-@@ -8,7 +8,9 @@ OSNAME=$(shell uname -s)
+@@ -10,7 +10,9 @@ DBROOT ?= $(etcdir)/iscsi
OPTFLAGS ?= -O2 -g
WARNFLAGS ?= -Wall -Wstrict-prototypes
CFLAGS = $(OPTFLAGS) $(WARNFLAGS) -I../include -I../usr \
-- -D$(OSNAME) -fPIC -D_GNU_SOURCE -fvisibility=hidden
-+ -D$(OSNAME) -fPIC -D_GNU_SOURCE -fvisibility=hidden \
-+ -I../libopeniscsiusr
++ -I../libopeniscsiusr \
+ -D$(OSNAME) -DISCSI_DB_ROOT=\"$(DBROOT)\" -fPIC -D_GNU_SOURCE -fvisibility=hidden
+LDFLAGS = -L../libopeniscsiusr -lopeniscsiusr
LIB = libiscsi.so.0
TESTS = tests/test_discovery_sendtargets tests/test_discovery_firmware
TESTS += tests/test_login tests/test_logout tests/test_params
-@@ -23,7 +25,7 @@ FW_PARAM_SRCS = fw_entry.o prom_lex.o prom_parse.tab.o fwparam_ppc.o fwparam_sys
+@@ -25,7 +27,7 @@ FW_PARAM_SRCS = fw_entry.o prom_lex.o pr
# sources shared with the userspace utils, note we build these separately
# to get PIC versions.
COMMON_OBJS = $(patsubst %.o, common-objs/%.o, $(COMMON_SRCS))
diff --git a/0014-libiscsi-fix-build-against-latest-upstream-again.patch b/0014-libiscsi-fix-build-against-latest-upstream-again.patch
index f9f8d07..df3323d 100644
--- a/0014-libiscsi-fix-build-against-latest-upstream-again.patch
+++ b/0014-libiscsi-fix-build-against-latest-upstream-again.patch
@@ -12,16 +12,16 @@ diff --git a/libiscsi/Makefile b/libiscsi/Makefile
index f2cf248..462d666 100644
--- a/libiscsi/Makefile
+++ b/libiscsi/Makefile
-@@ -10,7 +10,7 @@ WARNFLAGS ?= -Wall -Wstrict-prototypes
+@@ -12,7 +12,7 @@ WARNFLAGS ?= -Wall -Wstrict-prototypes
CFLAGS = $(OPTFLAGS) $(WARNFLAGS) -I../include -I../usr \
- -D$(OSNAME) -fPIC -D_GNU_SOURCE -fvisibility=hidden \
- -I../libopeniscsiusr
+ -I../libopeniscsiusr \
+ -D$(OSNAME) -DISCSI_DB_ROOT=\"$(DBROOT)\" -fPIC -D_GNU_SOURCE -fvisibility=hidden
-LDFLAGS = -L../libopeniscsiusr -lopeniscsiusr
+LDFLAGS = -L../libopeniscsiusr -lopeniscsiusr -lkmod -lcrypto
LIB = libiscsi.so.0
TESTS = tests/test_discovery_sendtargets tests/test_discovery_firmware
TESTS += tests/test_login tests/test_logout tests/test_params
-@@ -19,7 +19,7 @@ TESTS += tests/test_set_auth tests/test_get_auth
+@@ -21,7 +21,7 @@ TESTS += tests/test_set_auth tests/test_
COMMON_SRCS = sysdeps.o
# sources shared between iscsid, iscsiadm and iscsistart
diff --git a/0020-fix-upstream-build-breakage-of-iscsiuio-LDFLAGS.patch b/0020-fix-upstream-build-breakage-of-iscsiuio-LDFLAGS.patch
deleted file mode 100644
index 142fcde..0000000
--- a/0020-fix-upstream-build-breakage-of-iscsiuio-LDFLAGS.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-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
-
----
- iscsiuio/configure.ac | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/iscsiuio/configure.ac b/iscsiuio/configure.ac
-index 9b85448..5dc188b 100644
---- a/iscsiuio/configure.ac
-+++ b/iscsiuio/configure.ac
-@@ -72,7 +72,7 @@ AC_ARG_WITH([systemd],
- *) AC_MSG_ERROR([bad value $withval for --with-systemd]) ;;
- 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"],[
- if test "$with_libsystemd" = yes; then
- AC_MSG_ERROR([could not find libsystemd using pkg-config])
- else
---
-2.26.3
-
diff --git a/0023-stop-using-Werror-for-now.patch b/0023-stop-using-Werror-for-now.patch
index 624081c..8e31cb1 100644
--- a/0023-stop-using-Werror-for-now.patch
+++ b/0023-stop-using-Werror-for-now.patch
@@ -20,17 +20,17 @@ index 7e6b734..0069e75 100644
DESTDIR ?=
prefix = /usr
--exec_prefix = /
+-exec_prefix =
+exec_prefix = /usr
- sbindir = $(exec_prefix)/sbin
- bindir = $(exec_prefix)/bin
mandir = $(prefix)/share/man
+ etcdir = /etc
+
diff --git a/usr/Makefile b/usr/Makefile
index 885243a..1a743d1 100644
--- a/usr/Makefile
+++ b/usr/Makefile
-@@ -35,7 +35,7 @@ endif
- PKG_CONFIG = /usr/bin/pkg-config
+@@ -44,7 +44,7 @@ HOMEDIR ?= $(etcdir)/iscsi
+ PKG_CONFIG ?= /usr/bin/pkg-config
CFLAGS ?= -O2 -g
-WARNFLAGS ?= -Wall -Wextra -Werror -Wstrict-prototypes -fno-common
diff --git a/0024-minor-service-file-updates.patch b/0024-minor-service-file-updates.patch
index be17752..c44c425 100644
--- a/0024-minor-service-file-updates.patch
+++ b/0024-minor-service-file-updates.patch
@@ -22,20 +22,20 @@ The following are started automatically as needed:
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
+--- a/etc/systemd/iscsi-init.service.template
++++ b/etc/systemd/iscsi-init.service.template
+@@ -7,6 +7,7 @@ RequiresMountsFor=/etc/iscsi
+ # local-fs.target, don't start it here (no Wants=) but if
+ # it's running wait for it to finish
+ After=systemd-remount-fs.service
+Before=iscsid.service
- [Service]
- Type=oneshot
+ [Install]
+ # this ensures we are in the same transaction with
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
+--- a/etc/systemd/iscsi.service.template
++++ b/etc/systemd/iscsi.service.template
@@ -4,7 +4,7 @@ Documentation=man:iscsiadm(8) man:iscsid(8)
DefaultDependencies=no
Before=remote-fs-pre.target
@@ -47,8 +47,8 @@ index 175cb2c..6c542d2 100644
[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
+--- a/etc/systemd/iscsid.service.template
++++ b/etc/systemd/iscsid.service.template
@@ -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
diff --git a/open-iscsi-libiscsi.patch b/open-iscsi-libiscsi.patch
index 6d65275..7566298 100644
--- a/open-iscsi-libiscsi.patch
+++ b/open-iscsi-libiscsi.patch
@@ -1,15 +1,15 @@
---- open-iscsi-2.1.4/libiscsi/Makefile.orig 2022-05-16 21:07:19.280763434 +0200
-+++ open-iscsi-2.1.4/libiscsi/Makefile 2022-05-16 21:12:22.995784736 +0200
-@@ -11,7 +11,7 @@ CFLAGS = $(OPTFLAGS) $(WARNFLAGS) -I../i
- -D$(OSNAME) -fPIC -D_GNU_SOURCE -fvisibility=hidden \
- -I../libopeniscsiusr
+--- open-iscsi-2.1.7/libiscsi/Makefile.orig 2022-05-18 22:03:58.254329591 +0200
++++ open-iscsi-2.1.7/libiscsi/Makefile 2022-05-18 22:04:23.824191067 +0200
+@@ -13,7 +13,7 @@ CFLAGS = $(OPTFLAGS) $(WARNFLAGS) -I../i
+ -I../libopeniscsiusr \
+ -D$(OSNAME) -DISCSI_DB_ROOT=\"$(DBROOT)\" -fPIC -D_GNU_SOURCE -fvisibility=hidden
LDFLAGS = -L../libopeniscsiusr -lopeniscsiusr -lkmod -lcrypto
-LIB = libiscsi.so.0
+LIB = libopeniscsi.so.0
TESTS = tests/test_discovery_sendtargets tests/test_discovery_firmware
TESTS += tests/test_login tests/test_logout tests/test_params
TESTS += tests/test_get_network_config tests/test_get_initiator_name
-@@ -49,7 +49,7 @@ fw-objs/%.o: ../utils/fwparam_ibft/%.c
+@@ -51,7 +51,7 @@ fw-objs/%.o: ../usr/fwparam_ibft/%.c
$(CC) $(CFLAGS) -c $< -o $@
$(LIB): $(COMMON_OBJS) $(FW_OBJS) $(USR_OBJS) libiscsi.o
diff --git a/open-iscsi-systemd.patch b/open-iscsi-systemd.patch
index 41751c3..9cc2c5f 100644
--- a/open-iscsi-systemd.patch
+++ b/open-iscsi-systemd.patch
@@ -1,5 +1,5 @@
---- open-iscsi-2.1.4/etc/systemd/iscsi.service.orig 2022-05-15 21:39:53.531578661 +0200
-+++ open-iscsi-2.1.4/etc/systemd/iscsi.service 2022-05-15 21:43:54.510273168 +0200
+--- open-iscsi-2.1.4/etc/systemd/iscsi.service.template.orig 2022-05-15 21:39:53.531578661 +0200
++++ open-iscsi-2.1.4/etc/systemd/iscsi.service.template 2022-05-15 21:43:54.510273168 +0200
@@ -5,7 +5,7 @@ DefaultDependencies=no
Before=remote-fs-pre.target
After=network.target network-online.target iscsid.service iscsiuio.service systemd-remount-fs.service
@@ -9,47 +9,36 @@
[Service]
Type=oneshot
---- open-iscsi-2.1.4/etc/systemd/iscsid.service.orig 2022-05-15 21:39:53.531578661 +0200
-+++ open-iscsi-2.1.4/etc/systemd/iscsid.service 2022-05-15 21:44:16.530153876 +0200
+--- open-iscsi-2.1.7/etc/systemd/iscsid.service.template.orig 2022-05-16 22:04:51.668726910 +0200
++++ open-iscsi-2.1.7/etc/systemd/iscsid.service.template 2022-05-16 22:12:39.789524215 +0200
@@ -9,7 +9,7 @@ Requires=iscsi-init.service iscsi-shutdo
[Service]
Type=notify
NotifyAccess=main
--ExecStart=/usr/sbin/iscsid -f
-+ExecStart=/sbin/iscsid -f -u iscsi -g iscsi
+-ExecStart=@SBINDIR@/iscsid -f
++ExecStart=@SBINDIR@/iscsid -f -u iscsi -g iscsi
KillMode=mixed
Restart=on-failure
---- open-iscsi-2.1.4/etc/systemd/iscsiuio.service.orig 2022-05-15 21:39:53.531578661 +0200
-+++ open-iscsi-2.1.4/etc/systemd/iscsiuio.service 2022-05-15 21:44:41.373352622 +0200
-@@ -10,7 +10,7 @@ Before=remote-fs-pre.target iscsid.servi
- [Service]
- Type=notify
- NotifyAccess=main
--ExecStart=/usr/sbin/iscsiuio -f
-+ExecStart=/sbin/iscsiuio -f
- KillMode=mixed
- Restart=on-failure
-
---- open-iscsi-2.1.4/Makefile.orig 2022-05-15 21:56:37.309474063 +0200
-+++ open-iscsi-2.1.4/Makefile 2022-05-15 22:08:13.275703691 +0200
+--- open-iscsi-2.1.7/Makefile.orig 2022-05-16 22:24:15.152423778 +0200
++++ open-iscsi-2.1.7/Makefile 2022-05-16 22:38:37.014421337 +0200
@@ -7,7 +7,7 @@
DESTDIR ?=
prefix = /usr
-exec_prefix = /usr
-+exec_prefix = /
- sbindir = $(exec_prefix)/sbin
- bindir = $(exec_prefix)/bin
++exec_prefix =
mandir = $(prefix)/share/man
---- open-iscsi-2.1.4/etc/systemd/iscsi-init.service.orig 2022-05-15 22:26:26.836446030 +0200
-+++ open-iscsi-2.1.4/etc/systemd/iscsi-init.service 2022-05-16 20:43:43.358434144 +0200
-@@ -7,4 +7,4 @@ Before=iscsid.service
+ etcdir = /etc
+
+--- open-iscsi-2.1.7/etc/systemd/iscsi-init.service.template.orig 2022-05-16 22:24:15.152423778 +0200
++++ open-iscsi-2.1.7/etc/systemd/iscsi-init.service.template 2022-05-16 22:39:01.854286768 +0200
+@@ -17,4 +17,4 @@ WantedBy=systemd-remount-fs.service
[Service]
Type=oneshot
RemainAfterExit=no
--ExecStart=/usr/bin/sh -c 'echo "InitiatorName=`/usr/sbin/iscsi-iname`" > /etc/iscsi/initiatorname.iscsi'
-+ExecStart=/bin/sh -c 'echo "InitiatorName=`/sbin/iscsi-iname`" > /etc/iscsi/initiatorname.iscsi'
+-ExecStart=/usr/bin/sh -c 'echo "InitiatorName=`@SBINDIR@/iscsi-iname`" > /etc/iscsi/initiatorname.iscsi'
++ExecStart=/bin/sh -c 'echo "InitiatorName=`@SBINDIR@/iscsi-iname`" > /etc/iscsi/initiatorname.iscsi'
--- open-iscsi-2.1.4/etc/systemd/iscsi-onboot.service.orig 2022-05-15 22:26:25.683118945 +0200
+++ open-iscsi-2.1.4/etc/systemd/iscsi-onboot.service 2022-05-16 20:50:19.019623997 +0200
@@ -9,7 +9,7 @@ ConditionDirectoryNotEmpty=/sys/class/is
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/open-iscsi.git/commitdiff/e621921b91ef836f1021678878e738af997b7d87
More information about the pld-cvs-commit
mailing list