packages/open-iscsi
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

!84 Remove unnecessary tool iscsiuio

Browse Source 
Merge pull request !84 from Wenchao Hao/master
This commit is contained in:
openeuler-ci-bot 2022-02-08 10:03:18 +00:00 committed by Gitee
commit 2371290404
No known key found for this signature in database
GPG Key ID: 173E9B9CA92EEF8F
4 changed files with 30085 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

90
0014-Remove-iscsiuio-from-build-and-install-recipe.patch Normal file
View File

@ -0,0 +1,90 @@
From 45d156fd3463924bf7d50d1656bacca160b42430 Mon Sep 17 00:00:00 2001
From: Wenchao Hao <haowenchao@huawei.com>
Date: Thu, 27 Jan 2022 09:36:39 +0800
Subject: [PATCH 1/3] Remove iscsiuio from build and install recipe
iscsiuio is to be used in conjunction with specific linux driver to
improve performance, such as QLogic NetXtreme II or QLogic CNIC driver.
It is not a necessary tool of open-iscsi.
What's more, iscsiuio used a package uio which is out of maintain now,
which would introduce CVEs unhandled. So I want to remove this tool
from open-iscsi.
This patch removes iscsiuio from build and install recipe.
Signed-off-by: Wenchao Hao <haowenchao@huawei.com>
---
Makefile | 19 ++++---------------
1 file changed, 4 insertions(+), 15 deletions(-)
diff --git a/Makefile b/Makefile
index 7f52cc8..5908ff9 100644
--- a/Makefile
+++ b/Makefile
@@ -17,9 +17,9 @@ rulesdir = $(etcdir)/udev/rules.d
systemddir = $(prefix)/lib/systemd/system
MANPAGES = doc/iscsid.8 doc/iscsiadm.8 doc/iscsi_discovery.8 \
- iscsiuio/docs/iscsiuio.8 doc/iscsi_fw_login.8 doc/iscsi-iname.8 \
+ doc/iscsi_fw_login.8 doc/iscsi-iname.8 \
doc/iscsistart.8
-PROGRAMS = usr/iscsid usr/iscsiadm utils/iscsi-iname iscsiuio/src/unix/iscsiuio \
+PROGRAMS = usr/iscsid usr/iscsiadm utils/iscsi-iname \
usr/iscsistart
SCRIPTS = utils/iscsi_discovery utils/iscsi_fw_login utils/iscsi_offload \
utils/iscsi-gen-initiatorname
@@ -29,8 +29,7 @@ IFACEFILES = etc/iface.example
RULESFILES = utils/50-iscsi-firmware-login.rules
SYSTEMDFILES = etc/systemd/iscsi.service \
etc/systemd/iscsi-init.service \
- etc/systemd/iscsid.service etc/systemd/iscsid.socket \
- etc/systemd/iscsiuio.service etc/systemd/iscsiuio.socket
+ etc/systemd/iscsid.service etc/systemd/iscsid.socket
export DESTDIR prefix INSTALL
@@ -59,30 +58,22 @@ endif
all: user
-user: iscsiuio/Makefile
+user:
$(MAKE) -C libopeniscsiusr
$(MAKE) -C utils/sysdeps
$(MAKE) -C utils/fwparam_ibft
$(MAKE) -C usr
$(MAKE) -C utils
- $(MAKE) -C iscsiuio
@echo
@echo "Compilation complete Output file"
@echo "----------------------------------- ----------------"
@echo "Built iSCSI daemon: usr/iscsid"
@echo "Built management application: usr/iscsiadm"
@echo "Built boot tool: usr/iscsistart"
- @echo "Built iscsiuio daemon: iscsiuio/src/unix/iscsiuio"
@echo "Built libopeniscsiusr library: libopeniscsiusr/libopeniscsiusr.so"
@echo
@echo "Read README file for detailed information."
-iscsiuio/Makefile: iscsiuio/configure iscsiuio/Makefile.in
- cd iscsiuio; ./configure $(WITHOUT_ARG)
-
-iscsiuio/configure iscsiuio/Makefile.in: iscsiuio/configure.ac iscsiuio/Makefile.am
- cd iscsiuio; autoreconf --install
-
force: ;
clean:
@@ -91,8 +82,6 @@ clean:
$(MAKE) -C utils clean
$(MAKE) -C usr clean
$(MAKE) -C libopeniscsiusr clean
- [ ! -f iscsiuio/Makefile ] || $(MAKE) -C iscsiuio clean
- [ ! -f iscsiuio/Makefile ] || $(MAKE) -C iscsiuio distclean
# this is for safety
# now -jXXX will still be safe
--
2.34.1

29936
0015-Remove-iscsiuio-source-code.patch Normal file
View File

File diff suppressed because it is too large Load Diff

52
0016-Remove-iscsiuio-from-config-and-service-file.patch Normal file
View File

