Hello community,
here is the log from the commit of package xorg-x11-server
checked in at Sun Aug 6 22:10:51 CEST 2006.
--------
--- xorg-x11-server/xorg-x11-server.changes 2006-08-02 16:12:47.000000000 +0200
+++ xorg-x11-server/xorg-x11-server.changes 2006-08-06 17:55:28.000000000 +0200
@@ -1,0 +2,22 @@
+Sat Aug 5 22:48:38 CEST 2006 - sndirsch@suse.de
+
+- p_mouse_misc.diff:
+ * fix X server crashes with synaptics driver (Bug #61702)
+- pu_fixes.diff
+ * Fixes not yet in the official version
+- p_bug96328.diff:
+ * fallback mouse device checking
+- p_vga-crashfix.diff:
+ * fixes vga driver crash (#133989)
+- p_xorg_rom_read.diff
+ * read rom in big chunks instead of byte-at-a-time (Bug #140811)
+- ps_showopts.diff
+ * Xserver "-showopts" option to print available driver options
+ (Bug #137374)
+
+-------------------------------------------------------------------
+Sat Aug 5 10:15:01 CEST 2006 - sndirsch@suse.de
+
+- add /var/X11R6/bin directory for now (Bug #197188)
+
+-------------------------------------------------------------------
New:
----
p_bug96328.diff
p_mouse_misc.diff
p_vga-crashfix.diff
p_xorg_rom_read.diff
ps_showopts.diff
pu_fixes.diff
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ xorg-x11-server.spec ++++++
--- /var/tmp/diff_new_pack.IrvByU/_old 2006-08-06 22:09:06.000000000 +0200
+++ /var/tmp/diff_new_pack.IrvByU/_new 2006-08-06 22:09:06.000000000 +0200
@@ -17,13 +17,13 @@
URL: http://xorg.freedesktop.org/
%define EXPERIMENTAL 0
Version: 7.1
-Release: 12
+Release: 13
License: X11/MIT
BuildRoot: %{_tmppath}/%{name}-%{version}-build
Group: System/X11/Servers/XF86_4
Provides: xorg-x11-Xnest xorg-x11-Xprt xorg-x11-Xvfb xorg-x11-server-glx
Obsoletes: xorg-x11-Xnest xorg-x11-Xprt xorg-x11-Xvfb xorg-x11-server-glx
-Summary: xorg-x11-server
+Summary: X.Org Server
Source: xorg-server-%{dirsuffix}.tar.bz2
Source1: Mesa-6.5_20060712.tar.bz2
Source3: README.updates
@@ -34,10 +34,16 @@
Patch3: p_ValidatePci.diff
Patch4: xprint.diff
Patch5: xorg-server.diff
+Patch6: pu_fixes.diff
+Patch7: p_mouse_misc.diff
+Patch8: p_bug96328.diff
+Patch9: p_vga-crashfix.diff
+Patch10: p_xorg_rom_read.diff
+Patch11: ps_showopts.diff
%description
-This is the modularized Xserver for the X Window System.
+This package contains the X.Org Server.
@@ -91,7 +97,7 @@
Jim Gettys
%package sdk
-Summary: xorg-x11-server-sdk
+Summary: X.Org Server SDK.
Group: System/Libraries
Provides: xorg-x11-sdk
Obsoletes: xorg-x11-sdk
@@ -99,7 +105,7 @@
Autoreqprov: on
%description sdk
-xorg-x11-server-sdk
+This package contains the X.Org Server SDK.
@@ -160,6 +166,12 @@
%patch3
%patch4
%patch5
+%patch6
+%patch7 -p2
+%patch8 -p2
+%patch9 -p2
+%patch10 -p3
+%patch11
%build
autoreconf -fi
@@ -200,6 +212,7 @@
ln -snf ../../bin/X $RPM_BUILD_ROOT/usr/X11R6/bin/X
ln -snf ../../bin/Xorg $RPM_BUILD_ROOT/usr/X11R6/bin/Xorg
chmod u+s $RPM_BUILD_ROOT/usr/bin/Xorg
+mkdir -p $RPM_BUILD_ROOT/var/X11R6/bin
mkdir -p $RPM_BUILD_ROOT/usr/%{_lib}/xorg/modules/updates/{fonts,input,linux,drivers,multimedia,extensions}
install -m 644 $RPM_SOURCE_DIR/README.updates $RPM_BUILD_ROOT/usr/%{_lib}/xorg/modules/updates
mkdir -p $RPM_BUILD_ROOT/etc/permissions.d
@@ -320,6 +333,7 @@
%files
%defattr(-,root,root)
%dir /usr/%{_lib}/xorg
+%dir /var/X11R6/bin
%dir /var/lib/xkb
%dir /var/lib/xkb/compiled
/etc/permissions.d/%name.*
@@ -377,6 +391,22 @@
/usr/share/aclocal/*.m4
%changelog -n xorg-x11-server
+* Sat Aug 05 2006 - sndirsch@suse.de
+- p_mouse_misc.diff:
+ * fix X server crashes with synaptics driver (Bug #61702)
+- pu_fixes.diff
+ * Fixes not yet in the official version
+- p_bug96328.diff:
+ * fallback mouse device checking
+- p_vga-crashfix.diff:
+ * fixes vga driver crash (#133989)
+- p_xorg_rom_read.diff
+ * read rom in big chunks instead of byte-at-a-time (Bug #140811)
+- ps_showopts.diff
+ * Xserver "-showopts" option to print available driver options
+ (Bug #137374)
+* Sat Aug 05 2006 - sndirsch@suse.de
+- add /var/X11R6/bin directory for now (Bug #197188)
* Wed Aug 02 2006 - sndirsch@suse.de
- fix setup line
* Mon Jul 31 2006 - sndirsch@suse.de
++++++ p_bug96328.diff ++++++
Index: xf86Configure.c
===================================================================
RCS file: /home/eich/cvs/xc/programs/Xserver/hw/xfree86/common/xf86Configure.c,v
retrieving revision 1.1.1.43.10.1
diff -u -r1.1.1.43.10.1 xf86Configure.c
--- programs/Xserver/hw/xfree86/common/xf86Configure.c 28 Jan 2005 16:21:08 -0000 1.1.1.43.10.1
+++ programs/Xserver/hw/xfree86/common/xf86Configure.c 3 Aug 2005 14:54:46 -0000
@@ -267,34 +267,36 @@
/* Crude mechanism to auto-detect mouse (os dependent) */
{
- int fd;
-#if 0 && defined linux
- /* Our autodetection code can do a better job */
- int len;
- char path[32];
-
- if ((len = readlink(DFLT_MOUSE_DEV, path, sizeof(path) - 1)) > 0) {
- path[len] = '\0';
- if (strstr(path, "psaux") != NULL)
- DFLT_MOUSE_PROTO = "PS/2";
- }
-#endif
+ int fd = -1;
+
#ifdef WSCONS_SUPPORT
- fd = open("/dev/wsmouse", 0);
- if (fd > 0) {
- DFLT_MOUSE_DEV = "/dev/wsmouse";
- DFLT_MOUSE_PROTO = "wsmouse";
- close(fd);
- } else {
- ErrorF("cannot open /dev/wsmouse\n");
+ if (fd == -1) {
+ fd = open("/dev/wsmouse", 0);
+ if (fd != -1) {
+ DFLT_MOUSE_DEV = "/dev/wsmouse";
+ DFLT_MOUSE_PROTO = "wsmouse";
+ close(fd);
+ } else {
+ ErrorF("cannot open /dev/wsmouse\n");
+ }
}
#endif
#ifndef __SCO__
- fd = open(DFLT_MOUSE_DEV, 0);
- if (fd != -1) {
- foundMouse = TRUE;
- close(fd);
+ if (fd == -1) {
+ fd = open(DFLT_MOUSE_DEV, 0);
+# ifdef linux
+ if (fd == -1) {
+ char *name = "/dev/input/mice";
+ fd = open(name, 0);
+ if (fd != -1)
+ DFLT_MOUSE_DEV = name;
+ }
+# endif
+ if (fd != -1) {
+ foundMouse = TRUE;
+ close(fd);
+ }
}
#else
foundMouse = TRUE;
++++++ p_mouse_misc.diff ++++++
Index: programs/Xserver/hw/xfree86/common/xf86MiscExt.c
===================================================================
RCS file: /home/eich/cvs/xc/programs/Xserver/hw/xfree86/common/xf86MiscExt.c,v
retrieving revision 1.1.1.15
diff -u -r1.1.1.15 xf86MiscExt.c
--- programs/Xserver/hw/xfree86/common/xf86MiscExt.c 6 Jul 2004 15:12:40 -0000 1.1.1.15
+++ programs/Xserver/hw/xfree86/common/xf86MiscExt.c 17 Mar 2005 18:39:52 -0000
@@ -166,6 +166,11 @@
*devname = xf86FindOptionValue(pInfo->options, "Device");
pMse = pInfo->private;
+ if (pMse->magic != MOUSE_MAGIC
+ || pMse->size != sizeof(*pMse))
+ return FALSE;
+
+
mseptr->type = MapMseProtoToMisc(pMse->protocolID);
mseptr->baudrate = pMse->baudRate;
mseptr->samplerate = pMse->sampleRate;
@@ -533,6 +538,11 @@
pInfo = mse->private;
pMse = pInfo->private;
+
+ if (pMse->magic != MOUSE_MAGIC
+ || pMse->size != sizeof(*pMse))
+ return MISC_RET_NOMODULE;
+
oldflags = pMse->mouseFlags;
newProtocol = MapMseMiscToProto(mse->type);
Index: programs/Xserver/hw/xfree86/os-support/xf86OSmouse.h
===================================================================
RCS file: /home/eich/cvs/xc/programs/Xserver/hw/xfree86/os-support/xf86OSmouse.h,v
retrieving revision 1.1.1.21
diff -u -r1.1.1.21 xf86OSmouse.h
--- programs/Xserver/hw/xfree86/os-support/xf86OSmouse.h 1 Nov 2004 16:46:39 -0000 1.1.1.21
+++ programs/Xserver/hw/xfree86/os-support/xf86OSmouse.h 17 Mar 2005 18:39:52 -0000
@@ -204,7 +204,11 @@
int dx, int dy, int dz, int dw);
typedef void (*MouseCommonOptProc)(InputInfoPtr pInfo);
+#define MOUSE_MAGIC 15031995
+
typedef struct _MouseDevRec {
+ unsigned long magic;
+ int size;
PtrCtrlProcPtr Ctrl;
PostMseEventProc PostEvent;
MouseCommonOptProc CommonOptions;
++++++ p_vga-crashfix.diff ++++++
Index: programs/Xserver/miext/cw/cw.c
===================================================================
RCS file: /home/eich/cvs/xc/programs/Xserver/miext/cw/cw.c,v
retrieving revision 1.1.1.5
diff -u -r1.1.1.5 cw.c
--- programs/Xserver/miext/cw/cw.c 25 Nov 2005 10:05:47 -0000 1.1.1.5
+++ programs/Xserver/miext/cw/cw.c 28 Nov 2005 18:24:10 -0000
@@ -659,7 +659,7 @@
SCREEN_EPILOGUE(pScreen, GetWindowPixmap, cwGetWindowPixmap);
#ifdef RENDER
- if (GetPictureScreen (pScreen))
+ if (GetPictureScreenIfSet (pScreen))
cwInitializeRender(pScreen);
#endif
}
Index: programs/Xserver/render/picture.c
===================================================================
RCS file: /home/eich/cvs/xc/programs/Xserver/render/picture.c,v
retrieving revision 1.1.1.28
diff -u -r1.1.1.28 picture.c
--- programs/Xserver/render/picture.c 25 Nov 2005 10:05:52 -0000 1.1.1.28
+++ programs/Xserver/render/picture.c 28 Nov 2005 18:24:10 -0000
@@ -69,9 +69,11 @@
Bool
AllocatePicturePrivate (ScreenPtr pScreen, int index2, unsigned int amount)
{
- PictureScreenPtr ps = GetPictureScreen(pScreen);
+ PictureScreenPtr ps = GetPictureScreenIfSet(pScreen);
unsigned int oldamount;
+ if (!ps) return TRUE;
+
/* Round up sizes for proper alignment */
amount = ((amount + (sizeof(long) - 1)) / sizeof(long)) * sizeof(long);
++++++ p_xorg_rom_read.diff ++++++
--- xc/programs/Xserver/hw/xfree86/os-support/bus/linuxPci.c.orig 2005-12-21 18:53:54.000000000 -0700
+++ xc/programs/Xserver/hw/xfree86/os-support/bus/linuxPci.c 2005-12-21 19:01:28.000000000 -0700
@@ -791,8 +791,10 @@
write(fd, "1", 2);
lseek(fd, 0, SEEK_SET);
+ len = min(Len, st.st_size);
+
/* copy the ROM until we hit Len, EOF or read error */
- for (i = 0; i < Len && read(fd, Buf, 1) > 0; Buf++, i++)
+ for (; len && (size = read(fd, Buf, len)) > 0 ; Buf+=size, len-=size)
;
write(fd, "0", 2);
++++++ ps_showopts.diff ++++++
diff -u -r -N hw/xfree86/common.orig/Makefile.am hw/xfree86/common/Makefile.am
--- hw/xfree86/common.orig/Makefile.am 2006-08-06 18:01:51.000000000 +0200
+++ hw/xfree86/common/Makefile.am 2006-08-06 18:03:28.000000000 +0200
@@ -31,7 +31,7 @@
BUILT_SOURCES = xf86DefModeSet.c
AM_LDFLAGS = -r
-libcommon_la_SOURCES = xf86Configure.c xf86Bus.c xf86Config.c \
+libcommon_la_SOURCES = xf86Configure.c xf86ShowOpts.c xf86Bus.c xf86Config.c \
xf86Cursor.c xf86cvt.c xf86DGA.c xf86DPMS.c \
xf86DoProbe.c xf86DoScanPci.c xf86Events.c \
xf86Globals.c xf86Io.c xf86AutoConfig.c \
diff -u -r -N hw/xfree86/common.orig/xf86.h hw/xfree86/common/xf86.h
--- hw/xfree86/common.orig/xf86.h 2006-08-06 18:01:51.000000000 +0200
+++ hw/xfree86/common/xf86.h 2006-08-06 18:05:18.000000000 +0200
@@ -48,6 +48,7 @@
/* General parameters */
extern int xf86DoConfigure;
+extern int xf86DoShowOptions;
extern Bool xf86DoConfigurePass1;
extern int xf86ScreenIndex; /* Index into pScreen.devPrivates */
extern int xf86CreateRootWindowIndex; /* Index into pScreen.devPrivates */
diff -u -r -N hw/xfree86/common.orig/xf86Globals.c hw/xfree86/common/xf86Globals.c
--- hw/xfree86/common.orig/xf86Globals.c 2006-08-06 18:01:51.000000000 +0200
+++ hw/xfree86/common/xf86Globals.c 2006-08-06 18:05:49.000000000 +0200
@@ -188,6 +188,7 @@
Bool xf86ProbeFailed = FALSE;
Bool xf86DoProbe = FALSE;
Bool xf86DoConfigure = FALSE;
+Bool xf86DoShowOptions = FALSE;
DriverPtr *xf86DriverList = NULL;
int xf86NumDrivers = 0;
InputDriverPtr *xf86InputDriverList = NULL;
diff -u -r -N hw/xfree86/common.orig/xf86Init.c hw/xfree86/common/xf86Init.c
--- hw/xfree86/common.orig/xf86Init.c 2006-08-06 18:01:51.000000000 +0200
+++ hw/xfree86/common/xf86Init.c 2006-08-06 18:07:55.000000000 +0200
@@ -309,7 +309,7 @@
}
/* Read and parse the config file */
- if (!xf86DoProbe && !xf86DoConfigure) {
+ if (!xf86DoProbe && !xf86DoConfigure && !xf86DoShowOptions) {
switch (xf86HandleConfigFile(FALSE)) {
case CONFIG_OK:
break;
@@ -367,7 +367,10 @@
/* Force load mandatory base modules */
if (!xf86LoadModules(baseModules, NULL))
FatalError("Unable to load required base modules, Exiting...\n");
-
+
+ if (xf86DoShowOptions)
+ DoShowOptions();
+
xf86OpenConsole();
/* Do a general bus probe. This will be a PCI probe for x86 platforms */
@@ -1657,6 +1660,15 @@
xf86AllowMouseOpenFail = TRUE;
return 1;
}
+ if (!strcmp(argv[i], "-showopts"))
+ {
+ if (getuid() != 0 && geteuid() == 0) {
+ ErrorF("The '-showopts' option can only be used by root.\n");
+ exit(1);
+ }
+ xf86DoShowOptions = TRUE;
+ return 1;
+ }
if (!strcmp(argv[i], "-isolateDevice"))
{
int bus, device, func;
@@ -1699,6 +1711,7 @@
ErrorF("-modulepath paths specify the module search path\n");
ErrorF("-logfile file specify a log file name\n");
ErrorF("-configure probe for devices and write an "__XCONFIGFILE__"\n");
+ ErrorF("-showopts print available options for all installed drivers\n");
}
ErrorF("-config file specify a configuration file, relative to the\n");
ErrorF(" "__XCONFIGFILE__" search path, only root can use absolute\n");
diff -u -r -N hw/xfree86/common.orig/xf86Priv.h hw/xfree86/common/xf86Priv.h
--- hw/xfree86/common.orig/xf86Priv.h 2006-08-06 18:01:51.000000000 +0200
+++ hw/xfree86/common/xf86Priv.h 2006-08-06 18:02:03.000000000 +0200
@@ -169,6 +169,7 @@
/* xf86DoProbe.c */
void DoProbe(void);
void DoConfigure(void);
+void DoShowOptions(void);
/* xf86Events.c */
diff -u -r -N hw/xfree86/common.orig/xf86ShowOpts.c hw/xfree86/common/xf86ShowOpts.c
--- hw/xfree86/common.orig/xf86ShowOpts.c 1970-01-01 01:00:00.000000000 +0100
+++ hw/xfree86/common/xf86ShowOpts.c 2006-08-06 18:02:03.000000000 +0200
@@ -0,0 +1,129 @@
+/* $XFree86: xc/programs/Xserver/hw/xfree86/common/xf86ShopwOpts.c,v 3.80 2003/10/08 14:58:27 dawes Exp $ */
+/*
+ * Copyright 2000-2002 by Alan Hourihane, Flint Mountain, North Wales.
+ *
+ * Permission to use, copy, modify, distribute, and sell this software and its
+ * documentation for any purpose is hereby granted without fee, provided that
+ * the above copyright notice appear in all copies and that both that
+ * copyright notice and this permission notice appear in supporting
+ * documentation, and that the name of Alan Hourihane not be used in
+ * advertising or publicity pertaining to distribution of the software without
+ * specific, written prior permission. Alan Hourihane makes no representations
+ * about the suitability of this software for any purpose. It is provided
+ * "as is" without express or implied warranty.
+ *
+ * ALAN HOURIHANE DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
+ * INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO
+ * EVENT SHALL ALAN HOURIHANE BE LIABLE FOR ANY SPECIAL, INDIRECT OR
+ * CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+ * DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+ * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+ * PERFORMANCE OF THIS SOFTWARE.
+ *
+ * Author: Marcus Schaefer, ms@suse.de
+ *
+ */
+
+#include