Source: openfortivpn
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 "resolvconf" 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/openfortivpn.html

  /usr/bin/openfortivpn
  
  /sbin/resolvconf
  vs.
  /usr/sbin/resolvconf

The attached patch fixes this in debian/rules by passing the
--with-resolvconf argument to dh_auto_configure, using the most
compatible path.

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

Thanks for maintaining openfortivpn!

live well,
  vagrant
From 14e67565a16f7674f8181c72e80f191df0d91dbe Mon Sep 17 00:00:00 2001
From: Vagrant Cascadian <vagr...@reproducible-builds.org>
Date: Thu, 17 Nov 2022 03:22:53 +0000
Subject: [PATCH] debian/rules: Pass --with-resolvconf to dh_auto_configure to
 ensure consistent path regardless of the build environment.

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

diff --git a/debian/rules b/debian/rules
index 0279b75..dea45c8 100755
--- a/debian/rules
+++ b/debian/rules
@@ -13,7 +13,7 @@ export DEB_CFLAGS_MAINT_APPEND  = -Wno-unused-function
 override_dh_auto_configure:
 	aclocal
 	automake --add-missing
-	dh_auto_configure -- --with-pppd=/usr/sbin/pppd
+	dh_auto_configure -- --with-pppd=/usr/sbin/pppd --with-resolvconf=/sbin/resolvconf
 
 override_dh_installdocs:
 	dh_installdocs README.md
-- 
2.30.2

Attachment: signature.asc
Description: PGP signature

Reply via email to