Browse Source

readline package resubmit due to problems

Signed-off-by: basebuilder_pel7ppc64bebuilder0 <basebuilder@powerel.org>
master
basebuilder_pel7ppc64bebuilder0 7 years ago
parent
commit
87736ead2f
  1. 1
      SOURCES/readline-6.1-audit.patch
  2. 1
      SOURCES/readline-6.2-cppmacro.patch
  3. 16
      SOURCES/readline-6.2-shlib.patch
  4. 8
      SOURCES/readline62-001
  5. 36
      SOURCES/readline62-003

1
SOURCES/readline-6.1-audit.patch

@ -113,3 +113,4 @@ diff -up readline-6.1/readline.c.audit readline-6.1/readline.c @@ -113,3 +113,4 @@ diff -up readline-6.1/readline.c.audit readline-6.1/readline.c
+
return (value);
}

1
SOURCES/readline-6.2-cppmacro.patch

@ -9,3 +9,4 @@ diff -up readline-6.2/chardefs.h.orig readline-6.2/chardefs.h @@ -9,3 +9,4 @@ diff -up readline-6.2/chardefs.h.orig readline-6.2/chardefs.h
+#if !defined (isxdigit) && !defined (HAVE_ISXDIGIT) && !defined (__cplusplus)
# define isxdigit(c) (isdigit((c)) || ((c) >= 'a' && (c) <= 'f') || ((c) >= 'A' && (c) <= 'F'))
#endif

16
SOURCES/readline-6.2-shlib.patch

@ -4,7 +4,7 @@ diff -up readline-6.2/shlib/Makefile.in.shlib readline-6.2/shlib/Makefile.in @@ -4,7 +4,7 @@ diff -up readline-6.2/shlib/Makefile.in.shlib readline-6.2/shlib/Makefile.in
@@ -170,7 +170,7 @@ $(SHARED_READLINE): $(SHARED_OBJ)
$(SHARED_HISTORY): $(SHARED_HISTOBJ) xmalloc.so xfree.so
$(RM) $@
$(RM) $@
- $(SHOBJ_LD) ${SHOBJ_LDFLAGS} ${SHLIB_XLDFLAGS} -o $@ $(SHARED_HISTOBJ) xmalloc.so xfree.so $(SHLIB_LIBS)
+ $(SHOBJ_LD) ${SHOBJ_LDFLAGS} ${SHLIB_XLDFLAGS} -o $@ $(SHARED_HISTOBJ) xmalloc.so xfree.so
@ -16,26 +16,26 @@ diff -up readline-6.2/support/shlib-install.shlib readline-6.2/support/shlib-ins @@ -16,26 +16,26 @@ diff -up readline-6.2/support/shlib-install.shlib readline-6.2/support/shlib-ins
@@ -72,7 +72,7 @@ fi
case "$host_os" in
hpux*|darwin*|macosx*|linux*)
if [ -z "$uninstall" ]; then
if [ -z "$uninstall" ]; then
- chmod 555 ${INSTALLDIR}/${LIBNAME}
+ chmod 755 ${INSTALLDIR}/${LIBNAME}
fi ;;
fi ;;
cygwin*|mingw*)
IMPLIBNAME=`echo ${LIBNAME} \
IMPLIBNAME=`echo ${LIBNAME} \
diff -up readline-6.2/support/shobj-conf.shlib readline-6.2/support/shobj-conf
--- readline-6.2/support/shobj-conf.shlib 2009-10-28 14:20:21.000000000 +0100
+++ readline-6.2/support/shobj-conf 2011-02-14 17:33:07.612767986 +0100
@@ -112,10 +112,11 @@ sunos5*|solaris2*)
linux*-*|gnu*-*|k*bsd*-gnu-*|freebsd*-gentoo)
SHOBJ_CFLAGS=-fPIC
SHOBJ_LD='${CC}'
SHOBJ_CFLAGS=-fPIC
SHOBJ_LD='${CC}'
- SHOBJ_LDFLAGS='-shared -Wl,-soname,$@'
+ SHOBJ_LDFLAGS='$(CFLAGS) -shared -Wl,-soname,$@'
- SHLIB_XLDFLAGS='-Wl,-rpath,$(libdir) -Wl,-soname,`basename $@ $(SHLIB_MINOR)`'
+ SHLIB_XLDFLAGS='-Wl,-soname,`basename $@ $(SHLIB_MINOR)`'
SHLIB_LIBVERSION='$(SHLIB_LIBSUFF).$(SHLIB_MAJOR)$(SHLIB_MINOR)'
SHLIB_LIBVERSION='$(SHLIB_LIBSUFF).$(SHLIB_MAJOR)$(SHLIB_MINOR)'
+ SHLIB_LIBS='-ltinfo'
;;
;;
freebsd2*)

8
SOURCES/readline62-001

@ -37,10 +37,10 @@ Patch (apply with `patch -p0'): @@ -37,10 +37,10 @@ Patch (apply with `patch -p0'):
***************
*** 149,152 ****
--- 149,155 ----
/* Should handle everything, including cleanup, numeric arguments,
and turning off RL_STATE_VIMOTION */
/* Should handle everything, including cleanup, numeric arguments,
and turning off RL_STATE_VIMOTION */
+ if (RL_ISSTATE (RL_STATE_NUMERICARG) == 0)
+ _rl_internal_char_cleanup ();
+
return;
}
return;
}

36
SOURCES/readline62-003

@ -34,32 +34,32 @@ Patch (apply with `patch -p0'): @@ -34,32 +34,32 @@ Patch (apply with `patch -p0'):
rl_key_sequence_length++;
***************
*** 430,441 ****
while (rl_event_hook)
{
while (rl_event_hook)
{
! if (rl_gather_tyi () < 0) /* XXX - EIO */
{
rl_done = 1;
return ('\n');
}
RL_CHECK_SIGNALS ();
{
rl_done = 1;
return ('\n');
}
RL_CHECK_SIGNALS ();
- if (rl_get_char (&c) != 0)
- break;
if (rl_done) /* XXX - experimental */
return ('\n');
if (rl_done) /* XXX - experimental */
return ('\n');
--- 432,447 ----
while (rl_event_hook)
{
while (rl_event_hook)
{
! if (rl_get_char (&c) != 0)
! break;
!
! if ((r = rl_gather_tyi ()) < 0) /* XXX - EIO */
{
rl_done = 1;
return ('\n');
}
{
rl_done = 1;
return ('\n');
}
+ else if (r == 1) /* read something */
+ continue;
+
RL_CHECK_SIGNALS ();
if (rl_done) /* XXX - experimental */
return ('\n');
RL_CHECK_SIGNALS ();
if (rl_done) /* XXX - experimental */
return ('\n');

Loading…
Cancel
Save