summaryrefslogtreecommitdiff
path: root/x11-servers
diff options
context:
space:
mode:
authorDejan Lesjak <lesi@FreeBSD.org>2007-01-27 20:22:20 +0000
committerDejan Lesjak <lesi@FreeBSD.org>2007-01-27 20:22:20 +0000
commit0b7bf38e909c68cef56e207c502bbe7c72eca786 (patch)
tree0cb7d8b93a20a1f4ca942617edc962bcd069eb75 /x11-servers
parentUpdate to 0.16 (diff)
Add vendor patch preventing overwiting of data on the stack or other
parts of server by dbe and render extensions. PR: ports/107733 Security: CVE-2006-6101 CVE-2006-6102 CVE-2006-6103
Notes
Notes: svn path=/head/; revision=183431
Diffstat (limited to 'x11-servers')
-rw-r--r--x11-servers/xorg-server/Makefile7
-rw-r--r--x11-servers/xorg-server/distinfo3
2 files changed, 9 insertions, 1 deletions
diff --git a/x11-servers/xorg-server/Makefile b/x11-servers/xorg-server/Makefile
index a8201dbe3596..4dab8f178c32 100644
--- a/x11-servers/xorg-server/Makefile
+++ b/x11-servers/xorg-server/Makefile
@@ -7,13 +7,18 @@
PORTNAME= xorg-server
PORTVERSION= 6.9.0
-PORTREVISION= 5
+PORTREVISION= 6
CATEGORIES= x11-servers
MASTER_SITES= ${MASTER_SITE_XORG}
MASTER_SITE_SUBDIR= X11R${PORTVERSION}/src
DISTFILES= X11R${PORTVERSION}-src1.tar.gz \
X11R${PORTVERSION}-src3.tar.gz
+PATCHFILES= x11r6.9.0-dbe-render.diff
+PATCH_SITES= ${MASTER_SITE_XORG}
+PATCH_SITE_SUBDIR= X11R${PORTVERSION}/patches
+PATCH_DIST_ARGS= -d ${PATCH_WRKSRC}/programs/Xserver --quiet
+
MAINTAINER= x11@FreeBSD.org
COMMENT= X.Org X server and related programs
diff --git a/x11-servers/xorg-server/distinfo b/x11-servers/xorg-server/distinfo
index 177370c87899..8aa64eb535b0 100644
--- a/x11-servers/xorg-server/distinfo
+++ b/x11-servers/xorg-server/distinfo
@@ -4,3 +4,6 @@ SIZE (xorg/X11R6.9.0-src1.tar.gz) = 33460996
MD5 (xorg/X11R6.9.0-src3.tar.gz) = 4d5450bde835270632e004b25e45ef33
SHA256 (xorg/X11R6.9.0-src3.tar.gz) = 6c55602a0d6476457d3cf6a1413c39d63c70ca9255749bff5502dae9414f9971
SIZE (xorg/X11R6.9.0-src3.tar.gz) = 10872474
+MD5 (xorg/x11r6.9.0-dbe-render.diff) = 992f91012c2e2f4c8abdbe8bcdf7b0c4
+SHA256 (xorg/x11r6.9.0-dbe-render.diff) = c41ed0c07151bd597bc6869e6de5b369d029d3bfcc9c9401e1e6a097356843a4
+SIZE (xorg/x11r6.9.0-dbe-render.diff) = 5158