From 61ef142219290253087df3cac919209afe94f55e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A9=20Fabian=20Silva=20Delgado?= Date: Sun, 15 Mar 2015 16:37:50 -0300 Subject: xorg-server-1.17.1-4.parabola1: fix FS#43924 -> https://bugs.archlinux.org/task/43924 --- ...Fix-error-check-for-pci_device_map_legacy.patch | 47 ++++++++++++++++++++++ libre/xorg-server/PKGBUILD | 12 ++++-- 2 files changed, 55 insertions(+), 4 deletions(-) create mode 100644 libre/xorg-server/0001-int10-Fix-error-check-for-pci_device_map_legacy.patch diff --git a/libre/xorg-server/0001-int10-Fix-error-check-for-pci_device_map_legacy.patch b/libre/xorg-server/0001-int10-Fix-error-check-for-pci_device_map_legacy.patch new file mode 100644 index 000000000..75e5bb92f --- /dev/null +++ b/libre/xorg-server/0001-int10-Fix-error-check-for-pci_device_map_legacy.patch @@ -0,0 +1,47 @@ +From 0a78b599b34cc8b5fe6fe82f90e90234e8ab7a56 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?J=C3=BCrg=20Billeter?= +Date: Sat, 7 Feb 2015 18:13:21 +0100 +Subject: [PATCH] int10: Fix error check for pci_device_map_legacy +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +pci_device_map_legacy returns 0 on success. + +Signed-off-by: Jürg Billeter +Reviewed-by: Adam Jackson +Signed-off-by: Peter Hutterer +--- + hw/xfree86/int10/generic.c | 2 +- + hw/xfree86/os-support/linux/int10/linux.c | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) + +diff --git a/hw/xfree86/int10/generic.c b/hw/xfree86/int10/generic.c +index 012d194..8d5c4da 100644 +--- a/hw/xfree86/int10/generic.c ++++ b/hw/xfree86/int10/generic.c +@@ -104,7 +104,7 @@ readIntVec(struct pci_device *dev, unsigned char *buf, int len) + { + void *map; + +- if (!pci_device_map_legacy(dev, 0, len, 0, &map)) ++ if (pci_device_map_legacy(dev, 0, len, 0, &map)) + return FALSE; + + memcpy(buf, map, len); +diff --git a/hw/xfree86/os-support/linux/int10/linux.c b/hw/xfree86/os-support/linux/int10/linux.c +index 79b9a88..6ca118f 100644 +--- a/hw/xfree86/os-support/linux/int10/linux.c ++++ b/hw/xfree86/os-support/linux/int10/linux.c +@@ -75,7 +75,7 @@ readLegacy(struct pci_device *dev, unsigned char *buf, int base, int len) + { + void *map; + +- if (!pci_device_map_legacy(dev, base, len, 0, &map)) ++ if (pci_device_map_legacy(dev, base, len, 0, &map)) + return FALSE; + + memcpy(buf, map, len); +-- +2.3.2 + diff --git a/libre/xorg-server/PKGBUILD b/libre/xorg-server/PKGBUILD index 1aa74bf6e..0e612b2f1 100644 --- a/libre/xorg-server/PKGBUILD +++ b/libre/xorg-server/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 231799 2015-02-22 13:05:35Z lcarlier $ +# $Id: PKGBUILD 233821 2015-03-14 18:51:11Z lcarlier $ # Maintainer: AndyRTR # Maintainer: Jan de Groot # Maintainer (Parabola): Márcio Silva @@ -6,7 +6,7 @@ pkgbase=xorg-server pkgname=('xorg-server') pkgver=1.17.1 -pkgrel=3.parabola1 # build first with 0.1 and then rebuild it after xf86-input-evdev rebuild +pkgrel=4.parabola1 # build first with 0.1 and then rebuild it after xf86-input-evdev rebuild arch=('i686' 'x86_64' 'mips64el') license=('custom') url="http://xorg.freedesktop.org" @@ -21,7 +21,8 @@ source=(${url}/releases/individual/xserver/${pkgbase}-${pkgver}.tar.bz2{,.sig} xvfb-run xvfb-run.1 os-access-fix-regression-in-server-interpreted-auth.patch - v2-xserver-Fix-a-crash-with-XDMCP-error-handler.patch) + v2-xserver-Fix-a-crash-with-XDMCP-error-handler.patch + 0001-int10-Fix-error-check-for-pci_device_map_legacy.patch) validpgpkeys=('7B27A3F1A6E18CD9588B4AE8310180050905E40C' 'C383B778255613DFDB409D91DB221A6900000011') sha256sums=('2bf8e9f6f0a710dec1d2472467bff1f4e247cb6dcd76eb469aafdc8a2d7db2ab' @@ -29,7 +30,8 @@ sha256sums=('2bf8e9f6f0a710dec1d2472467bff1f4e247cb6dcd76eb469aafdc8a2d7db2ab' 'ff0156309470fc1d378fd2e104338020a884295e285972cc88e250e031cc35b9' '2460adccd3362fefd4cdc5f1c70f332d7b578091fb9167bf88b5f91265bbd776' '8a9d76eecf8795ca645fb1ce261733965578e953f6606153ce001a0e15d036e8' - 'a73e33644682d9f430db987c192da0f7193907af50539669ebd59614a5ebd0f9') + 'a73e33644682d9f430db987c192da0f7193907af50539669ebd59614a5ebd0f9' + '2ea82cdbd695f21c935710847913ed58e22d3d5c0c18c96175a4a6cc1142c071') prepare() { cd "${pkgbase}-${pkgver}" @@ -37,6 +39,8 @@ prepare() { patch -Np1 -i ../os-access-fix-regression-in-server-interpreted-auth.patch # partially fix FS#43867, not yet upstream patch -Np1 -i ../v2-xserver-Fix-a-crash-with-XDMCP-error-handler.patch + # fix FS#43924, merged upstream + patch -Np1 -i ../0001-int10-Fix-error-check-for-pci_device_map_legacy.patch # fix os name: #Build Operating System = OSNAME="--kernel-name --kernel-release --machine" OSVENDOR="" -- cgit v1.2.3-2-g168b