sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

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

From: Perforce Review Daemon <p4review AT smee.org>
To: "Andrew Stitt" <a AT t.armory.com>, "Arjan Bouter" <abouter AT sourcemage.org>, "SM-Commit Daemon" <sm-commit AT lists.ibiblio.org>, "David Michael Leo Brown Jr." <dmlb2000 AT gmail.com>, "duane_malcolm" <d.malcolm AT auckland.ac.nz>, "Pieter Lenaerts" <e-type AT sourcemage.org>, "Robin Cook" <rcook AT wyrms.net>, "Seth Woolley" <seth AT swoolley.homeip.net>, "vladimir_marek" <vlmarek AT volny.cz>
Subject: [SM-Commit] PERFORCE change 78921 by Arwed von Merkatz for review
Date: Sat, 6 May 2006 14:00:01 +0100 (BST)

Change 78921 by arwed_von_merkatz@arwed-Otherland on 2006/05/06 13:58:45

security patch to stable-rc, bug #11752

Affected files ...

... //sgl/grimoires/stable-rc/0.4/x11-libs/xorg/DETAILS#3 integrate
... //sgl/grimoires/stable-rc/0.4/x11-libs/xorg/HISTORY#3 integrate
... //sgl/grimoires/stable-rc/0.4/x11-libs/xorg/PRE_BUILD#3 integrate
... //sgl/grimoires/stable-rc/0.4/x11-libs/xorg/x11r6.9.0-mitri.diff#1 branch

Differences ...

==== //sgl/grimoires/stable-rc/0.4/x11-libs/xorg/DETAILS#3 (xtext) ====

@@ -15,7 +15,7 @@
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

==== //sgl/grimoires/stable-rc/0.4/x11-libs/xorg/HISTORY#3 (text) ====

@@ -1,3 +1,8 @@
+2006-05-06 George Sherwood <george AT 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 AT 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

==== //sgl/grimoires/stable-rc/0.4/x11-libs/xorg/PRE_BUILD#3 (xtext) ====

@@ -3,7 +3,8 @@
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 \

[SM-Commit] PERFORCE change 78921 by Arwed von Merkatz for review, Perforce Review Daemon, 05/06/2006