rpms/emacs/F-9 emacs-22.1.50-regex.patch, NONE, 1.1 emacs.spec, 1.114, 1.115

[Dennis Gilmore (ausil)]

Author: ausil

Update of /cvs/pkgs/rpms/emacs/F-9
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20095

Modified Files:
	emacs.spec 
Added Files:
	emacs-22.1.50-regex.patch 
Log Message:
add patch from bz#435767


emacs-22.1.50-regex.patch:

--- NEW FILE emacs-22.1.50-regex.patch ---
for  src/ChangeLog
from  Alexandre Oliva  <aoliva at redhat.com>

	* regex.c (MOVE_BUFFER_POINTER, EXTEND_BUFFER): Don't compute
	offsets between unrelated pointers.

--- emacs-22.1.50.orig/src/regex.c	2007-09-10 15:46:20.000000000 -0300
+++ emacs-22.1.50/src/regex.c	2008-03-22 08:07:06.000000000 -0300
@@ -3,7 +3,7 @@
    internationalization features.)
 
    Copyright (C) 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001,
-                 2002, 2003, 2004, 2005, 2006, 2007
+                 2002, 2003, 2004, 2005, 2006, 2007, 2008
                  Free Software Foundation, Inc.
 
    This program is free software; you can redistribute it and/or modify
@@ -1832,8 +1832,10 @@
    being larger than MAX_BUF_SIZE, then flag memory exhausted.  */
 #if __BOUNDED_POINTERS__
 # define SET_HIGH_BOUND(P) (__ptrhigh (P) = __ptrlow (P) + bufp->allocated)
-# define MOVE_BUFFER_POINTER(P) \
-  (__ptrlow (P) += incr, SET_HIGH_BOUND (P), __ptrvalue (P) += incr)
+# define MOVE_BUFFER_POINTER(P)					\
+  (__ptrlow (P) = new_buffer + (__ptrlow (P) - old_buffer),	\
+   SET_HIGH_BOUND (P),						\
+   __ptrvalue (P) = new_buffer + (__ptrvalue (P) - old_buffer))
 # define ELSE_EXTEND_BUFFER_HIGH_BOUND		\
   else						\
     {						\
@@ -1847,12 +1849,12 @@
 	SET_HIGH_BOUND (pending_exact);		\
     }
 #else
-# define MOVE_BUFFER_POINTER(P) (P) += incr
+# define MOVE_BUFFER_POINTER(P) ((P) = new_buffer + ((P) - old_buffer))
 # define ELSE_EXTEND_BUFFER_HIGH_BOUND
 #endif
 #define EXTEND_BUFFER()							\
   do {									\
-    re_char *old_buffer = bufp->buffer;					\
+    unsigned char *old_buffer = bufp->buffer;				\
     if (bufp->allocated == MAX_BUF_SIZE)				\
       return REG_ESIZE;							\
     bufp->allocated <<= 1;						\
@@ -1864,7 +1866,7 @@
     /* If the buffer moved, move all the pointers into it.  */		\
     if (old_buffer != bufp->buffer)					\
       {									\
-	int incr = bufp->buffer - old_buffer;				\
+	unsigned char *new_buffer = bufp->buffer;			\
 	MOVE_BUFFER_POINTER (b);					\
 	MOVE_BUFFER_POINTER (begalt);					\
 	if (fixup_alt_jump)						\



Index: emacs.spec
===================================================================
RCS file: /cvs/pkgs/rpms/emacs/F-9/emacs.spec,v
retrieving revision 1.114
retrieving revision 1.115
diff -u -r1.114 -r1.115
--- emacs.spec	2 May 2008 00:11:49 -0000	1.114
+++ emacs.spec	2 May 2008 01:28:53 -0000	1.115
@@ -4,7 +4,7 @@
 Name: emacs
 Epoch: 1
 Version: 22.2
-Release: 3%{?dist}
+Release: 4%{?dist}
 License: GPLv3+
 URL: http://www.gnu.org/software/emacs/
 Group: Applications/Editors
@@ -28,6 +28,7 @@
 Patch1: rpm-spec-mode.patch
 Patch2: po-mode-auto-replace-date-71264.patch
 Patch3: emacs-22.1.50-sparc64.patch
+Patch4: emacs-22.1.50-regex.patch
 Buildroot: %{_tmppath}/%{name}-%{version}-root
 BuildRequires: atk-devel, cairo-devel, freetype-devel, fontconfig-devel, giflib-devel, glibc-devel, gtk2-devel, libpng-devel
 BuildRequires: libjpeg-devel, libtiff-devel, libX11-devel, libXau-devel, libXdmcp-devel, libXrender-devel, libXt-devel
@@ -105,6 +106,7 @@
 %setup -q
 %patch0 -p1 -b .glibc-open-macro
 %patch3 -p1 -b .sparc64-libdir
+%patch4 -p1 -b .regexp
 
 # install rest of site-lisp files
 ( cd site-lisp
@@ -311,7 +313,10 @@
 %dir %{_datadir}/emacs/%{version}
 
 %changelog
-* Thu May 01 2008 Dennis Gilmore <dennis at ausil.us> 22.2-3
+* Thu May 01 2008 Dennis Gilmore <dennis at ausil.us> 1:22.2-4
+- add patch from bz#435767
+
+* Thu May 01 2008 Dennis Gilmore <dennis at ausil.us> 1:22.2-3
 - add epoch
 - put epoch in .pc file