readline package resubmit due to problems

Signed-off-by: basebuilder_pel7ppc64bebuilder0 <basebuilder@powerel.org>

SOURCES/readline-6.1-audit.patch

@@ -2,48 +2,48 @@ diff -up readline-6.1/config.h.in.audit readline-6.1/config.h.in
 --- readline-6.1/config.h.in.audit	2009-03-10 15:57:45.000000000 +0100
 +++ readline-6.1/config.h.in	2011-01-18 15:14:51.199219895 +0100
 @@ -29,6 +29,9 @@
-
+ 
  #undef __CHAR_UNSIGNED__
-
+ 
 +/* Define if you have <linux/audit.h> and it defines AUDIT_USER_TTY */
 +#undef HAVE_DECL_AUDIT_USER_TTY
 +
  /* Define if the `S_IS*' macros in <sys/stat.h> do not work properly.  */
  #undef STAT_MACROS_BROKEN
-
+ 
 diff -up readline-6.1/configure.audit readline-6.1/configure
 --- readline-6.1/configure.audit	2009-12-29 23:33:49.000000000 +0100
 +++ readline-6.1/configure	2011-01-18 15:21:20.571330373 +0100
 @@ -6602,7 +6602,9 @@ _ACEOF
-
+ 
  fi
-
+ 
 -
 +cat >>confdefs.h <<_ACEOF
 +#define HAVE_DECL_AUDIT_USER_TTY 1
 +_ACEOF
-
+ 
  { $as_echo "$as_me:$LINENO: checking if signal handlers must be reinstalled when invoked" >&5
  $as_echo_n "checking if signal handlers must be reinstalled when invoked... " >&6; }
 diff -up readline-6.1/configure.in.audit readline-6.1/configure.in
 --- readline-6.1/configure.in.audit	2009-10-12 16:12:15.000000000 +0200
 +++ readline-6.1/configure.in	2011-01-18 15:14:51.199219895 +0100
 @@ -159,6 +159,8 @@ AC_CHECK_HEADERS(sys/ptem.h,,,
-
+ 
  AC_SYS_LARGEFILE
-
+ 
 +AC_CHECK_DECLS([AUDIT_USER_TTY],,, [[#include <linux/audit.h>]])
 +
  BASH_SYS_SIGNAL_VINTAGE
  BASH_SYS_REINSTALL_SIGHANDLERS
-
+ 
 diff -up readline-6.1/readline.c.audit readline-6.1/readline.c
 --- readline-6.1/readline.c.audit	2009-08-31 14:45:31.000000000 +0200
 +++ readline-6.1/readline.c	2011-01-18 15:14:51.200219841 +0100
 @@ -55,6 +55,12 @@
  extern int errno;
  #endif /* !errno */
-
+ 
 +#if defined (HAVE_DECL_AUDIT_USER_TTY)
 +#  include <sys/socket.h>
 +#  include <linux/audit.h>
@@ -57,7 +57,7 @@ diff -up readline-6.1/readline.c.audit readline-6.1/readline.c
    rl_visible_prompt_length = rl_expand_prompt (rl_prompt);
    return 0;
  }
--
+-  
 +
 +#if defined (HAVE_DECL_AUDIT_USER_TTY)
 +/* Report STRING to the audit system. */
@@ -105,7 +105,7 @@ diff -up readline-6.1/readline.c.audit readline-6.1/readline.c
 @@ -352,6 +398,11 @@ readline (prompt)
      RL_SETSTATE (RL_STATE_CALLBACK);
  #endif
-
+ 
 +#if defined (HAVE_DECL_AUDIT_USER_TTY)
 +  if (value != NULL)
 +    audit_tty (value);
@@ -113,3 +113,4 @@ diff -up readline-6.1/readline.c.audit readline-6.1/readline.c
 +
    return (value);
  }
+ 

SOURCES/readline-6.2-cppmacro.patch

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

SOURCES/readline-6.2-gdb.patch

@@ -9,14 +9,14 @@ diff -up ./complete.c.old ./complete.c
 +  if (RL_ISSTATE (RL_STATE_CALLBACK) && (! RL_ISSTATE (RL_STATE_FEDORA_GDB)))
      return 1;
  #endif
-
+ 
 diff -up ./readline.h.old ./readline.h
 --- ./readline.h.old	2012-01-11 14:25:55.049711510 +0100
 +++ ./readline.h	2012-01-11 14:28:22.854863691 +0100
 @@ -840,6 +840,8 @@ extern int rl_inhibit_completion;
-
+ 
  #define RL_STATE_DONE		0x1000000	/* done; accepted line */
-
+ 
 +#define RL_STATE_FEDORA_GDB		0x2000000	/* exception for fedora gdb */
 +
  #define RL_SETSTATE(x)		(rl_readline_state |= (x))

SOURCES/readline-6.2-rl_trace.patch

@@ -3,7 +3,7 @@ index 6c68ad8..713e637 100644
 --- a/util.c
 +++ b/util.c
 @@ -493,10 +493,13 @@ _rl_trace (va_alist)
-
+ 
    if (_rl_tracefp == 0)
      _rl_tropen ();
 +  if (!_rl_tracefp)
@@ -11,11 +11,11 @@ index 6c68ad8..713e637 100644
    vfprintf (_rl_tracefp, format, args);
    fprintf (_rl_tracefp, "\n");
    fflush (_rl_tracefp);
-
+ 
 +out:
    va_end (args);
  }
-
+ 
 @@ -509,16 +512,17 @@ _rl_tropen ()
      fclose (_rl_tracefp);
    sprintf (fnbuf, "/var/tmp/rltrace.%ld", getpid());
@@ -24,13 +24,13 @@ index 6c68ad8..713e637 100644
 +  _rl_tracefp = fopen (fnbuf, "w+xe");
    return _rl_tracefp != 0;
  }
