diff -urp -x '*~' -x '*.orig' configure.ac configure.ac

 AC_CHECK_LIB(m, sqrt)

+dnl Check for libtsol for Solaris Trusted Extensions module

+AC_CHECK_LIB(tsol, bsllow, [BUILD_TSOL_MODULE=yes], [BUILD_TSOL_MODULE=no])

+AM_CONDITIONAL(BUILD_TSOL_MODULE, [test x$BUILD_TSOL_MODULE = xyes])

+if test "x$BUILD_TSOL_MODULE" = xyes; then

+fi

+

 AC_CHECK_HEADERS([ndbm.h dbm.h rpcsvc/dbm.h])

 dnl AGPGART headers

 AM_CONDITIONAL(XVFB, [test "x$XVFB" = xyes])

 if test "x$XVFB" = xyes; then

 	AC_SUBST([XVFB_LIBS])

 fi

 AM_CONDITIONAL(XNEST, [test "x$XNEST" = xyes])

 if test "x$XNEST" = xyes; then

 	AC_SUBST([XNEST_LIBS])

 fi

 if test "x$XPRINT" = xyes; then

-    KDRIVE_PURE_LIBS="$FB_LIB $MI_LIB $FIXES_LIB $XEXT_LIB $DBE_LIB $XTRAP_LIB $RECORD_LIB $GLX_LIBS $RENDER_LIB $RANDR_LIB $DAMAGE_LIB $MIEXT_DAMAGE_LIB $MIEXT_SHADOW_LIB $XI_LIB $XKB_LIB $XKB_STUB_LIB $COMPOSITE_LIB $XPSTUBS_LIB $IA_LIB $OS_LIB"

+    KDRIVE_PURE_LIBS="$FB_LIB $MI_LIB $FIXES_LIB $XEXT_LIB $DBE_LIB $XTRAP_LIB $RECORD_LIB $GLX_LIBS $RENDER_LIB $RANDR_LIB $DAMAGE_LIB $MIEXT_DAMAGE_LIB $MIEXT_SHADOW_LIB $XI_LIB $XKB_LIB $XKB_STUB_LIB $COMPOSITE_LIB $XPSTUBS_LIB $IA_LIB $TSOL_LIB $OS_LIB"

     KDRIVE_LIB='$(top_builddir)/hw/kdrive/src/libkdrive.a'

     case $host_os in

 	*linux*)

 # Add Sun IA extension

 AC_OUTPUT([IA/Makefile])

+

+# Add Sun Trusted Extensions extension

+AC_OUTPUT([tsol/Makefile])

diff -urp -x '*~' -x '*.orig' dix/dispatch.c dix/dispatch.c

@@ -74,8 +74,8 @@ Equipment Corporation.

 ******************************************************************/

-/* XSERVER_DTRACE additions:

- * Copyright 2005-2006 Sun Microsystems, Inc.  All rights reserved.

+/* 

  *

  * Permission is hereby granted, free of charge, to any person obtaining a

  * copy of this software and associated documentation files (the

+#ifdef TSOL

+SecurityHookPtr pSecHook = NULL;

+#endif /* TSOL */

+

 static int nextFreeClientID; /* always MIN free client ID */

 static int	nClients;	/* number of authorized clients */

 	    UngrabServer(client);

 	}

 	BITCLEAR(grabWaiters, client->index);

+#ifdef TSOL

+        if (pSecHook)

+            (*pSecHook->DeleteClientFromAnySelections)(client);

+        else

+#endif

 	DeleteClientFromAnySelections(client);

 	ReleaseActiveGrabs(client);

 	DeleteClientFontStuff(client);

diff -urp -x '*~' -x '*.orig' dix/events.c dix/events.c

