Debian Bug report logs - #991180
xaw3d: reproducible builds: Embeds build path in libXaw3d.so

Toggle useless messages

Message #5 received at submit@bugs.debian.org (full text, mbox, reply):

From: Vagrant Cascadian <vagrant@reproducible-builds.org>

To: submit@bugs.debian.org

Subject: xaw3d: reproducible builds: Embeds build path in libXaw3d.so

Date: Fri, 16 Jul 2021 07:51:29 -0700

[Message part 1 (text/plain, inline)]

Source: xaw3d
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 various places in libXaw3d.so.*:

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

  ./usr/lib/x86_64-linux-gnu/libXaw3d.so.6.1

  /build/1st/xaw3d-1.5+F/xc/lib/Xaw3d/AsciiSrc.c:263
  vs.
  /build/2/xaw3d-1.5+F/2nd/xc/lib/Xaw3d/AsciiSrc.c:263

The attached patch fixes this by passing -ffile-prefix-map and -I. to
CFLAGS in debian/rules to avoid embedding the build path.


Thanks for maintaining xaw3d!


live well,
  vagrant

[0001-debian-rules-Pass-CFLAGS-with-file-prefix-map-in-dh_.patch (text/x-diff, inline)]

From 5f84216e4f3fce385a5e27317f521aa89637c63f Mon Sep 17 00:00:00 2001
From: Vagrant Cascadian <vagrant@reproducible-builds.org>
Date: Fri, 16 Jul 2021 14:43:18 +0000
Subject: [PATCH] debian/rules: Pass CFLAGS with file-prefix-map in
 dh_auto_build.

Without file-prefix-map, the build path is embedded in the resulting
binaries. This converts it into a relative path. This also requires
passing "-I." to ensure the headers in the source are available under
a relative path.

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

diff --git a/debian/rules b/debian/rules
index f8f65f3..d88124b 100755
--- a/debian/rules
+++ b/debian/rules
@@ -13,7 +13,8 @@ override_dh_auto_build:
 	rm -rf $(SOURCE)/X11 && install -m755 -d $(SOURCE)/X11
 	cd $(SOURCE) && ln -sf ../ X11/Xaw3d && xmkmf
 	$(MAKE) -C $(SOURCE) \
-          EXTRA_DEFINES="-D_REENTRANT -DARROW_SCROLLBAR" SHLIBDEF="-D_REENTRANT -DARROW_SCROLLBAR"
+          EXTRA_DEFINES="-D_REENTRANT -DARROW_SCROLLBAR" SHLIBDEF="-D_REENTRANT -DARROW_SCROLLBAR" \
+          CFLAGS="-ffile-prefix-map=$(CURDIR)=. -I."
 
 override_dh_auto_clean:
 	rm -rf $(SOURCE)/X11 $(COMPAT) lib/Xaw3d/laygram.h
-- 
2.32.0

[signature.asc (application/pgp-signature, inline)]

Message #12 received at 991180@bugs.debian.org (full text, mbox, reply):

From: Vagrant Cascadian <vagrant@reproducible-builds.org>

To: 991180@bugs.debian.org, 986704@bugs.debian.org

Subject: NMU fixing reproducible builds and cross-building bugs

Date: Thu, 29 Dec 2022 10:38:16 -0800

[Message part 1 (text/plain, inline)]

Control: tags 991180 pending
Control: tags 986704 pending

I have uploaded an NMU to DELAYED/10 fixing reproducible builds and
cross-building issues, as well as some pending issues already merged in
git found by Debian Janitor.

Merge request also available:

  https://salsa.debian.org/debian/xaw3dg/-/merge_requests/3

Full debdiff follows (including changes already in git, in particular,
whitespace changes):

