Your message dated Fri, 30 Sep 2022 15:04:05 +0000
with message-id <[email protected]>
and subject line Bug#1020813: fixed in bible-kjv 4.38
has caused the Debian Bug report #1020813,
regarding bible-kjv: reproducible-builds: differing buildid in various binaries
to be marked as done.

This means that you claim that the problem has been dealt with.
If this is not the case it is now your responsibility to reopen the
Bug report if necessary, and/or fix the problem forthwith.

(NB: If you are a system administrator and have no idea what this
message is talking about, this may indicate a serious mail system
misconfiguration somewhere. Please contact [email protected]
immediately.)


-- 
1020813: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=1020813
Debian Bug Tracking System
Contact [email protected] with problems
--- Begin Message ---
Source: bible-kjv
Severity: normal
Tags: patch
User: [email protected]
Usertags: buildpath
X-Debbugs-Cc: [email protected]

The buildid differs in in various binaries when build a different build
path:

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

The attached patches fix this by patching the upstream Makefile to pass
-ffile-prefix-map and patching debian/rules to pass -ffile-prefix-map to
a CC call.

According to my local tests, with these patches applied bible-kjv should
build reproducibly on tests.reproducible-builds.org!

Thanks for maintaining bible-kjv!

live well,
  vagrant
From d5d57c09389cd4e5205c4f9aaa560dfc2ffbbebd Mon Sep 17 00:00:00 2001
From: Vagrant Cascadian <[email protected]>
Date: Tue, 27 Sep 2022 01:14:43 +0000
Subject: [PATCH 1/2] Makefile: Add -ffile-prefix-map to CFLAGS to avoid
 embedding build paths.

https://reproducible-builds.org/docs/build-path/
---
 Makefile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Makefile b/Makefile
index 3b998b8..6365c54 100644
--- a/Makefile
+++ b/Makefile
@@ -88,7 +88,7 @@ DESTMAN1      = $(DESTMAN)/man1
 
 # I use environment variables for these...
 #CFLAGS	      = -g
-CFLAGS	      = -Wall -Wformat -Werror -Wshadow -W -Wmissing-declarations -Wmissing-prototypes -Wstrict-prototypes -Wcast-align -Wcast-qual -Wbad-function-cast -Wpointer-arith -g2 -ggdb -DDESTLIB=\"$(DESTLIB)\"
+CFLAGS	      = -Wall -Wformat -Werror -Wshadow -W -Wmissing-declarations -Wmissing-prototypes -Wstrict-prototypes -Wcast-align -Wcast-qual -Wbad-function-cast -Wpointer-arith -g2 -ggdb -DDESTLIB=\"$(DESTLIB)\" -ffile-prefix-map=$(CURDIR)=.
 LDFLAGS       = 
 LDADD         = -lreadline
 
-- 
2.37.2

From 270b47fdbe2fd7ada4814438d4059fe383398cb7 Mon Sep 17 00:00:00 2001
From: Vagrant Cascadian <[email protected]>
Date: Tue, 27 Sep 2022 01:15:16 +0000
Subject: [PATCH 2/2] debian/rules: Add -ffile-prefix-map to CC call to avoid
 embedding build paths.

https://reproducible-builds.org/docs/build-path/
---
 debian/rules | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/debian/rules b/debian/rules
index 64fdebb..57e8174 100755
--- a/debian/rules
+++ b/debian/rules
@@ -23,7 +23,7 @@ build:
 	dpkg-architecture -a$(DEB_BUILD_ARCH) -f -c dh_auto_build --no-parallel -- bible-index.c bible.data bible.data.conc 'LD=$$(CC)'
 	rm -f *.o
 	dh_auto_build --no-parallel -- bible 'LD=$$(CC)'
-	cd debian && $(CC) -g -O2 -o randverse randverse.c
+	cd debian && $(CC) -g -O2 -ffile-prefix-map=$(CURDIR)=. -o randverse randverse.c
 	touch build
 
 build-arch: build
-- 
2.37.2

Attachment: signature.asc
Description: PGP signature


--- End Message ---
--- Begin Message ---
Source: bible-kjv
Source-Version: 4.38
Done: Matthew Vernon <[email protected]>

