diff --git a/iscsi-initiator-utils.spec b/iscsi-initiator-utils.spec index 0d68f45..aee8969 100644 --- a/iscsi-initiator-utils.spec +++ b/iscsi-initiator-utils.spec @@ -8,7 +8,11 @@ Summary: iSCSI daemon and utility programs Name: iscsi-initiator-utils Version: 6.%{open_iscsi_version}.%{open_iscsi_build} -Release: 8%{?dist} +Release: 9%{?dist} +Group: System Environment/Daemons +License: GPLv2+ +URL: http://www.open-iscsi.org + Source0: http://www.open-iscsi.org/bits/open-iscsi-%{open_iscsi_version}-%{open_iscsi_build}.tar.gz Source1: iscsiuio-%{iscsiuio_version}.tar.gz Source4: 04-iscsi @@ -56,11 +60,7 @@ Patch77: 0077-iscsiuio-document-pidfile-option.patch Patch99: 0099-use-Red-Hat-version-string-to-match-RPM-package-vers.patch -Group: System Environment/Daemons -License: GPLv2+ -URL: http://www.open-iscsi.org -Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -BuildRequires: openssl-devel flex bison python-devel doxygen glibc-static kmod-devel +BuildRequires: openssl-devel flex bison python-devel doxygen glibc-static kmod-devel systemd-devel # For dir ownership Requires(post): systemd Requires(preun): systemd @@ -145,7 +145,6 @@ popd %install -rm -rf $RPM_BUILD_ROOT mkdir -p $RPM_BUILD_ROOT/sbin mkdir -p ${RPM_BUILD_ROOT}%{_mandir}/man8 mkdir -p $RPM_BUILD_ROOT/etc/iscsi @@ -195,9 +194,6 @@ install -p -m 755 libiscsi/build/lib.linux-*/libiscsimodule.so \ touch $RPM_BUILD_ROOT/var/lock/iscsi/lock -%clean -rm -rf $RPM_BUILD_ROOT - %post /sbin/ldconfig @@ -239,7 +235,6 @@ fi /bin/systemctl try-restart iscsi.service >/dev/null 1>&1 || : %files -%defattr(-,root,root) %doc README %dir %{_var}/lib/iscsi %dir %{_var}/lib/iscsi/nodes @@ -267,12 +262,14 @@ fi %{_sysconfdir}/logrotate.d/iscsiuiolog %files devel -%defattr(-,root,root,-) %doc libiscsi/html %{_libdir}/libiscsi.so %{_includedir}/libiscsi.h %changelog +* Sun Aug 4 2013 Peter Robinson 6.2.0.873-9 +- Fix FTBFS, cleanup spec + * Sat Aug 03 2013 Fedora Release Engineering - 6.2.0.873-8 - Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild @@ -305,11 +302,11 @@ fi * Thu Jul 19 2012 Fedora Release Engineering - 6.2.0.872-19 - Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild -* Mon Feb 14 2012 Mike Christie 6.2.0.872.18 +* Tue Feb 14 2012 Mike Christie 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 5 2012 Mike Christie 6.2.0.872.17 +* Mon Feb 6 2012 Mike Christie 6.2.0.872.17 - 786174 Change iscsid/iscsi service startup, so it always starts when called. @@ -343,245 +340,3 @@ fi * Wed Feb 09 2011 Fedora Release Engineering - 6.2.0.872-9 - Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild - -* Wed Jul 21 2010 David Malcolm - 6.2.0.872-8 -- Rebuilt for https://fedoraproject.org/wiki/Features/Python_2.7/MassRebuild - -* Fri Jul 12 2010 Mike Christie 6.2.0.872.7 -- Sync to upstream open-iscsi-2.0-872-rc4 which fixes: - iscsiadm discovery port handling, add discoveryd init script - support, move from iscsid.conf to discovery db discoveryd settings, - and add discoverydb mode support. - -* Thu Jun 10 2010 Mike Christie 6.2.0.872.6 -- Fix last patch. - -* Wed Jun 9 2010 Mike Christie 6.2.0.872.5 -- Fix iscsiadm handling of port argument when it is not the default 3260. - -* Thu May 6 2010 Mike Christie 6.2.0.872.4 -- Fix iscsi script operations to check for offload drivers in rh_status -- Fix iscsiadm logging to not trigger iscsi script error detection - -* Wed May 5 2010 Mike Christie 6.2.0.872.3 -- 578455 Fix initial R2T=0 handling for be2iscsi - -* Wed Mar 31 2010 Mike Christie 6.2.0.872.2 -- 578455 Fix handling of MaxXmitDataSegmentLength=0 for be2iscsi - -* Wed Mar 31 2010 Mike Christie 6.2.0.872.1 -- 578455 Fix handling of MaxXmitDataSegmentLength=0 - -* Wed Mar 24 2010 Mike Christie 6.2.0.872.0 -- 516444 Add iSNS SCN handling (rebased to open-iscsi-2.0-872-rc1-) -- Update brcm to 0.5.7 - -* Sun Feb 14 2010 Hans de Goede 6.2.0.870-13 -- Preserve timestamps on doxygen generated files -- Fix FTBFS (#565038) - -* Mon Feb 8 2010 Mike Christie 6.2.0.871.1.1-3 -- Add spec patch comments. - -* Thu Jan 21 2010 Mike Christie 6.2.0.871.1.1-2 -- 556985 Fix up init.d iscsid script to remove offload modules and - load be2iscsi. -- Enable s390/s390x - -* Fri Jan 15 2010 Mike Christie 6.2.0.871.1.1-1 -- Sync to upstream -- 529324 Add iscsi-iname and iscsistart man page -- 463582 OF/iBFT support - -* Thu Jan 7 2010 Hans de Goede 6.2.0.870-12 -- Change python_sitelib macro to use %%global as the new rpm will break - using %%define here, see: - https://www.redhat.com/archives/fedora-devel-list/2010-January/msg00093.html - -* Tue Dec 1 2009 Hans de Goede 6.2.0.870-11 -- Own /etc/iscsi (#542849) -- Do not own /etc/NetworkManager/dispatcher.d (#533700) - -* Fri Jul 24 2009 Fedora Release Engineering - 6.2.0.870-10.1 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild - -* Fri May 22 2009 Dan Horak 6.2.0.870-9.1 -- drop the s390/s390x ExcludeArch - -* Mon Apr 27 2009 Hans de Goede 6.2.0.870-9 -- Don't crash when asked to parse the ppc firmware table more then - once (which can be done from libiscsi) (#491363) - -* Fri Apr 3 2009 Hans de Goede 6.2.0.870-8 -- Stop the NM script from exiting with an error status when it - didn't do anything (#493411) - -* Fri Mar 20 2009 Hans de Goede 6.2.0.870-7 -- libiscsi: use fwparam_ibft_sysfs() instead of fw_get_entry(), as - the latter causes stack corruption (workaround #490515) - -* Sat Mar 14 2009 Terje Rosten - 6.2.0.870-6 -- Add glibc-static to buildreq to build in F11 - -* Wed Feb 25 2009 Fedora Release Engineering - 6.2.0.870-5 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild - -* Thu Feb 12 2009 Hans de Goede 6.2.0.870-4 -- Fix libiscsi.discover_sendtargets python method to accept None as valid - authinfo argument (#485217) - -* Wed Jan 28 2009 Hans de Goede 6.2.0.870-3 -- Fix reading of iBFT firmware with newer kernels - -* Wed Jan 28 2009 Hans de Goede 6.2.0.870-2 -- Add libiscsi iscsi administration library and -devel subpackage - -* Tue Nov 25 2008 Mike Christie 6.2.0.870-1.0 -- Rebase to upstream - -* Thu Nov 6 2008 Hans de Goede 6.2.0.870-0.2.rc1 -- Add force-start iscsid initscript option and use that in "patch to make - iscsiadm start iscsid when needed" so that iscsid will actual be started - even if there are no iscsi disks configured yet (rh 470437) -- Do not start iscsid when not running when iscsiadm -k 0 gets executed - (rh 470438) - -* Tue Sep 30 2008 Hans de Goede 6.2.0.870-0.1.rc1 -- Rewrite SysV initscripts, fixes rh 441290, 246960, 282001, 436175, 430791 -- Add patch to make iscsiadm complain and exit when run as user instead - of hang spinning for the database lock -- Add patch to make iscsiadm start iscsid when needed (rh 436175 related) -- Don't start iscsi service when network not yet up (in case of using NM) - add NM dispatcher script to start iscsi service once network is up - -* Mon Jun 30 2008 Mike Christie - 6.2.0.870 -- Rebase to open-iscsi-2-870 -- 453282 Handle sysfs changes. - -* Fri Apr 25 2008 Mike Christie - 6.2.0.868-0.7 -- 437522 log out sessions that are not used for root during "iscsi stop". - -* Fri Apr 4 2008 Mike Christie - 6.2.0.868-0.6 -- Rebase to RHEL5 to bring in bug fixes. -- 437522 iscsi startup does not need to modify with network startup. -- 436175 Check for running sessions when stopping service. - -* Wed Feb 5 2008 Mike Christie - 6.2.0.868-0.3 -- Rebase to upstream and RHEL5. -- 246960 LSB init script changes. - -* Fri Oct 5 2007 Mike Christie - 6.2.0.865-0.2 -- Rebase to upstream's bug fix release. -- Revert init script startup changes from 225915 which reviewers did - not like. - -* Mon Jun 20 2007 Mike Christie - 6.2.0.754-0.1 -- 225915 From Adrian Reber - Fix up spec and init files for rpmlint. - -* Tue Feb 6 2007 Mike Christie - 6.2.0.754-0.0 -- Rebase to upstream. -- Add back --map functionality but in session mode to match RHEL5 fixes -- Break up iscsi init script into two, so iscsid can be started early for root - -* Tue Nov 28 2006 Mike Christie - 6.2.0.747-0.0 -- Fix several bugs in actor.c (iscsi scheduling). This should result -- in better dm-multipath intergation and fix bugs where time outs -- or requests were missed or dropped. -- Set default noop timeout correctly. - -* Sat Nov 25 2006 Mike Christie - 6.2.0.742-0.0 -- Don't flood targets with nop-outs. - -* Fri Nov 24 2006 Mike Christie - 6.2.0.737-0.0 -- Add commands missing from RHEL4/RHEL3 and document iscsid.conf. -- Fixup README. - -* Mon Nov 7 2006 Mike Christie - 6.2.0.695-0.8 -- Rebase to upstream open-iscsi-2.0-730. - -* Tue Oct 17 2006 Mike Christie - 6.2.0.695-0.7 -- Change period to colon in default name - -* Thu Oct 5 2006 Mike Christie - 6.2.0.695-0.6 -- BZ 209523 make sure the network is not going to get shutdown so -iscsi devices (include iscsi root and dm/md over iscsi) get syncd. -- BZ 209415 have package create iscsi var dirs - -* Tue Oct 3 2006 Mike Christie - 6.2.0.695-0.5 -- BZ 208864 move /etc/iscsi/nodes and send_targets to /var/lib/iscsi - -* Mon Oct 1 2006 Mike Christie - 6.2.0.695-0.4 -- BZ 208548 move /etc/iscsi/lock to /var/lock/iscsi/lock - -* Wed Sep 27 2006 Jeremy Katz - 6.2.0.695-0.3 -- Add fix for initscript with pid file moved - -* Tue Sep 26 2006 Mike Christie - 6.2.0.695-0.2 -- BZ 208050 - change default initiator name to reflect redhat -- Move pid from /etc/iscsi to /var/run/iscsid.pid - -* Fri Sep 15 2006 Mike Christie - 6.2.0.695-0.1 -- Add compat with FC kernel so iscsid will pass startup checks and run. -- Fix bug when using hw iscsi and software iscsi and iscsid is restarted. -- Fix session matching bug when hw and software iscsi is both running - -* Tue Sep 5 2006 Jeremy Katz - 6.1.1.685-0.1 -- Fix service startup -- Fix another case where cflags weren't being used - -* Mon Aug 28 2006 Mike Christie - 6.1.1.685 -- Rebase to upstream to bring in many bug fixes and rm db. -- iscsi uses /etc/iscsi instead of just etc now - -* Fri Jul 21 2006 Jeremy Katz - 6.1.1.645-1 -- fix shutdown with root on iscsi - -* Thu Jul 13 2006 Mike Christie - 6.1.1.645 -- update to upstream 1.1.645 -- Note DB and interface changed so you must update kernel, tools and DB - -* Wed Jul 12 2006 Jesse Keating - 6.0.5.595-2.1.1 -- rebuild - -* Wed Jul 12 2006 Jesse Keating - 6.0.5.595-2.1 -- rebuild - -* Wed Jun 21 2006 Mike Christie - 6.0.5.595-2 -- add PatM's statics.c file. This is needed for boot since - there is no getpwuid static available at that time. -* Tue Jun 20 2006 Jeremy Katz - 6.0.5.595-1 -- ensure that we respect %%{optflags} -- cleaned up initscript to make use of standard functions, return right - values and start by default -- build iscsistart as a static binary for use in initrds - -* Tue May 30 2006 Mike Christie -- rebase package to svn rev 595 to fix several bugs - NOTE!!!!!!!! This is not compatible with the older open-iscsi modules - and tools. You must upgrade. - -* Thu May 18 2006 Mike Christie -- update package to open-iscsi svn rev 571 - NOTE!!!!!!!! This is not compatible with the older open-iscsi modules - and tools. You must upgrade. - -* Fri Apr 7 2006 Mike Christie -- From Andy Henson : - Autogenerate /etc/initiatorname.iscsi during install if not already present -- Remove code to autogenerate /etc/initiatorname.iscsi from initscript -- From dan.y.roche@gmail.com: - add touch and rm lock code -- update README -- update default iscsid.conf. "cnx" was not supported. The correct - id was "conn". - -* Fri Feb 10 2006 Jesse Keating - 5.0.5.476-0.1 -- bump again for double-long bug on ppc(64) - -* Mon Jan 23 2006 Mike Christie -- rebase package to bring in ppc64 unsigned long vs unsigned - long long fix and iscsadm return value fix. Also drop rdma patch - becuase it is now upstream. -* Wed Dec 14 2005 Mike Christie -- initial packaging -