--- iscsitarget-0.4.16+svn162.orig/debian/README.Debian +++ iscsitarget-0.4.16+svn162/debian/README.Debian @@ -0,0 +1,30 @@ +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-source, which provides the source for the kernel modules + +The iscsitarget-source package can be used in several ways, + + - The easiest and preferred way is using module assistant: + m-a a-i iscsitarget + + - Using the make-kpkg(1) command provided by the kernel-package Debian + package. This will produce a corresponding iscsitarget-modules package + for the Debian kernel-image package that you are using. This is "the + Debian way". See the "modules_image" section of the make-kpkg(1) man + page. + + - Changing to the /usr/src/modules/iscsitarget/ directory and building as + the README file instructs using "make; make install". This will build + and install a module specific to the system you are building on and is + not under control of the packaging system. + + -- Philipp Hug , Tue, 29 Mar 2005 20:57:04 +0200 --- iscsitarget-0.4.16+svn162.orig/debian/rules +++ iscsitarget-0.4.16+svn162/debian/rules @@ -0,0 +1,177 @@ +#!/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 + +non_epoch_version=$(shell echo $(KVERS) | perl -pe 's/^\d+://') + +PACKAGE=iscsitarget +psource=iscsitarget-source +pmodules = $(PACKAGE)-module-$(non_epoch_version) + +MA_DIR ?= /usr/share/modass +-include $(MA_DIR)/include/generic.make +-include $(MA_DIR)/include/common-rules.make + +CFLAGS = -Wall -g + +ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS))) + CFLAGS += -O0 +else + CFLAGS += -O2 +endif +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 + +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 +# ... additional kernel specific things to configure... + +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 + + # Create the directories to install the source into + dh_installdirs -p$(psource) usr/src/modules/$(PACKAGE) + dh_installdirs -p$(psource) usr/src/modules/$(PACKAGE)/debian + dh_installdirs -p$(psource) usr/src/modules/$(PACKAGE)/include + dh_installdirs -p$(psource) usr/src/modules/$(PACKAGE)/kernel + + # Copy only the driver source to the proper location + cp kernel/* debian/$(psource)/usr/src/modules/$(PACKAGE)/kernel/ + cp include/* debian/$(psource)/usr/src/modules/$(PACKAGE)/include/ + + # Copy the needed debian/ pieces to the proper location + cp debian/*-module-* \ + debian/$(psource)/usr/src/modules/$(PACKAGE)/debian + cp debian/control.modules.in \ + debian/$(psource)/usr/src/modules/$(PACKAGE)/debian/control.in + cp debian/rules \ + debian/$(psource)/usr/src/modules/$(PACKAGE)/debian + cp debian/changelog \ + debian/$(psource)/usr/src/modules/$(PACKAGE)/debian + cp debian/copyright \ + debian/$(psource)/usr/src/modules/$(PACKAGE)/debian + +# install debian/ files + cd debian ; cp changelog control compat *.modules.in rules copyright $(psource)/usr/src/modules/$(PACKAGE)/debian + +# create toplevel module Makefile + echo "obj-m = kernel/" > debian/$(psource)/usr/src/modules/$(PACKAGE)/Makefile + +# tar the stuff + cd debian/$(psource)/usr/src/ ; tar cvjf iscsitarget.tar.bz2 modules ; rm -rf modules + + install -m 755 $(CURDIR)/debian/modass.iscsitarget-source $(CURDIR)/debian/$(psource)/usr/share/modass/overrides/iscsitarget-source + 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/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 --- iscsitarget-0.4.16+svn162.orig/debian/changelog +++ iscsitarget-0.4.16+svn162/debian/changelog @@ -0,0 +1,133 @@ +iscsitarget (0.4.16+svn162-2~bpo40+1) etch-backports; urgency=low + + * Backport for etch + + -- Julien Danjou Tue, 25 Nov 2008 09:54:26 +0000 + +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) 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-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 + --- iscsitarget-0.4.16+svn162.orig/debian/iscsitarget.manpages +++ iscsitarget-0.4.16+svn162/debian/iscsitarget.manpages @@ -0,0 +1,3 @@ +doc/manpages/ietadm.8 +doc/manpages/ietd.8 +doc/manpages/ietd.conf.5 --- iscsitarget-0.4.16+svn162.orig/debian/compat +++ iscsitarget-0.4.16+svn162/debian/compat @@ -0,0 +1 @@ +5 --- iscsitarget-0.4.16+svn162.orig/debian/modass.iscsitarget-source +++ iscsitarget-0.4.16+svn162/debian/modass.iscsitarget-source @@ -0,0 +1,15 @@ +#!/bin/sh +# +# (c) Eduard Bloch , 2003 +# generic maintainer script for module-assistant controled packages +# to be sourced or copied as example code + +# autodetecting values. They may be overriden by the caller. + +MA_DIR=${MA_DIR:-/usr/share/modass} + +BUILDDIR=${MODULE_LOC:-/usr/src/modules}/iscsitarget + +. $MA_DIR/packages/generic.sh + +$1 "$@" --- iscsitarget-0.4.16+svn162.orig/debian/control.modules.in +++ iscsitarget-0.4.16+svn162/debian/control.modules.in @@ -0,0 +1,22 @@ +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. --- iscsitarget-0.4.16+svn162.orig/debian/docs +++ iscsitarget-0.4.16+svn162/debian/docs @@ -0,0 +1,3 @@ +README +README.vmware +ChangeLog --- iscsitarget-0.4.16+svn162.orig/debian/iscsitarget.install +++ iscsitarget-0.4.16+svn162/debian/iscsitarget.install @@ -0,0 +1,5 @@ +usr/ietd /usr/sbin +usr/ietadm /usr/sbin +etc/ietd.conf /etc +etc/initiators.allow /etc +etc/initiators.deny /etc --- iscsitarget-0.4.16+svn162.orig/debian/copyright +++ iscsitarget-0.4.16+svn162/debian/copyright @@ -0,0 +1,37 @@ +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. + --- iscsitarget-0.4.16+svn162.orig/debian/dirs +++ iscsitarget-0.4.16+svn162/debian/dirs @@ -0,0 +1 @@ +usr/sbin --- iscsitarget-0.4.16+svn162.orig/debian/iscsitarget-source.dirs +++ iscsitarget-0.4.16+svn162/debian/iscsitarget-source.dirs @@ -0,0 +1 @@ +usr/share/modass/overrides --- iscsitarget-0.4.16+svn162.orig/debian/iscsitarget.init +++ iscsitarget-0.4.16+svn162/debian/iscsitarget.init @@ -0,0 +1,149 @@ +#!/bin/sh +# +### BEGIN INIT INFO +# Provides: cluster manager +# Required-Start: $network $time +# Required-Stop: $network $time +# Default-Start: 2 3 4 5 +# Default-Stop: 0 1 6 +# Short-Description: Starts and stops the iSCSI target +### END INIT INFO + +PID_FILE=/var/run/iscsi_trgt.pid +CONFIG_FILE=/etc/ietd.conf +DAEMON=/usr/sbin/ietd + +PATH=/sbin:/bin:/usr/sbin:/usr/bin + +# Don't touch this "memsize thingy" unless you are blessed +# with knowledge about it. +MEM_SIZE=1048576 + +configure_memsize() +{ + if [ -e /proc/sys/net/core/wmem_max ]; then + echo ${MEM_SIZE} > /proc/sys/net/core/wmem_max + fi + + if [ -e /proc/sys/net/core/rmem_max ]; then + echo ${MEM_SIZE} > /proc/sys/net/core/rmem_max + fi + + if [ -e /proc/sys/net/core/wmem_default ]; then + echo ${MEM_SIZE} > /proc/sys/net/core/wmem_default + fi + + if [ -e /proc/sys/net/core/rmem_default ]; then + echo ${MEM_SIZE} > /proc/sys/net/core/rmem_default + fi + + if [ -e /proc/sys/net/ipv4/tcp_mem ]; then + echo "${MEM_SIZE} ${MEM_SIZE} ${MEM_SIZE}" > /proc/sys/net/ipv4/tcp_mem + fi + + if [ -e /proc/sys/net/ipv4/tcp_rmem ]; then + echo "${MEM_SIZE} ${MEM_SIZE} ${MEM_SIZE}" > /proc/sys/net/ipv4/tcp_rmem + fi + + if [ -e /proc/sys/net/ipv4/tcp_wmem ]; then + echo "${MEM_SIZE} ${MEM_SIZE} ${MEM_SIZE}" > /proc/sys/net/ipv4/tcp_wmem + fi +} + +RETVAL=0 + +ietd_start() +{ + echo -n "Starting iSCSI enterprise target service: " + configure_memsize + modprobe -q crc32c + modprobe iscsi_trgt + RETVAL=$? + if [ $RETVAL != "0" ] ; then + echo "failed - module is missing!" + exit $RETVAL + fi + start-stop-daemon --start --exec $DAEMON --quiet --oknodo + RETVAL=$? + if [ $RETVAL = "0" ]; then + echo "succeeded." + else + echo "failed." + exit $RETVAL + fi +} + +ietd_stop() +{ + echo -n "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 + echo "succeeded." + else + echo "failed with reason :$RETURN" + exit 1 + fi + echo -n "Stopping iSCSI enterprise target service: " + start-stop-daemon --stop --quiet --exec $DAEMON --pidfile $PID_FILE --oknodo + RETVAL=$? + if [ $RETVAL = "0" ]; then + echo "succeeded." + else + echo "failed." + fi + else + echo "service not running." + fi + # ugly, but pid file is not removed ba ietd + rm -f $PID_FILE + + # check if the module is loaded at all + lsmod | grep -q iscsi_trgt + RETVAL=$? + if [ $RETVAL = "0" ] ; then + + echo -n "Removing iSCSI enterprise target modules: " + modprobe -r iscsi_trgt + RETVAL=$? + modprobe -r crc32c 2>/dev/null + if [ $RETVAL = "0" ]; then + echo "succeeded." + else + echo "failed." + exit 1 + fi + fi +} + +case "$1" in + start) + ietd_start + ;; + stop) + ietd_stop + ;; + restart|force-reload) + ietd_stop + sleep 1 + ietd_start + ;; + status) + PID=`pidof ietd` + if [ $PID ]; then + echo "iSCSI enterprise target is running at pid $PID" + else + echo "no iSCSI enterprise target found!" + exit 1 + fi + ;; + *) + echo "Usage: $0 {start|stop|restart|status}" + exit 1 +esac + +exit 0 --- iscsitarget-0.4.16+svn162.orig/debian/control +++ iscsitarget-0.4.16+svn162/debian/control @@ -0,0 +1,33 @@ +Source: iscsitarget +Section: net +Priority: optional +Maintainer: Philipp Hug +Uploaders: Frederik Schüler +Build-Depends: debhelper (>= 5.0.0), libssl-dev, bzip2 +Standards-Version: 3.8.0 +Homepage: http://iscsitarget.sourceforge.net/ + +Package: iscsitarget +Architecture: any +Depends: ${shlibs:Depends} +Recommends: iscsitarget-module +Suggests: 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-source +Architecture: all +Depends: debhelper (>= 5.0.0), module-assistant, bzip2 +Description: iSCSI Enterprise Target kernel module source + 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. --- iscsitarget-0.4.16+svn162.orig/debian/iscsitarget.overrides +++ iscsitarget-0.4.16+svn162/debian/iscsitarget.overrides @@ -0,0 +1 @@ +iscsitarget: non-standard-file-perm etc/ietd.conf 0600 != 0644 --- iscsitarget-0.4.16+svn162.orig/debian/iscsitarget-module-_KVERS_.postinst +++ iscsitarget-0.4.16+svn162/debian/iscsitarget-module-_KVERS_.postinst @@ -0,0 +1,6 @@ +#!/bin/sh +set -e + +depmod -a & + +#DEBHELPER#