From patchwork Sat Mar 8 13:36:55 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Bernd Kuhls X-Patchwork-Id: 328189 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from hemlock.osuosl.org (hemlock.osuosl.org [140.211.166.133]) by ozlabs.org (Postfix) with ESMTP id 661CC2C00AD for ; Sun, 9 Mar 2014 00:37:12 +1100 (EST) Received: from localhost (localhost [127.0.0.1]) by hemlock.osuosl.org (Postfix) with ESMTP id B8AB2899DE; Sat, 8 Mar 2014 13:37:11 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from hemlock.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id EJWI0zAX3JBH; Sat, 8 Mar 2014 13:37:11 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by hemlock.osuosl.org (Postfix) with ESMTP id BB79489A85; Sat, 8 Mar 2014 13:37:10 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from hemlock.osuosl.org (hemlock.osuosl.org [140.211.166.133]) by ash.osuosl.org (Postfix) with ESMTP id 4EE681BF97A for ; Sat, 8 Mar 2014 13:37:10 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by hemlock.osuosl.org (Postfix) with ESMTP id 46CAB89A85 for ; Sat, 8 Mar 2014 13:37:10 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from hemlock.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id GgSvf5UJGgij for ; Sat, 8 Mar 2014 13:37:08 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from blu0-omc2-s18.blu0.hotmail.com (blu0-omc2-s18.blu0.hotmail.com [65.55.111.93]) by hemlock.osuosl.org (Postfix) with ESMTP id E488C899DE for ; Sat, 8 Mar 2014 13:37:07 +0000 (UTC) Received: from BLU0-SMTP360 ([65.55.111.71]) by blu0-omc2-s18.blu0.hotmail.com with Microsoft SMTPSVC(6.0.3790.4675); Sat, 8 Mar 2014 05:37:06 -0800 X-TMN: [Qtt+teBBTHQBRJLpr4qGxIIL4LNUt410] X-Originating-Email: [berndkuhls@hotmail.com] Message-ID: Received: from fli4l.lan.fli4l ([79.247.171.24]) by BLU0-SMTP360.phx.gbl over TLS secured channel with Microsoft SMTPSVC(6.0.3790.4675); Sat, 8 Mar 2014 05:37:05 -0800 Received: from [192.168.1.122] (port=36864 helo=fli4lbuild64.lan.fli4l) by fli4l.lan.fli4l with esmtpsa (TLSv1.2:DHE-RSA-AES256-GCM-SHA384:256) (Exim 4.80.1) (envelope-from ) id 1WMHR0-0004Bi-Mv; Sat, 08 Mar 2014 14:37:03 +0100 From: Bernd Kuhls To: buildroot@buildroot.org Date: Sat, 8 Mar 2014 14:36:55 +0100 X-Mailer: git-send-email 1.7.10.4 In-Reply-To: <1394285816-7111-1-git-send-email-berndkuhls@hotmail.com> References: <1394285816-7111-1-git-send-email-berndkuhls@hotmail.com> MIME-Version: 1.0 X-OriginalArrivalTime: 08 Mar 2014 13:37:05.0417 (UTC) FILETIME=[7EA33790:01CF3AD3] Cc: Bernd Kuhls Subject: [Buildroot] =?utf-8?q?=5BPATCH_v3_3/4=5D_xorg=3A_Bump_xserver=5Fx?= =?utf-8?q?org-server_version_to_1=2E15=2E0?= X-BeenThere: buildroot@busybox.net X-Mailman-Version: 2.1.14 Precedence: list List-Id: Discussion and development of buildroot List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: buildroot-bounces@busybox.net Sender: buildroot-bounces@busybox.net - remove patches applied upstream - add new dependency xproto_presentproto Signed-off-by: Bernd Kuhls --- v3: rebased v2 v2: rebased v1 package/x11r7/xserver_xorg-server/Config.in | 1 + .../xserver_xorg-server-02-cve-2013-1940.patch | 34 ----------- ...ut-allocate-enough-space-for-null-charact.patch | 59 -------------------- .../xserver_xorg-server/xserver_xorg-server.mk | 3 +- 4 files changed, 3 insertions(+), 94 deletions(-) delete mode 100644 package/x11r7/xserver_xorg-server/xserver_xorg-server-02-cve-2013-1940.patch delete mode 100644 package/x11r7/xserver_xorg-server/xserver_xorg-server-03-Revert-kinput-allocate-enough-space-for-null-charact.patch diff --git a/package/x11r7/xserver_xorg-server/Config.in b/package/x11r7/xserver_xorg-server/Config.in index 5f0c2d8..dfa7d10 100644 --- a/package/x11r7/xserver_xorg-server/Config.in +++ b/package/x11r7/xserver_xorg-server/Config.in @@ -36,6 +36,7 @@ config BR2_PACKAGE_XSERVER_XORG_SERVER select BR2_PACKAGE_XPROTO_GLPROTO select BR2_PACKAGE_XPROTO_INPUTPROTO select BR2_PACKAGE_XPROTO_KBPROTO + select BR2_PACKAGE_XPROTO_PRESENTPROTO select BR2_PACKAGE_XPROTO_RANDRPROTO select BR2_PACKAGE_XPROTO_RENDERPROTO select BR2_PACKAGE_XPROTO_RESOURCEPROTO diff --git a/package/x11r7/xserver_xorg-server/xserver_xorg-server-02-cve-2013-1940.patch b/package/x11r7/xserver_xorg-server/xserver_xorg-server-02-cve-2013-1940.patch deleted file mode 100644 index d85494f..0000000 --- a/package/x11r7/xserver_xorg-server/xserver_xorg-server-02-cve-2013-1940.patch +++ /dev/null @@ -1,34 +0,0 @@ -From 6ca03b9161d33b1d2b55a3a1a913cf88deb2343f Mon Sep 17 00:00:00 2001 -From: Dave Airlie -Date: Wed, 10 Apr 2013 06:09:01 +0000 -Subject: xf86: fix flush input to work with Linux evdev devices. - -So when we VT switch back and attempt to flush the input devices, -we don't succeed because evdev won't return part of an event, -since we were only asking for 4 bytes, we'd only get -EINVAL back. - -This could later cause events to be flushed that we shouldn't have -gotten. - -This is a fix for CVE-2013-1940. - -Signed-off-by: Dave Airlie -Reviewed-by: Peter Hutterer -Signed-off-by: Peter Hutterer ---- -diff --git a/hw/xfree86/os-support/shared/posix_tty.c b/hw/xfree86/os-support/shared/posix_tty.c -index ab3757a..4d08c1e 100644 ---- a/hw/xfree86/os-support/shared/posix_tty.c -+++ b/hw/xfree86/os-support/shared/posix_tty.c -@@ -421,7 +421,8 @@ xf86FlushInput(int fd) - { - fd_set fds; - struct timeval timeout; -- char c[4]; -+ /* this needs to be big enough to flush an evdev event. */ -+ char c[256]; - - DebugF("FlushingSerial\n"); - if (tcflush(fd, TCIFLUSH) == 0) --- -cgit v0.9.0.2-2-gbebe diff --git a/package/x11r7/xserver_xorg-server/xserver_xorg-server-03-Revert-kinput-allocate-enough-space-for-null-charact.patch b/package/x11r7/xserver_xorg-server/xserver_xorg-server-03-Revert-kinput-allocate-enough-space-for-null-charact.patch deleted file mode 100644 index d19bc46..0000000 --- a/package/x11r7/xserver_xorg-server/xserver_xorg-server-03-Revert-kinput-allocate-enough-space-for-null-charact.patch +++ /dev/null @@ -1,59 +0,0 @@ -From 09f1e5b15b769e1122f0a8d7cae0820038992312 Mon Sep 17 00:00:00 2001 -From: Julien Cristau -Date: Sun, 7 Oct 2012 18:40:35 +0200 -Subject: [PATCH] Revert "kinput: allocate enough space for null character." -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -This reverts commit 531785dd746d64ef7f473a83ca73bb20e74b6fca. - -The above commit breaks Xephyr option parsing. Andrzej writes: - - Xephyr -retro -keybd evdev,,device=/dev/input/event2,xkbrules=evdev,xkbmodel=evdev,xkblayout=pl -mouse evdev,,device=/dev/input/event1 :3 - - results in: - - - Pointer option key (device=) of value (/dev/input/event1) not assigned! - Kbd option key (device=) of value (/dev/input/event2) not assigned! - Kbd option key (xkbrules=) of value (evdev) not assigned! - Kbd option key (xkbmodel=) of value (evdev) not assigned! - Kbd option key (xkblayout=) of value (pl) not assigned! - - - The effect of the patch is that the "key=value" pairs are parsed in such - a way that the key is added an "equals" sign to it and we end up with - keys like "device=" instead of "device". This in turn has effect on - KdParsePointerOptions and KdParseKbdOptions: the key does not match - any choice presented in the "switch" statement, and so "Pointer/Kbd - option key (...) of value (...) not assigned!" happens, making all - "key=value" options inaccessible to the user. Reverting the patch makes - them available again. - -Reference: http://bugs.debian.org/689246 -Reported-by: Andrzej Pietrasiewicz -Signed-off-by: Julien Cristau -Cc: Dave Airlie -Reviewed-by: Søren Sandmann -Signed-off-by: Keith Packard ---- - hw/kdrive/src/kinput.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/hw/kdrive/src/kinput.c b/hw/kdrive/src/kinput.c -index d35dcf8..b1068bb 100644 ---- a/hw/kdrive/src/kinput.c -+++ b/hw/kdrive/src/kinput.c -@@ -1034,7 +1034,7 @@ KdGetOptions(InputOption **options, char *string) - - if (strchr(string, '=')) { - tam_key = (strchr(string, '=') - string); -- key = strndup(string, tam_key + 1); -+ key = strndup(string, tam_key); - if (!key) - goto out; - --- -1.7.10.4 - diff --git a/package/x11r7/xserver_xorg-server/xserver_xorg-server.mk b/package/x11r7/xserver_xorg-server/xserver_xorg-server.mk index 034b591..7fa8053 100644 --- a/package/x11r7/xserver_xorg-server/xserver_xorg-server.mk +++ b/package/x11r7/xserver_xorg-server/xserver_xorg-server.mk @@ -4,7 +4,7 @@ # ################################################################################ -XSERVER_XORG_SERVER_VERSION = 1.12.4 +XSERVER_XORG_SERVER_VERSION = 1.15.0 XSERVER_XORG_SERVER_SOURCE = xorg-server-$(XSERVER_XORG_SERVER_VERSION).tar.bz2 XSERVER_XORG_SERVER_SITE = http://xorg.freedesktop.org/releases/individual/xserver XSERVER_XORG_SERVER_LICENSE = MIT @@ -40,6 +40,7 @@ XSERVER_XORG_SERVER_DEPENDENCIES = \ xproto_glproto \ xproto_inputproto \ xproto_kbproto \ + xproto_presentproto \ xproto_randrproto \ xproto_renderproto \ xproto_resourceproto \