Merge ~kstenerud/ubuntu/+source/tgt:merge-1.0.73-1-disco into ubuntu/+source/tgt:debian/sid

[Karl Stenerud]

PPA: https://launchpad.net/~kstenerud/+archive/ubuntu/disco-at-merge-1810736

Tests:

Test install:

lxc launch ubuntu-daily:disco tester
lxc exec tester bash
add-apt-repository -y ppa:kstenerud/disco-at-merge-1810736 &&
apt update &&
apt dist-upgrade -y &&
apt install -y tgt &&
tgtd --version

Test upgrade:

lxc launch ubuntu-daily:disco tester
lxc exec tester bash
apt update &&
apt dist-upgrade -y &&
apt install -y tgt &&
tgtd --version &&
add-apt-repository -y ppa:kstenerud/disco-at-merge-1810736 &&
apt update &&
apt dist-upgrade -y &&
tgtd --version

Package tests:

autopkgtest-build-lxd ubuntu-daily:disco/amd64
autopkgtest -U -s -o dep8-tgt-ppa --setup-commands="sudo add-apt-repository -y -u -s ppa:kstenerud/disco-at-merge-1810736" -B tgt -- lxd autopkgtest/ubuntu/disco/amd64

[Christian Ehrhardt  (paelzer)]

The actual carry of changes LGTM +1 on that.
But we know that tgt has quite a bunch of tests which are good.

Would you mind running that in autopkgtest (can be local just on x86 if you want) and append the logs here.

review: Needs Information

[Karl Stenerud (kstenerud)]

autopkgtest [12:07:36]: version 5.3.1
autopkgtest [12:07:36]: host thor-work; command line: /usr/bin/autopkgtest -U -s -o dep8-tgt-ppa '--setup-commands=sudo add-apt-repository -y -u -s ppa:kstenerud/disco-at-merge-1810736' -B tgt -- lxd autopkgtest/ubuntu/disco/amd64
autopkgtest [12:07:51]: @@@@@@@@@@@@@@@@@@@@ test bed setup
tee: /proc/self/fd/2: Permission denied
Hit:1 http://archive.ubuntu.com/ubuntu disco InRelease
Hit:2 http://archive.ubuntu.com/ubuntu disco-updates InRelease
Reading package lists...
Reading package lists...
Building dependency tree...
Reading state information...
Calculating upgrade...
0 upgraded, 0 newly installed, 0 to remove and 0 not upgraded.
Get:1 http://ppa.launchpad.net/kstenerud/disco-at-merge-1810736/ubuntu disco InRelease [15.9 kB]
Hit:2 http://archive.ubuntu.com/ubuntu disco InRelease
Get:3 http://ppa.launchpad.net/kstenerud/disco-at-merge-1810736/ubuntu disco/main Sources [896 B]
Get:4 http://ppa.launchpad.net/kstenerud/disco-at-merge-1810736/ubuntu disco/main amd64 Packages [792 B]
Hit:5 http://archive.ubuntu.com/ubuntu disco-updates InRelease
Fetched 17.6 kB in 1s (30.0 kB/s)
Reading package lists...
autopkgtest [12:08:17]: testbed dpkg architecture: amd64
autopkgtest [12:08:17]: testbed running kernel: Linux 4.15.0-43-generic #46-Ubuntu SMP Thu Dec 6 14:45:28 UTC 2018
autopkgtest [12:08:17]: @@@@@@@@@@@@@@@@@@@@ apt-source tgt
Get:1 http://ppa.launchpad.net/kstenerud/disco-at-merge-1810736/ubuntu disco/main tgt 1:1.0.74-1ubuntu1 (tar) [297 kB]
Get:2 http://ppa.launchpad.net/kstenerud/disco-at-merge-1810736/ubuntu disco/main tgt 1:1.0.74-1ubuntu1 (diff) [15.0 kB]
Get:3 http://ppa.launchpad.net/kstenerud/disco-at-merge-1810736/ubuntu disco/main tgt 1:1.0.74-1ubuntu1 (dsc) [2156 B]
gpgv: Signature made Mon Jan 7 13:11:39 2019 UTC
gpgv: using RSA key 7C177302572849D84A5048349E9C224744EF2A5A
gpgv: issuer "<email address hidden>"
gpgv: Can't check signature: No public key
dpkg-source: warning: failed to verify signature on ./tgt_1.0.74-1ubuntu1.dsc
autopkgtest [12:08:18]: testing package tgt version 1:1.0.74-1ubuntu1
autopkgtest [12:08:18]: build not needed
autopkgtest [12:08:18]: test daemon: preparing testbed
localtgt SKIP Test requires machine-level isolation but testbed does not provide that
Reading package lists...
Building dependency tree...
Reading state information...
Correcting dependencies...Starting pkgProblemResolver with broken count: 0
Starting 2 pkgProblemResolver with broken count: 0
Done
 Done
Starting pkgProblemResolver with broken count: 0
Starting 2 pkgProblemResolver with broken count: 0
Done
The following additional packages will be installed:
  libaio1 libconfig-general-perl libibverbs1 libnl-3-200 libnl-route-3-200
  librdmacm1 libsgutils2-2 sg3-utils tgt
Suggested packages:
  tgt-rbd
Recommended packages:
  ibverbs-providers
The following NEW packages will be installed:
  libaio1 libconfig-general-perl libibverbs1 libnl-3-200 libnl-route-3-200
  librdmacm1 libsgutils2-2 sg3-utils tgt
0 upgraded, 9 newly installed, 0 to remove and 0 not upgraded.
1 not fully installed or removed.
Need to get 1401 kB of archives.
After this operation, 4300 kB of a...

[Christian Ehrhardt  (paelzer)]

Ok, I think this is good then - thanks.
If you need sponsoring from me let me know.

review: Approve

[Karl Stenerud (kstenerud)]

Yes, please sponsor.

commit 4922984cb1a263f73226ee28fca0b144b473978b

[Christian Ehrhardt  (paelzer)]

Tagged and sponsored, please track proposed migration

diff --git a/debian/changelog b/debian/changelog
index ae8cbda..8db877c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,14 @@
+tgt (1:1.0.74-1ubuntu1) disco; urgency=medium
+
+  * Merge with Debian unstable (LP: #1810736). Remaining changes:
+    - Drop glusterfs support, package not in main.
+      - debian/control: drop build depends and package
+      - debian/rules: disable feature
+      - debian/tests/{control, storage}: remove related tests
+      - debian/tgt-glusterfs.install (Deleted)
+
+ -- Karl Stenerud <[e-mail]>  Mon, 07 Jan 2019 13:52:58 +0100
+
 tgt (1:1.0.74-1) unstable; urgency=medium
 
   [ Ondřej Nový ]
@@ -13,6 +24,17 @@ tgt (1:1.0.74-1) unstable; urgency=medium
 
  -- Apollon Oikonomopoulos <[e-mail]>  Sat, 08 Dec 2018 22:30:32 +0200
 
+tgt (1:1.0.73-1ubuntu1) cosmic; urgency=medium
+
+  * Merge with Debian unstable. Remaining changes:
+    - Drop glusterfs support, package not in main.
+      - debian/control: drop build depends and package
+      - debian/rules: disable feature
+      - debian/tests/{control, storage}: remove related tests
+      - debian/tgt-glusterfs.install (Deleted)
+
+ -- Christian Ehrhardt <[e-mail]>  Wed, 30 May 2018 11:45:12 +0200
+
 tgt (1:1.0.73-1) unstable; urgency=medium
 
   * New upstream version 1.0.73
@@ -25,12 +47,52 @@ tgt (1:1.0.73-1) unstable; urgency=medium
 
  -- Apollon Oikonomopoulos <[e-mail]>  Tue, 06 Mar 2018 00:12:22 +0200
 
+tgt (1:1.0.72-1ubuntu1) bionic; urgency=medium
+
+  * Merge with Debian unstable. Remaining changes:
+    - Drop glusterfs support, package not in main.
+      - debian/control: drop build depends and package
+      - debian/rules: disable feature
+      - debian/tests/{control, storage}: remove related tests
+      - debian/tgt-glusterfs.install (Deleted)
+  * Dropped changes (in new upstream version)
+    - Fix FTBFS with gcc7 by backporting upstream patches (LP 1723055)
+
+ -- Christian Ehrhardt <[e-mail]>  Thu, 16 Nov 2017 10:28:25 +0100
+
 tgt (1:1.0.72-1) unstable; urgency=medium
 
   * New upstream version (closes: #853680)
 
  -- Apollon Oikonomopoulos <[e-mail]>  Wed, 02 Aug 2017 20:12:08 -0400
 
+tgt (1:1.0.71-1ubuntu2) artful; urgency=medium
+
+  * Fix FTBFS with gcc7 by backporting upstream patches (LP: #1723055)
+    - d/p/GCC-FTBFS-1-Fix-header-warning-with-GCC-7-for-major.patch
+    - d/p/GCC-FTBFS-2-Remove-incorrect-size-specifier-in-spc_lu_init.patch
+    - d/p/GCC-FTBFS-3-smc-fix-snprintf-warnings-with-gcc7.patch
+    - Those patches are unchanged from upstream and make tgt effectively
+      almost 1.0.72, so on that merge they can be dropped.
+
+ -- Christian Ehrhardt <[e-mail]>  Thu, 19 Oct 2017 14:55:37 +0200
+
+tgt (1:1.0.71-1ubuntu1) artful; urgency=medium
+
+  * Merge with Debian unstable. Remaining changes:
+    - Drop glusterfs support, package not in main.
+      - debian/control: drop build depends and package
+      - debian/rules: disable feature
+      - debian/tests/{control, storage}: remove related tests
+      - debian/tgt-glusterfs.install (Deleted)
+  * Dropped changes (in Debian now):
+    - fix tgt being killed when serving many targets (LP 1559088)
+    - d/t/localtgt, d/t/control: add dep8 test that sets up targets and luns
+      via iscsi using rdwr/aio backends and runs fio read/write/verify
+      (LP 1640785)
+
+ -- Christian Ehrhardt <[e-mail]>  Sun, 09 Jul 2017 14:48:45 +0200
+
 tgt (1:1.0.71-1) unstable; urgency=medium
 
   [ Christian Ehrhardt ]
@@ -47,6 +109,20 @@ tgt (1:1.0.71-1) unstable; urgency=medium
 
  -- Apollon Oikonomopoulos <[e-mail]>  Tue, 04 Jul 2017 22:09:50 +0300
 
+tgt (1:1.0.69-1ubuntu1) zesty; urgency=medium
+
+  * Merge from Debian. Remaining changes:
+   - Drop glusterfs support, package not in main.
+     - debian/control
+     - debian/rules
+     - debian/tests/{control, storage}
+     - debian/tgt-glusterfs.install (Deleted)
+   - fix tgt being killed when serving many targets
+   - d/t/localtgt, d/t/control: add dep8 test that sets up targets and luns via
+     iscsi using rdwr/aio backends and runs fio read/write/verify
+
+ -- Christian Ehrhardt <[e-mail]>  Wed, 25 Jan 2017 11:25:55 +0100
+
 tgt (1:1.0.69-1) unstable; urgency=medium
 
   * New upstream release:
@@ -63,6 +139,28 @@ tgt (1:1.0.68-1) unstable; urgency=medium
 
  -- Apollon Oikonomopoulos <[e-mail]>  Tue, 01 Nov 2016 01:05:03 +0200
 
+tgt (1:1.0.67-1ubuntu1) zesty; urgency=medium
+
+  * Merge from Debian. Remaining changes:
+   - Drop glusterfs support, package not in main.
+     - debian/control
+     - debian/rules
+     - debian/tests/{control, storage}
+     - debian/tgt-glusterfs.install (Deleted)
+  * Drop changes:
+   - debian/patches/util_strtoull_errno.patch by Stas Sergeev (now upstream)
+   - Disable AIO backend support. This was done to reduce risk in a previous
+     feature freeze; Now that we are before Zesty's feature freeze, we
+     can introduce it this cycle.
+   - changing file modes of debian/tests/{admin, daemon} (missing in
+     changelog, not needed)
+  * Add changes:
+   - fix tgt being killed when serving many targets (LP: #1559088)
+   - d/t/localtgt, d/t/control: add dep8 test that sets up targets and luns via
+     iscsi using rdwr/aio backends and runs fio read/write/verify (LP: #1640785)
+
+ -- Christian Ehrhardt <[e-mail]>  Thu, 10 Nov 2016 10:35:15 +0100
+
 tgt (1:1.0.67-1) unstable; urgency=medium
 
   * New upstream release:
@@ -106,6 +204,29 @@ tgt (1:1.0.64-1) unstable; urgency=medium
 
  -- Apollon Oikonomopoulos <[e-mail]>  Tue, 24 May 2016 12:04:40 +0300
 
+tgt (1:1.0.63-1ubuntu2) yakkety; urgency=medium
+
+  * debian/patches/util_strtoull_errno.patch by Stas Sergeev
+    - Fix errno handling for number * parsing (LP: #1547060)
+
+ -- Ryan Harper <[e-mail]>  Thu, 21 Apr 2016 09:13:09 -0500
+
+tgt (1:1.0.63-1ubuntu1) xenial; urgency=medium
+
+  * Merge from Debian (LP: #1555700). Remaining changes:
+    - Drop glusterfs support, package not in main.
+      - debian/control
+      - debian/rules
+      - debian/tests/{admin, control, daemon, storage}
+      - debian/tgt-glusterfs.install (Deleted)
+    - Disable AIO backend support: untested new feature
+      - debian/control
+      - debian/tests/storage
+  * Dropped changes
+    - debian/patches/tgtd_dont_fail_on_eacces.patch: included in new release
+
+ -- Ryan Harper <[e-mail]>  Wed, 09 Mar 2016 16:51:44 -0600
+
 tgt (1:1.0.63-1) unstable; urgency=medium
 
   * New upstream release:
@@ -122,6 +243,34 @@ tgt (1:1.0.62-2) unstable; urgency=medium
 
  -- Apollon Oikonomopoulos <[e-mail]>  Tue, 19 Jan 2016 11:22:35 +0200
 
+tgt (1:1.0.62-1ubuntu2) xenial; urgency=medium
+
+  * debian/patches/tgtd_dont_fail_on_eacces.patch
+    tgtd: fix root-under-userns errors when attempting oom_score_adj
+    (Closes: LP:#1518440)
+
+ -- Ryan Harper <[e-mail]>  Mon, 01 Feb 2016 02:18:57 -0600
+
+tgt (1:1.0.62-1ubuntu1) xenial; urgency=low
+
+  * Merge from Debian unstable (LP: #1524982, LP: #1518440).  Remaining
+    changes:
+    - Drop glusterfs support, since it is not in main.
+  * debian/upstart:
+    - Dropped, we no longer use upstart (except on Touch, where tgt
+      isn't used).  Isn't worth a delta.
+  * debian/watch:
+    - Drop merge conflict markers accidentally left in.
+  * debian/tests/*:
+    - Drop delta with Debian here, they imported our tests and improved
+      them a while back.
+  * debian/tgt.service:
+    - Drop delta here, Debian made the same change.
+  * debian/bash-completion:
+    - Dropped, Debian has the same thing, just as tgt.bash-completion.
+
+ -- Michael Terry <[e-mail]>  Mon, 21 Dec 2015 14:20:23 -0500
+
 tgt (1:1.0.62-1) unstable; urgency=medium
 
   * New upstream version.
@@ -171,6 +320,26 @@ tgt (1:1.0.58-1) unstable; urgency=medium
 
  -- Apollon Oikonomopoulos <[e-mail]>  Tue, 26 May 2015 12:35:44 +0300
 
+tgt (1:1.0.57-1ubuntu2) wily; urgency=medium
+
+  * debian/tgt.service: remove spaces between key, = and value for WantedBy,
+    since it appears to confuse deb-systemd-helper.
+
+ -- Mathieu Trudel-Lapierre <[e-mail]>  Mon, 06 Jul 2015 21:21:58 -0400
+
+tgt (1:1.0.57-1ubuntu1) wily; urgency=low
+
+  * Merge from Debian unstable.  Remaining changes:
+    - Drop glusterfs support, since it is not in main.
+    - debian/patches/fix-config-regression.patch: Dropped no longer
+      needed.
+    - debian/patches/fix_delayed_management_request.patch: Dropped
+      no longer needed.
+    - debian/patches/fix_leak_of_task_in_scsi_flag.patch: Dropped
+      no longer needed.
+
+ -- Chuck Short <[e-mail]>  Thu, 07 May 2015 09:29:12 -0400
+
 tgt (1:1.0.57-1) unstable; urgency=medium
 
   * New upstream version:
@@ -296,6 +465,78 @@ tgt (1:1.0.46-1) unstable; urgency=medium
 
  -- Apollon Oikonomopoulos <[e-mail]>  Mon, 19 May 2014 15:41:46 +0300
 
+tgt (1:1.0.43-0ubuntu4) trusty; urgency=medium
+
+  * debian/patches/fix_delayed_management_request.patch: Adjust patch to fix
+    a FTBFS.
+  * debian/patches/fix_leak_of_task_in_scsi_flag.patch: Adjust patch to fix
+    a FTBFS.
+
+ -- Chuck Short <[e-mail]>  Fri, 11 Apr 2014 09:14:03 -0400
+
+tgt (1:1.0.43-0ubuntu3) trusty; urgency=medium
+
+  * Fix tgt connection issues under heavy load (LP: #1305343)
+    - debian/patches/fix_delayed_management_request.patch: Fix a crash
+      of tgtd which occured when removing a target with the --force option
+      (https://github.com/fujita/tgt/commit/e6e8d0fd3b83208278fb7ed765c3665ae7c5ab49)
+    - debian/patches/fix_leak_of_task_in_scsi_flag.patch: Clear task_in_scsi flag 
+      when exiting iscsi_tm_execute() and iser_tm_exec() functions. 
+      (https://github.com/fujita/tgt/commit/05fc2cb424863fbf2f3c60a8b617308ef1e370c5)
+
+ -- Chuck Short <[e-mail]>  Wed, 09 Apr 2014 19:35:20 -0400
+
+tgt (1:1.0.43-0ubuntu2) trusty; urgency=medium
+
+  * d/p/fix-config-regression.patch: Cherry picked fix from upstream VCS
+    to resolve regression on configuration of control port.
+
+ -- James Page <[e-mail]>  Tue, 14 Jan 2014 15:11:35 +0000
+
+tgt (1:1.0.43-0ubuntu1) trusty; urgency=medium
+
+  * New upstream release.
+
+ -- James Page <[e-mail]>  Tue, 14 Jan 2014 12:05:08 +0000
+
+tgt (1:1.0.41-0ubuntu1) trusty; urgency=low
+
+  * New upstream release:
+    - debian/patches/fix-tgt-admin-bashism: Dropped, included upstream.
+  * d/control,rules,bash-completion: Enable bash completion support
+    for tgt commands.
+
+ -- James Page <[e-mail]>  Mon, 11 Nov 2013 15:00:10 +0000
+
+tgt (1:1.0.38-0ubuntu1) saucy; urgency=low
+
+  * New upstream release:
+    - d/p/include-rbd-docs.patch,example-config-use-conf-dot-dee:
+      Dropped, included upstream.
+    - Refreshed other patches.
+  * d/watch: Really update to track github repository for releases.
+
+ -- James Page <[e-mail]>  Tue, 06 Aug 2013 17:38:27 +0100
+
+tgt (1:1.0.37-0ubuntu1) saucy; urgency=low
+
+  * Merge from Debian unstable:
+    - d/control: Drop depends on lsb-base; handled by debhelper.
+  * d/watch: Updated to track github upstream repository.
+  * New upstream release (LP: #1191180):
+    - d/control: Add xsltproc and docbook-xsl to BD's.
+    - d/p: Refreshed and tidied patches.
+  * Enable support for Ceph RBD backend:
+    - d/rules: Add CEPH_RBD=1 to options.
+    - d/control: Add BD on librbd-dev.
+    - d/p/include-rbd-docs.patch: Include README.rbd docs.
+  * Switch to debhelper compat level 8:
+    - d/rules: Rewrite to use debhelper overrides.
+    - d/compat,control: Bump compat level and minimum version
+      requirement for debhelper.
+
+ -- James Page <[e-mail]>  Tue, 18 Jun 2013 13:08:34 +0100
+
 tgt (1:1.0.17-1.1) unstable; urgency=low
 
   * Non-maintainer upload.
@@ -306,6 +547,36 @@ tgt (1:1.0.17-1.1) unstable; urgency=low
 
  -- Thomas Goirand <[e-mail]>  Thu, 11 Apr 2013 23:25:08 +0800
 
+tgt (1:1.0.17-1ubuntu4) saucy; urgency=low
+
+  * d/tests: added dep-8-tests
+
+ -- Yolanda <[e-mail]>  Tue, 21 May 2013 10:41:18 +0200
+
+tgt (1:1.0.17-1ubuntu3) quantal; urgency=low
+
+  * Rebuild for new armel compiler default of ARMv5t.
+
+ -- Colin Watson <[e-mail]>  Mon, 08 Oct 2012 23:02:42 +0100
+
+tgt (1:1.0.17-1ubuntu2) precise; urgency=low
+
+  * change /etc/tgt/tgt.conf to support adding config.d format
+    snippets in /etc/tgt/conf.d (LP: #978507)
+  * start tgt on installation (LP: #977621)
+  * stop tgt on shutdown (LP: #820699)
+
+ -- Scott Moser <[e-mail]>  Tue, 10 Apr 2012 23:11:00 -0400
+
+tgt (1:1.0.17-1ubuntu1) oneiric; urgency=low
+
+  * Merge from debian remaining changes: 
+    - debian/usptart: Add upstart job.
+    - Dropped:
+      - debian/patches/CVE-2011-0001.patch: No longer needed, use debian instead.
+
+ -- Chuck Short <[e-mail]>  Mon, 08 Aug 2011 04:45:03 -0400
+
 tgt (1:1.0.17-1) unstable; urgency=low
 
   * New upstream release.
@@ -318,12 +589,70 @@ tgt (1:1.0.4-3) unstable; urgency=high
 
  -- Ben Hutchings <[e-mail]>  Mon, 21 Mar 2011 03:32:59 +0000
 
+tgt (1:1.0.13-0ubuntu3) oneiric; urgency=low
+
+  * SECURITY UPDATE: denial of service and possible code execution via
+    double free in iscsi_rx_handler function
+    - debian/patches/CVE-2011-0001.patch: make sure the received data isn't
+      larger than INCOMING_BUFSIZE in usr/iscsi/iscsid.c.
+    - CVE-2011-0001
+
+ -- Marc Deslauriers <[e-mail]>  Tue, 21 Jun 2011 09:01:03 -0400
+
+tgt (1:1.0.13-0ubuntu2) natty; urgency=low
+
+  * debian/upstart: Add respawn to upstart job. (LP: #715686) 
+
+ -- Chuck Short <[e-mail]>  Mon, 14 Feb 2011 10:31:26 -0500
+
+tgt (1:1.0.13-0ubuntu1) natty; urgency=low
+
+  * New upstream release.
+  * debian/patches/make-tgt-setup-lun-executable: Dropped no longer needed.
+
+ -- Chuck Short <[e-mail]>  Tue, 08 Feb 2011 10:31:04 -0500
+
+tgt (1:1.0.4-2ubuntu1) natty; urgency=low
+
+  * Merge from debian unstable.  Remaining changes:
+    - debian/upstart: Add upstart job.
+    - Dropped:
+      + debian/patches/scripts-tgt-admin: Use debian's instead.
+
+ -- Chuck Short <[e-mail]>  Fri, 10 Sep 2010 16:19:59 +0100
+
 tgt (1:1.0.4-2) unstable; urgency=low
 
   * Fix bashism in tgt-admin, thanks to Chris Cheney (Closes: #589716)
 
  -- Ben Hutchings <[e-mail]>  Sun, 05 Sep 2010 22:13:52 +0100
 
+tgt (1:1.0.4-1ubuntu4) maverick; urgency=low
+
+  * debian/upstart: Corrected typo with post-start command; Resolving 
+    "unknown job" error. (LP: #574554)
+
+ -- Dave Walker (Daviey) <[e-mail]>  Mon, 09 Aug 2010 23:49:42 +0100
+
+tgt (1:1.0.4-1ubuntu3) maverick; urgency=low
+
+  * tgtd target will not start unless it's configured with "allow-in-use yes"
+    (LP: 605721)
+
+ -- Chris Cheney <[e-mail]>  Tue, 20 Jul 2010 04:29:56 -0500
+
+tgt (1:1.0.4-1ubuntu2) maverick; urgency=low
+
+  * debian/usptart: Add post-start exec to upstart script. (LP: #574554) 
+
+ -- Chuck Short <[e-mail]>  Fri, 16 Jul 2010 10:47:33 -0400
+
+tgt (1:1.0.4-1ubuntu1) maverick; urgency=low
+
+  * debian/rules, debian/tgt.tgtd.upstart: Add upstart script. (LP: #574554) 
+
+ -- Chuck Short <[e-mail]>  Thu, 17 Jun 2010 10:22:39 -0400
+
 tgt (1:1.0.4-1) unstable; urgency=low
 
   * New upstream release.
diff --git a/debian/control b/debian/control
index 6e807aa..e46c06e 100644
--- a/debian/control
+++ b/debian/control
@@ -1,9 +1,10 @@
 Source: tgt
 Section: net
 Priority: optional
-Maintainer: Apollon Oikonomopoulos <[e-mail]>
+Maintainer: Ubuntu Developers <[e-mail]>
+XSBC-Original-Maintainer: Apollon Oikonomopoulos <[e-mail]>
 Build-Depends: debhelper (>= 11~), libibverbs-dev, librdmacm-dev (>= 1.0.16),
-	       xsltproc, docbook-xsl, librbd-dev, glusterfs-common,
+               xsltproc, docbook-xsl, librbd-dev,
                bash-completion, libsystemd-dev, libaio-dev
 Vcs-Git: https://salsa.debian.org/debian/tgt.git
 Vcs-Browser: https://salsa.debian.org/debian/tgt
@@ -13,7 +14,7 @@ Homepage: http://stgt.sourceforge.net/
 Package: tgt
 Architecture: linux-any
 Depends: ${shlibs:Depends}, ${misc:Depends}, lsb-base, libconfig-general-perl, sg3-utils
-Suggests: tgt-glusterfs, tgt-rbd
+Suggests: tgt-rbd
 Description: Linux SCSI target user-space daemon and tools
  The Linux target framework (tgt) allows a Linux system to provide SCSI
  devices (targets) over networked SCSI transports.
@@ -55,26 +56,3 @@ Description: Linux SCSI target user-space daemon and tools - RBD support
  .
  This package enables tgt to use Ceph/RADOS block devices (RBD) as backing
  store for SCSI Logical Units.
-
-Package: tgt-glusterfs
-Architecture: linux-any
-Depends: tgt (= ${binary:Version}), ${shlibs:Depends}, ${misc:Depends}
-Description: Linux SCSI target user-space daemon and tools - GlusterFS support
- The Linux target framework (tgt) allows a Linux system to provide SCSI
- devices (targets) over networked SCSI transports.
- .
- tgt consists of a user-space daemon and user-space tools currently
- supporting the following transports:
- .
-  - iSCSI (SCSI over IP)
-  - iSER (iSCSI over RDMA, using Infiniband)
- .
- tgt also supports different storage types for use as backing stores for SCSI
- Logical Units:
- .
-  - Plain files and block devices
-  - Ceph/RADOS RBD volumes
-  - GlusterFS volumes
- .
- This package enables tgt to use GlusterFS volumes as backing store for SCSI
- Logical Units.
diff --git a/debian/rules b/debian/rules
index aefd543..fcbc088 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,7 +1,7 @@
 #!/usr/bin/make -f
 #export DH_VERBOSE=1
 
-FEATURES = ISCSI_RDMA=1 CEPH_RBD=1 GLFS_BD=1 SD_NOTIFY=1
+FEATURES = ISCSI_RDMA=1 CEPH_RBD=1 SD_NOTIFY=1
 
 export DEB_BUILD_MAINT_OPTIONS = hardening=+all
 
diff --git a/debian/tests/control b/debian/tests/control
index 1e1d3c7..ce05880 100644
--- a/debian/tests/control
+++ b/debian/tests/control
@@ -2,7 +2,7 @@ Tests: daemon admin
 Depends: tgt
 
 Tests: storage
-Depends: tgt, tgt-rbd, tgt-glusterfs
+Depends: tgt, tgt-rbd
 Restrictions: needs-root isolation-container allow-stderr
 
 Tests: localtgt
diff --git a/debian/tests/storage b/debian/tests/storage
index 2c24b7a..0389fb9 100755
--- a/debian/tests/storage
+++ b/debian/tests/storage
@@ -13,7 +13,7 @@ supported_bs=$(tgtadm --mode sys --op show | \
 		}')
 ret=0
 
-for bs in glfs rbd aio; do
+for bs in rbd aio; do
 	if echo "$supported_bs" | grep -q "\b$bs\b"; then
 		echo "OK - $bs supported"
 	else
diff --git a/debian/tgt-glusterfs.install b/debian/tgt-glusterfs.install
deleted file mode 100644
index 3726c09..0000000
--- a/debian/tgt-glusterfs.install
+++ /dev/null
@@ -1 +0,0 @@
-debian/tgt/usr/lib/tgt/backing-store/bs_glfs.so usr/lib/tgt/backing-store