rpms/xorg-x11-server/devel xorg-x11-server-1.0.1-SEGV-on-null-interface.patch, NONE, 1.1 xorg-x11-server-1.0.1-fbpict-fix-rounding.patch, NONE, 1.1 xorg-x11-server.spec, 1.35, 1.36

Mon Feb 6 08:10:12 UTC 2006

Author: mharris

Update of /cvs/dist/rpms/xorg-x11-server/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv9090

Modified Files:
	xorg-x11-server.spec 
Added Files:
	xorg-x11-server-1.0.1-SEGV-on-null-interface.patch 
	xorg-x11-server-1.0.1-fbpict-fix-rounding.patch 
Log Message:
* Sun Feb  5 2006 Mike A. Harris <mharris at redhat.com> 1.0.1-2
- Added xorg-x11-server-1.0.1-fbpict-fix-rounding.patch from CVS HEAD.
- Added xorg-x11-server-1.0.1-SEGV-on-null-interface.patch which prevents a
  SEGV on null interfaces (#174279,178986)


xorg-x11-server-1.0.1-SEGV-on-null-interface.patch:
 access.c |    2 ++
 1 files changed, 2 insertions(+)

--- NEW FILE xorg-x11-server-1.0.1-SEGV-on-null-interface.patch ---
Patch taken from xserver/xorg CVS HEAD, originally submitted to X.Org by
Andrei Barbu:

In theory, it should fix all 4 of these bug reports, however that is
currently unconfirmed:
https://bugs.freedesktop.org/show_bug.cgi?id=5218
https://bugs.freedesktop.org/show_bug.cgi?id=5068
https://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=178986
https://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=174279

Since it is in CVS HEAD, we can drop this patch when we update to the next
xserver/xorg release that comes from HEAD.  -- mharris


Index: xserver/xorg/os/access.c
diff -u xserver/xorg/os/access.c:1.13 xserver/xorg/os/access.c:1.14
--- xserver/xorg/os/access.c:1.13	Mon Nov  7 22:33:30 2005
+++ xserver/xorg/os/access.c	Fri Jan  6 16:45:17 2006
@@ -975,6 +975,8 @@
 	return;
     }
     for (ifr = ifap; ifr != NULL; ifr = ifr->ifa_next) {
+        if (!ifr->ifa_addr)
+            continue;
 #ifdef DNETCONN
 	if (ifr->ifa_addr.sa_family == AF_DECnet) 
 	    continue;

xorg-x11-server-1.0.1-fbpict-fix-rounding.patch:
 fbpict.h |    2 +-
 1 files changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE xorg-x11-server-1.0.1-fbpict-fix-rounding.patch ---
Patch should be added to 7.0 stable branch, and once checked in, we can
drop this patch when we update to 7.0.1 or later.  -- mharris


CVSROOT:	/cvs/xorg
Module name:	xserver
Changes by:	anholt at gabe.freedesktop.org	05/12/28 02:43:02

Log message:
  Fix a copy'n'paste-o that would result in mis-rounding of the results of
  several composite operators in A and G channels.


Index: xserver/xorg/fb/fbpict.h
diff -u xserver/xorg/fb/fbpict.h:1.18 xserver/xorg/fb/fbpict.h:1.19
--- xserver/xorg/fb/fbpict.h:1.18	Sun Oct  2 01:28:26 2005
+++ xserver/xorg/fb/fbpict.h	Wed Dec 28 02:43:02 2005
@@ -173,7 +173,7 @@
         x = (x + ((x >> 8) & 0xff00ff)) >> 8;                       \
         x &= 0xff00ff;                                              \
         x += (y >> 8) & 0xff00ff;                                   \
-        x |= 0x1000100 - ((t >> 8) & 0xff00ff);                     \
+        x |= 0x1000100 - ((x >> 8) & 0xff00ff);                     \
         x &= 0xff00ff;                                              \
         x <<= 8;                                                    \
         x += t;                                                     \


Index: xorg-x11-server.spec
===================================================================
RCS file: /cvs/dist/rpms/xorg-x11-server/devel/xorg-x11-server.spec,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -r1.35 -r1.36
--- xorg-x11-server.spec	30 Jan 2006 02:03:29 -0000	1.35
+++ xorg-x11-server.spec	6 Feb 2006 08:10:10 -0000	1.36
@@ -4,7 +4,7 @@
 Summary:   X.Org X11 X server
 Name:      xorg-x11-server
 Version:   1.0.1
-Release:   1
+Release:   2
 URL:       http://www.x.org
 License:   MIT/X11
 Group:     User Interface/X
@@ -18,7 +18,12 @@
 # xorg-server-0.99.3-rgb.txt-dix-config-fix.patch is from post-RC2 CVS
 Patch2:    xorg-server-0.99.3-rgb.txt-dix-config-fix.patch
 Patch3:    xserver-1.0.0-parser-add-missing-headers-to-sdk.patch
-Patch100:  xorg-redhat-die-ugly-pattern-die-die-die.patch
+
+# Patches taken from xserver/xorg CVS HEAD, post-1.0.1
+Patch100:  xorg-x11-server-1.0.1-fbpict-fix-rounding.patch
+Patch101:  xorg-x11-server-1.0.1-SEGV-on-null-interface.patch
+
+Patch1000:  xorg-redhat-die-ugly-pattern-die-die-die.patch
 
 # INFO: We don't ship the X server on s390/s390x/ppc64
 ExcludeArch: s390 s390x ppc64
@@ -226,7 +231,10 @@
 #%patch2 -p0 -b .rgb.txt-dix-config-fix
 %patch3 -p0 -b .parser-add-missing-headers-to-sdk
 
-%patch100 -p0 -b .redhat-die-ugly-pattern-die-die-die
+%patch100 -p2 -b .fbpict-fix-rounding
+%patch101 -p2 -b .SEGV-on-null-interface
+
+%patch1000 -p0 -b .redhat-die-ugly-pattern-die-die-die
 
 %build
 #FONTDIR="${datadir}/X11/fonts"
@@ -526,6 +534,11 @@
 # -------------------------------------------------------------------
 
 %changelog
+* Sun Feb  5 2006 Mike A. Harris <mharris at redhat.com> 1.0.1-2
+- Added xorg-x11-server-1.0.1-fbpict-fix-rounding.patch from CVS HEAD.
+- Added xorg-x11-server-1.0.1-SEGV-on-null-interface.patch which prevents a
+  SEGV on null interfaces (#174279,178986)
+
 * Wed Jan 18 2006 Mike A. Harris <mharris at redhat.com> 1.0.1-1
 - Updated to xserver 1.0.1 from X11R7.0
 


