[Lunar-commits] CVS: moonbase/zbeta/xfree86-beta BUILD, 1.2, 1.3 DETAILS, 1.1, 1.2 POST_INSTALL, 1.2, 1.3

Florin Braescu florin at lunar-linux.org
Thu Feb 19 20:04:49 GMT 2004 

Update of /var/cvs/lunar/moonbase/zbeta/xfree86-beta
In directory dbguin.lunar-linux.org:/tmp/cvs-serv27869

Modified Files:
	BUILD DETAILS POST_INSTALL 
Log Message:
update the module's patches. fixed the drm patch and added the freely available patch fontfile which is a security patch.

Index: BUILD
===================================================================
RCS file: /var/cvs/lunar/moonbase/zbeta/xfree86-beta/BUILD,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- BUILD	14 Feb 2004 05:25:00 -0000	1.2
+++ BUILD	19 Feb 2004 20:04:47 -0000	1.3
@@ -2,7 +2,7 @@
 
   DRM_DIR="programs/Xserver/hw/xfree86/os-support/linux/drm/kernel"
   DRM_DEST="/lib/modules/`uname -r`/kernel/drivers"
-  mkdir   -p                $DRM_DEST
+  mkdir   -p  $DRM_DEST
   cp          $DRM_DIR/*.o  $DRM_DEST  2>/dev/null
   depmod  -a
   true
@@ -21,7 +21,7 @@
     then
       sedit "/ HasFreetype2/d"                $CONFIG_CACHE/host.def
       sedit "/ BuildFreetype2Library/d"       $CONFIG_CACHE/host.def
-      sedit "/ Freetype2Dir/d"                 $CONFIG_CACHE/host.def
+      sedit "/ Freetype2Dir/d"                $CONFIG_CACHE/host.def
       echo "#define HasFreetype2              YES"  >> $CONFIG_CACHE/host.def
       echo "#define BuildFreetype2Library     NO"   >> $CONFIG_CACHE/host.def
       echo "#define Freetype2Dir              /usr" >> $CONFIG_CACHE/host.def
@@ -46,6 +46,7 @@
   export CPPFLAGS=`echo $CPPFLAGS | sed s/-ffast-math//`
 
   patch_it $SOURCE_CACHE/$SOURCE2 1 &&
+  patch_it $SOURCE_CACHE/$SOURCE3 1 &&
 
   if  module_installed  Linux-PAM
   then  echo  "#define  HasPam  YES"  >>  config/cf/site.def
@@ -63,33 +64,32 @@
   rm     -f /usr/X11R6/include/zconf.h  &&
   rm     -f /usr/X11R6/lib/libz.a       &&
 
-  if  [  !  -e                      /etc/skel/.xsession  ];  then
+  if  [ ! -e  /etc/skel/.xsession ];  then
     cp  $SCRIPT_DIRECTORY/xsession  /etc/skel/.xsession
   fi  &&
 
-  if  [  !  -e                    /usr/bin/X11  ];  then
-    ln      -sf   /usr/X11R6/bin  /usr/bin/X11
+  if  [ ! -e /usr/bin/X11 ];  then
+    ln -sf  /usr/X11R6/bin  /usr/bin/X11
   fi  &&
 
-  if  [  !  -e          /usr/X11  ];  then
-    ln      -sf  X11R6  /usr/X11
+  if  [ ! -e /usr/X11 ];  then
+    ln -sf  X11R6  /usr/X11
   fi  &&
 
-  if  [  !  -e                         /usr/include/X11  ];  then
-    ln      -sf  ../X11R6/include/X11  /usr/include/X11
+  if  [ ! -e /usr/include/X11 ];  then
+    ln -sf ../X11R6/include/X11  /usr/include/X11
   fi  &&
 
-  if  [  !  -e                     /usr/lib/X11  ];  then
-    ln      -sf  ../X11R6/lib/X11  /usr/lib/X11
+  if  [ ! -e /usr/lib/X11 ];  then
+    ln -sf ../X11R6/lib/X11  /usr/lib/X11
   fi  &&
 
-  if  [  !  -e                     /usr/lib/libMesaGLU.so ];  then
-    ln      -sf  /usr/X11R6/lib/libGLU.so.1.3 /usr/lib/libMesaGLU.so
+  if  [ ! -e /usr/lib/libMesaGLU.so ];  then
+    ln -sf /usr/X11R6/lib/libGLU.so.1.3  /usr/lib/libMesaGLU.so
   fi  &&
 
-  if  [  !  -e                /usr/X11R6/lib/libMesaGL.so ];  then
-    ln      -sf  /usr/X11R6/lib/libGL.so.1.2 /usr/X11R6/lib/libMesaGL.so
+  if  [ ! -e /usr/X11R6/lib/libMesaGL.so ];  then
+    ln -sf /usr/X11R6/lib/libGL.so.1.2  /usr/X11R6/lib/libMesaGL.so
   fi
 
-
 ) > $C_FIFO 2>&1

Index: DETAILS
===================================================================
RCS file: /var/cvs/lunar/moonbase/zbeta/xfree86-beta/DETAILS,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- DETAILS	14 Jan 2004 19:12:49 -0000	1.1
+++ DETAILS	19 Feb 2004 20:04:47 -0000	1.2
@@ -2,33 +2,37 @@
          VERSION=4.3.99.902
          SOURCE=XFree86-$VERSION.tar.bz2
          SOURCE2=XFree86-beta-drm.patch.bz2
+         SOURCE3=XFree86-beta-fontfile.patch.bz2
          FUZZY="off"
    SOURCE_DIRECTORY=$BUILD_DIRECTORY/xc
    SOURCE_URL[0]=ftp://ftp.xfree86.org/pub/XFree86/develsnaps/$SOURCE
   SOURCE2_URL[0]=$PATCH_URL/$SOURCE2
+  SOURCE3_URL[0]=$PATCH_URL/$SOURCE3
     SOURCE_VFY=md5:eec2d5e4b980ec73a7772b9362ed9021
+   SOURCE2_VFY=md5:b121d250dbaa7fcf996556d1ac34093f
+   SOURCE3_VFY=md5:e941780fc2fead4a4820b0e7dc49da7c
         WEB_SITE=http://www.xfree86.org
          ENTERED=20031203
-         UPDATED=20031221
+         UPDATED=20040219
         SHORT="xfree86 is a free implementation of the X Window System."
 
 cat << EOF
-  The XFree86 Project, Inc is an organisation which produces XFree86, a
-  freely redistributable open-source implementation of the X Window System
-  that runs on UNIX(R) and UNIX-like (like Linux, the BSDs, Mac OS X (aka
-  Darwin) and Solaris x86 series) operating systems and OS/2.
-  XFree86 is the underlying software that is between the hardware and
-  graphical user interface (aka gui) that people see and use. If you are
-  using KDE, GNOME, Enlightenment, Blackbox, AfterStep, twm or fvwm then
-  you are already using and running XFree86 as these run as our clients.
-  Traditionally, The XFree86 Project has focused on Intel x86-based
-  platforms, which is where the 86 in our name comes from, but our
-  current release supports other platforms like the Alpha, PowerPC, Sparc
-  and in-the-works MIPS CPU families.
-  Our goal at XFree86 is to have X run on every platform available,
-  including those we do not currently support, as the best windowing
-  system available on that platform.
+The XFree86 Project, Inc is an organisation which produces XFree86, a freely 
+redistributable open-source implementation of the X Window System that runs on 
+UNIX(R) and UNIX-like (like Linux, the BSDs, Mac OS X (aka Darwin) and Solaris 
+x86 series) operating systems and OS/2.
+XFree86 is the underlying software that is between the hardware and graphical 
+user interface (aka gui) that people see and use. If you are using KDE, GNOME, 
+Enlightenment, Blackbox, AfterStep, twm or fvwm then you are already using and 
+running XFree86 as these run as our clients.
+Traditionally, The XFree86 Project has focused on Intel x86-based platforms, 
+which is where the 86 in our name comes from, but our current release supports 
+other platforms like the Alpha, PowerPC, Sparc and in-the-works MIPS CPU 
+families.
+Our goal at XFree86 is to have X run on every platform available, including 
+those we do not currently support, as the best windowing system available on 
+that platform.
 
-  This is a developement snapshot for testing purposes. It can be compiled 
-  under linux-test kernels, with kernel-headers for that kernels too.
+This is a developement snapshot for testing purposes. It can be compiled under 
+linux-test kernels, with kernel-headers for that kernels too.
 EOF

Index: POST_INSTALL
===================================================================
RCS file: /var/cvs/lunar/moonbase/zbeta/xfree86-beta/POST_INSTALL,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- POST_INSTALL	14 Feb 2004 05:42:03 -0000	1.2
+++ POST_INSTALL	19 Feb 2004 20:04:47 -0000	1.3
@@ -30,6 +30,6 @@
 # running fc-cache please be patient
 /usr/X11R6/bin/fc-cache -f 
 
-if !module_installed xserver; then
+if ! module_installed xserver; then
   lin xserver
 fi

More information about the Lunar-commits mailing list