Hello community,
here is the log from the commit of package bash
checked in at Wed Dec 6 11:55:18 CET 2006.
--------
--- bash/bash.changes 2006-11-17 15:09:23.000000000 +0100
+++ /mounts/work_src_done/STABLE/bash/bash.changes 2006-11-22 17:29:20.000000000 +0100
@@ -6,0 +7,5 @@
+Tue Nov 14 11:50:32 CET 2006 - werner@suse.de
+
+- Update to bash 3.2 patch level 5
+
+-------------------------------------------------------------------
Old:
----
bash-2.05-2.4.4.patch
bash-3.1-patches.tar.bz2
bash-3.1-printf.patch
bash-3.1-wcschr.dif
bash-3.1.dif
bash-3.1.tar.bz2
readline-5.0-conf.patch
readline-5.0-wrap.patch
readline-5.1-patches.tar.bz2
readline-5.1-random.patch
readline-5.1.dif
readline-5.1.tar.bz2
New:
----
bash-3.2-2.4.4.patch
bash-3.2-patches.tar.bz2
bash-3.2-printf.patch
bash-3.2-wcschr.dif
bash-3.2.dif
bash-3.2.tar.bz2
readline-5.2-conf.patch
readline-5.2-patches.tar.bz2
readline-5.2-wrap.patch
readline-5.2.dif
readline-5.2.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ bash.spec ++++++
--- /var/tmp/diff_new_pack.SseReg/_old 2006-12-06 11:49:13.000000000 +0100
+++ /var/tmp/diff_new_pack.SseReg/_new 2006-12-06 11:49:13.000000000 +0100
@@ -1,5 +1,5 @@
#
-# spec file for package bash (Version 3.1)
+# spec file for package bash (Version 3.2)
#
# Copyright (c) 2006 SUSE LINUX Products GmbH, Nuernberg, Germany.
# This file and all modifications and additions to the pristine
@@ -13,12 +13,12 @@
Name: bash
License: GNU General Public License (GPL)
Group: System/Shells
-Requires: readline >= 5.1
+Requires: readline >= 5.2
Autoreqprov: on
-Version: 3.1
-Release: 52
-%define bash_vers 3.1
-%define rl_vers 5.1
+Version: 3.2
+Release: 1
+%define bash_vers 3.2
+%define rl_vers 5.2
Summary: The GNU Bourne-Again Shell
URL: http://www.gnu.org/software/bash/bash.html
Source0: bash-%{bash_vers}.tar.bz2
@@ -29,7 +29,7 @@
Patch0: bash-%{bash_vers}.dif
Patch1: bash-2.03-manual.patch
Patch2: bash-2.05a-security.patch
-Patch3: bash-2.05-2.4.4.patch
+Patch3: bash-3.2-2.4.4.patch
Patch4: bash-3.1-directory.patch
Patch5: bash-3.0-evalexp.patch
Patch6: bash-3.0-warn-locale.patch
@@ -37,14 +37,13 @@
Patch8: bash-3.0-decl.patch
Patch9: bash-3.1-random.patch
Patch10: bash-3.1-extended_quote.patch
-Patch11: bash-3.1-wcschr.dif
-Patch12: bash-3.1-printf.patch
+Patch11: bash-3.2-wcschr.dif
+Patch12: bash-3.2-printf.patch
Patch13: bash-3.1-loadables.dif
Patch20: readline-%{rl_vers}.dif
Patch21: readline-4.3-input.dif
-Patch22: readline-5.0-wrap.patch
-Patch23: readline-5.0-conf.patch
-Patch24: readline-5.1-random.patch
+Patch22: readline-5.2-wrap.patch
+Patch23: readline-5.2-conf.patch
Patch30: readline-5.1-destdir.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-build
@@ -66,8 +65,8 @@
Summary: The Readline Library
Group: System/Libraries
Provides: bash:/lib/libreadline.so.5
-Version: 5.1
-Release: 52
+Version: 5.2
+Release: 1
Autoreqprov: on
%description -n readline
@@ -86,8 +85,8 @@
Summary: Include Files and Libraries mandatory for Development.
Group: Development/Libraries/C and C++
Provides: bash:/usr/lib/libreadline.a
-Version: 5.1
-Release: 52
+Version: 5.2
+Release: 1
Requires: readline = %{version}-%{release}, %{_libdir}/libncurses.so
Autoreqprov: on
@@ -105,6 +104,7 @@
%prep
%setup -n bash-%{bash_vers} -b1 -b2 -b3
for p in ../bash-%{bash_vers}-patches/*; do
+ test -e $p || break
echo Patch $p
patch -s -p0 < $p
done
@@ -123,12 +123,7 @@
%patch12 -p0 -b .printf
%patch13 -p0 -b .plugins
for p in ../readline-%{rl_vers}-patches/*; do
- case "${p##*/}" in
- readline51-00[234])
- echo ${p##*/} is already included in bash31-patches
- continue
- ;;
- esac
+ test -e $p || break
echo Patch $p
patch -d lib/readline/ -s -p0 < $p
done
@@ -136,17 +131,16 @@
%patch21 -p0 -b .zerotty
%patch22 -p0 -b .wrap
%patch23 -p0 -b .conf
-%patch24 -p0 -b .random
%patch0 -p0
cd ../readline-%{rl_vers}
for p in ../readline-%{rl_vers}-patches/*; do
+ test -e $p || break
echo Patch $p
patch -s -p0 < $p
done
%patch21 -p2 -b .zerotty
%patch22 -p2 -b .wrap
%patch23 -p2 -b .conf
-%patch24 -p2 -b .random
%patch30 -p0 -b .destdir
%patch20 -p0
@@ -308,8 +302,7 @@
%doc %{_mandir}/man1/bashbug.1.gz
%doc %{_mandir}/man1/rbash.1.gz
%doc %{_defaultdocdir}/bash/
-/usr/share/locale/en@boldquot/LC_MESSAGES/bash.mo
-/usr/share/locale/en@quot/LC_MESSAGES/bash.mo
+/usr/share/locale/*/LC_MESSAGES/bash.mo
%files -n readline
%defattr(-,root,root)
@@ -332,6 +325,8 @@
%changelog -n bash
* Fri Nov 17 2006 - werner@suse.de
- Remove /usr/bin/bash (#206000)
+* Tue Nov 14 2006 - werner@suse.de
+- Update to bash 3.2 patch level 5
* Wed Sep 27 2006 - werner@suse.de
- Use PIE to make a shared bash binary
- Make the bash modules build for testing
++++++ bash-2.05-2.4.4.patch -> bash-3.2-2.4.4.patch ++++++
--- bash/bash-2.05-2.4.4.patch 2002-09-27 11:27:42.000000000 +0200
+++ /mounts/work_src_done/STABLE/bash/bash-3.2-2.4.4.patch 2006-11-14 11:31:37.000000000 +0100
@@ -1,6 +1,28 @@
+--- array.c
++++ array.c 2006-11-14 10:54:22.000000000 +0100
+@@ -724,7 +724,7 @@ char *s, *sep;
+ * To make a running version, compile -DTEST_ARRAY and link with:
+ * xmalloc.o syntax.o lib/malloc/libmalloc.a lib/sh/libsh.a
+ */
+-int interrupt_immediately = 0;
++volatile sig_atomic_t interrupt_immediately = 0;
+
+ int
+ signal_is_trapped(s)
+--- hashlib.c
++++ hashlib.c 2006-11-14 10:54:36.000000000 +0100
+@@ -381,7 +381,7 @@ hash_pstats (table, name)
+
+ HASH_TABLE *table, *ntable;
+
+-int interrupt_immediately = 0;
++volatile sig_atomic_t interrupt_immediately = 0;
+
+ int
+ signal_is_trapped (s)
--- jobs.c
-+++ jobs.c Wed May 2 18:20:31 2001
-@@ -1166,6 +1166,15 @@
++++ jobs.c 2001-05-02 18:20:31.000000000 +0200
+@@ -1701,6 +1701,15 @@ make_child (command, async_p)
pid_t mypid;
mypid = getpid ();
@@ -17,8 +39,8 @@
/* Close default_buffered_input if it's > 0. We don't close it if it's
0 because that's the file descriptor used when redirecting input,
--- quit.h
-+++ quit.h Wed May 2 17:38:34 2001
-@@ -21,8 +21,12 @@
++++ quit.h 2006-11-14 10:43:18.000000000 +0100
+@@ -21,9 +21,13 @@
#if !defined (_QUIT_H_)
#define _QUIT_H_
@@ -27,28 +49,82 @@
+#undef __need_sig_atomic_t
+
/* Non-zero means SIGINT has already ocurred. */
--extern int interrupt_state;
+-extern volatile int interrupt_state;
+-extern volatile int terminating_signal;
+extern volatile sig_atomic_t interrupt_state;
++extern volatile sig_atomic_t terminating_signal;
- extern void throw_to_top_level ();
-
+ /* Macro to call a great deal. SIGINT just sets the interrupt_state variable.
+ When it is safe, put QUIT in the code, and the "interrupt" will take
--- sig.c
-+++ sig.c Wed May 2 17:36:17 2001
-@@ -57,7 +57,7 @@
- extern int interactive, interactive_shell, login_shell, startup_state;
++++ sig.c 2006-11-14 10:53:51.000000000 +0100
+@@ -59,13 +59,13 @@ extern int loop_level, continuing, break
+ extern int parse_and_execute_level, shell_initialized;
/* Non-zero after SIGINT. */
--int interrupt_state;
+-volatile int interrupt_state = 0;
+volatile sig_atomic_t interrupt_state = 0;
+ /* Non-zero after SIGWINCH */
+-volatile int sigwinch_received = 0;
++volatile sig_atomic_t sigwinch_received = 0;
+
+ /* Set to the value of any terminating signal received. */
+-volatile int terminating_signal = 0;
++volatile sig_atomic_t terminating_signal = 0;
+
/* The environment at the top-level R-E loop. We use this in
the case of error return. */
-@@ -69,7 +69,7 @@
+@@ -77,10 +77,10 @@ sigset_t top_level_mask;
#endif /* JOB_CONTROL */
/* When non-zero, we throw_to_top_level (). */
-int interrupt_immediately = 0;
+volatile sig_atomic_t interrupt_immediately = 0;
- static void initialize_shell_signals ();
+ /* When non-zero, we call the terminating signal handler immediately. */
+-int terminate_immediately = 0;
++volatile sig_atomic_t terminate_immediately = 0;
+
+ #if defined (SIGWINCH)
+ static SigHandler *old_winch = (SigHandler *)SIG_DFL;
+--- sig.h
++++ sig.h 2006-11-14 10:49:32.000000000 +0100
+@@ -108,11 +108,15 @@ do { \
+
+ #endif /* JOB_CONTROL */
+
++#define __need_sig_atomic_t
++#include
++#undef __need_sig_atomic_t
++
+ /* Extern variables */
+-extern volatile int sigwinch_received;
++extern volatile sig_atomic_t sigwinch_received;
+
+-extern int interrupt_immediately;
+-extern int terminate_immediately;
++extern volatile sig_atomic_t interrupt_immediately;
++extern volatile sig_atomic_t terminate_immediately;
+
+ /* Functions from sig.c. */
+ extern sighandler termsig_sighandler __P((int));
+--- examples/loadables/tee.c
++++ examples/loadables/tee.c 2006-11-14 11:31:29.000000000 +0100
+@@ -17,6 +17,7 @@
+ #include "bashansi.h"
+
+ #include
++#include
+ #include
+
+ #include "builtins.h"
+@@ -37,7 +38,7 @@ static FLIST *tee_flist;
+
+ #define TEE_BUFSIZE 8192
+
+-extern int interrupt_immediately;
++extern volatile sig_atomic_t interrupt_immediately;
+
+ extern char *strerror ();
++++++ bash-3.1-patches.tar.bz2 -> bash-3.2-patches.tar.bz2 ++++++
++++ 2132 lines of diff (skipped)
++++++ bash-3.1-printf.patch -> bash-3.2-printf.patch ++++++
--- bash/bash-3.1-printf.patch 2006-07-27 17:11:44.000000000 +0200
+++ /mounts/work_src_done/STABLE/bash/bash-3.2-printf.patch 2006-11-14 11:16:56.000000000 +0100
@@ -8,19 +8,7 @@
#include "../bashtypes.h"
-@@ -132,6 +133,11 @@ extern int errno;
- vbuf = 0; \
- } \
- fflush (stdout); \
-+ if (ferror (stdout)) \
-+ { \
-+ clearerr (stdout); \
-+ return (EXECUTION_FAILURE); \
-+ } \
- return (value); \
- } \
- while (0)
-@@ -487,12 +493,20 @@ printf_builtin (list)
+@@ -501,12 +502,20 @@ printf_builtin (list)
case 'A':
#endif
{
++++++ bash-3.1-wcschr.dif -> bash-3.2-wcschr.dif ++++++
--- bash/bash-3.1-wcschr.dif 2006-05-31 19:06:52.000000000 +0200
+++ /mounts/work_src_done/STABLE/bash/bash-3.2-wcschr.dif 2006-11-13 17:43:36.000000000 +0100
@@ -1,12 +1,9 @@
--- subst.c
-+++ subst.c 2006-05-31 16:59:58.000000000 +0000
-@@ -946,8 +946,9 @@
- len = mbstowcs (wcharlist, charlist, 0);
- if (len == -1)
++++ subst.c 2006-11-13 17:42:38.000000000 +0100
+@@ -950,6 +950,7 @@ string_extract_verbatim (string, slen, s
len = 0;
-- wcharlist = xmalloc ((sizeof (wchar_t) * len) + 1);
-+ wcharlist = xmalloc ((sizeof (wchar_t)) * (len + 1));
- mbstowcs (wcharlist, charlist, len);
+ wcharlist = (wchar_t *)xmalloc (sizeof (wchar_t) * (len + 1));
+ mbstowcs (wcharlist, charlist, len + 1);
+ wcharlist[len] = (wchar_t)0;
}
++++++ bash-3.1-wcschr.dif -> bash-3.2.dif ++++++
--- bash/bash-3.1-wcschr.dif 2006-05-31 19:06:52.000000000 +0200
+++ /mounts/work_src_done/STABLE/bash/bash-3.2.dif 2006-11-14 11:03:00.000000000 +0100
@@ -1,13 +1,232 @@
+--- .pkgextract
++++ .pkgextract 2006-03-27 14:15:25.000000000 +0200
+@@ -0,0 +1,16 @@
++tar Oxfj ../bash-3.2-patches.tar.bz2 | patch -p0 -s
++patch -p0 -s --suffix=".manual" < ../bash-2.03-manual.patch
++patch -p0 -s --suffix=".security" < ../bash-2.05a-security.patch
++patch -p0 -s --suffix=".2.4.4" < ../bash-3.2-2.4.4.patch
++patch -p0 -s --suffix=".directory"< ../bash-3.1-directory.patch
++patch -p0 -s --suffix=".evalexp" < ../bash-3.0-evalexp.patch
++patch -p0 -s --suffix=".warnlc" < ../bash-3.0-warn-locale.patch
++patch -p0 -s --suffix=".nfs_redir"< ../bash-3.0-nfs_redir.patch
++patch -p0 -s --suffix=".decl" < ../bash-3.0-decl.patch
++patch -p1 -s --suffix=".random2" < ../bash-3.1-random.patch
++patch -p0 -s --suffix=".equote" < ../bash-3.1-extended_quote.patch
++patch -p0 -s --suffix=".wcschr" < ../bash-3.2-wcschr.dif
++patch -p0 -s --suffix=".loadable" < ../bash-3.1-loadables.dif
++patch -p0 -s --suffix=".zerotty" < ../readline-4.3-input.dif
++patch -p0 -s --suffix=".wrap" < ../readline-5.2-wrap.patch
++patch -p0 -s --suffix=".conf" < ../readline-5.2-conf.patch
+--- config-top.h
++++ config-top.h 2006-03-27 14:15:25.000000000 +0200
+@@ -52,14 +52,14 @@
+ /* The default value of the PATH variable. */
+ #ifndef DEFAULT_PATH_VALUE
+ #define DEFAULT_PATH_VALUE \
+- "/usr/gnu/bin:/usr/local/bin:/bin:/usr/bin:."
++ "/usr/local/bin:/bin:/usr/bin:/usr/X11R6/bin:."
+ #endif
+
+ /* The value for PATH when invoking `command -p'. This is only used when
+ the Posix.2 confstr () function, or CS_PATH define are not present. */
+ #ifndef STANDARD_UTILS_PATH
+ #define STANDARD_UTILS_PATH \
+- "/bin:/usr/bin:/sbin:/usr/sbin:/etc:/usr/etc"
++ "/bin:/usr/bin:/sbin:/usr/sbin"
+ #endif
+
+ /* Default primary and secondary prompt strings. */
+@@ -73,14 +73,14 @@
+ #define KSH_COMPATIBLE_SELECT
+
+ /* System-wide .bashrc file for interactive shells. */
+-/* #define SYS_BASHRC "/etc/bash.bashrc" */
++#define SYS_BASHRC "/etc/bash.bashrc"
+
+ /* System-wide .bash_logout for login shells. */
+-/* #define SYS_BASH_LOGOUT "/etc/bash.bash_logout" */
++#define SYS_BASH_LOGOUT "/etc/bash.bash_logout"
+
+ /* Define this to make non-interactive shells begun with argv[0][0] == '-'
+ run the startup files when not in posix mode. */
+-/* #define NON_INTERACTIVE_LOGIN_SHELLS */
++#define NON_INTERACTIVE_LOGIN_SHELLS
+
+ /* Define this if you want bash to try to check whether it's being run by
+ sshd and source the .bashrc if so (like the rshd behavior). */
+--- general.h
++++ general.h 2006-03-27 14:15:25.000000000 +0200
+@@ -21,10 +21,13 @@
+ #if !defined (_GENERAL_H_)
+ #define _GENERAL_H_
+
++#include
++#include
+ #include "stdc.h"
+
+ #include "bashtypes.h"
+ #include "chartypes.h"
++#include "bashline.h"
+
+ #if defined (HAVE_SYS_RESOURCE_H) && defined (RLIMTYPE)
+ # if defined (HAVE_SYS_TIME_H)
+--- jobs.c
++++ jobs.c 2006-03-27 14:15:25.000000000 +0200
+@@ -197,10 +197,10 @@ int previous_job = NO_JOB;
+ #endif
+
+ /* Last child made by the shell. */
+-pid_t last_made_pid = NO_PID;
++volatile pid_t last_made_pid = NO_PID;
+
+ /* Pid of the last asynchronous child. */
+-pid_t last_asynchronous_pid = NO_PID;
++volatile pid_t last_asynchronous_pid = NO_PID;
+
+ /* The pipeline currently being built. */
+ PROCESS *the_pipeline = (PROCESS *)NULL;
+@@ -213,7 +213,7 @@ int already_making_children = 0;
+
+ /* If this is non-zero, $LINES and $COLUMNS are reset after every process
+ exits from get_tty_state(). */
+-int check_window_size;
++int check_window_size = 1;
+
+ /* Functions local to this file. */
+
+--- jobs.h
++++ jobs.h 2006-03-27 14:15:25.000000000 +0200
+@@ -162,7 +162,7 @@ extern pid_t fork (), getpid (), getpgrp
+ extern struct jobstats js;
+
+ extern pid_t original_pgrp, shell_pgrp, pipeline_pgrp;
+-extern pid_t last_made_pid, last_asynchronous_pid;
++extern volatile pid_t last_made_pid, last_asynchronous_pid;
+ extern int asynchronous_notification;
+
+ extern JOB **jobs;
+--- parse.y
++++ parse.y 2006-03-27 14:15:25.000000000 +0200
+@@ -1182,7 +1182,7 @@ input_file_descriptor ()
+
+ #if defined (READLINE)
+ char *current_readline_prompt = (char *)NULL;
+-char *current_readline_line = (char *)NULL;
++unsigned char *current_readline_line = (unsigned char *)NULL;
+ int current_readline_line_index = 0;
+
+ static int
+--- shell.c
++++ shell.c 2006-03-27 14:15:25.000000000 +0200
+@@ -460,7 +460,7 @@ main (argc, argv, env)
+ if (dump_translatable_strings)
+ read_but_dont_execute = 1;
+
+- if (running_setuid && privileged_mode == 0)
++ if (running_setuid && privileged_mode == 0 /* && act_like_sh == 0 */)
+ disable_priv_mode ();
+
+ /* Need to get the argument to a -c option processed in the
--- subst.c
-+++ subst.c 2006-05-31 16:59:58.000000000 +0000
-@@ -946,8 +946,9 @@
- len = mbstowcs (wcharlist, charlist, 0);
- if (len == -1)
- len = 0;
-- wcharlist = xmalloc ((sizeof (wchar_t) * len) + 1);
-+ wcharlist = xmalloc ((sizeof (wchar_t)) * (len + 1));
- mbstowcs (wcharlist, charlist, len);
-+ wcharlist[len] = (wchar_t)0;
- }
++++ subst.c 2006-03-27 14:15:25.000000000 +0200
+@@ -2707,6 +2707,7 @@ call_expand_word_internal (w, q, i, c, e
+ last_command_exit_value = EXECUTION_FAILURE;
+ exp_jump_to_top_level ((result == &expand_word_error) ? DISCARD : FORCE_EOF);
+ /* NOTREACHED */
++ return NULL; /* make stupid compiler happy */
+ }
+ else
+ return (result);
+--- variables.c
++++ variables.c 2006-03-27 14:15:25.000000000 +0200
+@@ -1191,8 +1191,10 @@ assign_random (self, value, unused)
+ arrayind_t unused;
+ {
+ sbrand (strtoul (value, (char **)NULL, 10));
++#if !defined(linux)
+ if (subshell_environment)
+ seeded_subshell = 1;
++#endif
+ return (self);
+ }
+
+--- builtins/shopt.def
++++ builtins/shopt.def 2006-03-27 14:15:25.000000000 +0200
+@@ -252,9 +252,9 @@ reset_shopt_options ()
+ allow_null_glob_expansion = glob_dot_filenames = 0;
+ cdable_vars = mail_warning = 0;
+ no_exit_on_failed_exec = print_shift_error = 0;
+- check_hashed_filenames = cdspelling = expand_aliases = check_window_size = 0;
++ check_hashed_filenames = cdspelling = expand_aliases = 0;
+
+- source_uses_path = promptvars = 1;
++ check_window_size = source_uses_path = promptvars = 1;
+
+ #if defined (EXTENDED_GLOB)
+ extended_glob = 0;
+--- doc/Makefile.in
++++ doc/Makefile.in 2006-03-27 14:15:25.000000000 +0200
+@@ -141,7 +141,7 @@ BASHREF_FILES = $(srcdir)/bashref.texi $
+ ${RM} $@
+ -${DVIPS} $<
+
+-all: ps info dvi text html
++all: info html
+ nodvi: ps info text html
+
+ PSFILES = bash.ps bashbug.ps article.ps builtins.ps rbash.ps
+--- doc/bash.1
++++ doc/bash.1 2006-03-27 14:15:25.000000000 +0200
+@@ -4370,8 +4370,8 @@ file (the \fIinputrc\fP file).
+ The name of this file is taken from the value of the
+ .SM
+ .B INPUTRC
+-variable. If that variable is unset, the default is
+-.IR ~/.inputrc .
++environment variable. If that variable is unset, readline will read both
++.IR /etc/inputrc " and " ~/.inputrc .
+ When a program which uses the readline library starts up, the
+ initialization file is read, and the key bindings and variables
+ are set.
+@@ -8816,6 +8816,9 @@ The individual login shell cleanup file,
+ .TP
+ .FN ~/.inputrc
+ Individual \fIreadline\fP initialization file
++.TP
++.FN /etc/inputrc
++System \fBreadline\fP initialization file
+ .PD
+ .SH AUTHORS
+ Brian Fox, Free Software Foundation
+--- support/rlvers.sh
++++ support/rlvers.sh 2006-03-27 14:15:25.000000000 +0200
+@@ -27,10 +27,10 @@ TDIR=$TMPDIR/rlvers
+
+ # defaults
+ CC=cc
+-RL_LIBDIR=/usr/local/lib
+-RL_INCDIR=/usr/local/include
++RL_LIBDIR=/lib
++RL_INCDIR=/usr/include
+
+-TERMCAP_LIB="-ltermcap"
++TERMCAP_LIB="-lncurses"
+
+ # cannot rely on the presence of getopts
+ while [ $# -gt 0 ]; do
+--- support/shobj-conf
++++ support/shobj-conf 2006-09-22 16:11:58.000000000 +0200
+@@ -108,10 +108,11 @@ sunos5*|solaris2*)
+ linux*-*|gnu*-*|k*bsd*-gnu-*)
+ SHOBJ_CFLAGS=-fPIC
+ SHOBJ_LD='${CC}'
+- SHOBJ_LDFLAGS='-shared -Wl,-soname,$@'
++ SHOBJ_LDFLAGS='-shared'
+
+- SHLIB_XLDFLAGS='-Wl,-rpath,$(libdir) -Wl,-soname,`basename $@ $(SHLIB_MINOR)`'
++ SHLIB_XLDFLAGS='-Wl,-rpath-link,$(libdir) -Wl,-soname,`basename $@ $(SHLIB_MINOR)`'
+ SHLIB_LIBVERSION='$(SHLIB_LIBSUFF).$(SHLIB_MAJOR)$(SHLIB_MINOR)'
++ SHLIB_LIBS=-lncurses
+ ;;
- if (wcschr (wcharlist, wc))
+ freebsd2* | netbsd*)
++++++ bash-3.1-patches.tar.bz2 -> bash-3.2.tar.bz2 ++++++
++++ 335706 lines of diff (skipped)
++++++ readline-5.0-conf.patch -> readline-5.2-conf.patch ++++++
--- bash/readline-5.0-conf.patch 2006-09-14 17:58:54.000000000 +0200
+++ /mounts/work_src_done/STABLE/bash/readline-5.2-conf.patch 2006-11-14 11:19:34.000000000 +0100
@@ -1,6 +1,6 @@
--- lib/readline/bind.c
-+++ lib/readline/bind.c 2006-09-14 17:58:06.000000000 +0200
-@@ -723,6 +723,9 @@ rl_function_of_keyseq (keyseq, map, type
++++ lib/readline/bind.c 2006-11-13 17:20:23.000000000 +0100
+@@ -752,6 +752,9 @@ rl_function_of_keyseq (keyseq, map, type
/* The last key bindings file read. */
static char *last_readline_init_file = (char *)NULL;
@@ -10,7 +10,7 @@
/* The file we're currently reading key bindings from. */
static const char *current_readline_init_file;
static int current_readline_init_include_level;
-@@ -786,11 +789,14 @@ rl_re_read_init_file (count, ignore)
+@@ -815,11 +818,14 @@ rl_re_read_init_file (count, ignore)
return r;
}
@@ -23,55 +23,53 @@
2. the value of the shell variable `INPUTRC'
- 3. ~/.inputrc
+ 3. /etc/inputrc and ~/.inputrc
+ 4. /etc/inputrc
If the file existed and could be opened and read, 0 is returned,
otherwise errno is returned. */
- int
-@@ -802,13 +808,43 @@ rl_read_init_file (filename)
- {
- filename = last_readline_init_file;
- if (filename == 0)
-- filename = sh_get_env_value ("INPUTRC");
-+ {
-+ filename = sh_get_env_value ("INPUTRC");
-+ if (filename && !strncmp(SYSTEM_INPUTRC, filename, strlen(SYSTEM_INPUTRC)))
-+ {
-+ struct stat st;
-+ char *default_inputrc = tilde_expand(DEFAULT_INPUTRC);
-+
-+ if ((stat(default_inputrc, &st) == 0))
-+ {
-+ filename = DEFAULT_INPUTRC;
-+ read_system_init_file = 1;
-+ }
-+ else
-+ read_system_init_file = 0;
-+
-+ free(default_inputrc);
-+ }
-+ else
-+ read_system_init_file = 1;
-+ }
- if (filename == 0)
-+ {
- filename = DEFAULT_INPUTRC;
+@@ -831,16 +837,37 @@ rl_read_init_file (filename)
+ if (filename == 0)
+ filename = last_readline_init_file;
+ if (filename == 0)
+- filename = sh_get_env_value ("INPUTRC");
++ {
++ filename = sh_get_env_value ("INPUTRC");
++ if (filename && !strncmp(SYS_INPUTRC, filename, strlen(SYS_INPUTRC)))
++ {
++ struct stat st;
++ char *default_inputrc = tilde_expand(DEFAULT_INPUTRC);
++
++ if ((stat(default_inputrc, &st) == 0))
++ {
++ filename = DEFAULT_INPUTRC;
++ read_system_init_file = 1;
++ }
++ else
++ read_system_init_file = 0;
++
++ free(default_inputrc);
++ }
++ else
+ read_system_init_file = 1;
-+ }
++ }
+ if (filename == 0 || *filename == 0)
+ {
+ filename = DEFAULT_INPUTRC;
+- /* Try to read DEFAULT_INPUTRC; fall back to SYS_INPUTRC on failure */
+- if (_rl_read_init_file (filename, 0) == 0)
+- return 0;
+- filename = SYS_INPUTRC;
++ read_system_init_file = 1;
}
- if (*filename == 0)
-+ {
- filename = DEFAULT_INPUTRC;
-+ read_system_init_file = 1;
-+ }
-+
+ sv_bell_style(sh_get_env_value("DEFAULT_BELL_STYLE"));
+
+ if (read_system_init_file)
-+ _rl_read_init_file (SYSTEM_INPUTRC, 1);
-
++ _rl_read_init_file (SYS_INPUTRC, 1);
++
#if defined (__MSDOS__)
if (_rl_read_init_file (filename, 0) == 0)
-@@ -1319,7 +1355,14 @@ rl_parse_and_bind (string)
+ return 0;
+@@ -1350,7 +1377,14 @@ rl_parse_and_bind (string)
rl_macro_bind (seq, &funname[1], _rl_keymap);
}
else
@@ -87,7 +85,7 @@
free (seq);
return 0;
-@@ -1456,7 +1499,6 @@ typedef int _rl_sv_func_t PARAMS((const
+@@ -1487,7 +1521,6 @@ typedef int _rl_sv_func_t PARAMS((const
#define V_INT 2
/* Forward declarations */
@@ -96,29 +94,25 @@
static int sv_compquery PARAMS((const char *));
static int sv_editmode PARAMS((const char *));
--- lib/readline/rlconf.h
-+++ lib/readline/rlconf.h 2006-03-22 16:23:22.000000000 +0100
-@@ -35,10 +35,11 @@
++++ lib/readline/rlconf.h 2006-11-13 17:21:26.000000000 +0100
+@@ -35,7 +35,7 @@
#define HANDLE_SIGNALS
/* Ugly but working hack for binding prefix meta. */
-#define PREFIX_META_HACK
+#undef PREFIX_META_HACK
- /* The final, last-ditch effort file name for an init file. */
+ /* The next-to-last-ditch effort file name for a user-specific init file. */
#define DEFAULT_INPUTRC "~/.inputrc"
-+#define SYSTEM_INPUTRC "/etc/inputrc"
-
- /* If defined, expand tabs to spaces. */
- #define DISPLAY_TABS
--- lib/readline/doc/rluser.texi
-+++ lib/readline/doc/rluser.texi 2006-03-22 14:18:33.000000000 +0100
-@@ -336,7 +336,8 @@ file is taken from the value of the shel
- @ifclear BashFeatures
- file is taken from the value of the environment variable @env{INPUTRC}. If
++++ lib/readline/doc/rluser.texi 2006-11-13 17:23:56.000000000 +0100
+@@ -338,7 +338,8 @@ file is taken from the value of the envi
@end ifclear
--that variable is unset, the default is @file{~/.inputrc}.
-+that variable is unset, Readline will read both @file{/etc/inputrc} and
-+@file{~/.inputrc}.
+ that variable is unset, the default is @file{~/.inputrc}. If that
+ file does not exist or cannot be read, the ultimate default is
+-@file{/etc/inputrc}.
++@file{/etc/inputrc}. If both @file{~/.inputrc} and @file{/etc/inputrc}
++exist Readline will read first @file{/etc/inputrc} and then @file{~/.inputrc}.
When a program which uses the Readline library starts up, the
init file is read, and the key bindings are set.
++++++ readline-5.1-patches.tar.bz2 -> readline-5.2-patches.tar.bz2 ++++++
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/readline-5.1-patches/readline51-001 new/readline-5.2-patches/readline51-001
--- old/readline-5.1-patches/readline51-001 2005-12-21 22:49:00.000000000 +0100
+++ new/readline-5.2-patches/readline51-001 1970-01-01 01:00:00.000000000 +0100
@@ -1,77 +0,0 @@
- READLINE PATCH REPORT
- =====================
-
-Readline-Release: 5.1
-Patch-ID: readline51-001
-
-Bug-Reported-by: Andreas Schwab
-Bug-Reference-ID: <20051213141916.4014A394BFABD@sykes.suse.de>
-Bug-Reference-URL: http://lists.gnu.org/archive/html/bug-bash/2005-12/msg00038.html
-
-Bug-Description:
-
-A problem with the readline callback interface can result in segmentation
-faults when using the delete-char function via a multiple-key sequence.
-Two consecutive calls to delete-char will crash the application calling
-readline.
-
-Patch:
-
-*** ../readline-5.1/readline.c Mon Jul 4 22:29:35 2005
---- readline.c Tue Dec 20 17:38:29 2005
-***************
-*** 715,719 ****
- rl_dispatching = 1;
- RL_SETSTATE(RL_STATE_DISPATCHING);
-! r = (*map[key].function)(rl_numeric_arg * rl_arg_sign, key);
- RL_UNSETSTATE(RL_STATE_DISPATCHING);
- rl_dispatching = 0;
---- 715,719 ----
- rl_dispatching = 1;
- RL_SETSTATE(RL_STATE_DISPATCHING);
-! (*map[key].function)(rl_numeric_arg * rl_arg_sign, key);
- RL_UNSETSTATE(RL_STATE_DISPATCHING);
- rl_dispatching = 0;
-*** ../readline-5.1/text.c Sat Sep 24 19:06:07 2005
---- text.c Tue Dec 20 17:38:26 2005
-***************
-*** 1072,1077 ****
- int count, key;
- {
-- int r;
--
- if (count < 0)
- return (_rl_rubout_char (-count, key));
---- 1072,1075 ----
-***************
-*** 1091,1097 ****
- rl_forward_byte (count, key);
-
-! r = rl_kill_text (orig_point, rl_point);
- rl_point = orig_point;
-- return r;
- }
- else
---- 1089,1094 ----
- rl_forward_byte (count, key);
-
-! rl_kill_text (orig_point, rl_point);
- rl_point = orig_point;
- }
- else
-***************
-*** 1100,1105 ****
-
- new_point = MB_NEXTCHAR (rl_line_buffer, rl_point, 1, MB_FIND_NONZERO);
-! return (rl_delete_text (rl_point, new_point));
- }
- }
-
---- 1097,1103 ----
-
- new_point = MB_NEXTCHAR (rl_line_buffer, rl_point, 1, MB_FIND_NONZERO);
-! rl_delete_text (rl_point, new_point);
- }
-+ return 0;
- }
-
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/readline-5.1-patches/readline51-002 new/readline-5.2-patches/readline51-002
--- old/readline-5.1-patches/readline51-002 2006-02-04 18:06:00.000000000 +0100
+++ new/readline-5.2-patches/readline51-002 1970-01-01 01:00:00.000000000 +0100
@@ -1,43 +0,0 @@
- READLINE PATCH REPORT
- =====================
-
-Readline-Release: 5.1
-Patch-ID: readline51-002
-
-Bug-Reported-by: Mike Frysinger
-Bug-Reference-ID: <200601120613.11907.vapier@gentoo.org>
-Bug-Reference-URL: http://lists.gnu.org/archive/html/bug-bash/2006-01/msg00045.html
-
-Bug-Description:
-
-Under some circumstances, Readline can use an incorrect setting for the flag
-that indicates whether or not the terminal can auto-wrap, resulting in line-
-wrapping errors.
-
-Patch:
-
-*** ../readline-5.1/terminal.c Sat Nov 12 20:46:54 2005
---- terminal.c Tue Jan 31 10:57:54 2006
-***************
-*** 123,127 ****
-
- /* Non-zero means the terminal can auto-wrap lines. */
-! int _rl_term_autowrap;
-
- /* Non-zero means that this terminal has a meta key. */
---- 126,130 ----
-
- /* Non-zero means the terminal can auto-wrap lines. */
-! int _rl_term_autowrap = -1;
-
- /* Non-zero means that this terminal has a meta key. */
-***************
-*** 275,278 ****
---- 278,284 ----
- int rows, cols;
- {
-+ if (_rl_term_autowrap == -1)
-+ _rl_init_terminal_io (rl_terminal_name);
-+
- if (rows > 0)
- _rl_screenheight = rows;
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/readline-5.1-patches/readline51-003 new/readline-5.2-patches/readline51-003
--- old/readline-5.1-patches/readline51-003 2006-03-16 14:14:00.000000000 +0100
+++ new/readline-5.2-patches/readline51-003 1970-01-01 01:00:00.000000000 +0100
@@ -1,29 +0,0 @@
- READLINE PATCH REPORT
- =====================
-
-Readline-Release: 5.1
-Patch-ID: readline51-003
-
-Bug-Reported-by: Bob Rossi
-Bug-Reference-ID: <43F60606.80708@case.edu>
-Bug-Reference-URL:
-
-Bug-Description:
-
-In some cases, readline will reference freed memory when attempting to
-display a portion of the prompt.
-
-Patch:
-
-*** ../readline-5.1/readline.c Tue Dec 20 17:38:29 2005
---- readline.c Fri Feb 17 22:54:22 2006
-***************
-*** 282,287 ****
---- 282,288 ----
- {
- FREE (rl_prompt);
- rl_prompt = prompt ? savestring (prompt) : (char *)NULL;
-+ rl_display_prompt = rl_prompt ? rl_prompt : "";
-
- rl_visible_prompt_length = rl_expand_prompt (rl_prompt);
- return 0;
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/readline-5.1-patches/readline51-004 new/readline-5.2-patches/readline51-004
--- old/readline-5.1-patches/readline51-004 2006-03-16 14:15:00.000000000 +0100
+++ new/readline-5.2-patches/readline51-004 1970-01-01 01:00:00.000000000 +0100
@@ -1,90 +0,0 @@
- READLINE PATCH REPORT
- =====================
-
-Readline-Release: 5.1
-Patch-ID: readline51-004
-
-Bug-Reported-by: Mike Stroyan
-Bug-Reference-ID: <20060203191607.GC27614@localhost>
-Bug-Reference-URL: http://lists.gnu.org/archive/html/bug-bash/2006-02/msg00004.html
-
-Bug-Description:
-
-The displayed search prompt is corrupted when using non-incremental
-searches in vi and emacs mode if the prompt contains non-printing
-characters or spans multiple lines. The prompt is expanded more than
-once; the second time without the escape sequences that protect non-
-printing characters from the length calculations.
-
-Patch:
-
-*** ../readline-5.1-patched/display.c Wed Nov 30 14:05:02 2005
---- display.c Sat Feb 18 12:14:58 2006
-***************
-*** 1983,1993 ****
- int pchar;
- {
- int len;
-! char *pmt;
-
- rl_save_prompt ();
-
-! if (saved_local_prompt == 0)
- {
- len = (rl_prompt && *rl_prompt) ? strlen (rl_prompt) : 0;
- pmt = (char *)xmalloc (len + 2);
---- 1998,2012 ----
- int pchar;
- {
- int len;
-! char *pmt, *p;
-
- rl_save_prompt ();
-
-! /* We've saved the prompt, and can do anything with the various prompt
-! strings we need before they're restored. We want the unexpanded
-! portion of the prompt string after any final newline. */
-! p = rl_prompt ? strrchr (rl_prompt, '\n') : 0;
-! if (p == 0)
- {
- len = (rl_prompt && *rl_prompt) ? strlen (rl_prompt) : 0;
- pmt = (char *)xmalloc (len + 2);
-***************
-*** 1998,2016 ****
- }
- else
- {
-! len = *saved_local_prompt ? strlen (saved_local_prompt) : 0;
- pmt = (char *)xmalloc (len + 2);
- if (len)
-! strcpy (pmt, saved_local_prompt);
- pmt[len] = pchar;
- pmt[len+1] = '\0';
-! local_prompt = savestring (pmt);
-! prompt_last_invisible = saved_last_invisible;
-! prompt_visible_length = saved_visible_length + 1;
-! }
-
- prompt_physical_chars = saved_physical_chars + 1;
--
- return pmt;
- }
-
---- 2017,2033 ----
- }
- else
- {
-! p++;
-! len = strlen (p);
- pmt = (char *)xmalloc (len + 2);
- if (len)
-! strcpy (pmt, p);
- pmt[len] = pchar;
- pmt[len+1] = '\0';
-! }
-
-+ /* will be overwritten by expand_prompt, called from rl_message */
- prompt_physical_chars = saved_physical_chars + 1;
- return pmt;
- }
-
++++++ readline-5.0-wrap.patch -> readline-5.2-wrap.patch ++++++
--- bash/readline-5.0-wrap.patch 2005-04-19 17:14:17.000000000 +0200
+++ /mounts/work_src_done/STABLE/bash/readline-5.2-wrap.patch 2006-11-13 17:29:32.000000000 +0100
@@ -1,17 +1,14 @@
---- lib/readline/display.c 2005-01-18 12:34:39.489668286 +0000
-+++ lib/readline/display.c 2005-01-18 12:35:29.127187527 +0000
-@@ -622,10 +622,11 @@
-
+--- lib/readline/display.c
++++ lib/readline/display.c 2006-11-13 16:55:24.000000000 +0100
+@@ -665,7 +665,10 @@
inv_lbreaks[++newlines] = temp;
#if defined (HANDLE_MULTIBYTE)
-- lpos -= _rl_col_width (local_prompt, n0, num);
--#else
-- lpos -= _rl_screenwidth;
-+ if (local_prompt)
-+ lpos -= _rl_col_width (local_prompt, n0, num);
-+ else
+ if (MB_CUR_MAX > 1 && rl_byte_oriented == 0)
+- lpos -= _rl_col_width (local_prompt, n0, num);
++ {
++ if (local_prompt_len > 0)
++ lpos -= _rl_col_width (local_prompt, n0, num);
++ }
+ else
#endif
-+ lpos -= _rl_screenwidth;
- }
-
- prompt_last_screen_line = newlines;
+ lpos -= _rl_screenwidth;
++++++ readline-5.1.dif -> readline-5.2.dif ++++++
--- bash/readline-5.1.dif 2006-09-22 16:18:12.000000000 +0200
+++ /mounts/work_src_done/STABLE/bash/readline-5.2.dif 2006-11-13 17:34:05.000000000 +0100
@@ -1,10 +1,10 @@
--- .pkgextract
+++ .pkgextract 2005-12-09 17:09:26.000000000 +0100
@@ -0,0 +1,5 @@
++#tar Oxfj ../readline-5.2-patches.tar.bz2 | patch -p0 -s
+patch -p2 -s --suffix=".zerotty" < ../readline-4.3-input.dif
-+patch -p2 -s --suffix=".wrap" < ../readline-5.0-wrap.patch
-+patch -p2 -s --suffix=".conf" < ../readline-5.0-conf.patch
-+patch -p2 -s --suffix=".random" < ../readline-5.1-random.patch
++patch -p2 -s --suffix=".wrap" < ../readline-5.2-wrap.patch
++patch -p2 -s --suffix=".conf" < ../readline-5.2-conf.patch
+patch -p0 -s --suffix=".destdir" < ../readline-5.1-destdir.patch
--- Makefile.in
+++ Makefile.in 2005-12-09 17:09:26.000000000 +0100
@@ -28,20 +28,6 @@
fi )
uninstall-doc:
---- bind.c
-+++ bind.c 2005-12-09 17:09:26.000000000 +0100
-@@ -370,7 +370,10 @@ rl_generic_bind (type, keyseq, data, map
-
- ic = uc;
- if (ic < 0 || ic >= KEYMAP_SIZE)
-- return -1;
-+ {
-+ free (keys);
-+ return -1;
-+ }
-
- if (META_CHAR (ic) && _rl_convert_meta_chars_to_ascii)
- {
--- complete.c
+++ complete.c 2005-12-09 17:11:19.000000000 +0100
@@ -428,7 +428,7 @@ get_y_or_n (for_pager)
@@ -62,7 +48,7 @@
{
scan = rl_line_buffer[rl_point];
-@@ -1813,7 +1813,7 @@ rl_completion_matches (text, entry_funct
+@@ -1802,7 +1802,7 @@ rl_completion_matches (text, entry_funct
match_list = (char **)xmalloc ((match_list_size + 1) * sizeof (char *));
match_list[1] = (char *)NULL;
@@ -71,7 +57,7 @@
{
if (matches + 1 == match_list_size)
match_list = (char **)xrealloc
-@@ -1864,7 +1864,7 @@ rl_username_completion_function (text, s
+@@ -1853,7 +1853,7 @@ rl_username_completion_function (text, s
}
#if defined (HAVE_GETPWENT)
@@ -82,7 +68,7 @@
if (namelen == 0 || (STREQN (username, entry->pw_name, namelen)))
--- readline.c
+++ readline.c 2005-12-09 17:09:26.000000000 +0100
-@@ -715,7 +715,11 @@ _rl_dispatch_subseq (key, map, got_subse
+@@ -735,7 +735,11 @@ _rl_dispatch_subseq (key, map, got_subse
{
/* Special case rl_do_lowercase_version (). */
if (func == rl_do_lowercase_version)
@@ -118,19 +104,23 @@
info: $(INFOOBJ)
--- doc/readline.3
-+++ doc/readline.3 2005-12-09 17:09:26.000000000 +0100
-@@ -114,8 +114,8 @@ Readline is customized by putting comman
- file (the \fIinputrc\fP file).
- The name of this file is taken from the value of the
- .B INPUTRC
--environment variable. If that variable is unset, the default is
--.IR ~/.inputrc .
-+environment variable. If that variable is unset, readline will read both
-+.IR /etc/inputrc " and " ~/.inputrc .
++++ doc/readline.3 2006-11-13 17:33:27.000000000 +0100
+@@ -118,6 +118,14 @@ environment variable. If that variable
+ .IR ~/.inputrc .
+ If that file does not exist or cannot be read, the ultimate default is
+ .IR /etc/inputrc .
++If both files
++.I ~/.inputrc
++and
++.I /etc/inputrc
++exist readline will read first
++.I /etc/inputrc
++and then
++.IR ~/.inputrc .
When a program which uses the readline library starts up, the
init file is read, and the key bindings and variables are set.
There are only a few basic constructs allowed in the
-@@ -1266,6 +1266,9 @@ VI Command Mode functions
+@@ -1270,6 +1278,9 @@ VI Command Mode functions
.TP
.FN ~/.inputrc
Individual \fBreadline\fP initialization file
++++++ readline-5.1-patches.tar.bz2 -> readline-5.2.tar.bz2 ++++++
++++ 127926 lines of diff (skipped)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
---------------------------------------------------------------------
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org