[Glibc-bsd-commits] r3648 - in trunk/istgt: . debian debian/patches debian/source
Arno Töll
atoell-guest at alioth.debian.org
Sun Jul 31 15:05:42 UTC 2011
Author: atoell-guest
Date: 2011-07-31 15:05:42 +0000 (Sun, 31 Jul 2011)
New Revision: 3648
Added:
trunk/istgt/debian/
trunk/istgt/debian/changelog
trunk/istgt/debian/compat
trunk/istgt/debian/control
trunk/istgt/debian/copyright
trunk/istgt/debian/docs
trunk/istgt/debian/init
trunk/istgt/debian/manpages
trunk/istgt/debian/patches/
trunk/istgt/debian/patches/fix-compile-time-configuration.patch
trunk/istgt/debian/patches/fix-installdir.patch
trunk/istgt/debian/patches/handle-destdir.patch
trunk/istgt/debian/patches/series
trunk/istgt/debian/rules
trunk/istgt/debian/source/
trunk/istgt/debian/source/format
Log:
[svn-inject] Applying Debian modifications (0.4~20110529-1) to trunk
Property changes on: trunk/istgt/debian
___________________________________________________________________
Added: mergeWithUpstream
+ 1
Added: trunk/istgt/debian/changelog
===================================================================
--- trunk/istgt/debian/changelog (rev 0)
+++ trunk/istgt/debian/changelog 2011-07-31 15:05:42 UTC (rev 3648)
@@ -0,0 +1,9 @@
+istgt (0.4~20110529-1) unstable; urgency=low
+
+ * Initial release
+ * Make upstream Makefile honor $(DESTDIR) (`handle-destdir.patch')
+ * Install binaries to /sbin instead of /bin (`fix-installdir.patch')
+ * Install binaries with feasible defaults (`fix-compile-time-
+ configuration.patch')
+
+ -- Arno Töll <debian at toell.net> Wed, 06 Jul 2011 19:09:04 -0400
Added: trunk/istgt/debian/compat
===================================================================
--- trunk/istgt/debian/compat (rev 0)
+++ trunk/istgt/debian/compat 2011-07-31 15:05:42 UTC (rev 3648)
@@ -0,0 +1 @@
+8
Added: trunk/istgt/debian/control
===================================================================
--- trunk/istgt/debian/control (rev 0)
+++ trunk/istgt/debian/control 2011-07-31 15:05:42 UTC (rev 3648)
@@ -0,0 +1,21 @@
+Source: istgt
+Section: admin
+Priority: extra
+Maintainer: Arno Töll <debian at toell.net>
+Build-Depends: debhelper (>= 8.0), autotools-dev, libssl-dev
+Standards-Version: 3.9.2
+Homepage: http://www.peach.ne.jp/archives/istgt/
+
+Package: istgt
+Architecture: any
+Depends: lsb-base (>= 3.0-6), ${shlibs:Depends}, ${misc:Depends}
+Description: iSCSI userspace target for kFreeBSD systems
+ istgt is a iSCSI target for kFreeBSD systems running in user space.
+ It supports:
+ .
+ * Multipath I/O
+ * 64bit LBA for volumes over 2 TiB size
+ * Header/Data digest by CRC32C
+ * Mutual authentication with CHAP
+ * Multiple LUNs and ACLs for portals
+ * IPv6/IPv4 support
Added: trunk/istgt/debian/copyright
===================================================================
--- trunk/istgt/debian/copyright (rev 0)
+++ trunk/istgt/debian/copyright 2011-07-31 15:05:42 UTC (rev 3648)
@@ -0,0 +1,39 @@
+Format: http://anonscm.debian.org/viewvc/dep/web/deps/dep5.mdwn?revision=174
+Upstream-Name: istgt
+Upstream-Contact: Daisuke Aoyama <aoyama at peach.ne.jp>
+Source: http://www.peach.ne.jp/archives/istgt/
+
+
+Files: debian/*
+Copyright: 2011 Arno Toell
+License: BSD-2-clause
+Comment: Packaging for Debian was done by Arno Töll, and I hereby grant
+ distribution of it under the same terms as istgt itself.
+
+Files: *
+License: BSD-2-clause
+Copyright: Copyright (C) 2008-2011 Daisuke Aoyama <aoyama at peach.ne.jp>
+ All rights reserved.
+ .
+ Redistribution and use in source and binary forms, with or without
+ modification, are permitted provided that the following conditions
+ are met:
+ .
+ 1. Redistributions of source code must retain the above copyright
+ notice, this list of conditions and the following disclaimer.
+ 2. Redistributions in binary form must reproduce the above copyright
+ notice, this list of conditions and the following disclaimer in the
+ documentation and/or other materials provided with the distribution.
+ .
+ THIS SOFTWARE IS PROVIDED BY AUTHOR AND CONTRIBUTORS ``AS IS'' AND
+ ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ ARE DISCLAIMED. IN NO EVENT SHALL AUTHOR OR CONTRIBUTORS BE LIABLE
+ FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ SUCH DAMAGE.
+
Added: trunk/istgt/debian/docs
===================================================================
--- trunk/istgt/debian/docs (rev 0)
+++ trunk/istgt/debian/docs 2011-07-31 15:05:42 UTC (rev 3648)
@@ -0,0 +1 @@
+README
Added: trunk/istgt/debian/init
===================================================================
--- trunk/istgt/debian/init (rev 0)
+++ trunk/istgt/debian/init 2011-07-31 15:05:42 UTC (rev 3648)
@@ -0,0 +1,135 @@
+#! /bin/sh
+### BEGIN INIT INFO
+# Provides: istgt
+# Required-Start: $network $local_fs $remote_fs
+# Required-Stop: $remote_fs
+# Default-Start: 2 3 4 5
+# Default-Stop: 0 1 6
+# Short-Description: iSCSI userspace target for kFreeBSD systems
+# Description: iSCSI userspace target for kFreeBSD systems
+### END INIT INFO
+
+# Author: Arno Töll <debian at toell.net>
+
+PATH=/sbin:/usr/sbin:/bin:/usr/bin
+DESC="istgt iSCSI target"
+NAME=istgt
+DAEMON=/usr/sbin/istgt
+PIDFILE=/var/run/$NAME.pid
+DAEMON_ARGS="-c /etc/istgt/istgt.conf -p $PIDFILE"
+SCRIPTNAME=/etc/init.d/$NAME
+CONFIG=/etc/istgt/istgt.conf
+
+# Exit if the package is not installed
+[ -x $DAEMON ] || exit 0
+
+# Read configuration variable file if it is present
+[ -r /etc/default/$NAME ] && . /etc/default/$NAME
+
+# Load the VERBOSE setting and other rcS variables
+. /lib/init/vars.sh
+
+# Define LSB log_* functions.
+# Depend on lsb-base (>= 3.0-6) to ensure that this file is present.
+. /lib/lsb/init-functions
+
+if [ ! -r $CONFIG ] ; then
+ [ "$VERBOSE" != no ] && log_warning_msg "Not Starting $DESC: $CONFIG does not exit"
+ exit 0
+fi
+
+#
+# Function that starts the daemon/service
+#
+do_start()
+{
+ # Return
+ # 0 if daemon has been started
+ # 1 if daemon was already running
+ # 2 if daemon could not be started
+ start-stop-daemon --start --quiet --pidfile $PIDFILE --exec $DAEMON --test > /dev/null \
+ || return 1
+ start-stop-daemon --start --quiet --pidfile $PIDFILE --exec $DAEMON -- \
+ $DAEMON_ARGS \
+ || return 2
+}
+
+#
+# Function that stops the daemon/service
+#
+do_stop()
+{
+ # Return
+ # 0 if daemon has been stopped
+ # 1 if daemon was already stopped
+ # 2 if daemon could not be stopped
+ # other if a failure occurred
+ start-stop-daemon --stop --quiet --retry=TERM/30/KILL/5 --pidfile $PIDFILE --name $NAME
+ RETVAL="$?"
+ [ "$RETVAL" = 2 ] && return 2
+ # Wait for children to finish too if this is a daemon that forks
+ # and if the daemon is only ever run from this initscript.
+ start-stop-daemon --stop --quiet --oknodo --retry=0/30/KILL/5 --exec $DAEMON
+ [ "$?" = 2 ] && return 2
+ # Many daemons don't delete their pidfiles when they exit.
+ rm -f $PIDFILE
+ return "$RETVAL"
+}
+
+#
+# Function that sends a SIGHUP to the daemon/service
+#
+do_reload() {
+ start-stop-daemon --stop --signal 1 --quiet --pidfile $PIDFILE --name $NAME
+ return 0
+}
+
+case "$1" in
+ start)
+ [ "$VERBOSE" != no ] && log_daemon_msg "Starting $DESC " "$NAME"
+ do_start
+ case "$?" in
+ 0|1) [ "$VERBOSE" != no ] && log_end_msg 0 ;;
+ 2) [ "$VERBOSE" != no ] && log_end_msg 1 ;;
+ esac
+ ;;
+ stop)
+ [ "$VERBOSE" != no ] && log_daemon_msg "Stopping $DESC" "$NAME"
+ do_stop
+ case "$?" in
+ 0|1) [ "$VERBOSE" != no ] && log_end_msg 0 ;;
+ 2) [ "$VERBOSE" != no ] && log_end_msg 1 ;;
+ esac
+ ;;
+ status)
+ status_of_proc "$DAEMON" "$NAME" && exit 0 || exit $?
+ ;;
+ restart|force-reload)
+ #
+ # If the "reload" option is implemented then remove the
+ # 'force-reload' alias
+ #
+ log_daemon_msg "Restarting $DESC" "$NAME"
+ do_stop
+ case "$?" in
+ 0|1)
+ do_start
+ case "$?" in
+ 0) log_end_msg 0 ;;
+ 1) log_end_msg 1 ;; # Old process is still running
+ *) log_end_msg 1 ;; # Failed to start
+ esac
+ ;;
+ *)
+ # Failed to stop
+ log_end_msg 1
+ ;;
+ esac
+ ;;
+ *)
+ echo "Usage: $SCRIPTNAME {start|stop|status|restart|force-reload}" >&2
+ exit 3
+ ;;
+esac
+
+:
Added: trunk/istgt/debian/manpages
===================================================================
--- trunk/istgt/debian/manpages (rev 0)
+++ trunk/istgt/debian/manpages 2011-07-31 15:05:42 UTC (rev 3648)
@@ -0,0 +1 @@
+doc/istgt.1
Added: trunk/istgt/debian/patches/fix-compile-time-configuration.patch
===================================================================
--- trunk/istgt/debian/patches/fix-compile-time-configuration.patch (rev 0)
+++ trunk/istgt/debian/patches/fix-compile-time-configuration.patch 2011-07-31 15:05:42 UTC (rev 3648)
@@ -0,0 +1,17 @@
+Description: Workaround for broken build time guesses
+ .
+ * src/build.h.in Fix resulting path
+
+Forwarded: not-needed
+Author: Arno Töll <debian at toell.net>
+--- a/src/build.h.in
++++ b/src/build.h.in
+@@ -29,7 +29,7 @@
+ #define BUILD_H
+
+ #define BUILD_PREFIX "@prefix@"
+-#define BUILD_ETC_ISTGT BUILD_PREFIX "/etc/istgt"
++#define BUILD_ETC_ISTGT "/etc/istgt"
+ #define BUILD_VAR_ISTGT "/var/istgt"
+
+ #endif /* BUILD_H */
Added: trunk/istgt/debian/patches/fix-installdir.patch
===================================================================
--- trunk/istgt/debian/patches/fix-installdir.patch (rev 0)
+++ trunk/istgt/debian/patches/fix-installdir.patch 2011-07-31 15:05:42 UTC (rev 3648)
@@ -0,0 +1,40 @@
+Description: Install binaries to $PREFIX/sbin instead of $PREFIX/bin
+ .
+ * src/Makefile.in: Fix paths hardcoded to the install target
+ * doc/istgt.1.in: Reflect change in resulting man page
+
+Forwarded: not-needed
+Author: Arno Töll <debian at toell.net>
+
+--- a/src/Makefile.in
++++ b/src/Makefile.in
+@@ -83,11 +83,11 @@
+ $(CC) $(LDFLAGS) $(LIBS) -o $@ $(ISTGTCONTROL)
+
+ install: install-dirs
+- install -c -m 0755 istgt $(DESTDIR)/$(bindir)
+- install -c -m 0755 istgtcontrol $(DESTDIR)/$(bindir)
++ install -c -m 0755 istgt $(DESTDIR)/$(sbindir)
++ install -c -m 0755 istgtcontrol $(DESTDIR)/$(sbindir)
+
+ install-dirs:
+- mkdir -p $(DESTDIR)/$(bindir)
++ mkdir -p $(DESTDIR)/$(sbindir)
+
+ dist: $(DISTFILES)
+ mkdir $(DISTDIR)/$(subdir)
+--- a/doc/istgt.1.in
++++ b/doc/istgt.1.in
+@@ -46,10 +46,10 @@
+ .SH FILES
+ .PD 0
+ .TP
+-.I %%PREFIX%%/etc/istgt/istgt.conf
++.I /etc/istgt/istgt.conf
+ Configuration file
+ .TP
+-.I %%PREFIX%%/etc/istgt/auth.conf
++.I /etc/istgt/auth.conf
+ Authentication information file
+ .TP
+ .I /var/run/istgt.pid
Added: trunk/istgt/debian/patches/handle-destdir.patch
===================================================================
--- trunk/istgt/debian/patches/handle-destdir.patch (rev 0)
+++ trunk/istgt/debian/patches/handle-destdir.patch 2011-07-31 15:05:42 UTC (rev 3648)
@@ -0,0 +1,92 @@
+Description: Make the Makefile honor $(DESTDIR)
+ The Makefile does not honor the $(DESTDIR) environment variable
+ which is used to build Debian packages (see [1]).
+ .
+ * doc/Makefile.in: Add $(DESTDIR) to install targets
+ * etc/Makefile.in: Same
+ * src/Makefile.in: Same
+
+ [1] http://www.gnu.org/prep/standards/standards.html#DESTDIR
+
+Forwarded: not-needed
+Author: Arno Töll <debian at toell.net>
+
+--- a/doc/Makefile.in
++++ b/doc/Makefile.in
+@@ -39,21 +39,21 @@
+ done
+
+ install: install-dirs
+- install -c -m 0644 istgt.1 $(mandir)/man1/
+- -rm -f $(mandir)/man1/istgt.1.gz
+- gzip -9 $(mandir)/man1/istgt.1
++ install -c -m 0644 istgt.1 $(DESTDIR)/$(mandir)/man1/
++ -rm -f $(DESTDIR)/$(mandir)/man1/istgt.1.gz
++ gzip -9 $(DESTDIR)/$(mandir)/man1/istgt.1
+
+ install-doc: install-doc-dirs
+- install -c -m 0644 $(top_srcdir)/README $(datadir)/doc/istgt/
+- install -c -m 0644 $(top_srcdir)/ChangeLog.jp $(datadir)/doc/istgt/
+- install -c -m 0644 QUICKSTART $(datadir)/doc/istgt/
+- install -c -m 0644 QUICKSTART.jp $(datadir)/doc/istgt/
++ install -c -m 0644 $(top_srcdir)/README $(DESTDIR)/$(datadir)/doc/istgt/
++ install -c -m 0644 $(top_srcdir)/ChangeLog.jp $(DESTDIR)/$(datadir)/doc/istgt/
++ install -c -m 0644 QUICKSTART $(DESTDIR)/$(datadir)/doc/istgt/
++ install -c -m 0644 QUICKSTART.jp $(DESTDIR)/$(datadir)/doc/istgt/
+
+ install-dirs:
+- mkdir -p $(mandir)/man1
++ mkdir -p $(DESTDIR)/$(mandir)/man1
+
+ install-doc-dirs:
+- mkdir -p $(datadir)/doc/istgt
++ mkdir -p $(DESTDIR)/$(datadir)/doc/istgt
+
+ clean:
+ -rm -f istgt.1
+--- a/etc/Makefile.in
++++ b/etc/Makefile.in
+@@ -44,19 +44,19 @@
+ done
+
+ install: install-dirs
+- install -c -m 0644 istgt.conf $(sysconfdir)/istgt/istgt.conf.sample
++ install -c -m 0644 istgt.conf $(DESTDIR)/$(sysconfdir)/istgt/istgt.conf.sample
+ install -c -m 0644 istgt.large.conf \
+- $(sysconfdir)/istgt/istgt.large.conf.sample
+- install -c -m 0600 auth.conf $(sysconfdir)/istgt/auth.conf.sample
+- install -c -m 0600 istgtcontrol.conf $(sysconfdir)/istgt/istgtcontrol.conf.sample
++ $(DESTDIR)/$(sysconfdir)/istgt/istgt.large.conf.sample
++ install -c -m 0600 auth.conf $(DESTDIR)/$(sysconfdir)/istgt/auth.conf.sample
++ install -c -m 0600 istgtcontrol.conf $(DESTDIR)/$(sysconfdir)/istgt/istgtcontrol.conf.sample
+ # if [ ! -f $(sysconfdir)/rc.d/istgt ]; then \
+ # install -c -m 0555 istgt.sh $(sysconfdir)/rc.d/istgt; \
+ # fi
+- install -c -m 0555 istgt.sh $(sysconfdir)/rc.d/istgt
++ install -c -m 0555 istgt.sh $(DESTDIR)/$(sysconfdir)/rc.d/istgt
+
+ install-dirs:
+- mkdir -p $(sysconfdir)/istgt
+- mkdir -p $(sysconfdir)/rc.d
++ mkdir -p $(DESTDIR)/$(sysconfdir)/istgt
++ mkdir -p $(DESTDIR)/$(sysconfdir)/rc.d
+
+ clean:
+ -rm -f istgt.large.conf istgt.conf istgt.sh
+--- a/src/Makefile.in
++++ b/src/Makefile.in
+@@ -83,11 +83,11 @@
+ $(CC) $(LDFLAGS) $(LIBS) -o $@ $(ISTGTCONTROL)
+
+ install: install-dirs
+- install -c -m 0755 istgt $(bindir)
+- install -c -m 0755 istgtcontrol $(bindir)
++ install -c -m 0755 istgt $(DESTDIR)/$(bindir)
++ install -c -m 0755 istgtcontrol $(DESTDIR)/$(bindir)
+
+ install-dirs:
+- mkdir -p $(bindir)
++ mkdir -p $(DESTDIR)/$(bindir)
+
+ dist: $(DISTFILES)
+ mkdir $(DISTDIR)/$(subdir)
Added: trunk/istgt/debian/patches/series
===================================================================
--- trunk/istgt/debian/patches/series (rev 0)
+++ trunk/istgt/debian/patches/series 2011-07-31 15:05:42 UTC (rev 3648)
@@ -0,0 +1,3 @@
+handle-destdir.patch
+fix-installdir.patch
+fix-compile-time-configuration.patch
Added: trunk/istgt/debian/rules
===================================================================
--- trunk/istgt/debian/rules (rev 0)
+++ trunk/istgt/debian/rules 2011-07-31 15:05:42 UTC (rev 3648)
@@ -0,0 +1,18 @@
+#!/usr/bin/make -f
+# -*- makefile -*-
+
+# Uncomment this to turn on verbose mode.
+export DH_VERBOSE=1
+
+%:
+ dh $@
+
+override_dh_install:
+ dh_install
+ rm -f debian/istgt/etc/rc.d/istgt
+ rmdir debian/istgt/etc/rc.d
+ rm -f debian/istgt/usr/man/man1/istgt.1.gz
+ rmdir debian/istgt/usr/man/man1 debian/istgt/usr/man
+
+override_dh_installinit:
+ dh_installinit --no-start
Property changes on: trunk/istgt/debian/rules
___________________________________________________________________
Added: svn:executable
+ *
Added: trunk/istgt/debian/source/format
===================================================================
--- trunk/istgt/debian/source/format (rev 0)
+++ trunk/istgt/debian/source/format 2011-07-31 15:05:42 UTC (rev 3648)
@@ -0,0 +1 @@
+3.0 (quilt)
More information about the Glibc-bsd-commits
mailing list