diff --git a/.cvsignore b/.cvsignore index ef4b7ef..3b08a49 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -xorg-server-1.6.1.901.tar.bz2 +xorg-server-1.6.2.tar.bz2 diff --git a/sources b/sources index 358b339..4e69219 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -e6cba1f07006143daa95ce3f11d999b2 xorg-server-1.6.1.901.tar.bz2 +37641d0899df8a9c4a6284586d932b8d xorg-server-1.6.2.tar.bz2 diff --git a/xorg-x11-server.spec b/xorg-x11-server.spec index 8848335..5b8861e 100644 --- a/xorg-x11-server.spec +++ b/xorg-x11-server.spec @@ -18,8 +18,8 @@ Summary: X.Org X11 X server Name: xorg-x11-server -Version: 1.6.1.901 -Release: 5%{?dist} +Version: 1.6.2 +Release: 1%{?dist} URL: http://www.x.org License: MIT Group: User Interface/X @@ -91,21 +91,16 @@ Patch6016: xserver-1.6.1-nouveau.patch Patch6022: xserver-1.6.0-primary.patch -Patch6024: xserver-1.6.0-xinerama-cursors.patch - # ajax needs to upstream this Patch6027: xserver-1.6.0-displayfd.patch -Patch6028: xserver-1.6.0-restore-zap.patch Patch6029: xserver-1.6.0-no-i810.patch -Patch6030: xserver-1.6.0-randr-xinerama-crash.patch Patch6031: xserver-1.6.1-exa-avoid-swapped-out.patch Patch6032: xserver-1.6.1-randr-gamma.patch # Nominated for 1.6.2 Patch6034: xserver-1.6.1-exa-create-pixmap2.patch -Patch6035: xserver-1.6.1-avoid-malloc-for-logging.patch Patch6040: xserver-1.6.1-vt-switch.patch # from upstream, nominated for 1.6.2 (#499792) @@ -113,8 +108,6 @@ Patch6041: xserver-1.6.1-synaptics.patch Patch6042: xserver-1.6.1-proc-cmdline.patch # second part to xserver-1.6.1-synaptics.patch Patch6043: xserver-1.6.1-mousedrivers.patch -# #456376, patch from upstream -Patch6044: xserver-1.6.1-xkbsendmap.patch # #492359, monitor doesn't set first detailed timing preferred bit Patch6045: xserver-1.6.1-pea-quirk.patch @@ -143,7 +136,7 @@ BuildRequires: git-core BuildRequires: automake autoconf libtool pkgconfig BuildRequires: xorg-x11-util-macros >= 1.1.5 -BuildRequires: xorg-x11-proto-devel >= 7.4-10 +BuildRequires: xorg-x11-proto-devel >= 7.4-15 BuildRequires: xorg-x11-xtrans-devel >= 1.2.2-1 BuildRequires: libXfont-devel libXau-devel libxkbfile-devel libXres-devel @@ -536,6 +529,9 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Wed Jul 08 2009 Peter Hutterer 1.6.2-1 +- xserver 1.6.2 + * Thu Jun 11 2009 Ben Skeggs 1.6.1.901-5 - xserver-1.6.1-nouveau.patch: fix detection of earlier chipsets diff --git a/xserver-1.6.0-randr-xinerama-crash.patch b/xserver-1.6.0-randr-xinerama-crash.patch deleted file mode 100644 index be033b6..0000000 --- a/xserver-1.6.0-randr-xinerama-crash.patch +++ /dev/null @@ -1,38 +0,0 @@ -From be710aa311f385827f7d4ac1773971d575353d3b Mon Sep 17 00:00:00 2001 -From: Dave Airlie -Date: Wed, 15 Apr 2009 18:26:06 +1000 -Subject: [PATCH] randr12: looking up these bits if randr isn't initialised is bad. - -With xinerama enabled I get a segfault in here, this might not -be the right answer. ---- - hw/xfree86/modes/xf86RandR12.c | 6 ++++-- - 1 files changed, 4 insertions(+), 2 deletions(-) - -diff --git a/hw/xfree86/modes/xf86RandR12.c b/hw/xfree86/modes/xf86RandR12.c -index dacb5d2..ac066a8 100644 ---- a/hw/xfree86/modes/xf86RandR12.c -+++ b/hw/xfree86/modes/xf86RandR12.c -@@ -754,8 +754,8 @@ Bool - xf86RandR12CreateScreenResources (ScreenPtr pScreen) - { - ScrnInfoPtr pScrn = xf86Screens[pScreen->myNum]; -- xf86CrtcConfigPtr config = XF86_CRTC_CONFIG_PTR(pScrn); -- XF86RandRInfoPtr randrp = XF86RANDRINFO(pScreen); -+ xf86CrtcConfigPtr config; -+ XF86RandRInfoPtr randrp; - int c; - int width, height; - int mmWidth, mmHeight; -@@ -765,6 +765,8 @@ xf86RandR12CreateScreenResources (ScreenPtr pScreen) - return TRUE; - #endif - -+ config = XF86_CRTC_CONFIG_PTR(pScrn); -+ randrp = XF86RANDRINFO(pScreen); - /* - * Compute size of screen - */ --- -1.6.0.6 - diff --git a/xserver-1.6.0-restore-zap.patch b/xserver-1.6.0-restore-zap.patch deleted file mode 100644 index cc2fdc9..0000000 --- a/xserver-1.6.0-restore-zap.patch +++ /dev/null @@ -1,77 +0,0 @@ -From 41da426ebe0d8dc0734ff9dc5bcbfac9d9bd97b9 Mon Sep 17 00:00:00 2001 -From: Peter Hutterer -Date: Thu, 9 Apr 2009 10:12:27 +1000 -Subject: [PATCH] xfree86: restore default off for DontZap - -Zapping is triggered by xkb nowawdays, so make a note in the man page that -it's the Terminate_Server action. Since it's XKB, the correct way of disabling -it is through xkb rulesets. - -Signed-off-by: Peter Hutterer ---- - doc/Xserver.man.pre | 2 +- - hw/xfree86/common/xf86Config.c | 5 ++--- - hw/xfree86/doc/man/xorg.conf.man.pre | 11 +++++------ - 3 files changed, 8 insertions(+), 10 deletions(-) - -diff --git a/doc/Xserver.man.pre b/doc/Xserver.man.pre -index 8897e1a..dd81223 100644 ---- a/doc/Xserver.man.pre -+++ b/doc/Xserver.man.pre -@@ -223,7 +223,7 @@ turns on auto-repeat. - starts the stipple with the classic stipple and cursor visible. The default - is to start with a black root window, and to suppress display of the cursor - until the first time an application calls XDefineCursor(). For the Xorg --server, this also changes the default for the DontZap option to FALSE. For -+server, this also sets the default for the DontZap option to FALSE. For - kdrive servers, this implies -zap. - .TP 8 - .B \-s \fIminutes\fP -diff --git a/hw/xfree86/common/xf86Config.c b/hw/xfree86/common/xf86Config.c -index 17223a1..54c835d 100644 ---- a/hw/xfree86/common/xf86Config.c -+++ b/hw/xfree86/common/xf86Config.c -@@ -733,7 +733,7 @@ static OptionInfoRec FlagOptions[] = { - { FLAG_DONTVTSWITCH, "DontVTSwitch", OPTV_BOOLEAN, - {0}, FALSE }, - { FLAG_DONTZAP, "DontZap", OPTV_BOOLEAN, -- {0}, TRUE }, -+ {0}, FALSE }, - { FLAG_DONTZOOM, "DontZoom", OPTV_BOOLEAN, - {0}, FALSE }, - { FLAG_DISABLEVIDMODE, "DisableVidModeExtension", OPTV_BOOLEAN, -@@ -845,8 +845,7 @@ configServerFlags(XF86ConfFlagsPtr flagsconf, XF86OptionPtr layoutopts) - - xf86GetOptValBool(FlagOptions, FLAG_NOTRAPSIGNALS, &xf86Info.notrapSignals); - xf86GetOptValBool(FlagOptions, FLAG_DONTVTSWITCH, &xf86Info.dontVTSwitch); -- if (!xf86GetOptValBool(FlagOptions, FLAG_DONTZAP, &xf86Info.dontZap)) -- xf86Info.dontZap = !party_like_its_1989; -+ xf86GetOptValBool(FlagOptions, FLAG_DONTZAP, &xf86Info.dontZap); - xf86GetOptValBool(FlagOptions, FLAG_DONTZOOM, &xf86Info.dontZoom); - - xf86GetOptValBool(FlagOptions, FLAG_IGNORE_ABI, &xf86Info.ignoreABI); -diff --git a/hw/xfree86/doc/man/xorg.conf.man.pre b/hw/xfree86/doc/man/xorg.conf.man.pre -index d45c3b8..a0230cd 100644 ---- a/hw/xfree86/doc/man/xorg.conf.man.pre -+++ b/hw/xfree86/doc/man/xorg.conf.man.pre -@@ -464,12 +464,11 @@ Default: off. - .TP 7 - .BI "Option \*qDontZap\*q \*q" boolean \*q - This disallows the use of the --.B Ctrl+Alt+Backspace --sequence. --That sequence is normally used to terminate the __xservername__ server. --When this option is enabled (as per default), that key sequence has no --special meaning. --Default: on. -+.B Terminate_Server -+XKB action (usually on Ctrl+Alt+Backspace, depending on XKB options). -+This action is normally used to terminate the __xservername__ server. -+When this option is enabled, the action has no effect. -+Default: off. - .TP 7 - .BI "Option \*qDontZoom\*q \*q" boolean \*q - This disallows the use of the --- -1.6.2.2.447.g4afa7 - diff --git a/xserver-1.6.0-xinerama-cursors.patch b/xserver-1.6.0-xinerama-cursors.patch deleted file mode 100644 index 2e093ab..0000000 --- a/xserver-1.6.0-xinerama-cursors.patch +++ /dev/null @@ -1,37 +0,0 @@ -From 3323f7ac880d5a8261d5b22059374fc9de8ca683 Mon Sep 17 00:00:00 2001 -From: Peter Hutterer -Date: Wed, 25 Mar 2009 12:55:42 +1000 -Subject: [PATCH] xfree86: fix SWCursor check in xf86CursorSetCursor. - -Wrong check for inputInfo.pointer resulted in a SW cursor being rendered when -the pointer left the screen (in a Xinerama setup). -We must call the sprite rendering function if -- SW cursors are enabled, or -- The current device is not the VCP and not attached to the VCP. - -Reported-by: Gordon Yuan -Signed-off-by: Peter Hutterer ---- - hw/xfree86/ramdac/xf86Cursor.c | 6 +++--- - 1 files changed, 3 insertions(+), 3 deletions(-) - -diff --git a/hw/xfree86/ramdac/xf86Cursor.c b/hw/xfree86/ramdac/xf86Cursor.c -index 2b73b16..896ed37 100644 ---- a/hw/xfree86/ramdac/xf86Cursor.c -+++ b/hw/xfree86/ramdac/xf86Cursor.c -@@ -302,9 +302,9 @@ xf86CursorSetCursor(DeviceIntPtr pDev, ScreenPtr pScreen, CursorPtr pCurs, - - - if (pCurs == NullCursor) { /* means we're supposed to remove the cursor */ -- if (ScreenPriv->SWCursor || pDev != inputInfo.pointer) -- (*ScreenPriv->spriteFuncs->SetCursor)(pDev, pScreen, NullCursor, -- x, y); -+ if (ScreenPriv->SWCursor || -+ !(pDev == inputInfo.pointer || !pDev->isMaster && pDev->u.master == inputInfo.pointer)) -+ (*ScreenPriv->spriteFuncs->SetCursor)(pDev, pScreen, NullCursor, x, y); - else if (ScreenPriv->isUp) { - xf86SetCursor(pScreen, NullCursor, x, y); - ScreenPriv->isUp = FALSE; --- -1.6.0.6 - diff --git a/xserver-1.6.1-avoid-malloc-for-logging.patch b/xserver-1.6.1-avoid-malloc-for-logging.patch deleted file mode 100644 index 61c7f50..0000000 --- a/xserver-1.6.1-avoid-malloc-for-logging.patch +++ /dev/null @@ -1,58 +0,0 @@ -From 0e0642ee9466d3268476d0084a83a9d93a4aa555 Mon Sep 17 00:00:00 2001 -From: Peter Hutterer -Date: Thu, 16 Apr 2009 16:17:07 +1000 -Subject: [PATCH] os: don't malloc memory in LogVMessageVerb. - -LogVWrite is limited to a buffer size of 1024, so we don't loose anything here -by truncating. This way we can use LogVMessageVerb (and xf86Msg and friends) -during signal handlers with the normal message types. - -Signed-off-by: Peter Hutterer -Acked-by: Alan Coopersmith ---- - os/log.c | 22 ++++++---------------- - 1 files changed, 6 insertions(+), 16 deletions(-) - -diff --git a/os/log.c b/os/log.c -index 3961b0b..8108890 100644 ---- a/os/log.c -+++ b/os/log.c -@@ -316,7 +316,7 @@ void - LogVMessageVerb(MessageType type, int verb, const char *format, va_list args) - { - const char *s = X_UNKNOWN_STRING; -- char *tmpBuf = NULL; -+ char tmpBuf[1024]; - - /* Ignore verbosity for X_ERROR */ - if (logVerbosity >= verb || logFileVerbosity >= verb || type == X_ERROR) { -@@ -358,21 +358,11 @@ LogVMessageVerb(MessageType type, int verb, const char *format, va_list args) - break; - } - -- /* -- * Prefix the format string with the message type. We do it this way -- * so that LogVWrite() is only called once per message. -- */ -- if (s) { -- tmpBuf = malloc(strlen(format) + strlen(s) + 1 + 1); -- /* Silently return if malloc fails here. */ -- if (!tmpBuf) -- return; -- sprintf(tmpBuf, "%s ", s); -- strcat(tmpBuf, format); -- LogVWrite(verb, tmpBuf, args); -- free(tmpBuf); -- } else -- LogVWrite(verb, format, args); -+ /* if s is not NULL we need a space before format */ -+ snprintf(tmpBuf, sizeof(tmpBuf), "%s%s%s", s ? s : "", -+ s ? " " : "", -+ format); -+ LogVWrite(verb, tmpBuf, args); - } - } - --- -1.6.2.2 - diff --git a/xserver-1.6.1-xkbsendmap.patch b/xserver-1.6.1-xkbsendmap.patch deleted file mode 100644 index b5037bd..0000000 --- a/xserver-1.6.1-xkbsendmap.patch +++ /dev/null @@ -1,63 +0,0 @@ -From 525aa17f804d37d1cfcbbf6b8e6cddb45e999b20 Mon Sep 17 00:00:00 2001 -From: Tomas Janousek -Date: Wed, 20 May 2009 15:03:01 +0200 -Subject: [PATCH] Bug #6428, #16458, #21464: Fix crash due to uninitialized VModMap fields. - -In ProcXkbGetKbdByName, mrep.firstVModMapKey, .nVModMapKeys and -.totalVModMapKeys were not initialized, contained random values and caused -accesses to unallocated and later modified memory, causing -XkbSizeVirtualModMap and XkbWriteVirtualModMap to see different number of -nonzero values, resulting in writes past the end of an array in XkbSendMap. - -This patch initializes those values sensibly and reverts commits 5c0a2088 and -6dd4fc46, which have been plain non-sense. - -Signed-off-by: Tomas Janousek -Signed-off-by: Peter Hutterer ---- - xkb/xkb.c | 8 +++++--- - 1 files changed, 5 insertions(+), 3 deletions(-) - -diff --git a/xkb/xkb.c b/xkb/xkb.c -index 445c55f..ec46238 100644 ---- a/xkb/xkb.c -+++ b/xkb/xkb.c -@@ -1308,7 +1308,7 @@ XkbSizeVirtualModMap(XkbDescPtr xkb,xkbGetMapReply *rep) - rep->totalVModMapKeys= 0; - return 0; - } -- for (nRtrn=i=0;inVModMapKeys-1;i++) { -+ for (nRtrn=i=0;inVModMapKeys;i++) { - if (xkb->server->vmodmap[i+rep->firstVModMapKey]!=0) - nRtrn++; - } -@@ -1327,7 +1327,7 @@ unsigned short * pMap; - - wire= (xkbVModMapWireDesc *)buf; - pMap= &xkb->server->vmodmap[rep->firstVModMapKey]; -- for (i=0;inVModMapKeys-1;i++,pMap++) { -+ for (i=0;inVModMapKeys;i++,pMap++) { - if (*pMap!=0) { - wire->key= i+rep->firstVModMapKey; - wire->vmods= *pMap; -@@ -5670,7 +5670,7 @@ ProcXkbGetKbdByName(ClientPtr client) - mrep.present = 0; - mrep.totalSyms = mrep.totalActs = - mrep.totalKeyBehaviors= mrep.totalKeyExplicit= -- mrep.totalModMapKeys= 0; -+ mrep.totalModMapKeys= mrep.totalVModMapKeys= 0; - if (rep.reported&(XkbGBN_TypesMask|XkbGBN_ClientSymbolsMask)) { - mrep.present|= XkbKeyTypesMask; - mrep.firstType = 0; -@@ -5696,6 +5696,8 @@ ProcXkbGetKbdByName(ClientPtr client) - mrep.firstKeyExplicit = new->min_key_code; - mrep.nKeyActs = mrep.nKeyBehaviors = - mrep.nKeyExplicit = XkbNumKeys(new); -+ mrep.firstVModMapKey= new->min_key_code; -+ mrep.nVModMapKeys= XkbNumKeys(new); - } - else { - mrep.virtualMods= 0; --- -1.6.3.rc1.2.g0164.dirty -