xserver: Branch 'server-1.7-nominations' - 4 commits

[Peter Hutterer]

 configure.ac           |    6 +++---
 hw/xfree86/dri2/dri2.c |    2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

New commits:
commit 5b4fabb910eefb393eb3bfb45df5e63fdeb71f26
Author: Peter Hutterer <peter.hutterer at who-t.net>
Date:   Mon Mar 15 08:44:01 2010 +1000

    configure: restore SHA1_LIB for XSERVER_SYS_LIBS
    
    Accidentally removed in ff5fb43a4b38c707a, caused by
    a botched merge when cherry-picking 178da6534fe7ab4b99fb.
    
    Signed-off-by: Peter Hutterer <peter.hutterer at who-t.net>

diff --git a/configure.ac b/configure.ac
index 2046157..c215b5c 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1326,7 +1326,7 @@ PKG_CHECK_MODULES([XSERVERLIBS], [$REQUIRED_LIBS])
 #
 XSERVER_CFLAGS="${XSERVERCFLAGS_CFLAGS} ${SHA1_CFLAGS}"
 XSERVER_LIBS="$DIX_LIB $CONFIG_LIB $MI_LIB $OS_LIB"
-XSERVER_SYS_LIBS="${XSERVERLIBS_LIBS} ${SYS_LIBS} ${LIBS}"
+XSERVER_SYS_LIBS="${XSERVERLIBS_LIBS} ${SYS_LIBS} ${LIBS} ${SHA1_LIB}"
 AC_SUBST([XSERVER_LIBS])
 AC_SUBST([XSERVER_SYS_LIBS])
 
commit 5a2b3f36a05d1e0fcfd1b0f85d6584478ba24eda
Author: Peter Hutterer <peter.hutterer at who-t.net>
Date:   Fri Mar 12 16:53:06 2010 +1000

    xserver 1.7.5.902
    
    Signed-off-by: Peter Hutterer <peter.hutterer at who-t.net>

diff --git a/configure.ac b/configure.ac
index 9dca987..2046157 100644
--- a/configure.ac
+++ b/configure.ac
@@ -26,8 +26,8 @@ dnl
 dnl Process this file with autoconf to create configure.
 
 AC_PREREQ(2.57)
-AC_INIT([xorg-server], 1.7.5.901, [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], xorg-server)
-RELEASE_DATE="2010-03-05"
+AC_INIT([xorg-server], 1.7.5.902, [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], xorg-server)
+RELEASE_DATE="2010-03-12"
 AC_CONFIG_SRCDIR([Makefile.am])
 AM_INIT_AUTOMAKE([dist-bzip2 foreign])
 AM_MAINTAINER_MODE
commit c25b34fe61cb3fc7c3583a8ccf62c470cc8ead06
Merge: 3ae6a37... ff5fb43...
Author: Peter Hutterer <peter.hutterer at who-t.net>
Date:   Fri Mar 12 16:37:28 2010 +1000

    Merge branch 'server-1.7-nominations' into server-1.7-branch

commit 3ae6a3779d9040a4d7c3e1b7901117e24e0d3ecf
Author: Dave Airlie <airlied at redhat.com>
Date:   Wed Mar 10 16:07:09 2010 +1000

    dri2: return FALSE not BadValue.
    
    With 1.7 if you try and send a DRI2Connect with this value set
    to anything but 0, the server will segfault due to the strlen
    in the function this returns to, since BadValue != FALSE.
    
    Fixed via other work in 1.8.
    
    Signed-off-by: Dave Airlie <airlied at redhat.com>

diff --git a/hw/xfree86/dri2/dri2.c b/hw/xfree86/dri2/dri2.c
index d15ced1..1cc7b63 100644
--- a/hw/xfree86/dri2/dri2.c
+++ b/hw/xfree86/dri2/dri2.c
@@ -387,7 +387,7 @@ DRI2Connect(ScreenPtr pScreen, unsigned int driverType, int *fd,
 	return FALSE;
 
     if (driverType != DRI2DriverDRI)
-	return BadValue;
+	return FALSE;
 
     *fd = ds->fd;
     *driverName = ds->driverName;