-
+ 
  int
  _rl_trclose ()
  {
 -  int r;
 +  int r = 0;
-
+ 
 -  r = fclose (_rl_tracefp);
 +  if (_rl_tracefp)
 +    r = fclose (_rl_tracefp);

SOURCES/readline-6.2-shlib.patch

@@ -2,13 +2,13 @@ diff -up readline-6.2/shlib/Makefile.in.shlib readline-6.2/shlib/Makefile.in
 --- readline-6.2/shlib/Makefile.in.shlib	2010-12-28 21:56:21.000000000 +0100
 +++ readline-6.2/shlib/Makefile.in	2011-02-14 17:34:38.821537496 +0100
 @@ -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
-
- # Since tilde.c is shared between readline and bash, make sure we compile
+ 
+ # Since tilde.c is shared between readline and bash, make sure we compile 
  # it with the right flags when it's built as part of readline
 diff -up readline-6.2/support/shlib-install.shlib readline-6.2/support/shlib-install
 --- readline-6.2/support/shlib-install.shlib	2009-10-28 14:30:18.000000000 +0100
@@ -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*)

SOURCES/readline62-001

@@ -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;
+  	}

SOURCES/readline62-003

@@ -24,42 +24,42 @@ Patch (apply with `patch -p0'):
   rl_read_key ()
   {
 !   int c;
-
+  
     rl_key_sequence_length++;
 --- 412,416 ----
   rl_read_key ()
   {
 !   int c, r;
-
+  
     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');

SPECS/readline.spec

@@ -278,7 +278,7 @@ fi
 - Added URL tag (bug #141106).
 
 * Thu Sep  2 2004 Jeremy Katz <katzj@redhat.com> - 4.3-13
-- rebuild so that static linking against readline will work on ppc64
+- rebuild so that static linking against readline will work on ppc64 
   without dot symbols
 
 * Mon Jun 28 2004 Tim Waugh <twaugh@redhat.com> 4.3-12
@@ -396,7 +396,7 @@ fi
 * Fri Apr 09 1999 Michael K. Johnson <johnsonm@redhat.com>
 - added guard patch from Taneli Huuskonen <huuskone@cc.helsinki.fi>
 
-* Sun Mar 21 1999 Cristian Gafton <gafton@redhat.com>
+* Sun Mar 21 1999 Cristian Gafton <gafton@redhat.com> 
 - auto rebuild in the new build environment (release 4)
 
 * Sun Jul 26 1998 Jeff Johnson <jbj@redhat.com>