head	1.4;
access;
symbols
	pkgsrc-2013Q2:1.4.0.24
	pkgsrc-2013Q2-base:1.4
	pkgsrc-2012Q4:1.4.0.22
	pkgsrc-2012Q4-base:1.4
	pkgsrc-2011Q4:1.4.0.20
	pkgsrc-2011Q4-base:1.4
	pkgsrc-2011Q2:1.4.0.18
	pkgsrc-2011Q2-base:1.4
	pkgsrc-2009Q4:1.4.0.16
	pkgsrc-2009Q4-base:1.4
	pkgsrc-2008Q4:1.4.0.14
	pkgsrc-2008Q4-base:1.4
	pkgsrc-2008Q3:1.4.0.12
	pkgsrc-2008Q3-base:1.4
	cube-native-xorg:1.4.0.10
	cube-native-xorg-base:1.4
	pkgsrc-2008Q2:1.4.0.8
	pkgsrc-2008Q2-base:1.4
	pkgsrc-2008Q1:1.4.0.6
	pkgsrc-2008Q1-base:1.4
	pkgsrc-2007Q4:1.4.0.4
	pkgsrc-2007Q4-base:1.4
	pkgsrc-2007Q3:1.4.0.2
	pkgsrc-2007Q3-base:1.4
	pkgsrc-2007Q2:1.3.0.10
	pkgsrc-2007Q2-base:1.3
	pkgsrc-2007Q1:1.3.0.8
	pkgsrc-2007Q1-base:1.3
	pkgsrc-2006Q4:1.3.0.6
	pkgsrc-2006Q4-base:1.3
	pkgsrc-2006Q3:1.3.0.4
	pkgsrc-2006Q3-base:1.3
	pkgsrc-2006Q2:1.3.0.2
	pkgsrc-2006Q2-base:1.3
	pkgsrc-2006Q1:1.2.0.2
	pkgsrc-2006Q1-base:1.2
	pkgsrc-2005Q4:1.1.0.6
	pkgsrc-2005Q4-base:1.1
	pkgsrc-2005Q3:1.1.0.4
	pkgsrc-2005Q3-base:1.1
	pkgsrc-2005Q2:1.1.0.2
	pkgsrc-2005Q2-base:1.1;
locks; strict;
comment	@# @;


1.4
date	2007.08.17.20.25.32;	author joerg;	state dead;
branches;
next	1.3;

1.3
date	2006.05.03.12.23.48;	author tron;	state Exp;
branches;
next	1.2;

1.2
date	2006.01.18.23.53.06;	author xtraeme;	state dead;
branches
	1.2.2.1;
next	1.1;

1.1
date	2005.05.23.19.14.15;	author xtraeme;	state Exp;
branches;
next	;

1.2.2.1
date	2006.05.09.15.09.25;	author salo;	state Exp;
branches;
next	;


desc
@@


1.4
log
@To quote Johnny Lam: "In modular-xorg we trust"

Remove xorg 6.9 packages from pkgsrc.
@
text
@$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++;
@


1.3
log
@Apply patch to fix vulnerability reported in CVE-2006-1526.
Bump package revision because of this fix.
@
text
@d1 1
a1 1
$NetBSD$
@


1.2
log
@Update meta-pkgs/xorg to 6.9.0.

The full list of changes:
http://ftp.x.org/pub/X11R7.0/doc/html/RELNOTES2.html

Thanks to joerg@@ and reed@@ for testing on DragonFlyBSD.

Tested on NetBSD/i386 3.0/-current and DragonFlyBSD-1.4/i386.
@
text
@d1 1
a1 1
$NetBSD: patch-bh,v 1.1 2005/05/23 19:14:15 xtraeme Exp $
d3 20
a22 11
--- lib/xtrans/Xtranssock.c	Mon Apr  5 23:04:31 2004
+++ lib/xtrans/Xtranssock.c	Mon Apr  5 23:04:58 2004
@@@@ -91,7 +91,7 @@@@
 #if defined(__osf__) || defined(linux) || defined(AIXV5)
 #include <sys/param.h>
 #endif /* osf */
-#if defined(__NetBSD__) || defined(__OpenBSD__) || defined(__FreeBSD__) 
+#if defined(__NetBSD__) || defined(__OpenBSD__) || defined(__FreeBSD__) || defined(__DragonFly__)
 #include <sys/param.h>
 #include <machine/endian.h>
 #endif /* __NetBSD__ || __OpenBSD__ || __FreeBSD__ */
@


1.2.2.1
log
@Pullup ticket 1538 - requested by tron
security fix for xorg

Patch provided by the submitter.

   Module Name:		pkgsrc
   Committed By:	tron
   Date:		Wed May  3 12:23:48 UTC 2006

   Modified Files:
   	pkgsrc/x11/xorg-libs: distinfo
   	pkgsrc/x11/xorg-server: Makefile
   Added Files:
   	pkgsrc/x11/xorg-libs/patches: patch-bh

   Log Message:
   Apply patch to fix vulnerability reported in CVE-2006-1526.
   Bump package revision because of this fix.
@
text
@d1 1
a1 1
$NetBSD: patch-bh,v 1.3 2006/05/03 12:23:48 tron Exp $
d3 11
a13 20
--- 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++;
@


1.1
log
@Apply patches from Joerg Sonnenberger for DragonFlyBSD and GCC
3.x.x, while I'm here remove redundant DragonFly.cf from xorg-imake/files,
we'll use the same file from xorg-libs.
@
text
@d1 1
a1 1
$NetBSD$
@