Updating link to change in openSUSE:Factory/bash revision 50
OBS-URL: https://build.opensuse.org/package/show/Base:System/bash?expand=0&rev=0e684b6d69ca471a3edec76de2eeecc1
This commit is contained in:
OBS User buildservice-autocommit
committed by
Git OBS Bridge
Git OBS Bridge
parent
2319b1c7d2
commit
99eaf946d6
139
readline-6.1.dif
Normal file
139
readline-6.1.dif
Normal file
@@ -0,0 +1,139 @@
|
||||
--- .pkgextract
|
||||
+++ .pkgextract 2005-12-09 17:09:26.000000000 +0100
|
||||
@@ -0,0 +1,5 @@
|
||||
+tar Oxfj ../readline-6.0-patches.tar.bz2 | patch -p0 -s
|
||||
+patch -p2 -s --suffix=".zerotty" < ../readline-4.3-input.dif
|
||||
+patch -p2 -s --suffix=".wrap" < ../readline-6.0-wrap.patch
|
||||
+patch -p2 -s --suffix=".conf" < ../readline-5.2-conf.patch
|
||||
+patch -p0 -s --suffix=".destdir" < ../readline-6.0-destdir.patch
|
||||
--- Makefile.in
|
||||
+++ Makefile.in 2009-02-27 17:25:01.076001005 +0100
|
||||
@@ -222,10 +222,8 @@ uninstall-headers:
|
||||
maybe-uninstall-headers: uninstall-headers
|
||||
|
||||
install-static: installdirs $(STATIC_LIBS) install-headers install-doc install-examples
|
||||
- -$(MV) $(DESTDIR)$(libdir)/libreadline.a $(DESTDIR)$(libdir)/libreadline.old
|
||||
$(INSTALL_DATA) libreadline.a $(DESTDIR)$(libdir)/libreadline.a
|
||||
-test -n "$(RANLIB)" && $(RANLIB) $(DESTDIR)$(libdir)/libreadline.a
|
||||
- -$(MV) $(DESTDIR)$(libdir)/libhistory.a $(DESTDIR)$(libdir)/libhistory.old
|
||||
$(INSTALL_DATA) libhistory.a $(DESTDIR)$(libdir)/libhistory.a
|
||||
-test -n "$(RANLIB)" && $(RANLIB) $(DESTDIR)$(libdir)/libhistory.a
|
||||
|
||||
@@ -254,7 +252,7 @@ uninstall-examples: maybe-uninstall-head
|
||||
install-doc: installdirs
|
||||
-( if test -d doc ; then \
|
||||
cd doc && \
|
||||
- ${MAKE} ${MFLAGS} infodir=$(infodir) DESTDIR=${DESTDIR} install; \
|
||||
+ ${MAKE} infodir=$(infodir) DESTDIR=${DESTDIR} install; \
|
||||
fi )
|
||||
|
||||
uninstall-doc:
|
||||
--- complete.c
|
||||
+++ complete.c 2009-02-27 17:25:26.616935393 +0100
|
||||
@@ -942,7 +942,7 @@ _rl_find_completion_word (fp, dp)
|
||||
/* We didn't find an unclosed quoted substring upon which to do
|
||||
completion, so use the word break characters to find the
|
||||
substring on which to complete. */
|
||||
- while (rl_point = MB_PREVCHAR (rl_line_buffer, rl_point, MB_FIND_ANY))
|
||||
+ while ((rl_point = MB_PREVCHAR (rl_line_buffer, rl_point, MB_FIND_ANY)))
|
||||
{
|
||||
scan = rl_line_buffer[rl_point];
|
||||
|
||||
@@ -1884,7 +1884,7 @@ rl_completion_matches (text, entry_funct
|
||||
match_list[1] = (char *)NULL;
|
||||
|
||||
_rl_interrupt_immediately++;
|
||||
- while (string = (*entry_function) (text, matches))
|
||||
+ while ((string = (*entry_function) (text, matches)))
|
||||
{
|
||||
if (matches + 1 == match_list_size)
|
||||
match_list = (char **)xrealloc
|
||||
@@ -1936,7 +1936,7 @@ rl_username_completion_function (text, s
|
||||
}
|
||||
|
||||
#if defined (HAVE_GETPWENT)
|
||||
- while (entry = getpwent ())
|
||||
+ while ((entry = getpwent ()))
|
||||
{
|
||||
/* Null usernames should result in all users as possible completions. */
|
||||
if (namelen == 0 || (STREQN (username, entry->pw_name, namelen)))
|
||||
--- readline.c
|
||||
+++ readline.c 2005-12-09 17:09:26.000000000 +0100
|
||||
@@ -767,7 +767,11 @@ _rl_dispatch_subseq (key, map, got_subse
|
||||
{
|
||||
/* Special case rl_do_lowercase_version (). */
|
||||
if (func == rl_do_lowercase_version)
|
||||
- return (_rl_dispatch (_rl_to_lower (key), map));
|
||||
+ {
|
||||
+ if (key == ANYOTHERKEY)
|
||||
+ return -1;
|
||||
+ return (_rl_dispatch (_rl_to_lower (key), map));
|
||||
+ }
|
||||
|
||||
rl_executing_keymap = map;
|
||||
|
||||
--- readline.h
|
||||
+++ readline.h 2005-12-09 17:09:26.000000000 +0100
|
||||
@@ -448,7 +448,7 @@ extern char *rl_filename_completion_func
|
||||
|
||||
extern int rl_completion_mode PARAMS((rl_command_func_t *));
|
||||
|
||||
-#if 0
|
||||
+#ifdef OLD_READLINE
|
||||
/* Backwards compatibility (compat.c). These will go away sometime. */
|
||||
extern void free_undo_list PARAMS((void));
|
||||
extern int maybe_save_line PARAMS((void));
|
||||
--- doc/Makefile.in
|
||||
+++ doc/Makefile.in 2009-02-27 17:27:31.104001597 +0100
|
||||
@@ -98,7 +98,7 @@ DIST_DOCS = $(DVIOBJ) $(PSOBJ) $(HTMLOBJ
|
||||
$(RM) $@
|
||||
-${DVIPDF} $<
|
||||
|
||||
-all: info dvi html ps text pdf
|
||||
+all: info html
|
||||
nodvi: info html text
|
||||
|
||||
xdist: $(DIST_DOCS)
|
||||
--- doc/readline.3
|
||||
+++ 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
|
||||
@@ -1286,6 +1294,9 @@ VI Command Mode functions
|
||||
.TP
|
||||
.FN ~/.inputrc
|
||||
Individual \fBreadline\fP initialization file
|
||||
+.TP
|
||||
+.FN /etc/inputrc
|
||||
+System \fBreadline\fP initialization file
|
||||
.PD
|
||||
.SH AUTHORS
|
||||
Brian Fox, Free Software Foundation
|
||||
--- support/shobj-conf
|
||||
+++ support/shobj-conf 2006-09-22 16:17:48.000000000 +0200
|
||||
@@ -112,10 +112,11 @@ sunos5*|solaris2*)
|
||||
linux*-*|gnu*-*|k*bsd*-gnu-*|freebsd*-gentoo)
|
||||
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
|
||||
;;
|
||||
|
||||
freebsd2*)
|
||||
Reference in New Issue
Block a user