summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDaniel Baumann <daniel.baumann@progress-linux.org>2018-05-23 10:43:21 +0000
committerDaniel Baumann <daniel.baumann@progress-linux.org>2018-05-23 10:43:21 +0000
commit44b65ef822b659ca2c8cd8df33487f71db3df260 (patch)
tree37d568a4e9402866cd6bd789cb750d4526a6143e
parentReleasing progress-linux version 4.4.18-1~dschinn1. (diff)
downloadbash-44b65ef822b659ca2c8cd8df33487f71db3df260.zip
bash-44b65ef822b659ca2c8cd8df33487f71db3df260.tar.xz
Merging debian version 4.4.18-1.1.
Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
-rw-r--r--debian/changelog9
-rwxr-xr-xdebian/rules2
2 files changed, 10 insertions, 1 deletions
diff --git a/debian/changelog b/debian/changelog
index ab4c2b1..4034c3f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,12 @@
+bash (4.4.18-1.1) unstable; urgency=high
+
+ * Non-maintainer upload.
+ * Build again with -no-pie as dropping it broke bash when run under
+ qemu-user (with the same symptoms as #842037). Closes: #889869
+ Re-opens: #865599
+
+ -- Raphaƫl Hertzog <hertzog@debian.org> Tue, 13 Feb 2018 11:17:39 +0100
+
bash (4.4.18-1~dschinn1) dschinn-backports; urgency=medium
* Initial upload to dschinn-backports.
diff --git a/debian/rules b/debian/rules
index f0f10df..b0b40d4 100755
--- a/debian/rules
+++ b/debian/rules
@@ -39,7 +39,7 @@ ifneq (,$(findstring nostrip,$(DEB_BUILD_OPTIONS)))
endif
-dpkg_buildflags = DEB_CFLAGS_MAINT_APPEND="-Wall" dpkg-buildflags
+dpkg_buildflags = DEB_CFLAGS_MAINT_APPEND="-Wall -no-pie" dpkg-buildflags
CFLAGS := $(shell $(dpkg_buildflags) --get CFLAGS)
CPPFLAGS := $(shell $(dpkg_buildflags) --get CPPFLAGS)
LDFLAGS := $(shell $(dpkg_buildflags) --get LDFLAGS)