diff options
| author | tron <tron@pkgsrc.org> | 2006-05-03 12:23:48 +0000 |
|---|---|---|
| committer | tron <tron@pkgsrc.org> | 2006-05-03 12:23:48 +0000 |
| commit | c7fbfb68bfd271b8aa6ec010a9271184cc566ba8 (patch) | |
| tree | 92fd6200a5e0a29aa80d048e9e6ab064d7d812e7 /x11 | |
| parent | 1f93df87587385d5e03dc40fa93f0eeb271859a8 (diff) | |
| download | pkgsrc-c7fbfb68bfd271b8aa6ec010a9271184cc566ba8.tar.gz | |
Apply patch to fix vulnerability reported in CVE-2006-1526.
Bump package revision because of this fix.
Diffstat (limited to 'x11')
| -rw-r--r-- | x11/xorg-libs/distinfo | 3 | ||||
| -rw-r--r-- | x11/xorg-libs/patches/patch-bh | 22 | ||||
| -rw-r--r-- | x11/xorg-server/Makefile | 4 |
3 files changed, 26 insertions, 3 deletions
diff --git a/x11/xorg-libs/distinfo b/x11/xorg-libs/distinfo index 53fba4adf94..1a33f4b9de9 100644 --- a/x11/xorg-libs/distinfo +++ b/x11/xorg-libs/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.42 2006/04/28 21:52:19 joerg Exp $ +$NetBSD: distinfo,v 1.43 2006/05/03 12:23:48 tron Exp $ SHA1 (X11R6.9.0-src1.tar.gz) = a6c077ed8fdeee5fe1956a427c4cb0bc266e1bef RMD160 (X11R6.9.0-src1.tar.gz) = d12270a4f41a3ceee4bfd5da22d387a3aa707df8 @@ -42,6 +42,7 @@ SHA1 (patch-bd) = 2ea3591101f5e9602cc6846ca259b63cdcb88b73 SHA1 (patch-be) = b9bc7d05429652400343609b123c99c76f64b33a SHA1 (patch-bf) = 753c56b84a6859fa4048d88a53f9c04400525d72 SHA1 (patch-bg) = 3db63fcbe81d9f801ccac6353ad4a213a15c3ffe +SHA1 (patch-bh) = 9e7e86c9abde02c7c80ddcf5d88e8429b85cd3a6 SHA1 (patch-bl) = ccfd290ebffc08b9cd03b7eb83a9671b0e16baec SHA1 (patch-bm) = f9b73b7c1bd7d6d6db6d23741d5d1125eea5f860 SHA1 (patch-bn) = 58049eb799b469b70b5a2c611b8aef37a5631c0c diff --git a/x11/xorg-libs/patches/patch-bh b/x11/xorg-libs/patches/patch-bh new file mode 100644 index 00000000000..51874f1dda9 --- /dev/null +++ b/x11/xorg-libs/patches/patch-bh @@ -0,0 +1,22 @@ +$NetBSD: patch-bh,v 1.3 2006/05/03 12:23:48 tron Exp $ + +--- programs/Xserver/render/mitri.c.orig 2005-07-03 08:02:08.000000000 +0100 ++++ programs/Xserver/render/mitri.c 2006-05-03 11:59:48.000000000 +0100 +@@ -145,7 +145,7 @@ + if (npoint < 3) + return; + ntri = npoint - 2; +- tris = ALLOCATE_LOCAL (ntri & sizeof (xTriangle)); ++ tris = ALLOCATE_LOCAL (ntri * sizeof (xTriangle)); + if (!tris) + return; + for (tri = tris; npoint >= 3; npoint--, points++, tri++) +@@ -177,7 +177,7 @@ + if (npoint < 3) + return; + ntri = npoint - 2; +- tris = ALLOCATE_LOCAL (ntri & sizeof (xTriangle)); ++ tris = ALLOCATE_LOCAL (ntri * sizeof (xTriangle)); + if (!tris) + return; + first = points++; diff --git a/x11/xorg-server/Makefile b/x11/xorg-server/Makefile index 9cc0ae7fdc4..a97c6eee524 100644 --- a/x11/xorg-server/Makefile +++ b/x11/xorg-server/Makefile @@ -1,8 +1,8 @@ -# $NetBSD: Makefile,v 1.42 2006/04/28 21:52:19 joerg Exp $ +# $NetBSD: Makefile,v 1.43 2006/05/03 12:23:48 tron Exp $ DISTNAME= ${DISTFILES} PKGNAME= xorg-server-${XORG_VER} -PKGREVISION= 9 +PKGREVISION= 10 CATEGORIES= x11 MASTER_SITES= ${MASTER_SITE_XORG} DISTFILES= X11R${XORG_VER}-src1.tar.gz \ |