On 2023-12-06, Vagrant Cascadian wrote:
> I would like to submit an NMU in the near future to apply the two
> patches submitted for dustmite to fix reproducibility issues, which are
> both essentially one-line patches:
>
> #1020878: dustmite: reproducible-builds: build path embedded in
> /usr/bin/dustmite
>
> debian/rules:
>
> +EXTRA_DFLAGS += -ffile-prefix-map=$(CURDIR)=.
>
> #1020879: dustmite: reproducible-builds: timezone/locale dependent date in
> /usr/bin/dustmite
>
> dustmite.d:
>
> - stdout.writeln("DustMite build ", __DATE__, " (", source, "),
> built with ", __VENDOR__, " ", __VERSION__);
> + stdout.writeln("DustMite build (", source, "), built with ",
> __VENDOR__, " ", __VERSION__);
I have uploaded an NMU to DELAYED/10 using dgit, with the following
changes:
diff -Nru dustmite-0.0.430/debian/changelog dustmite-0.0.430/debian/changelog
--- dustmite-0.0.430/debian/changelog 2022-08-03 16:05:44.000000000 -0700
+++ dustmite-0.0.430/debian/changelog 2023-12-19 16:10:14.000000000 -0800
@@ -1,3 +1,13 @@
+dustmite (0.0.430-2.1) unstable; urgency=medium
+
+ * Non-maintainer upload.
+ * debian/rules: Add -ffile-prefix-map in EXTRA_DFLAGS to avoid embedding
+ build paths. (Closes: #1020878)
+ * dustmite.d: Avoid embedding timezone and locale-specific build date in
+ the binary. (Closes: #1020879)
+
+ -- Vagrant Cascadian <vagr...@reproducible-builds.org> Tue, 19 Dec 2023
16:10:14 -0800
+
dustmite (0.0.430-2) unstable; urgency=medium
* Add workaround for DMD frontend bug that has hit GDC as well
diff -Nru
dustmite-0.0.430/debian/patches/dustmite.d-avoid-embedding-timezone-and-.patch
dustmite-0.0.430/debian/patches/dustmite.d-avoid-embedding-timezone-and-.patch
---
dustmite-0.0.430/debian/patches/dustmite.d-avoid-embedding-timezone-and-.patch
1969-12-31 16:00:00.000000000 -0800
+++
dustmite-0.0.430/debian/patches/dustmite.d-avoid-embedding-timezone-and-.patch
2023-12-19 16:10:14.000000000 -0800
@@ -0,0 +1,24 @@
+From: Vagrant Cascadian <vagr...@reproducible-builds.org>
+Date: Tue, 27 Sep 2022 21:05:55 +0000
+X-Dgit-Generated: 0.0.430-2.1 4eff64636ff1acdf1b211ae89af3b2cf07ff4df0
+Subject: dustmite.d: Avoid embedding timezone and locale-specific build date in
+
+the binary. (Closes: #1020879)
+
+https://reproducible-builds.org/docs/timestamps/
+
+---
+
+diff --git a/dustmite.d b/dustmite.d
+index 3177cbe..918f49e 100644
+--- a/dustmite.d
++++ b/dustmite.d
+@@ -209,7 +209,7 @@ int main(string[] args)
+ enum source = import("source");
+ else
+ enum source = "upstream";
+- stdout.writeln("DustMite build ", __DATE__, " (", source, "),
built with ", __VENDOR__, " ", __VERSION__);
++ stdout.writeln("DustMite build (", source, "), built with ",
__VENDOR__, " ", __VERSION__);
+ if (args.length == 1)
+ return 0;
+ }
diff -Nru dustmite-0.0.430/debian/patches/series
dustmite-0.0.430/debian/patches/series
--- dustmite-0.0.430/debian/patches/series 1969-12-31 16:00:00.000000000
-0800
+++ dustmite-0.0.430/debian/patches/series 2023-12-19 16:10:14.000000000
-0800
@@ -0,0 +1 @@
+dustmite.d-avoid-embedding-timezone-and-.patch
diff -Nru dustmite-0.0.430/debian/rules dustmite-0.0.430/debian/rules
--- dustmite-0.0.430/debian/rules 2022-08-03 15:53:24.000000000 -0700
+++ dustmite-0.0.430/debian/rules 2023-12-19 16:10:14.000000000 -0800
@@ -8,6 +8,7 @@
# workaround for DMD frontend bug
# first found via LDC: https://github.com/ldc-developers/ldc/issues/4000
EXTRA_DFLAGS += -fall-instantiations
+EXTRA_DFLAGS += -ffile-prefix-map=$(CURDIR)=.
override_dh_auto_build:
gdc -odustmite \
signature.asc
Description: PGP signature
