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

Bug#1021461: marked as done (icon: reproducible-builds: buildid differences in /usr/bin/icon*)

Your message dated Mon, 03 Jun 2024 06:06:01 +0000
with message-id <E1sE0pV-006ILB-MZ@fasolo.debian.org>
and subject line Bug#1021461: fixed in icon 9.4.3-8
has caused the Debian Bug report #1021461,
regarding icon: reproducible-builds: buildid differences in /usr/bin/icon*
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.)


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

The buildid varies when built from a different path for /usr/bin/icont
and /usr/bin/iconx:

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

The attached patch to debian/rules fixes this by adding
-ffile-prefix-map to CFLAGS, and adjusting a call to sed to handle "/"
in the expression.

According to my local tests, with this patch applied, icon should build
reproducibly on tests.reproducible-builds.org!

Thanks for maintaining icon!

live well,
  vagrant

From 0235dc52092db96208f3e0c051a10b0dbccf127d Mon Sep 17 00:00:00 2001
From: Vagrant Cascadian <vagrant@reproducible-builds.org>
Date: Sat, 8 Oct 2022 23:12:15 +0000
Subject: [PATCH] debian/rules: Add -ffile-prefix-map to CFLAGS to avoid
 embedded build paths. Adjust call to sed to handle "/" in the expression.

While the build path doesn't directly show up in the binaries, the
buildid may differs dependent on the build path.
---
 debian/rules | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/debian/rules b/debian/rules
index 006ceb1..e5377bd 100755
--- a/debian/rules
+++ b/debian/rules
@@ -30,9 +30,12 @@ endif
 
 CFLAGS = -Wall -g $(CFLAGS_OPT)
 
+# Avoid embedding build paths for reproducible builds
+CFLAGS += -ffile-prefix-map=$(CURDIR)=.
+
 configure:
 	$(MAKE) X-Configure name=$(system)
-	sed "s/CFLAGS = .*/CFLAGS = $(CFLAGS)/" Makedefs > Makedefs.tmp
+	sed "s%CFLAGS = .*%CFLAGS = $(CFLAGS)%" Makedefs > Makedefs.tmp
 	echo "ASFLAGS = -Wa,--noexecstack" >> Makedefs.tmp
 	mv Makedefs.tmp Makedefs
 	touch $@
-- 
2.37.2

Attachment: signature.asc
Description: PGP signature


--- End Message ---
--- Begin Message --- 
Source: icon
Source-Version: 9.4.3-8
Done: Petter Reinholdtsen <pere@debian.org>

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

Debian distribution maintenance software
pp.
Petter Reinholdtsen <pere@debian.org> (supplier of updated icon 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: SHA256

Format: 1.8
Date: Mon, 03 Jun 2024 07:50:58 +0200
Source: icon
Architecture: source
Version: 9.4.3-8
Distribution: unstable
Urgency: medium
Maintainer: Debian QA Group <packages@qa.debian.org>
Changed-By: Petter Reinholdtsen <pere@debian.org>
Closes: 1021461
Changes:
 icon (9.4.3-8) unstable; urgency=medium
 .
   * QA upload.
 .
   [ Vagrant Cascadian ]
   * debian/rules: Add -ffile-prefix-map to CFLAGS to avoid embedded
     build paths. Adjust call to sed to handle "/" in the expression
     (Closes: #1021461).
 .
   [ Petter Reinholdtsen ]
   * Added d/gbp.conf to describe branch layout.
   * Updated vcs in d/control to Salsa.
   * Updated d/gbp.conf to enforce the use of pristine-tar.
   * Updated Standards-Version from 3.6.2 to 4.7.0.
   * Use wrap-and-sort -at for debian control files
   * Trim trailing whitespace.
   * Added Homepage to d/control.
   * Added d/watch to track upstream from github.
Checksums-Sha1:
 230323973ca7d6e5021a9baa8d73490ec7e55bec 1879 icon_9.4.3-8.dsc
 21749765e73837d381358ba0cae9329d28d6f24c 9228 icon_9.4.3-8.debian.tar.xz
 4f32a18473fac9377bf0cd10d10432bed02ec7f6 5661 icon_9.4.3-8_source.buildinfo
Checksums-Sha256:
 453f6b2ffb5fb5e7c4884a831859cd585ef9de51e7fa6fad119b007c42998547 1879 icon_9.4.3-8.dsc
 c578fceb116d97d8956fb1eca3f21b08271bcf43c4ea91520fd102adffda46dc 9228 icon_9.4.3-8.debian.tar.xz
 a1e969a2621380f23803c67d0ebb02d70185e54af8d998072119de2ec1408d92 5661 icon_9.4.3-8_source.buildinfo
Files:
 f3d5ee3255167599ba0eb878e5ec2b60 1879 devel optional icon_9.4.3-8.dsc
 7cd1181f85c92f30f3a424b296123af5 9228 devel optional icon_9.4.3-8.debian.tar.xz
 939e6513388e88eb036287aa7d537ed8 5661 devel optional icon_9.4.3-8_source.buildinfo

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

iQIzBAEBCAAdFiEERqLf4owIeylOb9kkgSgKoIe6+w4FAmZdWicACgkQgSgKoIe6
+w4IDQ//ex6ttPcr/i3nIZtP/k650oEsFeKILWJzk0v5bbySZxZmptsX2n2XS81S
ifAZg8+w+ZxA09PdAcjSPofxWPe6q3UnlFA0VgqchYMsqkO2dz4HHsFPToVQ6zr7
lzFNI+4IP8ntxsA8XtbLfNXuWK8BUOKTDYtwR3TRAgceUAOn5+8L+Scu+TtD5PHE
EgfPerW9FboBP0sRwazMaBzPHYwQv6BENRJa0FXcR97Jpr30vWpxLe243wIzBf95
X1i7mjTYsZLBH5WuQ/lwThZQf+Rm3ltZ0/QzAy3KkrEf/ntmKK3DN4DFiR/IdjU5
fXB/72Y0jjYXZF303HypbOHFLWIRIa/UxdChxx5d8AIV41JXBoL731lyxFT48t3R
MQVNXsTNeWdJiwG3CQVa6+fb/vhu29CpJoyfjHSZJ8i8SATQSxFNr7uSzunExuZ3
e8tUM8bSy4z73gyGzBbUF1zixUSAH2FSpcB1AlpAIqX8LNLVznhU5kmejs9dh2mn
NSxnoAmCini6ou+H7Cw69jUuk+k56IS+pyIy6ErpKJCpQPpup4z8BvD30cEilO/Q
VU+fFbnddgllH7cG4jiW3J9daUIPFbiAUUa/n53Epwsa21H/zx7y8xzZLe+Zl3JK
Oa1On9ZtBdt/qrNr0enGyEq1mk/dpqDIHy9A/jkr54VKXDqOqEY=
=HISq
-----END PGP SIGNATURE-----

Attachment: pgp3nPG1hNmcK.pgp
Description: PGP signature


--- End Message ---
Reply to: