From a161e9eadcbeacb136c6475aea19094f3a1a3f04 Mon Sep 17 00:00:00 2001
From: joerg <joerg>
Date: Wed, 10 Jan 2007 11:31:35 +0000
Subject: Add vendor patch for CVE-2006-6101, CVE-2006-6102 and CVE-2006-6103;
 this fixes possible overflows in the extensions dbe and render.

---
 x11/modular-xorg-server/Makefile | 7 ++++++-
 x11/modular-xorg-server/distinfo | 5 ++++-
 2 files changed, 10 insertions(+), 2 deletions(-)

(limited to 'x11/modular-xorg-server')

diff --git a/x11/modular-xorg-server/Makefile b/x11/modular-xorg-server/Makefile
index 12f125f0738..283d009d76f 100644
--- a/x11/modular-xorg-server/Makefile
+++ b/x11/modular-xorg-server/Makefile
@@ -1,11 +1,16 @@
-# $NetBSD: Makefile,v 1.3 2006/12/19 17:36:00 joerg Exp $
+# $NetBSD: Makefile,v 1.4 2007/01/10 11:31:35 joerg Exp $
 
 DISTNAME=	xorg-server-1.1.1
 PKGNAME=	modular-${DISTNAME}
+PKGREVISION=	1
 CATEGORIES=	x11
 MASTER_SITES=	http://xorg.freedesktop.org/releases/individual/xserver/
 EXTRACT_SUFX=	.tar.bz2
 
+PATCHFILES=		xorg-xserver-1.1.0-dbe-render.diff
+PATCH_SITES=		http://xorg.freedesktop.org/archive/X11R7.1/patches/
+PATCH_DIST_STRIP=	-p1
+
 SPECIAL_PERMS+=	bin/Xorg ${SETUID_ROOT_PERMS}
 PKG_DESTDIR_SUPPORT=	user-destdir
 
diff --git a/x11/modular-xorg-server/distinfo b/x11/modular-xorg-server/distinfo
index c863508947c..1417a96afc3 100644
--- a/x11/modular-xorg-server/distinfo
+++ b/x11/modular-xorg-server/distinfo
@@ -1,8 +1,11 @@
-$NetBSD: distinfo,v 1.1.1.1 2006/11/14 16:59:30 joerg Exp $
+$NetBSD: distinfo,v 1.2 2007/01/10 11:31:35 joerg Exp $
 
 SHA1 (xorg-server-1.1.1.tar.bz2) = eb29dd4fea9f184321cbb5512f68b674ada4daf7
 RMD160 (xorg-server-1.1.1.tar.bz2) = 17675c45b1e6ec8ed025f73efcf481c60ff42941
 Size (xorg-server-1.1.1.tar.bz2) = 6252103 bytes
+SHA1 (xorg-xserver-1.1.0-dbe-render.diff) = 2c01ee26bac79d71c9925d2b8bbfbc6b73de9396
+RMD160 (xorg-xserver-1.1.0-dbe-render.diff) = 3e168d1161bb29d669a2bae475c312b1f20cf25b
+Size (xorg-xserver-1.1.0-dbe-render.diff) = 5236 bytes
 SHA1 (patch-aa) = bc460c6376ec76a7f6adbefb4c9b75a6b0e2a040
 SHA1 (patch-ab) = be6748cac5db41bab46d02e2d8ab75bed6e11aa8
 SHA1 (patch-ac) = 3319535f0ab2f92e4c7f92af5266d7add7571630
-- 
cgit v1.2.3