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

Bug#1021470: marked as done (xsok: reproducible-builds: build path embedded in /usr/games/xsok)

Your message dated Wed, 01 May 2024 08:47:00 +0200
with message-id <sa61q6mdo63.fsf@hjemme.reinholdtsen.name>
and subject line Accepted xsok 1.02-20 (source) into unstable
has caused the Debian Bug report #1021470,
regarding xsok: reproducible-builds: build path embedded in /usr/games/xsok
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.)


-- 
1021470: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=1021470
Debian Bug Tracking System
Contact owner@bugs.debian.org with problems
--- Begin Message --- 
Source: xsok
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/games/xsok:

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

  /build/1st/xsok-1.02/src/Xaw-main.c:273
  vs.
  /build/2/xsok-1.02/2nd/src/Xaw-main.c:273

The attached patch to debian/rules fixes this by passing to make the
default CFLAGS using the upstream CCOPTIONS variable.

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

Thanks for maintaining xsok!

live well,
  vagrant

From 61246f44398cd2537268920502a906aa99f8233c Mon Sep 17 00:00:00 2001
From: Vagrant Cascadian <vagrant@reproducible-builds.org>
Date: Sun, 9 Oct 2022 01:21:33 +0000
Subject: [PATCH] debian/rules: Pass default CFLAGS via CCOPTIONS variable.

---
 debian/rules | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/debian/rules b/debian/rules
index 216e53d..fc9561e 100755
--- a/debian/rules
+++ b/debian/rules
@@ -15,7 +15,7 @@ build-indep: build
 build: build-stamp
 build-stamp:
 	dh_testdir
-	$(MAKE) $(OPTIMIZE) \
+	$(MAKE) CCOPTIONS="$(shell dpkg-buildflags --get CFLAGS)" $(OPTIMIZE) \
 	  LOCAL_LIBRARIES='-lXpm -lXaw -lXt -lX11' \
 	  XSOKLIBDIR=/usr/share/games/xsok \
 	  XSOKSAVEDIR=/var/games/xsok
-- 
2.30.2

Attachment: signature.asc
Description: PGP signature


--- End Message ---
--- Begin Message --- 
Version: 1.02-20

As far as I can tell, the latest changes to the package build system
made the build reproducible.  I suspect it was the switching to level 13
with default compiler flags.

-------------------- Start of forwarded message --------------------
From: Debian FTP Masters <ftpmaster@ftp-master.debian.org>
To: debian-devel-changes@lists.debian.org
Subject: Accepted xsok 1.02-20 (source) into unstable
Date: Sun, 28 Apr 2024 07:44:58 +0000


-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA256

Format: 1.8
Date: Sun, 28 Apr 2024 09:20:58 +0200
Source: xsok
Architecture: source
Version: 1.02-20
Distribution: unstable
Urgency: medium
Maintainer: Debian QA Group <packages@qa.debian.org>
Changed-By: Petter Reinholdtsen <pere@debian.org>
Closes: 1056146
Changes:
 xsok (1.02-20) unstable; urgency=medium
 .
   * QA upload.
 .
   [ Matheus Faria ]
   * remove unnecessary root:games permission
   * Switch to compat level 11.
   * add watch file
 .
   [ 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 4.2.1 to 4.7.0.
   * Use wrap-and-sort -at for debian control files.
   * Moved to debhelper compat level 13.
   * Added simple clean target in d/rules for rebuildability.
   * Convert d/copyright to machine readable format, including author
     statement on cyberbox (Closes: #1056146).
Checksums-Sha1:
 99007f68042cfe04141772ddd2cc81d41674ec08 1846 xsok_1.02-20.dsc
 3aaa0d08fe393d8a1591bf2b974374168848f8ad 19456 xsok_1.02-20.debian.tar.xz
 39c8d5388a5e22125a40122e771850274ca2f9a7 7251 xsok_1.02-20_source.buildinfo
Checksums-Sha256:
 815e35739f4ed0817bb2df13f06a04feb6beb130fdb72b52807363e5c739cc03 1846 xsok_1.02-20.dsc
 78cc38362798277feacad32a75f74823e95f4539eb625cfeb6b75122cee97b07 19456 xsok_1.02-20.debian.tar.xz
 95f0371e775a099f3274b5a373edcb728c39e2e0a6997de582163a4c8e942d2d 7251 xsok_1.02-20_source.buildinfo
Files:
 7fd2eb60d063a93a831f9eddcc5b101d 1846 games optional xsok_1.02-20.dsc
 cfe132fa5b20311055c2e6c7f8379316 19456 games optional xsok_1.02-20.debian.tar.xz
 b2df02a4360bfc5e63a3d8fe180a5e88 7251 games optional xsok_1.02-20_source.buildinfo

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

iQIzBAEBCAAdFiEERqLf4owIeylOb9kkgSgKoIe6+w4FAmYt+ToACgkQgSgKoIe6
+w5CjRAAg9j+VxtO6986ROI7JIGnmhfkZm/v+Um9Q5msS/BhXFbnHwDP5tF286+z
dV3FcK7TdQF++Gf0+ZD4lBFOtVLTZbQvIqLXSLid6WH7wpgE8c5C4O7qND+p8Gx2
FcYIlSVvYriGCBYEgTs27aEK+6zu3s6WFu9Yu0ur2mkVkjQy/7NPHgK99ZNxCR6r
Zw02k4P9tF6scvpUxyecfuM+xqV57R9rT3bYRAzIXBycjcps6RPYSatC31BouyWu
Be5K0o3aWqiKvfCEWYcYl0iH+ZaEVJJDS1YyIx9Z2XbITqfVuhj83bcwlor/5eoZ
Bi+7d2cRqQ7+6FeVy0xwKMRjUf/5qlSGEeGieEmxqb+ICWxHHoeFTXdH63ocozcF
zaDxKANuXF5AjnF1U8ymrJNoHzNUqdHkkN2Fi5L9l+hZtQGjt4EoX0XIotX098tV
BtxANf+UBL9o04EwQeWpAKRykZMeazzDYvcD+pCjHGMMsJfsBlp+AA53R61H58fq
J/6dvIRAGIwnXFAXYyWz+3EllFaIGjQyUVDshny0CbNG9YbJ6R8RvEqQ7UUO940S
8U7EK1Uprn/2g6Clkmx3MXWmGo0BoLiJDc/2bPh9Iye+ydhFEnHTt1SexrnMsvdQ
65Lsa/+oyIiQBqdpw3lw0dVU7CPiXV49dNEwNorZBp6grQMFeZU=
=WDM0
-----END PGP SIGNATURE-----

Attachment: pgpIlltEG9oD0.pgp
Description: PGP signature

-------------------- End of forwarded message --------------------

--- End Message ---
Reply to: