ports/69434: Added vendor patches to readline port
Frank J. Laszlo
laszlof at vonostingroup.com
Thu Jul 22 13:20:08 UTC 2004
>Number: 69434
>Category: ports
>Synopsis: Added vendor patches to readline port
>Confidential: no
>Severity: non-critical
>Priority: medium
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: sw-bug
>Submitter-Id: current-users
>Arrival-Date: Thu Jul 22 13:20:07 GMT 2004
>Closed-Date:
>Last-Modified:
>Originator: Frank J. Laszlo
>Release: FreeBSD 4.9-RELEASE-p3 i386
>Organization:
>Environment:
System: FreeBSD ritamari.vonostingroup.com 4.9-RELEASE-p3 FreeBSD 4.9-RELEASE-p3 #2: Mon Mar 8 18:14:29 EST 2004 root at ritamari.vonostingroup.com:/usr/obj/usr/src/sys/RITAMARI i386
>Description:
This patch will add vendor patches 002-005 from
https://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=98229
per PR ports/69352 and ports/61297
>How-To-Repeat:
See PR ports/61297
>Fix:
--- readline.patch begins here ---
diff -rNU3 readline.old/Makefile readline/Makefile
--- readline.old/Makefile Sun Dec 28 05:32:48 2003
+++ readline/Makefile Thu Jul 22 08:58:27 2004
@@ -7,6 +7,7 @@
PORTNAME= readline
PORTVERSION= 4.3
+PORTREVISION= 2
CATEGORIES= devel
MASTER_SITES= ftp://ftp.cwru.edu/pub/bash/
diff -rNU3 readline.old/files/patch-aa readline/files/patch-aa
--- readline.old/files/patch-aa Wed Dec 31 19:00:00 1969
+++ readline/files/patch-aa Tue Jul 20 13:28:09 2004
@@ -0,0 +1,16 @@
+*** ../readline-4.3/bind.c Thu Jan 24 11:15:52 2002
+--- bind.c Wed Jul 31 09:11:18 2002
+***************
+*** 312,316 ****
+ and the function bound to `a' to be executed when the user
+ types `abx', leaving `bx' in the input queue. */
+! if (k.function /* && k.type == ISFUNC */)
+ {
+ map[ANYOTHERKEY] = k;
+--- 312,316 ----
+ and the function bound to `a' to be executed when the user
+ types `abx', leaving `bx' in the input queue. */
+! if (k.function && ((k.type == ISFUNC && k.function != rl_do_lowercase_version) || k.type == ISMACR))
+ {
+ map[ANYOTHERKEY] = k;
+
diff -rNU3 readline.old/files/patch-ab readline/files/patch-ab
--- readline.old/files/patch-ab Wed Dec 31 19:00:00 1969
+++ readline/files/patch-ab Thu Jul 22 08:57:27 2004
@@ -0,0 +1,10 @@
+*** readline-4.3/readline.c Wed Mar 13 17:10:46 2002
+--- readline.c Tue Jul 30 17:46:44 2002
+***************
+*** 685,688 ****
+--- 685,689 ----
+ #if defined (VI_MODE)
+ if (rl_editing_mode == vi_mode && _rl_keymap == vi_movement_keymap &&
++ key != ANYOTHERKEY &&
+ _rl_vi_textmod_command (key))
+ _rl_vi_set_last (key, rl_numeric_arg, rl_arg_sign);
diff -rNU3 readline.old/files/patch-ac readline/files/patch-ac
--- readline.old/files/patch-ac Wed Dec 31 19:00:00 1969
+++ readline/files/patch-ac Thu Jul 22 08:57:27 2004
@@ -0,0 +1,68 @@
+*** readline-4.3/mbutil.c Tue Jun 4 11:54:29 2002
+--- mbutil.c Mon Aug 5 11:20:39 2002
+***************
+*** 206,210 ****
+ {
+ /* shorted to compose multibyte char */
+! memset (ps, 0, sizeof(mbstate_t));
+ return -2;
+ }
+--- 206,211 ----
+ {
+ /* shorted to compose multibyte char */
+! if (ps)
+! memset (ps, 0, sizeof(mbstate_t));
+ return -2;
+ }
+***************
+*** 213,217 ****
+ /* invalid to compose multibyte char */
+ /* initialize the conversion state */
+! memset (ps, 0, sizeof(mbstate_t));
+ return -1;
+ }
+--- 214,219 ----
+ /* invalid to compose multibyte char */
+ /* initialize the conversion state */
+! if (ps)
+! memset (ps, 0, sizeof(mbstate_t));
+ return -1;
+ }
+***************
+*** 226,232 ****
+ int
+ _rl_compare_chars (buf1, pos1, ps1, buf2, pos2, ps2)
+! char *buf1, *buf2;
+! mbstate_t *ps1, *ps2;
+! int pos1, pos2;
+ {
+ int i, w1, w2;
+--- 228,237 ----
+ int
+ _rl_compare_chars (buf1, pos1, ps1, buf2, pos2, ps2)
+! char *buf1;
+! int pos1;
+! mbstate_t *ps1;
+! char *buf2;
+! int pos2;
+! mbstate_t *ps2;
+ {
+ int i, w1, w2;
+***************
+*** 277,282 ****
+ /* clear the state of the byte sequence, because
+ in this case effect of mbstate is undefined */
+! memset (ps, 0, sizeof (mbstate_t));
+ }
+ else
+ pos += tmp;
+--- 282,290 ----
+ /* clear the state of the byte sequence, because
+ in this case effect of mbstate is undefined */
+! if (ps)
+! memset (ps, 0, sizeof (mbstate_t));
+ }
++ else if (tmp == 0)
++ pos++;
+ else
+ pos += tmp;
diff -rNU3 readline.old/files/patch-ad readline/files/patch-ad
--- readline.old/files/patch-ad Wed Dec 31 19:00:00 1969
+++ readline/files/patch-ad Thu Jul 22 08:57:27 2004
@@ -0,0 +1,90 @@
+*** readline-4.3/display.c Tue Jun 4 10:54:47 2002
+--- display.c Fri Sep 13 16:22:57 2002
+***************
+*** 71,75 ****
+
+ #if defined (HANDLE_MULTIBYTE)
+! static int _rl_col_width PARAMS((char *, int, int));
+ static int *_rl_wrapped_line;
+ #else
+--- 71,75 ----
+
+ #if defined (HANDLE_MULTIBYTE)
+! static int _rl_col_width PARAMS((const char *, int, int));
+ static int *_rl_wrapped_line;
+ #else
+***************
+*** 1349,1355 ****
+ _rl_output_some_chars (nfd + lendiff, temp - lendiff);
+ #if 0
+- _rl_last_c_pos += _rl_col_width (nfd+lendiff, 0, temp-lendiff) - col_lendiff;
+- #else
+ _rl_last_c_pos += _rl_col_width (nfd+lendiff, 0, temp-col_lendiff);
+ #endif
+ }
+--- 1349,1355 ----
+ _rl_output_some_chars (nfd + lendiff, temp - lendiff);
+ #if 0
+ _rl_last_c_pos += _rl_col_width (nfd+lendiff, 0, temp-col_lendiff);
++ #else
++ _rl_last_c_pos += _rl_col_width (nfd+lendiff, 0, temp-lendiff);
+ #endif
+ }
+***************
+*** 1511,1516 ****
+ /* 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
+! this case, NEW's display position is not obvious. */
+! if ((MB_CUR_MAX == 1 || rl_byte_oriented ) && _rl_last_c_pos == new) return;
+ #else
+ if (_rl_last_c_pos == new) return;
+--- 1511,1523 ----
+ /* 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
+! this case, NEW's display position is not obvious and must be
+! calculated. */
+! if (MB_CUR_MAX == 1 || rl_byte_oriented)
+! {
+! if (_rl_last_c_pos == new)
+! return;
+! }
+! else if (_rl_last_c_pos == _rl_col_width (data, 0, new))
+! return;
+ #else
+ if (_rl_last_c_pos == new) return;
+***************
+*** 1595,1603 ****
+ {
+ if (MB_CUR_MAX > 1 && rl_byte_oriented == 0)
+! {
+! tputs (_rl_term_cr, 1, _rl_output_character_function);
+! for (i = 0; i < new; i++)
+! putc (data[i], rl_outstream);
+! }
+ else
+ _rl_backspace (_rl_last_c_pos - new);
+--- 1602,1606 ----
+ {
+ if (MB_CUR_MAX > 1 && rl_byte_oriented == 0)
+! _rl_backspace (_rl_last_c_pos - _rl_col_width (data, 0, new));
+ else
+ _rl_backspace (_rl_last_c_pos - new);
+***************
+*** 2118,2122 ****
+ static int
+ _rl_col_width (str, start, end)
+! char *str;
+ int start, end;
+ {
+--- 2121,2125 ----
+ static int
+ _rl_col_width (str, start, end)
+! const char *str;
+ int start, end;
+ {
+***************
+*** 2194,2196 ****
+ }
+ #endif /* HANDLE_MULTIBYTE */
+-
+--- 2197,2198 ----
diff -rNU3 readline.old/files/patch-ae readline/files/patch-ae
--- readline.old/files/patch-ae Wed Dec 31 19:00:00 1969
+++ readline/files/patch-ae Thu Jul 22 08:57:27 2004
@@ -0,0 +1,31 @@
+*** readline-4.3/vi_mode.c Thu May 23 13:27:58 2002
+--- vi_mode.c Tue Feb 4 15:11:07 2003
+***************
+*** 681,685 ****
+ {
+ wchar_t wc;
+! char mb[MB_LEN_MAX];
+ mbstate_t ps;
+
+--- 681,686 ----
+ {
+ wchar_t wc;
+! char mb[MB_LEN_MAX+1];
+! int mblen;
+ mbstate_t ps;
+
+***************
+*** 704,708 ****
+ if (wc)
+ {
+! wctomb (mb, wc);
+ rl_begin_undo_group ();
+ rl_delete (1, 0);
+--- 705,711 ----
+ if (wc)
+ {
+! mblen = wctomb (mb, wc);
+! if (mblen >= 0)
+! mb[mblen] = '\0';
+ rl_begin_undo_group ();
+ rl_delete (1, 0);
--- readline.patch ends here ---
>Release-Note:
>Audit-Trail:
>Unformatted:
More information about the freebsd-ports-bugs
mailing list