summaryrefslogtreecommitdiff
path: root/x11-servers/xorg-server/Makefile
diff options
context:
space:
mode:
authorKoop Mast <kwm@FreeBSD.org>2014-12-10 21:35:13 +0000
committerKoop Mast <kwm@FreeBSD.org>2014-12-10 21:35:13 +0000
commit1ef33079b39900dcc3d50c5e019eb2f8901c525b (patch)
tree49084ca45edd067095895911788343ae39bf660b /x11-servers/xorg-server/Makefile
parentDocument xserver security advisories. (diff)
Fix multiple xserver security advisories in the 1.12.4 xserver.
The patches where not ported to 1.7.7 so mark it forbidden. This version is not default anymore and will be removed in the 1.14 update that currently being tested. Obtained from: xserver upstream MFH: 2014Q4 Security: 27b9b2f0-8081-11e4-b4ca-bcaec565249c
Notes
Notes: svn path=/head/; revision=374489
Diffstat (limited to 'x11-servers/xorg-server/Makefile')
-rw-r--r--x11-servers/xorg-server/Makefile3
1 files changed, 2 insertions, 1 deletions
diff --git a/x11-servers/xorg-server/Makefile b/x11-servers/xorg-server/Makefile
index b608dfa530c1..183136dbc8bb 100644
--- a/x11-servers/xorg-server/Makefile
+++ b/x11-servers/xorg-server/Makefile
@@ -35,13 +35,14 @@ OPTIONS_EXCLUDE_sparc64= HAL
.if defined(WITH_NEW_XORG)
XORG_VERSION= 1.12.4
-XORG_REVISION= 9
+XORG_REVISION= 10
PLIST_SUB+= OLD="@comment " NEW=""
EXTRA_PATCHES+= ${FILESDIR}/extra-clang \
${FILESDIR}/extra-configure \
${FILESDIR}/extra-new-bad-impl \
${FILESDIR}/extra-new-dix_dixfonts.c
.else
+FORBIDDEN= unfixed security issues
XORG_VERSION= 1.7.7
XORG_REVISION= 14
PLIST_SUB+= OLD="" NEW="@comment "