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

Bug#1024125: marked as done (ucspi-proxy: reproducible-builds: build path, timestamps and umask issues)

Your message dated Sat, 02 Dec 2023 02:37:13 +0000
with message-id <E1r9FsX-000ESv-Os@fasolo.debian.org>
and subject line Bug#1024125: fixed in ucspi-proxy 0.99-4
has caused the Debian Bug report #1024125,
regarding ucspi-proxy: reproducible-builds: build path, timestamps and umask issues
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.)


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

The buildids of various binaries differred when built in different build
paths, timestamps were embedded in manpages, and the mode of several
directories was dependent on the umask of the build environment:

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

  /usr/share/man/man1/ucspi-proxy-http-xlate.1.gz

  gzip·compressed·data,·was·"ucspi-proxy-http-xlate.1",·last·modified:·Sun·Nov·13·05:42:22·2022,·max·compression,·from·Unix
  vs.
  gzip·compressed·data,·was·"ucspi-proxy-http-xlate.1",·last·modified:·Sat·Dec·16·12:06:16·2023,·max·compression,·from·Unix

  drwxr-xr-x···0·root·········(0)·root·········(0)········0·2022-11-12·10:57:15.000000·./usr/bin/
  vs.
  drwxrwxr-x···0·root·········(0)·root·········(0)········0·2022-11-12·10:57:15.000000·./usr/bin/

The attached patches to debian/rules fix this by adding the
-ffile-prefix-map argument to CFLAGS which avoids embedding build paths,
passing -n to gzip to avoid embedding timestamps in the gzip headers of
created manpages, and setting a consistent mode on several directories
created by "make install".

Preferably, many of these issues would likely be fixed by converting to
dh and a recent debhelper-compat version...

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


Thanks for maintaining ucspi-proxy!


live well,
  vagrant

From ecb57971f4d5fc958cc8afa31db8932fb2fac62e Mon Sep 17 00:00:00 2001
From: Vagrant Cascadian <vagrant@reproducible-builds.org>
Date: Tue, 15 Nov 2022 02:08:38 +0000
Subject: [PATCH 1/3] debian/rules: Add -ffile-prefix-map to CFLAGS to avoid
 embedding build path.

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 a6a8a21..747c054 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,7 +1,7 @@
 #!/usr/bin/make -f
 
 CC =gcc
-CFLAGS =-W -Wall -Wshadow -O2 -g
+CFLAGS =-W -Wall -Wshadow -O2 -g -ffile-prefix-map=$(CURDIR)=.
 STRIP =strip
 BGINCS =/usr/include/bglibs
 
-- 
2.38.1


From 13c5e3b2c89431f80934d3ce4a35d2b18432bb8b Mon Sep 17 00:00:00 2001
From: Vagrant Cascadian <vagrant@reproducible-builds.org>
Date: Tue, 15 Nov 2022 02:09:51 +0000
Subject: [PATCH 2/3] debian/rules: Pass "-n" argument to gzip to avoid
 embedding timestamp in manpages.

https://tests.reproducible-builds.org/debian/issues/timestamps_in_gzip_headers_issue.html
---
 debian/rules | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/debian/rules b/debian/rules
index 747c054..f57275f 100755
--- a/debian/rules
+++ b/debian/rules
@@ -48,7 +48,7 @@ install: deb-checkdir deb-checkuid build-stamp
 	rm -rf '$(DIR)'
 	$(MAKE) install install_prefix='$(DIR)'
 	$(STRIP) -R .comment -R .note '$(DIR)'/usr/bin/ucspi-proxy*
