Bug#987766: unblock: open-iscsi/2.1.3-2

2021-05-25 Thread Cyril Brulebois 
Hi,

Paul Gevers  (2021-05-25):
> I trust you to handle that in a sane way, so, unless you find "heated"
> discussions in an unblock bug (than please check with the Release Team
> member(s) involved), please go ahead.

Alright, thanks. :) Yes, “when in doubt, ask” is quite a well known move
of mine.

> Ack, updated the age hint.

Thanks for that as well.


Cheers,
-- 
Cyril Brulebois (k...@debian.org)
D-I release manager -- Release team member -- Freelance Consultant


signature.asc
Description: PGP signature

Bug#987766: unblock: open-iscsi/2.1.3-2

2021-05-25 Thread Paul Gevers 
Hi kibi,

On 25-05-2021 01:05, Cyril Brulebois wrote:
> Paul Gevers  (2021-05-24):
>> unblocked and aged to 10 days. @kibi, let me know if you need it earlier.
> 
> Thanks for the unblock. Do you prefer handling the aging yourself, or
> can I just adjust with either age-days or urgent if I see stuff that's
> not yet in testing when I'm a few days from preparing the release? I've
> done the latter on my own for a while, but with the release getting
> closer, I could understand if you'd like to have more visibility /
> control over age requirements.

I trust you to handle that in a sane way, so, unless you find "heated"
discussions in an unblock bug (than please check with the Release Team
member(s) involved), please go ahead.

> As for this specific package, it might be slightly better to have 7
> days, so that it has a chance to be in testing by the week-end or early
> next week.

Ack, updated the age hint.

Paul



OpenPGP_signature
Description: OpenPGP digital signature

Bug#987766: unblock: open-iscsi/2.1.3-2

2021-05-24 Thread Cyril Brulebois 
Hi,

Ritesh Raj Sarraf  (2021-05-24):
> Dear Release Team and Paul,
> 
> I am hopeful that this recent upload of open-iscsi at version 2.1.3-5
> is proper. I request an unblock of this version so that the d-i issue
> is fixed.
> 
> The patch was prepared in close co-ordination with Cyril from d-i team.
> 
> The current migration status on the tracker page looks okay to me.
> The debdiff in between the versions from Testing and Unstable are
> attached with this email
> 
> Thanks,
> Ritesh
> 
> On Fri, 2021-05-14 at 21:56 +0200, Paul Gevers wrote:
> > Hi Ritesh,
> > 
> > On 12-05-2021 18:27, Ritesh Raj Sarraf wrote:
> > > The package has been uploaded to Unstable. It has built proper on
> > > all
> > > supported architectures. You may want to consider unblocking this
> > > build
> > > revision.
> > 
> > The armhf udeb package has an unmet dependency.
> > 
> > Paul

I'm obviously biased here, but I think the proposed package should be
better than what we have in bullseye. I don't have any open-iscsi setup
to perform run-time tests though.



Cheers,
-- 
Cyril Brulebois (k...@debian.org)
D-I release manager -- Release team member -- Freelance Consultant


signature.asc
Description: PGP signature

Bug#987766: unblock: open-iscsi/2.1.3-2

2021-05-24 Thread Ritesh Raj Sarraf 
Control: retitle -1 unblock: open-iscsi/2.1.3-5


Dear Release Team and Paul,

I am hopeful that this recent upload of open-iscsi at version 2.1.3-5
is proper. I request an unblock of this version so that the d-i issue
is fixed.

The patch was prepared in close co-ordination with Cyril from d-i team.

The current migration status on the tracker page looks okay to me.
The debdiff in between the versions from Testing and Unstable are
attached with this email

Thanks,
Ritesh

On Fri, 2021-05-14 at 21:56 +0200, Paul Gevers wrote:
> Hi Ritesh,
> 
> On 12-05-2021 18:27, Ritesh Raj Sarraf wrote:
> > The package has been uploaded to Unstable. It has built proper on
> > all
> > supported architectures. You may want to consider unblocking this
> > build
> > revision.
> 
> The armhf udeb package has an unmet dependency.
> 
> Paul
> 

-- 
Ritesh Raj Sarraf | http://people.debian.org/~rrs
Debian - The Universal Operating System
diff -Nru open-iscsi-2.1.3/debian/changelog open-iscsi-2.1.3/debian/changelog
--- open-iscsi-2.1.3/debian/changelog	2021-02-08 00:53:13.0 +0530
+++ open-iscsi-2.1.3/debian/changelog	2021-05-20 19:52:30.0 +0530
@@ -1,3 +1,26 @@
+open-iscsi (2.1.3-5) unstable; urgency=medium
+
+  [ Cyril Brulebois ]
+  * [3b8b2d8] Revert "Set architecture for build to linux-any"
+  * [1297e50] Adjust dh_auto_install and dh_makeshlibs overrides for the conditional udeb.
+
+ -- Ritesh Raj Sarraf   Thu, 20 May 2021 19:52:30 +0530
+
+open-iscsi (2.1.3-4) unstable; urgency=medium
+
+  * [8142984] Set architecture for build to linux-any. This ensures that the
+library is built on the right set of architectures and dh_makeshlibs is
+invoked appropriately. (Closes: #987858)
+
+ -- Ritesh Raj Sarraf   Tue, 04 May 2021 21:45:56 +0530
+
+open-iscsi (2.1.3-3) unstable; urgency=medium
+
+  * [47645a5] Make open-iscsi-udeb compatible with d-i.
+Thanks to Cyril Brulebois (Closes: #987568)
+
+ -- Ritesh Raj Sarraf   Thu, 29 Apr 2021 13:43:35 +0530
+
 open-iscsi (2.1.3-2) unstable; urgency=medium
 
   * [c3b7109] Fix FTCBFS:
diff -Nru open-iscsi-2.1.3/debian/control open-iscsi-2.1.3/debian/control
--- open-iscsi-2.1.3/debian/control	2021-02-08 00:53:13.0 +0530
+++ open-iscsi-2.1.3/debian/control	2021-05-20 19:52:23.0 +0530
@@ -144,8 +144,6 @@
 Package-Type: udeb
 Depends: ${misc:Depends},
  ${shlibs:Depends},
- libopeniscsiusr,
- udev,
  scsi-modules
 Description: Configure iSCSI
  The Open-iSCSI project is a high-performance, transport independent,
diff -Nru open-iscsi-2.1.3/debian/rules open-iscsi-2.1.3/debian/rules
--- open-iscsi-2.1.3/debian/rules	2021-02-08 00:53:13.0 +0530
+++ open-iscsi-2.1.3/debian/rules	2021-05-20 19:52:23.0 +0530
@@ -9,6 +9,8 @@
 include /usr/share/dpkg/pkg-info.mk
 export KBUILD_BUILD_TIMESTAMP = @$(SOURCE_DATE_EPOCH)
 
+UDEB := $(filter open-iscsi-udeb,$(shell dh_listpackages))
+
 %:
 	dh $@
 
@@ -59,6 +61,7 @@
 	mkdir -p debian/iscsiuio/usr/share/initramfs-tools/hooks
 	cp -p debian/extra/iscsiuio.initramfs.hook debian/iscsiuio/usr/share/initramfs-tools/hooks/iscsiuio
 
+ifneq ($(UDEB),)
 	@# open-iscsi-udeb
 	dh_install -p open-iscsi-udeb usr/iscsid sbin/
 	dh_install -p open-iscsi-udeb usr/iscsistart sbin/
@@ -69,6 +72,10 @@
 	dh_install -p open-iscsi-udeb debian/open-iscsi-udeb.start sbin/iscsi-start
 	dh_install -p open-iscsi-udeb debian/open-iscsi-udeb.finish-install usr/lib/finish-install.d/10open-iscsi
 
+	# Ship shared libraries along with the executable in a single udeb
+	dh_install -p open-iscsi-udeb libopeniscsiusr/libopeniscsiusr*.so.* usr/lib/${DEB_HOST_MULTIARCH}
+endif
+
 override_dh_installinit:
 	dh_installinit -p open-iscsi --name=iscsid
 	dh_installinit -p open-iscsi
@@ -96,3 +103,10 @@
 
 override_dh_missing:
 	dh_missing --fail-missing
+
+override_dh_makeshlibs:
+ifneq ($(UDEB),)
+	dh_makeshlibs --add-udeb=open-iscsi-udeb
+else
+	dh_makeshlibs
+endif


signature.asc
Description: This is a digitally signed message part

Bug#987766: unblock: open-iscsi/2.1.3-2

2021-05-14 Thread Paul Gevers 
Hi Ritesh,

On 12-05-2021 18:27, Ritesh Raj Sarraf wrote:
> The package has been uploaded to Unstable. It has built proper on all
> supported architectures. You may want to consider unblocking this build
> revision.

The armhf udeb package has an unmet dependency.

Paul



OpenPGP_signature
Description: OpenPGP digital signature

Bug#987766: unblock: open-iscsi/2.1.3-2

2021-05-12 Thread Ritesh Raj Sarraf 
On Tue, 2021-05-04 at 22:04 +0530, Ritesh Raj Sarraf wrote:
> > That's not what I meant. I'll try to be more clear next time.
> > 
> > You're debdiff showed only the content of the open-iscsi binary
> > package
> > (which wasn't affected by your changes). My request was intended
> > for
> > *all* binary packages. You can get that by running debdiff on the
> > changes files IIRC.
> 
> Attached are the diffs you requested. This time, I have not yet
> uploaded the proposed package to Unstable. I will have for an
> affirmation from the Release Team.

The package has been uploaded to Unstable. It has built proper on all
supported architectures. You may want to consider unblocking this build
revision.

Thanks,
Ritesh

-- 
Ritesh Raj Sarraf | http://people.debian.org/~rrs
Debian - The Universal Operating System


signature.asc
Description: This is a digitally signed message part

Bug#987766: unblock: open-iscsi/2.1.3-2

2021-05-04 Thread Ritesh Raj Sarraf 
Control: retitle -1 unblock: open-iscsi/2.1.3-4

Hello Paul,

On Fri, 2021-04-30 at 22:00 +0200, Paul Gevers wrote:
> Hi,
> 
> On 30-04-2021 17:03, Ritesh Raj Sarraf wrote:
> > I will go ahead with the upload now and will untag this bug report
> > of
> > `moreinfo`.
> 
> That's not what I meant. I'll try to be more clear next time.
> 
> You're debdiff showed only the content of the open-iscsi binary
> package
> (which wasn't affected by your changes). My request was intended for
> *all* binary packages. You can get that by running debdiff on the
> changes files IIRC.

Attached are the diffs you requested. This time, I have not yet
uploaded the proposed package to Unstable. I will have for an
affirmation from the Release Team.

-- 
Ritesh Raj Sarraf | http://people.debian.org/~rrs
Debian - The Universal Operating System
[The following lists of changes regard files as different if they have
different names, permissions or owners.]

Files in second .changes but not in first
-
-rw-r--r--  root/root   
/usr/lib/debug/.build-id/1c/1d6be98cf8c560bc6460b875d465d58d6c4ced.debug

Files in first .changes but not in second
-
-rw-r--r--  root/root   
/usr/lib/debug/.build-id/6f/976fbb6002dc58eb3d0a5ea09d3e802e513a7d.debug

Control files of package iscsiuio: lines which differ (wdiff format)

Version: [-2.1.3-2-] {+2.1.3-4+}

Control files of package iscsiuio-dbgsym: lines which differ (wdiff format)
---
Build-Ids: [-6f976fbb6002dc58eb3d0a5ea09d3e802e513a7d-] 
{+1c1d6be98cf8c560bc6460b875d465d58d6c4ced+}
Depends: iscsiuio (= [-2.1.3-2)-] {+2.1.3-4)+}
Version: [-2.1.3-2-] {+2.1.3-4+}

Control files of package libopeniscsiusr: lines which differ (wdiff format)
---
Version: [-2.1.3-2-] {+2.1.3-4+}

Control files of package libopeniscsiusr-dbgsym: lines which differ (wdiff 
format)
--
Depends: libopeniscsiusr (= [-2.1.3-2)-] {+2.1.3-4)+}
Version: [-2.1.3-2-] {+2.1.3-4+}

Control files of package libopeniscsiusr-dev: lines which differ (wdiff format)
---
Version: [-2.1.3-2-] {+2.1.3-4+}

Control files of package open-iscsi: lines which differ (wdiff format)
--
Version: [-2.1.3-2-] {+2.1.3-4+}

Control files of package open-iscsi-dbgsym: lines which differ (wdiff format)
-
Depends: open-iscsi (= [-2.1.3-2)-] {+2.1.3-4)+}
Version: [-2.1.3-2-] {+2.1.3-4+}

Control files of package open-iscsi-udeb: lines which differ (wdiff format)
---
Depends: libc6-udeb (>= 2.31), libcrypto1.1-udeb (>= 1.1.1k), libisns-udeb, 
libkmod2-udeb (>= 28), libmount1-udeb (>= 2.33), [-libopeniscsiusr,-] 
libsystemd0 (>= 247.3), [-udev,-] scsi-modules
Installed-Size: [-1220-] {+1341+}
Version: [-2.1.3-2-] {+2.1.3-4+}
diff -Nru open-iscsi-2.1.3/debian/changelog open-iscsi-2.1.3/debian/changelog
--- open-iscsi-2.1.3/debian/changelog	2021-02-08 00:53:13.0 +0530
+++ open-iscsi-2.1.3/debian/changelog	2021-05-04 21:45:56.0 +0530
@@ -1,3 +1,18 @@
+open-iscsi (2.1.3-4) unstable; urgency=medium
+
+  * [8142984] Set architecture for build to linux-any. This ensures that the
+library is built on the right set of architectures and dh_makeshlibs is
+invoked appropriately. (Closes: #987858)
+
+ -- Ritesh Raj Sarraf   Tue, 04 May 2021 21:45:56 +0530
+
+open-iscsi (2.1.3-3) unstable; urgency=medium
+
+  * [47645a5] Make open-iscsi-udeb compatible with d-i.
+Thanks to Cyril Brulebois (Closes: #987568)
+
+ -- Ritesh Raj Sarraf   Thu, 29 Apr 2021 13:43:35 +0530
+
 open-iscsi (2.1.3-2) unstable; urgency=medium
 
   * [c3b7109] Fix FTCBFS:
diff -Nru open-iscsi-2.1.3/debian/control open-iscsi-2.1.3/debian/control
--- open-iscsi-2.1.3/debian/control	2021-02-08 00:53:13.0 +0530
+++ open-iscsi-2.1.3/debian/control	2021-05-04 21:00:04.0 +0530
@@ -139,13 +139,11 @@
 #   linux kernel udebs) must exist for these architectures - so
 #   check that before adding them to this list; the other
 #   scsi-(core|common|...)-modules are NOT sufficient!
-Architecture: amd64 arm64 armhf i386 ia64 mips mipsel powerpc ppc64 ppc64el s390x
+Architecture: linux-any
 Section: debian-installer
 Package-Type: udeb
 Depends: ${misc:Depends},
  ${shlibs:Depends},
- libopeniscsiusr,
- udev,
  scsi-modules
 Description: Configure iSCSI
  The Open-iSCSI project is a high-performance, transport independent,
diff -Nru open-iscsi-2.1.3/debian/rules

Bug#987766: unblock: open-iscsi/2.1.3-2

2021-04-30 Thread Paul Gevers 
Hi,

On 30-04-2021 17:03, Ritesh Raj Sarraf wrote:
> I will go ahead with the upload now and will untag this bug report of
> `moreinfo`.

That's not what I meant. I'll try to be more clear next time.

You're debdiff showed only the content of the open-iscsi binary package
(which wasn't affected by your changes). My request was intended for
*all* binary packages. You can get that by running debdiff on the
changes files IIRC.

Paul



OpenPGP_signature
Description: OpenPGP digital signature

Bug#987766: unblock: open-iscsi/2.1.3-2

2021-04-30 Thread Ritesh Raj Sarraf 
Control: tag -1 +moreinfo +help

On Fri, 2021-04-30 at 21:02 +0530, Ritesh Raj Sarraf wrote:
> Control: tag -1 -moreinfo
> 
> On Fri, 2021-04-30 at 20:33 +0530, Ritesh Raj Sarraf wrote:
> > On Thu, 2021-04-29 at 22:19 +0200, Paul Gevers wrote:
> > > > The interim workaround is to ship the library into the open-
> > > > iscsi-
> > > udeb
> > > > package itself.
> > > 
> > > This looks acceptable, but could you please add a binary debdiff to
> > > this
> > > report to show the effect of the changes?
> > 
> > I guess I used the tool in the right way.
> > 
> > rrs@priyasi:.../Result$ debdiff /var/tmp/Chrome-Downloads/open-
> > iscsi_2.1.3-2_amd64.deb open-iscsi_2.1.3-3_amd64.deb
> > File lists identical (after any substitutions)
> > 
> > Control files: lines which differ (wdiff format)
> > 
> > Version: [-2.1.3-2-] {+2.1.3-3+}
> > 
> > 
> > 
> > I will go ahead with the upload now and will untag this bug report of
> > `moreinfo`.
> > 
> 
> The package has been uploaded to Debian Unstable now.
> 

And it has failed to build on some of the architectures. And that is
because, we have:

```
Package: open-iscsi-udeb
# Note: the (virtual) udeb package scsi-modules (provided by different
#   linux kernel udebs) must exist for these architectures - so
#   check that before adding them to this list; the other
#   scsi-(core|common|...)-modules are NOT sufficient!
Architecture: amd64 arm64 armhf i386 ia64 mips mipsel powerpc ppc64
ppc64el s390x
Section: debian-installer
Package-Type: udeb
```

Let me work with the d-i team and come with a follow-up fix/upload.

-- 
Ritesh Raj Sarraf | http://people.debian.org/~rrs
Debian - The Universal Operating System


signature.asc
Description: This is a digitally signed message part

Bug#987766: unblock: open-iscsi/2.1.3-2

2021-04-30 Thread Ritesh Raj Sarraf 
Control: tag -1 -moreinfo

On Fri, 2021-04-30 at 20:33 +0530, Ritesh Raj Sarraf wrote:
> On Thu, 2021-04-29 at 22:19 +0200, Paul Gevers wrote:
> > > The interim workaround is to ship the library into the open-
> > > iscsi-
> > udeb
> > > package itself.
> > 
> > This looks acceptable, but could you please add a binary debdiff to
> > this
> > report to show the effect of the changes?
> 
> I guess I used the tool in the right way.
> 
> rrs@priyasi:.../Result$ debdiff /var/tmp/Chrome-Downloads/open-
> iscsi_2.1.3-2_amd64.deb open-iscsi_2.1.3-3_amd64.deb
> File lists identical (after any substitutions)
> 
> Control files: lines which differ (wdiff format)
> 
> Version: [-2.1.3-2-] {+2.1.3-3+}
> 
> 
> 
> I will go ahead with the upload now and will untag this bug report of
> `moreinfo`.
> 

The package has been uploaded to Debian Unstable now.

-- 
Ritesh Raj Sarraf | http://people.debian.org/~rrs
Debian - The Universal Operating System


signature.asc
Description: This is a digitally signed message part

Bug#987766: unblock: open-iscsi/2.1.3-2

2021-04-30 Thread Ritesh Raj Sarraf 
On Thu, 2021-04-29 at 22:19 +0200, Paul Gevers wrote:
> > The interim workaround is to ship the library into the open-iscsi-
> udeb
> > package itself.
> 
> This looks acceptable, but could you please add a binary debdiff to
> this
> report to show the effect of the changes?

I guess I used the tool in the right way.

rrs@priyasi:.../Result$ debdiff /var/tmp/Chrome-Downloads/open-
iscsi_2.1.3-2_amd64.deb open-iscsi_2.1.3-3_amd64.deb
File lists identical (after any substitutions)

Control files: lines which differ (wdiff format)

Version: [-2.1.3-2-] {+2.1.3-3+}



I will go ahead with the upload now and will untag this bug report of
`moreinfo`.

-- 
Ritesh Raj Sarraf | http://people.debian.org/~rrs
Debian - The Universal Operating System


signature.asc
Description: This is a digitally signed message part

Bug#987766: unblock: open-iscsi/2.1.3-2

2021-04-29 Thread Paul Gevers 
Control: tags -1 moreinfo d-i
Control: retitle -1 unblock: open-iscsi/2.1.3-3

Hi Ritesh,

On 29-04-2021 10:23, Ritesh Raj Sarraf wrote:
> The open-iscsi-udeb package is not installable in the d-i environment
> because of the unavailable respective udeb package for libopeniscsiusr.

Ouch. If I understand that correctly, we should make our migration
software smarter to catch the issue before it migrates.

> The interim workaround is to ship the library into the open-iscsi-udeb
> package itself.

This looks acceptable, but could you please add a binary debdiff to this
report to show the effect of the changes?

> unblock open-iscsi/2.1.3-2

 ^^^ that's the version currently in unstable,
you need the to-be unblocked version there.

Paul



OpenPGP_signature
Description: OpenPGP digital signature

Bug#987766: unblock: open-iscsi/2.1.3-2

2021-04-29 Thread Ritesh Raj Sarraf 
Package: release.debian.org
Severity: normal
User: release.debian@packages.debian.org
Usertags: unblock

Please unblock package open-iscsi

[ Reason ]
With version 2.1.x of open-iscsi, a new library was introduced;
libopeniscsiusr. Since we ship a udeb variant of the open-iscsi package,
this library got pulled in into the open-iscsi-udeb package, adding a
depending on package libopeniscsiusr.

[ Impact ]
The open-iscsi-udeb package is not installable in the d-i environment
because of the unavailable respective udeb package for libopeniscsiusr.

The interim workaround is to ship the library into the open-iscsi-udeb
package itself. Nobody else is really making use of it. Post Bullseye,
I'll look into either shipping a new udeb for this library or building
the udeb variant of open-iscsi without support for this library, it is
allows.

[ Risks ]
The changes are trivial. We (Me and Cyril from d-i team) have validated
the effects of the change and do not see any breakage.

[ 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 testing

I have not uploaded this revision of the package to Unstable yet. I will
do the upload after you review this change and give me a go ahead.
Thanks.

unblock open-iscsi/2.1.3-2
diff -Nru open-iscsi-2.1.3/debian/changelog open-iscsi-2.1.3/debian/changelog
--- open-iscsi-2.1.3/debian/changelog   2021-02-08 00:53:13.0 +0530
+++ open-iscsi-2.1.3/debian/changelog   2021-04-29 13:43:35.0 +0530
@@ -1,3 +1,10 @@
+open-iscsi (2.1.3-3) unstable; urgency=medium
+
+  * [47645a5] Make open-iscsi-udeb compatible with d-i.
+Thanks to Cyril Brulebois (Closes: #987568)
+
+ -- Ritesh Raj Sarraf   Thu, 29 Apr 2021 13:43:35 +0530
+
 open-iscsi (2.1.3-2) unstable; urgency=medium
 
   * [c3b7109] Fix FTCBFS:
diff -Nru open-iscsi-2.1.3/debian/control open-iscsi-2.1.3/debian/control
--- open-iscsi-2.1.3/debian/control 2021-02-08 00:53:13.0 +0530
+++ open-iscsi-2.1.3/debian/control 2021-04-29 13:42:24.0 +0530
@@ -144,8 +144,6 @@
 Package-Type: udeb
 Depends: ${misc:Depends},
  ${shlibs:Depends},
- libopeniscsiusr,
- udev,
  scsi-modules
 Description: Configure iSCSI
  The Open-iSCSI project is a high-performance, transport independent,
diff -Nru open-iscsi-2.1.3/debian/rules open-iscsi-2.1.3/debian/rules
--- open-iscsi-2.1.3/debian/rules   2021-02-08 00:53:13.0 +0530
+++ open-iscsi-2.1.3/debian/rules   2021-04-29 13:42:24.0 +0530
@@ -69,6 +69,9 @@
dh_install -p open-iscsi-udeb debian/open-iscsi-udeb.start 
sbin/iscsi-start
dh_install -p open-iscsi-udeb debian/open-iscsi-udeb.finish-install 
usr/lib/finish-install.d/10open-iscsi
 
+   # Ship shared libraries along with the executable in a single udeb
+   dh_install -p open-iscsi-udeb libopeniscsiusr/libopeniscsiusr*.so.* 
usr/lib/${DEB_HOST_MULTIARCH}
+
 override_dh_installinit:
dh_installinit -p open-iscsi --name=iscsid
dh_installinit -p open-iscsi
@@ -96,3 +99,6 @@
 
 override_dh_missing:
dh_missing --fail-missing
+
+override_dh_makeshlibs:
+   dh_makeshlibs --add-udeb=open-iscsi-udeb