Source Mage code commit list

[George Sherwood <scm AT sourcemage.org>]

GIT changes to master grimoire by George Sherwood <gsherwood AT sourcemage.org>:

 libs/readline/DETAILS        |    2 
 libs/readline/HISTORY        |    5 +
 libs/readline/PRE_BUILD      |    8 +-
 libs/readline/readline52-008 |   70 ++++++++++++++++++++
 libs/readline/readline52-009 |   45 ++++++++++++
 libs/readline/readline52-010 |   47 +++++++++++++
 libs/readline/readline52-011 |   32 +++++++++
 libs/readline/readline52-012 |  150 
+++++++++++++++++++++++++++++++++++++++++++
 8 files changed, 356 insertions(+), 3 deletions(-)

New commits:
commit 13ca2a50cb1df6c676cadf51a8c55a97bed384ff
Author: George Sherwood <gsherwood AT sourcemage.org>
Commit: George Sherwood <gsherwood AT sourcemage.org>

    readline: Added 5 upstream patches.  PATCH_LEVEL++

diff --git a/libs/readline/DETAILS b/libs/readline/DETAILS
index c02c048..5a88cff 100755
--- a/libs/readline/DETAILS
+++ b/libs/readline/DETAILS
@@ -12,7 +12,7 @@ SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
       LICENSE[0]=GPL
         WEB_SITE=http://cnswww.cns.cwru.edu/php/chet/readline/rltop.html
          ENTERED=20010922
-      PATCHLEVEL=4
+      PATCHLEVEL=5
         KEYWORDS="libs"
            SHORT="readline lets users edit command lines as they are typed 
in."
 cat << EOF
diff --git a/libs/readline/HISTORY b/libs/readline/HISTORY
index 148b326..a3173c9 100644
--- a/libs/readline/HISTORY
+++ b/libs/readline/HISTORY
@@ -1,3 +1,8 @@
+2008-05-03 George Sherwood <george AT beernabeer.com>
+       * DETAiLS: PATCHLEVEL++
+       * PRE_BUILD: Added patch readline52-008-012
+       * readline52-008-012: Added upstream patches
+
 2007-08-25 George Sherwood <george AT beernabeer.com>
        * DETAILS: PATCHLEVEL++
        * PRE_BUILD: Added patches readline52-005/006/007
diff --git a/libs/readline/PRE_BUILD b/libs/readline/PRE_BUILD
index 1ad32d3..33368a4 100755
--- a/libs/readline/PRE_BUILD
+++ b/libs/readline/PRE_BUILD
@@ -7,8 +7,12 @@ patch -p0 < $SCRIPT_DIRECTORY/readline52-003 &&
 patch -p0 < $SCRIPT_DIRECTORY/readline52-004 &&
 patch -p0 < $SCRIPT_DIRECTORY/readline52-005 &&
 patch -p0 < $SCRIPT_DIRECTORY/readline52-006 &&
-patch -p0 < $SCRIPT_DIRECTORY/readline52-007
-
+patch -p0 < $SCRIPT_DIRECTORY/readline52-007 &&
+patch -p0 < $SCRIPT_DIRECTORY/readline52-008 &&
+patch -p0 < $SCRIPT_DIRECTORY/readline52-009 &&
+patch -p0 < $SCRIPT_DIRECTORY/readline52-010 &&
+patch -p0 < $SCRIPT_DIRECTORY/readline52-011 &&
+patch -p0 < $SCRIPT_DIRECTORY/readline52-012 &&
 
 
 # Dynamically link against termcap or ncurses
