Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
backupninja
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Custom issue tracker
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Deploy
Releases
Model registry
Monitor
Incidents
Service Desk
Analyze
Value stream analytics
Contributor analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Liberate
backupninja
Commits
76fef53b
Commit
76fef53b
authored
4 years ago
by
Jérôme Charaoui
Browse files
Options
Downloads
Patches
Plain Diff
Integrate contributed fix for reproducible build
parent
70420b3a
No related branches found
Branches containing commit
No related tags found
No related merge requests found
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
debian/changelog
+10
-0
10 additions, 0 deletions
debian/changelog
debian/patches/series
+1
-0
1 addition, 0 deletions
debian/patches/series
debian/patches/unbreak-AC_PATH_PROG-bash.patch
+25
-0
25 additions, 0 deletions
debian/patches/unbreak-AC_PATH_PROG-bash.patch
debian/rules
+2
-0
2 additions, 0 deletions
debian/rules
with
38 additions
and
0 deletions
debian/changelog
+
10
−
0
View file @
76fef53b
...
...
@@ -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)
...
...
This diff is collapsed.
Click to expand it.
debian/patches/series
0 → 100644
+
1
−
0
View file @
76fef53b
unbreak-AC_PATH_PROG-bash.patch
This diff is collapsed.
Click to expand it.
debian/patches/unbreak-AC_PATH_PROG-bash.patch
0 → 100644
+
25
−
0
View file @
76fef53b
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])
This diff is collapsed.
Click to expand it.
debian/rules
+
2
−
0
View file @
76fef53b
...
...
@@ -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
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment