Bug#1008072: buster-pu: package s390-dasd/0.0.74~deb10u1

[Cyril Brulebois]

Cyril Brulebois  (2022-03-21):
> Hopefully that's fine, but I could understand if you'd prefer
> 0.0.64+deb10u1 with just the dasd-config.c change. At least initially,
> it seemed to make sense to use the same approach for both buster and
> bullseye uploads.

Changes were prepared days ago, forgot the “please open bug reports”
reply from Adam… *and* managed not to spot the bullseye (instead of
buster) in the changelog until after having sent the opu request…

Fixed debdiff attached…


Cheers,
-- 
Cyril Brulebois (k...@debian.org)
D-I release manager -- Release team member -- Freelance Consultant
diff -Nru s390-dasd-0.0.64/dasd-config.c s390-dasd-0.0.74~deb10u1/dasd-config.c
--- s390-dasd-0.0.64/dasd-config.c	2018-08-10 21:25:00.0 +0200
+++ s390-dasd-0.0.74~deb10u1/dasd-config.c	2022-03-18 13:08:33.0 +0100
@@ -390,7 +390,7 @@
 	debconf_subst (client, TEMPLATE_PREFIX "formatting", "device", channel_current->name);
 	debconf_progress_start (client, 0, drive_geo.cylinders - 1, TEMPLATE_PREFIX "formatting");
 
-	snprintf (buf, sizeof (buf), "dasdfmt -l LX%04x -b 4096 -m 1 -f %s -y", channel_device (channel_current->name), dev);
+	snprintf (buf, sizeof (buf), "dasdfmt -l LX%04x -b 4096 -m 1 %s -y", channel_device (channel_current->name), dev);
 	ret = di_exec_shell_full (buf, format_handler, NULL, NULL, NULL, NULL, NULL, NULL);
 
 	debconf_progress_stop (client);
