debian/0000775000000000000000000000000013423553240007171 5ustar debian/compat0000664000000000000000000000000213064065365010376 0ustar 5 debian/iscsitarget.default0000664000000000000000000000016313064065365013067 0ustar ISCSITARGET_ENABLE=false ISCSITARGET_MAX_SLEEP=3 # ietd options # See ietd(8) for details ISCSITARGET_OPTIONS="" debian/copyright0000664000000000000000000000150313064065365011132 0ustar This package was debianized by Philipp Hug on Tue, 29 Mar 2005 20:57:04 +0200. It was downloaded from http://iscsitarget.sourceforge.net/ Upstream authors: Copyright (C) 2001-2003 InterOperability Lab (IOL) Copyright (C) 2002-2003 Ardis Technolgies Copyright (C) 2005 MING Zhang Copyright (C) 2006 FUJITA Tomonori and various contributions from iscsitarget-devel@sourceforge.net: Ali Lehmann Arne Redlich Bastiaan Bakker Dave Jiang Emmanuel Florac Florian Zierer Frederic Temporelli Henry Liu Juhani Rautiainen Junjiro Okajima K Chapman Krzysztof Blaszkowski Libor Vanek Philipp Hug Richard Bollinger Robert Whitehead Ross S. W. Walker Wang Zhenyu License: GNU General Public License version 2, see /usr/share/common-licenses/GPL-2 for more information. debian/iscsitarget-dkms.prerm0000664000000000000000000000036413064065365013527 0ustar #!/bin/sh set -e package=iscsitarget-dkms name=iscsitarget version=`dpkg-query -W -f='${Version}' "$package" \ |rev|cut -d- -f2-|rev|cut -d':' -f2|tr -d "\n"` dkms remove -m "$name" -v "$version" --all || true #DEBHELPER# exit 0 debian/source/0000775000000000000000000000000013064065365010500 5ustar debian/source/format0000664000000000000000000000001413064065365011706 0ustar 3.0 (quilt) debian/control.modules.in0000664000000000000000000000153713064065365012665 0ustar Source: iscsitarget Section: net Priority: optional Maintainer: Philipp Hug Uploaders: Frederik Schüler Build-Depends: debhelper (>> 5.0.0), linux-headers-_KVERS_ Standards-Version: 3.8.0 Package: iscsitarget-module-_KVERS_ Architecture: any Provides: iscsitarget-module Description: iSCSI Enterprise Target module for Linux (kernel _KVERS_) iSCSI Enterprise Target is for building an iSCSI storage system on Linux. It is aimed at developing an iSCSI target satisfying enterprise requirements. . This package contains the compiled kernel module for _KVERS_ . If you have compiled your own kernel, you will most likely need to build your own iscsitarget-modules. The iscsitarget-source package has been provided for use with the Debian kernel-package utility to produce a version of iscsitarget-module for your kernel. debian/configure_features.sh0000775000000000000000000000045013205071262013403 0ustar #!/bin/sh cfgfile=$1 echo foo $cfgfile > /tmp/foo touch $cfgfile srctree="/lib/modules/$kernelver/build" if ! egrep -A 10 '\> $cfgfile fi debian/changelog0000664000000000000000000005504613423553240011055 0ustar iscsitarget (1.4.20.3+svn499-0ubuntu2.6) trusty; urgency=medium * Fix ADT requirements to run daemon test only when isolation level machine is available. -- Stefan Bader Mon, 28 Jan 2019 11:16:06 +0100 iscsitarget (1.4.20.3+svn499-0ubuntu2.5) trusty; urgency=medium * Fix daemon dep8 test so it really tests for the running daemon (LP: #1734855). -- Stefan Bader Thu, 01 Feb 2018 16:48:03 +0100 iscsitarget (1.4.20.3+svn499-0ubuntu2.4) trusty; urgency=medium * Remove compat code for 4.4.0-84 and detect sock_recvmsg signature during build. (LP: #1732746) -- Thadeu Lima de Souza Cascardo Fri, 17 Nov 2017 17:47:16 +0000 iscsitarget (1.4.20.3+svn499-0ubuntu2.3) trusty; urgency=medium * d/p/(porting|compat|enable)-4.4.0-84.patch: Add compat code to build with Ubuntu 4.4.0-84 (LP: #1701697) -- Thadeu Lima de Souza Cascardo Wed, 12 Jul 2017 20:13:41 +0000 iscsitarget (1.4.20.3+svn499-0ubuntu2.2) trusty; urgency=medium * Backport compat changes to allow DKMS compiles for kernels up to 4.4 (LP: #1612627). - d/p/fix-build-4.3.patch: Fix source to compile with 4.3+ kernels. Thanks to Stefan Bader . - d/p/add-4.3-compat.patch: Add compat-4.3.patch to DKMS patches. Thanks to Stefan Bader . - d/p/enable-4.3-compat.patch: Enable compat-4.3 patch for DKMS builds. Thanks to Stefan Bader . -- Nishanth Aravamudan Mon, 20 Mar 2017 17:07:43 -0700 iscsitarget (1.4.20.3+svn499-0ubuntu2.1) trusty; urgency=low * Backport compat changes to allow DKMS compiles for kernels up to 3.19 (LP: #1483415). - d/p/fix-build-3.19: Modifies source to compile with 3.19 - d/p/add-compat-3.19: Adds compat patches without enabling them - d/p/enable-compat-3.19: Enables compat patches in the DKMS config * Add a check for the DKMS kernel module to d/tests/daemon dep-8 test (LP: #1496057) -- Stefan Bader Wed, 16 Sep 2015 13:29:48 +0200 iscsitarget (1.4.20.3+svn499-0ubuntu2) trusty; urgency=medium * debian/patches/enable-3.12-compat.patch: Ensure patches are applied correctly by dkms for kernels < 3.13. -- James Page Thu, 27 Mar 2014 20:14:11 +0000 iscsitarget (1.4.20.3+svn499-0ubuntu1) trusty; urgency=medium * New upstream snapshot including fixes for: - [r499] Compatibility with 3.13 kernel (LP: #1291641). - [r498] Fix backward compatibility patch rules for 3.x kernels. - [r497] Fix SERVICE ACTION IN / READ CAPACITY (16) - regression from r488. -- James Page Mon, 24 Mar 2014 13:13:42 +0000 iscsitarget (1.4.20.3+svn496-1ubuntu1) trusty; urgency=low * Merge from Debian unstable. Remaining changes: - d/iscsitarget.init: If module unloading fails after stopping ietd, report it but still exit zero since this doesn't justify causing package operations to fail. - d/docs: Install README.initiators and README.mcs. - d/p/*: Tidied redundant patches. * Dropped, included in new snapshot: - Re-sync with upstream accepted patches for 3.7->3.10 kernel support: - d/p/iscsitarget-svn495.patch: Support for 3.7 and 3.8 kernels - d/p/iscsitarget-svn496.patch: Support kernels up to and including 3.10. -- James Page Tue, 12 Nov 2013 11:11:50 +0000 iscsitarget (1.4.20.3+svn496-1) unstable; urgency=low * [798662d] Imported Upstream version 1.4.20.3+svn496 Closes: #717155 * [947f06d] Add README.source * [6e18336] Try harder to unload the kernel module. Thanks to David Mohr (Closes: #679515) * [ca83a57] Drop patch 001-fix-build-3.8.patch -- Ritesh Raj Sarraf Thu, 26 Sep 2013 18:15:08 +0530 iscsitarget (1.4.20.3+svn490-2ubuntu1) saucy; urgency=low * Merge from Debian unstable. Remaining changes: - d/iscsitarget.init: If module unloading fails after stopping ietd, report it but still exit zero since this doesn't justify causing package operations to fail. - d/docs: Install README.initiators and README.mcs. * Re-sync with upstream accepted patches for 3.7->3.10 kernel support: - d/p/iscsitarget-svn495.patch: Support for 3.7 and 3.8 kernels - d/p/iscsitarget-svn496.patch: Support kernels up to and including 3.10. * Dropped: - d/p/001-fix-build-3.8.patch: Dropped in preference to upstream committed patch. - d/p/*: Tidied redundant patches. -- James Page Fri, 05 Jul 2013 09:04:22 +0100 iscsitarget (1.4.20.3+svn490-2) unstable; urgency=low * Upload to unstable -- Ritesh Raj Sarraf Sun, 16 Jun 2013 14:07:47 +0530 iscsitarget (1.4.20.3+svn490-1) experimental; urgency=low * [6457029] Imported Upstream version 1.4.20.3+svn490 (Closes: #698757, #696383) * [22f9a74] Drop patches, applied upstream - inactive-sessions.patch - iscsitarget-prelim-1.4.20.3.patch - 0001-Makefile-changes-to-support-3.x-kernels.patch - 0002-Fix-send_data_rsp-to-handle-sense-data-correctly.patch - 0003-Compile-fix-for-kernels-3.1-and-3.2.patch * [1b1225b] Add patch 001-fix-build-3.8.patch -- Ritesh Raj Sarraf Fri, 12 Apr 2013 13:00:43 +0530 iscsitarget (1.4.20.2-11) experimental; urgency=low * [6dfdd7c] Add iscsitarget-dkms to Recommends and drop iscsitarget-module * [281b4a4] Update README.Debian explaining the new DKMS package. Thanks to Olaf van der Spek (Closes: #668382) * [a0d484c] Drop patch fix-build-3-2.patch * [afdf1df] Add patches from 1.4.20 stable branch (Closes: #685422) -- Ritesh Raj Sarraf Sat, 15 Sep 2012 12:55:24 +0530 iscsitarget (1.4.20.2-10ubuntu4) saucy; urgency=low * d/p/fix-3.10-kernel-match.patch: Fixup patch pattern matching for >= 3.10 kernels. * d/p/kernel-3.10-support.patch: Add support for Linux 3.10 (LP: #1195607). -- James Page Wed, 03 Jul 2013 09:27:28 +0100 iscsitarget (1.4.20.2-10ubuntu3) saucy; urgency=low * debian/tests: Add autopkgtest. -- Yolanda Fri, 10 May 2013 22:47:14 +0200 iscsitarget (1.4.20.2-10ubuntu2) raring; urgency=low * Fix compatibility with Linux 3.8 kernel (LP: #1117288): - d/p/iscsitarget-svn486.patch: Cherry picked patch from upstream VCS which adds support for 3.6 kernel. - d/p/fix-dkms.conf: Refreshed for backward compat < 3.6,3.8 kernel. - d/p/kernel-3.8-compat.patch: Fix compatibility Linux 3.8 kernel. -- James Page Tue, 12 Mar 2013 10:13:09 +0000 iscsitarget (1.4.20.2-10ubuntu1) quantal; urgency=low * Merge from Debian testing. Remaining changes: - d/iscsitarget.init: If module unloading fails after stopping ietd, report it but still exit zero since this doesn't justify causing package operations to fail. - d/docs: Install README.initiators and README.mcs. - d/p/fix-send-data-rsp.patch: Pick change @462 from upstream svn to prevent a assertion failure in iscsi.c@492. - d/p/linux-3.2-includes.patch: Add additional includes of linux/export.h and linux/module.h, resolving dkms build failures with > linux 3.2. - d/p/fix-dkms.patch: Add missing patch entries to the dkms.conf file. * Fix DKMS compatibility with Linux 3.5 kernel (LP: #1045706): - d/p/iscsitarget-svn{444,471}.patch: Cherry picked patches from upstream VCS trunk, resolving dkms build failures with > linux 3.5. - d/p/fix-linux3.5.patch: Rework usage of ioc_task_link, resolving dkms build failures with > linux 3.5. * Ensure ietadm can detect inactive sessions (LP: #967984): - d/p/iscsitarget-svn478.patch: Cherry picked patch from upstream VCS trunk which ensures that events are propagated correctly to ietd. -- James Page Tue, 04 Sep 2012 13:43:21 +0100 iscsitarget (1.4.20.2-10) unstable; urgency=low * [2bebbc2] don't prompt on modified conffiles. Thanks to Andreas Beckmann (Closes: #661397) * Upload to unstable -- Ritesh Raj Sarraf Wed, 14 Mar 2012 01:06:13 +0530 iscsitarget (1.4.20.2-9) experimental; urgency=low * [7ad9219] Clean up old sysctl knob. Thanks to Martin Braure de Calignon (Closes: #645582) * [0802fff] Use corrent message type. Thanks to Vincent Pelletier (Closes: #647923) * [dcab13f] Drop unmaintained iscsitarget-source package * [099cc1a] add quilt header to patch * [93dc585] Fix LSB Headers -- Ritesh Raj Sarraf Wed, 22 Feb 2012 18:39:35 +0530 iscsitarget (1.4.20.2-8) experimental; urgency=low * [735c872] Add patch to fix build on 3.2 kernels (Closes: #659560) -- Ritesh Raj Sarraf Wed, 15 Feb 2012 22:01:15 +0530 iscsitarget (1.4.20.2-7) unstable; urgency=low * [6ea2c52] Patch clean-up * [627d8e4] Enable hardened build flags. Thanks to Moritz Muehlenhoff (Closes: #656867) -- Ritesh Raj Sarraf Wed, 01 Feb 2012 00:43:21 +0530 iscsitarget (1.4.20.2-6) unstable; urgency=low * SVN 1.4.20@453 - Co-ordinated with upstream on the stability of the tree * [494142b] Drop double installation of upstream changelog. Thanks to Christian Pernegger (Closes: #633005) * [71de4f8] Add package linux-headers to Recommends. Thanks to George Shuklin (Closes: 636157, 628428) * [8344c44] Add support to provide daemon options. Thanks to Alfredo Sola, Robbert Rijkse (Closes: 609582, 545536) * [8208ade] Drop debian/30-iscsitarget.conf. (Closes: 636497) We should not play with kernel sysct knobs right from the package. Setting those values will depend on a per machine basis * [0e96f0e] Update Standards Version to 3.9.2. No changes required -- Ritesh Raj Sarraf Sun, 07 Aug 2011 02:09:59 +0530 iscsitarget (1.4.20.2-5ubuntu3) precise; urgency=low * d/patches/fix-send-data-rsp.patch: Pick change @462 from upstream svn to prevent a assertion failure in iscsi.c@492. (LP: #882540) -- Stefan Bader Wed, 11 Apr 2012 11:02:19 +0100 iscsitarget (1.4.20.2-5ubuntu2) precise; urgency=low * debian/patches/linux-3.2-includes.patch: Added additional includes of linux/export.h and a linux/module.h, resolving dkms build failures with > linux 3.2. Original patch courtesy of Kiall Mac Innes. (LP: #905987) -- Dave Walker (Daviey) Fri, 10 Feb 2012 12:16:11 +0000 iscsitarget (1.4.20.2-5ubuntu1) oneiric; urgency=low * Resynchronise with Debian experimental. Remaining changes: - If module unloading fails after stopping ietd, report it but still exit zero since this doesn't justify causing package operations to fail. - Install README.initiators and README.mcs. * Add missing patch entries to the dkms.conf file. -- Stefan Bader Thu, 30 Jun 2011 16:39:31 +0100 iscsitarget (1.4.20.2-5) experimental; urgency=low * Sync to 1.4.20 branch. This is equivalent of 1.4.20.3 and includes all commits up till revision 1.4.20@453 * Add linux-headers packages to Suggests (Closes: #628428) -- Ritesh Raj Sarraf Tue, 14 Jun 2011 09:30:01 +0530 iscsitarget (1.4.20.2-4expr2) experimental; urgency=low * Sync to 1.4.20 branch. This is equivalent of 1.4.20.3 and includes all commits up till revision 1.4.20@445 (Closes: #618682, #622318, #610309) -- Ritesh Raj Sarraf Tue, 26 Apr 2011 15:40:17 +0530 iscsitarget (1.4.20.2-4) unstable; urgency=low * Last upload was incorrect. Really upload to unstable now -- Ritesh Raj Sarraf Sat, 12 Feb 2011 01:59:17 +0530 iscsitarget (1.4.20.2-3) unstable; urgency=low * Upload to unstable -- Ritesh Raj Sarraf Thu, 10 Feb 2011 20:13:59 +0530 iscsitarget (1.4.20.2-2) experimental; urgency=low [ Michael Prokop ] * NIPQUAD definition has been removed in kernel 2.6.36, adjust kernel/conn.c accordingly so iscsitarget compiles against kernel 2.6.36. (Closes: #604641) -- Ritesh Raj Sarraf Sat, 08 Jan 2011 21:57:56 +0545 iscsitarget (1.4.20.2-1ubuntu1) maverick; urgency=low * Resynchronise with Debian (update to 1.4.20.2 in conjunction with recent kernel changes fixes LP: #604087). Remaining changes: - If module unloading fails after stopping ietd, report it but still exit zero since this doesn't justify causing package operations to fail. * Install README.initiators and README.mcs (LP: #606068). -- Colin Watson Fri, 20 Aug 2010 02:30:33 +0100 iscsitarget (1.4.20.2-1) unstable; urgency=low * New Upstream Bug Fix Release * Fix incorrect path installation. Correct path is /etc/iet/ * Update Standards Version to 3.9.1 (No changes required) * Add DKMS support for iscsitarget kernel module building * Add iscsitarget-dkms to Suggests * Change PID_FILE to ietd.pid. This was causing the ietd daemon to not be killed. Not very sure, perhaps upstream must have changed to ietd.pid from iscsi_trgt.pid (Closes: #589738) -- Ritesh Raj Sarraf Tue, 03 Aug 2010 13:38:08 +0530 iscsitarget (1.4.20.1-2) unstable; urgency=low * Change address to my official Debian address and remove the DMUA flag * Handle older kernel versions patches that upstream still supports. This should allow compiling iscsitarget with older kernels now. (Closes: #581200) * Drop initiators.deny file in further installations which is already deprecated upstream * Switch config files directory to /etc/ietd as upstream recommends it and document this change in NEWS.Debian * Add post-installation script to handle migration of old config file to the new location -- Ritesh Raj Sarraf Sat, 05 Jun 2010 22:52:42 +0530 iscsitarget (1.4.20.1-1) unstable; urgency=low * New Upstream Bugfix Release * Switch to 3.0 (quilt) source format -- Ritesh Raj Sarraf Mon, 03 May 2010 14:24:52 +0530 iscsitarget (1.4.20-1) unstable; urgency=low [ Philipp Hug ] * This package is group maintained now * Changed maintainer to alioth project mailing list [ Ritesh Raj Sarraf ] * New Upstream Release (Closes: #566509) * Add myself to Uploaders * LSB-ize the iscsitarget init script (Closes: #506588, #546477) * Add misc:Depends * Bump Standards Version. (No Changes Required) * Add DM Upload: yes * Add debian/source/format specifying the source format * Explain a little more about iscsitarget-module package and how it is made available, in README.Debian * Add Vcs headers -- Ritesh Raj Sarraf Sun, 18 Apr 2010 21:34:09 +0530 iscsitarget (1.4.19+svn275-ubuntu2) lucid; urgency=low * Install /etc/targets.allow. -- Colin Watson Fri, 23 Apr 2010 20:30:40 +0100 iscsitarget (1.4.19+svn275-ubuntu1) lucid; urgency=low * Merge from upstream SVN repo at svn://svn.berlios.de/iscsitarget/trunk -LP: #494693 -- Tim Gardner Wed, 09 Dec 2009 18:25:18 +0000 iscsitarget (0.4.17+svn229-1.4) unstable; urgency=low * Non-maintainer upload. * [f1d4105] Depend on procps (Closes: #569684) -- Guido Günther Tue, 16 Feb 2010 11:34:37 +0100 iscsitarget (0.4.17+svn229-1.3) unstable; urgency=low * Non-maintainer upload. * [2a179ca] Let propcs handle the sysctl knobs to make it more obvious to the sysadmin what's going on. (Closes: #543604) -- Guido Günther Sat, 23 Jan 2010 17:36:12 +0100 iscsitarget (0.4.17+svn229-1.2) unstable; urgency=low * Non-maintainer upload. * Include patch from Petter Reinholdtsen : - Fix incorrect provides and dependencies in init.d script (to solve release goal). (Closes: #542248) -- Michael Prokop Thu, 24 Sep 2009 00:05:36 +0200 iscsitarget (0.4.17+svn229-1.1) unstable; urgency=low * Non-maintainer upload. (Closes: #523374, #544941) * New upstream snapshot. * Bump Standards-Version to 3.8.3. -- Michael Prokop Fri, 11 Sep 2009 00:09:42 +0200 iscsitarget (0.4.16+svn162-3ubuntu1) jaunty; urgency=low * Merge from debian unstable, remaining changes (LP: #310321): - debian/control: Depend on lsb-base >= 3.2-14. - debian/prerm: Maintainer script to allow intrepid->jaunty upgrades of iscsitarget to succeed. - debian/iscsitarget.init: lsb-ized the entire init script. -- Nick Ellery Sun, 21 Dec 2008 13:40:23 -0800 iscsitarget (0.4.16+svn162-3) unstable; urgency=medium [ Jon Dowland ] * Add /etc/default/iscsitarget to determine whether to start the iscsitarget automatically or not. Default to not (environment might not have the correct module). Closes: #506099. -- Frederik Schüler Wed, 03 Dec 2008 15:07:17 +0100 iscsitarget (0.4.16+svn162-2ubuntu2) jaunty; urgency=low * debian/iscsitarget.prerm: Maintainer script to allow intrepid->jaunty upgrades of iscsitarget to succeed, if using the buggy iscsi_trgt.ko module that won't unload properly. -- Dustin Kirkland Mon, 24 Nov 2008 16:44:39 -0600 iscsitarget (0.4.16+svn162-2ubuntu1) jaunty; urgency=low * Merge from debian unstable, fixes LP: #298520 - Remaining changes: + debian/iscsitarget.init: lsb-ized the entire init script (Debian Bug: #506588) + debian/control: depend on lsb-base >= 3.2-14 - Dropped changes: + debian/rules, usr/misc.h: -D_GNU_SOURCE no longer required, __qelem is explicitly defined by source -- Dustin Kirkland Sat, 22 Nov 2008 15:14:12 -0600 iscsitarget (0.4.16+svn162-2) unstable; urgency=high * Fix initscript. (Closes: #484107) -- Frederik Schüler Sat, 04 Oct 2008 20:27:14 +0200 iscsitarget (0.4.16+svn162-1) unstable; urgency=low * New upstream snapshot. * Fix bashism in initscript. (Closes: #486035) * Bump standards to 3.8.0, no changes needed. * List all copyright holders and contributors in the copyright file. -- Frederik Schüler Mon, 30 Jun 2008 00:11:39 +0200 iscsitarget (0.4.15+svn148-2.1ubuntu2) intrepid; urgency=low * debian/rules, usr/misc.h: + Use of struct cred required -D_GNU_SOURCE (LP: #247360) + Enabling -D_GNU_SOURCE defines struct qelem so the local definition is unnessecary. -- Bobby R. Ward Thu, 10 Jul 2008 19:03:55 +0000 iscsitarget (0.4.15+svn148-2.1ubuntu1) intrepid; urgency=low * Merge from debian unstable, remaining changes: - Update kernel modules to build for several architectures. - Fixed init script. -- Chuck Short Tue, 17 May 2008 10:03:55 -0500 iscsitarget (0.4.15+svn148-2.1) unstable; urgency=low * Non-maintainer upload * Fix failure to build kernel modules for several architectures with kernel version 2.6.24 or later. (Closes: #480734) -- Ben Hutchings Mon, 19 May 2008 02:01:36 +0100 iscsitarget (0.4.15+svn148-2) unstable; urgency=high * Fix initscript, thanks to Gilles Mocellin for the patch. (Closes: #470411) -- Frederik Schüler Tue, 11 Mar 2008 23:01:45 +0100 iscsitarget (0.4.15+svn148-1) unstable; urgency=low * New upstream snapshot. - Adds support for 2.6.24 kernels. (Closes: #461753) * Fix bashism in initscript.(Closes: #464993) -- Frederik Schüler Tue, 19 Feb 2008 20:52:01 +0100 iscsitarget (0.4.15+svn145-1) unstable; urgency=low * New upstream snapshot. - support 2.6.23 kernels. (Closes: #449237) - fix ia64 FTBFS. (Closes: #457615) * Update to standards version 3.7.3, no changes needed. * Fix kbuild-clean target, thanks to Jeremy Laine for the fix. * Add lsb section to the iscsitarget initscript. * Add lintian override for /etc/ietd.conf permissions. -- Frederik Schüler Sat, 29 Dec 2007 22:53:26 +0100 iscsitarget (0.4.15-5ubuntu2) hardy; urgency=low * Correct bashisms in init script (LP: #160106) * Set maintainer to MOTU -- John Dong Thu, 31 Jan 2008 09:28:53 -0500 iscsitarget (0.4.15-5ubuntu1) hardy; urgency=low * Fix kernel source to build with 2.6.24. -- Chuck Short Tue, 29 Jan 2008 08:56:31 -0500 iscsitarget (0.4.15-5) unstable; urgency=high * Urgenc: high due to security update. * Fix /etc/ietd.conf permissions. (Closes: #448873) * Fix module-assistant build. Thanks to Franklin PIAT for the patch. (Closes: #448195) -- Frederik Schüler Sun, 04 Nov 2007 18:54:41 +0100 iscsitarget (0.4.15-4) unstable; urgency=low [ Frederik Schüler ] * Fix build failure on linux-2.6.22 (Closes: #432522) * Add toplevel Makefile to the module sources (Closes: #431765) * iscsitarget-source: do not recommend iscsitarget (Closes: #433318) -- Frederik Schüler Mon, 24 Sep 2007 12:15:50 +0200 iscsitarget (0.4.15-3) unstable; urgency=low * Don't depend on iscsitarget-module (Closes: #431302) -- Philipp Hug Mon, 02 Jul 2007 15:39:36 +0200 iscsitarget (0.4.15-2) unstable; urgency=low * Uploaded to unstable -- Philipp Hug Sat, 16 Jun 2007 21:48:42 +0200 iscsitarget (0.4.15-1) experimental; urgency=low * New upstream release * Uploaded to experimental (Closes: #304330) -- Philipp Hug Mon, 16 Apr 2007 22:18:57 +0200 iscsitarget (0.4.14+svn92-1) UNRELEASED; urgency=low * New upstream snapshot for kernels 2.6.19 and later. -- Frederik Schüler Sun, 14 Jan 2007 23:05:56 +0100 iscsitarget (0.4.13-3) unstable; urgency=low * Added missing config files -- Philipp Hug Sun, 26 Mar 2006 15:30:10 +0000 iscsitarget (0.4.13-2) unstable; urgency=low * Fixed init script * Build-Dependency on libssl-dev * depmod -a was not called * Recompiled on unstable/sid -- Philipp Hug Sun, 22 Jan 2006 18:23:50 +0100 iscsitarget (0.4.13-1) unstable; urgency=low * New upstream release -- Philipp Hug Sun, 22 Jan 2006 17:26:19 +0100 iscsitarget (0.4.11-1) experimental; urgency=low * New upstream release -- Philipp Hug Thu, 14 Jul 2005 13:07:45 +0200 iscsitarget (0.4.6-2) experimental; urgency=low * Fixed kernel module build * Added patch for < 2.6.11 kernels, not yet applied * Added depmod -a to postinst * Changed section to net -- Philipp Hug Tue, 29 Mar 2005 23:12:36 +0200 iscsitarget (0.4.6-1) experimental; urgency=low * Initial Release. -- Philipp Hug Tue, 29 Mar 2005 20:57:04 +0200 debian/iscsitarget-module-_KVERS_.postinst0000664000000000000000000000005313064065365015775 0ustar #!/bin/sh set -e depmod -a & #DEBHELPER# debian/iscsitarget.postinst0000664000000000000000000000061413064065365013327 0ustar #!/bin/sh set -e dpkg-maintscript-helper mv_conffile /etc/ietd.conf /etc/iet/ietd.conf -- "@" dpkg-maintscript-helper mv_conffile /etc/initiators.allow /etc/iet/initiators.allow -- "@" dpkg-maintscript-helper mv_conffile /etc/initiators.deny /etc/iet/initiators.deny -- "@" # Clean up old cruft dpkg-maintscript-helper rm_conffile /etc/sysctl.d/30-iscsitarget.conf -- "@" #DEBHELPER# exit 0 debian/control0000664000000000000000000000340513064066674010611 0ustar Source: iscsitarget Section: net Priority: optional Maintainer: Ubuntu Developers XSBC-Original-Maintainer: Debian iSCSI Maintainers Uploaders: Philipp Hug , Guido Guenther , Frederik Schüler , Ritesh Raj Sarraf Build-Depends: debhelper (>= 5.0.0), libssl-dev, bzip2 Standards-Version: 3.9.2 Homepage: http://iscsitarget.sourceforge.net/ Vcs-Git: git://git.debian.org/git/pkg-iscsi/iscsitarget.git Vcs-Browser: http://git.debian.org/?p=pkg-iscsi/iscsitarget.git XS-Testsuite: autopkgtest Package: iscsitarget Architecture: any Depends: ${shlibs:Depends}, ${misc:Depends}, procps, lsb-base (>= 3.2-14) Recommends: iscsitarget-dkms Conflicts: iscsitarget-source Description: iSCSI Enterprise Target userland tools iSCSI Enterprise Target is for building an iSCSI storage system on Linux. It is aimed at developing an iSCSI target satisfying enterprise requirements. . This package contains the userland part; you require the kernel module for proper operation. Package: iscsitarget-dkms Architecture: all Depends: dkms (>= 1.95), make, ${misc:Depends} Recommends: linux-headers Suggests: iscsitarget Conflicts: iscsitarget-source Description: iSCSI Enterprise Target kernel module source - dkms version iSCSI Enterprise Target is for building an iSCSI storage system on Linux. It is aimed at developing an iSCSI target satisfying enterprise requirements. . This package provides the source code for the iscsitarget kernel module. The iscsitarget package is also required in order to make use of this module. Kernel source or headers are required to compile this module. . This package contains the source to be built with dkms. debian/iscsitarget-dkms.postinst0000664000000000000000000000070213064065365014261 0ustar #!/bin/sh set -e package=iscsitarget-dkms name=iscsitarget version=`dpkg-query -W -f='${Version}' "$package" \ |rev|cut -d- -f2-|rev|cut -d':' -f2|tr -d "\n"` isadded=`dkms status -m "$name" -v "$version"` if [ "x${isadded}" = "x" ] ; then dkms add -m "$name" -v "$version" fi if [ "$1" = 'configure' ] ; then dkms build -m "$name" -v "$version" && dkms install -m "$name" -v "$version" || true fi #DEBHELPER# exit 0 debian/NEWS0000664000000000000000000000201713064066674007703 0ustar iscsitarget (1.4.20.3+svn490-1) experimental; urgency=low With this upload, the iscsitarget package will be targetted from the upstream "trunk" development branch. iscsitarget has not see a stable release in the last 2 years and most of the active changes (usually the kernel fixes) take place in the trunk branch. If you want to stick with the "stable branch, please stick to the Debian Wheezy release -- Ritesh Raj Sarraf Fri, 12 Apr 2013 13:17:41 +0530 iscsitarget (1.4.20.1-2) unstable; urgency=low The following conf file have changed locations from /etc/ to /etc/iet/ * /etc/ietd.conf => /etc/iet/ietd.conf * /etc/initiators.allow => /etc/iet/initiators.allow initiators.deny file has been deprecated upstream and thus will not be shipped going forward. The old file, if present will still be used. targets.allow file has been added, where different networks/ranges can be specified for individual targets. -- Ritesh Raj Sarraf Tue, 18 May 2010 01:07:12 +0530 debian/iscsitarget.install0000664000000000000000000000017013064065365013107 0ustar usr/ietd /usr/sbin usr/ietadm /usr/sbin etc/ietd.conf /etc/iet etc/initiators.allow /etc/iet etc/targets.allow /etc/iet debian/dirs0000664000000000000000000000002113064065365010055 0ustar etc/iet usr/sbin debian/tests/0000775000000000000000000000000013423553131010332 5ustar debian/tests/daemon0000664000000000000000000000131613234633765011535 0ustar #!/bin/bash #-------------------------- # Testing iscitarget daemon #-------------------------- set -e # modify /etc/default/iscsitarget to enable it CONFIG_FILE=/etc/default/iscsitarget TMP_CONFIG_FILE=/etc/default/iscsitarget.$$ echo -n "Enable daemon ... " sed -e "s/ISCSITARGET_ENABLE=false/ISCSITARGET_ENABLE=true/g" \ $CONFIG_FILE >$TMP_CONFIG_FILE if [ $? -ne 0 ]; then echo "FAIL (failed to enable in default config)" rm -f $TMP_CONFIG_FILE exit 1 fi echo "PASS" mv $TMP_CONFIG_FILE $CONFIG_FILE echo -n "Start daemon ... " /etc/init.d/iscsitarget restart >/dev/null 2>&1 sleep 2 if ps aux | grep -v "grep" | grep -q "ietd"; then echo "PASS" else echo "FAIL (daemon not running)" exit 1 fi exit 0 debian/tests/control0000664000000000000000000000032713423553131011737 0ustar Test-Command: modprobe iscsi_trgt Depends: iscsitarget, iscsitarget-dkms Restrictions: needs-root, isolation-machine Tests: daemon Depends: iscsitarget, iscsitarget-dkms Restrictions: needs-root, isolation-machine debian/iscsitarget.overrides0000664000000000000000000000010313064065365013437 0ustar iscsitarget: non-standard-file-perm etc/iet/ietd.conf 0600 != 0644 debian/dkms.conf.in0000664000000000000000000000060113205071337011400 0ustar PACKAGE_NAME="iscsitarget" PACKAGE_VERSION="__VERSION__" MAKE[0]="make -C ${kernel_source_dir} M=${dkms_tree}/${PACKAGE_NAME}/${PACKAGE_VERSION}/build" CLEAN="make -C ${kernel_source_dir} M=${dkms_tree}/${PACKAGE_NAME}/${PACKAGE_VERSION}/build clean" AUTOINSTALL=yes BUILT_MODULE_NAME[0]="iscsi_trgt" BUILT_MODULE_LOCATION[0]="kernel/" DEST_MODULE_LOCATION[0]="/kernel/drivers/iscsi/" debian/README.source0000664000000000000000000000026613064065365011363 0ustar These days, I extract the source from a git-svn cloned repo, using: git archive --format=tar.gz --prefix=iscsitarget-1.4.20.3+svn496/ HEAD >/tmp/iscsitarget-1.4.20.3+svn496.tar.gz debian/iscsitarget.manpages0000664000000000000000000000010313064065365013230 0ustar doc/manpages/ietadm.8 doc/manpages/ietd.8 doc/manpages/ietd.conf.5 debian/watch0000664000000000000000000000007613064065365010234 0ustar version=3 http://sf.net/iscsitarget/iscsitarget-(.+)\.tar\.gz debian/README.Debian0000664000000000000000000000114513064065365011242 0ustar iscsitarget for Debian ---------------------- This package requires at least kernel 2.6.19. Please see the included README.gz for a description of the iSCSI enterprise target software. The Debian iscsitarget source package provides two packages, 1) iscsitarget, which the provides the userspace daemon 2) iscsitarget-dkms, which provides the dkms format package for the kernel Note: The older iscsitarget-source package has been drop in favor of the dkms package The iscsitarget package Recommends the iscsitarget-dkms package which provides the sources to build the iscsitarget kernel component debian/rules0000775000000000000000000002240213203622671010252 0ustar #!/usr/bin/make -f # -*- makefile -*- # Sample debian/rules that uses debhelper. # GNU copyright 1997 to 1999 by Joey Hess. # # Modified to make a template file for a multi-binary package with separated # build-arch and build-indep targets by Bill Allombert 2001 # Uncomment this to turn on verbose mode. #export DH_VERBOSE=1 # This has to be exported to make some magic below work. export DH_OPTIONS # get-orig-source target DEB_UPSTREAM_VERSION=$(shell dpkg-parsechangelog | sed -rne 's,^Version: ([^-]+).*,\1,p') get-orig-source: [ ! -f $(ORIG_FILE).gz ] || rm -f $(ORIG_FILE).gz uscan --force-download --rename --repack --download-version=$(DEB_UPSTREAM_VERSION) --destdir=. non_epoch_version=$(shell echo $(KVERS) | perl -pe 's/^\d+://') PACKAGE=iscsitarget pmodules = $(PACKAGE)-module-$(non_epoch_version) # DKMS package pdkms=iscsitarget-dkms CFLAGS = `dpkg-buildflags --get CFLAGS` CFLAGS += -Wall CFLAGS += `dpkg-buildflags --get CPPFLAGS` LDFLAGS = `dpkg-buildflags --get LDFLAGS` export CFLAGS export LDFLAGS ifeq (,$(findstring nostrip,$(DEB_BUILD_OPTIONS))) INSTALL_PROGRAM += -s endif # module-assistant stuff MAJOR=$(shell echo $(KVERS) | sed -e 's/\(...\).*/\1/') ifeq ($(MAJOR),2.6) KO=k endif KERN_VER=$(shell echo $(KVERS) | cut -d "-" -f1) # Taken from upstream iscsitarget's Makefile KMAJ := $(shell echo $(KERN_VER) | \ sed -e 's/^\([0-9][0-9]*\)\.[0-9][0-9]*\.[0-9][0-9]*.*/\1/') KMIN := $(shell echo $(KERN_VER) | \ sed -e 's/^[0-9][0-9]*\.\([0-9][0-9]*\)\.[0-9][0-9]*.*/\1/') KREV := $(shell echo $(KERN_VER) | \ sed -e 's/^[0-9][0-9]*\.[0-9][0-9]*\.\([0-9][0-9]*\).*/\1/') kver_eq = $(shell [ $(KMAJ)$(KMIN)$(KREV) -eq $(1)$(2)$(3) ] && \ echo 1 || echo 0) kver_lt = $(shell [ $(KMAJ)$(KMIN)$(KREV) -lt $(1)$(2)$(3) ] && \ echo 1 || echo 0) kver_le = $(shell [ $(KMAJ)$(KMIN)$(KREV) -le $(1)$(2)$(3) ] && \ echo 1 || echo 0) kver_gt = $(shell [ $(KMAJ)$(KMIN)$(KREV) -gt $(1)$(2)$(3) ] && \ echo 1 || echo 0) kver_ge = $(shell [ $(KMAJ)$(KMIN)$(KREV) -ge $(1)$(2)$(3) ] && \ echo 1 || echo 0) kver_lk = $(shell [ `echo $(KERN_VER) | egrep $(1)` ] && echo 1 || echo 0) ifeq ($(call kver_lt,3,13,0),1) PATCHES := $(PATCHES) compat-3.12.patch endif ifeq ($(call kver_lt,3,10,0),1) PATCHES := $(PATCHES) compat-3.9.patch endif ifeq ($(call kver_lt,3,7,0),1) PATCHES := $(PATCHES) compat-3.6.patch endif ifeq ($(call kver_le,3,5,0),1) PATCHES := $(PATCHES) compat-3.5.patch endif ifeq ($(call kver_le,3,4,0),1) PATCHES := $(PATCHES) compat-3.2-3.4.patch endif ifeq ($(call kver_le,3,2,0),1) PATCHES := $(PATCHES) compat-2.6.39-3.2.patch endif ifeq ($(call kver_le,2,6,38),1) PATCHES := $(PATCHES) compat-2.6.38.patch endif ifeq ($(call kver_le,2,6,37),1) PATCHES := $(PATCHES) compat-2.6.36-2.6.37.patch endif # Compatibility patch for kernels >= 2.6.36 <= 2.6.38 ifeq ($(call kver_le,2,6,38),1) PATCHES := $(PATCHES) compat-2.6.36-2.6.37.patch endif # Compatibility patch for kernels > 2.6.32 <= 2.6.35 ifeq ($(call kver_le,2,6,35),1) PATCHES := $(PATCHES) compat-2.6.33-2.6.35.patch endif # Compatibility patch for kernels <= 2.6.32 ifeq ($(call kver_le,2,6,32),1) PATCHES := $(PATCHES) compat-2.6.32.patch endif # Compatibility patch for kernels <= 2.6.31 ifeq ($(call kver_le,2,6,31),1) PATCHES := $(PATCHES) compat-2.6.31.patch endif # Compatibility patch for kernels <= 2.6.30 ifeq ($(call kver_le,2,6,30),1) PATCHES := $(PATCHES) compat-2.6.30.patch endif # Compatibility patch for kernels <= 2.6.29 ifeq ($(call kver_le,2,6,29),1) PATCHES := $(PATCHES) compat-2.6.29.patch endif # Compatibility patch for kernels <= 2.6.28 ifeq ($(call kver_le,2,6,28),1) PATCHES := $(PATCHES) compat-2.6.28.patch endif # Compatibility patch for kernels >= 2.6.25 and <= 2.6.27 ifeq ($(call kver_le,2,6,27),1) PATCHES := $(PATCHES) compat-2.6.25-2.6.27.patch endif # Compatibility patch for kernels <= 2.6.24 ifeq ($(call kver_le,2,6,24),1) PATCHES := $(PATCHES) compat-2.6.24.patch endif # Compatibility patch for kernels <= 2.6.23 ifeq ($(call kver_le,2,6,23),1) PATCHES := $(PATCHES) compat-2.6.23.patch endif # Compatibility patch for kernels <= 2.6.22 ifeq ($(call kver_le,2,6,22),1) PATCHES := $(PATCHES) compat-2.6.22.patch endif # Compatibility patch for kernels >= 2.6.19 and <= 2.6.21 ifeq ($(call kver_le,2,6,21),1) PATCHES := $(PATCHES) compat-2.6.19-2.6.21.patch endif # Compatibility patch for kernels >= 2.6.14 and <= 2.6.18 ifeq ($(call kver_le,2,6,18),1) PATCHES := $(PATCHES) compat-2.6.14-2.6.18.patch endif # We don't support kernels < 2.6.14 except for explicit distros ifeq ($(call kver_lt,2,6,14),1) echo "unsupported kernel" exit 1 endif kdist_clean: dh_clean $(MAKE) -C $(KSRC) SUBDIRS=$(shell pwd)/kernel clean # prep-deb-files rewrites the debian/ files as needed. See RATIONALE for # details kdist_config: prep-deb-files for p in $(PATCHES); do \ echo "Applying patch $$p"; \ test -f patches/$$p && patch -p1 < patches/$$p \ #test -f patches/compat-$(KERN_VER).patch && patch -p1 < patches/compat-$(KERN_VER).patch \ done kdist_configure: kdist_config binary-modules: prep-deb-files dh_testdir dh_testroot dh_clean -k #$(MAKE) -C $(KSRC) KERNEL_SOURCES=$(KSRC) MODVERSIONS=detect KERNEL=linux-$(KVERS) KDIR=$(KSRC) SUBDIRS=$(shell pwd)/kernel modules $(MAKE) -C $(KSRC) SUBDIRS=$(shell pwd)/kernel modules #$(MAKE) -C $(KSRC) SUBDIRS=$(shell pwd)/kernel modules_install DESTDIR=$(CURDIR)/debian/$(pmodules) install -m644 -b -D $(shell pwd)/kernel/iscsi_trgt.$(KO)o $(CURDIR)/debian/${pmodules}/lib/modules/$(KVERS)/kernel/drivers/iscsi/iscsi_trgt.$(KO)o dh_installdocs dh_installchangelogs dh_compress dh_fixperms dh_installdeb dh_gencontrol -- -v$(VERSION) dh_md5sums dh_builddeb --destdir=$(DEB_DESTDIR) #Architecture build: build-arch build-indep build-arch: build-arch-stamp build-arch-stamp: dh_testdir $(MAKE) -C usr touch build-arch-stamp build-indep: build-indep-stamp build-indep-stamp: touch build-indep-stamp clean: dh_testdir dh_testroot rm -f build-arch-stamp build-indep-stamp #CONFIGURE-STAMP# $(MAKE) -C usr clean dh_clean install: install-arch install-indep install-indep: dh_testdir dh_testroot dh_clean -k -i dh_installdirs -i # For DKMS # Create the directories to install the source into dh_installdirs -p$(pdkms) usr/src/$(PACKAGE)-$(DEB_UPSTREAM_VERSION) dh_installdirs -p$(pdkms) usr/src/$(PACKAGE)-$(DEB_UPSTREAM_VERSION)/debian dh_installdirs -p$(pdkms) usr/src/$(PACKAGE)-$(DEB_UPSTREAM_VERSION)/include dh_installdirs -p$(pdkms) usr/src/$(PACKAGE)-$(DEB_UPSTREAM_VERSION)/kernel dh_installdirs -p$(pdkms) usr/src/$(PACKAGE)-$(DEB_UPSTREAM_VERSION)/patches # Copy only the driver source to the proper location cp kernel/* debian/$(pdkms)/usr/src/$(PACKAGE)-$(DEB_UPSTREAM_VERSION)/kernel/ cp include/* debian/$(pdkms)/usr/src/$(PACKAGE)-$(DEB_UPSTREAM_VERSION)/include/ cp patches/* debian/$(pdkms)/usr/src/$(PACKAGE)-$(DEB_UPSTREAM_VERSION)/patches/ # Copy prebuild script install -m 755 debian/configure_features.sh \ debian/$(pdkms)/usr/src/$(PACKAGE)-$(DEB_UPSTREAM_VERSION)/ # Copy the needed debian/ pieces to the proper location cp debian/*-module-* \ debian/$(pdkms)/usr/src/$(PACKAGE)-$(DEB_UPSTREAM_VERSION)/debian chmod 755 debian/$(pdkms)/usr/src/$(PACKAGE)-$(DEB_UPSTREAM_VERSION)/debian/*-module-* cp debian/control.modules.in \ debian/$(pdkms)/usr/src/$(PACKAGE)-$(DEB_UPSTREAM_VERSION)/debian/control.in cp debian/rules \ debian/$(pdkms)/usr/src/$(PACKAGE)-$(DEB_UPSTREAM_VERSION)/debian cp debian/changelog \ debian/$(pdkms)/usr/src/$(PACKAGE)-$(DEB_UPSTREAM_VERSION)/debian cp debian/copyright \ debian/$(pdkms)/usr/src/$(PACKAGE)-$(DEB_UPSTREAM_VERSION)/debian # install debian/ files cd debian ; cp changelog control compat *.modules.in rules copyright $(pdkms)/usr/src/$(PACKAGE)-$(DEB_UPSTREAM_VERSION)/debian # create toplevel module Makefile echo "obj-m = kernel/" > debian/$(pdkms)/usr/src/$(PACKAGE)-$(DEB_UPSTREAM_VERSION)/Makefile # Prepare dkms.conf from the dkms.conf.in template sed "s/__VERSION__/$(DEB_UPSTREAM_VERSION)/g" debian/dkms.conf.in > debian/$(pdkms)/usr/src/$(PACKAGE)-$(DEB_UPSTREAM_VERSION)/dkms.conf grep ^PATCH dkms.conf >> debian/$(pdkms)/usr/src/$(PACKAGE)-$(DEB_UPSTREAM_VERSION)/dkms.conf dh_install -i install-arch: dh_testdir dh_testroot dh_clean -k -s dh_installdirs -s dh_install -s # install override mkdir -p debian/iscsitarget/usr/share/lintian/overrides cp debian/iscsitarget.overrides \ debian/iscsitarget/usr/share/lintian/overrides/iscsitarget # Must not depend on anything. This is to be called by # binary-arch/binary-indep # in another 'make' thread. binary-common: dh_testdir dh_testroot dh_installchangelogs ChangeLog dh_installdocs dh_installinit dh_installman dh_link dh_strip dh_compress dh_fixperms chmod 600 $(CURDIR)/debian/iscsitarget/etc/iet/ietd.conf dh_makeshlibs dh_installdeb dh_shlibdeps dh_gencontrol dh_md5sums dh_builddeb # Build architecture independant packages using the common target. binary-indep: build-indep install-indep $(MAKE) -f debian/rules DH_OPTIONS=-i binary-common # Build architecture dependant packages using the common target. binary-arch: build-arch install-arch $(MAKE) -f debian/rules DH_OPTIONS=-a binary-common binary: binary-arch binary-indep .PHONY: build clean binary-indep binary-arch binary install install-indep install-arch get-orig-source debian/iscsitarget.init0000664000000000000000000000663213064065365012415 0ustar #!/bin/sh # ### BEGIN INIT INFO # Provides: iscsitarget # Required-Start: $remote_fs $syslog $network $time procps # Required-Stop: $remote_fs $syslog $network $time procps # Default-Start: 2 3 4 5 # Default-Stop: 0 1 6 # Short-Description: Starts and stops the iSCSI software target # Description: Starts and stops the iSCSI software target ### END INIT INFO PID_FILE=/var/run/ietd.pid CONFIG_FILE=/etc/iet/ietd.conf DAEMON=/usr/sbin/ietd PATH=/sbin:/bin:/usr/sbin:/usr/bin . /lib/lsb/init-functions # log_{warn,failure}_msg ISCSITARGET_ENABLE=false ISCSITARGET_MAX_SLEEP=3 ISCSITARGET_DEFAULTS_FILE=/etc/default/iscsitarget if [ -s "$ISCSITARGET_DEFAULTS_FILE" ]; then . "$ISCSITARGET_DEFAULTS_FILE" case "x$ISCSITARGET_ENABLE" in xtrue|xfalse) ;; *) log_failure_msg "value of ISCSITARGET_ENABLE must be either 'true' or 'false';" log_failure_msg "not starting iscsitarget." exit 1 ;; esac fi RETVAL=0 ietd_start() { log_daemon_msg "Starting iSCSI enterprise target service" modprobe -q crc32c modprobe iscsi_trgt RETVAL=$? if [ $RETVAL != "0" ] ; then log_end_msg 1 exit $RETVAL fi start-stop-daemon --start --exec $DAEMON --quiet --oknodo -- $ISCSITARGET_OPTIONS RETVAL=$? if [ $RETVAL = "0" ]; then log_end_msg 0 else log_end_msg 1 exit $RETVAL fi log_end_msg 0 exit 0 } ietd_stop() { log_daemon_msg "Removing iSCSI enterprise target devices: " pidof ietd >/dev/null 2>&1 RETVAL=$? if [ $RETVAL = "0" ] ; then # ugly, but ietadm does not allways provides correct exit values RETURN=`ietadm --op delete 2>&1` RETVAL=$? if [ $RETVAL = "0" ] && [ "$RETURN" != "something wrong" ] ; then log_end_msg 0 else log_end_msg 1 log_failure_msg "failed with reason :$RETURN" exit $RETVAL fi log_daemon_msg "Stopping iSCSI enterprise target service: " start-stop-daemon --stop --quiet --exec $DAEMON --pidfile $PID_FILE --oknodo RETVAL=$? if [ $RETVAL = "0" ]; then log_end_msg 0 else log_end_msg 1 fi else log_end_msg 0 fi # ugly, but pid file is not removed by ietd rm -f $PID_FILE # check if the module is loaded at all lsmod | grep -q iscsi_trgt RETVAL=$? if [ $RETVAL = "0" ] ; then for i in $(seq $ISCSITARGET_MAX_SLEEP); do log_daemon_msg "Removing iSCSI enterprise target modules: " modprobe -r iscsi_trgt RETVAL=$? if [ $RETVAL = "0" ]; then break fi # give iet some time to finish processing sleep 1 done modprobe -r crc32c 2>/dev/null if [ $RETVAL = "0" ]; then log_end_msg 0 else log_end_msg 1 # Lack of module unloading should be reported, # but not necessarily exit non-zero fi fi } case "$1" in start) if [ "$ISCSITARGET_ENABLE" = "true" ]; then ietd_start else log_warning_msg "iscsitarget not enabled in \"$ISCSITARGET_DEFAULTS_FILE\", not starting..." fi ;; stop) ietd_stop ;; restart|force-reload) ietd_stop sleep 1 if [ "$ISCSITARGET_ENABLE" = "true" ]; then ietd_start else log_warning_msg "iscsitarget not enabled in \"$ISCSITARGET_DEFAULTS_FILE\", not starting..." fi ;; status) status_of_proc -p $PID_FILE $DAEMON "iSCSI enterprise target" && exit 0 || exit $? ;; *) log_action_msg "Usage: $0 {start|stop|restart|status}" exit 1 esac exit 0 debian/docs0000664000000000000000000000006213064065365010051 0ustar README README.initiators README.mcs README.vmware debian/patches/0000775000000000000000000000000013205071437010621 5ustar debian/patches/fix-build-4.3.patch0000664000000000000000000000604213064067163014035 0ustar Description: Fix source to compile with 4.3+ kernels commit 4246a0b63bd8f56a1469b12eafeb875b1041a451 block: add a bi_error field to struct bio -> Removes BIO_UPTODATE and error argument to bio_endio. commit b54ffb73cadcdcff9cc1ae0e11f502407e3e2e4c block: remove bio_get_nr_vecs() -> Removed that call (always use BIO_MAX_PAGES) commit 676d23690fb62b5d51ba5d659935e9f7d9da9f8e net: Fix use after free by removing length arg from sk_data_ready callbacks. -> Removes len argument from sk_data_ready() callback. Author: Stefan Bader Index: iscsitarget-1.4.20.3+svn502/kernel/block-io.c =================================================================== --- iscsitarget-1.4.20.3+svn502.orig/kernel/block-io.c 2014-05-06 22:59:55.000000000 +0200 +++ iscsitarget-1.4.20.3+svn502/kernel/block-io.c 2015-11-23 19:25:01.818683572 +0100 @@ -29,14 +29,12 @@ struct tio_work { struct completion tio_complete; }; -static void blockio_bio_endio(struct bio *bio, int error) +static void blockio_bio_endio(struct bio *bio) { struct tio_work *tio_work = bio->bi_private; - error = test_bit(BIO_UPTODATE, &bio->bi_flags) ? error : -EIO; - - if (error) - atomic_set(&tio_work->error, error); + if (bio->bi_error) + atomic_set(&tio_work->error, bio->bi_error); /* If last bio signal completion */ if (atomic_dec_and_test(&tio_work->bios_remaining)) @@ -61,15 +59,11 @@ blockio_make_request(struct iet_volume * u32 size = tio->size; u32 tio_index = 0; - int max_pages = 1; + int max_pages = bdev_q ? BIO_MAX_PAGES : 1; int err = 0; loff_t ppos = tio->offset; - /* Calculate max_pages for bio_alloc (memory saver) */ - if (bdev_q) - max_pages = bio_get_nr_vecs(bio_data->bdev); - tio_work = kzalloc(sizeof (*tio_work), GFP_KERNEL); if (!tio_work) return -ENOMEM; Index: iscsitarget-1.4.20.3+svn502/kernel/conn.c =================================================================== --- iscsitarget-1.4.20.3+svn502.orig/kernel/conn.c 2015-11-23 18:59:14.000000000 +0100 +++ iscsitarget-1.4.20.3+svn502/kernel/conn.c 2015-11-23 19:14:46.974693052 +0100 @@ -87,13 +87,13 @@ static void iet_state_change(struct sock target->nthread_info.old_state_change(sk); } -static void iet_data_ready(struct sock *sk, int len) +static void iet_data_ready(struct sock *sk) { struct iscsi_conn *conn = sk->sk_user_data; struct iscsi_target *target = conn->session->target; nthread_wakeup(target); - target->nthread_info.old_data_ready(sk, len); + target->nthread_info.old_data_ready(sk); } /* Index: iscsitarget-1.4.20.3+svn502/kernel/iscsi.h =================================================================== --- iscsitarget-1.4.20.3+svn502.orig/kernel/iscsi.h 2014-05-06 22:59:55.000000000 +0200 +++ iscsitarget-1.4.20.3+svn502/kernel/iscsi.h 2015-11-23 19:14:22.942693422 +0100 @@ -81,7 +81,7 @@ struct network_thread_info { spinlock_t nthread_lock; void (*old_state_change)(struct sock *); - void (*old_data_ready)(struct sock *, int); + void (*old_data_ready)(struct sock *); void (*old_write_space)(struct sock *); }; debian/patches/series0000664000000000000000000000031513205071377012040 0ustar enable-3.12-compat.patch fix-build-3.19.patch add-3.19-compat.patch enable-3.19-compat.patch fix-build-4.3.patch add-4.3-compat.patch enable-4.3-compat.patch sock_recvmsg.patch check_recvmsg_on_make.patch debian/patches/sock_recvmsg.patch0000664000000000000000000000141213203620205014314 0ustar Index: iscsitarget-1.4.20.3+svn502/kernel/compat.h =================================================================== --- iscsitarget-1.4.20.3+svn502.orig/kernel/compat.h +++ iscsitarget-1.4.20.3+svn502/kernel/compat.h @@ -10,6 +10,7 @@ #define __IET_COMPAT_H__ #include +#include "config.h" #ifndef DECLARE_COMPLETION_ONSTACK #define DECLARE_COMPLETION_ONSTACK(work) DECLARE_COMPLETION(work) @@ -27,4 +28,14 @@ #define roundup_pow_of_two(n) (1UL << fls_long(n - 1)) #endif +#ifdef SOCK_RECVMSG_HASNOSIZE +static inline int sock_recvmsg_compat(struct socket *sock, struct msghdr *msg, + size_t size, int flags) +{ + return sock_recvmsg(sock, msg, flags); +} + +#define sock_recvmsg sock_recvmsg_compat +#endif + #endif /* __IET_COMPAT_H__ */ debian/patches/add-3.19-compat.patch0000664000000000000000000002127313064066674014262 0ustar Description: Add 3.13 and 3.18 compat patches into patch directory Author: Stefan Bader Forward: no Index: iscsitarget-1.4.20.3+svn499/patches/compat-3.13.patch =================================================================== --- /dev/null 1970-01-01 00:00:00.000000000 +0000 +++ iscsitarget-1.4.20.3+svn499/patches/compat-3.13.patch 2015-09-14 17:05:21.931561728 +0200 @@ -0,0 +1,13 @@ +diff --git b/kernel/block-io.c a/kernel/block-io.c +index 00365b5..7c9ea21 100644 +--- b/kernel/block-io.c ++++ a/kernel/block-io.c +@@ -87,7 +87,7 @@ blockio_make_request(struct iet_volume *volume, struct tio *tio, int rw) + } + + /* bi_sector is ALWAYS in units of 512 bytes */ +- bio->bi_iter.bi_sector = ppos >> 9; ++ bio->bi_sector = ppos >> 9; + bio->bi_bdev = bio_data->bdev; + bio->bi_end_io = blockio_bio_endio; + bio->bi_private = tio_work; Index: iscsitarget-1.4.20.3+svn499/patches/compat-3.18.patch =================================================================== --- /dev/null 1970-01-01 00:00:00.000000000 +0000 +++ iscsitarget-1.4.20.3+svn499/patches/compat-3.18.patch 2015-09-14 16:32:48.835591841 +0200 @@ -0,0 +1,205 @@ +Index: iscsitarget-1.4.20.3+svn502/kernel/iscsi.c +=================================================================== +--- iscsitarget-1.4.20.3+svn502.orig/kernel/iscsi.c 2015-02-23 10:55:39.581332582 +0100 ++++ iscsitarget-1.4.20.3+svn502/kernel/iscsi.c 2015-02-23 10:55:39.589332622 +0100 +@@ -489,7 +489,8 @@ static void cmnd_skip_pdu(struct iscsi_c + } + conn->read_iov[i].iov_base = addr; + conn->read_iov[i].iov_len = size; +- iov_iter_init(&conn->read_msg.msg_iter, READ, conn->read_iov, ++i, conn->read_size); ++ conn->read_msg.msg_iov = conn->read_iov; ++ conn->read_msg.msg_iovlen = ++i; + } + + static void iscsi_cmnd_reject(struct iscsi_cmnd *req, int reason) +@@ -717,6 +718,7 @@ static int cmnd_recv_pdu(struct iscsi_co + idx = offset >> PAGE_CACHE_SHIFT; + offset &= ~PAGE_CACHE_MASK; + ++ conn->read_msg.msg_iov = conn->read_iov; + conn->read_size = size = (size + 3) & -4; + conn->read_overflow = 0; + +@@ -728,16 +730,16 @@ static int cmnd_recv_pdu(struct iscsi_co + conn->read_iov[i].iov_base = addr + offset; + if (offset + size <= PAGE_CACHE_SIZE) { + conn->read_iov[i].iov_len = size; +- iov_iter_init(&conn->read_msg.msg_iter, READ, conn->read_iov, ++i, conn->read_size); ++ conn->read_msg.msg_iovlen = ++i; + break; + } + conn->read_iov[i].iov_len = PAGE_CACHE_SIZE - offset; + size -= conn->read_iov[i].iov_len; + offset = 0; + if (++i >= ISCSI_CONN_IOV_MAX) { ++ conn->read_msg.msg_iovlen = i; + conn->read_overflow = size; + conn->read_size -= size; +- iov_iter_init(&conn->read_msg.msg_iter, READ, conn->read_iov, i, conn->read_size); + break; + } + +@@ -916,6 +918,7 @@ static int nop_out_start(struct iscsi_co + + if ((size = cmnd->pdu.datasize)) { + size = (size + 3) & -4; ++ conn->read_msg.msg_iov = conn->read_iov; + if (cmnd->pdu.bhs.itt != cpu_to_be32(ISCSI_RESERVED_TAG)) { + struct tio *tio; + int pg_cnt = get_pgcnt(size); +@@ -943,7 +946,7 @@ static int nop_out_start(struct iscsi_co + } + assert(!size); + conn->read_overflow = size; +- iov_iter_init(&conn->read_msg.msg_iter, READ, conn->read_iov, i, conn->read_size); ++ conn->read_msg.msg_iovlen = i; + } + + out: +@@ -983,7 +986,7 @@ static void scsi_cmnd_start(struct iscsi + set_cmnd_lunit(req); + + switch (req_hdr->scb[0]) { +- case SERVICE_ACTION_IN_16: ++ case SERVICE_ACTION_IN: + if ((req_hdr->scb[1] & 0x1f) != 0x10) + goto error; + case INQUIRY: +Index: iscsitarget-1.4.20.3+svn502/kernel/nthread.c +=================================================================== +--- iscsitarget-1.4.20.3+svn502.orig/kernel/nthread.c 2015-02-24 11:06:42.057236808 +0100 ++++ iscsitarget-1.4.20.3+svn502/kernel/nthread.c 2015-02-23 10:55:39.589332622 +0100 +@@ -42,8 +42,9 @@ static inline void iscsi_conn_init_read( + len = (len + 3) & -4; // XXX ??? + conn->read_iov[0].iov_base = data; + conn->read_iov[0].iov_len = len; ++ conn->read_msg.msg_iov = conn->read_iov; ++ conn->read_msg.msg_iovlen = 1; + conn->read_size = (len + 3) & -4; +- iov_iter_init(&conn->read_msg.msg_iter, READ, conn->read_iov, 1, conn->read_size); + } + + static void iscsi_conn_read_ahs(struct iscsi_conn *conn, struct iscsi_cmnd *cmnd) +@@ -82,18 +83,14 @@ static int is_data_available(struct iscs + + static void forward_iov(struct msghdr *msg, int len) + { +- struct iovec *iov; +- +- while (msg->msg_iter.iov->iov_len <= len) { +- len -= msg->msg_iter.iov->iov_len; +- msg->msg_iter.iov++; +- msg->msg_iter.nr_segs--; ++ while (msg->msg_iov->iov_len <= len) { ++ len -= msg->msg_iov->iov_len; ++ msg->msg_iov++; ++ msg->msg_iovlen--; + } + +- /* XXX: discards const ... */ +- iov = msg->msg_iter.iov; +- iov->iov_base = (char *) msg->msg_iter.iov->iov_base + len; +- iov->iov_len -= len; ++ msg->msg_iov->iov_base = (char *) msg->msg_iov->iov_base + len; ++ msg->msg_iov->iov_len -= len; + } + + static int do_recv(struct iscsi_conn *conn, int state) +@@ -101,7 +98,6 @@ static int do_recv(struct iscsi_conn *co + mm_segment_t oldfs; + struct msghdr msg; + struct iovec iov[ISCSI_CONN_IOV_MAX]; +- size_t iovlen = ISCSI_CONN_IOV_MAX; + int i, len, res; + + if (!test_bit(CONN_ACTIVE, &conn->state)) { +@@ -114,15 +110,12 @@ static int do_recv(struct iscsi_conn *co + goto out; + } + +- if (conn->read_msg.msg_iter.nr_segs < iovlen) +- iovlen = conn->read_msg.msg_iter.nr_segs; +- +- for (i = 0, len = 0; i < iovlen; i++) { +- iov[i] = conn->read_msg.msg_iter.iov[i]; ++ msg.msg_iov = iov; ++ msg.msg_iovlen = min_t(size_t, conn->read_msg.msg_iovlen, ISCSI_CONN_IOV_MAX); ++ for (i = 0, len = 0; i < msg.msg_iovlen; i++) { ++ iov[i] = conn->read_msg.msg_iov[i]; + len += iov[i].iov_len; + } +- iov_iter_init(&msg.msg_iter, READ, iov, iovlen, len); +- + + oldfs = get_fs(); + set_fs(get_ds()); +Index: iscsitarget-1.4.20.3+svn502/kernel/conn.c +=================================================================== +--- iscsitarget-1.4.20.3+svn502.orig/kernel/conn.c 2015-02-23 10:55:39.581332582 +0100 ++++ iscsitarget-1.4.20.3+svn502/kernel/conn.c 2015-02-23 10:55:39.589332622 +0100 +@@ -127,7 +127,7 @@ static void iet_socket_bind(struct iscsi + + dprintk(D_GENERIC, "%llu\n", (unsigned long long) session->sid); + +- conn->sock = SOCKET_I(file_inode(conn->file)); ++ conn->sock = SOCKET_I(conn->file->f_dentry->d_inode); + conn->sock->sk->sk_user_data = conn; + + write_lock_bh(&conn->sock->sk->sk_callback_lock); +Index: iscsitarget-1.4.20.3+svn502/kernel/volume.c +=================================================================== +--- iscsitarget-1.4.20.3+svn502.orig/kernel/volume.c 2015-02-23 10:55:39.585332602 +0100 ++++ iscsitarget-1.4.20.3+svn502/kernel/volume.c 2015-02-23 10:55:39.589332622 +0100 +@@ -398,7 +398,7 @@ int is_volume_reserved(struct iet_volume + case READ_CAPACITY: + /* allowed commands when reserved */ + break; +- case SERVICE_ACTION_IN_16: ++ case SERVICE_ACTION_IN: + if ((scb[1] & 0x1F) == 0x10) + break; + /* fall through */ +@@ -465,7 +465,7 @@ int is_volume_reserved(struct iet_volume + if (excl_access_ro && !registered) + err = -EBUSY; + break; +- case SERVICE_ACTION_IN_16: ++ case SERVICE_ACTION_IN: + if ((scb[1] & 0x1F) == 0x10) + break; + /* fall through */ +Index: iscsitarget-1.4.20.3+svn502/kernel/file-io.c +=================================================================== +--- iscsitarget-1.4.20.3+svn502.orig/kernel/file-io.c 2015-02-23 10:55:39.585332602 +0100 ++++ iscsitarget-1.4.20.3+svn502/kernel/file-io.c 2015-02-23 10:55:39.589332622 +0100 +@@ -69,7 +69,7 @@ static int fileio_make_request(struct ie + static int fileio_sync(struct iet_volume *lu, struct tio *tio) + { + struct fileio_data *p = lu->private; +- struct inode *inode = file_inode(p->filp); ++ struct inode *inode = p->filp->f_dentry->d_inode; + struct address_space *mapping = inode->i_mapping; + loff_t ppos, count; + int res; +@@ -213,7 +213,7 @@ static int fileio_attach(struct iet_volu + eprintk("%d\n", err); + goto out; + } +- inode = file_inode(p->filp); ++ inode = p->filp->f_dentry->d_inode; + + if (S_ISREG(inode->i_mode)) + ; +Index: iscsitarget-1.4.20.3+svn502/kernel/target_disk.c +=================================================================== +--- iscsitarget-1.4.20.3+svn502.orig/kernel/target_disk.c 2015-02-23 10:55:39.585332602 +0100 ++++ iscsitarget-1.4.20.3+svn502/kernel/target_disk.c 2015-02-23 10:55:39.589332622 +0100 +@@ -606,7 +606,7 @@ static int disk_execute_cmnd(struct iscs + case REQUEST_SENSE: + send_data_rsp(cmnd, build_request_sense_response); + break; +- case SERVICE_ACTION_IN_16: ++ case SERVICE_ACTION_IN: + send_data_rsp(cmnd, build_service_action_in_response); + break; + case READ_6: debian/patches/enable-4.3-compat.patch0000664000000000000000000001521113064067162014656 0ustar Description: Enable compat-4.3 patch for DKMS builds Author: Stefan Bader Index: iscsitarget-1.4.20.3+svn502/dkms.conf =================================================================== --- iscsitarget-1.4.20.3+svn502.orig/dkms.conf 2015-11-23 18:59:14.000000000 +0100 +++ iscsitarget-1.4.20.3+svn502/dkms.conf 2015-11-23 19:51:37.214658975 +0100 @@ -19,75 +19,78 @@ AUTOINSTALL="yes" # # Patches newest - oldest, distro spec at bottom # -PATCH[0]="compat-3.18.patch" -PATCH_MATCH[0]="(2\.6\.(9|14|15|16|17|18|19|20|21|22|23|24|25|26|27|28|29|30|31|32|33|34|35|36|37|38|39)|3\.(0|1|2|3|4|5|6|7|8|9|10|11|12|13|14|15|16|17|18)\.0)" +PATCH[0]="compat-4.3.patch" +PATCH_MATCH[0]="(2\.6\.(9|14|15|16|17|18|19|20|21|22|23|24|25|26|27|28|29|30|31|32|33|34|35|36|37|38|39)|3\.(0|1|2|3|4|5|6|7|8|9|10|11|12|13|14|15|16|17|18|19)\.0)|4\.(0|1|2)\.0" -PATCH[1]="compat-3.13.patch" -PATCH_MATCH[1]="(2\.6\.(9|14|15|16|17|18|19|20|21|22|23|24|25|26|27|28|29|30|31|32|33|34|35|36|37|38|39)|3\.(0|1|2|3|4|5|6|7|8|9|10|11|12|13)\.0)" +PATCH[1]="compat-3.18.patch" +PATCH_MATCH[1]="(2\.6\.(9|14|15|16|17|18|19|20|21|22|23|24|25|26|27|28|29|30|31|32|33|34|35|36|37|38|39)|3\.(0|1|2|3|4|5|6|7|8|9|10|11|12|13|14|15|16|17|18)\.0)" -PATCH[2]="compat-3.12.patch" -PATCH_MATCH[2]="(2\.6\.(9|14|15|16|17|18|19|20|21|22|23|24|25|26|27|28|29|30|31|32|33|34|35|36|37|38|39)|3\.(0|1|2|3|4|5|6|7|8|9|10|11|12)\.0)" +PATCH[2]="compat-3.13.patch" +PATCH_MATCH[2]="(2\.6\.(9|14|15|16|17|18|19|20|21|22|23|24|25|26|27|28|29|30|31|32|33|34|35|36|37|38|39)|3\.(0|1|2|3|4|5|6|7|8|9|10|11|12|13)\.0)" -PATCH[3]="compat-3.9.patch" -PATCH_MATCH[3]="(2\.6\.(9|14|15|16|17|18|19|20|21|22|23|24|25|26|27|28|29|30|31|32|33|34|35|36|37|38|39)|3\.(0|1|2|3|4|5|6|7|8|9)\.0)" +PATCH[3]="compat-3.12.patch" +PATCH_MATCH[3]="(2\.6\.(9|14|15|16|17|18|19|20|21|22|23|24|25|26|27|28|29|30|31|32|33|34|35|36|37|38|39)|3\.(0|1|2|3|4|5|6|7|8|9|10|11|12)\.0)" -PATCH[4]="compat-3.6.patch" -PATCH_MATCH[4]="(2\.6\.(9|14|15|16|17|18|19|20|21|22|23|24|25|26|27|28|29|30|31|32|33|34|35|36|37|38|39)|3\.(0|1|2|3|4|5|6)\.0)" +PATCH[4]="compat-3.9.patch" +PATCH_MATCH[4]="(2\.6\.(9|14|15|16|17|18|19|20|21|22|23|24|25|26|27|28|29|30|31|32|33|34|35|36|37|38|39)|3\.(0|1|2|3|4|5|6|7|8|9)\.0)" -PATCH[5]="compat-3.5.patch" -PATCH_MATCH[5]="(2\.6\.(9|14|15|16|17|18|19|20|21|22|23|24|25|26|27|28|29|30|31|32|33|34|35|36|37|38|39)|3\.(0|1|2|3|4|5)\.0)" +PATCH[5]="compat-3.6.patch" +PATCH_MATCH[5]="(2\.6\.(9|14|15|16|17|18|19|20|21|22|23|24|25|26|27|28|29|30|31|32|33|34|35|36|37|38|39)|3\.(0|1|2|3|4|5|6)\.0)" -PATCH[6]="compat-3.2-3.4.patch" -PATCH_MATCH[6]="(2\.6\.(9|14|15|16|17|18|19|20|21|22|23|24|25|26|27|28|29|30|31|32|33|34|35|36|37|38|39)|3\.(0|1|2|3|4)\.0)" +PATCH[6]="compat-3.5.patch" +PATCH_MATCH[6]="(2\.6\.(9|14|15|16|17|18|19|20|21|22|23|24|25|26|27|28|29|30|31|32|33|34|35|36|37|38|39)|3\.(0|1|2|3|4|5)\.0)" -PATCH[7]="compat-2.6.39-3.2.patch" -PATCH_MATCH[7]="(2\.6\.(9|14|15|16|17|18|19|20|21|22|23|24|25|26|27|28|29|30|31|32|33|34|35|36|37|38|39)|3\.(0|1|2)\.0)" +PATCH[7]="compat-3.2-3.4.patch" +PATCH_MATCH[7]="(2\.6\.(9|14|15|16|17|18|19|20|21|22|23|24|25|26|27|28|29|30|31|32|33|34|35|36|37|38|39)|3\.(0|1|2|3|4)\.0)" -PATCH[8]="compat-2.6.38.patch" -PATCH_MATCH[8]="2\.6\.(9|14|15|16|17|18|19|20|21|22|23|24|25|26|27|28|29|30|31|32|33|34|35|36|37|38)" +PATCH[8]="compat-2.6.39-3.2.patch" +PATCH_MATCH[8]="(2\.6\.(9|14|15|16|17|18|19|20|21|22|23|24|25|26|27|28|29|30|31|32|33|34|35|36|37|38|39)|3\.(0|1|2)\.0)" -PATCH[9]="compat-2.6.36-2.6.37.patch" -PATCH_MATCH[9]="2\.6\.(9|14|15|16|17|18|19|20|21|22|23|24|25|26|27|28|29|30|31|32|33|34|35|36|37)" +PATCH[9]="compat-2.6.38.patch" +PATCH_MATCH[9]="2\.6\.(9|14|15|16|17|18|19|20|21|22|23|24|25|26|27|28|29|30|31|32|33|34|35|36|37|38)" -PATCH[10]="compat-2.6.33-2.6.35.patch" -PATCH_MATCH[10]="2\.6\.(9|14|15|16|17|18|19|20|21|22|23|24|25|26|27|28|29|30|31|32|33|34|35)" +PATCH[10]="compat-2.6.36-2.6.37.patch" +PATCH_MATCH[10]="2\.6\.(9|14|15|16|17|18|19|20|21|22|23|24|25|26|27|28|29|30|31|32|33|34|35|36|37)" -PATCH[11]="compat-2.6.32.patch" -PATCH_MATCH[11]="2\.6\.(9|14|15|16|17|18|19|20|21|22|23|24|25|26|27|28|29|30|31|32)" +PATCH[11]="compat-2.6.33-2.6.35.patch" +PATCH_MATCH[11]="2\.6\.(9|14|15|16|17|18|19|20|21|22|23|24|25|26|27|28|29|30|31|32|33|34|35)" -PATCH[12]="compat-2.6.31.patch" -PATCH_MATCH[12]="2\.6\.(9|14|15|16|17|18|19|20|21|22|23|24|25|26|27|28|29|30|31)" +PATCH[12]="compat-2.6.32.patch" +PATCH_MATCH[12]="2\.6\.(9|14|15|16|17|18|19|20|21|22|23|24|25|26|27|28|29|30|31|32)" -PATCH[13]="compat-2.6.30.patch" -PATCH_MATCH[13]="2\.6\.(9|14|15|16|17|18|19|20|21|22|23|24|25|26|27|28|29|30)" +PATCH[13]="compat-2.6.31.patch" +PATCH_MATCH[13]="2\.6\.(9|14|15|16|17|18|19|20|21|22|23|24|25|26|27|28|29|30|31)" -PATCH[14]="compat-2.6.29.patch" -PATCH_MATCH[14]="2\.6\.(9|14|15|16|17|18|19|20|21|22|23|24|25|26|27|28|29)" +PATCH[14]="compat-2.6.30.patch" +PATCH_MATCH[14]="2\.6\.(9|14|15|16|17|18|19|20|21|22|23|24|25|26|27|28|29|30)" -PATCH[15]="compat-2.6.28.patch" -PATCH_MATCH[15]="2\.6\.(9|14|15|16|17|18|19|20|21|22|23|24|25|26|27|28)" +PATCH[15]="compat-2.6.29.patch" +PATCH_MATCH[15]="2\.6\.(9|14|15|16|17|18|19|20|21|22|23|24|25|26|27|28|29)" -PATCH[16]="compat-2.6.25-2.6.27.patch" -PATCH_MATCH[16]="2\.6\.(9|14|15|16|17|18|19|20|21|22|23|24|25|26|27)" +PATCH[16]="compat-2.6.28.patch" +PATCH_MATCH[16]="2\.6\.(9|14|15|16|17|18|19|20|21|22|23|24|25|26|27|28)" -PATCH[17]="compat-2.6.24.patch" -PATCH_MATCH[17]="2\.6\.(9|14|15|16|17|18|19|20|21|22|23|24)" +PATCH[17]="compat-2.6.25-2.6.27.patch" +PATCH_MATCH[17]="2\.6\.(9|14|15|16|17|18|19|20|21|22|23|24|25|26|27)" -PATCH[18]="compat-2.6.23.patch" -PATCH_MATCH[18]="2\.6\.(9|14|15|16|17|18|19|20|21|22|23)" +PATCH[18]="compat-2.6.24.patch" +PATCH_MATCH[18]="2\.6\.(9|14|15|16|17|18|19|20|21|22|23|24)" -PATCH[19]="compat-2.6.22.patch" -PATCH_MATCH[19]="2\.6\.(9|14|15|16|17|18|19|20|21|22)" +PATCH[19]="compat-2.6.23.patch" +PATCH_MATCH[19]="2\.6\.(9|14|15|16|17|18|19|20|21|22|23)" -PATCH[20]="compat-2.6.19-2.6.21.patch" -PATCH_MATCH[20]="2\.6\.(9|14|15|16|17|18|19|20|21)" +PATCH[20]="compat-2.6.22.patch" +PATCH_MATCH[20]="2\.6\.(9|14|15|16|17|18|19|20|21|22)" -PATCH[21]="compat-2.6.14-2.6.18.patch" -PATCH_MATCH[21]="2\.6\.(9|14|15|16|17|18)" +PATCH[21]="compat-2.6.19-2.6.21.patch" +PATCH_MATCH[21]="2\.6\.(9|14|15|16|17|18|19|20|21)" -PATCH[22]="compat-sles10sp2.patch" -PATCH_MATCH[22]="2\.6\.16\.60-.*" +PATCH[22]="compat-2.6.14-2.6.18.patch" +PATCH_MATCH[22]="2\.6\.(9|14|15|16|17|18)" -PATCH[23]="compat-rhel4.patch" -PATCH_MATCH[23]="2\.6\.9-.*\.(el|plus\.c4)" +PATCH[23]="compat-sles10sp2.patch" +PATCH_MATCH[23]="2\.6\.16\.60-.*" + +PATCH[24]="compat-rhel4.patch" +PATCH_MATCH[24]="2\.6\.9-.*\.(el|plus\.c4)" debian/patches/add-4.3-compat.patch0000664000000000000000000000576313064067160014171 0ustar Description: Add compat-4.3.patch to DKMS patches This add the compat patch to the DKMS machinery (but does not enable it). Author: Stefan Bader Index: iscsitarget-1.4.20.3+svn502/patches/compat-4.3.patch =================================================================== --- /dev/null 1970-01-01 00:00:00.000000000 +0000 +++ iscsitarget-1.4.20.3+svn502/patches/compat-4.3.patch 2015-11-23 19:30:21.914678637 +0100 @@ -0,0 +1,72 @@ +Index: iscsitarget-1.4.20.3+svn502/kernel/block-io.c +=================================================================== +--- iscsitarget-1.4.20.3+svn502.orig/kernel/block-io.c 2015-11-23 19:25:01.818683572 +0100 ++++ iscsitarget-1.4.20.3+svn502/kernel/block-io.c 2014-05-06 22:59:55.000000000 +0200 +@@ -29,12 +29,14 @@ struct tio_work { + struct completion tio_complete; + }; + +-static void blockio_bio_endio(struct bio *bio) ++static void blockio_bio_endio(struct bio *bio, int error) + { + struct tio_work *tio_work = bio->bi_private; + +- if (bio->bi_error) +- atomic_set(&tio_work->error, bio->bi_error); ++ error = test_bit(BIO_UPTODATE, &bio->bi_flags) ? error : -EIO; ++ ++ if (error) ++ atomic_set(&tio_work->error, error); + + /* If last bio signal completion */ + if (atomic_dec_and_test(&tio_work->bios_remaining)) +@@ -59,11 +61,15 @@ blockio_make_request(struct iet_volume * + u32 size = tio->size; + u32 tio_index = 0; + +- int max_pages = bdev_q ? BIO_MAX_PAGES : 1; ++ int max_pages = 1; + int err = 0; + + loff_t ppos = tio->offset; + ++ /* Calculate max_pages for bio_alloc (memory saver) */ ++ if (bdev_q) ++ max_pages = bio_get_nr_vecs(bio_data->bdev); ++ + tio_work = kzalloc(sizeof (*tio_work), GFP_KERNEL); + if (!tio_work) + return -ENOMEM; +Index: iscsitarget-1.4.20.3+svn502/kernel/conn.c +=================================================================== +--- iscsitarget-1.4.20.3+svn502.orig/kernel/conn.c 2015-11-23 19:14:46.974693052 +0100 ++++ iscsitarget-1.4.20.3+svn502/kernel/conn.c 2015-11-23 18:59:14.000000000 +0100 +@@ -87,13 +87,13 @@ static void iet_state_change(struct sock + target->nthread_info.old_state_change(sk); + } + +-static void iet_data_ready(struct sock *sk) ++static void iet_data_ready(struct sock *sk, int len) + { + struct iscsi_conn *conn = sk->sk_user_data; + struct iscsi_target *target = conn->session->target; + + nthread_wakeup(target); +- target->nthread_info.old_data_ready(sk); ++ target->nthread_info.old_data_ready(sk, len); + } + + /* +Index: iscsitarget-1.4.20.3+svn502/kernel/iscsi.h +=================================================================== +--- iscsitarget-1.4.20.3+svn502.orig/kernel/iscsi.h 2015-11-23 19:14:22.942693422 +0100 ++++ iscsitarget-1.4.20.3+svn502/kernel/iscsi.h 2014-05-06 22:59:55.000000000 +0200 +@@ -81,7 +81,7 @@ struct network_thread_info { + spinlock_t nthread_lock; + + void (*old_state_change)(struct sock *); +- void (*old_data_ready)(struct sock *); ++ void (*old_data_ready)(struct sock *, int); + void (*old_write_space)(struct sock *); + }; + debian/patches/enable-3.19-compat.patch0000664000000000000000000001413013064066674014752 0ustar Description: Enable 3.19 (and 3.14) compat patch for the DKMS build Author: Stefan Bader Forward: no Index: iscsitarget-1.4.20.3+svn499/dkms.conf =================================================================== --- iscsitarget-1.4.20.3+svn499.orig/dkms.conf 2015-09-14 16:30:47.000000000 +0200 +++ iscsitarget-1.4.20.3+svn499/dkms.conf 2015-09-14 16:36:26.787588481 +0200 @@ -19,70 +19,75 @@ AUTOINSTALL="yes" # # Patches newest - oldest, distro spec at bottom # +PATCH[0]="compat-3.18.patch" +PATCH_MATCH[0]="(2\.6\.(9|14|15|16|17|18|19|20|21|22|23|24|25|26|27|28|29|30|31|32|33|34|35|36|37|38|39)|3\.(0|1|2|3|4|5|6|7|8|9|10|11|12|13|14|15|16|17|18)\.0)" -PATCH[0]="compat-3.12.patch" -PATCH_MATCH[0]="(2\.6\.(9|14|15|16|17|18|19|20|21|22|23|24|25|26|27|28|29|30|31|32|33|34|35|36|37|38|39)|3\.(0|1|2|3|4|5|6|7|8|9|10|11|12)\.0)" +PATCH[1]="compat-3.13.patch" +PATCH_MATCH[1]="(2\.6\.(9|14|15|16|17|18|19|20|21|22|23|24|25|26|27|28|29|30|31|32|33|34|35|36|37|38|39)|3\.(0|1|2|3|4|5|6|7|8|9|10|11|12|13)\.0)" -PATCH[1]="compat-3.9.patch" -PATCH_MATCH[1]="(2\.6\.(9|14|15|16|17|18|19|20|21|22|23|24|25|26|27|28|29|30|31|32|33|34|35|36|37|38|39)|3\.(0|1|2|3|4|5|6|7|8|9)\.0)" +PATCH[2]="compat-3.12.patch" +PATCH_MATCH[2]="(2\.6\.(9|14|15|16|17|18|19|20|21|22|23|24|25|26|27|28|29|30|31|32|33|34|35|36|37|38|39)|3\.(0|1|2|3|4|5|6|7|8|9|10|11|12)\.0)" -PATCH[2]="compat-3.6.patch" -PATCH_MATCH[2]="(2\.6\.(9|14|15|16|17|18|19|20|21|22|23|24|25|26|27|28|29|30|31|32|33|34|35|36|37|38|39)|3\.(0|1|2|3|4|5|6)\.0)" +PATCH[3]="compat-3.9.patch" +PATCH_MATCH[3]="(2\.6\.(9|14|15|16|17|18|19|20|21|22|23|24|25|26|27|28|29|30|31|32|33|34|35|36|37|38|39)|3\.(0|1|2|3|4|5|6|7|8|9)\.0)" -PATCH[3]="compat-3.5.patch" -PATCH_MATCH[3]="(2\.6\.(9|14|15|16|17|18|19|20|21|22|23|24|25|26|27|28|29|30|31|32|33|34|35|36|37|38|39)|3\.(0|1|2|3|4|5)\.0)" +PATCH[4]="compat-3.6.patch" +PATCH_MATCH[4]="(2\.6\.(9|14|15|16|17|18|19|20|21|22|23|24|25|26|27|28|29|30|31|32|33|34|35|36|37|38|39)|3\.(0|1|2|3|4|5|6)\.0)" -PATCH[4]="compat-3.2-3.4.patch" -PATCH_MATCH[4]="(2\.6\.(9|14|15|16|17|18|19|20|21|22|23|24|25|26|27|28|29|30|31|32|33|34|35|36|37|38|39)|3\.(0|1|2|3|4)\.0)" +PATCH[5]="compat-3.5.patch" +PATCH_MATCH[5]="(2\.6\.(9|14|15|16|17|18|19|20|21|22|23|24|25|26|27|28|29|30|31|32|33|34|35|36|37|38|39)|3\.(0|1|2|3|4|5)\.0)" -PATCH[5]="compat-2.6.39-3.2.patch" -PATCH_MATCH[5]="(2\.6\.(9|14|15|16|17|18|19|20|21|22|23|24|25|26|27|28|29|30|31|32|33|34|35|36|37|38|39)|3\.(0|1|2)\.0)" +PATCH[6]="compat-3.2-3.4.patch" +PATCH_MATCH[6]="(2\.6\.(9|14|15|16|17|18|19|20|21|22|23|24|25|26|27|28|29|30|31|32|33|34|35|36|37|38|39)|3\.(0|1|2|3|4)\.0)" -PATCH[6]="compat-2.6.38.patch" -PATCH_MATCH[6]="2\.6\.(9|14|15|16|17|18|19|20|21|22|23|24|25|26|27|28|29|30|31|32|33|34|35|36|37|38)" +PATCH[7]="compat-2.6.39-3.2.patch" +PATCH_MATCH[7]="(2\.6\.(9|14|15|16|17|18|19|20|21|22|23|24|25|26|27|28|29|30|31|32|33|34|35|36|37|38|39)|3\.(0|1|2)\.0)" -PATCH[7]="compat-2.6.36-2.6.37.patch" -PATCH_MATCH[7]="2\.6\.(9|14|15|16|17|18|19|20|21|22|23|24|25|26|27|28|29|30|31|32|33|34|35|36|37)" +PATCH[8]="compat-2.6.38.patch" +PATCH_MATCH[8]="2\.6\.(9|14|15|16|17|18|19|20|21|22|23|24|25|26|27|28|29|30|31|32|33|34|35|36|37|38)" -PATCH[8]="compat-2.6.33-2.6.35.patch" -PATCH_MATCH[8]="2\.6\.(9|14|15|16|17|18|19|20|21|22|23|24|25|26|27|28|29|30|31|32|33|34|35)" +PATCH[9]="compat-2.6.36-2.6.37.patch" +PATCH_MATCH[9]="2\.6\.(9|14|15|16|17|18|19|20|21|22|23|24|25|26|27|28|29|30|31|32|33|34|35|36|37)" -PATCH[9]="compat-2.6.32.patch" -PATCH_MATCH[9]="2\.6\.(9|14|15|16|17|18|19|20|21|22|23|24|25|26|27|28|29|30|31|32)" +PATCH[10]="compat-2.6.33-2.6.35.patch" +PATCH_MATCH[10]="2\.6\.(9|14|15|16|17|18|19|20|21|22|23|24|25|26|27|28|29|30|31|32|33|34|35)" -PATCH[10]="compat-2.6.31.patch" -PATCH_MATCH[10]="2\.6\.(9|14|15|16|17|18|19|20|21|22|23|24|25|26|27|28|29|30|31)" +PATCH[11]="compat-2.6.32.patch" +PATCH_MATCH[11]="2\.6\.(9|14|15|16|17|18|19|20|21|22|23|24|25|26|27|28|29|30|31|32)" -PATCH[11]="compat-2.6.30.patch" -PATCH_MATCH[11]="2\.6\.(9|14|15|16|17|18|19|20|21|22|23|24|25|26|27|28|29|30)" +PATCH[12]="compat-2.6.31.patch" +PATCH_MATCH[12]="2\.6\.(9|14|15|16|17|18|19|20|21|22|23|24|25|26|27|28|29|30|31)" -PATCH[12]="compat-2.6.29.patch" -PATCH_MATCH[12]="2\.6\.(9|14|15|16|17|18|19|20|21|22|23|24|25|26|27|28|29)" +PATCH[13]="compat-2.6.30.patch" +PATCH_MATCH[13]="2\.6\.(9|14|15|16|17|18|19|20|21|22|23|24|25|26|27|28|29|30)" -PATCH[13]="compat-2.6.28.patch" -PATCH_MATCH[13]="2\.6\.(9|14|15|16|17|18|19|20|21|22|23|24|25|26|27|28)" +PATCH[14]="compat-2.6.29.patch" +PATCH_MATCH[14]="2\.6\.(9|14|15|16|17|18|19|20|21|22|23|24|25|26|27|28|29)" -PATCH[14]="compat-2.6.25-2.6.27.patch" -PATCH_MATCH[14]="2\.6\.(9|14|15|16|17|18|19|20|21|22|23|24|25|26|27)" +PATCH[15]="compat-2.6.28.patch" +PATCH_MATCH[15]="2\.6\.(9|14|15|16|17|18|19|20|21|22|23|24|25|26|27|28)" -PATCH[15]="compat-2.6.24.patch" -PATCH_MATCH[15]="2\.6\.(9|14|15|16|17|18|19|20|21|22|23|24)" +PATCH[16]="compat-2.6.25-2.6.27.patch" +PATCH_MATCH[16]="2\.6\.(9|14|15|16|17|18|19|20|21|22|23|24|25|26|27)" -PATCH[16]="compat-2.6.23.patch" -PATCH_MATCH[16]="2\.6\.(9|14|15|16|17|18|19|20|21|22|23)" +PATCH[17]="compat-2.6.24.patch" +PATCH_MATCH[17]="2\.6\.(9|14|15|16|17|18|19|20|21|22|23|24)" -PATCH[17]="compat-2.6.22.patch" -PATCH_MATCH[17]="2\.6\.(9|14|15|16|17|18|19|20|21|22)" +PATCH[18]="compat-2.6.23.patch" +PATCH_MATCH[18]="2\.6\.(9|14|15|16|17|18|19|20|21|22|23)" -PATCH[18]="compat-2.6.19-2.6.21.patch" -PATCH_MATCH[18]="2\.6\.(9|14|15|16|17|18|19|20|21)" +PATCH[19]="compat-2.6.22.patch" +PATCH_MATCH[19]="2\.6\.(9|14|15|16|17|18|19|20|21|22)" -PATCH[19]="compat-2.6.14-2.6.18.patch" -PATCH_MATCH[19]="2\.6\.(9|14|15|16|17|18)" +PATCH[20]="compat-2.6.19-2.6.21.patch" +PATCH_MATCH[20]="2\.6\.(9|14|15|16|17|18|19|20|21)" -PATCH[20]="compat-sles10sp2.patch" -PATCH_MATCH[20]="2\.6\.16\.60-.*" +PATCH[21]="compat-2.6.14-2.6.18.patch" +PATCH_MATCH[21]="2\.6\.(9|14|15|16|17|18)" -PATCH[21]="compat-rhel4.patch" -PATCH_MATCH[21]="2\.6\.9-.*\.(el|plus\.c4)" +PATCH[22]="compat-sles10sp2.patch" +PATCH_MATCH[22]="2\.6\.16\.60-.*" + +PATCH[23]="compat-rhel4.patch" +PATCH_MATCH[23]="2\.6\.9-.*\.(el|plus\.c4)" debian/patches/check_recvmsg_on_make.patch0000664000000000000000000000111113205071437016130 0ustar Index: iscsitarget-1.4.20.3+svn499/kernel/Makefile =================================================================== --- iscsitarget-1.4.20.3+svn499.orig/kernel/Makefile 2011-09-09 06:28:52.000000000 +0000 +++ iscsitarget-1.4.20.3+svn499/kernel/Makefile 2017-11-21 18:40:24.269643999 +0000 @@ -15,3 +15,7 @@ file-io.o null-io.o target_disk.o event.o param.o \ block-io.o ua.o persist.o +$(addprefix $(obj)/,$(iscsi_trgt-objs)): $(obj)/config.h + +$(obj)/config.h: $(src)/../configure_features.sh + kernelver=$(KERNELRELEASE) $(src)/../configure_features.sh $(obj)/config.h debian/patches/enable-3.12-compat.patch0000664000000000000000000001245113064066674014747 0ustar Description: Add 3.12 compat patch to dkms configuration Author: James Page Forwarded: no --- a/dkms.conf +++ b/dkms.conf @@ -20,66 +20,69 @@ AUTOINSTALL="yes" # Patches newest - oldest, distro spec at bottom # -PATCH[0]="compat-3.9.patch" -PATCH_MATCH[0]="(2\.6\.(9|14|15|16|17|18|19|20|21|22|23|24|25|26|27|28|29|30|31|32|33|34|35|36|37|38|39)|3\.(0|1|2|3|4|5|6|7|8|9)\.0)" +PATCH[0]="compat-3.12.patch" +PATCH_MATCH[0]="(2\.6\.(9|14|15|16|17|18|19|20|21|22|23|24|25|26|27|28|29|30|31|32|33|34|35|36|37|38|39)|3\.(0|1|2|3|4|5|6|7|8|9|10|11|12)\.0)" -PATCH[1]="compat-3.6.patch" -PATCH_MATCH[1]="(2\.6\.(9|14|15|16|17|18|19|20|21|22|23|24|25|26|27|28|29|30|31|32|33|34|35|36|37|38|39)|3\.(0|1|2|3|4|5|6)\.0)" +PATCH[1]="compat-3.9.patch" +PATCH_MATCH[1]="(2\.6\.(9|14|15|16|17|18|19|20|21|22|23|24|25|26|27|28|29|30|31|32|33|34|35|36|37|38|39)|3\.(0|1|2|3|4|5|6|7|8|9)\.0)" -PATCH[2]="compat-3.5.patch" -PATCH_MATCH[2]="(2\.6\.(9|14|15|16|17|18|19|20|21|22|23|24|25|26|27|28|29|30|31|32|33|34|35|36|37|38|39)|3\.(0|1|2|3|4|5)\.0)" +PATCH[2]="compat-3.6.patch" +PATCH_MATCH[2]="(2\.6\.(9|14|15|16|17|18|19|20|21|22|23|24|25|26|27|28|29|30|31|32|33|34|35|36|37|38|39)|3\.(0|1|2|3|4|5|6)\.0)" -PATCH[3]="compat-3.2-3.4.patch" -PATCH_MATCH[3]="(2\.6\.(9|14|15|16|17|18|19|20|21|22|23|24|25|26|27|28|29|30|31|32|33|34|35|36|37|38|39)|3\.(0|1|2|3|4)\.0)" +PATCH[3]="compat-3.5.patch" +PATCH_MATCH[3]="(2\.6\.(9|14|15|16|17|18|19|20|21|22|23|24|25|26|27|28|29|30|31|32|33|34|35|36|37|38|39)|3\.(0|1|2|3|4|5)\.0)" -PATCH[4]="compat-2.6.39-3.2.patch" -PATCH_MATCH[4]="(2\.6\.(9|14|15|16|17|18|19|20|21|22|23|24|25|26|27|28|29|30|31|32|33|34|35|36|37|38|39)|3\.(0|1|2)\.0)" +PATCH[4]="compat-3.2-3.4.patch" +PATCH_MATCH[4]="(2\.6\.(9|14|15|16|17|18|19|20|21|22|23|24|25|26|27|28|29|30|31|32|33|34|35|36|37|38|39)|3\.(0|1|2|3|4)\.0)" -PATCH[5]="compat-2.6.38.patch" -PATCH_MATCH[5]="2\.6\.(9|14|15|16|17|18|19|20|21|22|23|24|25|26|27|28|29|30|31|32|33|34|35|36|37|38)" +PATCH[5]="compat-2.6.39-3.2.patch" +PATCH_MATCH[5]="(2\.6\.(9|14|15|16|17|18|19|20|21|22|23|24|25|26|27|28|29|30|31|32|33|34|35|36|37|38|39)|3\.(0|1|2)\.0)" -PATCH[6]="compat-2.6.36-2.6.37.patch" -PATCH_MATCH[6]="2\.6\.(9|14|15|16|17|18|19|20|21|22|23|24|25|26|27|28|29|30|31|32|33|34|35|36|37)" +PATCH[6]="compat-2.6.38.patch" +PATCH_MATCH[6]="2\.6\.(9|14|15|16|17|18|19|20|21|22|23|24|25|26|27|28|29|30|31|32|33|34|35|36|37|38)" -PATCH[7]="compat-2.6.33-2.6.35.patch" -PATCH_MATCH[7]="2\.6\.(9|14|15|16|17|18|19|20|21|22|23|24|25|26|27|28|29|30|31|32|33|34|35)" +PATCH[7]="compat-2.6.36-2.6.37.patch" +PATCH_MATCH[7]="2\.6\.(9|14|15|16|17|18|19|20|21|22|23|24|25|26|27|28|29|30|31|32|33|34|35|36|37)" -PATCH[8]="compat-2.6.32.patch" -PATCH_MATCH[8]="2\.6\.(9|14|15|16|17|18|19|20|21|22|23|24|25|26|27|28|29|30|31|32)" +PATCH[8]="compat-2.6.33-2.6.35.patch" +PATCH_MATCH[8]="2\.6\.(9|14|15|16|17|18|19|20|21|22|23|24|25|26|27|28|29|30|31|32|33|34|35)" -PATCH[9]="compat-2.6.31.patch" -PATCH_MATCH[9]="2\.6\.(9|14|15|16|17|18|19|20|21|22|23|24|25|26|27|28|29|30|31)" +PATCH[9]="compat-2.6.32.patch" +PATCH_MATCH[9]="2\.6\.(9|14|15|16|17|18|19|20|21|22|23|24|25|26|27|28|29|30|31|32)" -PATCH[10]="compat-2.6.30.patch" -PATCH_MATCH[10]="2\.6\.(9|14|15|16|17|18|19|20|21|22|23|24|25|26|27|28|29|30)" +PATCH[10]="compat-2.6.31.patch" +PATCH_MATCH[10]="2\.6\.(9|14|15|16|17|18|19|20|21|22|23|24|25|26|27|28|29|30|31)" -PATCH[11]="compat-2.6.29.patch" -PATCH_MATCH[11]="2\.6\.(9|14|15|16|17|18|19|20|21|22|23|24|25|26|27|28|29)" +PATCH[11]="compat-2.6.30.patch" +PATCH_MATCH[11]="2\.6\.(9|14|15|16|17|18|19|20|21|22|23|24|25|26|27|28|29|30)" -PATCH[12]="compat-2.6.28.patch" -PATCH_MATCH[12]="2\.6\.(9|14|15|16|17|18|19|20|21|22|23|24|25|26|27|28)" +PATCH[12]="compat-2.6.29.patch" +PATCH_MATCH[12]="2\.6\.(9|14|15|16|17|18|19|20|21|22|23|24|25|26|27|28|29)" -PATCH[13]="compat-2.6.25-2.6.27.patch" -PATCH_MATCH[13]="2\.6\.(9|14|15|16|17|18|19|20|21|22|23|24|25|26|27)" +PATCH[13]="compat-2.6.28.patch" +PATCH_MATCH[13]="2\.6\.(9|14|15|16|17|18|19|20|21|22|23|24|25|26|27|28)" -PATCH[14]="compat-2.6.24.patch" -PATCH_MATCH[14]="2\.6\.(9|14|15|16|17|18|19|20|21|22|23|24)" +PATCH[14]="compat-2.6.25-2.6.27.patch" +PATCH_MATCH[14]="2\.6\.(9|14|15|16|17|18|19|20|21|22|23|24|25|26|27)" -PATCH[15]="compat-2.6.23.patch" -PATCH_MATCH[15]="2\.6\.(9|14|15|16|17|18|19|20|21|22|23)" +PATCH[15]="compat-2.6.24.patch" +PATCH_MATCH[15]="2\.6\.(9|14|15|16|17|18|19|20|21|22|23|24)" -PATCH[16]="compat-2.6.22.patch" -PATCH_MATCH[16]="2\.6\.(9|14|15|16|17|18|19|20|21|22)" +PATCH[16]="compat-2.6.23.patch" +PATCH_MATCH[16]="2\.6\.(9|14|15|16|17|18|19|20|21|22|23)" -PATCH[17]="compat-2.6.19-2.6.21.patch" -PATCH_MATCH[17]="2\.6\.(9|14|15|16|17|18|19|20|21)" +PATCH[17]="compat-2.6.22.patch" +PATCH_MATCH[17]="2\.6\.(9|14|15|16|17|18|19|20|21|22)" -PATCH[18]="compat-2.6.14-2.6.18.patch" -PATCH_MATCH[18]="2\.6\.(9|14|15|16|17|18)" +PATCH[18]="compat-2.6.19-2.6.21.patch" +PATCH_MATCH[18]="2\.6\.(9|14|15|16|17|18|19|20|21)" -PATCH[19]="compat-sles10sp2.patch" -PATCH_MATCH[19]="2\.6\.16\.60-.*" +PATCH[19]="compat-2.6.14-2.6.18.patch" +PATCH_MATCH[19]="2\.6\.(9|14|15|16|17|18)" -PATCH[20]="compat-rhel4.patch" -PATCH_MATCH[20]="2\.6\.9-.*\.(el|plus\.c4)" +PATCH[20]="compat-sles10sp2.patch" +PATCH_MATCH[20]="2\.6\.16\.60-.*" + +PATCH[21]="compat-rhel4.patch" +PATCH_MATCH[21]="2\.6\.9-.*\.(el|plus\.c4)" debian/patches/fix-build-3.19.patch0000664000000000000000000002126013064066674014130 0ustar Description: Fix source to compile on 3.19 kernels Author: Stefan Bader Forward: no Index: iscsitarget-1.4.20.3+svn499/kernel/block-io.c =================================================================== --- iscsitarget-1.4.20.3+svn499.orig/kernel/block-io.c 2013-07-03 20:34:49.000000000 +0200 +++ iscsitarget-1.4.20.3+svn499/kernel/block-io.c 2015-09-14 17:05:44.379561382 +0200 @@ -87,7 +87,7 @@ blockio_make_request(struct iet_volume * } /* bi_sector is ALWAYS in units of 512 bytes */ - bio->bi_sector = ppos >> 9; + bio->bi_iter.bi_sector = ppos >> 9; bio->bi_bdev = bio_data->bdev; bio->bi_end_io = blockio_bio_endio; bio->bi_private = tio_work; Index: iscsitarget-1.4.20.3+svn499/kernel/conn.c =================================================================== --- iscsitarget-1.4.20.3+svn499.orig/kernel/conn.c 2014-01-26 19:30:45.000000000 +0100 +++ iscsitarget-1.4.20.3+svn499/kernel/conn.c 2015-09-14 17:05:48.491561319 +0200 @@ -127,7 +127,7 @@ static void iet_socket_bind(struct iscsi dprintk(D_GENERIC, "%llu\n", (unsigned long long) session->sid); - conn->sock = SOCKET_I(conn->file->f_dentry->d_inode); + conn->sock = SOCKET_I(file_inode(conn->file)); conn->sock->sk->sk_user_data = conn; write_lock_bh(&conn->sock->sk->sk_callback_lock); Index: iscsitarget-1.4.20.3+svn499/kernel/file-io.c =================================================================== --- iscsitarget-1.4.20.3+svn499.orig/kernel/file-io.c 2013-07-03 20:34:49.000000000 +0200 +++ iscsitarget-1.4.20.3+svn499/kernel/file-io.c 2015-09-14 17:05:48.491561319 +0200 @@ -69,7 +69,7 @@ static int fileio_make_request(struct ie static int fileio_sync(struct iet_volume *lu, struct tio *tio) { struct fileio_data *p = lu->private; - struct inode *inode = p->filp->f_dentry->d_inode; + struct inode *inode = file_inode(p->filp); struct address_space *mapping = inode->i_mapping; loff_t ppos, count; int res; @@ -213,7 +213,7 @@ static int fileio_attach(struct iet_volu eprintk("%d\n", err); goto out; } - inode = p->filp->f_dentry->d_inode; + inode = file_inode(p->filp); if (S_ISREG(inode->i_mode)) ; Index: iscsitarget-1.4.20.3+svn499/kernel/iscsi.c =================================================================== --- iscsitarget-1.4.20.3+svn499.orig/kernel/iscsi.c 2012-04-16 21:56:35.000000000 +0200 +++ iscsitarget-1.4.20.3+svn499/kernel/iscsi.c 2015-09-14 17:05:48.479561319 +0200 @@ -489,8 +489,7 @@ static void cmnd_skip_pdu(struct iscsi_c } conn->read_iov[i].iov_base = addr; conn->read_iov[i].iov_len = size; - conn->read_msg.msg_iov = conn->read_iov; - conn->read_msg.msg_iovlen = ++i; + iov_iter_init(&conn->read_msg.msg_iter, READ, conn->read_iov, ++i, conn->read_size); } static void iscsi_cmnd_reject(struct iscsi_cmnd *req, int reason) @@ -718,7 +717,6 @@ static int cmnd_recv_pdu(struct iscsi_co idx = offset >> PAGE_CACHE_SHIFT; offset &= ~PAGE_CACHE_MASK; - conn->read_msg.msg_iov = conn->read_iov; conn->read_size = size = (size + 3) & -4; conn->read_overflow = 0; @@ -730,16 +728,16 @@ static int cmnd_recv_pdu(struct iscsi_co conn->read_iov[i].iov_base = addr + offset; if (offset + size <= PAGE_CACHE_SIZE) { conn->read_iov[i].iov_len = size; - conn->read_msg.msg_iovlen = ++i; + iov_iter_init(&conn->read_msg.msg_iter, READ, conn->read_iov, ++i, conn->read_size); break; } conn->read_iov[i].iov_len = PAGE_CACHE_SIZE - offset; size -= conn->read_iov[i].iov_len; offset = 0; if (++i >= ISCSI_CONN_IOV_MAX) { - conn->read_msg.msg_iovlen = i; conn->read_overflow = size; conn->read_size -= size; + iov_iter_init(&conn->read_msg.msg_iter, READ, conn->read_iov, i, conn->read_size); break; } @@ -918,7 +916,6 @@ static int nop_out_start(struct iscsi_co if ((size = cmnd->pdu.datasize)) { size = (size + 3) & -4; - conn->read_msg.msg_iov = conn->read_iov; if (cmnd->pdu.bhs.itt != cpu_to_be32(ISCSI_RESERVED_TAG)) { struct tio *tio; int pg_cnt = get_pgcnt(size); @@ -946,7 +943,7 @@ static int nop_out_start(struct iscsi_co } assert(!size); conn->read_overflow = size; - conn->read_msg.msg_iovlen = i; + iov_iter_init(&conn->read_msg.msg_iter, READ, conn->read_iov, i, conn->read_size); } out: @@ -986,7 +983,7 @@ static void scsi_cmnd_start(struct iscsi set_cmnd_lunit(req); switch (req_hdr->scb[0]) { - case SERVICE_ACTION_IN: + case SERVICE_ACTION_IN_16: if ((req_hdr->scb[1] & 0x1f) != 0x10) goto error; case INQUIRY: Index: iscsitarget-1.4.20.3+svn499/kernel/nthread.c =================================================================== --- iscsitarget-1.4.20.3+svn499.orig/kernel/nthread.c 2012-03-22 22:25:45.000000000 +0100 +++ iscsitarget-1.4.20.3+svn499/kernel/nthread.c 2015-09-14 17:05:48.487561319 +0200 @@ -42,9 +42,8 @@ static inline void iscsi_conn_init_read( len = (len + 3) & -4; // XXX ??? conn->read_iov[0].iov_base = data; conn->read_iov[0].iov_len = len; - conn->read_msg.msg_iov = conn->read_iov; - conn->read_msg.msg_iovlen = 1; conn->read_size = (len + 3) & -4; + iov_iter_init(&conn->read_msg.msg_iter, READ, conn->read_iov, 1, conn->read_size); } static void iscsi_conn_read_ahs(struct iscsi_conn *conn, struct iscsi_cmnd *cmnd) @@ -83,14 +82,18 @@ static int is_data_available(struct iscs static void forward_iov(struct msghdr *msg, int len) { - while (msg->msg_iov->iov_len <= len) { - len -= msg->msg_iov->iov_len; - msg->msg_iov++; - msg->msg_iovlen--; + struct iovec *iov; + + while (msg->msg_iter.iov->iov_len <= len) { + len -= msg->msg_iter.iov->iov_len; + msg->msg_iter.iov++; + msg->msg_iter.nr_segs--; } - msg->msg_iov->iov_base = (char *) msg->msg_iov->iov_base + len; - msg->msg_iov->iov_len -= len; + /* XXX: discards const ... */ + iov = msg->msg_iter.iov; + iov->iov_base = (char *) msg->msg_iter.iov->iov_base + len; + iov->iov_len -= len; } static int do_recv(struct iscsi_conn *conn, int state) @@ -98,6 +101,7 @@ static int do_recv(struct iscsi_conn *co mm_segment_t oldfs; struct msghdr msg; struct iovec iov[ISCSI_CONN_IOV_MAX]; + size_t iovlen = ISCSI_CONN_IOV_MAX; int i, len, res; if (!test_bit(CONN_ACTIVE, &conn->state)) { @@ -110,12 +114,15 @@ static int do_recv(struct iscsi_conn *co goto out; } - msg.msg_iov = iov; - msg.msg_iovlen = min_t(size_t, conn->read_msg.msg_iovlen, ISCSI_CONN_IOV_MAX); - for (i = 0, len = 0; i < msg.msg_iovlen; i++) { - iov[i] = conn->read_msg.msg_iov[i]; + if (conn->read_msg.msg_iter.nr_segs < iovlen) + iovlen = conn->read_msg.msg_iter.nr_segs; + + for (i = 0, len = 0; i < iovlen; i++) { + iov[i] = conn->read_msg.msg_iter.iov[i]; len += iov[i].iov_len; } + iov_iter_init(&msg.msg_iter, READ, iov, iovlen, len); + oldfs = get_fs(); set_fs(get_ds()); Index: iscsitarget-1.4.20.3+svn499/kernel/target_disk.c =================================================================== --- iscsitarget-1.4.20.3+svn499.orig/kernel/target_disk.c 2014-01-03 09:03:31.000000000 +0100 +++ iscsitarget-1.4.20.3+svn499/kernel/target_disk.c 2015-09-14 17:05:48.491561319 +0200 @@ -606,7 +606,7 @@ static int disk_execute_cmnd(struct iscs case REQUEST_SENSE: send_data_rsp(cmnd, build_request_sense_response); break; - case SERVICE_ACTION_IN: + case SERVICE_ACTION_IN_16: send_data_rsp(cmnd, build_service_action_in_response); break; case READ_6: Index: iscsitarget-1.4.20.3+svn499/kernel/volume.c =================================================================== --- iscsitarget-1.4.20.3+svn499.orig/kernel/volume.c 2012-04-16 21:56:35.000000000 +0200 +++ iscsitarget-1.4.20.3+svn499/kernel/volume.c 2015-09-14 17:05:48.491561319 +0200 @@ -398,7 +398,7 @@ int is_volume_reserved(struct iet_volume case READ_CAPACITY: /* allowed commands when reserved */ break; - case SERVICE_ACTION_IN: + case SERVICE_ACTION_IN_16: if ((scb[1] & 0x1F) == 0x10) break; /* fall through */ @@ -465,7 +465,7 @@ int is_volume_reserved(struct iet_volume if (excl_access_ro && !registered) err = -EBUSY; break; - case SERVICE_ACTION_IN: + case SERVICE_ACTION_IN_16: if ((scb[1] & 0x1F) == 0x10) break; /* fall through */ Index: iscsitarget-1.4.20.3+svn499/Makefile =================================================================== --- iscsitarget-1.4.20.3+svn499.orig/Makefile 2014-01-26 19:30:45.000000000 +0100 +++ iscsitarget-1.4.20.3+svn499/Makefile 2015-09-14 17:19:44.103548436 +0200 @@ -66,6 +66,14 @@ kver_lk = $(shell [ `echo $(KVER) | egre # base first the earlier patch sets will not need to be modified. # +ifeq ($(call kver_lt,3,19,0),1) + PATCHES := $(PATCHES) compat-3.18.patch +endif + +ifeq ($(call kver_lt,3,14,0),1) + PATCHES := $(PATCHES) compat-3.13.patch +endif + ifeq ($(call kver_lt,3,13,0),1) PATCHES := $(PATCHES) compat-3.12.patch endif