summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDaniel Baumann <daniel.baumann@progress-linux.org>2018-05-23 10:47:43 +0000
committerDaniel Baumann <daniel.baumann@progress-linux.org>2018-05-23 10:47:43 +0000
commitcf4fc022d8334aa289faf2c06c865327fb64ab37 (patch)
tree005c340148a74c17ed8b640925a36eac15c442db
parentReleasing progress-linux version 4.4.18-1.1~dschinn1. (diff)
downloadbash-cf4fc022d8334aa289faf2c06c865327fb64ab37.zip
bash-cf4fc022d8334aa289faf2c06c865327fb64ab37.tar.xz
Merging debian version 4.4.18-2.
Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
-rw-r--r--debian/changelog10
-rw-r--r--debian/patches/bash44-019.diff43
-rw-r--r--debian/patches/series1
-rwxr-xr-xdebian/rules6
4 files changed, 57 insertions, 3 deletions
diff --git a/debian/changelog b/debian/changelog
index 200a84e..99f0ebd 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,13 @@
+bash (4.4.18-2) unstable; urgency=medium
+
+ * Revert the changes from the last upload.
+ * Configure the normal build --without-bash-malloc as well.
+ See http://lists.nongnu.org/archive/html/qemu-devel/2018-03/msg04700.html
+ for the qemu fix. Closes: #865599. LP: #1751011.
+ * Apply upstream patch 019.
+
+ -- Matthias Klose <doko@debian.org> Wed, 04 Apr 2018 20:04:48 +0200
+
bash (4.4.18-1.1~dschinn1) dschinn-backports; urgency=high
* Uploading to dschinn-backports, remaining changes:
diff --git a/debian/patches/bash44-019.diff b/debian/patches/bash44-019.diff
new file mode 100644
index 0000000..996310f
--- /dev/null
+++ b/debian/patches/bash44-019.diff
@@ -0,0 +1,43 @@
+ BASH PATCH REPORT
+ =================
+
+Bash-Release: 4.4
+Patch-ID: bash44-019
+
+Bug-Reported-by: Kieran Grant <kieran.thehacker.grant@gmail.com>
+Bug-Reference-ID: <ec9071ae-efb1-9e09-5d03-e905daf2835c@gmail.com>
+Bug-Reference-URL: http://lists.gnu.org/archive/html/bug-bash/2018-02/msg00002.html
+
+Bug-Description:
+
+With certain values for PS1, especially those that wrap onto three or more
+lines, readline will miscalculate the number of invisible characters,
+leading to crashes and core dumps.
+
+Index: b/lib/readline/display.c
+===================================================================
+--- a/lib/readline/display.c
++++ b/lib/readline/display.c
+@@ -771,7 +771,9 @@ rl_redisplay ()
+ appear in the first and last lines of the prompt */
+ wadjust = (newlines == 0)
+ ? prompt_invis_chars_first_line
+- : ((newlines == prompt_lines_estimate) ? wrap_offset : prompt_invis_chars_first_line);
++ : ((newlines == prompt_lines_estimate)
++ ? (wrap_offset - prompt_invis_chars_first_line)
++ : 0);
+
+ /* fix from Darin Johnson <darin@acuson.com> for prompt string with
+ invisible characters that is longer than the screen width. The
+Index: b/patchlevel.h
+===================================================================
+--- a/patchlevel.h
++++ b/patchlevel.h
+@@ -25,6 +25,6 @@
+ regexp `^#define[ ]*PATCHLEVEL', since that's what support/mkversion.sh
+ looks for to find the patch level (for the sccs version string). */
+
+-#define PATCHLEVEL 18
++#define PATCHLEVEL 19
+
+ #endif /* _PATCHLEVEL_H_ */
diff --git a/debian/patches/series b/debian/patches/series
index 47d66d6..ee570e7 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,4 +1,5 @@
# bash44-001.diff
+bash44-019.diff
bashbug-editor.diff
deb-bash-config.diff
deb-examples.diff
diff --git a/debian/rules b/debian/rules
index b0b40d4..1904bd5 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 -no-pie" dpkg-buildflags
+dpkg_buildflags = DEB_CFLAGS_MAINT_APPEND="-Wall" dpkg-buildflags
CFLAGS := $(shell $(dpkg_buildflags) --get CFLAGS)
CPPFLAGS := $(shell $(dpkg_buildflags) --get CPPFLAGS)
LDFLAGS := $(shell $(dpkg_buildflags) --get LDFLAGS)
@@ -73,7 +73,8 @@ conf_args = \
--enable-largefile \
--prefix=/usr \
--infodir=/usr/share/info \
- --mandir=/usr/share/man
+ --mandir=/usr/share/man \
+ --without-bash-malloc
ifeq ($(with_installed_rl),yes)
conf_args += --with-installed-readline
endif
@@ -85,7 +86,6 @@ endif
static_conf_args := $(conf_args) \
--enable-static-link \
- --without-bash-malloc \
#build: bash-build static-build preinst-build check
build: before-build bash-build static-build preinst-build check