diff -Nru s390-dasd-0.0.64/debian/changelog s390-dasd-0.0.74~deb10u1/debian/changelog
--- s390-dasd-0.0.64/debian/changelog	2019-05-28 07:41:41.0 +0200
+++ s390-dasd-0.0.74~deb10u1/debian/changelog	2022-03-21 22:24:45.0 +0100
@@ -1,3 +1,112 @@
+s390-dasd (0.0.74~deb10u1) buster; urgency=medium
+
+  * Rebuild for buster.
+
+ -- Cyril Brulebois   Mon, 21 Mar 2022 22:24:45 +0100
+
+s390-dasd (0.0.74) unstable; urgency=medium
+
+  [ Dipak Zope ]
+  * Stop passing deprecated -f option to dasdfmt, which was dropped in
+s390-tools 1.37.1-1 (Closes: #1004292).
+
+ -- Cyril Brulebois   Fri, 18 Mar 2022 13:12:26 +0100
+
+s390-dasd (0.0.73) unstable; urgency=medium
+
+  * Team upload
+
+  [ Updated translations ]
+  * Finnish (fi.po) by Kimmo Kujansuu
+
+ -- Holger Wansing   Fri, 23 Jul 2021 19:30:21 +0200
+
+s390-dasd (0.0.72) unstable; urgency=medium
+
+  * Team upload
+
+  [ Updated translations ]
+  * Lithuanian (lt.po) by Gediminas Murauskas
+
+ -- Holger Wansing   Thu, 08 Jul 2021 23:38:27 +0200
+
+s390-dasd (0.0.71) unstable; urgency=medium
+
+  * Team upload
+
+  [ Updated translations ]
+  * Arabic (ar.po) by Fahim Sabah
+
+ -- Holger Wansing   Tue, 01 Jun 2021 21:05:44 +0200
+
+s390-dasd (0.0.70) unstable; urgency=medium
+
+  * Team upload
+
+  [ Updated translations ]
+  * Lithuanian (lt.po) by Kornelijus Tvarijanavičius
+
+ -- Holger Wansing   Fri, 02 Apr 2021 12:10:09 +0200
+
+s390-dasd (0.0.69) unstable; urgency=medium
+
+  * Team upload
+
+  [ Updated translations ]
+  * Greek (el.po) by george k
+  * Hindi (hi.po) by KushagraKarira
+  * Kabyle (kab.po) by Selyan Sliman Amiri
+  * Tamil (ta.po) by Vasudevan Tirumurti
+
+ -- Holger Wansing   Sat, 20 Feb 2021 19:26:43 +0100
+
+s390-dasd (0.0.68) unstable; urgency=medium
+
+  * Team upload
+
+  [ Philipp Kern ]
+  * Remove myself from uploaders.
+
+  [ Updated translations ]
+  * Occitan (oc.po) by Quentin PAGÈS
+
+ -- Philipp Kern   Sun, 27 Dec 2020 14:30:11 +0100
+
+s390-dasd (0.0.67) unstable; urgency=medium
+
+  * Team upload
+
+  [ Updated translations ]
+  * Basque (eu.po) by Iñaki Larrañaga Murgoitio
+  * Persian (fa.po) by Seyed Hany Hosseini
+  * Norwegian Bokmal (nb.po) by Allan Nordhøy
+  * Serbian (sr.po) by Filipovic Dragan
+
+  [ New translations ]
+  * Kabyle (kab.po) by Slimane Selyan Amiri
+  * Occitan (oc.po) by Quentin PAGÈS
+
+ -- Holger Wansing   Fri, 06 Nov 2020 18:48:50 +0100
+
+s390-dasd (0.0.66) unstable; urgency=medium
+
+  * Team upload
+
+  [ Updated translations ]
+  * Marathi (mr.po) by Prachi Joshi
+
+ -- Holger Wansing   Sat, 07 Mar 2020 21:31:15 +0100
+
+s390-dasd (0.0.65) unstable; urgency=medium
+
+  * Team upload
+
+  [ Updated translations ]
+  * Croatian (hr.po) by gogogogi
+  * Portuguese (pt.po) by Miguel Figueiredo
+
+ -- Holger Wansing   Wed, 13 Nov 2019 23:43:24 +0100
+
 s390-dasd (0.0.64) unstable; urgency=medium
 
   * Team upload
diff -Nru s390-dasd-0.0.64/debian/control s390-dasd-0.0.74~deb10u1/debian/control
--- s390-dasd-0.0.64/debian/control	2018-11-25 21:19:34.0 +0100
+++ s390-dasd-0.0.74~deb10u1/debian/control	2021-02-08 13:55:26.0 +0100
@@ -2,7 +2,7 @@
 Section: debian-installer
 Priority: standard
 Maintainer: Debian Install System Team 
-Uploaders: Bastian Blank , Philipp Kern 
+Uploaders: Bastian Blank 
 Build-Depends: debhelper (>= 9), po-debconf (>= 0.5.0), libsysfs-dev, libdebconfclient0-dev (>=0.47), libdebian-installer-dev
 Vcs-Browser: https://salsa.debian.org/installer-team/s390-dasd
 Vcs-Git: https://salsa.debian.org/installer-team/s390-dasd.git
diff 

Bug#1008072: buster-pu: package s390-dasd/0.0.74~deb10u1

[Cyril Brulebois]

Package: release.debian.org
Severity: normal
Tags: buster
User: release.debian@packages.debian.org
Usertags: pu
X-Debbugs-Cc: Dipak Zope1 

Hi,

Dipak Zope was kind enough to dig into s390x issues, and found s390-dasd
to be the missing piece in bullseye. I'm therefore proposing this change
to unbreak s390-dasd.

[ Reason ]

An option was dropped from a CLI tool that gets called in the installer
context, and we didn't remove it from our execve call.

[ Impact ]

Formatting fails on s390x systems.

[ Tests ]

Dipak Zope did the testing, and has an @ibm.com address, which sounds
good enough for me. :)

[ Risks ]

It cannot work without the fix.

[ Checklist ]

  [x] *all* changes are documented in the d/changelog
  [x] I reviewed all changes and I approve them
  [x] attach debdiff against the package in stable
  [x] the issue is verified as fixed in unstable

This is a trivial backport of the package uploaded to unstable a few
days ago. The diff against buster is larger than the one for bullseye
(catching up not only from 0.0.73 to 0.0.74, but from 0.0.64), but
that's mostly about l10n updates (and dropping pkern from Uploaders):

kibi@tokyo:~/debian-installer/packages (master=)$ diffstat -w 80 
s390-dasd+buster.diff 
 dasd-config.c|2 
 debian/changelog |  109 +++
 debian/control   |2 
 debian/po/ar.po  |9 ++
 debian/po/el.po  |   15 ++--
 debian/po/eu.po  |   32 +-
 debian/po/fa.po  |   35 ++-
 debian/po/fi.po  |7 +-
 debian/po/hi.po  |   33 ++
 debian/po/hr.po  |   40 ++---
 debian/po/kab.po |  163 
