%global open_iscsi_version	2.0

%global open_iscsi_build	873

%global commit0			4c1f2d90ef1c73e33d9f1e4ae9c206ffe015a8f9

%global shortcommit0		%(c=%{commit0}; echo ${c:0:7})

Summary: iSCSI daemon and utility programs

Name: iscsi-initiator-utils

Version: 6.%{open_iscsi_version}.%{open_iscsi_build}

Release: 33.git%{shortcommit0}%{?dist}

Group: System Environment/Daemons

License: GPLv2+

URL: http://www.open-iscsi.org

Source0: https://github.com/mikechristie/open-iscsi/archive/%{commit0}.tar.gz#/open-iscsi-%{shortcommit0}.tar.gz

Source4: 04-iscsi

Source5: iscsi-tmpfiles.conf

Patch1: open-iscsi-v2.0.873-4c9d6f9-1-idmb_rec_write-check-for-tpgt-first.patch

Patch2: open-iscsi-v2.0.873-4c9d6f9-2-idbm_rec_write-seperate-old-and-new-style-writes.patch

Patch3:open-iscsi-v2.0.873-4c9d6f9-3-idbw_rec_write-pick-tpgt-from-existing-record.patch

Patch4:open-iscsi-v2.0.873-4c9d6f9-4-update-systemd-service-files-add-iscsi.service-for-s.patch

Patch5:open-iscsi-v2.0.873-4c9d6f9-5-iscsi-boot-related-service-file-updates.patch

Patch6:open-iscsi-v2.0.873-4c9d6f9-6-update-initscripts-and-docs.patch

Patch7:open-iscsi-v2.0.873-4c9d6f9-7-use-var-for-config.patch

Patch8:open-iscsi-v2.0.873-4c9d6f9-8-use-red-hat-for-name.patch

Patch9:open-iscsi-v2.0.873-4c9d6f9-9-libiscsi.patch

Patch10:open-iscsi-v2.0.873-4c9d6f9-10-remove-the-offload-boot-supported-ifdef.patch

Patch11:open-iscsi-v2.0.873-4c9d6f9-11-iscsiuio-systemd-unit-files.patch

Patch12:open-iscsi-v2.0.873-4c9d6f9-12-disable-iscsid.startup-from-iscsiadm-prefer-systemd-.patch

Patch13:open-iscsi-v2.0.873-4c9d6f9-13-Don-t-check-for-autostart-sessions-if-iscsi-is-not-u.patch

Patch14:open-iscsi-v2.0.873-4c9d6f9-14-start-socket-listeners-on-iscsiadm-command.patch

Patch15:open-iscsi-v2.0.873-4c9d6f9-15-Revert-iscsiadm-return-error-when-login-fails.patch

Patch16:open-iscsi-v2.0.873-4c9d6f9-16-update-handling-of-boot-sessions.patch

Patch17:open-iscsi-v2.0.873-4c9d6f9-17-update-iscsi.service-for-boot-session-recovery.patch

Patch18:open-iscsi-v2.0.873-4c9d6f9-18-updates-to-iscsi.service.patch

Patch19:open-iscsi-v2.0.873-4c9d6f9-19-make-session-shutdown-a-seperate-service.patch.patch

Patch20:open-iscsi-v2.0.873-4c9d6f9-20-Add-macros-to-release-GIL-lock.patch

Patch21:open-iscsi-v2.0.873-4c9d6f9-21-libiscsi-introduce-sessions-API.patch

# ugly version string patch, should change with every rebuild

Patch22:open-iscsi-v2.0.873-4c9d6f9-22-use-Red-Hat-version-string-to-match-RPM-package-vers.patch

Patch23: 0001-Build-system-sort-object-file-lists.patch

Patch24: open-iscsi-2.0.873-157-remove-sysfs-attr_list.patch

BuildRequires: flex bison python2-devel python3-devel python-setuptools doxygen kmod-devel systemd-units

BuildRequires: autoconf automake libtool libmount-devel openssl-devel

BuildRequires: isns-utils-static isns-utils-devel

# For dir ownership

Requires: %{name}-iscsiuio >= %{version}-%{release}

Requires(post): systemd

Requires(preun): systemd

Requires(postun): systemd

%global _hardened_build 1

%global __provides_exclude_from ^(%{python2_sitearch}/.*\\.so|%{python3_sitearch}/.*\\.so)$

%description

The iscsi package provides the server daemon for the iSCSI protocol,

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.

