[SM-Commit] PERFORCE change 78951 by Arwed von Merkatz for review

Perforce Review Daemon p4review at smee.org
Sat May 6 14:55:01 EDT 2006


Change 78951 by arwed_von_merkatz at arwed-Otherland on 2006/05/06 19:54:45

	security fix for stable, bug #11752

Affected files ...

... //sgl/grimoires/stable/0.3/x11-libs/xorg/DETAILS#2 edit
... //sgl/grimoires/stable/0.3/x11-libs/xorg/HISTORY#2 edit
... //sgl/grimoires/stable/0.3/x11-libs/xorg/PRE_BUILD#2 edit
... //sgl/grimoires/stable/0.3/x11-libs/xorg/xorg-68x-CAN-2006-1526.patch#1 add

Differences ...

==== //sgl/grimoires/stable/0.3/x11-libs/xorg/DETAILS#2 (xtext) ====

@@ -15,6 +15,7 @@
    SOURCE_URL[1]=ftp://ftp.x.org/pub/${XVERSION}/src-single/$SOURCE
           MD5[0]=207d5f0d3bf72cfb4fe2ad5b2b9d3322
      GCC_VERSION=3.4
+  SECURITY_PATCH=1
 fi
         WEB_SITE=http://xorg.freedesktop.org/
          ENTERED=20040407

==== //sgl/grimoires/stable/0.3/x11-libs/xorg/HISTORY#2 (text) ====

@@ -1,3 +1,8 @@
+2006-05-06 Arwed v. Merkatz <v.merkatz at gmx.net>
+	* PRE_BUILD, xorg-68x-CAN-2006-1526.patch: patch for CVE-2006-1525, see
+	  http://lists.freedesktop.org/archives/xorg/2006-May/015136.html
+	* DETAILS: SECURITY_PATCH=1, Bug #11752.
+
 2006-01-14 Arwed v. Merkatz <v.merkatz at gmx.net>
 	* PRE_BUILD, evdev-for-6.8.2.patch: removed patch as the fix doesn't
 	  seem to work

==== //sgl/grimoires/stable/0.3/x11-libs/xorg/PRE_BUILD#2 (xtext) ====

@@ -6,7 +6,8 @@
    patch -p0 < ${SCRIPT_DIRECTORY}/xpm-sec10.diff &&
    cd ${SOURCE_DIRECTORY} &&
    patch -p1 < ${SCRIPT_DIRECTORY}/xorg-x11-6.8.2-xft-releasefile-crash.patch &&
-   patch -p0 < ${SCRIPT_DIRECTORY}/CAN-2005-2495.patch
+   patch -p0 < ${SCRIPT_DIRECTORY}/CAN-2005-2495.patch  &&
+   patch -p0 < ${SCRIPT_DIRECTORY}/xorg-68x-CAN-2006-1526.patch
 fi &&
 
 cp  $SOURCE_DIRECTORY/config/cf/xorgsite.def  \



More information about the SM-Commit mailing list