--- a/open-src/xserver/xorg/xtsol.patch Mon May 09 10:12:33 2011 -0700
+++ b/open-src/xserver/xorg/xtsol.patch Mon May 09 14:58:28 2011 -0700
@@ -19,9 +19,10 @@
# FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
# DEALINGS IN THE SOFTWARE.
-diff -Nurp -x '*~' -x '*.orig' Makefile.am Makefile.am
---- Makefile.am 2011-02-15 15:53:19.157650482 -0800
-+++ Makefile.am 2011-02-15 15:53:21.258518321 -0800
+diff --git a/Makefile.am b/Makefile.am
+index 4d2e2ca..e14a6e3 100644
+--- a/Makefile.am
++++ b/Makefile.am
@@ -17,6 +17,10 @@ if RECORD
RECORD_DIR=record
endif
@@ -41,10 +42,11 @@
exa \
config \
hw \
-diff -Nurp -x '*~' -x '*.orig' Xext/security.c Xext/security.c
---- Xext/security.c 2010-06-10 23:10:22.000000000 -0700
-+++ Xext/security.c 2011-02-15 15:53:21.258912860 -0800
-@@ -1146,3 +1146,27 @@ SecurityExtensionInit(INITARGS)
+diff --git a/Xext/security.c b/Xext/security.c
+index 8673880..14bb5cd 100644
+--- a/Xext/security.c
++++ b/Xext/security.c
+@@ -1144,3 +1144,27 @@ SecurityExtensionInit(INITARGS)
/* Label objects that were created before we could register ourself */
SecurityLabelInitial();
}
@@ -72,9 +74,10 @@
+
+ return oldLevel;
+}
-diff -Nurp -x '*~' -x '*.orig' Xext/securitysrv.h Xext/securitysrv.h
---- Xext/securitysrv.h 2009-09-27 18:56:58.000000000 -0700
-+++ Xext/securitysrv.h 2011-02-15 15:53:21.259073802 -0800
+diff --git a/Xext/securitysrv.h b/Xext/securitysrv.h
+index 3d3894a..8b7317f 100644
+--- a/Xext/securitysrv.h
++++ b/Xext/securitysrv.h
@@ -80,4 +80,8 @@ typedef struct {
/* Give this value or higher to the -audit option to get security messages */
#define SECURITY_AUDIT_LEVEL 4
@@ -84,10 +87,11 @@
+extern _X_EXPORT unsigned int setClientTrustLevel(ClientPtr client, unsigned int newLevel);
+
#endif /* _SECURITY_SRV_H */
-diff -Nurp -x '*~' -x '*.orig' configure.ac configure.ac
---- configure.ac 2011-02-15 15:53:19.158803446 -0800
-+++ configure.ac 2011-02-15 15:53:21.259892485 -0800
-@@ -231,6 +231,14 @@ dnl Find the math libary
+diff --git a/configure.ac b/configure.ac
+index f4311c3..69057ec 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -227,6 +227,14 @@ dnl Find the math libary
AC_CHECK_LIB(m, sqrt)
AC_CHECK_LIB(m, cbrt, AC_DEFINE(HAVE_CBRT, 1, [Have the 'cbrt' function]))
@@ -102,48 +106,49 @@
AC_CHECK_HEADERS([ndbm.h dbm.h rpcsvc/dbm.h])
dnl AGPGART headers
-@@ -1515,6 +1523,8 @@ AM_CONDITIONAL(XVFB, [test "x$XVFB" = xy
+@@ -1501,6 +1509,8 @@ AM_CONDITIONAL(XVFB, [test "x$XVFB" = xyes])
if test "x$XVFB" = xyes; then
- XVFB_LIBS="$FB_LIB $FIXES_LIB $XEXT_LIB $DBE_LIB $RECORD_LIB $GLX_LIBS $RANDR_LIB $RENDER_LIB $DAMAGE_LIB $MIEXT_DAMAGE_LIB $MIEXT_SHADOW_LIB $XI_LIB $XKB_LIB $XKB_STUB_LIB $COMPOSITE_LIB"
+ XVFB_LIBS="$FB_LIB $FIXES_LIB $XEXT_LIB $DBE_LIB $RECORD_LIB $GLX_LIBS $RANDR_LIB $RENDER_LIB $DAMAGE_LIB $MIEXT_SYNC_LIB $MIEXT_DAMAGE_LIB $MIEXT_SHADOW_LIB $XI_LIB $XKB_LIB $XKB_STUB_LIB $COMPOSITE_LIB"
XVFB_SYS_LIBS="$XVFBMODULES_LIBS $GLX_SYS_LIBS"
+ XVFB_LIBS="$XVFB_LIBS $TSOL_LIB"
+ XVFB_SYS_LIBS="$XVFB_SYS_LIBS $TSOL_SYS_LIBS"
AC_SUBST([XVFB_LIBS])
AC_SUBST([XVFB_SYS_LIBS])
fi
-@@ -1536,6 +1546,8 @@ if test "x$XNEST" = xyes; then
+@@ -1522,6 +1532,8 @@ if test "x$XNEST" = xyes; then
fi
- XNEST_LIBS="$FB_LIB $FIXES_LIB $MI_LIB $XEXT_LIB $DBE_LIB $RECORD_LIB $GLX_LIBS $RANDR_LIB $RENDER_LIB $DAMAGE_LIB $MIEXT_DAMAGE_LIB $MIEXT_SHADOW_LIB $XI_LIB $XKB_LIB $XKB_STUB_LIB $COMPOSITE_LIB $DIX_LIB $MAIN_LIB $OS_LIB"
+ XNEST_LIBS="$FB_LIB $FIXES_LIB $MI_LIB $XEXT_LIB $DBE_LIB $RECORD_LIB $GLX_LIBS $RANDR_LIB $RENDER_LIB $DAMAGE_LIB $MIEXT_SYNC_LIB $MIEXT_DAMAGE_LIB $MIEXT_SHADOW_LIB $XI_LIB $XKB_LIB $XKB_STUB_LIB $COMPOSITE_LIB $DIX_LIB $MAIN_LIB $OS_LIB"
XNEST_SYS_LIBS="$XNESTMODULES_LIBS $GLX_SYS_LIBS"
+ XNEST_LIBS="$XNEST_LIBS $TSOL_LIB"
+ XNEST_SYS_LIBS="$XNEST_SYS_LIBS $TSOL_SYS_LIBS"
AC_SUBST([XNEST_LIBS])
AC_SUBST([XNEST_SYS_LIBS])
fi
-@@ -2100,6 +2112,7 @@ if test "$KDRIVE" = yes; then
+@@ -2086,6 +2098,7 @@ if test "$KDRIVE" = yes; then
KDRIVE_CFLAGS="$XSERVER_CFLAGS -DHAVE_KDRIVE_CONFIG_H $TSLIB_CFLAGS"
- KDRIVE_PURE_LIBS="$FB_LIB $MI_LIB $FIXES_LIB $XEXT_LIB $DBE_LIB $RECORD_LIB $GLX_LIBS $RANDR_LIB $RENDER_LIB $DAMAGE_LIB $MIEXT_DAMAGE_LIB $MIEXT_SHADOW_LIB $XI_LIB $XKB_LIB $XKB_STUB_LIB $COMPOSITE_LIB $OS_LIB"
+ KDRIVE_PURE_LIBS="$FB_LIB $MI_LIB $FIXES_LIB $XEXT_LIB $DBE_LIB $RECORD_LIB $GLX_LIBS $RANDR_LIB $RENDER_LIB $DAMAGE_LIB $MIEXT_SYNC_LIB $MIEXT_DAMAGE_LIB $MIEXT_SHADOW_LIB $XI_LIB $XKB_LIB $XKB_STUB_LIB $COMPOSITE_LIB $OS_LIB"
+ KDRIVE_PURE_LIBS="$KDRIVE_PURE_LIBS $TSOL_LIB"
KDRIVE_LIB='$(top_builddir)/hw/kdrive/src/libkdrive.la'
case $host_os in
*linux*)
-@@ -2280,3 +2293,6 @@ xorg-server.pc
+@@ -2277,3 +2290,6 @@ xorg-server.pc
# Add Sun IA extension
AC_OUTPUT([IA/Makefile])
+
+# Add Sun Trusted Extensions extension
+AC_OUTPUT([tsol/Makefile])
-diff -Nurp -x '*~' -x '*.orig' dix/dispatch.c dix/dispatch.c
---- dix/dispatch.c 2010-06-10 23:10:22.000000000 -0700
-+++ dix/dispatch.c 2011-02-15 15:53:21.260755445 -0800
+diff --git a/dix/dispatch.c b/dix/dispatch.c
+index 7b2132d..63a2378 100644
+--- a/dix/dispatch.c
++++ b/dix/dispatch.c
@@ -74,8 +74,8 @@ Equipment Corporation.
******************************************************************/
-/* XSERVER_DTRACE additions:
-- * Copyright 2005-2006 Sun Microsystems, Inc. All rights reserved.
+- * Copyright (c) 2005-2006, Oracle and/or its affiliates. All rights reserved.
+/*
+ * Copyright (c) 2005, 2006, Oracle and/or its affiliates. All rights reserved.
*
@@ -160,7 +165,7 @@
static int nextFreeClientID; /* always MIN free client ID */
static int nClients; /* number of authorized clients */
-@@ -897,7 +901,12 @@ ProcCirculateWindow(ClientPtr client)
+@@ -896,7 +900,12 @@ ProcCirculateWindow(ClientPtr client)
return Success;
}
@@ -174,7 +179,7 @@
GetGeometry(ClientPtr client, xGetGeometryReply *rep)
{
DrawablePtr pDraw;
-@@ -2000,7 +2009,12 @@ ProcPutImage(ClientPtr client)
+@@ -1990,7 +1999,12 @@ ProcPutImage(ClientPtr client)
return Success;
}
@@ -188,49 +193,10 @@
DoGetImage(ClientPtr client, int format, Drawable drawable,
int x, int y, int width, int height,
Mask planemask, xGetImageReply **im_return)
-diff -Nurp -x '*~' -x '*.orig' dix/events.c dix/events.c
---- dix/events.c 2010-12-02 12:16:53.000000000 -0800
-+++ dix/events.c 2011-02-15 15:53:21.262022757 -0800
-@@ -75,7 +75,7 @@ Equipment Corporation.
- ******************************************************************/
-
- /*
-- * Copyright © 2003-2005 Sun Microsystems, Inc. All rights reserved.
-+ * Copyright (c) 2003-2005, 2007, Oracle and/or its affiliates. All rights reserved.
- *
- * Permission is hereby granted, free of charge, to any person obtaining a
- * copy of this software and associated documentation files (the "Software"),
-@@ -334,7 +334,12 @@ IsMaster(DeviceIntPtr dev)
- return dev->type == MASTER_POINTER || dev->type == MASTER_KEYBOARD;
- }
-
--static WindowPtr XYToWindow(
-+#ifdef TSOL
-+_X_EXPORT
-+#else
-+static
-+#endif
-+WindowPtr XYToWindow(
- DeviceIntPtr pDev,
- int x,
- int y
-@@ -2583,7 +2588,12 @@ PointInBorderSize(WindowPtr pWin, int x,
- *
- * @returns the window at the given coordinates.
- */
--static WindowPtr
-+#ifdef TSOL
-+_X_EXPORT
-+#else
-+static
-+#endif
-+WindowPtr
- XYToWindow(DeviceIntPtr pDev, int x, int y)
- {
- WindowPtr pWin;
-diff -Nurp -x '*~' -x '*.orig' dix/window.c dix/window.c
---- dix/window.c 2010-11-09 22:26:52.000000000 -0800
-+++ dix/window.c 2011-02-15 15:53:21.262869239 -0800
+diff --git a/dix/window.c b/dix/window.c
+index 9be7064..25f1a52 100644
+--- a/dix/window.c
++++ b/dix/window.c
@@ -97,6 +97,33 @@ Equipment Corporation.
******************************************************************/
@@ -265,7 +231,7 @@
#ifdef HAVE_DIX_CONFIG_H
#include <dix-config.h>
-@@ -173,6 +200,11 @@ static Bool TileScreenSaver(ScreenPtr pS
+@@ -175,6 +202,11 @@ static Bool TileScreenSaver(ScreenPtr pScreen, int kind);
#define SubStrSend(pWin,pParent) (StrSend(pWin) || SubSend(pParent))
@@ -277,7 +243,7 @@
#ifdef DEBUG
/******
* PrintWindowTree
-@@ -1805,7 +1837,12 @@ IsSiblingAboveMe(
+@@ -1835,7 +1867,12 @@ IsSiblingAboveMe(
return Below;
}
@@ -291,7 +257,7 @@
WindowExtents(
WindowPtr pWin,
BoxPtr pBox)
-@@ -1835,7 +1872,12 @@ MakeBoundingRegion (
+@@ -1865,7 +1902,12 @@ MakeBoundingRegion (
return pRgn;
}
@@ -305,7 +271,7 @@
ShapeOverlap (
WindowPtr pWin,
BoxPtr pWinBox,
-@@ -2035,7 +2077,12 @@ WhereDoIGoInTheStack(
+@@ -2065,7 +2107,12 @@ WhereDoIGoInTheStack(
}
}
@@ -319,10 +285,11 @@
ReflectStackChange(
WindowPtr pWin,
WindowPtr pSib,
-diff -Nurp -x '*~' -x '*.orig' hw/xfree86/common/xf86Config.c hw/xfree86/common/xf86Config.c
---- hw/xfree86/common/xf86Config.c 2011-02-15 15:53:19.159630285 -0800
-+++ hw/xfree86/common/xf86Config.c 2011-02-15 15:53:21.263463226 -0800
-@@ -127,6 +127,7 @@ static ModuleDefault ModuleDefaults[] =
+diff --git a/hw/xfree86/common/xf86Config.c b/hw/xfree86/common/xf86Config.c
+index 21bfe0b..7c548eb 100644
+--- a/hw/xfree86/common/xf86Config.c
++++ b/hw/xfree86/common/xf86Config.c
+@@ -126,6 +126,7 @@ static ModuleDefault ModuleDefaults[] = {
{.name = "dri2", .toLoad = TRUE, .load_opt=NULL},
#endif
{.name = "ia", .toLoad = TRUE, .load_opt=NULL},
@@ -330,10 +297,11 @@
{.name = NULL, .toLoad = FALSE, .load_opt=NULL}
};
-diff -Nurp -x '*~' -x '*.orig' hw/xfree86/dixmods/Makefile.am hw/xfree86/dixmods/Makefile.am
---- hw/xfree86/dixmods/Makefile.am 2011-02-15 15:53:19.159921744 -0800
-+++ hw/xfree86/dixmods/Makefile.am 2011-02-15 15:53:21.263627438 -0800
-@@ -74,3 +74,11 @@ libia_la_CPPFLAGS = $(AM_CPPFLAGS) -I$(t
+diff --git a/hw/xfree86/dixmods/Makefile.am b/hw/xfree86/dixmods/Makefile.am
+index ea065fa..5e5725e 100644
+--- a/hw/xfree86/dixmods/Makefile.am
++++ b/hw/xfree86/dixmods/Makefile.am
+@@ -74,3 +74,11 @@ libia_la_CPPFLAGS = $(AM_CPPFLAGS) -I$(top_builddir)/IA
libia_la_LDFLAGS = -avoid-version
libia_la_LIBADD = $(top_builddir)/IA/libIA.la
libia_la_SOURCES = iamodule.c
@@ -345,10 +313,11 @@
+libxtsol_la_LIBADD = $(top_builddir)/tsol/libxtsol.la
+libxtsol_la_SOURCES = tsolmodule.c
+endif
-diff -Nurp -x '*~' -x '*.orig' include/dix.h include/dix.h
---- include/dix.h 2010-06-10 23:10:22.000000000 -0700
-+++ include/dix.h 2011-02-15 15:53:21.263857126 -0800
-@@ -172,6 +172,15 @@ extern _X_EXPORT void MarkClientExceptio
+diff --git a/include/dix.h b/include/dix.h
+index 12e4b59..50c20ed 100644
+--- a/include/dix.h
++++ b/include/dix.h
+@@ -172,6 +172,15 @@ extern _X_EXPORT void MarkClientException(
ClientPtr /*client*/);
extern _X_HIDDEN Bool CreateConnectionBlock(void);
@@ -364,21 +333,10 @@
/* dixutils.c */
extern _X_EXPORT int CompareISOLatin1Lowered(
-diff -Nurp -x '*~' -x '*.orig' include/dixevents.h include/dixevents.h
---- include/dixevents.h 2009-09-27 18:57:02.000000000 -0700
-+++ include/dixevents.h 2011-02-15 15:53:21.264009881 -0800
-@@ -88,4 +88,8 @@ extern _X_EXPORT void PostSyntheticMotio
- unsigned long time);
- #endif
-
-+#ifdef TSOL
-+extern _X_EXPORT WindowPtr XYToWindow(DeviceIntPtr pDev, int x, int y);
-+#endif
-+
- #endif /* DIXEVENTS_H */
-diff -Nurp -x '*~' -x '*.orig' include/extnsionst.h include/extnsionst.h
---- include/extnsionst.h 2010-05-23 00:30:24.000000000 -0700
-+++ include/extnsionst.h 2011-02-15 15:53:21.264213101 -0800
+diff --git a/include/extnsionst.h b/include/extnsionst.h
+index bb66dfb..3a51180 100644
+--- a/include/extnsionst.h
++++ b/include/extnsionst.h
@@ -45,6 +45,34 @@ SOFTWARE.
******************************************************************/
@@ -447,10 +405,11 @@
+
#endif /* EXTENSIONSTRUCT_H */
-diff -Nurp -x '*~' -x '*.orig' include/input.h include/input.h
---- include/input.h 2010-08-13 01:02:40.000000000 -0700
-+++ include/input.h 2011-02-15 15:53:21.264443755 -0800
-@@ -406,7 +406,7 @@ extern void NoteLedState(
+diff --git a/include/input.h b/include/input.h
+index f96a0a9..89ab1bf 100644
+--- a/include/input.h
++++ b/include/input.h
+@@ -403,7 +403,7 @@ extern void NoteLedState(
int /*led*/,
Bool /*on*/);
@@ -459,10 +418,11 @@
DeviceIntPtr /*device*/,
ClientPtr /*client*/);
-diff -Nurp -x '*~' -x '*.orig' include/window.h include/window.h
---- include/window.h 2009-09-27 18:57:02.000000000 -0700
-+++ include/window.h 2011-02-15 15:53:21.264618099 -0800
-@@ -266,4 +266,9 @@ extern _X_EXPORT void DisableMapUnmapEve
+diff --git a/include/window.h b/include/window.h
+index 6fb2f8c..29e4364 100644
+--- a/include/window.h
++++ b/include/window.h
+@@ -266,4 +266,9 @@ extern _X_EXPORT void DisableMapUnmapEvents(
extern _X_EXPORT void EnableMapUnmapEvents(
WindowPtr /* pWin */ );
@@ -472,9 +432,10 @@
+#endif
+
#endif /* WINDOW_H */
-diff -Nurp -x '*~' -x '*.orig' mi/miinitext.c mi/miinitext.c
---- mi/miinitext.c 2011-02-15 15:53:19.160356394 -0800
-+++ mi/miinitext.c 2011-02-15 15:53:21.264889170 -0800
+diff --git a/mi/miinitext.c b/mi/miinitext.c
+index ee04b05..82a4d2e 100644
+--- a/mi/miinitext.c
++++ b/mi/miinitext.c
@@ -66,6 +66,7 @@ SOFTWARE.
#undef DAMAGE
#undef COMPOSITE
@@ -503,7 +464,7 @@
/* FIXME: this whole block of externs should be from the appropriate headers */
#ifdef MITSHM
-@@ -315,6 +322,9 @@ static ExtensionToggle ExtensionToggleLi
+@@ -315,6 +322,9 @@ static ExtensionToggle ExtensionToggleList[] =
#ifdef SolarisIAExtension
{ IANAME /* "SolarisIA" */, &noIAExtension },
#endif
@@ -513,7 +474,7 @@
#ifdef RES
{ "X-Resource", &noResExtension },
#endif
-@@ -486,6 +496,11 @@ InitExtensions(int argc, char *argv[])
+@@ -484,6 +494,11 @@ InitExtensions(int argc, char *argv[])
#ifdef SolarisIAExtension
if (!noIAExtension) IAExtensionInit();
#endif
@@ -525,10 +486,11 @@
}
#else /* XFree86LOADER */
-diff -Nurp -x '*~' -x '*.orig' os/connection.c os/connection.c
---- os/connection.c 2010-09-11 14:20:51.000000000 -0700
-+++ os/connection.c 2011-02-15 15:53:21.265265952 -0800
-@@ -44,6 +44,33 @@ ARISING OUT OF OR IN CONNECTION WITH THE
+diff --git a/os/connection.c b/os/connection.c
+index 5580fab..c69d4fe 100644
+--- a/os/connection.c
++++ b/os/connection.c
+@@ -44,6 +44,33 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
SOFTWARE.
******************************************************************/
@@ -562,7 +524,7 @@
/*****************************************************************
* Stuff to create connections --- OS dependent
*
-@@ -256,6 +283,11 @@ static int ListenTransCount;
+@@ -255,6 +282,11 @@ static int ListenTransCount;
static void ErrorConnMax(XtransConnInfo /* trans_conn */);
@@ -574,7 +536,7 @@
static XtransConnInfo
lookup_trans_conn (int fd)
{
-@@ -651,6 +683,12 @@ ClientAuthorized(ClientPtr client,
+@@ -646,6 +678,12 @@ ClientAuthorized(ClientPtr client,
priv = (OsCommPtr)client->osPrivate;
trans_conn = priv->trans_conn;