%package iscsiuio

Summary: Userspace configuration daemon required for some iSCSI hardware

Group: System Environment/Daemons

License: BSD

Requires: %{name} = %{version}-%{release}

%description iscsiuio

The iscsiuio configuration daemon provides network configuration help

for some iSCSI offload hardware.

%package devel

Summary: Development files for %{name}

Group: Development/Libraries

Requires: %{name} = %{version}-%{release}

%description devel

The %{name}-devel package contains libraries and header files for

developing applications that use %{name}.

%package -n python-%{name}

Summary: Python %{python2_version} bindings to %{name}

Group: Development/Libraries

%description -n python-%{name}

The %{name}-python2 package contains Python %{python2_version} bindings to the

libiscsi interface for interacting with %{name}

%package -n python3-%{name}

Summary: Python %{python3_version} bindings to %{name}

Group: Development/Libraries

%description -n python3-%{name}

The %{name}-python3 package contains Python %{python3_version} bindings to the

libiscsi interface for interacting with %{name}

%prep

%autosetup -p1 -n open-iscsi-%{commit0}

# change exec_prefix, there's no easy way to override

%{__sed} -i -e 's|^exec_prefix = /$|exec_prefix = %{_exec_prefix}|' Makefile

%build

# configure sub-packages from here

# letting the top level Makefile do it will lose setting from rpm

cd iscsiuio

autoreconf --install

%{configure}

cd ..

%{__make} OPTFLAGS="%{optflags} %{?__global_ldflags} -DUSE_KMOD -lkmod"

pushd libiscsi

%{__python2} setup.py build

%{__python3} setup.py build

