[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

Bug#1011104: marked as done (convlit: reproducible-builds: embedded build paths in /usr/bin/clit)

Your message dated Mon, 16 May 2022 22:34:24 +0000
with message-id <E1nqjIG-000IFj-V5@fasolo.debian.org>
and subject line Bug#1011104: fixed in convlit 1.8-4
has caused the Debian Bug report #1011104,
regarding convlit: reproducible-builds: embedded build paths in /usr/bin/clit
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 owner@bugs.debian.org
immediately.)


-- 
1011104: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=1011104
Debian Bug Tracking System
Contact owner@bugs.debian.org with problems
--- Begin Message --- 
Source: convlit
Severity: normal
Tags: patch
User: reproducible-builds@lists.alioth.debian.org
Usertags: buildpath
X-Debbugs-Cc: reproducible-bugs@lists.alioth.debian.org

The build path is embedded in /usr/bin/clit:

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

  /build/1st/convlit-1.8/clit18/clit.c:109
  vs.
  /build/2/convlit-1.8/2nd/clit18/clit.c:109

The first patch fixes this by passing -ffile-prefix-map to CFLAGS in
debian/rules, which avoids embedding the build paths in the binaries.

The second patch fixes this by completing the transition to the dh build
system, which includes -ffile-prefix-map in CFLAGS by default.


With these patches applied, convlit should build reproducibly on
tests.reproducible-builds.org!


live well,
  vagrant

From 3aaf27ae4627bcc32dd6e7c877f2e16891808f20 Mon Sep 17 00:00:00 2001
From: Vagrant Cascadian <vagrant@reproducible-builds.org>
Date: Mon, 16 May 2022 21:31:09 +0000
Subject: [PATCH 1/2] debian/rules: Pass -ffile-prefix-map in CFLAGS to avoid
 embedding build paths.

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

diff --git a/debian/rules b/debian/rules
index 60c65ac..d18f93e 100755
--- a/debian/rules
+++ b/debian/rules
@@ -17,6 +17,10 @@ ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
 else
     CFLAGS += -O2
 endif
+
+# Avoid embedding the build path for reproducible builds
+CFLAGS += -ffile-prefix-map=$(CURDIR)=.
+
 export CFLAGS
 
 
-- 
2.35.1


From 55cac9ca7525b81f670c5ee7df8b6145370aa8cd Mon Sep 17 00:00:00 2001
From: Vagrant Cascadian <vagrant@reproducible-builds.org>
Date: Mon, 16 May 2022 21:36:05 +0000
Subject: [PATCH 2/2] debian/rules: Finish conversion to dh.

---
 debian/rules | 61 +++++++---------------------------------------------
 1 file changed, 8 insertions(+), 53 deletions(-)

diff --git a/debian/rules b/debian/rules
index d18f93e..40ffb83 100755
--- a/debian/rules
+++ b/debian/rules
@@ -11,59 +11,14 @@ export DEB_BUILD_MAINT_OPTIONS = hardening=+all
 %:
 	dh $@
 
-CFLAGS := -Wall -g
-ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
-    CFLAGS += -O0
-else
-    CFLAGS += -O2
-endif
+override_dh_auto_build:
+	dh_auto_build --sourcedir=$(CURDIR)/lib
+	dh_auto_build --sourcedir=$(CURDIR)/clit18
 
-# Avoid embedding the build path for reproducible builds
-CFLAGS += -ffile-prefix-map=$(CURDIR)=.
+override_dh_auto_clean:
+	dh_auto_clean --sourcedir=$(CURDIR)/clit18
+	dh_auto_clean --sourcedir=$(CURDIR)/lib
+	dh_auto_clean
 
-export CFLAGS
-
-
-build: build-stamp
-build-stamp:
-	dh_testdir
-	$(MAKE) -C $(CURDIR)/lib
-	$(MAKE) -C $(CURDIR)/clit18
-	touch $@
-
-clean:
-	dh_testdir
-	dh_testroot
-	rm -f build-stamp
-	$(MAKE) -C $(CURDIR)/clit18  clean
-	$(MAKE) -C $(CURDIR)/lib     clean
-	dh_clean
-
-install: build
-	dh_testdir
-	dh_testroot
-	dh_prep
-	dh_install
-
-binary-indep:
-# do nothing
-
-binary-arch: build install
-	dh_testdir
-	dh_testroot
-	dh_installchangelogs
-	dh_installdocs
-	dh_installexamples
+override_dh_installman:
 	dh_installman debian/clit.1
-	dh_link
-	dh_strip
-	dh_compress
-	dh_fixperms
-	dh_installdeb
-	dh_shlibdeps
-	dh_gencontrol
-	dh_md5sums
-	dh_builddeb
-
-binary: binary-indep binary-arch
-.PHONY: build clean binary-indep binary-arch binary install
-- 
2.35.1

Attachment: signature.asc
Description: PGP signature


--- End Message ---
--- Begin Message --- 
Source: convlit
Source-Version: 1.8-4
Done: Vagrant Cascadian <vagrant@reproducible-builds.org>

We believe that the bug you reported is fixed in the latest version of
convlit, 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 1011104@bugs.debian.org,
and the maintainer will reopen the bug report if appropriate.

Debian distribution maintenance software
pp.
Vagrant Cascadian <vagrant@reproducible-builds.org> (supplier of updated convlit 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 ftpmaster@ftp-master.debian.org)


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

Format: 1.8
Date: Mon, 16 May 2022 15:11:57 -0700
Source: convlit
Architecture: source
Version: 1.8-4
Distribution: unstable
Urgency: medium
Maintainer: Debian QA Group <packages@qa.debian.org>
Changed-By: Vagrant Cascadian <vagrant@reproducible-builds.org>
Closes: 901987 1011104
Changes:
 convlit (1.8-4) unstable; urgency=medium
 .
   * QA upload.
 .
   [ Vagrant Cascadian ]
   * debian/rules: Finish conversion to dh. (Closes: #901987, #1011104)
   * debian/control: Update to Standards-Version 4.6.1.
 .
   [ Helmut Grohne ]
   * clit18/Makefile: Make one plain gcc call substitutable.
     (Closes: #901987)
Checksums-Sha1:
 c152c7e4ed9ef4dd3bc1cea9ff6bd4affc7220b0 1268 convlit_1.8-4.dsc
 7390df4154ff4a80239144a913521a19d8816ba0 6088 convlit_1.8-4.debian.tar.xz
Checksums-Sha256:
 5df326221e2a95a43182dd63cc008c563cfeaa9a9a6e4b56307493ead52cf2c7 1268 convlit_1.8-4.dsc
 7163894385737b22c0b722a324863e80c0a79a9d6ceb89f9171572e123de354d 6088 convlit_1.8-4.debian.tar.xz
Files:
 bea0f7e314e280ecdeee72d9e58a2f00 1268 utils optional convlit_1.8-4.dsc
 cfffb9ab2e480b3699fcba6b8c72ae00 6088 utils optional convlit_1.8-4.debian.tar.xz

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

iJYEARYKAD4WIQRlgHNhO/zFx+LkXUXcUY/If5cWqgUCYoLOKCAcdmFncmFudEBy
ZXByb2R1Y2libGUtYnVpbGRzLm9yZwAKCRDcUY/If5cWqpETAQDnYTMMYSl4Q856
5C1Vya54vXxhawFRQ6HH1Lmw1fE1pQEArIzr+xJ9cyk5ENzPpc6e92BjF44NsnUT
KwQYMVVJ9g8=
=YB3M
-----END PGP SIGNATURE-----

--- End Message ---
Reply to: