Tue Jul 14 16:46:44 UTC 2009

Author: mlichvar

Update of /cvs/pkgs/rpms/readline/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2396

Modified Files:
	.cvsignore readline.spec sources 
Added Files:
	readline-6.0-shlib.patch readline60-001 readline60-002 
	readline60-003 
Removed Files:
	readline-5.2-001.patch readline-5.2-002.patch 
	readline-5.2-003.patch readline-5.2-004.patch 
	readline-5.2-005.patch readline-5.2-006.patch 
	readline-5.2-007.patch readline-5.2-008.patch 
	readline-5.2-009.patch readline-5.2-010.patch 
	readline-5.2-011.patch readline-5.2-redisplay-sigint.patch 
	readline-5.2-shlib.patch 
Log Message:
- update to 6.0
- include patches 001, 002, 003


readline-6.0-shlib.patch:

--- NEW FILE readline-6.0-shlib.patch ---
diff -up readline-6.0/shlib/Makefile.in.shlib readline-6.0/shlib/Makefile.in
--- readline-6.0/shlib/Makefile.in.shlib	2009-01-06 18:03:22.000000000 +0100
+++ readline-6.0/shlib/Makefile.in	2009-07-02 14:36:15.000000000 +0200
@@ -169,7 +169,7 @@ $(SHARED_READLINE):	$(SHARED_OBJ)
 
 $(SHARED_HISTORY):	$(SHARED_HISTOBJ) xmalloc.so
 	$(RM) $@
-	$(SHOBJ_LD) ${SHOBJ_LDFLAGS} ${SHLIB_XLDFLAGS} -o $@ $(SHARED_HISTOBJ) xmalloc.so $(SHLIB_LIBS)
+	$(SHOBJ_LD) ${SHOBJ_LDFLAGS} ${SHLIB_XLDFLAGS} -o $@ $(SHARED_HISTOBJ) xmalloc.so
 
 # 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.0/support/shlib-install.shlib readline-6.0/support/shlib-install
--- readline-6.0/support/shlib-install.shlib	2008-07-20 01:16:05.000000000 +0200
+++ readline-6.0/support/shlib-install	2009-07-02 14:37:59.000000000 +0200
@@ -71,7 +71,7 @@ fi
 case "$host_os" in
 hpux*|darwin*|macosx*|linux*)
 	if [ -z "$uninstall" ]; then