touch -r libiscsi.doxy html/*

popd

%install

%{__make} DESTDIR=%{?buildroot} install_programs install_doc install_etc

# upstream makefile doesn't get everything the way we like it

rm $RPM_BUILD_ROOT%{_sbindir}/iscsi_discovery

rm $RPM_BUILD_ROOT%{_mandir}/man8/iscsi_discovery.8

%{__install} -pm 755 usr/iscsistart $RPM_BUILD_ROOT%{_sbindir}

%{__install} -pm 644 doc/iscsistart.8 $RPM_BUILD_ROOT%{_mandir}/man8

%{__install} -pm 644 doc/iscsi-iname.8 $RPM_BUILD_ROOT%{_mandir}/man8

%{__install} -d $RPM_BUILD_ROOT%{_sysconfdir}/logrotate.d

%{__install} -pm 644 iscsiuio/iscsiuiolog $RPM_BUILD_ROOT%{_sysconfdir}/logrotate.d

%{__install} -d $RPM_BUILD_ROOT%{_sharedstatedir}/iscsi

%{__install} -d $RPM_BUILD_ROOT%{_sharedstatedir}/iscsi/nodes

%{__install} -d $RPM_BUILD_ROOT%{_sharedstatedir}/iscsi/send_targets

%{__install} -d $RPM_BUILD_ROOT%{_sharedstatedir}/iscsi/static

%{__install} -d $RPM_BUILD_ROOT%{_sharedstatedir}/iscsi/isns

%{__install} -d $RPM_BUILD_ROOT%{_sharedstatedir}/iscsi/slp

%{__install} -d $RPM_BUILD_ROOT%{_sharedstatedir}/iscsi/ifaces

# for %%ghost

%{__install} -d $RPM_BUILD_ROOT/var/lock/iscsi

touch $RPM_BUILD_ROOT/var/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-shutdown.service $RPM_BUILD_ROOT%{_unitdir}

%{__install} -pm 644 etc/systemd/iscsid.service $RPM_BUILD_ROOT%{_unitdir}

%{__install} -pm 644 etc/systemd/iscsid.socket $RPM_BUILD_ROOT%{_unitdir}

%{__install} -pm 644 etc/systemd/iscsiuio.service $RPM_BUILD_ROOT%{_unitdir}

%{__install} -pm 644 etc/systemd/iscsiuio.socket $RPM_BUILD_ROOT%{_unitdir}

%{__install} -d $RPM_BUILD_ROOT%{_libexecdir}

%{__install} -pm 755 etc/systemd/iscsi-mark-root-nodes $RPM_BUILD_ROOT%{_libexecdir}

%{__install} -d $RPM_BUILD_ROOT%{_sysconfdir}/NetworkManager/dispatcher.d

%{__install} -pm 755 %{SOURCE4} $RPM_BUILD_ROOT%{_sysconfdir}/NetworkManager/dispatcher.d

%{__install} -d $RPM_BUILD_ROOT%{_tmpfilesdir}

%{__install} -pm 644 %{SOURCE5} $RPM_BUILD_ROOT%{_tmpfilesdir}/iscsi.conf

%{__install} -d $RPM_BUILD_ROOT%{_libdir}

%{__install} -pm 755 libiscsi/libiscsi.so.0 $RPM_BUILD_ROOT%{_libdir}

%{__ln_s}    libiscsi.so.0 $RPM_BUILD_ROOT%{_libdir}/libiscsi.so

%{__install} -d $RPM_BUILD_ROOT%{_includedir}

%{__install} -pm 644 libiscsi/libiscsi.h $RPM_BUILD_ROOT%{_includedir}

%{__install} -d $RPM_BUILD_ROOT%{python2_sitearch}

%{__install} -d $RPM_BUILD_ROOT%{python3_sitearch}

pushd libiscsi

%{__python2} setup.py install --skip-build --root $RPM_BUILD_ROOT

%{__python3} setup.py install --skip-build --root $RPM_BUILD_ROOT

popd

%post

/sbin/ldconfig

%systemd_post iscsi.service iscsi-shutdown.service iscsid.service iscsid.socket

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 iscsid.socket >/dev/null 2>&1 || :

fi

%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-shutdown.service iscsid.service iscsiuio.service iscsid.socket iscsiuio.socket

%preun iscsiuio

%systemd_preun iscsiuio.service iscsiuio.socket

%postun

/sbin/ldconfig

%systemd_postun

%postun iscsiuio

%systemd_postun

%triggerun -- iscsi-initiator-utils < 6.2.0.873-25

# prior to 6.2.0.873-24 iscsi.service was missing a Wants=remote-fs-pre.target

# this forces remote-fs-pre.target active if needed for a clean shutdown/reboot

# after upgrading this package

if [ $1 -gt 0 ]; then

    /usr/bin/systemctl -q is-active iscsi.service

    if [ $? -eq 0 ]; then

        /usr/bin/systemctl -q is-active remote-fs-pre.target

        if [ $? -ne 0 ]; then

            SRC=`/usr/bin/systemctl show --property FragmentPath remote-fs-pre.target | cut -d= -f2`

            DST=/run/systemd/system/remote-fs-pre.target

            if [ $SRC != $DST ]; then

                cp $SRC $DST

            fi

            sed -i 's/RefuseManualStart=yes/RefuseManualStart=no/' $DST

            /usr/bin/systemctl daemon-reload >/dev/null 2>&1 || :

            /usr/bin/systemctl start remote-fs-pre.target >/dev/null 2>&1 || :

        fi

    fi

fi

# added in 6.2.0.873-25

if [ $1 -gt 0 ]; then

    systemctl start iscsi-shutdown.service >/dev/null 2>&1 || :

fi

%files

%doc README

%dir %{_sharedstatedir}/iscsi

%dir %{_sharedstatedir}/iscsi/nodes

%dir %{_sharedstatedir}/iscsi/isns

%dir %{_sharedstatedir}/iscsi/static

%dir %{_sharedstatedir}/iscsi/slp

%dir %{_sharedstatedir}/iscsi/ifaces

%dir %{_sharedstatedir}/iscsi/send_targets

%ghost %{_var}/lock/iscsi

%ghost %{_var}/lock/iscsi/lock

%{_unitdir}/iscsi.service

%{_unitdir}/iscsi-shutdown.service

%{_unitdir}/iscsid.service

%{_unitdir}/iscsid.socket

%{_libexecdir}/iscsi-mark-root-nodes

%{_sysconfdir}/NetworkManager/dispatcher.d/04-iscsi

%{_tmpfilesdir}/iscsi.conf

%dir %{_sysconfdir}/iscsi

%attr(0600,root,root) %config(noreplace) %{_sysconfdir}/iscsi/iscsid.conf

%{_sbindir}/iscsi-iname

%{_sbindir}/iscsiadm

%{_sbindir}/iscsid

%{_sbindir}/iscsistart

%{_libdir}/libiscsi.so.0

%{_mandir}/man8/iscsi-iname.8.gz

%{_mandir}/man8/iscsiadm.8.gz

%{_mandir}/man8/iscsid.8.gz

%{_mandir}/man8/iscsistart.8.gz

%files iscsiuio

%{_sbindir}/iscsiuio

%{_unitdir}/iscsiuio.service

%{_unitdir}/iscsiuio.socket

%config(noreplace) %{_sysconfdir}/logrotate.d/iscsiuiolog

%{_mandir}/man8/iscsiuio.8.gz

%files devel

%doc libiscsi/html

%{_libdir}/libiscsi.so

%{_includedir}/libiscsi.h

%files -n python-%{name}

%{python2_sitearch}/*

%files -n python3-%{name}

%{python3_sitearch}/*

%changelog

* Fri Feb 19 2016 Chris Leech <cleech@redhat.com> - 6.2.0.873-33.git4c1f2d9

- sync with upstream

- sysfs handling changes to speed up operations over large number of sessions

* Thu Feb 04 2016 Fedora Release Engineering <releng@fedoraproject.org> - 6.2.0.873-32.git4c9d6f9

- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild

* Wed Feb  3 2016 Michael Schwendt <mschwendt@fedoraproject.org> - 6.2.0.873-31.git4c9d6f9

- BuildRequires: isns-utils-static for -lisns (bz #1291913)

* Tue Nov 03 2015 Robert Kuska <rkuska@redhat.com> - 6.2.0.873-30.git4c9d6f9

- Rebuilt for Python3.5 rebuild

* Tue Oct 06 2015 Chris Leech <cleech@redhat.com> - 6.2.0.873-29.git4c9d6f9

- rebase with upstream, change Source0 url to github

- build with external isns-utils

* Mon Oct 05 2015 Chris Leech <cleech@redhat.com> - 6.2.0.873-28.git6aa2c9b

- fixed broken multiple trigger scripts, removed old pre-systemd migration triggers

- added libiscsi session API patch (bz #1262279)

* Wed Jun 17 2015 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 6.2.0.873-27.git6aa2c9b

- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild

* Wed Jun 10 2015 Chris Leech <cleech@redhat.com> - 6.2.0.873-26.git6aa2c9b

- rebase to upstream snapshot

- add patch to improve GIL lock performance in libiscsi

- Split Python 2 and Python 3 bindings out into subpackages

* Wed Jan 28 2015 Chris Leech <cleech@redhat.com> - 6.2.0.873-25.gitc9d830b

- split out session logout on shutdown to a separate service

- 985321 roll up libiscsi patches, update python bindings to support python3

- scriptlets were never split out properly for the iscsiuio subpackage

- fix regression in network interface binding

- created iscsi-shutdown.service to ensure that session cleanup happens

- Add --with-slp=no

- segfault from unexpected netlink event during discovery

- inhibit strict aliasing optimizations in iscsiuio, rpmdiff error

* Thu Oct 23 2014 Chris Leech <cleech@redhat.com> - 6.2.0.873-24.gitc9d830b

- sync with upstream v2.0.873-84-gc9d830b

- ignore iscsiadm return in iscsi.service

- make sure systemd order against remote mounts is correct

- add discovery as a valid mode in iscsiadm.8

- make sure to pass --with-security=no to isns configure

* Sat Aug 16 2014 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 6.2.0.873-23

- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild

* Sat Jun 07 2014 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 6.2.0.873-22

- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild

* Mon Apr 14 2014 Chris Leech <cleech@redhat.com> - 6.2.0.873-21

- boot session handling improvements

- split out iscsiuio into a seperate sub-package

- sync with new upstream additions

- revert change to return code when calling login_portal for sessions

  that already exist, as it impacts users scripting around iscsiadm

* Tue Dec 10 2013 Chris Leech <cleech@redhat.com> - 6.2.0.873-17

- fix regression in glob use, inappropriate error code escape

- clean up dead node links from discovery when reusing tpgt

* Mon Nov 25 2013 Chris Leech <cleech@redhat.com> - 6.2.0.873-16

- fix iscsiuio socket activation

- have systemd start socket units on iscsiadm use, if not already listening

* Sun Sep 15 2013 Chris Leech <cleech@redhat.com> - 6.2.0.873-15

- move /sbin to /usr/sbin

- use rpm macros in install rules

* Fri Sep 13 2013 Chris Leech <cleech@redhat.com> - 6.2.0.873-14

- fix iscsiuio hardened build and other compiler flags

* Fri Aug 23 2013 Andy Grover <agrover@redhat.com> - 6.2.0.873-13

- Fix patch 0041 to check session != NULL before calling iscsi_sysfs_read_boot()

* Tue Aug 20 2013 Chris Leech <cleech@redhat.com> - 6.2.0.873-12

- fix regression in last build, database records can't be accessed

* Mon Aug 19 2013 Chris Leech <cleech@redhat.com> - 6.2.0.873-11

- iscsi boot related fixes

  make sure iscsid gets started if there are any boot sessions running

  add reload target to fix double session problem when restarting from NM

  don't rely on session list passed from initrd, never got fully implemented

  remove patches related to running iscsid from initrd, possible to revisit later

* Sun Aug 18 2013 Chris Leech <cleech@redhat.com> - 6.2.0.873-10

- sync with upstream git, minor context fixes after rebase of out-of-tree patches

- iscsiuio is merged upstream, remove old source archive and patches

- spec cleanups to fix rpmlint issues

* Sun Aug  4 2013 Peter Robinson <pbrobinson@fedoraproject.org> 6.2.0.873-9

- Fix FTBFS, cleanup spec

* Sat Aug 03 2013 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 6.2.0.873-8

- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild

* Tue Jun 11 2013 Chris Leech <cleech@redhat.com> - 6.2.0.873-7

- Use the systemd tmpfiles service to recreate lockfiles in /var/lock

- 955167 build as a position independent executable

- 894576 fix order of setuid/setgid and drop additional groups

* Tue May 28 2013 Chris Leech <cleech@redhat.com> - 6.2.0.873-6

- Don't have iscsiadm scan for autostart record if node db is empty (bug #951951)

* Tue Apr 30 2013 Orion Poplawski <orion@cora.nwra.com> - 6.2.0.873-5

- Fix typo in NM dispatcher script (bug #917058)

* Thu Feb 21 2013 Chris Leech <cleech@redhat.com> - 6.2.0.873-4

- build with libkmod support, instead of calling out to modprobe

- enable socket activation by default

* Thu Jan 24 2013 Kalev Lember <kalevlember@gmail.com> - 6.2.0.873-3

- Fix the postun script to not use ldconfig as the interpreter

* Wed Jan 23 2013 Chris Leech <cleech@redhat.com> - 6.2.0.873-2

- package iscsi_mark_root_nodes script, it's being referenced by the unit files

* Tue Jan 22 2013 Chris Leech <cleech@redhat.com> - 6.2.0.873-1

- rebase to new upstream code

- systemd conversion

- 565245 Fix multilib issues caused by timestamp in doxygen footers

* Thu Jul 19 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 6.2.0.872-19

- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild

* Tue Feb 14 2012 Mike Christie <mchristi@redhat.com> 6.2.0.872.18

- 789683 Fix boot slow down when the iscsi service is started

  (regression added in 6.2.0.872.16 when the nm wait was added).

* Mon Feb 6 2012 Mike Christie <mchristi@redhat.com> 6.2.0.872.17

- 786174 Change iscsid/iscsi service startup, so it always starts

  when called.

* Sat Feb 4 2012 Mike Christie <mchristi@redhat.com> 6.2.0.872.16

- 747479 Fix iscsidevs handling of network requirement

* Fri Jan 13 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 6.2.0.872-15

- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild

* Wed Nov 30 2011 Mike Christie <mcrhsit@redhat.com> 6.2.0.872.14

- Fix version string to reflect fedora and not rhel.

* Tue Oct 18 2011 Mike Christie <mcrhsit@redhat.com> 6.2.0.872.13

- Update iscsi tools.

* Sat Apr 30 2011 Hans de Goede <hdegoede@redhat.com> - 6.2.0.872-12

- Change iscsi init scripts to check for networking being actually up, rather

  then for NetworkManager being started (#692230)

* Tue Apr 26 2011 Hans de Goede <hdegoede@redhat.com> - 6.2.0.872-11

- Fix iscsid autostarting when upgrading from an older version

  (add iscsid.startup key to iscsid.conf on upgrade)

- Fix printing of [ OK ] when successfully stopping iscsid

- systemd related fixes:

 - Add Should-Start/Stop tgtd to iscsi init script to fix (re)boot from

   hanging when using locally hosted targets

 - %%ghost /var/lock/iscsi and contents (#656605)

* Mon Apr 25 2011 Mike Christie <mchristi@redhat.com> 6.2.0.872-10

- Fix iscsi init scripts check for networking being up (#692230)

* Wed Feb 09 2011 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 6.2.0.872-9

- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild