Source: mahimahi
Severity: normal
Tags: patch
User: [email protected]
Usertags: usrmerge
X-Debbugs-Cc: [email protected]

The paths to "iptables" and "ip" may vary when built on a usrmerge and
non-usrmerge system, and get embedded in /usr/bin/mm-link and possibly
other binaries:

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

It's a little hard to notice, but I caught these differences in mm-link:

  /sbin/ipH
  vs.
  /usr/sbiH


The attached patch fixes this by passing IPTABLES and IP to configure in
debian/rules. With this patch applied, it should build reproducibly in
our test infrastructure.


Thanks for maintaining mahimahi!


live well,
  vagrant
From 805c875889c81f89991d46f74f1b9a6e5ffb57a6 Mon Sep 17 00:00:00 2001
From: Vagrant Cascadian <[email protected]>
Date: Fri, 18 Dec 2020 20:00:13 +0000
Subject: [PATCH] debian/rules: Pass IPTABLES and IP to configure.

The paths to "iptables" and "ip" may be loated in /sbin and /bin or
/usr/sbin and /usr/bin if the system is configured as a usrmerge
system. Specify the the most compatible locations in /sbin and /bin.

https://tests.reproducible-builds.org/debian/issues/unstable/paths_vary_due_to_usrmerge_issue.html
---
 debian/rules | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/debian/rules b/debian/rules
index 15593d9..d165f59 100755
--- a/debian/rules
+++ b/debian/rules
@@ -14,6 +14,9 @@ DEB_HOST_MULTIARCH ?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH)
 %:
 	dh $@ --with autoreconf
 
+override_dh_auto_configure:
+	dh_auto_configure -- IPTABLES=/sbin/iptables IP=/bin/ip
+
 override_dh_fixperms-arch:
 	dh_fixperms
 	chmod 4755 debian/mahimahi/usr/bin/mm-delay
-- 
2.20.1

Attachment: signature.asc
Description: PGP signature

Reply via email to