Merge ~paelzer/ubuntu/+source/tgt:merge-1.0.79-2-gcc-10-FTFBS-GROOVY into ubuntu/+source/tgt:debian/sid

[Christian Ehrhardt ]

[Christian Ehrhardt  (paelzer)]

commit 413a540caf9e2f62e0974f649a3de0dbcf76c4e7
has (tag: pkg/import/1%1.0.79-3, pkg/debian/sid)

But https://code.launchpad.net/~usd-import-team/ubuntu/+source/tgt/+git/tgt/+ref/debian/sid misses that.

Therefore the LP diff is odd, but the actual change is a no-change-rebase that fixes an FTBFS with gcc-10.

PPA: https://launchpad.net/~ci-train-ppa-service/+archive/ubuntu/4287/+packages

There is actually a s390x FTFBS left that Debian has not fixed yet, I'll look into that after lunch.

[Christian Ehrhardt  (paelzer)]

s390x FTFBS fix added to the MP

Unmerged commits

08811b7... by Christian Ehrhardt  on 2020-09-30

changelog: avoid FTFBS due to glibc 2.32 (s390x)

Signed-off-by: Christian Ehrhardt <email address hidden>

37282e9... by Christian Ehrhardt  on 2020-09-30

d/rules: avoid FTFBS due to glibc 2.32 triggering more gcc-10 errors on tgt build

Signed-off-by: Christian Ehrhardt <email address hidden>

fb711ca... by Christian Ehrhardt  on 2020-09-30

update-maintainer

Signed-off-by: Christian Ehrhardt <email address hidden>

54f1f1a... by Christian Ehrhardt  on 2020-09-30

changelog: 1:1.0.79-3ubuntu1

Signed-off-by: Christian Ehrhardt <email address hidden>

f854f68... by Andreas Hasenack on 2019-07-31

merge-changelogs

e4594f3... by Christian Ehrhardt  on 2016-11-10

    - 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)

413a540... by Apollon Oikonomopoulos <email address hidden> on 2020-09-17

1:1.0.79-3 (patches unapplied)

Imported using git-ubuntu import.

18195ed... by Apollon Oikonomopoulos <email address hidden> on 2019-07-21

1:1.0.79-2 (patches unapplied)

Imported using git-ubuntu import.

ce00767... by Apollon Oikonomopoulos <email address hidden> on 2019-07-17

1:1.0.79-1 (patches unapplied)

Imported using git-ubuntu import.

e7dbd58... by Apollon Oikonomopoulos <email address hidden> on 2018-12-08

1:1.0.74-1 (patches unapplied)

Imported using git-ubuntu import.

diff --git a/debian/changelog b/debian/changelog
index 2c433fe..33cd5db 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,40 @@
+<<<<<<< debian/changelog
+=======
+tgt (1:1.0.79-3ubuntu1) groovy; 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)
+  * Add changes:
+    - d/rules: avoid FTFBS on s390x due to glibc 2.32 triggering more
+      gcc-10 errors on tgt build
+
+ -- Christian Ehrhardt <[e-mail]>  Wed, 30 Sep 2020 13:30:55 +0200
+
+tgt (1:1.0.79-3) unstable; urgency=medium
+
+  * Fix FTBFS with GCC 10 (Closes: #957874)
+  * Bump Standards-Version to 4.5.0; no changes needed
+  * Bump debhelper-compat to 13; no changes needed
+  * d/copyright: bump debian/ years
+
+ -- Apollon Oikonomopoulos <[e-mail]>  Thu, 17 Sep 2020 12:38:22 +0300
+
+tgt (1:1.0.79-2ubuntu1) eoan; 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)
+
+ -- Andreas Hasenack <[e-mail]>  Wed, 31 Jul 2019 16:25:34 -0300
+
+>>>>>>> debian/changelog
 tgt (1:1.0.79-2) unstable; urgency=medium
 
   * Allow env to override pkg-config.
@@ -20,6 +57,20 @@ tgt (1:1.0.79-1) unstable; urgency=medium
 
  -- Apollon Oikonomopoulos <[e-mail]>  Wed, 17 Jul 2019 13:19:03 -0300
 
+<<<<<<< debian/changelog
+=======
+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
+
+>>>>>>> debian/changelog
 tgt (1:1.0.74-1) unstable; urgency=medium
 
   [ Ondřej Nový ]
@@ -35,6 +86,20 @@ tgt (1:1.0.74-1) unstable; urgency=medium
 
  -- Apollon Oikonomopoulos <[e-mail]>  Sat, 08 Dec 2018 22:30:32 +0200
 
+<<<<<<< debian/changelog
+=======
+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
+
+>>>>>>> debian/changelog
 tgt (1:1.0.73-1) unstable; urgency=medium
 
   * New upstream version 1.0.73
@@ -47,12 +112,58 @@ tgt (1:1.0.73-1) unstable; urgency=medium
 
  -- Apollon Oikonomopoulos <[e-mail]>  Tue, 06 Mar 2018 00:12:22 +0200
 
+<<<<<<< debian/changelog
+=======
+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
+
+>>>>>>> debian/changelog
 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
 
+<<<<<<< debian/changelog
+=======
+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
+
+>>>>>>> debian/changelog
 tgt (1:1.0.71-1) unstable; urgency=medium
 
   [ Christian Ehrhardt ]
@@ -69,6 +180,23 @@ tgt (1:1.0.71-1) unstable; urgency=medium
 
  -- Apollon Oikonomopoulos <[e-mail]>  Tue, 04 Jul 2017 22:09:50 +0300
 
+<<<<<<< debian/changelog
+=======
+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
+
+>>>>>>> debian/changelog
 tgt (1:1.0.69-1) unstable; urgency=medium
 
   * New upstream release:
@@ -85,6 +213,31 @@ tgt (1:1.0.68-1) unstable; urgency=medium
 
  -- Apollon Oikonomopoulos <[e-mail]>  Tue, 01 Nov 2016 01:05:03 +0200
 
+<<<<<<< debian/changelog
+=======
+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
+
+>>>>>>> debian/changelog
 tgt (1:1.0.67-1) unstable; urgency=medium
 
   * New upstream release:
@@ -128,6 +281,32 @@ tgt (1:1.0.64-1) unstable; urgency=medium
 
  -- Apollon Oikonomopoulos <[e-mail]>  Tue, 24 May 2016 12:04:40 +0300
 
+<<<<<<< debian/changelog
+=======
+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
+
+>>>>>>> debian/changelog
 tgt (1:1.0.63-1) unstable; urgency=medium
 
   * New upstream release:
@@ -144,6 +323,37 @@ tgt (1:1.0.62-2) unstable; urgency=medium
 
  -- Apollon Oikonomopoulos <[e-mail]>  Tue, 19 Jan 2016 11:22:35 +0200
 
+<<<<<<< debian/changelog
+=======
+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
+
+>>>>>>> debian/changelog
 tgt (1:1.0.62-1) unstable; urgency=medium
 
   * New upstream version.
@@ -193,6 +403,29 @@ tgt (1:1.0.58-1) unstable; urgency=medium
 
  -- Apollon Oikonomopoulos <[e-mail]>  Tue, 26 May 2015 12:35:44 +0300
 
+<<<<<<< debian/changelog
+=======
+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
+
+>>>>>>> debian/changelog
 tgt (1:1.0.57-1) unstable; urgency=medium
 
   * New upstream version:
@@ -318,6 +551,81 @@ tgt (1:1.0.46-1) unstable; urgency=medium
 
  -- Apollon Oikonomopoulos <[e-mail]>  Mon, 19 May 2014 15:41:46 +0300
 
