Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=58cafd696e339662f7b543945a267540e0625348
commit 58cafd696e339662f7b543945a267540e0625348 Author: crazy <[email protected]> Date: Tue Oct 20 09:51:16 2015 +0200 xorg-server-1.17.2-1-x86_64 * version bump * FB cleanup diff --git a/source/x11/xorg-server/0001-int10-Fix-error-check-for-pci_device_map_legacy.patch b/source/x11/xorg-server/0001-int10-Fix-error-check-for-pci_device_map_legacy.patch deleted file mode 100644 index 75e5bb9..0000000 --- a/source/x11/xorg-server/0001-int10-Fix-error-check-for-pci_device_map_legacy.patch +++ /dev/null @@ -1,47 +0,0 @@ -From 0a78b599b34cc8b5fe6fe82f90e90234e8ab7a56 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?J=C3=BCrg=20Billeter?= <[email protected]> -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 <[email protected]> -Reviewed-by: Adam Jackson <[email protected]> -Signed-off-by: Peter Hutterer <[email protected]> ---- - 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/source/x11/xorg-server/FrugalBuild b/source/x11/xorg-server/FrugalBuild index a376bf6..be118e1 100644 --- a/source/x11/xorg-server/FrugalBuild +++ b/source/x11/xorg-server/FrugalBuild @@ -1,7 +1,6 @@ # Compiling Time: 6.34 SBU # Maintainer: bouleetbil <[email protected]> -options+=('asneeded') : ${USE_DEVEL="n"} : ${USE_DGA="y"} @@ -15,11 +14,11 @@ xorg_protos=('bigreqsproto' 'calibrateproto' 'compositeproto>=0.4' 'damageproto> 'recordproto' 'renderproto>=0.9.3' 'resourceproto' 'scrnsaverproto' 'trapproto' \ 'videoproto>=2.2.2' 'windowswmproto' 'xcb-proto' 'xcmiscproto' 'xextproto>=7.0.5' \ 'xf86bigfontproto' 'xf86dgaproto' 'xf86driproto>=2.0.4' 'xf86miscproto' 'xf86rushproto' \ - 'xf86vidmodeproto' 'xineramaproto' 'xproto>=7.0.15' 'dri3proto' 'presentproto') + 'xf86vidmodeproto' 'xineramaproto' 'xproto>=7.0.15' 'dri3proto' 'presentproto' 'libpthread-stubs') pkgname=xorg-server -pkgver=1.17.1 -pkgrel=2 +pkgver=1.17.2 +pkgrel=1 pkgdesc="Modular X.Org X Server" groups=('x11' 'xorg-core') archs=('i686' 'x86_64' 'arm') @@ -39,7 +38,9 @@ conflicts=('libdri' 'xf86-video-modesetting' 'glamor') _F_archive_grepv="99" Finclude xorg -sha1sums=('490118810a54e91c8814245c99d6285caf4985dd') +source=(${source[@]} v2-xserver-Fix-a-crash-with-XDMCP-error-handler.patch) +sha1sums=('56ac29a82b99bcf4c7ba2fca41a44cfa18748262' \ + '1affbe761ff160e31ae9f200758a3079228027ec') if Fuse $USE_DEVEL; then pkgver=1.6.3.901.151.g120286a @@ -84,16 +85,6 @@ else rodepends=(${rodepends[@]} 'xf86-input-mouse' 'xf86-input-keyboard') fi -source=(${source[@]} \ - 'os-access-fix-regression-in-server-interpreted-auth.patch' - 'v2-xserver-Fix-a-crash-with-XDMCP-error-handler.patch' - '0001-int10-Fix-error-check-for-pci_device_map_legacy.patch' -) -sha1sums=(${sha1sums[@]} \ - 'acd7c1bc83269ecabe2c9b5ad15bff65ecba268a' - '1affbe761ff160e31ae9f200758a3079228027ec' - 'e21e444d2b493a81dc0413fc9bc367cfd9e0ef12' -) subpkgs=('libglx') subdescs=('Glx library for XOrg.') @@ -162,12 +153,6 @@ else fi -# FSA fix *** -#source=(${source[@]}) -#sha1sums=(${sha1sums[@]}) -# *********** - - build() { if Fuse $USE_DEVEL; then Funpack_scm diff --git a/source/x11/xorg-server/os-access-fix-regression-in-server-interpreted-auth.patch b/source/x11/xorg-server/os-access-fix-regression-in-server-interpreted-auth.patch deleted file mode 100644 index b96bb7a..0000000 --- a/source/x11/xorg-server/os-access-fix-regression-in-server-interpreted-auth.patch +++ /dev/null @@ -1,30 +0,0 @@ -diff --git a/os/access.c b/os/access.c -index 28f2d32..fe6e831 100644 ---- a/os/access.c -+++ b/os/access.c -@@ -1390,14 +1390,23 @@ InvalidHost(register struct sockaddr *saddr, int len, ClientPtr client) - else - return 0; - } -+ -+ /* An empty address requires both a NULL addr *and* a zero length -+ * as the address comparison functions call memcmp with both -+ * parameters. Make sure they agree here -+ */ -+ if (addr == NULL) -+ len = 0; -+ if (len == 0) -+ addr = NULL; - for (host = validhosts; host; host = host->next) { - if (host->family == FamilyServerInterpreted) { -- if (addr && siAddrMatch(family, addr, len, host, client)) { -+ if (siAddrMatch(family, addr, len, host, client)) { - return 0; - } - } - else { -- if (addr && addrEqual(family, addr, len, host)) -+ if (addrEqual(family, addr, len, host)) - return 0; - } -
_______________________________________________ Frugalware-git mailing list [email protected] http://frugalware.org/mailman/listinfo/frugalware-git
