[Lunar-commits] xorg-server: security patches merged to one official v2

[Zbigniew Luszpinski]

commit 7e7ef75936457576c91e03b293faf0f0273eda2e
Author: Zbigniew Luszpinski <zbiggy at lunar-linux.org>
Date:   Wed Jan 30 15:38:27 2008 +0100

    xorg-server: security patches merged to one official v2
    v2 fixes regression bug of patch v1.
    This is official fix.
---
 xorg7/xorg-server/BUILD   |    1 -
 xorg7/xorg-server/DETAILS |    9 +++------
 2 files changed, 3 insertions(+), 7 deletions(-)

diff --git a/xorg7/xorg-server/BUILD b/xorg7/xorg-server/BUILD
index 1c0ba3f..7e9f3d5 100644
--- a/xorg7/xorg-server/BUILD
+++ b/xorg7/xorg-server/BUILD
@@ -4,7 +4,6 @@
 
   patch_it $SOURCE3 1 &&
   patch_it $SOURCE4 1 &&
-  patch_it $SOURCE5 1 &&
 
   if [ -h /usr/share/X11/xkb/compiled ]; then
     rm -f /usr/share/X11/xkb/compiled
diff --git a/xorg7/xorg-server/DETAILS b/xorg7/xorg-server/DETAILS
index 5d1763d..a225719 100644
--- a/xorg7/xorg-server/DETAILS
+++ b/xorg7/xorg-server/DETAILS
@@ -4,18 +4,15 @@
           SOURCE=$MODULE-$VERSION.tar.bz2
          SOURCE2=MesaLib-${MESA_VERSION}.tar.bz2
          SOURCE3=$MODULE-$VERSION-xkbleds.patch
-         SOURCE4=$MODULE-$VERSION-multiple-overflows.diff
-         SOURCE5=$MODULE-$VERSION-dont-reject-8bpp-shm-pix.patch
+         SOURCE4=xorg-xserver-$VERSION-multiple-overflows-v2.diff
       SOURCE_URL=$XORG_URL/individual/xserver/
      SOURCE2_URL=$SFORGE_URL/mesa3d
      SOURCE3_URL=$PATCH_URL
-     SOURCE4_URL=$PATCH_URL
-     SOURCE5_URL=$PATCH_URL
+     SOURCE4_URL=$XORG_URL/X11R7.3/patches/
       SOURCE_VFY=sha1:3aa6327f4def4d33ce2a8d6d7587295db231ab6d
      SOURCE2_VFY=sha1:deb1002cf377ba8bd9407bd3cf573f8c8be31671
      SOURCE3_VFY=sha1:3955adfae52793f913063affb844d84d2fea1491
-     SOURCE4_VFY=sha1:b3c9013aa6abc30fabd8f6a85e427f5fd6e6ef6c
-     SOURCE5_VFY=sha1:d2d3666ac30bc5b541b8bf30fe5de157dbb79c9a
+     SOURCE4_VFY=sha1:af92fd389e72a3bb59d25dbf9cbb06e827b75d7d
    MODULE_PREFIX=${X11R7_PREFIX:-/usr}
         WEB_SITE=http://www.x.org/
          ENTERED=20060120