summaryrefslogtreecommitdiff
path: root/extra/xorg-server/PKGBUILD
diff options
context:
space:
mode:
authorNicolás Reynolds <fauno@endefensadelsl.org>2014-01-07 03:30:07 +0000
committerNicolás Reynolds <fauno@endefensadelsl.org>2014-01-07 03:30:07 +0000
commitbd5b8fe0fe2355ad0df744ed310d12b8a70c51f9 (patch)
tree193748868eafd7f5d1fb754757fa956bb3070ae6 /extra/xorg-server/PKGBUILD
parent3b88fa9d064e61705923ef42381b467bc8ecfd32 (diff)
Tue Jan 7 03:27:41 UTC 2014
Diffstat (limited to 'extra/xorg-server/PKGBUILD')
-rw-r--r--extra/xorg-server/PKGBUILD13
1 files changed, 9 insertions, 4 deletions
diff --git a/extra/xorg-server/PKGBUILD b/extra/xorg-server/PKGBUILD
index 28ade7a63..b9b3f52ad 100644
--- a/extra/xorg-server/PKGBUILD
+++ b/extra/xorg-server/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 201503 2013-12-13 14:16:21Z andyrtr $
+# $Id: PKGBUILD 203261 2014-01-06 22:20:54Z lcarlier $
# Maintainer: AndyRTR <andyrtr@archlinux.org>
# Maintainer: Jan de Groot <jgc@archlinux.org>
pkgbase=xorg-server
pkgname=('xorg-server' 'xorg-server-xephyr' 'xorg-server-xdmx' 'xorg-server-xvfb' 'xorg-server-xnest' 'xorg-server-common' 'xorg-server-devel')
pkgver=1.14.5
-pkgrel=1
+pkgrel=2
arch=('i686' 'x86_64')
license=('custom')
url="http://xorg.freedesktop.org"
@@ -22,7 +22,8 @@ source=(${url}/releases/individual/xserver/${pkgbase}-${pkgver}.tar.bz2
xvfb-run
xvfb-run.1
10-quirks.conf
- fb-rename-wfbDestroyGlyphCache.patch)
+ fb-rename-wfbDestroyGlyphCache.patch
+ CVE-2013-6424.diff)
sha256sums=('8d0f06bf1416487a5170318477088826a8d737d4a201e996b2dc1ecff47461d1'
'66e25f76a7496c429e0aff4b0670f168719bb0ceaeb88c6f2272f2bf3ed21162'
'd027776fac1f7675b0a9ee817502290b1c45f9c09b0f0a6bb058c35f92361e84'
@@ -32,7 +33,8 @@ sha256sums=('8d0f06bf1416487a5170318477088826a8d737d4a201e996b2dc1ecff47461d1'
'ff0156309470fc1d378fd2e104338020a884295e285972cc88e250e031cc35b9'
'2460adccd3362fefd4cdc5f1c70f332d7b578091fb9167bf88b5f91265bbd776'
'94612f5c0d34a3b7152915c2e285c7b462e9d8e38d3539bd551a339498eac166'
- 'd0832cc16b5e6c1dee2959055a4b327f5c87e2a67b5f427d654663057207b2c1')
+ 'd0832cc16b5e6c1dee2959055a4b327f5c87e2a67b5f427d654663057207b2c1'
+ '89948993afd4d9aec6a0bdbaf62f494e9956bb77a0386307d497f340a818ff61')
prepare() {
cd "${pkgbase}-${pkgver}"
@@ -53,6 +55,9 @@ prepare() {
# http://cgit.freedesktop.org/xorg/xserver/commit/fb/wfbrename.h?id=5047810a4c20fab444b8c6eb146c55dcdb0d4219
patch -Np1 -i ../fb-rename-wfbDestroyGlyphCache.patch
+
+ # Fix CVE-2013-6424 (FS#38401)
+ patch -Np1 -i ../CVE-2013-6424.diff
}
build() {