[Clfs-commits] [Cross-LFS]Cross-LFS Book branch, master, updated. 06fcd8eba18cd3118f935995f052ce8522c574ad
git
git at cross-lfs.org
Tue Aug 3 18:27:58 PDT 2010
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "Cross-LFS Book".
The branch, master has been updated
via 06fcd8eba18cd3118f935995f052ce8522c574ad (commit)
from e74f725fe31a2ed43dcfd360eac77023e30aafa0 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit 06fcd8eba18cd3118f935995f052ce8522c574ad
Author: Joe Ciccone <jciccone at gmail.com>
Date: Tue Aug 3 21:28:26 2010 -0400
Updated Readline to 6.1.
diff --git a/BOOK/introduction/common/changelog.xml b/BOOK/introduction/common/changelog.xml
index a52f0fc..e9a511b 100644
--- a/BOOK/introduction/common/changelog.xml
+++ b/BOOK/introduction/common/changelog.xml
@@ -40,6 +40,15 @@
<para>August 02, 2010</para>
<itemizedlist>
<listitem>
+ <para>[jciccone] - Updated Readline to 6.1.</para>
+ </listitem>
+ </itemizedlist>
+ </listitem>
+
+ <listitem>
+ <para>August 02, 2010</para>
+ <itemizedlist>
+ <listitem>
<para>[jciccone] - Updated IPRoute2 to 2.6.34.</para>
</listitem>
<listitem>
diff --git a/BOOK/packages.ent b/BOOK/packages.ent
index 4b2ed99..9cf49a3 100644
--- a/BOOK/packages.ent
+++ b/BOOK/packages.ent
@@ -357,10 +357,10 @@
<!ENTITY psmisc-home "http://psmisc.sourceforge.net">
<!ENTITY readline-version2 "6">
-<!ENTITY readline-version "&readline-version2;.0">
-<!ENTITY readline-size "2,217 KB">
+<!ENTITY readline-version "&readline-version2;.1">
+<!ENTITY readline-size "2,212 KB">
<!ENTITY readline-url "&gnu;readline/readline-&readline-version;.tar.gz">
-<!ENTITY readline-md5 "b7f65a48add447693be6e86f04a63019">
+<!ENTITY readline-md5 "fc2f7e714fe792db1ce6ddc4c9fb4ef3">
<!ENTITY readline-home "http://cnswww.cns.cwru.edu/php/chet/readline/rltop.html">
<!ENTITY rsyslog-version "4.4.2">
diff --git a/BOOK/patches.ent b/BOOK/patches.ent
index 41cafd1..525a3b0 100644
--- a/BOOK/patches.ent
+++ b/BOOK/patches.ent
@@ -68,9 +68,9 @@
<!ENTITY perl-libc-patch-md5 "d572b0cc87b35f1806fd84f88803fb66">
<!ENTITY perl-libc-patch-size "4 KB">
-<!ENTITY readline-branch_update-patch "readline-&readline-version;-branch_update-2.patch">
-<!ENTITY readline-branch_update-patch-md5 "1e92533f7b03e03bd0a73703d0d9cc75">
-<!ENTITY readline-branch_update-patch-size "8 KB">
+<!ENTITY readline-branch_update-patch "readline-&readline-version;-branch_update-1.patch">
+<!ENTITY readline-branch_update-patch-md5 "91bb18428fcacb91b3f4c09d219e1258">
+<!ENTITY readline-branch_update-patch-size "4 KB">
<!ENTITY sysvinit-fixes-patch "sysvinit-&sysvinit-version;-fixes-1.patch">
<!ENTITY sysvinit-fixes-patch-md5 "405d23896b54ca61afd53003a62592fd">
diff --git a/patches/readline-6.0-branch_update-2.patch b/patches/readline-6.0-branch_update-2.patch
deleted file mode 100644
index 046c897..0000000
--- a/patches/readline-6.0-branch_update-2.patch
+++ /dev/null
@@ -1,115 +0,0 @@
-Submitted By: Jonathan Norman (jonathan at bluesquarelinux.co.uk)
-Date: 2009-12-31
-Initial Package Version: 6.0
-Origin: Upstream
-Upstream Status: Applied
-Description: Contains all upstream patches up to 6.0-004
-
-diff -Naur readline-6.0.orig/display.c readline-6.0/display.c
---- readline-6.0.orig/display.c 2009-12-31 18:52:45.000000000 +0000
-+++ readline-6.0/display.c 2009-12-31 19:05:02.000000000 +0000
-@@ -512,6 +512,7 @@
- /* Block keyboard interrupts because this function manipulates global
- data structures. */
- _rl_block_sigint ();
-+ RL_SETSTATE (RL_STATE_REDISPLAYING);
-
- if (!rl_display_prompt)
- rl_display_prompt = "";
-@@ -1191,6 +1192,8 @@
- if (!rl_display_fixed || forced_display || lmargin != last_lmargin)
- {
- forced_display = 0;
-+ o_cpos = _rl_last_c_pos;
-+ cpos_adjusted = 0;
- update_line (&visible_line[last_lmargin],
- &invisible_line[lmargin],
- 0,
-@@ -1198,6 +1201,13 @@
- _rl_screenwidth + (lmargin ? 0 : wrap_offset),
- 0);
-
-+ if ((MB_CUR_MAX > 1 && rl_byte_oriented == 0) &&
-+ cpos_adjusted == 0 &&
-+ _rl_last_c_pos != o_cpos &&
-+ _rl_last_c_pos > wrap_offset &&
-+ o_cpos < prompt_last_invisible)
-+ _rl_last_c_pos -= prompt_invis_chars_first_line; /* XXX - was wrap_offset */
-+
- /* If the visible new line is shorter than the old, but the number
- of invisible characters is greater, and we are at the end of
- the new line, we need to clear to eol. */
-@@ -1236,6 +1246,7 @@
- visible_wrap_offset = wrap_offset;
- }
-
-+ RL_UNSETSTATE (RL_STATE_REDISPLAYING);
- _rl_release_sigint ();
- }
-
-@@ -1772,7 +1783,7 @@
- space_to_eol will insert too many spaces. XXX - maybe we should
- adjust col_lendiff based on the difference between _rl_last_c_pos
- and _rl_screenwidth */
-- if (col_lendiff && (_rl_last_c_pos < _rl_screenwidth))
-+ if (col_lendiff && ((MB_CUR_MAX == 1 || rl_byte_oriented) || (_rl_last_c_pos < _rl_screenwidth)))
- #endif
- {
- if (_rl_term_autowrap && current_line < inv_botlin)
-@@ -1892,6 +1903,10 @@
-
- woff = WRAP_OFFSET (_rl_last_v_pos, wrap_offset);
- cpos = _rl_last_c_pos;
-+
-+ if (cpos == 0 && cpos == new)
-+ return;
-+
- #if defined (HANDLE_MULTIBYTE)
- /* If we have multibyte characters, NEW is indexed by the buffer point in
- a multibyte string, but _rl_last_c_pos is the display position. In
-@@ -1905,9 +1920,9 @@
- prompt string, since they're both buffer indices and DPOS is a
- desired display position. */
- if ((new > prompt_last_invisible) || /* XXX - don't use woff here */
-- (prompt_physical_chars > _rl_screenwidth &&
-+ (prompt_physical_chars >= _rl_screenwidth &&
- _rl_last_v_pos == prompt_last_screen_line &&
-- wrap_offset >= woff &&
-+ wrap_offset >= woff && dpos >= woff &&
- new > (prompt_last_invisible-(_rl_screenwidth*_rl_last_v_pos)-wrap_offset)))
- /* XXX last comparison might need to be >= */
- {
-diff -Naur readline-6.0.orig/patchlevel readline-6.0/patchlevel
---- readline-6.0.orig/patchlevel 2009-12-31 18:52:45.000000000 +0000
-+++ readline-6.0/patchlevel 2009-12-31 18:58:11.000000000 +0000
-@@ -1,3 +1,3 @@
- # Do not edit -- exists only for use by patch
-
--0
-+3
-diff -Naur readline-6.0.orig/readline.h readline-6.0/readline.h
---- readline-6.0.orig/readline.h 2009-12-31 18:52:45.000000000 +0000
-+++ readline-6.0/readline.h 2009-12-31 18:58:11.000000000 +0000
-@@ -814,8 +814,9 @@
- #define RL_STATE_VIMOTION 0x100000 /* reading vi motion arg */
- #define RL_STATE_MULTIKEY 0x200000 /* reading multiple-key command */
- #define RL_STATE_VICMDONCE 0x400000 /* entered vi command mode at least once */
-+#define RL_STATE_REDISPLAYING 0x800000 /* updating terminal display */
-
--#define RL_STATE_DONE 0x800000 /* done; accepted line */
-+#define RL_STATE_DONE 0x1000000 /* done; accepted line */
-
- #define RL_SETSTATE(x) (rl_readline_state |= (x))
- #define RL_UNSETSTATE(x) (rl_readline_state &= ~(x))
-diff -Naur readline-6.0.orig/terminal.c readline-6.0/terminal.c
---- readline-6.0.orig/terminal.c 2009-12-31 18:52:45.000000000 +0000
-+++ readline-6.0/terminal.c 2009-12-31 18:58:11.000000000 +0000
-@@ -355,7 +355,7 @@
- _rl_get_screen_size (fileno (rl_instream), 1);
- if (CUSTOM_REDISPLAY_FUNC ())
- rl_forced_update_display ();
-- else
-+ else if (RL_ISSTATE(RL_STATE_REDISPLAYING) == 0)
- _rl_redisplay_after_sigwinch ();
- }
- }
diff --git a/patches/readline-6.1-branch_update-1.patch b/patches/readline-6.1-branch_update-1.patch
new file mode 100644
index 0000000..7f6b216
--- /dev/null
+++ b/patches/readline-6.1-branch_update-1.patch
@@ -0,0 +1,51 @@
+Submitted By: Joe Ciccone <jciccone at gmail.com>
+Date: 2010-08-03
+Initial Package Version: 6.1
+Origin: Upstream
+Upstream Status: From Upstream
+Description: Contains all upstream patches up to 6.1-002
+
+diff -Naur readline-6.1.orig/complete.c readline-6.1/complete.c
+--- readline-6.1.orig/complete.c 2009-11-29 23:39:30.000000000 +0000
++++ readline-6.1/complete.c 2010-08-04 01:25:55.061576555 +0000
+@@ -2138,7 +2138,7 @@
+ All other entries except "." and ".." match. */
+ if (filename_len == 0)
+ {
+- if (_rl_match_hidden_files == 0 && HIDDEN_FILE (entry->d_name))
++ if (_rl_match_hidden_files == 0 && HIDDEN_FILE (convfn))
+ continue;
+
+ if (convfn[0] != '.' ||
+@@ -2219,7 +2219,7 @@
+ temp[dirlen++] = '/';
+ }
+
+- strcpy (temp + dirlen, entry->d_name);
++ strcpy (temp + dirlen, convfn);
+ }
+ else
+ temp = savestring (convfn);
+diff -Naur readline-6.1.orig/patchlevel readline-6.1/patchlevel
+--- readline-6.1.orig/patchlevel 2008-11-18 16:01:14.000000000 +0000
++++ readline-6.1/patchlevel 2010-08-04 01:25:55.949701897 +0000
+@@ -1,3 +1,3 @@
+ # Do not edit -- exists only for use by patch
+
+-0
++2
+diff -Naur readline-6.1.orig/readline.h readline-6.1/readline.h
+--- readline-6.1.orig/readline.h 2009-08-27 03:05:55.000000000 +0000
++++ readline-6.1/readline.h 2010-08-04 01:25:55.949701897 +0000
+@@ -39,9 +39,9 @@
+ #endif
+
+ /* Hex-encoded Readline version number. */
+-#define RL_READLINE_VERSION 0x0600 /* Readline 6.0 */
++#define RL_READLINE_VERSION 0x0601 /* Readline 6.1 */
+ #define RL_VERSION_MAJOR 6
+-#define RL_VERSION_MINOR 0
++#define RL_VERSION_MINOR 1
+
+ /* Readline data structures. */
+
-----------------------------------------------------------------------
Summary of changes:
BOOK/introduction/common/changelog.xml | 9 ++
BOOK/packages.ent | 6 +-
BOOK/patches.ent | 6 +-
patches/readline-6.0-branch_update-2.patch | 115 ----------------------------
patches/readline-6.1-branch_update-1.patch | 51 ++++++++++++
5 files changed, 66 insertions(+), 121 deletions(-)
delete mode 100644 patches/readline-6.0-branch_update-2.patch
create mode 100644 patches/readline-6.1-branch_update-1.patch
hooks/post-receive
--
Cross-LFS Book
More information about the Clfs-commits
mailing list