@ -0,0 +1,52 @@
From 3ae85fdd120146eb7abcf25bb4588baec85076bf Mon Sep 17 00:00:00 2001
From: Wenchao Hao <haowenchao@huawei.com>
Date: Thu, 27 Jan 2022 10:11:12 +0800
Subject: [PATCH 3/3] Remove iscsiuio from config and service file
iscsiuio is to be used in conjunction with specific linux driver to
improve performance, such as QLogic NetXtreme II or QLogic CNIC driver.
It is not a necessary tool of open-iscsi.
What's more, iscsiuio used a package uio which is out of maintain now,
which would introduce CVEs unhandled. So I want to remove this tool
from open-iscsi.
This patch removes iscsiuio from config and service file
Signed-off-by: Wenchao Hao <haowenchao@huawei.com>
---
etc/iscsid.conf | 2 +-
etc/systemd/iscsid.service | 4 ++--
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/etc/iscsid.conf b/etc/iscsid.conf
index f21ed3d..8d2808e 100644
--- a/etc/iscsid.conf
+++ b/etc/iscsid.conf
@@ -19,7 +19,7 @@
# the time then leave this attribute commented out.
#
# Default for Fedora and RHEL. (uncomment to activate).
-# iscsid.startup = /bin/systemctl start iscsid.socket iscsiuio.socket
+# iscsid.startup = /bin/systemctl start iscsid.socket
#
# Default if you are not using systemd (uncomment to activate)
# iscsid.startup = /usr/bin/service start iscsid
diff --git a/etc/systemd/iscsid.service b/etc/systemd/iscsid.service
index 70c7fbd..49347f5 100644
--- a/etc/systemd/iscsid.service
+++ b/etc/systemd/iscsid.service
@@ -1,8 +1,8 @@
[Unit]
Description=Open-iSCSI
-Documentation=man:iscsid(8) man:iscsiuio(8) man:iscsiadm(8)
+Documentation=man:iscsid(8) man:iscsiadm(8)
DefaultDependencies=no
-After=network-online.target iscsiuio.service iscsi-init.service
+After=network-online.target iscsi-init.service
Before=remote-fs-pre.target
Wants=remote-fs-pre.target
--
2.34.1

16
open-iscsi.spec
View File

@ -4,7 +4,7 @@
Name: open-iscsi
Version: 2.1.5
Release: 3
Release: 4
Summary: ISCSI software initiator daemon and utility programs
License: GPLv2+ and BSD
URL: http://www.open-iscsi.com
@ -22,6 +22,9 @@ patch10: 0010-fix-iscsiadm-op-new-report-to-cannot-rename-error.patch
patch11: 0011-Fix-compiler-error-introduced-with-recent-IPv6-commi.patch
patch12: 0012-Remove-iscsid.service-s-dependence-of-iscsi-init.ser.patch
patch13: 0013-Remove-session-info-password-print.patch
patch14: 0014-Remove-iscsiuio-from-build-and-install-recipe.patch
patch15: 0015-Remove-iscsiuio-source-code.patch
patch16: 0016-Remove-iscsiuio-from-config-and-service-file.patch
BuildRequires: flex bison doxygen kmod-devel systemd-units gcc git isns-utils-devel systemd-devel
BuildRequires: autoconf automake libtool libmount-devel openssl-devel pkg-config
@ -76,12 +79,6 @@ This contains man files for the using of %{name}.
perl -i -pe 's|^exec_prefix = /$|exec_prefix = %{_exec_prefix}|' Makefile
%build
cd iscsiuio
touch AUTHORS NEWS
autoreconf --install
%{configure}
cd ..
%make_build OPTFLAGS="%{optflags} %{?__global_ldflags} -DUSE_KMOD -lkmod" LIB_DIR=%{_libdir}
@ -96,7 +93,6 @@ make DESTDIR=%{?buildroot} LIB_DIR=%{_libdir} \
install -pm 755 usr/iscsistart $RPM_BUILD_ROOT%{_sbindir}
install -d $RPM_BUILD_ROOT%{_sysconfdir}/logrotate.d
install -pm 644 iscsiuio/iscsiuiolog $RPM_BUILD_ROOT%{_sysconfdir}/logrotate.d
install -d $RPM_BUILD_ROOT%{_sysconfdir}/{iscsi,iscsi/nodes,iscsi/send_targets,iscsi/static,iscsi/isns,iscsi/slp,iscsi/ifaces}
install -d $RPM_BUILD_ROOT/var/lock/iscsi
touch $RPM_BUILD_ROOT/var/lock/iscsi/lock
@ -143,7 +139,6 @@ fi
%dir %{_sysconfdir}/iscsi
%attr(0600,root,root) %config(noreplace) %{_sysconfdir}/iscsi/iscsid.conf
%config(noreplace) %{_sysconfdir}/logrotate.d/iscsiuiolog
%config %{_sysconfdir}/iscsi/ifaces/iface.example
%ghost %{_sysconfdir}/iscsi/initiatorname.iscsi
@ -156,6 +151,9 @@ fi
%{_mandir}/man8/*
%changelog
* Thu Jan 26 2022 haowenchao <haowenchao@huawei.com> - 2.1.5-4
- Remove tool iscsiuio
* Tue Jan 25 2022 haowenchao <haowenchao@huawei.com> - 2.1.5-3
- Remove password print in session info display