+<<<<<<< debian/changelog
+=======
+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
+
+>>>>>>> debian/changelog
 tgt (1:1.0.17-1.1) unstable; urgency=low
 
   * Non-maintainer upload.
@@ -328,6 +636,39 @@ tgt (1:1.0.17-1.1) unstable; urgency=low
 
  -- Thomas Goirand <[e-mail]>  Thu, 11 Apr 2013 23:25:08 +0800
 
+<<<<<<< debian/changelog
+=======
+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
+
+>>>>>>> debian/changelog
 tgt (1:1.0.17-1) unstable; urgency=low
 
   * New upstream release.
@@ -340,12 +681,76 @@ tgt (1:1.0.4-3) unstable; urgency=high
 
  -- Ben Hutchings <[e-mail]>  Mon, 21 Mar 2011 03:32:59 +0000
 
+<<<<<<< debian/changelog
+=======
+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
+
+>>>>>>> debian/changelog
 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
 
+<<<<<<< debian/changelog
+=======
+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
+
+>>>>>>> debian/changelog
 tgt (1:1.0.4-1) unstable; urgency=low
 
   * New upstream release.
diff --git a/debian/control b/debian/control
index d56bd26..74a1aa9 100644
--- a/debian/control
+++ b/debian/control
@@ -1,6 +1,7 @@
 Source: tgt
 Section: net
 Priority: optional
+<<<<<<< debian/control
 Maintainer: Apollon Oikonomopoulos <[e-mail]>
 Build-Depends: debhelper (>= 12~), libibverbs-dev, librdmacm-dev (>= 1.0.16),
 	       xsltproc, docbook-xsl, librbd-dev, libglusterfs-dev, uuid-dev,
@@ -8,13 +9,27 @@ Build-Depends: debhelper (>= 12~), libibverbs-dev, librdmacm-dev (>= 1.0.16),
 Vcs-Git: https://salsa.debian.org/debian/tgt.git
 Vcs-Browser: https://salsa.debian.org/debian/tgt
 Standards-Version: 4.4.0
+=======
+Maintainer: Ubuntu Developers <[e-mail]>
+XSBC-Original-Maintainer: Apollon Oikonomopoulos <[e-mail]>
+Build-Depends: debhelper-compat (= 13), libibverbs-dev, librdmacm-dev (>= 1.0.16),
+	       xsltproc, docbook-xsl, librbd-dev, uuid-dev,
+               bash-completion, libsystemd-dev, libaio-dev, pkg-config
+Vcs-Git: https://salsa.debian.org/debian/tgt.git
+Vcs-Browser: https://salsa.debian.org/debian/tgt
+Standards-Version: 4.5.0
+>>>>>>> debian/control
 Homepage: http://stgt.sourceforge.net/
 
 Package: tgt
 Architecture: linux-any
 Depends: ${shlibs:Depends}, ${misc:Depends}, lsb-base, libconfig-general-perl, sg3-utils
 Pre-Depends: ${misc:Pre-Depends}
+<<<<<<< debian/control
 Suggests: tgt-glusterfs, tgt-rbd
+=======
+Suggests: tgt-rbd
+>>>>>>> debian/control
 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.
@@ -56,6 +71,7 @@ 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.
+<<<<<<< debian/control
 
 Package: tgt-glusterfs
 Architecture: linux-any
@@ -79,3 +95,5 @@ Description: Linux SCSI target user-space daemon and tools - GlusterFS support
  .
  This package enables tgt to use GlusterFS volumes as backing store for SCSI
  Logical Units.
+=======
+>>>>>>> debian/control
diff --git a/debian/copyright b/debian/copyright
index 8f350de..0a94fd7 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -10,7 +10,11 @@ License: GPL-2
 Files: debian/*
 Copyright: Copyright © 2007-2011 Frederik Schüler <[e-mail]>
            Copyright © 2007-2011 Ben Hutchings <[e-mail]>
+<<<<<<< debian/copyright
            Copyright © 2014-2018 Apollon Oikonomopoulos <[e-mail]>
+=======
+           Copyright © 2014-2020 Apollon Oikonomopoulos <[e-mail]>
+>>>>>>> debian/copyright
 License: GPL-2+
 
 Files: usr/bs_aio.c usr/work.c
diff --git a/debian/patches/0008-Fix-build-with-gcc-10.patch b/debian/patches/0008-Fix-build-with-gcc-10.patch
 new file mode 100644
index 0000000..5a43776
--- /dev/null
+++ b/debian/patches/0008-Fix-build-with-gcc-10.patch
@@ -0,0 +1,46 @@
+From: Apollon Oikonomopoulos <[e-mail]>
+Date: Thu, 17 Sep 2020 12:12:56 +0300
+Subject: Fix build with gcc-10
+
+iscsi_add_portal sometimes passes a NULL pointer as a %s argument to
+printf. This is considered an error by -Werror=format-overflow and GCC-10 has
+become much smarter in detecting these cases:
+
+ In file included from iscsi/iscsid.h:29,
+                  from iscsi/iscsi_tcp.c:35:
+ In function 'iscsi_add_portal',
+     inlined from 'iscsi_add_portal' at iscsi/iscsi_tcp.c:408:5,
+     inlined from 'iscsi_tcp_init' at iscsi/iscsi_tcp.c:449:3:
+ ./log.h:90:2: error: '%s' directive argument is null [-Werror=format-overflow=]
+    90 |  log_error("%s(%d) " fmt, __FUNCTION__, __LINE__, ##args); \
+       |  ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+ iscsi/iscsi_tcp.c:411:3: note: in expansion of macro 'eprintf'
+   411 |   eprintf("failed to create/bind to portal %s:%d\n", addr, port);
+       |   ^~~~~~~
+
+Fix this by passing the empty string to eprintf() if addr is NULL.
+
+Closes: #957874
+---
+ usr/iscsi/iscsi_tcp.c | 7 ++++++-
+ 1 file changed, 6 insertions(+), 1 deletion(-)
+
+diff --git a/usr/iscsi/iscsi_tcp.c b/usr/iscsi/iscsi_tcp.c
+index 2bb8356..cb4e23c 100644
+--- a/usr/iscsi/iscsi_tcp.c
++++ b/usr/iscsi/iscsi_tcp.c
+@@ -407,8 +407,13 @@ int iscsi_tcp_init_portal(char *addr, int port, int tpgt)
+ 
+ int iscsi_add_portal(char *addr, int port, int tpgt)
+ {
++	const char *addr_str = "";
++
+ 	if (iscsi_tcp_init_portal(addr, port, tpgt)) {
+-		eprintf("failed to create/bind to portal %s:%d\n", addr, port);
++		if (addr) {
++			addr_str = addr;
++		}
++		eprintf("failed to create/bind to portal %s:%d\n", addr_str, port);
+ 		return -1;
+ 	}
+ 
diff --git a/debian/patches/0009-Replace-__packed-with-__attribute__.patch b/debian/patches/0009-Replace-__packed-with-__attribute__.patch
 new file mode 100644
index 0000000..caf839c
--- /dev/null
+++ b/debian/patches/0009-Replace-__packed-with-__attribute__.patch
@@ -0,0 +1,39 @@
+From: Apollon Oikonomopoulos <[e-mail]>
+Date: Thu, 17 Sep 2020 12:45:19 +0300
+Subject: Replace __packed with __attribute__(...)
+
+GCC 10 changed the default from -fcommon to -fno-common. This makes the
+tgt build fail because of multiple definitions of __packed. Change all
+instances of __packed to __attribute__((__packed__)), which is the
+canonical attribute form.
+---
+ usr/iscsi/iscsid.c | 2 +-
+ usr/iscsi/iser.c   | 2 +-
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/usr/iscsi/iscsid.c b/usr/iscsi/iscsid.c
+index a54a46e..476a760 100644
+--- a/usr/iscsi/iscsid.c
++++ b/usr/iscsi/iscsid.c
+@@ -1074,7 +1074,7 @@ void iscsi_rsp_set_residual(struct iscsi_cmd_rsp *rsp, struct scsi_cmd *scmd)
+ struct iscsi_sense_data {
+ 	uint16_t length;
+ 	uint8_t  data[0];
+-} __packed;
++} __attribute__((__packed__));
+ 
+ static int iscsi_cmd_rsp_build(struct iscsi_task *task)
+ {
+diff --git a/usr/iscsi/iser.c b/usr/iscsi/iser.c
+index c7c43b2..2abb872 100644
+--- a/usr/iscsi/iser.c
++++ b/usr/iscsi/iser.c
+@@ -92,7 +92,7 @@ char *iser_portal_addr;
+ struct iscsi_sense_data {
+ 	uint16_t length;
+ 	uint8_t data[0];
+-} __packed;
++} __attribute__((__packed__));
+ 
+ static size_t buf_pool_sz_mb = DEFAULT_POOL_SIZE_MB;
+ static int cq_vector = -1;
diff --git a/debian/patches/series b/debian/patches/series
index d533c5e..484b9cc 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -5,3 +5,8 @@
 0005-fix-aio-detection.patch
 0006-fix-pie-build
 0007-Fix-compilation-with-glusterfs-6.patch
+<<<<<<< debian/patches/series
+=======
+0008-Fix-build-with-gcc-10.patch
+0009-Replace-__packed-with-__attribute__.patch
+>>>>>>> debian/patches/series
diff --git a/debian/rules b/debian/rules
index 15484a4..8996676 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,9 +1,18 @@
 #!/usr/bin/make -f
 #export DH_VERBOSE=1
 
+<<<<<<< debian/rules
 FEATURES = ISCSI_RDMA=1 CEPH_RBD=1 GLFS_BD=1 SD_NOTIFY=1
 
 export DEB_BUILD_MAINT_OPTIONS = hardening=+all
+=======
+FEATURES = ISCSI_RDMA=1 CEPH_RBD=1 SD_NOTIFY=1
+
+export DEB_BUILD_MAINT_OPTIONS = hardening=+all
+# avoid FTFBS due to glibc 2.32 triggering more gcc-10 errors
+# in the usage of its functions by tgt
+export DEB_CFLAGS_MAINT_APPEND = -Wno-maybe-uninitialized -Wno-stringop-truncation
+>>>>>>> debian/rules
 
 %:
 	dh $@ --with bash-completion
diff --git a/debian/tests/control b/debian/tests/control
index 1e1d3c7..98ea7a5 100644
--- a/debian/tests/control
+++ b/debian/tests/control
@@ -2,7 +2,11 @@ Tests: daemon admin
 Depends: tgt
 
 Tests: storage
+<<<<<<< debian/tests/control
 Depends: tgt, tgt-rbd, tgt-glusterfs
+=======
+Depends: tgt, tgt-rbd
+>>>>>>> debian/tests/control
 Restrictions: needs-root isolation-container allow-stderr
 
 Tests: localtgt
diff --git a/debian/tests/storage b/debian/tests/storage
index 2c24b7a..52f17ed 100755
--- a/debian/tests/storage
+++ b/debian/tests/storage
@@ -13,7 +13,11 @@ supported_bs=$(tgtadm --mode sys --op show | \
 		}')
 ret=0
 
+<<<<<<< debian/tests/storage
 for bs in glfs rbd aio; do
+=======
+for bs in rbd aio; do
+>>>>>>> debian/tests/storage
 	if echo "$supported_bs" | grep -q "\b$bs\b"; then
 		echo "OK - $bs supported"
 	else