[Lunar-commits] r22894 - in moonbase/trunk/xorg7: x11-apps/xinit x11-libs/xtrans xorg-server

[Auke Kok]

Author: sofar
Date: 2007-01-10 17:56:40 +0100 (Wed, 10 Jan 2007)
New Revision: 22894

Modified:
   moonbase/trunk/xorg7/x11-apps/xinit/BUILD
   moonbase/trunk/xorg7/x11-apps/xinit/DETAILS
   moonbase/trunk/xorg7/x11-libs/xtrans/BUILD
   moonbase/trunk/xorg7/x11-libs/xtrans/DETAILS
   moonbase/trunk/xorg7/xorg-server/BUILD
   moonbase/trunk/xorg7/xorg-server/DETAILS
Log:
Merged 3 security fixes to X.org, thanks zbigniew.


Modified: moonbase/trunk/xorg7/x11-apps/xinit/BUILD
===================================================================
--- moonbase/trunk/xorg7/x11-apps/xinit/BUILD	2007-01-10 01:24:09 UTC (rev 22893)
+++ moonbase/trunk/xorg7/x11-apps/xinit/BUILD	2007-01-10 16:56:40 UTC (rev 22894)
@@ -1,6 +1,8 @@
 (
   . /etc/profile.d/x11r7.rc &&
 
+  patch_it "$SOURCE2" 0 &&
+
   default_build
 
 ) > $C_FIFO 2>&1

Modified: moonbase/trunk/xorg7/x11-apps/xinit/DETAILS
===================================================================
--- moonbase/trunk/xorg7/x11-apps/xinit/DETAILS	2007-01-10 01:24:09 UTC (rev 22893)
+++ moonbase/trunk/xorg7/x11-apps/xinit/DETAILS	2007-01-10 16:56:40 UTC (rev 22894)
@@ -3,13 +3,13 @@
           SOURCE=$MODULE-$VERSION.tar.bz2
          SOURCE2=$MODULE-1.0.2-setuid.diff
       SOURCE_URL=$XORG_URL/X11R7.1/src/everything/
-     SOURCE2_URL=$XORG_URL/X11R7.1/patches			
+     SOURCE2_URL=$XORG_URL/X11R7.1/patches/
       SOURCE_VFY=sha1:c6b1208e5cd180f565006313b3bdbc5b880700e0
      SOURCE2_VFY=sha1:816fa2fea8dbc1479ed594dace6281538de5e0ad
    MODULE_PREFIX=${X11R7_PREFIX:-/usr}
         WEB_SITE=http://www.x.org/
          ENTERED=20060120
-         UPDATED=20060918
+         UPDATED=20070108
            SHORT="the X.Org server initialization tool"
 
 cat << EOF

Modified: moonbase/trunk/xorg7/x11-libs/xtrans/BUILD
===================================================================
--- moonbase/trunk/xorg7/x11-libs/xtrans/BUILD	2007-01-10 01:24:09 UTC (rev 22893)
+++ moonbase/trunk/xorg7/x11-libs/xtrans/BUILD	2007-01-10 16:56:40 UTC (rev 22894)
@@ -1,6 +1,9 @@
 (
+
   . /etc/profile.d/x11r7.rc &&
 
+  patch_it "$SOURCE2" 0 &&
+
   default_build
 
 ) > $C_FIFO 2>&1

Modified: moonbase/trunk/xorg7/x11-libs/xtrans/DETAILS
===================================================================
--- moonbase/trunk/xorg7/x11-libs/xtrans/DETAILS	2007-01-10 01:24:09 UTC (rev 22893)
+++ moonbase/trunk/xorg7/x11-libs/xtrans/DETAILS	2007-01-10 16:56:40 UTC (rev 22894)
@@ -1,12 +1,15 @@
           MODULE=xtrans
          VERSION=X11R7.0-1.0.0
           SOURCE=$MODULE-$VERSION.tar.bz2
