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

Bug#1014789: marked as done (rdiff-backup-fs: reproducible-builds: embedded build paths in /usr/bin/rdiff-backup-fs)

Your message dated Tue, 12 Jul 2022 00:33:53 +0000
with message-id <E1oB3qb-000Coj-Mc@fasolo.debian.org>
and subject line Bug#1014789: fixed in rdiff-backup-fs 1.0.0-6
has caused the Debian Bug report #1014789,
regarding rdiff-backup-fs: reproducible-builds: embedded build paths in /usr/bin/rdiff-backup-fs
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.)


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

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

  /build/1st/rdiff-backup-fs-1.0.0/rdiff-backup-fs.c:43
  vs.
  /build/2/rdiff-backup-fs-1.0.0/2nd/rdiff-backup-fs.c:43

The attached patches fix this by updating to using debhelper compat 13
which sets various compiler flags by default, patching configure.ac to
take EXTRA_CFLAGS, and passing EXTRA_CFLAGS to configure in
debian/rules.


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


live well,
  vagrant

From cc979a98912da5099859c5337d2c7de5bb7aac9d Mon Sep 17 00:00:00 2001
From: Vagrant Cascadian <vagrant@reproducible-builds.org>
Date: Mon, 11 Jul 2022 23:13:08 +0000
Subject: [PATCH 1/3] Update to debhelper compat 13.

---
 debian/compat  | 1 -
 debian/control | 2 +-
 debian/rules   | 2 +-
 3 files changed, 2 insertions(+), 3 deletions(-)
 delete mode 100644 debian/compat

diff --git a/debian/compat b/debian/compat
deleted file mode 100644
index 7f8f011..0000000
--- a/debian/compat
+++ /dev/null
@@ -1 +0,0 @@
-7
diff --git a/debian/control b/debian/control
index c6d57ea..b4fa00f 100644
--- a/debian/control
+++ b/debian/control
@@ -2,7 +2,7 @@ Source: rdiff-backup-fs
 Section: utils
 Priority: extra
 Maintainer: Debian QA Group <packages@qa.debian.org>
-Build-Depends: debhelper (>= 7.0.50~), autotools-dev, libz-dev, libfuse-dev, pkg-config, dh-autoreconf
+Build-Depends: debhelper-compat (= 13), libz-dev, libfuse-dev, pkg-config
 Standards-Version: 3.9.2
 Homepage: http://code.google.com/p/rdiff-backup-fs/
 
diff --git a/debian/rules b/debian/rules
index 21dfdfb..955dd78 100755
--- a/debian/rules
+++ b/debian/rules
@@ -10,4 +10,4 @@
 #export DH_VERBOSE=1
 
 %:
-	dh --with autoreconf $@ 
+	dh $@
-- 
2.36.1


From 20475bdd718c6baca6bd832dc92ef37821bec195 Mon Sep 17 00:00:00 2001
From: Vagrant Cascadian <vagrant@reproducible-builds.org>
Date: Mon, 11 Jul 2022 23:13:49 +0000
Subject: [PATCH 2/3] configure.ac: Support passing EXTRA_CFLAGS when setting
 LIBS and CFLAGS variables.

---
 configure.ac | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/configure.ac b/configure.ac
index 7f7482a..ae26bde 100644
--- a/configure.ac
+++ b/configure.ac
@@ -46,8 +46,8 @@ AC_TYPE_SIZE_T
 dnl checking type of system to provide proper compile and linking flags
 
 case ${host} in
-    *-*-linux-*|*-*-k*bsd*-*)	AC_SUBST(CFLAGS, ["-Wall -g -O3 `pkg-config --cflags fuse`"])
-			AC_SUBST(LIBS, ["$LIBS `pkg-config --cflags --libs fuse` -lz"]);;
+    *-*-linux-*|*-*-k*bsd*-*)	AC_SUBST(CFLAGS, ["$EXTRA_CFLAGS -Wall -g -O3 `pkg-config --cflags fuse`"])
+			AC_SUBST(LIBS, ["$LIBS $EXTRA_CFLAGS `pkg-config --cflags --libs fuse` -lz"]);;
     *-*-bsd-*)		AC_SUBST(CFLAGS, ["-Wall -g -O3 `pkg-config --cflags fuse`"])
 			AC_SUBST(LIBS, ["$LIBS `pkg-config --cflags --libs fuse` -lz"]);;
     *-*-darwin*)	AC_SUBST(CFLAGS, ["-Wall -g -O3 `pkg-config --cflags fuse`"])
