Skip to content
Snippets Groups Projects
Commit 76fef53b authored by Jérôme Charaoui's avatar Jérôme Charaoui
Browse files

Integrate contributed fix for reproducible build

parent 70420b3a
No related branches found
No related tags found
No related merge requests found
......@@ -5,6 +5,16 @@ backupninja (UNRELEASED) unstable; urgency=medium
-- Micah Anderson <micah@riseup.net> Sat, 02 Jan 2021 15:49:50 -0400
backupninja (1.1.0-2.1) unstable; urgency=medium
* Non-maintainer upload.
* Add debian/patches/unbreak-AC_PATH_PROG-bash.patch
* Pass BASH,SED,MKTEMP to configure specifying correct paths
- fixes reproducible build on merged-usr vs non-merged system
(Closes: #915222)
-- Andreas Henriksson <andreas@fatal.se> Sat, 01 Dec 2018 21:39:53 +0100
backupninja (1.1.0-2) unstable; urgency=medium
* Fix FTBFS (Closes: #903168)
......
unbreak-AC_PATH_PROG-bash.patch
From: Andreas Henriksson <andreas@fatal.se>
Subject: unbreak AC_PATH_PROG bash
Being able to set the variable name in the environment before
running configure is a documented feature of AC_PATH_PROG.
Explicitly unsetting the variable ofcourse breaks that feature.
If someone thinks BASH is not a good variable name because it
might be used for something else already, then either sanitize
your build environment or use a different variable name!
The hypothetical case in the comment isn't relevant in our build
environment, so unbreak things here by commenting out the unset....
--- backupninja-1.1.0.orig/configure.ac
+++ backupninja-1.1.0/configure.ac
@@ -11,7 +11,7 @@ AM_INIT_AUTOMAKE([foreign])
# BASH may already be set in the shell, if the admin then changes the
# the /bin/sh symlink to a non-bash shell, all hell will break lose.
-unset BASH
+#unset BASH
AC_PATH_PROGS(BASH, bash, "no", [$PATH:/bin:/usr/bin:/usr/sbin])
if test x$BASH = "xno"; then
AC_MSG_ERROR([bash is required])
......@@ -9,6 +9,8 @@ TMP = $(CURDIR)/debian/$(PACKAGE)
override_dh_auto_configure:
dh_auto_configure -- \
MKTEMP=/bin/mktemp BASH=/bin/bash SED=/bin/sed \
AWK=/usr/bin/awk STAT=/usr/bin/stat \
--libdir=\$${prefix}/lib \
--libexecdir=\$${prefix}/lib
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment