Source: gnunet
Severity: important
Tags: patch
User: reproducible-bui...@lists.alioth.debian.org
Usertags: usrmerge
X-Debbugs-Cc: reproducible-b...@lists.alioth.debian.org

The path to the "ifconfig" binary differs depending on if it is built in an
environment with or without usrmerge:

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

  /usr/include/gnunet/gnunet_config.h

  #define·IFCONFIG·"/sbin/ifconfig"
  vs.
  #define·IFCONFIG·"/usr/sbin/ifconfig"

The attached patch fixes this in debian/rules by passing the
IFCONFIG_BINARY variable to dh_auto_configure, using the most compatible
path.

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

Thanks for maintaining gnunet!

live well,
  vagrant
From 846543aeec468ef2ebb82209ee064f39446ff5e8 Mon Sep 17 00:00:00 2001
From: Vagrant Cascadian <vagr...@reproducible-builds.org>
Date: Thu, 17 Nov 2022 04:19:14 +0000
Subject: [PATCH 1/2] debian/rules: Pass IFCONFIG_BINARY to ensure consistent
 path.

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

diff --git a/debian/rules b/debian/rules
index 89dbecc..1e70915 100755
--- a/debian/rules
+++ b/debian/rules
@@ -14,7 +14,7 @@ execute_after_dh_auto_clean:
 	rm -rf src/integration-tests/*.py
 
 override_dh_auto_configure:
-	dh_auto_configure -- --disable-rpath --with-microhttpd=yes $(shell dpkg-buildflags --export=configure) VAR_IFCONFIG_BINARY=/sbin/ifconfig
+	dh_auto_configure -- --disable-rpath --with-microhttpd=yes $(shell dpkg-buildflags --export=configure) VAR_IFCONFIG_BINARY=/sbin/ifconfig IFCONFIG_BINARY=/sbin/ifconfig
 
 override_dh_auto_test:
 	# Disabling test suite, incomplete
-- 
2.30.2

Attachment: signature.asc
Description: PGP signature

Reply via email to