debian/changelog | 11 +++++++++++ debian/control | 2 ++ debian/rules | 4 +++- dix/events.c | 8 +++++++- hw/dmx/config/xdmxconfig.c | 3 --- hw/xfree86/os-support/linux/lnx_acpi.c | 9 ++++++--- 6 files changed, 29 insertions(+), 8 deletions(-)
New commits: commit bea6ce867d4cbd370e133d9c63ad0208ba674baf Author: Julien Cristau <[email protected]> Date: Sat Feb 23 16:02:52 2013 +0100 Upload to unstable diff --git a/debian/changelog b/debian/changelog index 546dc00..228dc7c 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -xorg-server (2:1.12.4-5) UNRELEASED; urgency=low +xorg-server (2:1.12.4-5) unstable; urgency=low * dmx: don't include dmx-config.h from xdmxconfig (closes: #495816) * xfree86: bail on misformed acpi strings (closes: #696110) @@ -7,7 +7,7 @@ xorg-server (2:1.12.4-5) UNRELEASED; urgency=low * Link against -lbsd on kfreebsd. This gives us access to getpeereid(), and makes MIT-SHM work with non-world-accessible segments (closes: #701469). - -- Julien Cristau <[email protected]> Sat, 23 Feb 2013 14:46:13 +0100 + -- Julien Cristau <[email protected]> Sat, 23 Feb 2013 15:37:44 +0100 xorg-server (2:1.12.4-4) unstable; urgency=low commit 89fe7540dd25f48e33117ca07f911606f9e98cce Author: Julien Cristau <[email protected]> Date: Sat Feb 23 15:08:19 2013 +0100 Link against -lbsd on kfreebsd. This gives us access to getpeereid(), and makes MIT-SHM work with non-world-accessible segments (closes: #701469). diff --git a/debian/changelog b/debian/changelog index f16f73f..546dc00 100644 --- a/debian/changelog +++ b/debian/changelog @@ -4,6 +4,8 @@ xorg-server (2:1.12.4-5) UNRELEASED; urgency=low * xfree86: bail on misformed acpi strings (closes: #696110) * dix: don't allow overriding a grab with a different type of grab * dix: Set focus field on XI2 crossing events (closes: #699907) + * Link against -lbsd on kfreebsd. This gives us access to getpeereid(), and + makes MIT-SHM work with non-world-accessible segments (closes: #701469). -- Julien Cristau <[email protected]> Sat, 23 Feb 2013 14:46:13 +0100 diff --git a/debian/control b/debian/control index d8f3735..6077dec 100644 --- a/debian/control +++ b/debian/control @@ -77,6 +77,8 @@ Build-Depends: # unit tests xkb-data, x11-xkb-utils, +# getpeereid() + libbsd-dev [kfreebsd-any], Standards-Version: 3.9.2 Vcs-Git: git://git.debian.org/git/pkg-xorg/xserver/xorg-server Vcs-Browser: http://git.debian.org/?p=pkg-xorg/xserver/xorg-server.git diff --git a/debian/rules b/debian/rules index 3011a78..7308463 100755 --- a/debian/rules +++ b/debian/rules @@ -79,6 +79,7 @@ else ifeq ($(DEB_HOST_ARCH_OS), kfreebsd) config_backend += --disable-config-udev config_backend_main += --enable-config-hal config_backend_udeb += --disable-config-hal + libs = LIBS=-lbsd else # hurd config_backend += --disable-config-udev --disable-config-hal endif @@ -126,7 +127,8 @@ confflags += \ --disable-xquartz \ --disable-xwin \ --disable-xfake \ - --disable-install-setuid + --disable-install-setuid \ + $(libs) confflags_main = \ --with-default-font-path="/usr/share/fonts/X11/misc,/usr/share/fonts/X11/cyrillic,/usr/share/fonts/X11/100dpi/:unscaled,/usr/share/fonts/X11/75dpi/:unscaled,/usr/share/fonts/X11/Type1,/usr/share/fonts/X11/100dpi,/usr/share/fonts/X11/75dpi,/var/lib/defoma/x-ttcidfont-conf.d/dirs/TrueType,built-ins" \ commit 9fcda0b8c69da19f842cd1cf9e3f69487711aaa9 Author: Julien Cristau <[email protected]> Date: Sat Feb 23 14:59:34 2013 +0100 Update changelog for cherry-picks diff --git a/debian/changelog b/debian/changelog index b9468f1..f16f73f 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,12 @@ +xorg-server (2:1.12.4-5) UNRELEASED; urgency=low + + * dmx: don't include dmx-config.h from xdmxconfig (closes: #495816) + * xfree86: bail on misformed acpi strings (closes: #696110) + * dix: don't allow overriding a grab with a different type of grab + * dix: Set focus field on XI2 crossing events (closes: #699907) + + -- Julien Cristau <[email protected]> Sat, 23 Feb 2013 14:46:13 +0100 + xorg-server (2:1.12.4-4) unstable; urgency=low * Fix memory leak in libnettle sha1 patch. Thanks, Yaakov Selkowitz! commit a338f013f0e60a61a1e00101f3034dda313a1fc7 Author: Carlos Garnacho <[email protected]> Date: Wed Feb 6 14:07:22 2013 +0100 dix: Set focus field on XI2 crossing events Set on DeviceEnterLeaveEvent() the xXIEnterEvent->focus field similarly to how the CoreEnterLeaveEvent() function above does for core events. This fixes bug https://bugzilla.gnome.org/show_bug.cgi?id=677329 reported to GTK+, where focus handling on window managers with sloppy focus or no window manager present was broken due to this field being always set to FALSE. Signed-off-by: Carlos Garnacho <[email protected]> Reviewed-by: Peter Hutterer <[email protected]> Signed-off-by: Peter Hutterer <[email protected]> (cherry picked from commit 509b3c3dc82e7abce1900d5e1cddd90f23be5a87) (cherry picked from commit e7b4b83679604919035d5aab544092aef5ea6034) diff --git a/dix/events.c b/dix/events.c index aa1b6e1..3c65dcf 100644 --- a/dix/events.c +++ b/dix/events.c @@ -4524,6 +4524,7 @@ DeviceEnterLeaveEvent(DeviceIntPtr mouse, { GrabPtr grab = mouse->deviceGrab.grab; xXIEnterEvent *event; + WindowPtr focus; int filter; int btlen, len, i; DeviceIntPtr kbd; @@ -4565,6 +4566,11 @@ DeviceEnterLeaveEvent(DeviceIntPtr mouse, event->group.locked_group = kbd->key->xkbInfo->state.locked_group; } + focus = (kbd) ? kbd->focus->win : None; + if ((focus != NoneWin) && + ((pWin == focus) || (focus == PointerRootWin) || IsParent(focus, pWin))) + event->focus = TRUE; + FixUpEventFromWindow(mouse->spriteInfo->sprite, (xEvent *) event, pWin, None, FALSE); commit 8ec7b13ca447b186fc63624e89ae9ec433240fe6 Author: Peter Hutterer <[email protected]> Date: Fri Dec 14 11:34:15 2012 +1000 dix: don't allow overriding a grab with a different type of grab (#58255) If a client has a core grab, don't allow re-grabbing with type XI2, etc. This was the intent of the original commit xorg-server-1.5.99.1-782-g09f9a86, but ineffective. X.Org Bug 58255 <http://bugs.freedesktop.org/show_bug.cgi?id=58255> Signed-off-by: Peter Hutterer <[email protected]> Reviewed-by: Keith Packard <[email protected]> (cherry picked from commit dd3242c87a0a58cba055eb99c0c3fcf03153e4b8) diff --git a/dix/events.c b/dix/events.c index 822b6e9..aa1b6e1 100644 --- a/dix/events.c +++ b/dix/events.c @@ -4995,7 +4995,7 @@ GrabDevice(ClientPtr client, DeviceIntPtr dev, grab = grabInfo->grab; if (grab && grab->grabtype != grabtype) *status = AlreadyGrabbed; - if (grab && !SameClient(grab, client)) + else if (grab && !SameClient(grab, client)) *status = AlreadyGrabbed; else if ((!pWin->realized) || (confineTo && commit acec09de1da80fd39302353e2b896fbe48ad1e05 Author: Ted Felix <[email protected]> Date: Tue Jan 29 16:36:48 2013 +1000 xfree86: bail on misformed acpi strings (#73227) If acpid sends a string in a format that we can't parse, bail out instead of potentially dereferencing a NULL-pointer. X.Org Bug 73227 <http://bugs.freedesktop.org/show_bug.cgi?id=73227> Signed-off-by: Ted Felix <[email protected]> Reviewed-by: Peter Hutterer <[email protected]> Signed-off-by: Peter Hutterer <[email protected]> (cherry picked from commit 3d35dfcf5bad1b0a028fbecd65cb6cf6ebf12503) diff --git a/hw/xfree86/os-support/linux/lnx_acpi.c b/hw/xfree86/os-support/linux/lnx_acpi.c index d98efa2..dcaa19e 100644 --- a/hw/xfree86/os-support/linux/lnx_acpi.c +++ b/hw/xfree86/os-support/linux/lnx_acpi.c @@ -82,18 +82,21 @@ lnxACPIGetEventFromOs(int fd, pmEvent * events, int num) video = strtok(ev, " "); - GFX = strtok(NULL, " "); + if (!(GFX = strtok(NULL, " "))) + return 0; #if 0 ErrorF("GFX: %s\n", GFX); #endif - notify = strtok(NULL, " "); + if (!(notify = strtok(NULL, " "))) + return 0; notify_l = strtoul(notify, NULL, 16); #if 0 ErrorF("notify: 0x%lx\n", notify_l); #endif - data = strtok(NULL, " "); + if (!(data = strtok(NULL, " "))) + return 0; data_l = strtoul(data, NULL, 16); #if 0 ErrorF("data: 0x%lx\n", data_l); commit 250ce11bbf531b16f70b45760feadb54c11fba31 Author: Peter Hutterer <[email protected]> Date: Sat Jan 26 14:13:33 2013 +1000 dmx: don't include dmx-config.h from xdmxconfig (#37502) dmx-config.h is a server header which includes dix-config.h. That again defines a bunch of server-specifics, including setting the size of XID to 32 bit. libX11 uses unsigned long (8 bits on x86_64). XGCValues thus ends up being 16 bytes smaller in xdmxconfig than in the library, causing garbage to be sent to the server. X.Org Bug 37502 <http://bugs.freedesktop.org/show_bug.cgi?id=37502> Signed-off-by: Peter Hutterer <[email protected]> Reviewed-by: Keith Packard <[email protected]> (cherry picked from commit 1058fcf57fdcb94d92e7b5f4483b347853d5f8e6) diff --git a/hw/dmx/config/xdmxconfig.c b/hw/dmx/config/xdmxconfig.c index f308412..2121dd7 100644 --- a/hw/dmx/config/xdmxconfig.c +++ b/hw/dmx/config/xdmxconfig.c @@ -31,9 +31,6 @@ * */ -#ifdef HAVE_DMX_CONFIG_H -#include <dmx-config.h> -#endif #include <stdio.h> #include <stdlib.h> -- To UNSUBSCRIBE, email to [email protected] with a subject of "unsubscribe". Trouble? Contact [email protected] Archive: http://lists.debian.org/[email protected]