+         SOURCE2=$MODULE-1.0.0-setuid.diff
       SOURCE_URL=$XORG_URL/X11R7.0/src/lib/
+     SOURCE2_URL=$XORG_URL/X11R7.1/patches/
       SOURCE_VFY=sha1:a3ed9e277f5a5539cd466964ebabe402e29943a2
+     SOURCE2_VFY=sha1:82b913fe5ec96fd55afb8356ae338b90ed0f179b
    MODULE_PREFIX=${X11R7_PREFIX:-/usr}
         WEB_SITE=http://www.x.org/
          ENTERED=20060120
-         UPDATED=20060120
+         UPDATED=20070108
            SHORT="the X.Org transport library"
 
 cat << EOF

Modified: moonbase/trunk/xorg7/xorg-server/BUILD
===================================================================
--- moonbase/trunk/xorg7/xorg-server/BUILD	2007-01-10 01:24:09 UTC (rev 22893)
+++ moonbase/trunk/xorg7/xorg-server/BUILD	2007-01-10 16:56:40 UTC (rev 22894)
@@ -1,14 +1,16 @@
 (
+
   . /etc/profile.d/x11r7.rc &&
-  
-  patch_it $SOURCE3 1 &&
 
+  patch_it $SOURCE3 0 &&
+  patch_it $SOURCE4 1 &&
+
   if [[ "$USE_NVIDIA" = "y" ]]; then
     OPTS="$OPTS --disable-glx --disable-glx-tlx";
   fi &&
 
   OPTS+="--enable-composite --enable-aiglx \
-	 --with-mesa-source=${SOURCE_DIRECTORY}/Mesa-${MESA_VERSION}" &&
+         --with-mesa-source=${SOURCE_DIRECTORY}/Mesa-${MESA_VERSION}" &&
 
   default_build
 

Modified: moonbase/trunk/xorg7/xorg-server/DETAILS
===================================================================
--- moonbase/trunk/xorg7/xorg-server/DETAILS	2007-01-10 01:24:09 UTC (rev 22893)
+++ moonbase/trunk/xorg7/xorg-server/DETAILS	2007-01-10 16:56:40 UTC (rev 22894)
@@ -1,19 +1,22 @@
           MODULE=xorg-server
          VERSION=X11R7.1-1.1.0
-    MESA_VERSION=6.5
+    MESA_VERSION=6.5.2
           SOURCE=$MODULE-$VERSION.tar.bz2
          SOURCE2=MesaLib-${MESA_VERSION}.tar.bz2
-         SOURCE3=$MODULE-1.1.0-grabkeys.patch
+         SOURCE3=$MODULE-1.1.0-setuid.diff
+         SOURCE4=$MODULE-1.1.0-grabkeys.patch
       SOURCE_URL=$XORG_URL/X11R7.1/src/xserver/
      SOURCE2_URL=$SFORGE_URL/mesa3d/
-     SOURCE3_URL=$PATCH_URL
+     SOURCE3_URL=$XORG_URL/X11R7.1/patches/
+     SOURCE4_URL=$PATCH_URL
       SOURCE_VFY=sha1:959c66376f4468b60aa288d5153b823499596eb3 
-     SOURCE2_VFY=sha1:a77368901b0731b662d0858aef2c405a7ddf6014
-     SOURCE3_VFY=sha1:c9df6f85ba7070decd7794c40027e91f673677a6
+     SOURCE2_VFY=sha1:ba860bb6ee57c02202342dfd5927464a068ea18f
+     SOURCE3_VFY=sha1:e72b50c6434d429abaf0c13d9e78e1d467579fe9
+     SOURCE4_VFY=sha1:c9df6f85ba7070decd7794c40027e91f673677a6
    MODULE_PREFIX=${X11R7_PREFIX:-/usr}
         WEB_SITE=http://www.x.org/
          ENTERED=20060120
-         UPDATED=20060523
+         UPDATED=20070107
            SHORT="The X.Org X11R7 server for the X Window System"
 
 cat << EOF