cc001447ed
- Upgrade to upstream vresion 2.1.2 as 2.1.2-suse (for jre#SES-1081), including: * use openssl for random data generation * Misspelled socket name might cause confusion to inexperienced user. * iscsi/libopeniscsiusr:add libopeniscsiuser_node.h to HEADERS * Let initiator name be created by iscsi-init.service. * iscsi: fix fd leak * iscsi: Add break to while loop * Fix compiler complaint about string copy in iscsiuio * Fix a compiler complaint about writing one byte * Fix issue with zero-length arrays at end of struct * Add iscsi-init.service * Proper disconnect of TCP connection * Fix dependency on new systemd RPM macro * Fix SIGPIPE loop in signal handler * Update iscsi-iname.c * log:modify iSCSI shared memory permissions for logs * Sequence systemd services correctly when upgrading * Ignore iface.example in iface match checks * More changes for musl. * Fix type mismatch under musl. * Change include of <sys/poll.h> to <poll.h> * Add Wants=remote-fs-pre.target for sequencing. * Add workaround in SPEC file for installcheck. * Fix issue where "iscsi-iname -p" core dumps. * iscsi-iname: fix iscsi-iname -p access NULL pointer without given IQN prefix * Fix iscsi.service so it handles restarts better Replacing open-iscsi-2.1.1-suse.tar.bz2 with open-iscsi-2.1.2-suse.tar.bz2, and updating open-iscsi-SUSE-latest.diff.bz2 to empty, since initially there are no differences. OBS-URL: https://build.opensuse.org/request/show/823424 OBS-URL: https://build.opensuse.org/package/show/network/open-iscsi?expand=0&rev=167
227 lines
7.3 KiB
RPMSpec
227 lines
7.3 KiB
RPMSpec
#
|
|
# spec file for package open-iscsi
|
|
#
|
|
# Copyright (c) 2020 SUSE LLC
|
|
#
|
|
# All modifications and additions to the file contributed by third parties
|
|
# remain the property of their copyright owners, unless otherwise agreed
|
|
# upon. The license for this file, and modifications and additions to the
|
|
# file, is the same license as for the pristine package itself (unless the
|
|
# license for the pristine package is not an Open Source License, in which
|
|
# case the license is the MIT License). An "Open Source License" is a
|
|
# license that conforms to the Open Source Definition (Version 1.9)
|
|
# published by the Open Source Initiative.
|
|
|
|
# Please submit bugfixes or comments via https://bugs.opensuse.org/
|
|
#
|
|
|
|
|
|
%define iscsi_minor_release 1
|
|
%define iscsi_patch_release 2
|
|
%define iscsi_patch_release_suse %{iscsi_patch_release}-suse
|
|
Name: open-iscsi
|
|
Version: 2.1.2
|
|
Release: 0
|
|
Summary: Linux iSCSI Software Initiator
|
|
License: GPL-2.0-or-later
|
|
Group: Productivity/Networking/Other
|
|
URL: https://www.open-iscsi.com
|
|
Source: %{name}-2.%{iscsi_minor_release}.%{iscsi_patch_release_suse}.tar.bz2
|
|
Patch1: %{name}-SUSE-latest.diff.bz2
|
|
BuildRequires: autoconf
|
|
BuildRequires: automake
|
|
BuildRequires: bison
|
|
BuildRequires: db-devel < 5
|
|
BuildRequires: fdupes
|
|
BuildRequires: flex
|
|
BuildRequires: libkmod-devel
|
|
BuildRequires: libmount-devel
|
|
BuildRequires: libtool
|
|
BuildRequires: make
|
|
BuildRequires: open-isns-devel
|
|
BuildRequires: openssl-devel >= 1.1.1c
|
|
BuildRequires: pkg-config
|
|
BuildRequires: suse-module-tools
|
|
BuildRequires: pkgconfig(libsystemd)
|
|
BuildRequires: pkgconfig(systemd)
|
|
Requires(post): coreutils
|
|
Requires: libopeniscsiusr0_2_0 = %{version}
|
|
%{?systemd_requires}
|
|
|
|
%description
|
|
This is a transport independent implementation of RFC 3720
|
|
iSCSI. It is partitioned into user and kernel parts.
|
|
|
|
The kernel portion of Open-iSCSI implements the iSCSI data path (that
|
|
is, iSCSI Read and iSCSI Write), and consists of two loadable
|
|
modules: iscsi_if.ko and iscsi_tcp.ko, and is now is delivered
|
|
as part of the kernel.
|
|
|
|
The user-space part contains the entire control plane: configuration
|
|
manager, iSCSI Discovery, Login and Logout processing,
|
|
connection-level error processing, Nop-In and Nop-Out handling. It
|
|
comes with a daemon process called iscsid, and a management utility,
|
|
iscsiadm.
|
|
|
|
%package -n libopeniscsiusr0_2_0
|
|
Version: 2.%{iscsi_minor_release}.%{iscsi_patch_release}
|
|
Release: 0
|
|
Summary: The iSCSI User-level Library
|
|
Group: System/Libraries
|
|
Obsoletes: libopeniscsiusr0_1_0
|
|
|
|
%description -n libopeniscsiusr0_2_0
|
|
The iSCSI user-space API from the open-iscsi project.
|
|
|
|
%package -n iscsiuio
|
|
Version: 0.7.8.6
|
|
Release: 0
|
|
Summary: Linux Broadcom NetXtremem II iscsi server
|
|
Group: Productivity/Networking/Other
|
|
Requires: logrotate
|
|
|
|
%description -n iscsiuio
|
|
This tool is to be used in conjunction with the Broadcom NetXtreme II Linux
|
|
driver (Kernel module name: "bnx2" and "bnx2x"), Broadcom CNIC driver,
|
|
and the Broadcom iSCSI driver (Kernel module name: "bnx2i").
|
|
This user-space tool is used in conjunction with the following
|
|
Broadcom Network Controllers:
|
|
|
|
* bnx2: BCM5706, BCM5708, BCM5709 devices
|
|
* bnx2x: BCM57710, BCM57711, BCM57711E, BCM57712, BCM57712E,
|
|
BCM57800, BCM57810, BCM57840 devices
|
|
|
|
This utility will provide the ARP and DHCP functionality for the iSCSI offload.
|
|
The communication to the driver is done via user-space I/O (Kernel module name
|
|
"uio").
|
|
|
|
%package devel
|
|
Version: 2.%{iscsi_minor_release}.%{iscsi_patch_release}
|
|
Release: 0
|
|
Summary: The iSCSI User-level Library Development Library and Include files
|
|
Group: Development/Libraries/C and C++
|
|
Requires: %{name} = %{version}
|
|
Conflicts: libopeniscsiusr0_1_0
|
|
|
|
%description devel
|
|
This development package contains the open-iscsi user-level library
|
|
include files and documentation. These are used to compile against
|
|
the libopeniscsiusr library.
|
|
|
|
%prep
|
|
%setup -q -n %{name}-2.%{iscsi_minor_release}.%{iscsi_patch_release_suse}
|
|
%patch1 -p1
|
|
|
|
%build
|
|
[ -z "$SOURCE_DATE_EPOCH" ] || export KBUILD_BUILD_TIMESTAMP=@$SOURCE_DATE_EPOCH
|
|
make %{?_smp_mflags} OPTFLAGS="%{optflags} -fno-strict-aliasing -fno-common -DOFFLOAD_BOOT_SUPPORTED -DLOCK_DIR=\\\"%{_sysconfdir}/iscsi\\\"" LIB_DIR=%{_libdir} user
|
|
cd iscsiuio
|
|
touch AUTHORS NEWS
|
|
autoreconf --install
|
|
%configure --sbindir=/sbin
|
|
make %{?_smp_mflags} CFLAGS="%{optflags}" LIB_DIR=%{_libdir}
|
|
|
|
%install
|
|
make DESTDIR=%{buildroot} LIB_DIR=%{_libdir} install_user
|
|
# install service files
|
|
make DESTDIR=%{buildroot} LIB_DIR=%{_libdir} install_systemd
|
|
# create rc symlinks
|
|
[ -d %{buildroot}%{_sbindir} ] || mkdir -p %{buildroot}%{_sbindir}
|
|
ln -s %{_sbindir}/service %{buildroot}%{_sbindir}/rciscsi
|
|
ln -s %{_sbindir}/service %{buildroot}%{_sbindir}/rciscsid
|
|
ln -s %{_sbindir}/service %{buildroot}%{_sbindir}/rciscsiuio
|
|
(cd %{buildroot}/etc; ln -sf iscsi/iscsid.conf iscsid.conf)
|
|
echo > %{buildroot}%{_sysconfdir}/iscsi/initiatorname.iscsi
|
|
install -m 0755 usr/iscsistart %{buildroot}/sbin
|
|
%make_install -C iscsiuio
|
|
# rename iscsiuio logrotate file to proper name
|
|
mv %{buildroot}%{_sysconfdir}/logrotate.d/iscsiuiolog %{buildroot}%{_sysconfdir}/logrotate.d/iscsiuio
|
|
%fdupes %{buildroot}/%{_prefix}
|
|
|
|
%post
|
|
%{?regenerate_initrd_post}
|
|
%service_add_post iscsi.service iscsid.service iscsid.socket
|
|
|
|
%posttrans
|
|
%{?regenerate_initrd_posttrans}
|
|
|
|
%postun
|
|
%if %{defined service_del_postun_without_restart}
|
|
%service_del_postun_without_restart iscsi.service
|
|
%else
|
|
%service_del_postun -n iscsi.service
|
|
%endif
|
|
%service_del_postun iscsid.service iscsid.socket
|
|
|
|
%pre
|
|
%service_add_pre iscsi.service iscsid.service iscsid.socket
|
|
|
|
%preun
|
|
%service_del_preun iscsi.service iscsid.service iscsid.socket
|
|
|
|
%post -n libopeniscsiusr0_2_0 -p /sbin/ldconfig
|
|
%postun -n libopeniscsiusr0_2_0 -p /sbin/ldconfig
|
|
|
|
%post -n iscsiuio
|
|
%service_add_post iscsiuio.service iscsiuio.socket
|
|
|
|
%postun -n iscsiuio
|
|
%service_del_postun iscsiuio.service iscsiuio.socket
|
|
|
|
%pre -n iscsiuio
|
|
%service_add_pre iscsiuio.service iscsiuio.socket
|
|
|
|
%preun -n iscsiuio
|
|
%service_del_preun iscsiuio.service iscsiuio.socket
|
|
|
|
%files
|
|
%dir %{_sysconfdir}/iscsi
|
|
%attr(0600,root,root) %config(noreplace) %{_sysconfdir}/iscsi/iscsid.conf
|
|
%ghost %{_sysconfdir}/iscsi/initiatorname.iscsi
|
|
%dir %{_sysconfdir}/iscsi/ifaces
|
|
%config %{_sysconfdir}/iscsi/ifaces/iface.example
|
|
%{_sysconfdir}/iscsid.conf
|
|
%{_unitdir}/iscsid.service
|
|
%{_unitdir}/iscsid.socket
|
|
%{_unitdir}/iscsi-init.service
|
|
%{_unitdir}/iscsi.service
|
|
%{_systemdgeneratordir}/ibft-rule-generator
|
|
%{_sbindir}/rciscsi
|
|
%{_sbindir}/rciscsid
|
|
/sbin/iscsid
|
|
/sbin/iscsiadm
|
|
/sbin/iscsi-iname
|
|
/sbin/iscsistart
|
|
/sbin/iscsi-gen-initiatorname
|
|
/sbin/iscsi_offload
|
|
/sbin/iscsi_discovery
|
|
/sbin/iscsi_fw_login
|
|
%doc README
|
|
%license COPYING
|
|
%{_mandir}/man8/iscsiadm.8%{ext_man}
|
|
%{_mandir}/man8/iscsid.8%{ext_man}
|
|
%{_mandir}/man8/iscsi_discovery.8%{ext_man}
|
|
%{_mandir}/man8/iscsistart.8%{ext_man}
|
|
%{_mandir}/man8/iscsi-iname.8%{ext_man}
|
|
%{_mandir}/man8/iscsi_fw_login.8%{ext_man}
|
|
%{_udevrulesdir}/50-iscsi-firmware-login.rules
|
|
|
|
%files -n libopeniscsiusr0_2_0
|
|
%{_libdir}/libopeniscsiusr.so.*
|
|
|
|
%files -n iscsiuio
|
|
/sbin/iscsiuio
|
|
/sbin/brcm_iscsiuio
|
|
%{_mandir}/man8/iscsiuio.8%{ext_man}
|
|
%config %{_sysconfdir}/logrotate.d/iscsiuio
|
|
%{_unitdir}/iscsiuio.service
|
|
%{_unitdir}/iscsiuio.socket
|
|
%{_sbindir}/rciscsiuio
|
|
|
|
%files devel
|
|
%{_includedir}/libopeniscsiusr*.h
|
|
%{_mandir}/man3/*.3%{ext_man}
|
|
%{_libdir}/libopeniscsiusr.so
|
|
|
|
%changelog
|