We believe that the bug you reported is fixed in the latest version of
bible-kjv, which is due to be installed in the Debian FTP archive.

A summary of the changes between this version and the previous one is
attached.

Thank you for reporting the bug, which will now be closed.  If you
have further comments please address them to [email protected],
and the maintainer will reopen the bug report if appropriate.

Debian distribution maintenance software
pp.
Matthew Vernon <[email protected]> (supplier of updated bible-kjv package)

(This message was generated automatically at their request; if you
believe that there is a problem with it please contact the archive
administrators by mailing [email protected])


-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA512

Format: 1.8
Date: Fri, 30 Sep 2022 15:22:50 +0100
Source: bible-kjv
Binary: bible-kjv bible-kjv-text
Architecture: source
Version: 4.38
Distribution: unstable
Urgency: medium
Maintainer: Matthew Vernon <[email protected]>
Changed-By: Matthew Vernon <[email protected]>
Description:
 bible-kjv  - King James Version of the Bible: user interface program.
 bible-kjv-text - King James Version of the Bible - text and concordance
Closes: 1020813
Changes:
 bible-kjv (4.38) unstable; urgency=medium
 .
   * Patches from Vagrant Cascadian to use -ffile-prefix-map to make build
     reproducible (Closes: #1020813)
Checksums-Sha1:
 3e85bbcbcad93ec1271e4f5ad0f99f14ce1280ef 1642 bible-kjv_4.38.dsc
 816495a277a987fa7f7e7e377c555b2cbedb23b1 1413504 bible-kjv_4.38.tar.gz
Checksums-Sha256:
 c58dc6fbf49b4c19cbea61b841b691d7c2e76c382d82495b513e60bb79f16e46 1642 
bible-kjv_4.38.dsc
 890b4d16fa2c0a9930fd4e6df22c6182b696ac0c1c47d12dc513227c62d8f249 1413504 
bible-kjv_4.38.tar.gz
Files:
 91af147e402710f8c8de45ac1146aa5b 1642 doc optional bible-kjv_4.38.dsc
 224be9734c9fc3f4f3871242aaabc089 1413504 doc optional bible-kjv_4.38.tar.gz

-----BEGIN PGP SIGNATURE-----

iQJHBAEBCgAxFiEEuk75yE35bTfYoeLUEvTSHI9qY8gFAmM2/SMTHG1hdHRoZXdA
ZGViaWFuLm9yZwAKCRAS9NIcj2pjyMe8D/4xi+zjtBt/tVtYYZ6TuKP6DwUaWwRs
9PRRXqBDe3kkCcdyFkzuCU2NKhUZ6qU722Ldz8/xPdNFUXmGtzk/nOi6Fy9MpwxR
htFaMaFUqC/QXzi8CuFjKjoWLhDQ/pdgJfCMa78pxW8K1XSp04ZiL5WdWKQzLZSU
sYoa3kNij1gdd9StklOJKodaG9tN2a98CcqhNWlDZEvDfD3r+gXUj5OoyKQscYn3
f27Td6MnH4NHi7OVCQ0KE5NkJYibxvo9gpzN1SXoUda+MXK0OMW0qisflBGQboro
bs17V3UjqxbigixNd4/Fv9BUGtGGA+fin7peki+5FIV5cFt9oKEDzCjkzQI1mRg3
lFy3lCOtknZY36C/l4R3seKnmPfzBjYg5aFVd+qsk59srrTBiBggrB+g6sVFFvTt
9WIc/h7fiSEKVjtecigddAw6gEMsjUDEnFEHUfkm/pi2X1yqobZBvCbsl75VUzRZ
gbZbv3SeZ2wxclkIGXqiiGzDD5Bl0+N2kBTbeZn2Pm0iIJbUjkM2+Nw7S2y6o4yH
pwDdrDcFUOPCxT5Pz4QwwdKIYEVbvpV9+hjiKOL42ut9JyyXzGCbZ66Nm640fM/B
NB8+161iPtlZKwtnhmMZ0QYyfBq5WKWiyvlO0QZHb8RzBJzA+cxDfISCyctCT2Zp
zKK2KhAccs2hmg==
=JuBN
-----END PGP SIGNATURE-----

--- End Message ---

Reply via email to