-- 
2.36.1


From 8f52af0fa9e957c8eff1797aaf57d8bb9233af47 Mon Sep 17 00:00:00 2001
From: Vagrant Cascadian <vagrant@reproducible-builds.org>
Date: Mon, 11 Jul 2022 23:15:45 +0000
Subject: [PATCH 3/3] debian/rules: Set EXTRA_CFLAGS in dh_auto_configure
 override.

This allows passing the default compiler flags, such as
-ffile-prefix-map which is used to avoid embedding the build path.
---
 debian/rules | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/debian/rules b/debian/rules
index 955dd78..608d0b6 100755
--- a/debian/rules
+++ b/debian/rules
@@ -11,3 +11,6 @@
 
 %:
 	dh $@
+
+override_dh_auto_configure:
+	EXTRA_CFLAGS="$(CFLAGS)" dh_auto_configure
-- 
2.36.1

Attachment: signature.asc
Description: PGP signature


--- End Message ---
--- Begin Message --- 
Source: rdiff-backup-fs
Source-Version: 1.0.0-6
Done: Vagrant Cascadian <vagrant@reproducible-builds.org>

We believe that the bug you reported is fixed in the latest version of
rdiff-backup-fs, 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 1014789@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 rdiff-backup-fs 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, 11 Jul 2022 17:05:20 -0700
Source: rdiff-backup-fs
Architecture: source
Version: 1.0.0-6
Distribution: unstable
Urgency: medium
Maintainer: Debian QA Group <packages@qa.debian.org>
Changed-By: Vagrant Cascadian <vagrant@reproducible-builds.org>
Closes: 1014789
Changes:
 rdiff-backup-fs (1.0.0-6) unstable; urgency=medium
 .
   * QA upload.
   * Update to debhelper compat 13.
   * debian/patches: configure.ac: Support passing EXTRA_CFLAGS when
     setting LIBS and CFLAGS variables.
   * debian/rules: Set EXTRA_CFLAGS in dh_auto_configure override.
     (Closes: #1014789)
   * debian/copyright: Update Format URL.
   * debian/control: Set Rules-Requires-Root to "no".
   * debian/control: Set priority to "optional".
Checksums-Sha1:
 3245d345c089e0b830e1a608ce9bb5355f9428d8 1387 rdiff-backup-fs_1.0.0-6.dsc
 1c5c0e77c037b21144c647d4fd8bb12ae953f511 4692 rdiff-backup-fs_1.0.0-6.debian.tar.xz
Checksums-Sha256:
 68346fbe7011b95bda251b7f98d455b7af4c39f403d4fc3efee7c24c200dedf6 1387 rdiff-backup-fs_1.0.0-6.dsc
 571c644221c39b7a6de5eec7511281d7f8b3862902b0d949acbdea8ca75598fc 4692 rdiff-backup-fs_1.0.0-6.debian.tar.xz
Files:
 c60aa4c742bfa48f8e37c0828b818c7d 1387 utils optional rdiff-backup-fs_1.0.0-6.dsc
 3b139683baa75694e5d46c7b7a5745a7 4692 utils optional rdiff-backup-fs_1.0.0-6.debian.tar.xz

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

iJYEARYKAD4WIQRlgHNhO/zFx+LkXUXcUY/If5cWqgUCYsy87yAcdmFncmFudEBy
ZXByb2R1Y2libGUtYnVpbGRzLm9yZwAKCRDcUY/If5cWqoW4AQC5KH7OFNu7ld6b
lS1lurEVrqvzlKOSfeZd54ruqCwJTQD/b/M0umyAcpACmj3/jwyaGV2bfI3vMni4
FBt6b8mMgAE=
=xtFU
-----END PGP SIGNATURE-----

--- End Message ---
Reply to: