Source: xnee
Severity: normal
Tags: patch
User: reproducible-bui...@lists.alioth.debian.org
Usertags: username timestamps
X-Debbugs-Cc: reproducible-b...@lists.alioth.debian.org

The username and build time is embedded in /usr/share/doc/xnee/xnee.ps.gz.

  
https://tests.reproducible-builds.org/debian/rb-pkg/unstable/amd64/diffoscope-results/xnee.html

  %DVIPSSource:··TeX·output·2021.10.08:0802
vs.
  %DVIPSSource:··TeX·output·2022.11.11:1638

  %%CreationDate:·Fri·Oct··8·08:02:16·2021
vs.
  %%CreationDate:·Fri·Nov·11·16:37:50·2022
  
  %%For:·pbuilder1
vs.
  %%For:·pbuilder2

The attached patches fix this in debian/rules by setting
FORCE_SOURCE_DATE=1 to fix the DVIPSSource timestamp, and manually
adjusting the CreationDate and For headers in the .ps file directly.

With these patches applied, xnee should be reproducible on
tests.reproducible-builds.org!


Thanks for maintaining xnee!


live well,
  vagrant
From 52f8dc5c3e4986fdb349fd1fca46b786e01f3814 Mon Sep 17 00:00:00 2001
From: Vagrant Cascadian <vagr...@reproducible-builds.org>
Date: Fri, 8 Oct 2021 23:41:00 +0000
Subject: [PATCH 1/2] debian/rules: Fix date im embedded xnee.ps.

Export FORCE_SOURCE_DATE=1 to get texlive to respect
SOURCE_DATE_EPOCH, which fixes the embedded timestamp in DVIPSSource
in xnee.ps.

Adjust the "CreationDate" header in xnee.ps to use the date from
debian/changelog instead of the current time.
---
 debian/rules | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/debian/rules b/debian/rules
index 0a30558..87800cc 100755
--- a/debian/rules
+++ b/debian/rules
@@ -10,8 +10,14 @@ DEB_CONFIGURE_EXTRA_FLAGS := --disable-gui --disable-gnome-applet \
 
 DEB_DH_STRIP_ARGS_libxnee0 = --dbgsym-migration="libxnee-dbg"
 
+# Ensure texlive respects SOURCE_DATE_EPOCH
+export FORCE_SOURCE_DATE=1
+
+CHANGELOG_DATE=$(shell dpkg-parsechangelog -Sdate)
+
 binary-install/xnee-doc::
 	sed -i s+$$(printf "\r")++g debian/xnee-doc/usr/share/info/xnee.info
-
+	# Fix embedded timestamp in .ps document
+	sed -i -e "s/%%CreationDate: .*/%%CreationDate: $(CHANGELOG_DATE)/g" debian/xnee-doc/usr/share/doc/xnee/xnee.ps
 clean::
 	rm -f examples/simple_bash.sh share/xnee.sh
-- 
2.30.2

From 2d3a9ea580a8dad7a7852255627e96aa9ebc6000 Mon Sep 17 00:00:00 2001
From: Vagrant Cascadian <vagr...@reproducible-builds.org>
Date: Sat, 9 Oct 2021 00:07:30 +0000
Subject: [PATCH 2/2] debian/rules: Fix embedded username in xnee.ps

Adjust the "For" header in xnee.ps to specify "debian-build" instead
of the username.
---
 debian/rules | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/debian/rules b/debian/rules
index 87800cc..cd23542 100755
--- a/debian/rules
+++ b/debian/rules
@@ -19,5 +19,8 @@ binary-install/xnee-doc::
 	sed -i s+$$(printf "\r")++g debian/xnee-doc/usr/share/info/xnee.info
 	# Fix embedded timestamp in .ps document
 	sed -i -e "s/%%CreationDate: .*/%%CreationDate: $(CHANGELOG_DATE)/g" debian/xnee-doc/usr/share/doc/xnee/xnee.ps
+	# Fix embedded username in .ps document
+	sed -i -e "s/%%For: .*/%%For: debian-build/g" debian/xnee-doc/usr/share/doc/xnee/xnee.ps
+
 clean::
 	rm -f examples/simple_bash.sh share/xnee.sh
-- 
2.30.2

Attachment: signature.asc
Description: PGP signature

Reply via email to