Source Mage code commit list

[Treeve Jelbert <scm AT sourcemage.org>]

GIT changes to devel-xorg-modular grimoire by Treeve Jelbert 
<treeve AT sourcemage.org>:

 xorg-xserver/xorg-server/BUILD   |    2 +-
 xorg-xserver/xorg-server/DEPENDS |   17 +++++++++--------
 xorg-xserver/xorg-server/DETAILS |    6 +++---
 xorg-xserver/xorg-server/HISTORY |    9 +++++++++
 4 files changed, 22 insertions(+), 12 deletions(-)

New commits:
commit 33c5d180a56517703a3a072389598e46bef8d3ef
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Treeve Jelbert <treeve AT sourcemage.org>

    xorg-server: => 1.11.2

diff --git a/xorg-xserver/xorg-server/BUILD b/xorg-xserver/xorg-server/BUILD
index ce19cdf..f52d7f6 100755
--- a/xorg-xserver/xorg-server/BUILD
+++ b/xorg-xserver/xorg-server/BUILD
@@ -16,7 +16,7 @@ OPTS="${XORG_SERVER_OPTS}                                   
  \
       --with-xkb-output=$TRACK_ROOT/var/lib/xkb               \
       --with-dri-driver-path=$TRACK_ROOT/usr/lib/dri          \
       --with-fontrootdir=${TRACK_ROOT}/usr/share/fonts/X11    \
-      --disable-dmx                                           \
+      --disable-secure-rpc                                    \
       --disable-xwin                                          \
       --enable-dbe                                            \
       ${OPTS}"                                                &&
diff --git a/xorg-xserver/xorg-server/DEPENDS 
b/xorg-xserver/xorg-server/DEPENDS
index c081a4c..f89ab87 100755
--- a/xorg-xserver/xorg-server/DEPENDS
+++ b/xorg-xserver/xorg-server/DEPENDS
@@ -17,8 +17,8 @@ else
 fi                                                 &&
 ##
 optional_depends  libselinux                       \
-                  "--enable-xselinux"              \
-                  "--disable-xselinux"             \
+                  ""              \
+                  ""             \
                   "Enable SELinux support"         &&
 optional_depends  dri2proto                        \
                   "--enable-dri2"                  \
@@ -63,11 +63,13 @@ if ! is_depends_enabled $SPELL hal; then
     "enable udev kernel config support"
 fi &&
 
-#optional_depends  libdmx                           \
-#                  "--enable-dmx"                   \
-#                  "--disable-dmx"                  \
-#                  "Build DMX server"               &&
-# apparently now needed forcing/or breaks way to much
+optional_depends  dmxproto                           \
+                  "--enable-dmx"                   \
+                  "--disable-dmx"                  \
+                  "Build DMX server"               &&
+if is_depends_enabled $SPELL dmxproto;then
+  depends  libdmx
+fi &&
 depends  freetype2                                 &&
 depends  libxfontcache                             &&
 depends  libxxf86dga "--enable-dga"                &&
@@ -85,7 +87,6 @@ depends  pixman                                    &&
 simple_version_check_force_depends pixman 160 3    &&
 depends  compositeproto                            &&
 depends  damageproto                               &&
-depends  dmxproto                                  &&
 depends  evieext                                   &&
 depends  fixesproto                                &&
 depends  fontcacheproto                            &&
diff --git a/xorg-xserver/xorg-server/DETAILS 
b/xorg-xserver/xorg-server/DETAILS
index 6506af4..b37b218 100755
--- a/xorg-xserver/xorg-server/DETAILS
+++ b/xorg-xserver/xorg-server/DETAILS
@@ -1,6 +1,6 @@
             SPELL=xorg-server
-          VERSION=1.11.1
-      
SOURCE_HASH=sha512:84fd972352807974964c38e40bfc1564b9755774a679cc7e688ffc42e834355ee1bdeeaddd8e7df9bfa228e1a5e187534d67c3aa95381e4e662f8271e32ddb7f
+          VERSION=1.11.2
+      
SOURCE_HASH=sha512:1d8d39d0f3e91205fdee33ab52d66aadaca7d4780ece622d947735a98de14e1983be9ff737e4e3678236a67f398145e5ff582407252384bbd5ef30b9c385b07f
            SOURCE=$SPELL-$VERSION.tar.bz2
 #       SOURCE_GPG="gurus.gpg:$SOURCE.sig:UPSTREAM_HASH"
     
SOURCE_URL[0]=http://xorg.freedesktop.org/releases/individual/xserver/$SOURCE
@@ -8,7 +8,7 @@
          WEB_SITE=http://xorg.freedesktop.org/
           ENTERED=20051125
        LICENSE[0]=XCL
-   SECURITY_PATCH=4
+   SECURITY_PATCH=5
        PATCHLEVEL=0
             SHORT="X servers (including Xorg, Xprt, Xvfb, Xnest & Xdmx)"
 cat << EOF
diff --git a/xorg-xserver/xorg-server/HISTORY 
b/xorg-xserver/xorg-server/HISTORY
index 0270ef8..a0a24af 100644
--- a/xorg-xserver/xorg-server/HISTORY
+++ b/xorg-xserver/xorg-server/HISTORY
@@ -1,3 +1,12 @@
+2011-11-05 Treeve Jelbert <treeve AT sourcemage.org>
+       * DETAILS: 1.11.2
+         SECURITY_PATCH=5
+         CVE-2011-4028: File disclosure vulnerability
+         CVE-2011-4029: File permission change vulnerability
+       * DEPENDS: if dmxproto is present, also need libdmx
+         option for libselinux is now xcsecurity, but does not work
+       * BUILD: force disable-secure-rpc
+         
 2011-09-24 Treeve Jelbert <treeve AT sourcemage.org>
        * DETAILS: 1.11.1