-	gzip -9 '$(DIR)'/usr/share/man/man1/*.1
+	gzip -9n '$(DIR)'/usr/share/man/man1/*.1
 	test -r changelog || ln -s ChangeLog changelog
 
 binary-indep:
-- 
2.38.1


From 1f3f8a61324623784e9ada73786b14872c770510 Mon Sep 17 00:00:00 2001
From: Vagrant Cascadian <vagrant@reproducible-builds.org>
Date: Tue, 15 Nov 2022 02:12:55 +0000
Subject: [PATCH 3/3] debian/rules: Set permissions on several directories
 before building package, to avoid differences due to build environment umask.

https://tests.reproducible-builds.org/debian/issues/different_due_to_umask_issue.html
---
 debian/rules | 1 +
 1 file changed, 1 insertion(+)

diff --git a/debian/rules b/debian/rules
index f57275f..e4dd446 100755
--- a/debian/rules
+++ b/debian/rules
@@ -49,6 +49,7 @@ install: deb-checkdir deb-checkuid build-stamp
 	$(MAKE) install install_prefix='$(DIR)'
 	$(STRIP) -R .comment -R .note '$(DIR)'/usr/bin/ucspi-proxy*
 	gzip -9n '$(DIR)'/usr/share/man/man1/*.1
+	chmod u=rwx,og=rx '$(DIR)' '$(DIR)/usr' '$(DIR)/usr/bin' '$(DIR)/usr/share' '$(DIR)/usr/share/man'
 	test -r changelog || ln -s ChangeLog changelog
 
 binary-indep:
-- 
2.38.1

Attachment: signature.asc
Description: PGP signature


--- End Message ---
--- Begin Message --- 
Source: ucspi-proxy
Source-Version: 0.99-4
Done: Vagrant Cascadian <vagrant@reproducible-builds.org>

We believe that the bug you reported is fixed in the latest version of
ucspi-proxy, 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 1024125@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 ucspi-proxy 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: Fri, 01 Dec 2023 17:56:23 -0800
Source: ucspi-proxy
Architecture: source
Version: 0.99-4
Distribution: unstable
Urgency: medium
Maintainer: Debian QA Group <packages@qa.debian.org>
Changed-By: Vagrant Cascadian <vagrant@reproducible-builds.org>
Closes: 1024125
Changes:
 ucspi-proxy (0.99-4) unstable; urgency=medium
 .
   * QA Upload
   * debian/rules: Add -ffile-prefix-map to CFLAGS to avoid embedding build
     path. (Closes: #1024125)
   * debian/rules: Pass "-n" argument to gzip to avoid embedding timestamp
     in manpages. (Closes: #1024125)
   * debian/rules: Set permissions on several directories before building
     package, to avoid differences due to build environment umask.
     (Closes: #1024125)
Checksums-Sha1:
 3441a4de1a95b73e5b4650968c7bd7ad1a40205b 1235 ucspi-proxy_0.99-4.dsc
 bbf5b4a43c64dd41b5f3e32729680fb3bf888816 4728 ucspi-proxy_0.99-4.debian.tar.xz
Checksums-Sha256:
 791932ddf0c98efcb322764d0f23e919b86a35594992482bc800d4b83f8d3ef0 1235 ucspi-proxy_0.99-4.dsc
 aa9c4ad01003becc8203d9547e64cf9e8d3613e5fe2cda1b0fb68579bac44619 4728 ucspi-proxy_0.99-4.debian.tar.xz
Files:
 9d5bc1fdc33e2d8e5eb402fe573b0ffd 1235 net optional ucspi-proxy_0.99-4.dsc
 ad50b5aabba30a456a4eda5638f8fc86 4728 net optional ucspi-proxy_0.99-4.debian.tar.xz

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

iJYEARYKAD4WIQRlgHNhO/zFx+LkXUXcUY/If5cWqgUCZWqQAiAcdmFncmFudEBy
ZXByb2R1Y2libGUtYnVpbGRzLm9yZwAKCRDcUY/If5cWqs8sAP9xh686cuGJ0PzN
DMAkgHcdosLwkGFbhnC5JOTedeYR4gD/cX7ngzGPqtjuC3cN54l4bMfIBqx3DHyS
b1mXvLeq/wk=
=GjFh
-----END PGP SIGNATURE-----

--- End Message ---
Reply to: