diff options
| author | Treeve Jelbert | 2015-06-17 09:35:25 +0200 |
|---|---|---|
| committer | Treeve Jelbert | 2015-06-17 09:35:25 +0200 |
| commit | 7f1532a972f35439a58f77a546d45ffcc01d15ad (patch) | |
| tree | 5f022dfef1011961958a8cd7d769e64a25358517 | |
| parent | e4c4d684daed7af337bd4835777917a1899a842b (diff) | |
xorg-server-1.17.2 SECURITY FIX
| -rwxr-xr-x | xorg-xserver/xorg-server/DETAILS | 6 | ||||
| -rw-r--r-- | xorg-xserver/xorg-server/HISTORY | 6 | ||||
| -rwxr-xr-x | xorg-xserver/xorg-server/PRE_BUILD | 3 | ||||
| -rw-r--r-- | xorg-xserver/xorg-server/xorg-server-1.17.1-gcc5_fixes-1.patch | 53 |
4 files changed, 10 insertions, 58 deletions
diff --git a/xorg-xserver/xorg-server/DETAILS b/xorg-xserver/xorg-server/DETAILS index 9e8f8b4763..ba75a0eda9 100755 --- a/xorg-xserver/xorg-server/DETAILS +++ b/xorg-xserver/xorg-server/DETAILS @@ -1,6 +1,6 @@ SPELL=xorg-server - VERSION=1.17.1 - SOURCE_HASH=sha512:195a0e0a6bd9c7655e62dd40dfbd7dea77d10f1143d4fd6154e8bdbb463d3729f81ecd1e379d66f68e828d4f4583782c15ce260de24444802076844aec552c4f + VERSION=1.17.2 + SOURCE_HASH=sha512:7e7b7620890cc8db696695758fa22fa879f9d3c33946663611ec0b37f02116e9c6f08779f9eece59907b430d3df93f0c0548939683ea156b3c4cbe02571b7551 SOURCE=$SPELL-$VERSION.tar.bz2 # SOURCE_GPG="gurus.gpg:$SOURCE.sig:UPSTREAM_HASH" SOURCE_URL[0]=http://xorg.freedesktop.org/releases/individual/xserver/$SOURCE @@ -8,7 +8,7 @@ WEB_SITE=http://xorg.freedesktop.org/ ENTERED=20051125 LICENSE[0]=XCL - SECURITY_PATCH=9 + SECURITY_PATCH=10 PATCHLEVEL=0 SHORT="X servers (including Xorg, Xprt, Xvfb, Xnest & Xdmx)" cat << EOF diff --git a/xorg-xserver/xorg-server/HISTORY b/xorg-xserver/xorg-server/HISTORY index 117692de2e..8c76550bd7 100644 --- a/xorg-xserver/xorg-server/HISTORY +++ b/xorg-xserver/xorg-server/HISTORY @@ -1,3 +1,9 @@ +2015-06-17 Treeve Jelbert <treeve@sourcemage.org> + * DETAILS: 1.17.2 + SECURITY_PATCH++ fix CVE-2015-3164 + * xorg-server-1.17.1-gcc5_fixes-1.patch: fr;ryrf + * PRE_BUILD: adjust + 2015-06-04 Treeve Jelbert <treeve@sourcemage.org> * DEPENDS, CONFIGURE: simplify driver selection instead of giving a vast list of optional drivers, suggest the most likely ones diff --git a/xorg-xserver/xorg-server/PRE_BUILD b/xorg-xserver/xorg-server/PRE_BUILD index bec27b3c54..710034f1f2 100755 --- a/xorg-xserver/xorg-server/PRE_BUILD +++ b/xorg-xserver/xorg-server/PRE_BUILD @@ -2,5 +2,4 @@ default_pre_build && # required to build glselect mesa && cd "$SOURCE_DIRECTORY" && -patch -p1 < $SPELL_DIRECTORY/gl_select.patch && -patch -p1 < $SPELL_DIRECTORY/xorg-server-1.17.1-gcc5_fixes-1.patch +patch -p1 < $SPELL_DIRECTORY/gl_select.patch diff --git a/xorg-xserver/xorg-server/xorg-server-1.17.1-gcc5_fixes-1.patch b/xorg-xserver/xorg-server/xorg-server-1.17.1-gcc5_fixes-1.patch deleted file mode 100644 index 6f02897be3..0000000000 --- a/xorg-xserver/xorg-server/xorg-server-1.17.1-gcc5_fixes-1.patch +++ /dev/null @@ -1,53 +0,0 @@ -Submitted By: Ken Moffat <ken at linuxfromscratch dot org> -Date: 2015-04-18 -Initial Package Version: 1.17.1 -Upstream Status: Applied -Origin: Egbert Eich -Description: fixes compilation with gcc-5 - -From 21b896939c5bb242f3aacc37baf12379e43254b6 Mon Sep 17 00:00:00 2001 -From: Egbert Eich <eich@freedesktop.org> -Date: Tue, 3 Mar 2015 16:27:05 +0100 -Subject: symbols: Fix sdksyms.sh to cope with gcc5 - -Gcc5 adds additional lines stating line numbers before and -after __attribute__() which need to be skipped. - -Signed-off-by: Egbert Eich <eich@freedesktop.org> -Tested-by: Daniel Stone <daniels@collabora.com> -Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net> - -diff --git a/hw/xfree86/sdksyms.sh b/hw/xfree86/sdksyms.sh -index 2305073..05ac410 100755 ---- a/hw/xfree86/sdksyms.sh -+++ b/hw/xfree86/sdksyms.sh -@@ -350,13 +350,25 @@ BEGIN { - if (sdk) { - n = 3; - -+ # skip line numbers GCC 5 adds before __attribute__ -+ while ($n == "" || $0 ~ /^# [0-9]+ "/) { -+ getline; -+ n = 1; -+ } -+ - # skip attribute, if any - while ($n ~ /^(__attribute__|__global)/ || - # skip modifiers, if any - $n ~ /^\*?(unsigned|const|volatile|struct|_X_EXPORT)$/ || - # skip pointer -- $n ~ /^[a-zA-Z0-9_]*\*$/) -+ $n ~ /^[a-zA-Z0-9_]*\*$/) { - n++; -+ # skip line numbers GCC 5 adds after __attribute__ -+ while ($n == "" || $0 ~ /^# [0-9]+ "/) { -+ getline; -+ n = 1; -+ } -+ } - - # type specifier may not be set, as in - # extern _X_EXPORT unsigned name(...) --- -cgit v0.10.2 - |