@@ -76,7 +76,7 @@ Equipment Corporation.

 /*****************************************************************

-Copyright 2003-2005 Sun Microsystems, Inc.

+Copyright 2007 Sun Microsystems, Inc.

 All rights reserved.

     int mode

 );

-static WindowPtr XYToWindow(

+#ifdef TSOL

+_X_EXPORT

+#else

+static

+#endif

+WindowPtr XYToWindow(

     int x,

     int y

 );

-static WindowPtr 

+#ifdef TSOL

+_X_EXPORT

+#else

+static

+#endif

+WindowPtr 

 XYToWindow(int x, int y)

 {

diff -urp -x '*~' -x '*.orig' dix/property.c dix/property.c

@@ -45,6 +45,34 @@ SOFTWARE.

 ******************************************************************/

+/* Copyright 2006 Sun Microsystems, Inc.  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"), to deal in the Software without restriction, including

+ * without limitation the rights to use, copy, modify, merge, publish,

+ * distribute, and/or sell copies of the Software, and to permit persons

+ * to whom the Software is furnished to do so, provided that the above

+ * copyright notice(s) and this permission notice appear in all copies of

+ * the Software and that both the above copyright notice(s) and this

+ * permission notice appear in supporting documentation.

+ *

+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS

+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF

+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT

+ * OF THIRD PARTY RIGHTS. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR

+ * HOLDERS INCLUDED IN THIS NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL

+ * INDIRECT OR CONSEQUENTIAL DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING

+ * FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT,

+ * NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION

+ * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.

+ *

+ * Except as contained in this notice, the name of a copyright holder

+ * shall not be used in advertising or otherwise to promote the sale, use

+ * or other dealings in this Software without prior written authorization

+ * of the copyright holder.

+ */ 

+

 #ifdef HAVE_DIX_CONFIG_H

 #include <dix-config.h>

 #endif

 #include "xace.h"

+#ifdef TSOL

+#include "extnsionst.h"

+extern SecurityHookPtr pSecHook;

+#endif /* TSOL */

+

 /*****************************************************************

  * Property Stuff

  *

     }

+#ifdef TSOL

+    if (pSecHook)

+	err = (*pSecHook->ChangeWindowProperty)(client, pWin, stuff->property,

+	   stuff->type, (int)format, (int)mode, len, (pointer)&stuff[1], TRUE);

+    else

+#endif /* TSOL */

     }

+#ifdef TSOL

+    if (pSecHook)

+	result = (*pSecHook->DeleteProperty)(client, pWin, stuff->property);

+    else

+#endif /* TSOL */

     if (client->noClientException != Success)

 	return(client->noClientException);

diff -urp -x '*~' -x '*.orig' dix/window.c dix/window.c

@@ -98,6 +98,33 @@ Equipment Corporation.

 ******************************************************************/

+/* Copyright 2006 Sun Microsystems, Inc.  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"), to deal in the Software without restriction, including

+ * without limitation the rights to use, copy, modify, merge, publish,

+ * distribute, and/or sell copies of the Software, and to permit persons

+ * to whom the Software is furnished to do so, provided that the above

+ * copyright notice(s) and this permission notice appear in all copies of

+ * the Software and that both the above copyright notice(s) and this

+ * permission notice appear in supporting documentation.

+ *

+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS

+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF

+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT

+ * OF THIRD PARTY RIGHTS. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR

+ * HOLDERS INCLUDED IN THIS NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL

+ * INDIRECT OR CONSEQUENTIAL DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING

+ * FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT,

+ * NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION

+ * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.

+ *

+ * Except as contained in this notice, the name of a copyright holder

+ * shall not be used in advertising or otherwise to promote the sale, use

+ * or other dealings in this Software without prior written authorization

+ * of the copyright holder.

+ */ 

 #ifdef HAVE_DIX_CONFIG_H

 #include <dix-config.h>

 _X_EXPORT int numSaveUndersViewable = 0;

 _X_EXPORT int deltaSaveUndersViewable = 0;

+#ifdef TSOL

+#include "extnsionst.h"

+extern SecurityHookPtr pSecHook;

+#endif /* TSOL */