diff -Nru xaw3d-1.5+F/debian/changelog xaw3d-1.5+F/debian/changelog
--- xaw3d-1.5+F/debian/changelog	2021-01-07 10:57:42.000000000 -0800
+++ xaw3d-1.5+F/debian/changelog	2022-12-29 10:16:57.000000000 -0800
@@ -1,3 +1,20 @@
+xaw3d (1.5+F-1.1) unstable; urgency=medium
+
+  * Non-maintainer upload.
+
+  [ Debian Janitor ]
+  * Trim trailing whitespace.
+  * Update standards version to 4.6.1, no changes needed.
+
+  [ Vagrant Cascadian ]
+  * debian/rules: Pass CFLAGS with file-prefix-map in dh_auto_build.
+    (Closes: #991180)
+
+  [ Nilesh Patra ]
+  * Fix cross-building. (Closes: #986704)
+
+ -- Vagrant Cascadian <vagrant@debian.org>  Thu, 29 Dec 2022 10:16:57 -0800
+
 xaw3d (1.5+F-1) unstable; urgency=medium
 
   * Reassembled original tarball to cope with dquilt.
@@ -13,7 +30,7 @@
 
   * Non-maintainer upload.
   * debian/control: Drop explicit Pre-Depends on multiarch-support (Closes:
-    #870564). 
+    #870564).
 
  -- Aurelien Jarno <aurel32@debian.org>  Sat, 20 Jan 2018 14:50:00 +0100
 
@@ -42,7 +59,7 @@
   * Added patch XawIm.c to prevent gv segfaulting.
     (closes: #573474)
   * Added ${misc:Depends} to both binary packages to make lintian happy.
-  * Added xaw3dg.lintian-overrides to override the 
+  * Added xaw3dg.lintian-overrides to override the
     package-name-doesnt-match-sonames lintian warning.
   * Added debian/README.source.
 
@@ -50,8 +67,8 @@
 
 xaw3d (1.5+E-17) unstable; urgency=low
 
-  * Bumped replace to conflicts with pre -16 version. That's needed for 
-    moving of the .so link 
+  * Bumped replace to conflicts with pre -16 version. That's needed for
+    moving of the .so link
    (closes: #492302)
 
  -- Francesco Paolo Lovergine <frankie@debian.org>  Fri, 25 Jul 2008 09:47:14 +0200
@@ -99,7 +116,7 @@
   * Removed libxaw8-dev fake dependency, because it has been dropped in xorg
     roadmap.
   * Removed all X11 -dev dependencies in xaw3dg-dev, and the old
-    libc-dev|libc6-dev now superfluous dependency too. Packages now have to 
+    libc-dev|libc6-dev now superfluous dependency too. Packages now have to
     declare explicitly their own -dev build-deps.
     (closes: #241280)
 
@@ -107,7 +124,7 @@
 
 xaw3d (1.5+E-11) unstable; urgency=low
 
-  * Changed to xorg 7 conformancy in paths: 
+  * Changed to xorg 7 conformancy in paths:
   	/usr/X11R6/lib -> /usr/lib
         /usr/X11R6/include -> /usr/include
     (closes: #362074, #363578)
@@ -189,8 +206,8 @@
 
 xaw3d (1.5+E-1) unstable; urgency=low
 
-  * Ready for unstable. 
-    Changing release version for a smooth upgrading from experimental. 
+  * Ready for unstable.
+    Changing release version for a smooth upgrading from experimental.
     (closes: #117325,#196439,#144877)
 
  -- Francesco Paolo Lovergine <frankie@debian.org>  Tue, 19 Aug 2003 00:35:30 +0200
@@ -295,12 +312,12 @@
 xaw3d (1.5-15) unstable; urgency=low
 
   * Added -DARROW_SCROLLBAR in rules file for EXTRA_DEFINES.
-    The trick described in old scrollbars doc is no longer working due 
+    The trick described in old scrollbars doc is no longer working due
     to changes in rules file: EXTRA_DEFINES in lib/Xaw3d/Imakefile are ignored.
     That obsolete document has been removed.
     Emacs folks will be happy :)
 
-    This seems also closing an old bug report about scrolling in 
+    This seems also closing an old bug report about scrolling in
     emacs21 and xterm. Or hope so. I'll see if I could get some better
     patches to have a rock solid correction.
     (closes: #36736)
@@ -370,7 +387,7 @@
   * The xaw3dg preinst did return an error when the "medium" debconf
     note wasn't displayed. I added " || true" to fix this.
     (closes: #86599)
-  * debian/shlibs: Generate a dependency on xaw3dg (>= 1.5-6). 
+  * debian/shlibs: Generate a dependency on xaw3dg (>= 1.5-6).
 
  -- Adrian Bunk <bunk@fs.tum.de>  Tue, 20 Feb 2001 14:21:24 +0100
 
@@ -486,7 +503,7 @@
 
   * Non-maintainer upload
   * Handle ld.so.conf properly in postrm as well
-  
+
  -- Wichert Akkerman <wakkerma@debian.org>  Tue, 21 Dec 1999 23:54:45 +0100
 
 xaw3d (1.3-6.6) unstable; urgency=low
@@ -554,13 +571,13 @@
   * now uses libc6
   * included a shlibs file
   * added xaw-wrappers file for axe
-  
+
  -- joost witteveen <joost@rulcmc.leidenuniv.nl>  Sun,  3 Aug 1997 20:31:18 +0200
 
 xaw3d (1.3-5) unstable; urgency=low
 
   * Compiled with -D_REENTRANT
-  * uses new, unreleased ld.so-1.8.9, so that the soname now can be 
+  * uses new, unreleased ld.so-1.8.9, so that the soname now can be
     libxaw3d, making everything somewhat easier.
 
  -- joost witteveen <joost@rulcmc.leidenuniv.nl>  Sun, 9 Feb 1997 10:56:39 +0100
@@ -584,7 +601,7 @@
   * Changed /sbin/ldconfig to ldconfig in postinst, prerm.
   * Included changelog.Debian
   * gzipped /usr/doc/xaw3d/*
-  
+
  -- joost witteveen <joost@rulcmc.leidenuniv.nl>  Fri, 27 Dec 1996 19:12:04 +0100
 
 xaw3d (1.3-1) unstable; urgency=low
diff -Nru xaw3d-1.5+F/debian/control xaw3d-1.5+F/debian/control
--- xaw3d-1.5+F/debian/control	2021-01-07 10:57:42.000000000 -0800
+++ xaw3d-1.5+F/debian/control	2022-12-29 09:53:07.000000000 -0800
@@ -12,7 +12,7 @@
  ,x11proto-xext-dev
  ,bison
  ,flex (>= 2.5.31-16)
-Standards-Version: 4.5.1
+Standards-Version: 4.6.1
 Vcs-Browser: https://salsa.debian.org/debian/xaw3dg
 Vcs-Git: https://salsa.debian.org/debian/xaw3dg.git
 
diff -Nru xaw3d-1.5+F/debian/rules xaw3d-1.5+F/debian/rules
--- xaw3d-1.5+F/debian/rules	2021-01-07 10:57:42.000000000 -0800
+++ xaw3d-1.5+F/debian/rules	2022-12-29 09:54:46.000000000 -0800
@@ -12,8 +12,9 @@
 override_dh_auto_build:
 	rm -rf $(SOURCE)/X11 && install -m755 -d $(SOURCE)/X11
 	cd $(SOURCE) && ln -sf ../ X11/Xaw3d && xmkmf
-	$(MAKE) -C $(SOURCE) \
-          EXTRA_DEFINES="-D_REENTRANT -DARROW_SCROLLBAR" SHLIBDEF="-D_REENTRANT -DARROW_SCROLLBAR"
+	dh_auto_build -- -C $(SOURCE) \
+          EXTRA_DEFINES="-D_REENTRANT -DARROW_SCROLLBAR" SHLIBDEF="-D_REENTRANT -DARROW_SCROLLBAR" \
+          CFLAGS="-ffile-prefix-map=$(CURDIR)=. -I."
 
 override_dh_auto_clean:
 	rm -rf $(SOURCE)/X11 $(COMPAT) lib/Xaw3d/laygram.h
@@ -22,7 +23,7 @@
 	dh_clean `find . -name Makefile`
 
 override_dh_auto_install:
-	$(MAKE) -C $(SOURCE) install \
+	dh_auto_install -- -C $(SOURCE) install \
         DESTDIR=$(CURDIR)/debian/tmp INCDIR=/usr/include \
 		SHLIBDIR=/usr/lib/$(DEB_HOST_MULTIARCH) \
 		USRLIBDIR=/usr/lib/$(DEB_HOST_MULTIARCH)
@@ -31,4 +32,4 @@
 	dh_installexamples $(SOURCE)/app-defaults
 
 override_dh_installdocs:
-	dh_installdocs $(SOURCE)/README.XAW3D 
+	dh_installdocs $(SOURCE)/README.XAW3D



live well,
  vagrant

[signature.asc (application/pgp-signature, inline)]

Message #17 received at 991180-close@bugs.debian.org (full text, mbox, reply):

From: Debian FTP Masters <ftpmaster@ftp-master.debian.org>

To: 991180-close@bugs.debian.org

Subject: Bug#991180: fixed in xaw3d 1.5+F-1.1

Date: Sun, 08 Jan 2023 19:13:53 +0000

Source: xaw3d
Source-Version: 1.5+F-1.1
Done: Vagrant Cascadian <vagrant@debian.org>

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

Debian distribution maintenance software
pp.
Vagrant Cascadian <vagrant@debian.org> (supplier of updated xaw3d 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: Thu, 29 Dec 2022 10:16:57 -0800
Source: xaw3d
Architecture: source
Version: 1.5+F-1.1
Distribution: unstable
Urgency: medium
Maintainer: Francesco Paolo Lovergine <frankie@debian.org>
Changed-By: Vagrant Cascadian <vagrant@debian.org>
Closes: 986704 991180
Changes:
 xaw3d (1.5+F-1.1) unstable; urgency=medium
 .
   * Non-maintainer upload.
 .
   [ Debian Janitor ]
   * Trim trailing whitespace.
   * Update standards version to 4.6.1, no changes needed.
 .
   [ Vagrant Cascadian ]
   * debian/rules: Pass CFLAGS with file-prefix-map in dh_auto_build.
     (Closes: #991180)
 .
   [ Nilesh Patra ]
   * Fix cross-building. (Closes: #986704)
Checksums-Sha1:
 4f7dc7d3e3e3fe2f6a034e5b721765b56e2cb519 1385 xaw3d_1.5+F-1.1.dsc
 4bdb1c24a604956ca0e4eaf83929dd3aace1e801 16180 xaw3d_1.5+F-1.1.debian.tar.xz
 55045c9e38fe961a6ed15dc0a9139267b082250a 6769 xaw3d_1.5+F-1.1_amd64.buildinfo
Checksums-Sha256:
 ccb81f9bb194e0c46483b3b6f79f1678d96f65f1894c390ea2dff46737b89384 1385 xaw3d_1.5+F-1.1.dsc
 0671c6e0bf1124a3307e7034042523b5a303a661869d9dca50d8883b6f939b71 16180 xaw3d_1.5+F-1.1.debian.tar.xz
 b0cf9c744cbdd3105230ae19917991c0265767775fa04da20bea21901cc55085 6769 xaw3d_1.5+F-1.1_amd64.buildinfo
Files:
 d524c894c12eb067da048e3c9263e192 1385 x11 optional xaw3d_1.5+F-1.1.dsc
 0d1e8cd3f217c6cd31111fec8762e50a 16180 x11 optional xaw3d_1.5+F-1.1.debian.tar.xz
 b5430337fdd4dc58938f070c8d8da7b8 6769 x11 optional xaw3d_1.5+F-1.1_amd64.buildinfo

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

iIkEARYKADEWIQRlgHNhO/zFx+LkXUXcUY/If5cWqgUCY63bNxMcdmFncmFudEBk
ZWJpYW4ub3JnAAoJENxRj8h/lxaqsWYA/3+UtaI3GwJmBVOhGZMSlLu0N+nImm++
jbmpPzoaQIlyAQDMFWWjen+/mVEk8g2L86uTlNPj5x2uG7IP4Gwp3zLHCg==
=aGbb
-----END PGP SIGNATURE-----

Send a report that this bug log contains spam.