sm-commit AT lists.ibiblio.org
Subject: Source Mage code commit list
List archive
[SM-Commit] GIT changes to master grimoire by Treeve Jelbert (89b71349b7c9e464b5b545d16d3455346407832f)
- From: Treeve Jelbert <scm AT sourcemage.org>
- To: sm-commit AT lists.ibiblio.org
- Subject: [SM-Commit] GIT changes to master grimoire by Treeve Jelbert (89b71349b7c9e464b5b545d16d3455346407832f)
- Date: Tue, 8 Mar 2016 19:29:48 +0000
GIT changes to master grimoire by Treeve Jelbert <treeve AT sourcemage.org>:
archive/pbzip2/DETAILS | 4 +-
archive/pbzip2/HISTORY | 3 +
crypto/npth/DETAILS | 2 -
crypto/npth/HISTORY | 3 +
disk/lvm/DETAILS | 2 -
disk/lvm/HISTORY | 4 ++
disk/lvm/PRE_BUILD | 3 -
disk/lvm/lvm-static-hotfix.patch | 21 -----------
graphics-libs/harfbuzz/DETAILS | 4 +-
graphics-libs/harfbuzz/HISTORY | 3 +
libs/readline/DETAILS | 1
libs/readline/HISTORY | 5 ++
libs/readline/PRE_BUILD | 3 +
libs/readline/patches/readline63-001 | 43 +++++++++++++++++++++++
libs/readline/patches/readline63-002 | 44 ++++++++++++++++++++++++
libs/readline/patches/readline63-003 | 47 ++++++++++++++++++++++++++
libs/readline/patches/readline63-004 | 45 +++++++++++++++++++++++++
libs/readline/patches/readline63-005 | 58 ++++++++++++++++++++++++++++++++
libs/readline/patches/readline63-006 | 63
+++++++++++++++++++++++++++++++++++
libs/readline/patches/readline63-007 | 47 ++++++++++++++++++++++++++
libs/readline/patches/readline63-008 | 47 ++++++++++++++++++++++++++
21 files changed, 421 insertions(+), 31 deletions(-)
New commits:
commit 89b71349b7c9e464b5b545d16d3455346407832f
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Treeve Jelbert <treeve AT sourcemage.org>
lvm: => 2.02.145
commit 1d9f784ae1fca0a003ff46cb599c81ae1f193c31
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Treeve Jelbert <treeve AT sourcemage.org>
pbzip2: => 1.1.13
commit 07acd6386f5dc67e172afb3c6c3f73f0e0b897b1
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Treeve Jelbert <treeve AT sourcemage.org>
npth: => 1.2
commit df2fbce32c9b3491391255c809aed14cf00b466e
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Treeve Jelbert <treeve AT sourcemage.org>
readline - upstream patches
commit beb96ef99967271d4c6f8cbdcddd5ff13f65b4cf
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Treeve Jelbert <treeve AT sourcemage.org>
harfbuzz: => 1.2.3
diff --git a/archive/pbzip2/DETAILS b/archive/pbzip2/DETAILS
index 885e57d..420de2c 100755
--- a/archive/pbzip2/DETAILS
+++ b/archive/pbzip2/DETAILS
@@ -1,6 +1,6 @@
SPELL=pbzip2
- VERSION=1.1.12
-
SOURCE_HASH=sha512:bb68e87867295b89ee6fb76a8b72834daebf0ca6c16b2f10bce67fe7386716a728acd28bf46a9732087202ca0cc774f02c741b0b58801184bb7550f6fd119cd6
+ VERSION=1.1.13
+
SOURCE_HASH=sha512:a150e476a85b2ae71c244561380f8f113072ef712173afaa0bdace5845d5f81a15b135258cb01376156b69a5085b02b7ab866cfab5713aa773b251b203c087b8
SOURCE="$SPELL-$VERSION.tar.gz"
SOURCE_URL[0]="https://launchpad.net/$SPELL/${VERSION%.*}/$VERSION/+download/$SOURCE";
SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
diff --git a/archive/pbzip2/HISTORY b/archive/pbzip2/HISTORY
index accfa43..ce0dbe2 100644
--- a/archive/pbzip2/HISTORY
+++ b/archive/pbzip2/HISTORY
@@ -1,3 +1,6 @@
+2016-03-08 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: version 1.1.13
+
2015-01-09 Ismael Luceno <ismael AT sourcemage.org>
* DETAILS: updated spell to 1.1.12
diff --git a/crypto/npth/DETAILS b/crypto/npth/DETAILS
index 61bd35a..13d61ed 100755
--- a/crypto/npth/DETAILS
+++ b/crypto/npth/DETAILS
@@ -1,5 +1,5 @@
SPELL=npth
- VERSION=1.1
+ VERSION=1.2
SOURCE=$SPELL-$VERSION.tar.bz2
SOURCE_URL[0]=ftp://ftp.gnupg.org/gcrypt/npth/$SOURCE
diff --git a/crypto/npth/HISTORY b/crypto/npth/HISTORY
index 54fffa0..ca60ff5 100644
--- a/crypto/npth/HISTORY
+++ b/crypto/npth/HISTORY
@@ -1,3 +1,6 @@
+2016-03-08 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: version 1,2
+
2014-11-08 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: version 1,1
diff --git a/disk/lvm/DETAILS b/disk/lvm/DETAILS
index ee5f118..b2483c0 100755
--- a/disk/lvm/DETAILS
+++ b/disk/lvm/DETAILS
@@ -1,5 +1,5 @@
SPELL=lvm
- VERSION=2.02.114
+ VERSION=2.02.145
SOURCE=LVM2.$VERSION.tgz
SOURCE2=$SOURCE.asc
SOURCE_DIRECTORY=$BUILD_DIRECTORY/LVM2.$VERSION
diff --git a/disk/lvm/HISTORY b/disk/lvm/HISTORY
index 9b7130a..4fb6a34 100644
--- a/disk/lvm/HISTORY
+++ b/disk/lvm/HISTORY
@@ -1,3 +1,7 @@
+2016-03-08 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: version 2.02.145
+ * lvm-static-hotfix.patch PRE_BUILD: deleted
+
2015-01-06 Ismael Luceno <ismael AT sourcemage.org>
* DETAILS: updated spell to 2.02.114
diff --git a/disk/lvm/PRE_BUILD b/disk/lvm/PRE_BUILD
deleted file mode 100755
index 92c0ce3..0000000
--- a/disk/lvm/PRE_BUILD
+++ /dev/null
@@ -1,3 +0,0 @@
-default_pre_build &&
-cd "$SOURCE_DIRECTORY" &&
-patch -p1 < "$SCRIPT_DIRECTORY/lvm-static-hotfix.patch"
diff --git a/disk/lvm/lvm-static-hotfix.patch
b/disk/lvm/lvm-static-hotfix.patch
deleted file mode 100644
index e586dbb..0000000
--- a/disk/lvm/lvm-static-hotfix.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-diff -ru LVM2.2.02.109.orig/tools/Makefile.in LVM2.2.02.109/tools/Makefile.in
---- LVM2.2.02.109.orig/tools/Makefile.in 2014-08-05 03:10:57.000000000
+0200
-+++ LVM2.2.02.109/tools/Makefile.in 2014-08-08 08:45:14.849098142 +0200
-@@ -128,7 +128,7 @@
-
- dmsetup.static: dmsetup.o $(interfacebuilddir)/libdevmapper.a
- $(CC) $(CFLAGS) $(LDFLAGS) -static -L$(interfacebuilddir) \
-- -o $@ dmsetup.o -ldevmapper $(STATIC_LIBS) $(LIBS)
-+ -o $@ dmsetup.o -ldevmapper $(STATIC_LIBS) $(LIBS) -lpthread
-
- all: device-mapper
-
-@@ -144,7 +144,7 @@
-
- lvm.static: $(OBJECTS) lvm-static.o $(top_builddir)/lib/liblvm-internal.a
$(interfacebuilddir)/libdevmapper.a
- $(CC) $(CFLAGS) $(LDFLAGS) -static -L$(interfacebuilddir) -o $@ \
-- $(OBJECTS) lvm-static.o $(LVMLIBS) $(STATIC_LIBS) $(LIBS)
-+ $(OBJECTS) lvm-static.o $(LVMLIBS) $(STATIC_LIBS) $(LIBS)
-luuid -lpthread
-
- liblvm2cmd.a: $(top_builddir)/lib/liblvm-internal.a $(OBJECTS) lvmcmdlib.o
lvm2cmd.o
- cat $(top_builddir)/lib/liblvm-internal.a > $@
diff --git a/graphics-libs/harfbuzz/DETAILS b/graphics-libs/harfbuzz/DETAILS
index e4f19c5..51f52be 100755
--- a/graphics-libs/harfbuzz/DETAILS
+++ b/graphics-libs/harfbuzz/DETAILS
@@ -9,8 +9,8 @@ SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-git"
SOURCE_IGNORE=volatile
FORCE_DOWNLOAD=on
else
- VERSION=1.1.3
-
SOURCE_HASH=sha512:e418a1543ec2a1e58e5d8d0ba9a40e8675eda13c94c664ff83ed6303c724f078cf1744883b454c46ec40157db8dc05e7f2cf5e52200601bb1e13827d8dfbaccf
+ VERSION=1.2.3
+
SOURCE_HASH=sha512:9df730dd07f726150252e6c1db1b9f49182492d9b0443388aa3bb102482749cb3299079dde8f83430e7947633ccf8d21bc41a95f02ba497bfd8195e702d3b031
SOURCE=$SPELL-$VERSION.tar.bz2
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
SOURCE_URL[0]=http://www.freedesktop.org/software/harfbuzz/release/$SOURCE
diff --git a/graphics-libs/harfbuzz/HISTORY b/graphics-libs/harfbuzz/HISTORY
index 2422dde..aac4fa9 100644
--- a/graphics-libs/harfbuzz/HISTORY
+++ b/graphics-libs/harfbuzz/HISTORY
@@ -1,3 +1,6 @@
+2016-03-09 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: version 1.2.3
+
2016-02-25 Remko van der Vossen <wich AT sourcemage.org>
* SUB_DEPENDS, PRE_SUB_DEPENDS, REPAIR^all^PRE_SUB_DEPENDS:
added GLIB2 subdependency
diff --git a/libs/readline/DETAILS b/libs/readline/DETAILS
index 4f23564..63f0f09 100755
--- a/libs/readline/DETAILS
+++ b/libs/readline/DETAILS
@@ -1,5 +1,6 @@
SPELL=readline
VERSION=6.3
+ PATCHLEVEL=8
SOURCE=$SPELL-$VERSION.tar.gz
SOURCE2=$SOURCE.sig
SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
diff --git a/libs/readline/HISTORY b/libs/readline/HISTORY
index 314819e..a26c91c 100644
--- a/libs/readline/HISTORY
+++ b/libs/readline/HISTORY
@@ -1,3 +1,8 @@
+2016-03-08 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: PATCHLEVEL=8
+ * patches/*: added upstream patches
+ * PRE_BUILD: apply patches
+
2015-01-30 Vlad Glagolev <stealth AT sourcemage.org>
* FINAL: added, INSTALL is not the right place for ldconfig, move it
here
diff --git a/libs/readline/PRE_BUILD b/libs/readline/PRE_BUILD
index 0317ede..0a5867a 100755
--- a/libs/readline/PRE_BUILD
+++ b/libs/readline/PRE_BUILD
@@ -1,5 +1,6 @@
default_pre_build &&
cd "$SOURCE_DIRECTORY" &&
-
+# apply upstream patches
+cat $SPELL_DIRECTORY/patches/* |patch &&
# Dynamically link against termcap or ncurses
sed -i "s/SHLIB_LIBS =/SHLIB_LIBS = @TERMCAP_LIB@/" shlib/Makefile.in
diff --git a/libs/readline/patches/readline63-001
b/libs/readline/patches/readline63-001
new file mode 100644
index 0000000..bae6a2f
--- /dev/null
+++ b/libs/readline/patches/readline63-001
@@ -0,0 +1,43 @@
+ READLINE PATCH REPORT
+ =====================
+
+Readline-Release: 6.3
+Patch-ID: readline63-001
+
+Bug-Reported-by: Daan van Rossum <daan AT flash.uchicago.edu>
+Bug-Reference-ID: <20140307072523.GA14250 AT flash.uchicago.edu>
+Bug-Reference-URL:
+
+Bug-Description:
+
+The `.' command in vi mode cannot undo multi-key commands beginning with
+`c', `d', and `y' (command plus motion specifier).
+
+Patch (apply with `patch -p0'):
+
+*** ../readline-6.3/readline.c 2013-10-28 14:58:06.000000000 -0400
+--- readline.c 2014-03-07 15:20:33.000000000 -0500
+***************
+*** 965,969 ****
+ if (rl_editing_mode == vi_mode && _rl_keymap == vi_movement_keymap &&
+ key != ANYOTHERKEY &&
+! rl_key_sequence_length == 1 && /* XXX */
+ _rl_vi_textmod_command (key))
+ _rl_vi_set_last (key, rl_numeric_arg, rl_arg_sign);
+--- 965,969 ----
+ if (rl_editing_mode == vi_mode && _rl_keymap == vi_movement_keymap &&
+ key != ANYOTHERKEY &&
+! _rl_dispatching_keymap == vi_movement_keymap &&
+ _rl_vi_textmod_command (key))
+ _rl_vi_set_last (key, rl_numeric_arg, rl_arg_sign);
+*** ../readline-6.3/patchlevel 2013-11-15 08:11:11.000000000 -0500
+--- patchlevel 2014-03-21 08:28:40.000000000 -0400
+***************
+*** 1,3 ****
+ # Do not edit -- exists only for use by patch
+
+! 5
+--- 1,3 ----
+ # Do not edit -- exists only for use by patch
+
+! 1
diff --git a/libs/readline/patches/readline63-002
b/libs/readline/patches/readline63-002
new file mode 100644
index 0000000..0e79f13
--- /dev/null
+++ b/libs/readline/patches/readline63-002
@@ -0,0 +1,44 @@
+ READLINE PATCH REPORT
+ =====================
+
+Readline-Release: 6.3
+Patch-ID: readline63-002
+
+Bug-Reported-by: Anatol Pomozov <anatol.pomozov AT gmail.com>
+Bug-Reference-ID:
<CAOMFOmXy3mT2So5GQ5F-smCVArQuAeBwZ2QKzgCtMeXJoDeYOQ AT mail.gmail.com>
+Bug-Reference-URL:
http://lists.gnu.org/archive/html/bug-readline/2014-03/msg00010.html
+
+Bug-Description:
+
+When in callback mode, some readline commands can cause readline to seg
+fault by passing invalid contexts to callback functions.
+
+Patch (apply with `patch -p0'):
+
+*** ../readline-6.3/readline.c 2013-10-28 14:58:06.000000000 -0400
+--- readline.c 2014-03-10 14:15:02.000000000 -0400
+***************
+*** 745,749 ****
+
+ RL_CHECK_SIGNALS ();
+! if (r == 0) /* success! */
+ {
+ _rl_keyseq_chain_dispose ();
+--- 745,750 ----
+
+ RL_CHECK_SIGNALS ();
+! /* We only treat values < 0 specially to simulate recursion. */
+! if (r >= 0 || (r == -1 && (cxt->flags & KSEQ_SUBSEQ) == 0)) /*
success! or failure! */
+ {
+ _rl_keyseq_chain_dispose ();
+*** ../readline-6.3/patchlevel 2013-11-15 08:11:11.000000000 -0500
+--- patchlevel 2014-03-21 08:28:40.000000000 -0400
+***************
+*** 1,3 ****
+ # Do not edit -- exists only for use by patch
+
+! 1
+--- 1,3 ----
+ # Do not edit -- exists only for use by patch
+
+! 2
diff --git a/libs/readline/patches/readline63-003
b/libs/readline/patches/readline63-003
new file mode 100644
index 0000000..d2cad94
--- /dev/null
+++ b/libs/readline/patches/readline63-003
@@ -0,0 +1,47 @@
+ READLINE PATCH REPORT
+ =====================
+
+Readline-Release: 6.3
+Patch-ID: readline63-003
+
+Bug-Reported-by:
+Bug-Reference-ID:
+Bug-Reference-URL:
+
+Bug-Description:
+
+There are debugging functions in the readline release that are theoretically
+exploitable as security problems. They are not public functions, but have
+global linkage.
+
+Patch (apply with `patch -p0'):
+
+*** ../readline-6.3/util.c 2013-09-02 13:36:12.000000000 -0400
+--- util.c 2014-03-20 10:25:53.000000000 -0400
+***************
+*** 477,480 ****
+--- 479,483 ----
+ }
+
++ #if defined (DEBUG)
+ #if defined (USE_VARARGS)
+ static FILE *_rl_tracefp;
+***************
+*** 539,542 ****
+--- 542,546 ----
+ }
+ #endif
++ #endif /* DEBUG */
+
+
+*** ../readline-6.3/patchlevel 2013-11-15 08:11:11.000000000 -0500
+--- patchlevel 2014-03-21 08:28:40.000000000 -0400
+***************
+*** 1,3 ****
+ # Do not edit -- exists only for use by patch
+
+! 2
+--- 1,3 ----
+ # Do not edit -- exists only for use by patch
+
+! 3
diff --git a/libs/readline/patches/readline63-004
b/libs/readline/patches/readline63-004
new file mode 100644
index 0000000..3cd89e3
--- /dev/null
+++ b/libs/readline/patches/readline63-004
@@ -0,0 +1,45 @@
+ READLINE PATCH REPORT
+ =====================
+
+Readline-Release: 6.3
+Patch-ID: readline63-004
+
+Bug-Reported-by: Egmont Koblinger <egmont AT gmail.com>
+Bug-Reference-ID:
<CAGWcZk+bU5Jo1M+tutGvL-250UBE9DXjpeJVofYJSFcqFEVfMg AT mail.gmail.com>
+Bug-Reference-URL:
http://lists.gnu.org/archive/html/bug-bash/2014-03/msg00153.html
+
+Bug-Description:
+
+The signal handling changes to bash and readline (to avoid running any code
+in a signal handler context) cause the cursor to be placed on the wrong
+line of a multi-line command after a ^C interrupts editing.
+
+Patch (apply with `patch -p0'):
+
+*** ../readline-6.3-patched/display.c 2013-12-27 13:10:56.000000000 -0500
+--- display.c 2014-03-27 11:52:45.000000000 -0400
+***************
+*** 2678,2682 ****
+ if (_rl_echoing_p)
+ {
+! _rl_move_vert (_rl_vis_botlin);
+ _rl_vis_botlin = 0;
+ fflush (rl_outstream);
+--- 2678,2683 ----
+ if (_rl_echoing_p)
+ {
+! if (_rl_vis_botlin > 0) /* minor optimization plus bug fix */
+! _rl_move_vert (_rl_vis_botlin);
+ _rl_vis_botlin = 0;
+ fflush (rl_outstream);
+*** ../readline-6.3/patchlevel 2013-11-15 08:11:11.000000000 -0500
+--- patchlevel 2014-03-21 08:28:40.000000000 -0400
+***************
+*** 1,3 ****
+ # Do not edit -- exists only for use by patch
+
+! 3
+--- 1,3 ----
+ # Do not edit -- exists only for use by patch
+
+! 4
diff --git a/libs/readline/patches/readline63-005
b/libs/readline/patches/readline63-005
new file mode 100644
index 0000000..8a63738
--- /dev/null
+++ b/libs/readline/patches/readline63-005
@@ -0,0 +1,58 @@
+ READLINE PATCH REPORT
+ =====================
+
+Readline-Release: 6.3
+Patch-ID: readline63-005
+
+Bug-Reported-by: Juergen Daubert <jue AT jue.li>
+Bug-Reference-ID: <20140303180430.GA7346 AT jue.netz>
+Bug-Reference-URL:
http://lists.gnu.org/archive/html/bug-readline/2014-03/msg00002.html
+
+Bug-Description:
+
+There are still applications using the deprecated Function/VFunction/etc.
+typedefs in rltypedefs.h. This patch restores the typedefs, but attempts
+to mark them as deprecated using gcc/clang attributes. Thanks to Max Horn
+for the suggestion.
+
+Patch (apply with `patch -p0'):
+
+*** ../readline-6.3-patched/rltypedefs.h 2011-03-26 14:53:31.000000000
-0400
+--- rltypedefs.h 2014-04-10 11:30:45.000000000 -0400
+***************
+*** 27,30 ****
+--- 27,49 ----
+ #endif
+
++ /* Old-style, attempt to mark as deprecated in some way people will
notice. */
++
++ #if !defined (_FUNCTION_DEF)
++ # define _FUNCTION_DEF
++
++ #if defined(__GNUC__) || defined(__clang__)
++ typedef int Function () __attribute__ ((deprecated));
++ typedef void VFunction () __attribute__ ((deprecated));
++ typedef char *CPFunction () __attribute__ ((deprecated));
++ typedef char **CPPFunction () __attribute__ ((deprecated));
++ #else
++ typedef int Function ();
++ typedef void VFunction ();
++ typedef char *CPFunction ();
++ typedef char **CPPFunction ();
++ #endif
++
++ #endif /* _FUNCTION_DEF */
++
+ /* New style. */
+
+*** ../readline-6.3/patchlevel 2013-11-15 08:11:11.000000000 -0500
+--- patchlevel 2014-03-21 08:28:40.000000000 -0400
+***************
+*** 1,3 ****
+ # Do not edit -- exists only for use by patch
+
+! 4
+--- 1,3 ----
+ # Do not edit -- exists only for use by patch
+
+! 5
diff --git a/libs/readline/patches/readline63-006
b/libs/readline/patches/readline63-006
new file mode 100644
index 0000000..a3f0930
--- /dev/null
+++ b/libs/readline/patches/readline63-006
@@ -0,0 +1,63 @@
+ READLINE PATCH REPORT
+ =====================
+
+Readline-Release: 6.3
+Patch-ID: readline63-006
+
+Bug-Reported-by: <Trond.Endrestol AT ximalas.info>
+Bug-Reference-ID:
<alpine.BSF.2.03.1404192114310.1973 AT enterprise.ximalas.info>
+Bug-Reference-URL:
http://lists.gnu.org/archive/html/bug-bash/2014-04/msg00069.html
+
+Bug-Description:
+
+Using reverse-i-search when horizontal scrolling is enabled does not
redisplay
+the entire line containing the successful search results.
+
+Patch (apply with `patch -p0'):
+
+*** ../readline-6.3-patched/display.c 2014-04-08 18:19:36.000000000 -0400
+--- display.c 2014-04-20 18:32:52.000000000 -0400
+***************
+*** 1638,1642 ****
+ the spot of first difference is before the end of the invisible chars,
+ lendiff needs to be adjusted. */
+! if (current_line == 0 && !_rl_horizontal_scroll_mode &&
+ current_invis_chars != visible_wrap_offset)
+ {
+--- 1638,1642 ----
+ the spot of first difference is before the end of the invisible chars,
+ lendiff needs to be adjusted. */
+! if (current_line == 0 && /* !_rl_horizontal_scroll_mode && */
+ current_invis_chars != visible_wrap_offset)
+ {
+***************
+*** 1826,1831 ****
+ _rl_last_c_pos += bytes_to_insert;
+
+ if (_rl_horizontal_scroll_mode && ((oe-old) > (ne-new)))
+! goto clear_rest_of_line;
+ }
+ }
+--- 1826,1836 ----
+ _rl_last_c_pos += bytes_to_insert;
+
++ /* XXX - we only want to do this if we are at the end of the
line
++ so we move there with _rl_move_cursor_relative */
+ if (_rl_horizontal_scroll_mode && ((oe-old) > (ne-new)))
+! {
+! _rl_move_cursor_relative (ne-new, new);
+! goto clear_rest_of_line;
+! }
+ }
+ }
+*** ../readline-6.3/patchlevel 2013-11-15 08:11:11.000000000 -0500
+--- patchlevel 2014-03-21 08:28:40.000000000 -0400
+***************
+*** 1,3 ****
+ # Do not edit -- exists only for use by patch
+
+! 5
+--- 1,3 ----
+ # Do not edit -- exists only for use by patch
+
+! 6
diff --git a/libs/readline/patches/readline63-007
b/libs/readline/patches/readline63-007
new file mode 100644
index 0000000..1b65792
--- /dev/null
+++ b/libs/readline/patches/readline63-007
@@ -0,0 +1,47 @@
+ READLINE PATCH REPORT
+ =====================
+
+Readline-Release: 6.3
+Patch-ID: readline63-007
+
+Bug-Reported-by: John Lenton
+Bug-Reference-ID:
+Bug-Reference-URL:
https://bugs.launchpad.net/ubuntu/+source/bash/+bug/1317476
+
+Bug-Description:
+
+Readline should allow SIGALRM and SIGVTALRM (if available) to `interrupt'
+rl_getc and cause the handler to run when not in a signal handling context.
+
+Patch (apply with `patch -p0'):
+
+*** ../readline-6.3-patched/input.c 2014-01-10 15:07:08.000000000 -0500
+--- input.c 2014-05-30 16:20:56.000000000 -0400
+***************
+*** 535,540 ****
+--- 538,551 ----
+ else if (_rl_caught_signal == SIGHUP || _rl_caught_signal == SIGTERM)
+ return (RL_ISSTATE (RL_STATE_READCMD) ? READERR : EOF);
++ /* keyboard-generated signals of interest */
+ else if (_rl_caught_signal == SIGINT || _rl_caught_signal == SIGQUIT)
+ RL_CHECK_SIGNALS ();
++ /* non-keyboard-generated signals of interest */
++ else if (_rl_caught_signal == SIGALRM
++ #if defined (SIGVTALRM)
++ || _rl_caught_signal == SIGVTALRM
++ #endif
++ )
++ RL_CHECK_SIGNALS ();
+
+ if (rl_signal_event_hook)
+*** ../readline-6.3/patchlevel 2013-11-15 08:11:11.000000000 -0500
+--- patchlevel 2014-03-21 08:28:40.000000000 -0400
+***************
+*** 1,3 ****
+ # Do not edit -- exists only for use by patch
+
+! 6
+--- 1,3 ----
+ # Do not edit -- exists only for use by patch
+
+! 7
diff --git a/libs/readline/patches/readline63-008
b/libs/readline/patches/readline63-008
new file mode 100644
index 0000000..691016f
--- /dev/null
+++ b/libs/readline/patches/readline63-008
@@ -0,0 +1,47 @@
+ READLINE PATCH REPORT
+ =====================
+
+Readline-Release: 6.3
+Patch-ID: readline63-008
+
+Bug-Reported-by: Jared Yanovich <slovichon AT gmail.com>
+Bug-Reference-ID: <20140625225019.GJ17044 AT nightderanger.psc.edu>
+Bug-Reference-URL:
http://lists.gnu.org/archive/html/bug-bash/2014-06/msg00070.html
+
+Bug-Description:
+
+When the readline `revert-all-at-newline' option is set, pressing newline
+when the current line is one retrieved from history results in a double free
+and a segmentation fault.
+
+Patch (apply with `patch -p0'):
+
+*** ../readline-6.3-patched/misc.c 2012-09-01 18:03:11.000000000 -0400
+--- misc.c 2014-06-30 13:41:19.000000000 -0400
+***************
+*** 462,465 ****
+--- 462,466 ----
+ /* Set up rl_line_buffer and other variables from history entry */
+ rl_replace_from_history (entry, 0); /* entry->line is now current
*/
++ entry->data = 0; /* entry->data is now current
undo list */
+ /* Undo all changes to this history entry */
+ while (rl_undo_list)
+***************
+*** 469,473 ****
+ FREE (entry->line);
+ entry->line = savestring (rl_line_buffer);
+- entry->data = 0;
+ }
+ entry = previous_history ();
+--- 470,473 ----
+*** ../readline-6.3/patchlevel 2013-11-15 08:11:11.000000000 -0500
+--- patchlevel 2014-03-21 08:28:40.000000000 -0400
+***************
+*** 1,3 ****
+ # Do not edit -- exists only for use by patch
+
+! 7
+--- 1,3 ----
+ # Do not edit -- exists only for use by patch
+
+! 8
- [SM-Commit] GIT changes to master grimoire by Treeve Jelbert (89b71349b7c9e464b5b545d16d3455346407832f), Treeve Jelbert, 03/08/2016
Archive powered by MHonArc 2.6.24.