ChangeLog | 342 ++++++++++++++++++++++++++++++++++
Xext/security.c | 42 ++--
Xext/xselinux.c | 9
Xi/exevents.c | 3
Xi/xiproperty.c | 9
configure.ac | 4
debian/changelog | 15 +
debian/patches/20_hurd-i386.diff | 32 ++-
debian/patches/kfreebsd-ftbfs.diff | 45 ++++
debian/patches/series | 1
dix/events.c | 17 +
dix/getevents.c | 14 -
dix/protocol.txt | 12 +
doc/Xserver.man.pre | 7
exa/exa.c | 13 +
exa/exa.h | 14 +
exa/exa_migration.c | 2
exa/exa_unaccel.c | 25 ++
hw/xfree86/common/xf86Config.c | 13 +
hw/xfree86/common/xf86Xinput.c | 4
hw/xfree86/dixmods/extmod/xf86vmode.c | 16 -
hw/xfree86/doc/man/Xorg.man.pre | 3
hw/xfree86/dri2/dri2ext.c | 4
hw/xfree86/loader/loadmod.c | 3
hw/xfree86/modes/xf86Crtc.c | 11 -
hw/xfree86/modes/xf86EdidModes.c | 10
hw/xfree86/modes/xf86RandR12.c | 6
os/log.c | 22 --
xkb/xkb.c | 2
29 files changed, 598 insertions(+), 102 deletions(-)
New commits:
commit cbccf51785b500f51dc974ed05f5512181d4c51f
Author: Julien Cristau <jcris...@debian.org>
Date: Thu May 14 17:37:58 2009 +0200
Prepare changelog for upload
diff --git a/debian/changelog b/debian/changelog
index 84bcd53..8a2d6f3 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,9 +1,9 @@
-xorg-server (2:1.6.1.901-2) UNRELEASED; urgency=low
+xorg-server (2:1.6.1.901-2) unstable; urgency=low
* Merge from upstream server-1.6-branch (commit a9f85dce).
* Fix FTBFS on kfreebsd (closes: #525475). Thanks, Petr Salinger!
- -- Julien Cristau <jcris...@debian.org> Thu, 14 May 2009 17:08:00 +0200
+ -- Julien Cristau <jcris...@debian.org> Thu, 14 May 2009 17:37:40 +0200
xorg-server (2:1.6.1.901-1) experimental; urgency=low
commit 591c5973038e3d77960b74a367ff783bbe3934a8
Author: Julien Cristau <jcris...@debian.org>
Date: Thu May 14 17:37:26 2009 +0200
add bug closer to 1.6.1.901 changelog entry
diff --git a/debian/changelog b/debian/changelog
index 1b00c55..84bcd53 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -8,6 +8,7 @@ xorg-server (2:1.6.1.901-2) UNRELEASED; urgency=low
xorg-server (2:1.6.1.901-1) experimental; urgency=low
* New upstream development release
+ + fixes crash in CheckMotion with xinerama (closes: #524853)
+ Refresh 20_hurd-i386.diff
[ Brice Goglin ]
commit 9fd63eea38b10780355f827eee138c09aee7487f
Author: Julien Cristau <jcris...@debian.org>
Date: Thu May 14 17:13:57 2009 +0200
Fix FTBFS on kfreebsd (closes: #525475).
Thanks, Petr Salinger!
diff --git a/debian/changelog b/debian/changelog
index 0458d52..1b00c55 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,7 @@
xorg-server (2:1.6.1.901-2) UNRELEASED; urgency=low
* Merge from upstream server-1.6-branch (commit a9f85dce).
+ * Fix FTBFS on kfreebsd (closes: #525475). Thanks, Petr Salinger!
-- Julien Cristau <jcris...@debian.org> Thu, 14 May 2009 17:08:00 +0200
diff --git a/debian/patches/kfreebsd-ftbfs.diff
b/debian/patches/kfreebsd-ftbfs.diff
new file mode 100644
index 0000000..8f9368b
--- /dev/null
+++ b/debian/patches/kfreebsd-ftbfs.diff
@@ -0,0 +1,45 @@
+From 4cc33190ef1a4207c0f8fc74201cdf2568a239c2 Mon Sep 17 00:00:00 2001
+From: Julien Cristau <jcris...@debian.org>
+Date: Thu, 14 May 2009 17:01:57 +0200
+Subject: [PATCH] xfree86: Add two __FreeBSD_kernel__ checks
+
+Debian bug#525475 <http://bugs.debian.org/525475>
+
+Reported-by: Petr Salinger <petr.salin...@seznam.cz>
+Signed-off-by: Julien Cristau <jcris...@debian.org>
+---
+ hw/xfree86/os-support/bus/Pci.h | 3 ++-
+ hw/xfree86/os-support/shared/stdResource.c | 3 ++-
+ 2 files changed, 4 insertions(+), 2 deletions(-)
+
+diff --git a/hw/xfree86/os-support/bus/Pci.h b/hw/xfree86/os-support/bus/Pci.h
+index 7623e97..79b38f0 100644
+--- a/hw/xfree86/os-support/bus/Pci.h
++++ b/hw/xfree86/os-support/bus/Pci.h
+@@ -168,7 +168,8 @@
+
+ #endif /* !defined(DEBUGPCI) */
+
+-#if defined(__FreeBSD__) || defined(__OpenBSD__) || defined(__NetBSD__) || \
++#if defined(__FreeBSD__) || defined(__FreeBSD_kernel__) || \
++ defined(__OpenBSD__) || defined(__NetBSD__) || \
+ defined(__DragonFly__) || defined(__sun) || defined(__GNU__)
+ #define ARCH_PCI_INIT bsdPciInit
+ #endif
+diff --git a/hw/xfree86/os-support/shared/stdResource.c
b/hw/xfree86/os-support/shared/stdResource.c
+index a4c162d..9db349b 100644
+--- a/hw/xfree86/os-support/shared/stdResource.c
++++ b/hw/xfree86/os-support/shared/stdResource.c
+@@ -43,7 +43,8 @@
+ /* Avoid Imakefile changes */
+ #include "bus/Pci.h"
+
+-#if defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__) || \
++#if defined(__FreeBSD__) || defined(__FreeBSD_kernel__) || \
++ defined(__NetBSD__) || defined(__OpenBSD__) || \
+ defined(__DragonFly__) || defined(__sun) || defined(__GNU__)
+ #define xf86StdAccResFromOS xf86AccResFromOS
+ #endif
+--
+1.6.2.4
+
diff --git a/debian/patches/series b/debian/patches/series
index 9949d6a..70abcb3 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,6 +1,7 @@
001_fedora_extramodes.patch
#13_debian_add_xkbpath_env_variable.diff
20_hurd-i386.diff
+kfreebsd-ftbfs.diff
0001-xorg.conf-5-refer-to-mousedrv-4-.-Debian-394058.patch
Turn-on-ModeDebug-by-default.patch
Add-libgcrypt-as-an-option-for-sha1.diff
commit e5f1ba21badbea7f2297a25cb407083128374ea9
Author: Julien Cristau <jcris...@debian.org>
Date: Thu May 14 17:12:38 2009 +0200
merge unreleased changelog entry with 2:1.6.1.901-1
diff --git a/debian/changelog b/debian/changelog
index a7e327c..0458d52 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -9,10 +9,6 @@ xorg-server (2:1.6.1.901-1) experimental; urgency=low
* New upstream development release
+ Refresh 20_hurd-i386.diff
- -- David Nusinow <dnusi...@debian.org> Mon, 11 May 2009 21:50:37 -0400
-
-xorg-server (2:1.6.1-2) UNRELEASED; urgency=low
-
[ Brice Goglin ]
* Add 20_hurd-i386.diff to fix FTBFS on hurd-i386,
thanks Samuel Thibault! (closes: #523970)
@@ -25,7 +21,7 @@ xorg-server (2:1.6.1-2) UNRELEASED; urgency=low
* Properly initialize libgcrypt in the libgcrypt patch (closes: #524822).
Thanks, Sven Joachim!
- -- David Nusinow <dnusi...@debian.org> Thu, 16 Apr 2009 22:44:29 -0400
+ -- David Nusinow <dnusi...@debian.org> Mon, 11 May 2009 21:50:37 -0400
xorg-server (2:1.6.1-1) unstable; urgency=low
commit 875b8b64e1d6c0411d5cf83de4148c2def9a52f3
Author: Julien Cristau <jcris...@debian.org>
Date: Thu May 14 17:12:06 2009 +0200
update changelogs
diff --git a/ChangeLog b/ChangeLog
index 4e012b2..357cf46 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,345 @@
+commit a9f85dcefbadfe44d8c58ad08430aaadb8c59d34
+Author: Eamon Walsh <ewa...@tycho.nsa.gov>
+Date: Mon May 11 15:27:46 2009 -0400
+
+ xselinux: Relax ownership restriction on SetSelectionUseContext.
+
+ Instead, clients should keep track of the selection instances they use.
+ (cherry picked from commit 0952d12717031e9dda9e48123bb922d0f4e81834)
+
+ Signed-off-by: Eamon Walsh <ewa...@tycho.nsa.gov>
+
+commit 0fbf6f30f771e60714fb3003a9bb1a6b79e50c6e
+Author: Alan Coopersmith <alan.coopersm...@sun.com>
+Date: Thu Mar 26 22:22:32 2009 -0700
+
+ Don't leak default font path when appending built-ins
+
+ Signed-off-by: Alan Coopersmith <alan.coopersm...@sun.com>
+ (cherry picked from commit 66539cc05d0b017b9feb4a038499907810140623)
+
+ Signed-off-by: Keith Packard <kei...@keithp.com>
+
+commit 773e4890b385a229b0919b4a249714d0bb7171a2
+Author: Alan Coopersmith <alan.coopersm...@sun.com>
+Date: Thu Mar 26 22:25:08 2009 -0700
+
+ Don't leak canonical module name and patterns if module is built-in
+
+ Signed-off-by: Alan Coopersmith <alan.coopersm...@sun.com>
+ Acked-by: Peter Hutterer <peter.hutte...@who-t.net>
+ (cherry picked from commit 1c101d75d4855b2698e3fc8d2dd662f20585812f)
+
+ Signed-off-by: Keith Packard <kei...@keithp.com>
+
+commit 21f58a2b0d0d96492d2d7c7de1bd654ed0114279
+Author: Peter Hutterer <peter.hutte...@who-t.net>
+Date: Wed May 6 16:55:32 2009 +1000
+
+ Xi: don't double-swap the XListDeviceProperties reply.
+
+ Signed-off-by: Peter Hutterer <peter.hutte...@who-t.net>
+ (cherry picked from commit 50cc8adafca4ba3838d468278d6eb8a4692d2488)
+
+ Signed-off-by: Keith Packard <kei...@keithp.com>
+
+commit b575af88d0e547a03b164f6f3b2d4b268b9ffc34
+Author: Peter Hutterer <peter.hutte...@who-t.net>
+Date: Wed May 6 22:25:28 2009 +1000
+
+ Xi: fix copy/paste error causing sizeof against wrong struct.
+
+ This wrong check may cause BadLength to be returned to the client even if
the
+ length is correct.
+
+ Signed-off-by: Peter Hutterer <peter.hutte...@who-t.net>
+ (cherry picked from commit 8b583ca2b21155359c6255f406c96599b277c762)
+
+ Signed-off-by: Keith Packard <kei...@keithp.com>
+
+commit 9c643b1e3ddc4ec9f1a924bd25f24df8536c7ea6
+Author: Peter Hutterer <peter.hutte...@who-t.net>
+Date: Thu Apr 16 16:17:07 2009 +1000
+
+ 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 <peter.hutte...@who-t.net>
+ Acked-by: Alan Coopersmith <alan.coopersm...@sun.com>
+ (cherry picked from commit 0e0642ee9466d3268476d0084a83a9d93a4aa555)
+
+ Signed-off-by: Keith Packard <kei...@keithp.com>
+
+commit 7cd596e0dd6b9c195d7e395c26bfb00ef544c525
+Author: Dave Airlie <airl...@linux.ie>
+Date: Wed Apr 15 18:26:06 2009 +1000
+
+ randr12: looking up these bits if randr isn't initialised is bad.
+
+ When xinerama is enabled we don't get randr protocol, but the
+ driver might still want randr internals
+ (cherry picked from commit faf7dfa099f5b42a703313fbd1bf8afdad07a179)
+
+ Signed-off-by: Keith Packard <kei...@keithp.com>
+
+commit bc95f29441b3daa7b9d91bd3c2b3e502a3a8cc81
+Author: Alan Coopersmith <alan.coopersm...@sun.com>
+Date: Thu Apr 23 08:42:38 2009 -0700
+
+ Fix byte swapping of XF86VidMode{Get,Set}GammaRamp
+
+ Fixes OpenSolaris Bug 8315:
+ Xorg segfaults when screensaver fades in cross-endian xdmcp session
+ <http://defect.opensolaris.org/bz/show_bug.cgi?id=8315>
+
+ Signed-off-by: Alan Coopersmith <alan.coopersm...@sun.com>
+ (cherry picked from commit 7d0f7518c2235a9dc783029971259ddaada2db20)
+
+ Signed-off-by: Keith Packard <kei...@keithp.com>
+
+commit 3f0c73694b9ddc85b82a7a82a5d98fa8b18a01a8
+Author: Jon TURNEY <jon.tur...@dronecode.org.uk>
+Date: Thu Feb 12 16:03:16 2009 +0000
+
+ Remove references to rgb.txt from files section of Xserver and Xorg man
pages
+
+ The references to this file in the server code were removed in commit
dda10c9066a660b647384179f82e1da8e063264f
+
+ Signed-off-by: Jon TURNEY <jon.tur...@dronecode.org.uk>
+ (cherry picked from commit d0dd649035fc3698c5b436f9d9d248116aa106a3)
+
+ Signed-off-by: Keith Packard <kei...@keithp.com>
+
+commit 78eb366c65a953bbc059a989a92dfe28fbe1ae29
+Author: Jon TURNEY <jon.tur...@dronecode.org.uk>
+Date: Thu Feb 12 16:02:17 2009 +0000
+
+ Remove long-gone '-co' option from Xserver man page
+
+ The '-co' option was removed in commit
dda10c9066a660b647384179f82e1da8e063264f
+
+ Signed-off-by: Jon TURNEY <jon.tur...@dronecode.org.uk>
+ (cherry picked from commit b0ad9e1ced9619f37acf77764c395c57b86cf463)
+
+ Signed-off-by: Keith Packard <kei...@keithp.com>
+
+commit 31536307703fcffa14a027ec777310c9962f816c
+Author: Alan Coopersmith <alan.coopersm...@sun.com>
+Date: Sat May 2 00:26:18 2009 -0700
+
+ XkbSetNamedIndicator should ignore SD's without LED's
+
+ When ProcXkbSetNamedIndicator is called on a core device, and we
+ walk the slaves to set the LED's on each of them, ignore any slaves
+ that do not have either a KbdFeedbackCtrl or LedCtrl structure.
+
+ (This is much more critical in xserver-1.5-branch, where we walk
+ *all* devices, not just the slaves of the specified master, and
+ thus return failure when setting an LED on the Core Keyboard and
+ hit a xf86-input-mouse device with no LED's to set.)
+
+ Signed-off-by: Alan Coopersmith <alan.coopersm...@sun.com>
+ Acked-by: Peter Hutterer <peter.hutte...@who-t.net>
+ (cherry picked from commit 557dbadf3be273255e8fdb12d9321f4e88bf2b65)
+
+ Signed-off-by: Keith Packard <kei...@keithp.com>
+
+commit 01f0210b2ba34f724aa221bbe6b567a5751781a6
+Author: Keith Packard <kei...@keithp.com>
+Date: Fri May 8 22:29:15 2009 -0700
+
+ xserver 1.6.1.901
+
+ Signed-off-by: Keith Packard <kei...@keithp.com>
+
+commit e21c9949ac456ba9b162b6244a17e68c5b8112a9
+Author: Pierre Ossman <pie...@ossman.eu>
+Date: Tue Apr 28 09:34:55 2009 +0200
+
+ dix: fix calculation of number of fake KeyRelease events
+
+ Signed-off-by: Pierre Ossman <pie...@ossman.eu>
+ Signed-off-by: Keith Packard <kei...@keithp.com>
+
+commit 3b1ff33587458bad45777b8eb74b81c3e55987ad
+Author: Pierre Ossman <pie...@ossman.eu>
+Date: Tue Apr 28 12:29:07 2009 +0200
+
+ Xi: don't send XKB mapping notifications when XKB is disabled
+
+ Signed-off-by: Pierre Ossman <pie...@ossman.eu>
+ Signed-off-by: Keith Packard <kei...@keithp.com>
+
+commit 4b702526dec35f5cfe5c6baec6a77c02c95c2867
+Author: Peter Hutterer <peter.hutte...@who-t.net>
+Date: Wed Mar 25 13:08:27 2009 +1000
+
+ dix: ignore non-pointer events in XineramaCheckMotion (#20557)
+
+ Note that deviceKeyButtonPointer and keyButtonPointer have the same wire
+ layout, so we only need to check for event types.
+
+ X.Org Bug 20557 <http://bugs.freedesktop.org/show_bug.cgi?id=20557>
+
+ Signed-off-by: Peter Hutterer <peter.hutte...@who-t.net>
+ Signed-off-by: Keith Packard <kei...@keithp.com>
+
+commit fdbb6fd3d3c0ce7078f8faaf089af51cc36cbcb3
+Author: Jesse Barnes <jbar...@virtuousgeek.org>
+Date: Mon May 4 15:38:22 2009 -0700
+
+ Don't prepare outputs & crtcs if set_mode_major is present
+
+ A driver with this hook will take care of preparing the outputs & crtcs,
+ so calling the prepare functions will just cause unnecessary flicker.
+
+ Fixes bug #21077
+ (cherry picked from commit 94648bb797d94b025746c60679c584e5be2fae28)
+
+ Signed-off-by: Keith Packard <kei...@keithp.com>
+
+commit eac2b3658aacc8a64dc3c0fd7cc8fd77abcc59af
+Author: Julien Cristau <jcris...@debian.org>
+Date: Wed Apr 22 20:01:49 2009 +0200
+
+ Bug#21324: Add quirk for Iiyama Vision Master 450
+
+ Reported-by: Jeremy Henty <onepo...@starurchin.org>
+ Signed-off-by: Julien Cristau <jcris...@debian.org>
+ (cherry picked from commit 0dfb97f15f591f85e079f5829c77d0c328d00464)
+
+ Signed-off-by: Keith Packard <kei...@keithp.com>
+
+commit b3c42e6450b0af97ead4f410983c803a959e1d04
+Author: Tormod Volden <debian.tor...@gmail.com>
+Date: Wed Apr 1 19:32:21 2009 +0200
+
+ xfree86: edid quirk for Philips LCD LP154W01-TLAJ
+
+ This panel reports its vertical size in cm.
+
+ X.Org bug#21000 <http://bugs.freedesktop.org/show_bug.cgi?id=21000>
+
+ Signed-off-by: Tormod Volden <debian.tor...@gmail.com>
+ Signed-off-by: Julien Cristau <jcris...@debian.org>
+ (cherry picked from commit b1dab580bdfb4acfe3feddeda6e760098ec4922a)
+
+ Signed-off-by: Keith Packard <kei...@keithp.com>
+
+commit 96eede556ac9f95204fa54287f74794acdbf3a2b
+Author: Julien Cristau <jcris...@debian.org>
+Date: Wed Dec 24 14:17:27 2008 +0100
+
+ Add RandR 1.3 requests to protocol.txt
+ (cherry picked from commit 4f86ee61a4abf7a29e565d095aa08abd0ca9dc66)
+
+ Signed-off-by: Keith Packard <kei...@keithp.com>
+
+commit b7b520e3a93fde5579c48eabb9b8c694a7dfbcb1
+Author: Julien Cristau <jcris...@debian.org>
+Date: Wed Dec 24 14:23:37 2008 +0100
+
+ Add XI 1.5 event and requests to protocol.txt
+ (cherry picked from commit 063833f3a6d9f8f657e3de309c8d6d5c3d606513)
+
+ Signed-off-by: Keith Packard <kei...@keithp.com>
+
+commit 0df12a3f01c953c0908b4b53a93fd3a5c704f69b
+Author: Ander Conselvan de Oliveira <an...@mandriva.com.br>
+Date: Mon Apr 6 16:01:20 2009 -0300
+
+ xfree86: Remove device from inputInfo.devices if ActivateDevice failed.
+
+ After the call to xf86ActivateDevice, the new device will be added to
+ inputInfo.devices. However, if the subsequent call to ActivateDevice
+ fails, the correponding InputInfoRec for the device is deleted but an
+ entry still remains in inputInfo.devices. This might lead to a server
+ crash later on (on InitAndStartDevices for instance) when the device
+ control proc would be called for an invalid device.
+ (cherry picked from commit efa31092d6703397121a0ada4f7205a8ecad3d3d)
+
+ Signed-off-by: Peter Hutterer <peter.hutte...@who-t.net>
+ Signed-off-by: Keith Packard <kei...@keithp.com>
+
+commit 24dc7694a2ba72d45cda7720aeaec8350930edc3
+Author: Michel Dänzer <daen...@vmware.com>
+Date: Fri Feb 6 11:37:53 2009 +0100
+
+ EXA: Guard empty pending region warning by DEBUG_MIGRATE.
+
+ It isn't very useful yet while the damage layer calls us for empty
operations,
+ mostly confuses users.
+ (cherry picked from commit 3948b523893d3d44b6a088340c4252e969613769)
+
+ Signed-off-by: Keith Packard <kei...@keithp.com>
+
+commit 5198ff6f86e4796819c0d1f742de57a69228c93b
+Author: Michel Dänzer <daen...@vmware.com>
+Date: Fri Feb 27 16:37:28 2009 +0100
+
+ EXA: Handle separate alpha maps properly in Composite fallback, take two.
+
+ Preserve the EXA ABI by introducing a new driver flag
EXA_SUPPORTS_PREPARE_AUX.
+ If the driver doesn't set this flag, we have to assume any
Prepare/FinishAccess
+ driver hooks can't handle the EXA_PREPARE_AUX* indices, so we move out such
+ pixmaps at PrepareAccess time.
+
+ Fixes https://bugs.freedesktop.org/show_bug.cgi?id=18710 .
+
+ Signed-off-by: Michel Dänzer <daen...@vmware.com>
+ (cherry picked from commit 4cfb36f6ad2df01215028fec48d99239a0e4496b)
+
+ Signed-off-by: Keith Packard <kei...@keithp.com>
+
+commit 199bb367152d68e784dfbec79ab9b70540d83fc2
+Author: Ian Romanick <ian.d.roman...@intel.com>
+Date: Mon Apr 20 18:20:52 2009 -0700
+
+ DRI2: Send the version the code actually supports
+
+ This prevents building an older server with a new dri2proto.h from
+ resulting in a DRI2 extension module that lies about the version it
+ supports.
+
+ Signed-off-by: Ian Romanick <ian.d.roman...@intel.com>
+ (cherry picked from commit 44227ef1b77467c76147b9bf79bdd0e6305a522a)
+
+ Signed-off-by: Keith Packard <kei...@keithp.com>
+
+commit 11db545a86c8933c638a0bc1fcd4f2c65279f617
+Author: Eamon Walsh <ewa...@tycho.nsa.gov>
+Date: Thu Apr 16 22:48:11 2009 -0400
+
+ security: Grant untrusted windows remove access on all windows.
+
+ This allows untrusted clients to destroy their own windows when they
+ have been reparented by a trusted window manager.
+ (cherry picked from commit 4559d2ace6ac55fe361f572ded0769cdd1f3b545)
+
+commit 5d48f288eccb57dfe1751946c9d60dbd3ac0129a
+Author: Eamon Walsh <ewa...@tycho.nsa.gov>
+Date: Thu Apr 16 22:39:54 2009 -0400
+
+ security: Fix a crash caused by wrong ordering of format arguments.
+ (cherry picked from commit 3481b32ab971c41cb972f6819ae049f3e9f7033b)
+
+commit 93e0a648138e569087fc6e07c1a28abfa92a4dde
+Author: Eamon Walsh <ewa...@tycho.nsa.gov>
+Date: Thu Apr 16 22:33:12 2009 -0400
+
+ security: Revert behavior of extension access for compatibility.
+
+ Previously, three extensions were defined as "trusted" by the extension:
+ BIG-REQUESTS, XC-MISC, and XPrint. No other extensions were permitted
+ to be used by untrusted clients.
+
+ In commit 8b5d21cc1d1f4e9d20e5d5eca44cb1e60a419763 this was changed for
+ some reason. Return to the old, compatible behavior.
+ (cherry picked from commit 6045506be0cebca4ebbe943ae77f020aafa703d4)
+
commit cd321badf0c185854b3e0c038f3851a3ac7864ea
Author: Adam Jackson <a...@redhat.com>
Date: Tue Apr 14 16:08:11 2009 -0400
diff --git a/debian/changelog b/debian/changelog
index 0ec241c..a7e327c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+xorg-server (2:1.6.1.901-2) UNRELEASED; urgency=low
+
+ * Merge from upstream server-1.6-branch (commit a9f85dce).
+
+ -- Julien Cristau <jcris...@debian.org> Thu, 14 May 2009 17:08:00 +0200
+
xorg-server (2:1.6.1.901-1) experimental; urgency=low
* New upstream development release
commit 498d51427bca7950ee10eccec9109dcceef84694
Author: David Nusinow <dnusi...@debian.org>
Date: Mon May 11 22:16:56 2009 -0400
New upstream development release
Refresh 20_hurd-i386.diff
diff --git a/debian/changelog b/debian/changelog
index ac0d7ef..0ec241c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+xorg-server (2:1.6.1.901-1) experimental; urgency=low
+
+ * New upstream development release
+ + Refresh 20_hurd-i386.diff
+
+ -- David Nusinow <dnusi...@debian.org> Mon, 11 May 2009 21:50:37 -0400
+
xorg-server (2:1.6.1-2) UNRELEASED; urgency=low
[ Brice Goglin ]
diff --git a/debian/patches/20_hurd-i386.diff b/debian/patches/20_hurd-i386.diff
index 22ed9dc..fbc32c6 100644
--- a/debian/patches/20_hurd-i386.diff
+++ b/debian/patches/20_hurd-i386.diff
@@ -2,8 +2,10 @@ From: Samuel Thibault <samuel.thiba...@ens-lyon.org>
Bug#523970: xorg-server: FTBFS on hurd-i386
---- a/hw/xfree86/os-support/bus/Pci.h.orig 2009-04-13 21:21:10.000000000
+0000
-+++ b/hw/xfree86/os-support/bus/Pci.h 2009-04-13 21:22:38.000000000 +0000
+Index: xorg-server/hw/xfree86/os-support/bus/Pci.h
+===================================================================
+--- xorg-server.orig/hw/xfree86/os-support/bus/Pci.h 2009-04-11
15:23:16.000000000 -0400
++++ xorg-server/hw/xfree86/os-support/bus/Pci.h 2009-05-11
21:50:11.000000000 -0400
@@ -169,7 +169,7 @@
#endif /* !defined(DEBUGPCI) */
@@ -13,9 +15,11 @@ Bug#523970: xorg-server: FTBFS on hurd-i386
#define ARCH_PCI_INIT bsdPciInit
#endif
---- a/configure.ac.orig 2009-04-13 21:38:24.000000000 +0000
-+++ b/configure.ac 2009-04-13 21:38:27.000000000 +0000
-@@ -1356,6 +1356,9 @@
+Index: xorg-server/configure.ac
+===================================================================
+--- xorg-server.orig/configure.ac 2009-05-11 21:49:28.000000000 -0400
++++ xorg-server/configure.ac 2009-05-11 21:50:11.000000000 -0400
+@@ -1354,6 +1354,9 @@
gnu*)
XORG_OS="gnu"
XORG_OS_SUBDIR="hurd"
@@ -25,8 +29,10 @@ Bug#523970: xorg-server: FTBFS on hurd-i386
;;
*)
XORG_OS="unknown"
---- a/hw/xfree86/os-support/hurd/Makefile.am.orig 2009-04-13
23:05:45.000000000 +0000
-+++ b/hw/xfree86/os-support/hurd/Makefile.am 2009-04-13 23:07:12.000000000
+0000
+Index: xorg-server/hw/xfree86/os-support/hurd/Makefile.am
+===================================================================
+--- xorg-server.orig/hw/xfree86/os-support/hurd/Makefile.am 2009-04-11
15:23:16.000000000 -0400
++++ xorg-server/hw/xfree86/os-support/hurd/Makefile.am 2009-05-11
21:50:11.000000000 -0400
@@ -5,6 +5,7 @@
$(srcdir)/../shared/VTsw_noop.c \
$(srcdir)/../shared/posix_tty.c \
@@ -35,8 +41,10 @@ Bug#523970: xorg-server: FTBFS on hurd-i386
$(srcdir)/../shared/sigiostubs.c \
$(srcdir)/../shared/pm_noop.c \
$(srcdir)/../shared/kmod_noop.c \
---- a/hw/xfree86/os-support/shared/stdResource.c.orig 2009-04-13
23:15:07.000000000 +0000
-+++ b/hw/xfree86/os-support/shared/stdResource.c 2009-04-13
23:15:33.000000000 +0000
+Index: xorg-server/hw/xfree86/os-support/shared/stdResource.c
+===================================================================
+--- xorg-server.orig/hw/xfree86/os-support/shared/stdResource.c
2009-04-11 15:23:16.000000000 -0400
++++ xorg-server/hw/xfree86/os-support/shared/stdResource.c 2009-05-11
21:50:11.000000000 -0400
@@ -44,7 +44,7 @@
#include "bus/Pci.h"
@@ -46,8 +54,10 @@ Bug#523970: xorg-server: FTBFS on hurd-i386
#define xf86StdAccResFromOS xf86AccResFromOS
#endif
---- a/hw/xfree86/os-support/hurd/hurd_video.c.orig 2009-02-25
19:12:12.000000000 +0000
-+++ b/hw/xfree86/os-support/hurd/hurd_video.c 2009-04-13 23:55:16.000000000
+0000
+Index: xorg-server/hw/xfree86/os-support/hurd/hurd_video.c
+===================================================================
+--- xorg-server.orig/hw/xfree86/os-support/hurd/hurd_video.c 2009-04-11
15:23:16.000000000 -0400
++++ xorg-server/hw/xfree86/os-support/hurd/hurd_video.c 2009-05-11
21:50:11.000000000 -0400
@@ -41,8 +41,8 @@
/**************************************************************************
* Video Memory Mapping section
commit a9f85dcefbadfe44d8c58ad08430aaadb8c59d34
Author: Eamon Walsh <ewa...@tycho.nsa.gov>
Date: Mon May 11 15:27:46 2009 -0400
xselinux: Relax ownership restriction on SetSelectionUseContext.
Instead, clients should keep track of the selection instances they use.
(cherry picked from commit 0952d12717031e9dda9e48123bb922d0f4e81834)
Signed-off-by: Eamon Walsh <ewa...@tycho.nsa.gov>
diff --git a/Xext/xselinux.c b/Xext/xselinux.c
index 2a32bb8..6c99c29 100644
--- a/Xext/xselinux.c
+++ b/Xext/xselinux.c
@@ -1349,15 +1349,6 @@ ProcSELinuxSetCreateContext(ClientPtr client, unsigned
offset)
goto out;
privPtr = &serverClient->devPrivates;
}
- else if (offset == USE_SEL) {
- /* Selection use context currently requires no selections owned */
- Selection *pSel;
- for (pSel = CurrentSelections; pSel; pSel = pSel->next)
- if (pSel->client == client) {
- rc = BadMatch;
- goto out;
- }
- }
ptr = dixLookupPrivate(privPtr, subjectKey);
pSid = (security_id_t *)(ptr + offset);
commit 0fbf6f30f771e60714fb3003a9bb1a6b79e50c6e
Author: Alan Coopersmith <alan.coopersm...@sun.com>
Date: Thu Mar 26 22:22:32 2009 -0700
Don't leak default font path when appending built-ins
Signed-off-by: Alan Coopersmith <alan.coopersm...@sun.com>
(cherry picked from commit 66539cc05d0b017b9feb4a038499907810140623)
Signed-off-by: Keith Packard <kei...@keithp.com>
diff --git a/hw/xfree86/common/xf86Config.c b/hw/xfree86/common/xf86Config.c
index 17223a1..9e56ca9 100644
--- a/hw/xfree86/common/xf86Config.c
+++ b/hw/xfree86/common/xf86Config.c
@@ -601,7 +601,9 @@ configFiles(XF86ConfFilesPtr fileconf)
defaultFontPath = Xprintf("%s%s%s",
fileconf->file_fontpath,
*temp_path ? "," : "", temp_path);
- must_copy = FALSE;
+ if (defaultFontPath != NULL) {
+ must_copy = FALSE;
+ }
}
else
defaultFontPath = fileconf->file_fontpath;
@@ -617,7 +619,14 @@ configFiles(XF86ConfFilesPtr fileconf)
!((start == temp_path || start[-1] == ',') && (!*end || *end == ','))) {
defaultFontPath = Xprintf("%s%sbuilt-ins",
temp_path, *temp_path ? "," : "");
- must_copy = FALSE;
+ if (must_copy == TRUE) {
+ if (defaultFontPath != NULL) {
+ must_copy = FALSE;
+ }
+ } else {
+ /* already made a copy of the font path */
+ xfree(temp_path);
+ }
}
/* xf86ValidateFontPath modifies its argument, but returns a copy of it. */
temp_path = must_copy ? XNFstrdup(defaultFontPath) : defaultFontPath;
commit 773e4890b385a229b0919b4a249714d0bb7171a2
Author: Alan Coopersmith <alan.coopersm...@sun.com>
Date: Thu Mar 26 22:25:08 2009 -0700
Don't leak canonical module name and patterns if module is built-in
Signed-off-by: Alan Coopersmith <alan.coopersm...@sun.com>
Acked-by: Peter Hutterer <peter.hutte...@who-t.net>
(cherry picked from commit 1c101d75d4855b2698e3fc8d2dd662f20585812f)
Signed-off-by: Keith Packard <kei...@keithp.com>
diff --git a/hw/xfree86/loader/loadmod.c b/hw/xfree86/loader/loadmod.c
index e98f013..22b540c 100644
--- a/hw/xfree86/loader/loadmod.c
+++ b/hw/xfree86/loader/loadmod.c
@@ -867,7 +867,8 @@ doLoadModule(const char *module, const char *path, const
char **subdirlist,
if (!strcmp (m, *cim))
{
xf86MsgVerb(X_INFO, 3, "Module \"%s\" already built-in\n", m);
- return (ModuleDescPtr) 1;
+ ret = (ModuleDescPtr) 1;
+ goto LoadModule_exit;
}
if (!name) {
commit 21f58a2b0d0d96492d2d7c7de1bd654ed0114279
Author: Peter Hutterer <peter.hutte...@who-t.net>
Date: Wed May 6 16:55:32 2009 +1000
Xi: don't double-swap the XListDeviceProperties reply.
Signed-off-by: Peter Hutterer <peter.hutte...@who-t.net>
(cherry picked from commit 50cc8adafca4ba3838d468278d6eb8a4692d2488)
Signed-off-by: Keith Packard <kei...@keithp.com>
diff --git a/Xi/xiproperty.c b/Xi/xiproperty.c
index 04b2c81..b04ee94 100644
--- a/Xi/xiproperty.c
+++ b/Xi/xiproperty.c
@@ -602,13 +602,6 @@ ProcXListDeviceProperties (ClientPtr client)
rep.length = (numProps * sizeof(Atom)) >> 2;
rep.sequenceNumber = client->sequence;
rep.nAtoms = numProps;
- if (client->swapped)
- {
- int n;
- swaps (&rep.sequenceNumber, n);
- swapl (&rep.length, n);
- swaps (&rep.nAtoms, n);
- }
temppAtoms = pAtoms;
for (prop = dev->properties.properties; prop; prop = prop->next)
*temppAtoms++ = prop->propertyName;
commit b575af88d0e547a03b164f6f3b2d4b268b9ffc34
Author: Peter Hutterer <peter.hutte...@who-t.net>
Date: Wed May 6 22:25:28 2009 +1000
Xi: fix copy/paste error causing sizeof against wrong struct.
This wrong check may cause BadLength to be returned to the client even if
the
length is correct.
Signed-off-by: Peter Hutterer <peter.hutte...@who-t.net>
(cherry picked from commit 8b583ca2b21155359c6255f406c96599b277c762)
Signed-off-by: Keith Packard <kei...@keithp.com>
diff --git a/Xi/xiproperty.c b/Xi/xiproperty.c
index 26af3fc..04b2c81 100644
--- a/Xi/xiproperty.c
+++ b/Xi/xiproperty.c
@@ -650,7 +650,7 @@ ProcXChangeDeviceProperty (ClientPtr client)
return BadValue;
}
len = stuff->nUnits;
- if (len > ((0xffffffff - sizeof(xChangePropertyReq)) >> 2))
+ if (len > ((0xffffffff - sizeof(xChangeDevicePropertyReq)) >> 2))
return BadLength;
sizeInBytes = format>>3;
totalSize = len * sizeInBytes;
commit 9c643b1e3ddc4ec9f1a924bd25f24df8536c7ea6
Author: Peter Hutterer <peter.hutte...@who-t.net>
Date: Thu Apr 16 16:17:07 2009 +1000
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 <peter.hutte...@who-t.net>
Acked-by: Alan Coopersmith <alan.coopersm...@sun.com>
(cherry picked from commit 0e0642ee9466d3268476d0084a83a9d93a4aa555)
Signed-off-by: Keith Packard <kei...@keithp.com>
diff --git a/os/log.c b/os/log.c
index 39bbd60..692e78a 100644
--- a/os/log.c
+++ b/os/log.c
@@ -312,7 +312,7 @@ _X_EXPORT 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) {
@@ -354,21 +354,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);
}
}
commit 7cd596e0dd6b9c195d7e395c26bfb00ef544c525
Author: Dave Airlie <airl...@linux.ie>
Date: Wed Apr 15 18:26:06 2009 +1000
randr12: looking up these bits if randr isn't initialised is bad.
When xinerama is enabled we don't get randr protocol, but the
driver might still want randr internals
(cherry picked from commit faf7dfa099f5b42a703313fbd1bf8afdad07a179)
Signed-off-by: Keith Packard <kei...@keithp.com>
diff --git a/hw/xfree86/modes/xf86RandR12.c b/hw/xfree86/modes/xf86RandR12.c
index 6f93a0d..4546492 100644
--- a/hw/xfree86/modes/xf86RandR12.c
+++ b/hw/xfree86/modes/xf86RandR12.c
@@ -752,8 +752,8 @@ _X_EXPORT 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;
@@ -763,6 +763,8 @@ xf86RandR12CreateScreenResources (ScreenPtr pScreen)
return TRUE;
#endif
+ config = XF86_CRTC_CONFIG_PTR(pScrn);
+ randrp = XF86RANDRINFO(pScreen);
/*
* Compute size of screen
*/
commit bc95f29441b3daa7b9d91bd3c2b3e502a3a8cc81
Author: Alan Coopersmith <alan.coopersm...@sun.com>
Date: Thu Apr 23 08:42:38 2009 -0700
Fix byte swapping of XF86VidMode{Get,Set}GammaRamp
Fixes OpenSolaris Bug 8315:
Xorg segfaults when screensaver fades in cross-endian xdmcp session
<http://defect.opensolaris.org/bz/show_bug.cgi?id=8315>
Signed-off-by: Alan Coopersmith <alan.coopersm...@sun.com>
(cherry picked from commit 7d0f7518c2235a9dc783029971259ddaada2db20)
Signed-off-by: Keith Packard <kei...@keithp.com>
diff --git a/hw/xfree86/dixmods/extmod/xf86vmode.c
b/hw/xfree86/dixmods/extmod/xf86vmode.c
index 6485a04..aecaf94 100644
--- a/hw/xfree86/dixmods/extmod/xf86vmode.c
+++ b/hw/xfree86/dixmods/extmod/xf86vmode.c
@@ -1543,6 +1543,7 @@ ProcXF86VidModeGetGammaRamp(ClientPtr client)
{
CARD16 *ramp = NULL;
int n, length, i;
+ size_t ramplen;
xXF86VidModeGetGammaRampReply rep;
REQUEST(xXF86VidModeGetGammaRampReq);
@@ -1557,7 +1558,8 @@ ProcXF86VidModeGetGammaRamp(ClientPtr client)
length = (stuff->size + 1) & ~1;
if(stuff->size) {
- if(!(ramp = xalloc(length * 3 * sizeof(CARD16))))
+ ramplen = length * 3 * sizeof(CARD16);
+ if (!(ramp = xalloc(ramplen)))
return BadAlloc;
if (!VidModeGetGammaRamp(stuff->screen, stuff->size,
@@ -1575,13 +1577,12 @@ ProcXF86VidModeGetGammaRamp(ClientPtr client)
swaps(&rep.sequenceNumber, n);
swapl(&rep.length, n);
swaps(&rep.size, n);
- for(i = 0; i < length * 3; i++)
- swaps(&ramp[i],n);
+ SwapShorts(ramp, length * 3);
}
WriteToClient(client, sizeof(xXF86VidModeGetGammaRampReply), (char *)&rep);
if(stuff->size) {
- WriteToClient(client, rep.length << 2, (char*)ramp);
+ WriteToClient(client, ramplen, (char*)ramp);
xfree(ramp);
}
@@ -2062,7 +2063,6 @@ SProcXF86VidModeGetGamma(ClientPtr client)
static int
SProcXF86VidModeSetGammaRamp(ClientPtr client)
{
- CARD16 *ramp;
int length, n;
REQUEST(xXF86VidModeSetGammaRampReq);
swaps(&stuff->length, n);
@@ -2071,11 +2071,7 @@ SProcXF86VidModeSetGammaRamp(ClientPtr client)
swaps(&stuff->screen, n);
length = ((stuff->size + 1) & ~1) * 6;
REQUEST_FIXED_SIZE(xXF86VidModeSetGammaRampReq, length);
- ramp = (CARD16*)&stuff[1];
- while(length--) {
- swaps(ramp, n);
- ramp++;
- }
+ SwapRestS(stuff);
return ProcXF86VidModeSetGammaRamp(client);
}
commit 3f0c73694b9ddc85b82a7a82a5d98fa8b18a01a8
Author: Jon TURNEY <jon.tur...@dronecode.org.uk>
Date: Thu Feb 12 16:03:16 2009 +0000
Remove references to rgb.txt from files section of Xserver and Xorg man
pages
The references to this file in the server code were removed in commit
dda10c9066a660b647384179f82e1da8e063264f
Signed-off-by: Jon TURNEY <jon.tur...@dronecode.org.uk>
(cherry picked from commit d0dd649035fc3698c5b436f9d9d248116aa106a3)
Signed-off-by: Keith Packard <kei...@keithp.com>
diff --git a/doc/Xserver.man.pre b/doc/Xserver.man.pre
index eace57d..cd5bdbd 100644
--- a/doc/Xserver.man.pre
--
To UNSUBSCRIBE, email to debian-x-requ...@lists.debian.org
with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org