+

 #ifdef DEBUG

 /******

  * PrintWindowTree

     DeleteWindowFromAnySaveSet(pWin);

+#ifdef TSOL

+    if (pSecHook)

+	(*pSecHook->DeleteWindowFromAnySelections)(pWin);

+    else

+#endif

     DeleteWindowFromAnySelections(pWin);

     DeleteWindowFromAnyEvents(pWin, TRUE);

     REGION_UNINIT(pScreen, &pWin->clipList);

     return(Below);

 }

-static BoxPtr

+#ifdef TSOL

+_X_EXPORT

+#else

+static

+#endif

+BoxPtr

 WindowExtents(

     return pRgn;

 }

-static Bool

+#ifdef TSOL

+_X_EXPORT

+#else

+static

+#endif

+Bool

 ShapeOverlap (

     WindowPtr	pWin,

     BoxPtr	pWinBox,

     }

 }

-static void

+#ifdef TSOL

+_X_EXPORT

+#else

+static

+#endif

+void

 ReflectStackChange(

diff -urp -x '*~' -x '*.orig' hw/xfree86/common/xf86Config.c hw/xfree86/common/xf86Config.c

diff -urp -x '*~' -x '*.orig' hw/xfree86/dixmods/Makefile.am hw/xfree86/dixmods/Makefile.am

+

+if BUILD_TSOL_MODULE

+# Sun Trusted Extensions extension module additions

+extsmodule_LTLIBRARIES += libxtsol.la

+libxtsol_la_LDFLAGS = -avoid-version

+libxtsol_la_LIBADD = $(top_builddir)/tsol/libxtsol.la

+libxtsol_la_SOURCES = tsolmodule.c

+endif

diff -urp -x '*~' -x '*.orig' include/extnsionst.h include/extnsionst.h

@@ -45,6 +45,34 @@ SOFTWARE.

 ******************************************************************/

+/* Copyright 2007 Sun Microsystems, Inc.  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"), to deal in the Software without restriction, including

+ * without limitation the rights to use, copy, modify, merge, publish,

+ * distribute, and/or sell copies of the Software, and to permit persons

+ * to whom the Software is furnished to do so, provided that the above

+ * copyright notice(s) and this permission notice appear in all copies of

+ * the Software and that both the above copyright notice(s) and this

+ * permission notice appear in supporting documentation.

+ *

+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS

+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF

+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT

+ * OF THIRD PARTY RIGHTS. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR

+ * HOLDERS INCLUDED IN THIS NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL

+ * INDIRECT OR CONSEQUENTIAL DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING

+ * FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT,

+ * NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION

+ * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.

+ *

+ * Except as contained in this notice, the name of a copyright holder

+ * shall not be used in advertising or otherwise to promote the sale, use

+ * or other dealings in this Software without prior written authorization

+ * of the copyright holder.

+ */ 

+

 #ifndef EXTENSIONSTRUCT_H

 #define EXTENSIONSTRUCT_H 

 #include "gc.h"

+#ifdef TSOL

+#include "inputstr.h"

+#endif /* TSOL */

+

 typedef struct _ExtensionEntry {

     int index;

     void (* CloseDown)(	/* called at server shutdown */

+#ifdef TSOL

+typedef struct

+{

+        char *, ClientPtr , char **);

+    int (*ChangeWindowProperty)(ClientPtr, WindowPtr, Atom, Atom, int, int,

+        unsigned long, pointer, Bool);

+    int (*DeleteProperty)(ClientPtr, WindowPtr, Atom);

+    void (*DeleteClientFromAnySelections)(ClientPtr);

+    void (*DeleteWindowFromAnySelections)(WindowPtr);

+} SecurityHook, *SecurityHookPtr;

+

+extern SecurityHookPtr pSecHook;

+

+#endif /* TSOL */

+

 #endif /* EXTENSIONSTRUCT_H */

+

diff -urp -x '*~' -x '*.orig' mi/miinitext.c mi/miinitext.c