-		chmod 555 ${INSTALLDIR}/${LIBNAME}
+		chmod 755 ${INSTALLDIR}/${LIBNAME}
 	fi ;;
 cygwin*|mingw*)
 	IMPLIBNAME=`echo ${LIBNAME} \
diff -up readline-6.0/support/shobj-conf.shlib readline-6.0/support/shobj-conf
--- readline-6.0/support/shobj-conf.shlib	2009-01-04 20:32:42.000000000 +0100
+++ readline-6.0/support/shobj-conf	2009-07-02 14:40:06.000000000 +0200
@@ -112,10 +112,11 @@ sunos5*|solaris2*)
 linux*-*|gnu*-*|k*bsd*-gnu-*)
 	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_LIBS='-ltinfo'
 	;;
 
 freebsd2*)


--- NEW FILE readline60-001 ---
			   READLINE PATCH REPORT
			   =====================

Readline-Release: 6.0
Patch-ID: readline60-001

Bug-Reported-by: Nicolai Lissner <nlissne at linux01.org>
Bug-Reference-ID: <20090412020510.GA29658 at lilith>
Bug-Reference-URL: http://lists.gnu.org/archive/html/bug-bash/2009-04/msg00104.html

Bug-Description:

If a SIGWINCH arrives while bash is performing redisplay, multi-line prompts
are displayed incorrectly due to the display code being called recursively.

Patch:

*** ../readline-6.0/readline.h	2009-01-04 14:32:33.000000000 -0500
--- readline.h	2009-04-13 08:47:00.000000000 -0400
***************
*** 815,820 ****
  #define RL_STATE_MULTIKEY	0x200000	/* reading multiple-key command */
  #define RL_STATE_VICMDONCE	0x400000	/* entered vi command mode at least once */
  
! #define RL_STATE_DONE		0x800000	/* done; accepted line */
  
  #define RL_SETSTATE(x)		(rl_readline_state |= (x))
--- 815,821 ----
  #define RL_STATE_MULTIKEY	0x200000	/* reading multiple-key command */
  #define RL_STATE_VICMDONCE	0x400000	/* entered vi command mode at least once */
+ #define RL_STATE_REDISPLAYING	0x800000	/* updating terminal display */
  
! #define RL_STATE_DONE		0x1000000	/* done; accepted line */
  
  #define RL_SETSTATE(x)		(rl_readline_state |= (x))
*** ../readline-6.0/display.c	2009-01-04 14:32:32.000000000 -0500
--- display.c	2009-04-13 08:29:54.000000000 -0400
***************
*** 513,516 ****
--- 513,517 ----
       data structures. */
    _rl_block_sigint ();  
+   RL_SETSTATE (RL_STATE_REDISPLAYING);
  
    if (!rl_display_prompt)
***************
*** 1237,1240 ****
--- 1238,1242 ----
    }
  
+   RL_UNSETSTATE (RL_STATE_REDISPLAYING);
    _rl_release_sigint ();
  }
*** ../readline-6.0/terminal.c	2009-01-04 14:32:34.000000000 -0500
--- terminal.c	2009-04-13 08:43:00.000000000 -0400
***************
*** 356,360 ****
        if (CUSTOM_REDISPLAY_FUNC ())
  	rl_forced_update_display ();
!       else
  	_rl_redisplay_after_sigwinch ();
      }
--- 356,360 ----
        if (CUSTOM_REDISPLAY_FUNC ())
  	rl_forced_update_display ();
!       else if (RL_ISSTATE(RL_STATE_REDISPLAYING) == 0)
  	_rl_redisplay_after_sigwinch ();
      }
*** ../readline-6.0/patchlevel	2008-11-18 11:01:14.000000000 -0500
--- patchlevel	2009-05-09 12:01:06.000000000 -0400
***************
*** 1,3 ****
  # Do not edit -- exists only for use by patch
  
! 0
--- 1,3 ----
  # Do not edit -- exists only for use by patch
  
! 1


--- NEW FILE readline60-002 ---
			   READLINE PATCH REPORT
			   =====================

Readline-Release: 6.0
Patch-ID: readline60-002

Bug-Reported-by:  Matt Zyzik <matt.zyzik at nyu.edu>
Bug-Reference-ID: <20090319015542.696F62B8E8 at ice.filescope.com>
Bug-Reference-URL: http://lists.gnu.org/archive/html/bug-bash/2009-03/msg00149.html

Bug-Description:

When not in a locale supporting multibyte characters, readline will occasionally
not erase characters between the cursor position and the end of the line
when killing text backwards.

Patch:

*** ../readline-6.0/display.c	2009-01-04 14:32:32.000000000 -0500
--- display.c	2009-04-14 14:00:18.000000000 -0400
***************
*** 1775,1779 ****
  	     adjust col_lendiff based on the difference between _rl_last_c_pos
  	     and _rl_screenwidth */
! 	  if (col_lendiff && (_rl_last_c_pos < _rl_screenwidth))
  #endif
  	    {	  
--- 1775,1779 ----
  	     adjust col_lendiff based on the difference between _rl_last_c_pos
  	     and _rl_screenwidth */
! 	  if (col_lendiff && ((MB_CUR_MAX == 1 || rl_byte_oriented) || (_rl_last_c_pos < _rl_screenwidth)))
  #endif
  	    {	  
*** ../readline-6.0/patchlevel	2008-11-18 11:01:14.000000000 -0500
--- patchlevel	2009-05-09 12:01:06.000000000 -0400
***************
*** 1,3 ****
  # Do not edit -- exists only for use by patch
  
! 1
--- 1,3 ----
  # Do not edit -- exists only for use by patch
  
! 2


--- NEW FILE readline60-003 ---
			   READLINE PATCH REPORT
			   =====================

Readline-Release: 6.0
Patch-ID: readline60-003

Bug-Reported-by: Andreas Schwab <schwab at linux-m68k.org>
Bug-Reference-ID: <m21vrhhx08.fsf at igel.home>
Bug-Reference-URL: http://lists.gnu.org/archive/html/bug-bash/2009-04/msg00160.html

Bug-Description:

If the prompt length exactly matches the screen width, and the prompt ends
with invisible characters, readline positions the cursor incorrectly.

Patch:

*** ../readline-6.0/display.c	2009-01-04 14:32:32.000000000 -0500
--- display.c	2009-04-25 21:42:18.000000000 -0400
***************
*** 1895,1898 ****
--- 1897,1904 ----
    woff = WRAP_OFFSET (_rl_last_v_pos, wrap_offset);
    cpos = _rl_last_c_pos;
+ 
+   if (cpos == 0 && cpos == new)
+     return;
+ 
  #if defined (HANDLE_MULTIBYTE)
    /* If we have multibyte characters, NEW is indexed by the buffer point in
***************
*** 1908,1914 ****
  	 desired display position. */
        if ((new > prompt_last_invisible) ||		/* XXX - don't use woff here */
! 	  (prompt_physical_chars > _rl_screenwidth &&
  	   _rl_last_v_pos == prompt_last_screen_line &&
! 	   wrap_offset >= woff &&
  	   new > (prompt_last_invisible-(_rl_screenwidth*_rl_last_v_pos)-wrap_offset)))
  	   /* XXX last comparison might need to be >= */
--- 1914,1920 ----
  	 desired display position. */
        if ((new > prompt_last_invisible) ||		/* XXX - don't use woff here */
! 	  (prompt_physical_chars >= _rl_screenwidth &&
  	   _rl_last_v_pos == prompt_last_screen_line &&
! 	   wrap_offset >= woff && dpos >= woff &&
  	   new > (prompt_last_invisible-(_rl_screenwidth*_rl_last_v_pos)-wrap_offset)))
  	   /* XXX last comparison might need to be >= */
*** ../readline-6.0/patchlevel	2008-11-18 11:01:14.000000000 -0500
--- patchlevel	2009-05-09 12:01:06.000000000 -0400
***************
*** 1,3 ****
  # Do not edit -- exists only for use by patch
  
! 2
--- 1,3 ----
  # Do not edit -- exists only for use by patch
  
! 3


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/readline/devel/.cvsignore,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- .cvsignore	13 Nov 2006 14:33:06 -0000	1.8
+++ .cvsignore	14 Jul 2009 16:46:12 -0000	1.9
@@ -1 +1 @@
-readline-5.2.tar.gz
+readline-6.0.tar.gz


Index: readline.spec
===================================================================
RCS file: /cvs/pkgs/rpms/readline/devel/readline.spec,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -p -r1.42 -r1.43
--- readline.spec	25 Feb 2009 19:24:10 -0000	1.42
+++ readline.spec	14 Jul 2009 16:46:14 -0000	1.43
@@ -1,24 +1,16 @@
 Summary: A library for editing typed command lines
 Name: readline
-Version: 5.2
-Release: 14%{?dist}
-License: GPLv2+
+Version: 6.0
+Release: 1%{?dist}
+License: GPLv3+
 Group: System Environment/Libraries
 URL: http://cnswww.cns.cwru.edu/php/chet/readline/rltop.html
 Source: ftp://ftp.gnu.org/gnu/readline/readline-%{version}.tar.gz
-Patch1: readline-5.2-shlib.patch
-Patch2: readline-5.2-001.patch
-Patch3: readline-5.2-002.patch
-Patch4: readline-5.2-003.patch
-Patch5: readline-5.2-004.patch
-Patch6: readline-5.2-005.patch
-Patch7: readline-5.2-006.patch
-Patch8: readline-5.2-007.patch
-Patch9: readline-5.2-008.patch
-Patch10: readline-5.2-009.patch
-Patch11: readline-5.2-010.patch
-Patch12: readline-5.2-011.patch
-Patch13: readline-5.2-redisplay-sigint.patch
+Patch1: ftp://ftp.gnu.org/gnu/readline/readline-6.0-patches/readline60-001
+Patch2: ftp://ftp.gnu.org/gnu/readline/readline-6.0-patches/readline60-002
+Patch3: ftp://ftp.gnu.org/gnu/readline/readline-6.0-patches/readline60-003
+# fix file permissions, remove RPATH, use CFLAGS
+Patch20: readline-6.0-shlib.patch
 Requires(post): /sbin/install-info
 Requires(preun): /sbin/install-info
 BuildRequires: ncurses-devel
@@ -57,19 +49,10 @@ library.
 
 %prep
 %setup -q
-%patch1 -p1 -b .shlib
-%patch2 -p0 -b .001
-%patch3 -p0 -b .002
-%patch4 -p0 -b .003
-%patch5 -p0 -b .004
-%patch6 -p0 -b .005
-%patch7 -p0 -b .006
-%patch8 -p0 -b .007
-%patch9 -p0 -b .008
-%patch10 -p0 -b .009
-%patch11 -p0 -b .010
-%patch12 -p0 -b .011
-%patch13 -p1 -b .redisplay-sigint
+%patch1 -p0 -b .001
+%patch2 -p0 -b .002
+%patch3 -p0 -b .003
+%patch20 -p1 -b .shlib
 
 pushd examples
 rm -f rlfe/configure
@@ -95,6 +78,7 @@ for l in $RPM_BUILD_ROOT%{_libdir}/libre
         sed 's,\(^/\|\)[^/][^/]*,..,g')/%{_lib}/$(readlink $l) $l
 done
 
+rm -rf $RPM_BUILD_ROOT%{_datadir}/readline
 rm -f $RPM_BUILD_ROOT%{_infodir}/dir
 
 %clean
@@ -146,6 +130,10 @@ fi
 %{_libdir}/lib*.a
 
 %changelog
+* Tue Jul 14 2009 Miroslav Lichvar <mlichvar at redhat.com> 6.0-1
+- update to 6.0
+- include patches 001, 002, 003
+
 * Wed Feb 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 5.2-14
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/readline/devel/sources,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- sources	13 Nov 2006 14:33:06 -0000	1.8
+++ sources	14 Jul 2009 16:46:14 -0000	1.9
@@ -1 +1 @@
-e39331f32ad14009b9ff49cc10c5e751  readline-5.2.tar.gz
+b7f65a48add447693be6e86f04a63019  readline-6.0.tar.gz


--- readline-5.2-001.patch DELETED ---


--- readline-5.2-002.patch DELETED ---


--- readline-5.2-003.patch DELETED ---


--- readline-5.2-004.patch DELETED ---


--- readline-5.2-005.patch DELETED ---


--- readline-5.2-006.patch DELETED ---


--- readline-5.2-007.patch DELETED ---


--- readline-5.2-008.patch DELETED ---


--- readline-5.2-009.patch DELETED ---


--- readline-5.2-010.patch DELETED ---


--- readline-5.2-011.patch DELETED ---


--- readline-5.2-redisplay-sigint.patch DELETED ---


--- readline-5.2-shlib.patch DELETED ---


