diff options
author | root | 2006-06-15 22:30:41 -0500 |
---|---|---|
committer | root | 2006-06-15 22:30:41 -0500 |
commit | 17e864d0a033123af79f65eb1ca7c0881256bd25 (patch) | |
tree | 36adf4cb0aaec334cdf49378d5884b97db769678 | |
parent | f065bac876cb4b212af239712a6cd1fe690dfca4 (diff) |
x11-libs/xorg/: 2006/06/15 sync stable-rc from p4
-rwxr-xr-x | x11-libs/xorg/DETAILS | 2 | ||||
-rw-r--r-- | x11-libs/xorg/HISTORY | 5 | ||||
-rwxr-xr-x | x11-libs/xorg/PRE_BUILD | 3 | ||||
-rw-r--r-- | x11-libs/xorg/x11r6.9.0-mitri.diff | 25 |
4 files changed, 33 insertions, 2 deletions
diff --git a/x11-libs/xorg/DETAILS b/x11-libs/xorg/DETAILS index b4251da0dc..6c8bc945a7 100755 --- a/x11-libs/xorg/DETAILS +++ b/x11-libs/xorg/DETAILS @@ -15,7 +15,7 @@ SOURCE_DIRECTORY=$BUILD_DIRECTORY/xc SOURCE_URL[1]=ftp://ftp.x.org/pub/${XVERSION}/src-single/$SOURCE # SOURCE_HASH=sha512:8fe05f9e4ca1eb44fd344ce226c023a5904c0d94af9e769f8d24ea64f4695ed6904b2238acc16bea00637852de7cbd3241cb59f1af66e1d147dc4897308419bb SOURCE_GPG=gurus.gpg:$SOURCE.sig:WORKS_FOR_ME - SECURITY_PATCH=1 + SECURITY_PATCH=2 fi WEB_SITE=http://xorg.freedesktop.org/ ENTERED=20040407 diff --git a/x11-libs/xorg/HISTORY b/x11-libs/xorg/HISTORY index d813326fb5..c2274e8744 100644 --- a/x11-libs/xorg/HISTORY +++ b/x11-libs/xorg/HISTORY @@ -1,3 +1,8 @@ +2006-05-06 George Sherwood <george@beernabeer.com> + * PRE_BUILD, x11r6.9.0-mitri.diff: patch for CVE-2006-1525, see + http://lists.freedesktop.org/archives/xorg/2006-May/015136.html + * DETAILS: SECURITY_PATCH=2, Bug #11752. + 2006-03-21 Arwed v. Merkatz <v.merkatz@gmx.net> * PRE_BUILD, x11r6.9.0-geteuid.diff: patch for CVE-2006-0745, see http://lists.freedesktop.org/archives/xorg/2006-March/013992.html diff --git a/x11-libs/xorg/PRE_BUILD b/x11-libs/xorg/PRE_BUILD index 687128e83d..a003b7945d 100755 --- a/x11-libs/xorg/PRE_BUILD +++ b/x11-libs/xorg/PRE_BUILD @@ -3,7 +3,8 @@ unpack_file '' && cd $SOURCE_DIRECTORY && if [[ $X_LATEST != y ]]; then - patch -p0 < $SCRIPT_DIRECTORY/x11r6.9.0-geteuid.diff + patch -p0 < $SCRIPT_DIRECTORY/x11r6.9.0-geteuid.diff && + patch -p0 < $SCRIPT_DIRECTORY/x11r6.9.0-mitri.diff fi && cp $SOURCE_DIRECTORY/config/cf/xorgsite.def \ diff --git a/x11-libs/xorg/x11r6.9.0-mitri.diff b/x11-libs/xorg/x11r6.9.0-mitri.diff new file mode 100644 index 0000000000..bf75372732 --- /dev/null +++ b/x11-libs/xorg/x11r6.9.0-mitri.diff @@ -0,0 +1,25 @@ +Index: programs/Xserver/render/mitri.c +=================================================================== +RCS file: /cvs/xorg/xc/programs/Xserver/render/mitri.c,v +retrieving revision 1.5 +diff -u -r1.5 mitri.c +--- programs/Xserver/render/mitri.c 3 Jul 2005 07:02:08 -0000 1.5 ++++ programs/Xserver/render/mitri.c 30 Apr 2006 20:19:57 -0000 +@@ -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++; |