diff --git a/libs/readline/readline52-008 b/libs/readline/readline52-008
new file mode 100644
index 0000000..1d7f327
--- /dev/null
+++ b/libs/readline/readline52-008
@@ -0,0 +1,70 @@
+                          READLINE PATCH REPORT
+                          =====================
+
+Readline-Release: 5.2
+Patch-ID: readline52-008
+
+Bug-Reported-by:       dAniel hAhler <ubuntu AT thequod.de>
+Bug-Reference-ID:      <4702ED8A.5000503 AT thequod.de>
+Bug-Reference-URL:     
https://bugs.launchpad.net/ubuntu/+source/bash/+bug/119938
+
+Bug-Description:
+
+When updating the display after displaying, for instance, a list of possible
+completions, readline will place the cursor at the wrong position if the
+prompt contains invisible characters and a newline.
+
+Patch:
+
+*** ../readline-5.2-patched/display.c  Mon Aug  6 14:26:29 2007
+--- display.c  Wed Oct 10 22:43:58 2007
+***************
+*** 1049,1053 ****
+             else
+               tx = nleft;
+!            if (_rl_last_c_pos > tx)
+               {
+                 _rl_backspace (_rl_last_c_pos - tx);  /* XXX */
+--- 1049,1053 ----
+             else
+               tx = nleft;
+!            if (tx >= 0 && _rl_last_c_pos > tx)
+               {
+                 _rl_backspace (_rl_last_c_pos - tx);  /* XXX */
+***************
+*** 1205,1209 ****
+  {
+    register char *ofd, *ols, *oe, *nfd, *nls, *ne;
+!   int temp, lendiff, wsatend, od, nd;
+    int current_invis_chars;
+    int col_lendiff, col_temp;
+--- 1205,1209 ----
+  {
+    register char *ofd, *ols, *oe, *nfd, *nls, *ne;
+!   int temp, lendiff, wsatend, od, nd, o_cpos;
+    int current_invis_chars;
+    int col_lendiff, col_temp;
+***************
+*** 1466,1469 ****
+--- 1466,1471 ----
+      }
+  
++   o_cpos = _rl_last_c_pos;
++ 
+    /* When this function returns, _rl_last_c_pos is correct, and an absolute
+       cursor postion in multibyte mode, but a buffer index when not in a
+***************
+*** 1475,1479 ****
+       invisible characters in the prompt string.  Let's see if setting this 
when
+       we make sure we're at the end of the drawn prompt string works. */
+!   if (current_line == 0 && MB_CUR_MAX > 1 && rl_byte_oriented == 0 && 
_rl_last_c_pos == prompt_physical_chars)
+      cpos_adjusted = 1;
+  #endif
+--- 1477,1483 ----
+       invisible characters in the prompt string.  Let's see if setting this 
when
+       we make sure we're at the end of the drawn prompt string works. */
+!   if (current_line == 0 && MB_CUR_MAX > 1 && rl_byte_oriented == 0 && 
+!       (_rl_last_c_pos > 0 || o_cpos > 0) &&
+!       _rl_last_c_pos == prompt_physical_chars)
+      cpos_adjusted = 1;
+  #endif
diff --git a/libs/readline/readline52-009 b/libs/readline/readline52-009
new file mode 100644
index 0000000..af9e381
--- /dev/null
+++ b/libs/readline/readline52-009
@@ -0,0 +1,45 @@
+                          READLINE PATCH REPORT
+                          =====================
+
+Readline-Release: 5.2
+Patch-ID: readline52-009
+
+Bug-Reported-by:       dAniel hAhler <ubuntu AT thequod.de>
+Bug-Reference-ID:
+Bug-Reference-URL:
+
+Bug-Description:
+
+Under some circumstances, readline will incorrectly display a prompt string
+containing invisible characters after the final newline.
+
+Patch:
+
+*** ../readline-5.2-patched/display.c  2007-08-25 13:47:08.000000000 -0400
+--- display.c  2007-11-10 17:51:29.000000000 -0500
+***************
+*** 392,396 ****
+        local_prompt = expand_prompt (p, &prompt_visible_length,
+                                      &prompt_last_invisible,
+!                                     (int *)NULL,
+                                      &prompt_physical_chars);
+        c = *t; *t = '\0';
+--- 420,424 ----
+        local_prompt = expand_prompt (p, &prompt_visible_length,
+                                      &prompt_last_invisible,
+!                                     &prompt_invis_chars_first_line,
+                                      &prompt_physical_chars);
+        c = *t; *t = '\0';
+***************
+*** 399,403 ****
+        local_prompt_prefix = expand_prompt (prompt, &prompt_prefix_length,
+                                                  (int *)NULL,
+!                                                 
&prompt_invis_chars_first_line,
+                                                  (int *)NULL);
+        *t = c;
+--- 427,431 ----
+        local_prompt_prefix = expand_prompt (prompt, &prompt_prefix_length,
+                                                  (int *)NULL,
+!                                                 (int *)NULL,
+                                                  (int *)NULL);
+        *t = c;
diff --git a/libs/readline/readline52-010 b/libs/readline/readline52-010
new file mode 100644
index 0000000..ee5c026
--- /dev/null
+++ b/libs/readline/readline52-010
@@ -0,0 +1,47 @@
+                          READLINE PATCH REPORT
+                          =====================
+
+Readline-Release: 5.2
+Patch-ID: readline52-010
+
+Bug-Reported-by:       Miroslav Lichvar <mlichvar AT redhat.com>
+Bug-Reference-ID:      Fri, 02 Nov 2007 14:07:45 +0100
+Bug-Reference-URL:     
http://lists.gnu.org/archive/html/bug-readline/2007-11/msg00000.html
+
+Bug-Description:
+
+In certain cases when outputting characters at the end of the line,
+e.g., when displaying the prompt string, readline positions the cursor
+incorrectly if the prompt string contains invisible characters and the
+text being drawn begins before the last invisible character in the line.
+
+Patch:
+
+*** ../readline-5.2-patched/display.c  2007-08-25 13:47:08.000000000 -0400
+--- display.c  2007-11-10 17:51:29.000000000 -0500
+***************
+*** 1566,1574 ****
+         else
+           {
+-            /* We have horizontal scrolling and we are not inserting at
+-               the end.  We have invisible characters in this line.  This
+-               is a dumb update. */
+             _rl_output_some_chars (nfd, temp);
+             _rl_last_c_pos += col_temp;
+             return;
+           }
+--- 1619,1632 ----
+         else
+           {
+             _rl_output_some_chars (nfd, temp);
+             _rl_last_c_pos += col_temp;
++            /* If nfd begins before any invisible characters in the prompt,
++               adjust _rl_last_c_pos to account for wrap_offset and set
++               cpos_adjusted to let the caller know. */
++            if (current_line == 0 && wrap_offset && ((nfd - new) <= 
prompt_last_invisible))
++              {
++                _rl_last_c_pos -= wrap_offset;
++                cpos_adjusted = 1;
++              }
+             return;
+           }
diff --git a/libs/readline/readline52-011 b/libs/readline/readline52-011
new file mode 100644
index 0000000..a1197ed
--- /dev/null
+++ b/libs/readline/readline52-011
@@ -0,0 +1,32 @@
+                          READLINE PATCH REPORT
+                          =====================
+
+Readline-Release: 5.2
+Patch-ID: readline52-011
+
+Bug-Reported-by:       Uwe Doering <gemini AT geminix.org>
+Bug-Reference-ID:      <46F3DD72.2090801 AT geminix.org>
+Bug-Reference-URL:     
http://lists.gnu.org/archive/html/bug-bash/2007-09/msg00102.html
+
+Bug-Description:
+
+There is an off-by-one error in the code that buffers characters received
+very quickly in succession, causing characters to be dropped.
+
+Patch:
+
+*** ../readline-5.2-patched/input.c    2007-08-25 13:47:10.000000000 -0400
+--- input.c    2007-10-12 22:55:25.000000000 -0400
+***************
+*** 155,159 ****
+        pop_index--;
+        if (pop_index < 0)
+!      pop_index = ibuffer_len - 1;
+        ibuffer[pop_index] = key;
+        return (1);
+--- 155,159 ----
+        pop_index--;
+        if (pop_index < 0)
+!      pop_index = ibuffer_len;
+        ibuffer[pop_index] = key;
+        return (1);
diff --git a/libs/readline/readline52-012 b/libs/readline/readline52-012
new file mode 100644
index 0000000..7b37024
--- /dev/null
+++ b/libs/readline/readline52-012
@@ -0,0 +1,150 @@
+                          READLINE PATCH REPORT
+                          =====================
+
+Readline-Release: 5.2
+Patch-ID: readline52-012
+
+Bug-Reported-by:       Chet Ramey <chet.ramey AT case.edu>
+Bug-Reference-ID:
+Bug-Reference-URL:
+
+Bug-Description:
+
+This updates the options required to create shared libraries on several
+systems, including Mac OS X 10.5 (darwin9.x), FreeBSD, NetBSD, OpenBSD,
+AIX, and HP/UX.
+
+Patch:
+
+*** ../readline-5.2-patched/support/shobj-conf 2006-04-11 09:15:43.000000000 
-0400
+--- support/shobj-conf 2007-12-06 23:46:41.000000000 -0500
+***************
+*** 11,15 ****
+  # chet AT po.cwru.edu
+  
+! # Copyright (C) 1996-2002 Free Software Foundation, Inc.
+  #
+  # This program is free software; you can redistribute it and/or modify
+--- 11,15 ----
+  # chet AT po.cwru.edu
+  
+! # Copyright (C) 1996-2007 Free Software Foundation, Inc.
+  #
+  # This program is free software; you can redistribute it and/or modify
+***************
+*** 115,119 ****
+       ;;
+  
+! freebsd2* | netbsd*)
+       SHOBJ_CFLAGS=-fpic
+       SHOBJ_LD=ld
+--- 115,119 ----
+       ;;
+  
+! freebsd2*)
+       SHOBJ_CFLAGS=-fpic
+       SHOBJ_LD=ld
+***************
+*** 126,130 ****
+  # FreeBSD-3.x ELF
+  freebsd[3-9]*|freebsdelf[3-9]*|freebsdaout[3-9]*|dragonfly*)
+!      SHOBJ_CFLAGS=-fpic
+       SHOBJ_LD='${CC}'
+  
+--- 126,130 ----
+  # FreeBSD-3.x ELF
+  freebsd[3-9]*|freebsdelf[3-9]*|freebsdaout[3-9]*|dragonfly*)
+!      SHOBJ_CFLAGS=-fPIC
+       SHOBJ_LD='${CC}'
+  
+***************
+*** 143,147 ****
+  
+  # Darwin/MacOS X
+! darwin8*)
+       SHOBJ_STATUS=supported
+       SHLIB_STATUS=supported
+--- 143,147 ----
+  
+  # Darwin/MacOS X
+! darwin[89]*)
+       SHOBJ_STATUS=supported
+       SHLIB_STATUS=supported
+***************
+*** 154,158 ****
+       SHLIB_LIBSUFF='dylib'
+  
+!      SHOBJ_LDFLAGS='-undefined dynamic_lookup'
+       SHLIB_XLDFLAGS='-dynamiclib -arch_only `/usr/bin/arch` -install_name 
$(libdir)/$@ -current_version $(SHLIB_MAJOR)$(SHLIB_MINOR) 
-compatibility_version $(SHLIB_MAJOR) -v'
+  
+--- 154,158 ----
+       SHLIB_LIBSUFF='dylib'
+  
+!      SHOBJ_LDFLAGS='-dynamiclib -dynamic -undefined dynamic_lookup 
-arch_only `/usr/bin/arch`'
+       SHLIB_XLDFLAGS='-dynamiclib -arch_only `/usr/bin/arch` -install_name 
$(libdir)/$@ -current_version $(SHLIB_MAJOR)$(SHLIB_MINOR) 
-compatibility_version $(SHLIB_MAJOR) -v'
+  
+***************
+*** 172,176 ****
+  
+       case "${host_os}" in
+!      darwin[78]*)    SHOBJ_LDFLAGS=''
+                       SHLIB_XLDFLAGS='-dynamiclib -arch_only 
`/usr/bin/arch` -install_name $(libdir)/$@ -current_version 
$(SHLIB_MAJOR)$(SHLIB_MINOR) -compatibility_version $(SHLIB_MAJOR) -v'
+                       ;;
+--- 172,176 ----
+  
+       case "${host_os}" in
+!      darwin[789]*)   SHOBJ_LDFLAGS=''
+                       SHLIB_XLDFLAGS='-dynamiclib -arch_only 
`/usr/bin/arch` -install_name $(libdir)/$@ -current_version 
$(SHLIB_MAJOR)$(SHLIB_MINOR) -compatibility_version $(SHLIB_MAJOR) -v'
+                       ;;
+***************
+*** 183,187 ****
+       ;;
+  
+! openbsd*)
+       SHOBJ_CFLAGS=-fPIC
+       SHOBJ_LD='${CC}'
+--- 183,187 ----
+       ;;
+  
+! openbsd*|netbsd*)
+       SHOBJ_CFLAGS=-fPIC
+       SHOBJ_LD='${CC}'
+***************
+*** 248,252 ****
+       ;;
+  
+! aix4.[2-9]*-*gcc*)           # lightly tested by jik AT cisco.com
+       SHOBJ_CFLAGS=-fpic
+       SHOBJ_LD='ld'
+--- 248,252 ----
+       ;;
+  
+! aix4.[2-9]*-*gcc*|aix[5-9].*-*gcc*)          # lightly tested by 
jik AT cisco.com
+       SHOBJ_CFLAGS=-fpic
+       SHOBJ_LD='ld'
+***************
+*** 259,263 ****
+       ;;
+  
+! aix4.[2-9]*)
+       SHOBJ_CFLAGS=-K
+       SHOBJ_LD='ld'
+--- 259,263 ----
+       ;;
+  
+! aix4.[2-9]*|aix[5-9].*)
+       SHOBJ_CFLAGS=-K
+       SHOBJ_LD='ld'
+***************
+*** 330,334 ****
+       # if you have problems linking here, moving the `-Wl,+h,$@' from
+       # SHLIB_XLDFLAGS to SHOBJ_LDFLAGS has been reported to work
+!      SHOBJ_LDFLAGS='-shared -Wl,-b -Wl,+s'
+  
+       SHLIB_XLDFLAGS='-Wl,+h,$@ -Wl,+b,$(libdir)'
+--- 330,334 ----
+       # if you have problems linking here, moving the `-Wl,+h,$@' from
+       # SHLIB_XLDFLAGS to SHOBJ_LDFLAGS has been reported to work
+!      SHOBJ_LDFLAGS='-shared -fpic -Wl,-b -Wl,+s'
+  
+       SHLIB_XLDFLAGS='-Wl,+h,$@ -Wl,+b,$(libdir)'