Merge ~ahasenack/ubuntu/+source/sg3-utils:eoan-sg3-utils-1.44-merge into ubuntu/+source/sg3-utils:debian/sid

[Andreas Hasenack]

Normal merge from debian.

PPA: https://launchpad.net/~ahasenack/+archive/ubuntu/sg3-utils-144-merge/

or

sudo add-apt-repository -y -u ppa:ahasenack/sg3-utils-144-merge

Dropped one delta, already applied upstream. No DEP8 tests to run, but maybe it will trigger some elsewhere.

[Andreas Hasenack (ahasenack)]

Debian added a fix for the udevadm path in 1.42-3, and I checked and ours is in the same path, so we can keep that.

[Paride Legovini (paride)]

This seems quite straightforward, LGTM!

review: Approve

[Bryce Harrington (bryce)]

* Checked install/remove/purge in lxc
* Checked no changes outside debian/
* Checked update-maintainer is present
* Checked debdiff that there's no obvious errors
* Checked 1.44-1 current with debian unstable

* Checked debian for any outstanding changes since 1.44-1:
  - added an alternative dependency on linux-initramfs-tool -- we don't have a bug requesting this though, so guess can just wait get it at next merge.

* Checked upstream for outstanding changes since 1.44, in the 1.45-beta announced 06/04. There are no CVEs, none that fix ubuntu bugs, and nothing leaping out as critical importance that can't wait for the next merge. But for reference, these looked semi-relevant to ubuntu:
  - sg_ses: bug: --page= being overridden when --control and --data= also given; fix
  - sg_opcodes: expand MLU (spc5r20)
  - sg_write_buffer: allow comma and period separated lists when input from stdin
  - sg_inq: update version descriptors to spc5r21
  - sg_format: add --dcrt used twice (FOV=1 DCRT=0)
  - sg_raw: fix --send bug when using stdin
  - sg_vpd: 3pc VPD page add copy group descriptor
    + add --examine option
  - sg_read_buffer: decode read microcode status page
    + add --inhex=FN option
  - sg_xcopy: add --fco (fast copy only) (spc5r20)
    + implement --app=1 (append) on regular OFILE type
  - sg_modes: placeholders for Command duration limit T2A and T2B mpages (sbc4r17)
  - sg_lib: add sg_t10_uuid_desig2str()
    + tweak sg_pt interface to better handle bidi
    + sg_cmds_process_resp(): two arguments removed
    + add ${PACKAGE_VERSION} to '.so' name
    + add sg_f2hex_arr()
  - rescan-scsi-bus: widen LUN 0 only scanning
    + multiple patches to sync with Suse
  - sg_pt: add sg_get_opcode_translation() to replace global pointer to array: sg_opcode_info_arr[]
    + extend small SNTL to support read capacity
  - sg_io_linux (sg_lib): add sg_linux_sense_print()
  - sg_pt_linux: uses sg v4 interface if sg driver >= 4.0.0 . Force sg v3 always by building with './configure --disable-linux-sgv4'
    + add sg_linux_get_sg_version() function

I'm not familiar with sg3-utils usages, but offhand nothing that looks like it couldn't wait for next merge, and the packaging work looks clean.

+1 from me

review: Approve

[Bryce Harrington (bryce)]

Unrelated to the merge, but in taking a look at the bugs reported against sg3-utils:

* https://bugs.launchpad.net/ubuntu/+source/sg3-utils/+bug/992128
  - Claims that --readonly doesn't work.
  - This is old, filed in 2012, and never really got triaged.
  - Google isn't showing this as a widespread issue, or one that is known/persisting.
  - I bet it is obsolete (possibly usage error?) and can be closed.

* https://bugs.launchpad.net/ubuntu/+source/sg3-utils/+bug/1679392
  - Missing dep8 tests
  - This package doesn't seem like a good autopkgtest candidate since its HW dependent and just cli tools. However, I added thoughts to the bug on some basic tests that could be added.

[Andreas Hasenack (ahasenack)]

Thanks for the review! Adding dep8 tests is out of scope for this merge I think, and that bug really looks like it's obsolete

[Andreas Hasenack (ahasenack)]

tagged and uploaded:

$ git push pkg upload/1.44-1ubuntu1
Enumerating objects: 28, done.
Counting objects: 100% (28/28), done.
Delta compression using up to 2 threads
Compressing objects: 100% (22/22), done.
Writing objects: 100% (23/23), 2.81 KiB | 159.00 KiB/s, done.
Total 23 (delta 15), reused 1 (delta 0)
To ssh://git.launchpad.net/~usd-import-team/ubuntu/+source/sg3-utils
 * [new tag] upload/1.44-1ubuntu1 -> upload/1.44-1ubuntu1

$ dput -f ubuntu ../sg3-utils_1.44-1ubuntu1_source.changes
Checking signature on .changes
gpg: ../sg3-utils_1.44-1ubuntu1_source.changes: Valid signature from AC983EB5BF6BCBA9
Checking signature on .dsc
gpg: ../sg3-utils_1.44-1ubuntu1.dsc: Valid signature from AC983EB5BF6BCBA9
Uploading to ubuntu (via ftp to upload.ubuntu.com):
  Uploading sg3-utils_1.44-1ubuntu1.dsc: done.
  Uploading sg3-utils_1.44.orig.tar.xz: done.
  Uploading sg3-utils_1.44-1ubuntu1.debian.tar.xz: done.
  Uploading sg3-utils_1.44-1ubuntu1_source.buildinfo: done.
  Uploading sg3-utils_1.44-1ubuntu1_source.changes: done.
Successfully uploaded packages.

[Andreas Hasenack (ahasenack)]

This migrated already.

diff --git a/debian/changelog b/debian/changelog
index d70c5b8..025156e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,15 @@
+sg3-utils (1.44-1ubuntu1) eoan; urgency=medium
+
+  * Merge with Debian unstable. Remaining changes:
+    - debian/control, debian/rules: build a sg3-udeb installer package again.
+    - debian/sg3-udeb.install: install the right binaries for sg3-udeb.
+  * Dropped:
+    - d/p/ftbfs-sysmacro-include.patch: include correct header for the
+      major()/minor() macro definitions. (LP: #1823436)
+      [Fixed upstream]
+
+ -- Andreas Hasenack <[e-mail]>  Tue, 18 Jun 2019 14:51:10 +0000
+
 sg3-utils (1.44-1) unstable; urgency=medium
 
   * New upstream version 1.44
@@ -14,6 +26,20 @@ sg3-utils (1.42-3) unstable; urgency=medium
 
  -- Ritesh Raj Sarraf <[e-mail]>  Mon, 10 Sep 2018 10:02:04 +0545
 
+sg3-utils (1.42-2ubuntu2) eoan; urgency=medium
+
+  * d/p/ftbfs-sysmacro-include.patch: include correct header for the
+    major() macro definition. (LP: #1823436)
+
+ -- Andreas Hasenack <[e-mail]>  Tue, 23 Apr 2019 18:07:53 -0300
+
+sg3-utils (1.42-2ubuntu1) yakkety; urgency=medium
+
+  * debian/control, debian/rules: build a sg3-udeb installer package again.
+  * debian/sg3-udeb.install: install the right binaries for sg3-udeb.
+
+ -- Mathieu Trudel-Lapierre <[e-mail]>  Wed, 06 Jul 2016 09:19:44 -0400
+
 sg3-utils (1.42-2) unstable; urgency=medium
 
   * [a3ba3f8] Don't hardcode architecture in install files
diff --git a/debian/control b/debian/control
index c3e3dc5..f0066c9 100644
--- a/debian/control
+++ b/debian/control
@@ -1,7 +1,8 @@
 Source: sg3-utils
 Section: admin
 Priority: optional
-Maintainer: Ritesh Raj Sarraf <[e-mail]>
+Maintainer: Ubuntu Developers <[e-mail]>
+XSBC-Original-Maintainer: Ritesh Raj Sarraf <[e-mail]>
 Uploaders: Jonathan McDowell <[e-mail]>
 Build-Depends: debhelper (>= 9), libtool, libcam-dev [kfreebsd-any], dh-autoreconf, dpkg-dev (>= 1.16.1~)
 Standards-Version: 3.9.2
@@ -77,3 +78,10 @@ Description: utilities for devices using the SCSI command set (udev rules)
  .
  udev rules which are associated with the utilities in the sg3-utils package.
 
+Package: sg3-udeb
+Architecture: any
+Package-Type: udeb
+Section: debian-installer
+Depends: ${misc:Depends}
+Description: utilities for devices using the SCSI command set
+
diff --git a/debian/rules b/debian/rules
index 317dbe2..d1c1231 100755
--- a/debian/rules
+++ b/debian/rules
@@ -25,10 +25,12 @@ override_dh_install:
 	dh_install
 
 	[ ! -f scripts/55-scsi-sg3_id.rules ] || cp scripts/55-scsi-sg3_id.rules debian/sg3-utils-udev.scsi-sg3_id.udev
+	[ ! -f scripts/55-scsi-sg3_id.rules ] || cp scripts/55-scsi-sg3_id.rules debian/sg3-udeb.scsi-sg3_id.udev
 	[ ! -f scripts/58-scsi-sg3_symlink.rules ] || cp scripts/58-scsi-sg3_symlink.rules debian/sg3-utils-udev.scsi-sg3_symlink.udev
 
 	dh_installudev -psg3-utils-udev --priority=55 --name=scsi-sg3_id 
 	dh_installudev -psg3-utils-udev --priority=58 --name=scsi-sg3_symlink 
+	dh_installudev -psg3-udeb --priority=55 --name=scsi-sg3_id 
 
 	install -D -m 755 debian/initramfs/hooks $(INITRAMFS)/hooks/sg3-utils
 
@@ -37,6 +39,7 @@ override_dh_clean:
 
 	rm -f debian/sg3-utils-udev.scsi-sg3_id.udev
 	rm -f debian/sg3-utils-udev.scsi-sg3_symlink.udev
+	rm -f debian/sg3-udeb.scsi-sg3_id.udev
 
 	dh_clean
 
diff --git a/debian/sg3-udeb.install b/debian/sg3-udeb.install
new file mode 100644
index 0000000..f043efa
--- /dev/null
+++ b/debian/sg3-udeb.install
@@ -0,0 +1,2 @@
+usr/bin/sg_inq
+usr/lib/*/libsgutils*.so.*