ChangeLog | 62 ++++++++++++++++++++++++++++++ Xext/xselinux.c | 4 + config/hal.c | 37 ++++++++++++----- configure.ac | 6 +- debian/changelog | 15 +++++++ debian/control | 1 debian/patches/182_fedora_quirk_pea.patch | 28 ------------- debian/patches/series | 1 hw/xfree86/modes/xf86EdidModes.c | 5 ++ 9 files changed, 115 insertions(+), 44 deletions(-)
New commits: commit b0755a80c892b506b2b4d3f44933eefd688c67fa Author: Timo Aaltonen <tjaal...@cc.hut.fi> Date: Wed Aug 5 14:11:12 2009 +0300 Release 1.6.3-1ubuntu1 diff --git a/debian/changelog b/debian/changelog index 0d8e67e..596dd63 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,11 +1,11 @@ -xorg-server (2:1.6.3-1ubuntu1) UNRELEASED; urgency=low +xorg-server (2:1.6.3-1ubuntu1) karmic; urgency=low * Merge from Debian unstable. * control: Drop libaudit-dev from build-deps, since SELinux-support is still disabled anyway. * Drop 182_fedora_quirk_pea.patch, included in 1.6.3. - -- Timo Aaltonen <tjaal...@ubuntu.com> Wed, 05 Aug 2009 14:03:46 +0300 + -- Timo Aaltonen <tjaal...@ubuntu.com> Wed, 05 Aug 2009 14:11:01 +0300 xorg-server (2:1.6.3-1) unstable; urgency=low commit 2603e82e0f11ff138c3d26dafc5dd2d433f3a976 Author: Timo Aaltonen <tjaal...@cc.hut.fi> Date: Wed Aug 5 14:04:03 2009 +0300 Drop 182_fedora_quirk_pea.patch, included in 1.6.3. diff --git a/debian/changelog b/debian/changelog index ea3b60c..0d8e67e 100644 --- a/debian/changelog +++ b/debian/changelog @@ -3,8 +3,9 @@ xorg-server (2:1.6.3-1ubuntu1) UNRELEASED; urgency=low * Merge from Debian unstable. * control: Drop libaudit-dev from build-deps, since SELinux-support is still disabled anyway. + * Drop 182_fedora_quirk_pea.patch, included in 1.6.3. - -- Timo Aaltonen <tjaal...@ubuntu.com> Wed, 05 Aug 2009 13:56:10 +0300 + -- Timo Aaltonen <tjaal...@ubuntu.com> Wed, 05 Aug 2009 14:03:46 +0300 xorg-server (2:1.6.3-1) unstable; urgency=low diff --git a/debian/patches/182_fedora_quirk_pea.patch b/debian/patches/182_fedora_quirk_pea.patch deleted file mode 100644 index 6382aa8..0000000 --- a/debian/patches/182_fedora_quirk_pea.patch +++ /dev/null @@ -1,28 +0,0 @@ -From 8c4bcb5a2b9e99e16ade5b09f7b1f476be1dad55 Mon Sep 17 00:00:00 2001 -From: Ben Skeggs <bske...@redhat.com> -Date: Wed, 27 May 2009 15:24:34 +1000 -Subject: [PATCH] quirk: use first detailed timing as preferred for PEA prod 9003 (rh#492359) - ---- - hw/xfree86/modes/xf86EdidModes.c | 5 +++++ - 1 files changed, 5 insertions(+), 0 deletions(-) - -diff --git a/hw/xfree86/modes/xf86EdidModes.c b/hw/xfree86/modes/xf86EdidModes.c -index 54f2c65..54b410e 100644 ---- a/hw/xfree86/modes/xf86EdidModes.c -+++ b/hw/xfree86/modes/xf86EdidModes.c -@@ -205,6 +205,11 @@ static Bool quirk_first_detailed_preferred (int scrnIndex, xf86MonPtr DDC) - DDC->vendor.prod_id == 2423) - return TRUE; - -+ /* Peacock Ergovision 19. See rh#492359 */ -+ if (memcmp (DDC->vendor.name, "PEA", 4) == 0 && -+ DDC->vendor.prod_id == 9003) -+ return TRUE; -+ - return FALSE; - } - --- -1.6.2.2 - diff --git a/debian/patches/series b/debian/patches/series index 24a99fe..58ab3d2 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -36,4 +36,3 @@ fedora-pci-primary.diff 179_glx_cleanup_drawables.patch 180_fedora_no_synaptics_mouse_synthesis.patch 181_fedora_log_proc_cmdline.patch -182_fedora_quirk_pea.patch commit de2659245727443770f7cd10e8924dcfb6230072 Author: Timo Aaltonen <tjaal...@cc.hut.fi> Date: Wed Aug 5 13:58:28 2009 +0300 Drop libaudit-dev from build-deps, since SELinux-support is disabled for now. diff --git a/debian/changelog b/debian/changelog index dff0d44..ea3b60c 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,8 +1,10 @@ xorg-server (2:1.6.3-1ubuntu1) UNRELEASED; urgency=low * Merge from Debian unstable. + * control: Drop libaudit-dev from build-deps, since SELinux-support + is still disabled anyway. - -- Timo Aaltonen <tjaal...@ubuntu.com> Wed, 05 Aug 2009 13:54:26 +0300 + -- Timo Aaltonen <tjaal...@ubuntu.com> Wed, 05 Aug 2009 13:56:10 +0300 xorg-server (2:1.6.3-1) unstable; urgency=low diff --git a/debian/control b/debian/control index 3e82d57..4941adf 100644 --- a/debian/control +++ b/debian/control @@ -51,7 +51,6 @@ Build-Depends: libdbus-1-dev [!hurd-i386], libhal-dev [!hurd-i386], libselinux1-dev (>= 2.0.80) [alpha amd64 arm armeb armel hppa i386 ia64 lpia m32r m68k mips mipsel powerpc ppc64 s390 s390x sh3 sh3eb sh4 sh4eb sparc], - libaudit-dev [alpha amd64 arm armeb armel hppa i386 ia64 lpia m32r m68k mips mipsel powerpc ppc64 s390 s390x sh3 sh3eb sh4 sh4eb sparc], x11proto-xf86dri-dev, libdrm-dev (>= 2.4.3) [!hurd-i386], x11proto-gl-dev (>= 1.4.9), commit 5c15f3b9e38fd840739f3edd69a75ffbe811a847 Author: Brice Goglin <bgog...@debian.org> Date: Sat Aug 1 08:55:46 2009 +0200 Prepare changelog for upload diff --git a/debian/changelog b/debian/changelog index a21593e..bfbbab9 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,8 +1,8 @@ -xorg-server (2:1.6.3-1) UNRELEASED; urgency=low +xorg-server (2:1.6.3-1) unstable; urgency=low * New upstream release. - -- Brice Goglin <bgog...@debian.org> Sat, 01 Aug 2009 08:53:23 +0200 + -- Brice Goglin <bgog...@debian.org> Sat, 01 Aug 2009 08:55:40 +0200 xorg-server (2:1.6.2.901-1) unstable; urgency=low commit 031abda44e00be39e18247a67bf5fc6ba72687f6 Author: Brice Goglin <bgog...@debian.org> Date: Sat Aug 1 08:53:56 2009 +0200 New upstream release diff --git a/ChangeLog b/ChangeLog index 9f358c4..d4b3b86 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,65 @@ +commit f274e595ed56722450f6ecebad70500c92e50c58 +Author: Keith Packard <kei...@keithp.com> +Date: Fri Jul 31 23:37:53 2009 -0700 + + Bump release number to 1.6.3 + + Signed-off-by: Keith Packard <kei...@keithp.com> + +commit 55dcfdbbd6a2a4debb717b104c4b54f4a2c76fff +Author: Alan Coopersmith <alan.coopersm...@sun.com> +Date: Tue Jul 28 15:02:37 2009 -0700 + + Remove hardcoded gcc -Wall option from configure.ac + + Signed-off-by: Alan Coopersmith <alan.coopersm...@sun.com> + (cherry picked from commit 442967c90dd9d8483a56bdc9237c49e33d619126) + +commit 4d349b6c333449517913a5e981b4fc3155da4855 +Author: Adam Jackson <a...@redhat.com> +Date: Fri Mar 27 15:56:15 2009 -0400 + + selinux: Only activate if policy says to be an object manager + (cherry picked from commit 283a081572d8db787c77d09e5ba6bcadebf4f7fe) + +commit d0875154f4f4b751264a2f6781500e97409a499b +Author: Ben Skeggs <bske...@redhat.com> +Date: Wed May 27 15:24:34 2009 +1000 + + quirk: use first detailed timing as preferred for PEA prod 9003 (rh#492359) + + Signed-off-by: Peter Hutterer <peter.hutte...@who-t.net> + (cherry picked from commit 048697ccfa31cf7f7a29afa90a2f702d43efb7d4) + +commit c941479ecc2dead9c3deaee2620c9b9518c3da9a +Author: Rémi Cardona <r...@gentoo.org> +Date: Mon Jul 27 12:07:51 2009 +0200 + + config: add HAL error checks + + This patch simplifies error handling in the HAL code and fixes a + segfault if libhal_find_device_by_capability() failed. + + Fixes http://bugs.gentoo.org/278760 + + Based on a patch by Martin von Gagern <martin.vgag...@gmx.net> + + Signed-off-by: Rémi Cardona <r...@gentoo.org> + Acked-by: Peter Hutterer <peter.hutte...@who-t.net> + (cherry picked from commit b1c3dc6ae226db178420e3b5f297b94afc87c94c) + +commit 546f913ff5461dd93d4a0b29b24d2267557326c7 +Author: Alan Coopersmith <alan.coopersm...@sun.com> +Date: Fri May 8 21:31:01 2009 -0700 + + Don't printf NULL pointers on HAL connection error + + Fixes Solaris bug 6801386 Xorg core dumps on startup if hald not running + http://bugs.opensolaris.org/bugdatabase/view_bug.do?bug_id=6801386 + + Signed-off-by: Alan Coopersmith <alan.coopersm...@sun.com> + (cherry picked from commit 1e816065e5ec3b9394dc1fa5815457a664e15fd9) + commit 155cb2f9a376d40b699a72ac3bdede71af1b518f Author: Keith Packard <kei...@keithp.com> Date: Sun Jul 26 14:22:35 2009 -0700 diff --git a/debian/changelog b/debian/changelog index b97eefb..a21593e 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +xorg-server (2:1.6.3-1) UNRELEASED; urgency=low + + * New upstream release. + + -- Brice Goglin <bgog...@debian.org> Sat, 01 Aug 2009 08:53:23 +0200 + xorg-server (2:1.6.2.901-1) unstable; urgency=low * New upstream release candidate. commit f274e595ed56722450f6ecebad70500c92e50c58 Author: Keith Packard <kei...@keithp.com> Date: Fri Jul 31 23:37:53 2009 -0700 Bump release number to 1.6.3 Signed-off-by: Keith Packard <kei...@keithp.com> diff --git a/configure.ac b/configure.ac index c8aedc9..fe7978f 100644 --- a/configure.ac +++ b/configure.ac @@ -26,12 +26,12 @@ dnl dnl Process this file with autoconf to create configure. AC_PREREQ(2.57) -AC_INIT([xorg-server], 1.6.2.901, [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], xorg-server) +AC_INIT([xorg-server], 1.6.3, [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], xorg-server) AC_CONFIG_SRCDIR([Makefile.am]) AM_INIT_AUTOMAKE([dist-bzip2 foreign]) AM_MAINTAINER_MODE -RELEASE_DATE="2009-7-26" +RELEASE_DATE="2009-7-31" dnl this gets generated by autoheader, and thus contains all the defines. we dnl don't ever actually use it, internally. commit 55dcfdbbd6a2a4debb717b104c4b54f4a2c76fff Author: Alan Coopersmith <alan.coopersm...@sun.com> Date: Tue Jul 28 15:02:37 2009 -0700 Remove hardcoded gcc -Wall option from configure.ac Signed-off-by: Alan Coopersmith <alan.coopersm...@sun.com> (cherry picked from commit 442967c90dd9d8483a56bdc9237c49e33d619126) diff --git a/configure.ac b/configure.ac index 792c622..c8aedc9 100644 --- a/configure.ac +++ b/configure.ac @@ -880,7 +880,7 @@ fi if test "x$DRI2" = xyes; then save_CFLAGS=$CFLAGS - CFLAGS="$GL_CFLAGS $LIBDRM_CFLAGS -Wall" + CFLAGS="$GL_CFLAGS $LIBDRM_CFLAGS" AC_COMPILE_IFELSE([AC_LANG_SOURCE([[#include <GL/gl.h> #include <GL/internal/dri_interface.h> #ifndef __DRI_DRI2 commit 4d349b6c333449517913a5e981b4fc3155da4855 Author: Adam Jackson <a...@redhat.com> Date: Fri Mar 27 15:56:15 2009 -0400 selinux: Only activate if policy says to be an object manager (cherry picked from commit 283a081572d8db787c77d09e5ba6bcadebf4f7fe) diff --git a/Xext/xselinux.c b/Xext/xselinux.c index 4f4254a..3124eb9 100644 --- a/Xext/xselinux.c +++ b/Xext/xselinux.c @@ -1989,6 +1989,10 @@ SELinuxExtensionInit(INITARGS) return; } + /* Don't init unless there's something to do */ + if (!security_get_boolean_active("xserver_object_manager")) + return; + /* Check SELinux mode in configuration file */ switch(selinuxEnforcingState) { case SELINUX_MODE_DISABLED: commit d0875154f4f4b751264a2f6781500e97409a499b Author: Ben Skeggs <bske...@redhat.com> Date: Wed May 27 15:24:34 2009 +1000 quirk: use first detailed timing as preferred for PEA prod 9003 (rh#492359) Signed-off-by: Peter Hutterer <peter.hutte...@who-t.net> (cherry picked from commit 048697ccfa31cf7f7a29afa90a2f702d43efb7d4) diff --git a/hw/xfree86/modes/xf86EdidModes.c b/hw/xfree86/modes/xf86EdidModes.c index 087f663..6256fda 100644 --- a/hw/xfree86/modes/xf86EdidModes.c +++ b/hw/xfree86/modes/xf86EdidModes.c @@ -205,6 +205,11 @@ static Bool quirk_first_detailed_preferred (int scrnIndex, xf86MonPtr DDC) DDC->vendor.prod_id == 2423) return TRUE; + /* Peacock Ergovision 19. See rh#492359 */ + if (memcmp (DDC->vendor.name, "PEA", 4) == 0 && + DDC->vendor.prod_id == 9003) + return TRUE; + return FALSE; } commit c941479ecc2dead9c3deaee2620c9b9518c3da9a Author: Rémi Cardona <r...@gentoo.org> Date: Mon Jul 27 12:07:51 2009 +0200 config: add HAL error checks This patch simplifies error handling in the HAL code and fixes a segfault if libhal_find_device_by_capability() failed. Fixes http://bugs.gentoo.org/278760 Based on a patch by Martin von Gagern <martin.vgag...@gmx.net> Signed-off-by: Rémi Cardona <r...@gentoo.org> Acked-by: Peter Hutterer <peter.hutte...@who-t.net> (cherry picked from commit b1c3dc6ae226db178420e3b5f297b94afc87c94c) diff --git a/config/hal.c b/config/hal.c index 731d9b8..59bff66 100644 --- a/config/hal.c +++ b/config/hal.c @@ -474,13 +474,13 @@ connect_and_register(DBusConnection *connection, struct config_hal_info *info) char **devices; int num_devices, i; + if (info->hal_ctx) + return TRUE; /* already registered, pretend we did something */ + info->system_bus = connection; dbus_error_init(&error); - if (info->hal_ctx) - return TRUE; /* already registered, pretend we did something */ - info->hal_ctx = libhal_ctx_new(); if (!info->hal_ctx) { LogMessage(X_ERROR, "config/hal: couldn't create HAL context\n"); @@ -501,7 +501,7 @@ connect_and_register(DBusConnection *connection, struct config_hal_info *info) LogMessage(X_ERROR, "config/hal: couldn't watch all properties: %s (%s)\n", error.name ? error.name : "unknown error", error.message ? error.message : "null"); - goto out_ctx2; + goto out_ctx; } libhal_ctx_set_device_added(info->hal_ctx, device_added); libhal_ctx_set_device_removed(info->hal_ctx, device_removed); @@ -509,6 +509,12 @@ connect_and_register(DBusConnection *connection, struct config_hal_info *info) devices = libhal_find_device_by_capability(info->hal_ctx, "input", &num_devices, &error); /* FIXME: Get default devices if error is set. */ + if (dbus_error_is_set(&error)) { + LogMessage(X_ERROR, "config/hal: couldn't find input device: %s (%s)\n", + error.name ? error.name : "unknown error", + error.message ? error.message : "null"); + goto out_ctx; + } for (i = 0; i < num_devices; i++) device_added(info->hal_ctx, devices[i]); libhal_free_string_array(devices); @@ -517,13 +523,19 @@ connect_and_register(DBusConnection *connection, struct config_hal_info *info) return TRUE; -out_ctx2: - if (!libhal_ctx_shutdown(info->hal_ctx, &error)) - LogMessage(X_WARNING, "config/hal: couldn't shut down context: %s (%s)\n", - error.name ? error.name : "unknown error", - error.message ? error.message : "null"); out_ctx: - libhal_ctx_free(info->hal_ctx); + dbus_error_free(&error); + + if (info->hal_ctx) { + if (!libhal_ctx_shutdown(info->hal_ctx, &error)) { + LogMessage(X_WARNING, "config/hal: couldn't shut down context: %s (%s)\n", + error.name ? error.name : "unknown error", + error.message ? error.message : "null"); + dbus_error_free(&error); + } + libhal_ctx_free(info->hal_ctx); + } + out_err: dbus_error_free(&error); commit 546f913ff5461dd93d4a0b29b24d2267557326c7 Author: Alan Coopersmith <alan.coopersm...@sun.com> Date: Fri May 8 21:31:01 2009 -0700 Don't printf NULL pointers on HAL connection error Fixes Solaris bug 6801386 Xorg core dumps on startup if hald not running http://bugs.opensolaris.org/bugdatabase/view_bug.do?bug_id=6801386 Signed-off-by: Alan Coopersmith <alan.coopersm...@sun.com> (cherry picked from commit 1e816065e5ec3b9394dc1fa5815457a664e15fd9) diff --git a/config/hal.c b/config/hal.c index 36fa839..731d9b8 100644 --- a/config/hal.c +++ b/config/hal.c @@ -493,12 +493,14 @@ connect_and_register(DBusConnection *connection, struct config_hal_info *info) } if (!libhal_ctx_init(info->hal_ctx, &error)) { LogMessage(X_ERROR, "config/hal: couldn't initialise context: %s (%s)\n", - error.name, error.message); + error.name ? error.name : "unknown error", + error.message ? error.message : "null"); goto out_ctx; } if (!libhal_device_property_watch_all(info->hal_ctx, &error)) { LogMessage(X_ERROR, "config/hal: couldn't watch all properties: %s (%s)\n", - error.name, error.message); + error.name ? error.name : "unknown error", + error.message ? error.message : "null"); goto out_ctx2; } libhal_ctx_set_device_added(info->hal_ctx, device_added); @@ -518,7 +520,8 @@ connect_and_register(DBusConnection *connection, struct config_hal_info *info) out_ctx2: if (!libhal_ctx_shutdown(info->hal_ctx, &error)) LogMessage(X_WARNING, "config/hal: couldn't shut down context: %s (%s)\n", - error.name, error.message); + error.name ? error.name : "unknown error", + error.message ? error.message : "null"); out_ctx: libhal_ctx_free(info->hal_ctx); out_err: -- To UNSUBSCRIBE, email to debian-x-requ...@lists.debian.org with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org