Bug#950806: dh_strip_nondeterminism: breaks Multi-Arch: same on binNMU

[Helmut Grohne]

Control: clone -1 -2
Control: reassign -2 src:ruby2.5
Control: retitle -2 ruby2.5 is not binNMU-safe
Control: affects -2 =
Control: tags -2 = patch

Hi Chris,

On Sun, Feb 09, 2020 at 08:57:10AM -0000, Chris Lamb wrote:
> Hi Helmut,
> 
> >    dh_strip_nondeterminism -a
> > 	Using 1579457206 as canonical time
> […]
> >    dh_strip_nondeterminism -a
> > 	Using 1579456117 as canonical time
> […]
> > This could affect any Multi-Arch: same package that is being binNMUed.
> 
> I can't seem to summon enough braincells this second to work out the
> right solution but whilst I see this I *think* this has been discussed
> a little before (likely with no resolution).
> 
> Ah yes, here we go perhaps:
> 
>   https://bugs.debian.org/894441

It seems to me that this bug is pretty much a duplicate of #894441.
Though there is kind of severity-inversion going on here. For ruby2.5,
it is a matter of being installable or not. That ends up being wishlist
on the ftp side. In essence, I think this asks for a intermediate
solution on the dh_strip_nondeterminism side until the long-term
solution becomes implementable.

Possibly strip-nondeterminism should be even more careful in figuring
out which files it should touch. The affected file appears to have a
very old timestamp and it might be corrupted in some way as sng gives an
error.

In any case, I think we an work around the issue in ruby2.5. So let's
just do that for now. Attaching a patch.

Helmut
-------------- next part --------------
diff --minimal -Nru ruby2.5-2.5.7/debian/changelog ruby2.5-2.5.7/debian/changelog
--- ruby2.5-2.5.7/debian/changelog	2019-10-23 17:48:04.000000000 +0200
+++ ruby2.5-2.5.7/debian/changelog	2020-02-09 11:08:13.000000000 +0100
@@ -1,3 +1,10 @@
+ruby2.5 (2.5.7-1.1) UNRELEASED; urgency=medium
+
+  * Non-maintainer upload.
+  * Make ruby2.5 binNMU-safe. (Closes: #-1)
+
+ -- Helmut Grohne <helmut at subdivi.de>  Sun, 09 Feb 2020 11:08:13 +0100
+
 ruby2.5 (2.5.7-1) unstable; urgency=medium
 
   [ Utkarsh Gupta ]
diff --minimal -Nru ruby2.5-2.5.7/debian/rules ruby2.5-2.5.7/debian/rules
--- ruby2.5-2.5.7/debian/rules	2019-10-23 17:48:04.000000000 +0200
+++ ruby2.5-2.5.7/debian/rules	2020-02-09 11:08:12.000000000 +0100
@@ -122,3 +122,6 @@
 	mkdir -p $(CURDIR)/debian/tmp/usr/share/systemtap/tapset
 	sed 's|@LIBRARY_PATH@|/usr/lib/$(DEB_HOST_MULTIARCH)/libruby-$(RUBY_VERSION).so|g' $(CURDIR)/debian/libruby.stp > $(CURDIR)/debian/tmp/usr/share/systemtap/tapset/libruby$(RUBY_VERSION)-$(DEB_HOST_MULTIARCH).stp
 	dh_install
+
+override_dh_strip_nondeterminism:
+	dh_strip_nondeterminism -XmacFFBgHack.png