+
 debian/po/lt.po  |   19 +++---
 debian/po/mr.po  |   23 ---
 debian/po/nb.po  |   13 ++--
 debian/po/oc.po  |  167 
+++
 debian/po/pt.po  |8 +-
 debian/po/sr.po  |6 -
 debian/po/ta.po  |   21 --
 18 files changed, 592 insertions(+), 112 deletions(-)

Hopefully that's fine, but I could understand if you'd prefer
0.0.64+deb10u1 with just the dasd-config.c change. At least initially,
it seemed to make sense to use the same approach for both buster and
bullseye uploads.


Cheers,
-- 
Cyril Brulebois (k...@debian.org)
D-I release manager -- Release team member -- Freelance Consultant
diff -Nru s390-dasd-0.0.64/dasd-config.c s390-dasd-0.0.74~deb10u1/dasd-config.c
--- s390-dasd-0.0.64/dasd-config.c  2018-08-10 21:25:00.0 +0200
+++ s390-dasd-0.0.74~deb10u1/dasd-config.c  2022-03-18 13:08:33.0 
+0100
@@ -390,7 +390,7 @@
debconf_subst (client, TEMPLATE_PREFIX "formatting", "device", 
channel_current->name);
debconf_progress_start (client, 0, drive_geo.cylinders - 1, 
TEMPLATE_PREFIX "formatting");
 
-   snprintf (buf, sizeof (buf), "dasdfmt -l LX%04x -b 4096 -m 1 -f %s -y", 
channel_device (channel_current->name), dev);
+   snprintf (buf, sizeof (buf), "dasdfmt -l LX%04x -b 4096 -m 1 %s -y", 
channel_device (channel_current->name), dev);
ret = di_exec_shell_full (buf, format_handler, NULL, NULL, NULL, NULL, 
NULL, NULL);
 
debconf_progress_stop (client);
diff -Nru s390-dasd-0.0.64/debian/changelog 
s390-dasd-0.0.74~deb10u1/debian/changelog
--- s390-dasd-0.0.64/debian/changelog   2019-05-28 07:41:41.0 +0200
+++ s390-dasd-0.0.74~deb10u1/debian/changelog   2022-03-18 13:16:33.0 
+0100
@@ -1,3 +1,112 @@
+s390-dasd (0.0.74~deb10u1) bullseye; urgency=medium
+
+  * Rebuild for buster.
+
+ -- Cyril Brulebois   Fri, 18 Mar 2022 13:16:33 +0100
+
+s390-dasd (0.0.74) unstable; urgency=medium
+
+  [ Dipak Zope ]
+  * Stop passing deprecated -f option to dasdfmt, which was dropped in
+s390-tools 1.37.1-1 (Closes: #1004292).
+
+ -- Cyril Brulebois   Fri, 18 Mar 2022 13:12:26 +0100
+
+s390-dasd (0.0.73) unstable; urgency=medium
+
+  * Team upload
+
+  [ Updated translations ]
+  * Finnish (fi.po) by Kimmo Kujansuu
+
+ -- Holger Wansing   Fri, 23 Jul 2021 19:30:21 +0200
+
+s390-dasd (0.0.72) unstable; urgency=medium
+
+  * Team upload
+
+  [ Updated translations ]
+  * Lithuanian (lt.po) by Gediminas Murauskas
+
+ -- Holger Wansing   Thu, 08 Jul 2021 23:38:27 +0200
+
+s390-dasd (0.0.71) unstable; urgency=medium
+
+  * Team upload
+
+  [ Updated translations ]
+  * Arabic (ar.po) by Fahim Sabah
+
+ -- Holger Wansing   Tue, 01 Jun 2021 21:05:44 +0200
+
+s390-dasd (0.0.70) unstable; urgency=medium
+
+  * Team upload
+
+  [ Updated translations ]
+  * Lithuanian (lt.po) by Kornelijus Tvarijanavičius
+
+ -- Holger Wansing   Fri, 02 Apr 2021 12:10:09 +0200
+
+s390-dasd (0.0.69) unstable; urgency=medium
+
+  * Team upload
+
+  [ Updated translations ]
+  * Greek (el.po) by george k
+  * Hindi (hi.po) by KushagraKarira
+  * Kabyle (kab.po) by Selyan Sliman Amiri
+  * Tamil (ta.po) by Vasudevan Tirumurti
+
+ -- Holger Wansing   Sat, 20 Feb 2021