On 2023-05-29, Sebastiaan Couwenberg wrote: > On 5/29/23 06:13, Vagrant Cascadian wrote: >> On 2023-05-29, Sebastiaan Couwenberg wrote: >>> On 5/28/23 23:38, Vagrant Cascadian wrote: >>>> That said, I think it really is the touch commands in debian/datumgrids* >>>> as touch's timestamp modification is timezone dependent in many cases... >>>> >>>> The attached patch fixes this by setting the TZ=UTC as an environment >>>> variable in the debian/datumgrids*.shar files. ... >>> Patching the shar files is not ideal, when their content is modified >>> these changes will be lost. >>> >>> shar/unshar should be more likely be patched.
I am not familiar with shar/unshar, but sure, adding support for SOURCE_DATE_EPOCH would be welcome... >>> Does TZ=UTC also work when set in the environment? If so, that could be >>> passed to the unshar commands in d/rules. >> >> I would expect that to work as well, which I though of shortly after >> sending the updated patch... though did not yet test it! > > Can you test that? Tested! Works! Patch attached! > Otherwise we'll have to upload to experimental. As much as I would love to see it fixed in time for bookworm, my guess is that it is a bit late already... live well, vagrant
From 24865b8c2cda67a39774415e540dfc24ad243458 Mon Sep 17 00:00:00 2001 From: Vagrant Cascadian <vagr...@reproducible-builds.org> Date: Mon, 29 May 2023 15:28:36 -0700 Subject: [PATCH] debian/rules: Use UTC timezone when calling unshar. (Closes: #1035704) Without this, the touch calls in debian/datumgrids*.shar result in timezone-specific differences in various .gsb and .gtx files. https://reproducible-builds.org/docs/timezones/ --- debian/rules | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/debian/rules b/debian/rules index a778f4d..3a624ff 100755 --- a/debian/rules +++ b/debian/rules @@ -20,8 +20,8 @@ UPSTREAM_VERSION = $(shell echo $(DEB_VERSION_UPSTREAM) | sed -e 's/\+.*//') datumgrids: datumgrids-stamp datumgrids-stamp: - unshar -c -d $(CURDIR)/data $(CURDIR)/debian/datumgrids.shar - unshar -c -d $(CURDIR)/data $(CURDIR)/debian/datumgrids-ch.shar + TZ=UTC unshar -c -d $(CURDIR)/data $(CURDIR)/debian/datumgrids.shar + TZ=UTC unshar -c -d $(CURDIR)/data $(CURDIR)/debian/datumgrids-ch.shar touch $@ %: -- 2.39.2
signature.asc
Description: PGP signature
