From: Jakub Bogusz Date: Fri, 6 Aug 2004 22:39:19 +0000 (+0000) Subject: - obsolete X-Git-Tag: auto/th/bash-3_0-3~8 X-Git-Url: http://git.pld-linux.org/?a=commitdiff_plain;ds=sidebyside;h=4a1cc8367ff5b19c75f8b783ec7a2c15b49310da;p=packages%2Fbash.git - obsolete Changed files: bash-DESTDIR.patch -> 1.3 bash-gcc34.patch -> 1.2 bash-shellfunc.patch -> 1.3 bash205b-001 -> 1.2 bash205b-002 -> 1.2 bash205b-003 -> 1.2 bash205b-004 -> 1.2 bash205b-005 -> 1.2 bash205b-006 -> 1.2 bash205b-007 -> 1.2 --- diff --git a/bash-DESTDIR.patch b/bash-DESTDIR.patch deleted file mode 100644 index faf4c4a..0000000 --- a/bash-DESTDIR.patch +++ /dev/null @@ -1,26 +0,0 @@ ---- bash-2.05a/Makefile.in Tue Feb 12 22:55:14 2002 -+++ bash-2.05a/Makefile.in.new Tue Feb 12 23:40:24 2002 -@@ -630,6 +630,7 @@ - $(INSTALL_PROGRAM) $(INSTALLMODE) $(Program) $(DESTDIR)$(bindir)/$(Program) - $(INSTALL_PROGRAM) $(INSTALLMODE2) bashbug $(DESTDIR)$(bindir)/bashbug - -( cd $(DOCDIR) ; $(MAKE) $(MFLAGS) \ -+ DESTDIR=$(DESTDIR) \ - man1dir=$(man1dir) man1ext=$(man1ext) \ - man3dir=$(man3dir) man3ext=$(man3ext) \ - infodir=$(infodir) htmldir=$(htmldir) DESTDIR=$(DESTDIR) $@ ) ---- bash-2.05a/doc/Makefile.in Thu Feb 7 22:38:32 2002 -+++ bash-2.05a/doc/Makefile.in.new Tue Feb 12 23:39:40 2002 -@@ -184,10 +184,10 @@ - $(RM) Makefile - - installdirs: -- -test -d $(man1dir) || $(SHELL) ${MKDIRS} $(DESTDIR)$(man1dir) -- -test -d $(infodir) || $(SHELL) ${MKDIRS} $(DESTDIR)$(infodir) -+ -test -d $(DESTDIR)$(man1dir) || $(SHELL) ${MKDIRS} $(DESTDIR)$(man1dir) -+ -test -d $(DESTDIR)$(infodir) || $(SHELL) ${MKDIRS} $(DESTDIR)$(infodir) - -if test -n "$(htmldir)" ; then \ -- test -d $(htmldir) || $(SHELL) ${MKDIRS} $(DESTDIR)$(htmldir) ; \ -+ test -d $(DESTDIR)$(htmldir) || $(SHELL) ${MKDIRS} $(DESTDIR)$(htmldir) ; \ - fi - - install: info installdirs diff --git a/bash-gcc34.patch b/bash-gcc34.patch deleted file mode 100644 index d4628b8..0000000 --- a/bash-gcc34.patch +++ /dev/null @@ -1,28 +0,0 @@ ---- bash-2.05b/lib/malloc/malloc.c.orig 2002-06-21 21:16:49.000000000 +0200 -+++ bash-2.05b/lib/malloc/malloc.c 2004-03-01 10:07:19.749437536 +0100 -@@ -236,7 +236,7 @@ - 8192UL, 16384UL, 32768UL, 65536UL, 131072UL, 262144UL, 524288UL, - 1048576UL, 2097152UL, 4194304UL, 8388608UL, 16777216UL, 33554432UL, - 67108864UL, 134217728UL, 268435456UL, 536870912UL, 1073741824UL, -- 2147483648UL, 4294967296UL-1 -+ 2147483648UL, 4294967295UL - }; - - /* binsizes[x] == (1 << ((x) + 3)) */ -@@ -290,7 +290,7 @@ - - #if !defined (botch) - static void --botch (s, file, line) -+botch (const char *s, const char *file, int line) - { - fprintf (stderr, "malloc: failed assertion: %s\n", s); - (void)fflush (stderr); -@@ -879,6 +879,7 @@ - busy[nunits] = 0; - - free_return: -+ ((void)0); - - #ifdef MALLOC_STATS - _mstats.nmalloc[nunits]--; diff --git a/bash-shellfunc.patch b/bash-shellfunc.patch deleted file mode 100644 index 67499e2..0000000 --- a/bash-shellfunc.patch +++ /dev/null @@ -1,28 +0,0 @@ ---- bash-2.04/execute_cmd.c.shellfunc Tue Jan 25 11:29:11 2000 -+++ bash-2.04/execute_cmd.c Tue May 2 21:26:24 2000 -@@ -2855,6 +2855,7 @@ - int return_val, result; - COMMAND *tc, *fc; - char *debug_trap, *error_trap; -+ SHELL_VAR* old_shell_function; - - USE_VAR(fc); - -@@ -2862,6 +2862,8 @@ - if (tc && (flags & CMD_IGNORE_RETURN)) - tc->flags |= CMD_IGNORE_RETURN; - -+ old_shell_function = this_shell_function; -+ - if (subshell == 0) - { - begin_unwind_frame ("function_calling"); -@@ -2959,6 +2959,8 @@ - - if (variable_context == 0 || this_shell_function == 0) - make_funcname_visible (0); -+ -+ this_shell_function = old_shell_function; - - return (result); - } diff --git a/bash205b-001 b/bash205b-001 deleted file mode 100644 index a27276a..0000000 --- a/bash205b-001 +++ /dev/null @@ -1,33 +0,0 @@ - BASH PATCH REPORT - ================= - -Bash-Release: 2.05b -Patch-ID: bash205b-001 - -Bug-Reported-by: taviso@sdf.lonestar.org -Bug-Reference-ID: <200208021107.g72B723d021352@darkstar.example.net> -Bug-Reference-URL: http://mail.gnu.org/pipermail/bug-bash/2002-August/004980.html - -Bug-Description: - -Bash goes into an infinite loop and eventually crashes with a SIGSEGV -when some keys on the numeric keypad are pressed, possibly in combination -with the shift key. - -Patch: - -*** ../bash-2.05b/lib/readline/bind.c Thu Jan 24 11:15:52 2002 ---- lib/readline/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 --git a/bash205b-002 b/bash205b-002 deleted file mode 100644 index 1cca560..0000000 --- a/bash205b-002 +++ /dev/null @@ -1,27 +0,0 @@ - BASH PATCH REPORT - ================= - -Bash-Release: 2.05b -Patch-ID: bash205b-002 - -Bug-Reported-by: rwhron@earthlink.net -Bug-Reference-ID: <20020724000454.GA15210@rushmore> (bug-bash) -Bug-Reference-URL: http://mail.gnu.org/pipermail/bug-bash/2002-July/004856.html - -Bug-Description: - -Repeating an edit in vi-mode with `.' does not work. - -Patch: - -*** ../bash-2.05b/lib/readline/readline.c Wed Mar 13 17:10:46 2002 ---- lib/readline/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 --git a/bash205b-003 b/bash205b-003 deleted file mode 100644 index 2289176..0000000 --- a/bash205b-003 +++ /dev/null @@ -1,58 +0,0 @@ - BASH PATCH REPORT - ================= - -Bash-Release: 2.05b -Patch-ID: bash205b-003 - -Bug-Reported-by: jan.q.bruun-andersen@posten.se -Bug-Reference-ID: -Bug-Reference-URL: http://mail.gnu.org/pipermail/bug-bash/2002-July/004789.html - -Bug-Description: - -In certain cases, Bash appends a space instead of a slash to a directory -name relative to the current directory when performing command name -completion. This affects partial completion of intermediate directory -names. - -Patch: - -*** ../bash-2.05b/bashline.c Tue May 7 15:52:42 2002 ---- bashline.c Sat Aug 3 11:40:16 2002 -*************** -*** 1045,1049 **** ---- 1045,1052 ---- - else - { -+ #define CMD_IS_DIR(x) (absolute_pathname(x) == 0 && *(x) != '~' && test_for_directory (x)) -+ - matches = rl_completion_matches (text, command_word_completion_function); -+ - /* If we are attempting command completion and nothing matches, we - do not want readline to perform filename completion for us. We -*************** -*** 1053,1057 **** - if (matches == (char **)NULL) - rl_ignore_some_completions_function = bash_ignore_filenames; -! else if (matches[1] == 0 && *matches[0] != '/') - /* Turn off rl_filename_completion_desired so readline doesn't - append a slash if there is a directory with the same name ---- 1056,1060 ---- - if (matches == (char **)NULL) - rl_ignore_some_completions_function = bash_ignore_filenames; -! else if (matches[1] == 0 && CMD_IS_DIR(matches[0])) - /* Turn off rl_filename_completion_desired so readline doesn't - append a slash if there is a directory with the same name -*************** -*** 1062,1066 **** - conflict. */ - rl_filename_completion_desired = 0; -! else if (matches[0] && matches[1] && STREQ (matches[0], matches[1]) && *matches[0] != '/') - /* There are multiple instances of the same match (duplicate - completions haven't yet been removed). In this case, all of ---- 1065,1069 ---- - conflict. */ - rl_filename_completion_desired = 0; -! else if (matches[0] && matches[1] && STREQ (matches[0], matches[1]) && CMD_IS_DIR (matches[0])) - /* There are multiple instances of the same match (duplicate - completions haven't yet been removed). In this case, all of diff --git a/bash205b-004 b/bash205b-004 deleted file mode 100644 index cc61e5c..0000000 --- a/bash205b-004 +++ /dev/null @@ -1,41 +0,0 @@ - BASH PATCH REPORT - ================= - -Bash-Release: 2.05b -Patch-ID: bash205b-004 - -Bug-Reported-by: c.f.a.johnson@rogers.com -Bug-Reference-ID: -Bug-Reference-URL: http://mail.gnu.org/pipermail/bug-bash/2002-August/005074.html - -Bug-Description: - -A bug in the bash variable expansion code causes leading blanks in a -variable's value to be ignored when computing its length. - -Patch: - -*** ../bash-2.05b/subst.c Mon Jun 24 07:59:45 2002 ---- subst.c Sat Aug 17 17:28:46 2002 -*************** -*** 1639,1647 **** - /* This performs word splitting and quoted null character removal on - STRING. */ -! #if 0 -! #define issep(c) ((separators)[1] ? (member ((c), separators)) : (c) == (separators)[0]) -! #else -! #define issep(c) ((separators)[1] ? isifs(c) : (c) == (separators)[0]) -! #endif - - WORD_LIST * ---- 1639,1646 ---- - /* This performs word splitting and quoted null character removal on - STRING. */ -! #define issep(c) \ -! (((separators)[0]) ? ((separators)[1] ? isifs(c) \ -! : (c) == (separators)[0]) \ -! : 0) - - WORD_LIST * - - diff --git a/bash205b-005 b/bash205b-005 deleted file mode 100644 index 06872b2..0000000 --- a/bash205b-005 +++ /dev/null @@ -1,86 +0,0 @@ - BASH PATCH REPORT - ================= - -Bash-Release: 2.05b -Patch-ID: bash205b-005 - -Bug-Reported-by: Jim Meyering -Bug-Reference-ID: <87bs6v8iib.fsf@pixie.eng.ascend.com> -Bug-Reference-URL: http://mail.gnu.org/archive/html/bug-bash/2002-09/msg00047.html - -Bug-Description: - -When in a locale with multibyte characters, the readline display updater -will occasionally cause a segmentation fault when attempting to compute -the length of the first multibyte character on the line. - -Patch: - -*** ../bash-2.05b/lib/readline/mbutil.c Tue Jun 4 11:54:29 2002 ---- lib/readline/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 --git a/bash205b-006 b/bash205b-006 deleted file mode 100644 index 65a2eef..0000000 --- a/bash205b-006 +++ /dev/null @@ -1,108 +0,0 @@ - BASH PATCH REPORT - ================= - -Bash-Release: 2.05b -Patch-ID: bash205b-006 - -Bug-Reported-by: clowenst@ucsd.edu -Bug-Reference-ID: <156388ec.0212021151.51a48df1@posting.google.com> -Bug-Reference-URL: - -Bug-Description: - -When running in a locale with multibyte characters, the readline display -updater will use carriage returns when drawing the line, overwriting any -partial output already on the screen and not terminated by a newline. - -Patch: - -*** ../bash-2.05b/lib/readline/display.c Tue Jun 4 10:54:47 2002 ---- lib/readline/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 --git a/bash205b-007 b/bash205b-007 deleted file mode 100644 index 3874e9f..0000000 --- a/bash205b-007 +++ /dev/null @@ -1,49 +0,0 @@ - BASH PATCH REPORT - ================= - -Bash-Release: 2.05b -Patch-ID: bash205b-007 - -Bug-Reported-by: dman@dman.ddts.net -Bug-Reference-ID: <15893.26358.129589.503364@gargle.gargle.HOWL> -Bug-Reference-URL: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=175127 - -Bug-Description: - -Using the vi editing mode's case-changing commands in a locale with -multibyte characters will cause garbage characters to be inserted into -the editing buffer. - -Patch: - -*** ../bash-2.05b/lib/readline/vi_mode.c Thu May 23 13:27:58 2002 ---- lib/readline/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);