--- a/open-src/xserver/xorg/xtsol.patch Wed Mar 09 16:02:37 2011 -0800
+++ b/open-src/xserver/xorg/xtsol.patch Mon Mar 14 15:37:30 2011 -0700
@@ -1,4 +1,4 @@
-# Copyright (c) 2006, 2010, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2006, 2011, 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"),
@@ -18,9 +18,10 @@
# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
# FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
# DEALINGS IN THE SOFTWARE.
-diff -urp -x '*~' -x '*.orig' Makefile.am Makefile.am
---- Makefile.am 2010-01-07 18:14:14.864775261 -0800
-+++ Makefile.am 2010-01-07 18:14:16.389557045 -0800
+
+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
@@ -17,6 +17,10 @@ if RECORD
RECORD_DIR=record
endif
@@ -40,10 +41,10 @@
exa \
config \
hw \
-diff -urp -x '*~' -x '*.orig' Xext/security.c Xext/security.c
---- Xext/security.c 2010-01-07 14:44:56.000000000 -0800
-+++ Xext/security.c 2010-01-07 18:14:16.390294231 -0800
-@@ -1152,3 +1152,27 @@ SecurityExtensionInit(INITARGS)
+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)
/* Label objects that were created before we could register ourself */
SecurityLabelInitial();
}
@@ -71,9 +72,9 @@
+
+ return oldLevel;
+}
-diff -urp -x '*~' -x '*.orig' Xext/securitysrv.h Xext/securitysrv.h
---- Xext/securitysrv.h 2009-10-27 23:56:18.000000000 -0700
-+++ Xext/securitysrv.h 2010-01-07 18:14:16.390609284 -0800
+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
@@ -80,4 +80,8 @@ typedef struct {
/* Give this value or higher to the -audit option to get security messages */
#define SECURITY_AUDIT_LEVEL 4
@@ -83,10 +84,10 @@
+extern _X_EXPORT unsigned int setClientTrustLevel(ClientPtr client, unsigned int newLevel);
+
#endif /* _SECURITY_SRV_H */
-diff -urp -x '*~' -x '*.orig' configure.ac configure.ac
---- configure.ac 2010-01-07 18:14:14.865470331 -0800
-+++ configure.ac 2010-01-07 18:14:16.392132857 -0800
-@@ -225,6 +225,14 @@ dnl Find the math libary
+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
AC_CHECK_LIB(m, sqrt)
AC_CHECK_LIB(m, cbrt, AC_DEFINE(HAVE_CBRT, 1, [Have the 'cbrt' function]))
@@ -101,25 +102,25 @@
AC_CHECK_HEADERS([ndbm.h dbm.h rpcsvc/dbm.h])
dnl AGPGART headers
-@@ -1387,6 +1395,8 @@ AM_CONDITIONAL(XVFB, [test "x$XVFB" = xy
+@@ -1515,6 +1523,8 @@ AM_CONDITIONAL(XVFB, [test "x$XVFB" = xy
if test "x$XVFB" = xyes; then
- XVFB_LIBS="$FB_LIB $FIXES_LIB $XEXT_LIB $CONFIG_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_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
-@@ -1408,6 +1418,8 @@ if test "x$XNEST" = xyes; then
+@@ -1536,6 +1546,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 $CONFIG_LIB"
+ 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_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
-@@ -1976,6 +1988,7 @@ if test "$KDRIVE" = yes; then
+@@ -2100,6 +2112,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"
@@ -127,16 +128,16 @@
KDRIVE_LIB='$(top_builddir)/hw/kdrive/src/libkdrive.la'
case $host_os in
*linux*)
-@@ -2139,3 +2152,6 @@ xorg-server.pc
+@@ -2280,3 +2293,6 @@ xorg-server.pc
# 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
---- dix/dispatch.c 2010-01-03 19:17:33.000000000 -0800
-+++ dix/dispatch.c 2010-01-07 18:14:16.394483902 -0800
+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
@@ -74,8 +74,8 @@ Equipment Corporation.
******************************************************************/
@@ -159,8 +160,8 @@
static int nextFreeClientID; /* always MIN free client ID */
static int nClients; /* number of authorized clients */
-@@ -931,7 +935,12 @@ ProcCirculateWindow(ClientPtr client)
- return(client->noClientException);
+@@ -897,7 +901,12 @@ ProcCirculateWindow(ClientPtr client)
+ return Success;
}
-static int
@@ -173,8 +174,8 @@
GetGeometry(ClientPtr client, xGetGeometryReply *rep)
{
DrawablePtr pDraw;
-@@ -2071,7 +2080,12 @@ ProcPutImage(ClientPtr client)
- return (client->noClientException);
+@@ -2000,7 +2009,12 @@ ProcPutImage(ClientPtr client)
+ return Success;
}
-static int
@@ -187,9 +188,9 @@
DoGetImage(ClientPtr client, int format, Drawable drawable,
int x, int y, int width, int height,
Mask planemask, xGetImageReply **im_return)
-diff -urp -x '*~' -x '*.orig' dix/events.c dix/events.c
---- dix/events.c 2010-01-07 14:44:56.000000000 -0800
-+++ dix/events.c 2010-01-07 18:14:16.397086083 -0800
+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.
******************************************************************/
@@ -199,8 +200,8 @@
*
* Permission is hereby granted, free of charge, to any person obtaining a
* copy of this software and associated documentation files (the "Software"),
-@@ -360,7 +360,12 @@ IsMaster(DeviceIntPtr dev)
- return (dev->type == MASTER_POINTER || dev->type == MASTER_KEYBOARD);
+@@ -334,7 +334,12 @@ IsMaster(DeviceIntPtr dev)
+ return dev->type == MASTER_POINTER || dev->type == MASTER_KEYBOARD;
}
-static WindowPtr XYToWindow(
@@ -213,7 +214,7 @@
DeviceIntPtr pDev,
int x,
int y
-@@ -2631,7 +2636,12 @@ PointInBorderSize(WindowPtr pWin, int x,
+@@ -2583,7 +2588,12 @@ PointInBorderSize(WindowPtr pWin, int x,
*
* @returns the window at the given coordinates.
*/
@@ -227,9 +228,9 @@
XYToWindow(DeviceIntPtr pDev, int x, int y)
{
WindowPtr pWin;
-diff -urp -x '*~' -x '*.orig' dix/window.c dix/window.c
---- dix/window.c 2009-10-27 23:56:19.000000000 -0700
-+++ dix/window.c 2010-01-07 18:14:16.398779526 -0800
+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
@@ -97,6 +97,33 @@ Equipment Corporation.
******************************************************************/
@@ -264,7 +265,7 @@
#ifdef HAVE_DIX_CONFIG_H
#include <dix-config.h>
-@@ -179,6 +206,11 @@ static Bool TileScreenSaver(int i, int k
+@@ -173,6 +200,11 @@ static Bool TileScreenSaver(ScreenPtr pS
#define SubStrSend(pWin,pParent) (StrSend(pWin) || SubSend(pParent))
@@ -276,8 +277,8 @@
#ifdef DEBUG
/******
* PrintWindowTree
-@@ -1825,7 +1857,12 @@ IsSiblingAboveMe(
- return(Below);
+@@ -1805,7 +1837,12 @@ IsSiblingAboveMe(
+ return Below;
}
-static BoxPtr
@@ -290,7 +291,7 @@
WindowExtents(
WindowPtr pWin,
BoxPtr pBox)
-@@ -1861,7 +1898,12 @@ MakeBoundingRegion (
+@@ -1835,7 +1872,12 @@ MakeBoundingRegion (
return pRgn;
}
@@ -304,7 +305,7 @@
ShapeOverlap (
WindowPtr pWin,
BoxPtr pWinBox,
-@@ -2065,7 +2107,12 @@ WhereDoIGoInTheStack(
+@@ -2035,7 +2077,12 @@ WhereDoIGoInTheStack(
}
}
@@ -318,10 +319,10 @@
ReflectStackChange(
WindowPtr pWin,
WindowPtr pSib,
-diff -urp -x '*~' -x '*.orig' hw/xfree86/common/xf86Config.c hw/xfree86/common/xf86Config.c
---- hw/xfree86/common/xf86Config.c 2010-01-07 18:14:14.866096681 -0800
-+++ hw/xfree86/common/xf86Config.c 2010-01-07 18:14:16.400356732 -0800
-@@ -117,6 +117,7 @@ static ModuleDefault ModuleDefaults[] =
+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[] =
{.name = "dri2", .toLoad = TRUE, .load_opt=NULL},
#endif
{.name = "ia", .toLoad = TRUE, .load_opt=NULL},
@@ -329,10 +330,10 @@
{.name = NULL, .toLoad = FALSE, .load_opt=NULL}
};
-diff -urp -x '*~' -x '*.orig' hw/xfree86/dixmods/Makefile.am hw/xfree86/dixmods/Makefile.am
---- hw/xfree86/dixmods/Makefile.am 2010-01-07 18:14:14.866255080 -0800
-+++ hw/xfree86/dixmods/Makefile.am 2010-01-07 18:14:16.400667347 -0800
-@@ -73,3 +73,11 @@ extsmodule_LTLIBRARIES += libia.la
+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
libia_la_LDFLAGS = -avoid-version
libia_la_LIBADD = $(top_builddir)/IA/libIA.la
libia_la_SOURCES = iamodule.c
@@ -344,10 +345,10 @@
+libxtsol_la_LIBADD = $(top_builddir)/tsol/libxtsol.la
+libxtsol_la_SOURCES = tsolmodule.c
+endif
-diff -urp -x '*~' -x '*.orig' include/dix.h include/dix.h
---- include/dix.h 2010-01-07 14:44:57.000000000 -0800
-+++ include/dix.h 2010-01-07 18:14:16.401101717 -0800
-@@ -171,6 +171,15 @@ extern _X_EXPORT void MarkClientExceptio
+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
ClientPtr /*client*/);
extern _X_HIDDEN Bool CreateConnectionBlock(void);
@@ -362,10 +363,10 @@
+
/* dixutils.c */
- extern _X_EXPORT void CopyISOLatin1Lowered(
-diff -urp -x '*~' -x '*.orig' include/dixevents.h include/dixevents.h
---- include/dixevents.h 2009-08-10 21:00:25.000000000 -0700
-+++ include/dixevents.h 2010-01-07 18:14:16.401388928 -0800
+ 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
@@ -375,9 +376,9 @@
+#endif
+
#endif /* DIXEVENTS_H */
-diff -urp -x '*~' -x '*.orig' include/extnsionst.h include/extnsionst.h
---- include/extnsionst.h 2009-08-10 21:00:25.000000000 -0700
-+++ include/extnsionst.h 2010-01-07 18:14:16.401772630 -0800
+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
@@ -45,6 +45,34 @@ SOFTWARE.
******************************************************************/
@@ -446,9 +447,21 @@
+
#endif /* EXTENSIONSTRUCT_H */
-diff -urp -x '*~' -x '*.orig' include/window.h include/window.h
---- include/window.h 2009-10-27 23:56:24.000000000 -0700
-+++ include/window.h 2010-01-07 18:14:16.402098271 -0800
+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(
+ int /*led*/,
+ Bool /*on*/);
+
+-extern void MaybeStopHint(
++extern _X_EXPORT void MaybeStopHint(
+ 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
extern _X_EXPORT void EnableMapUnmapEvents(
WindowPtr /* pWin */ );
@@ -459,10 +472,18 @@
+#endif
+
#endif /* WINDOW_H */
-diff -urp -x '*~' -x '*.orig' mi/miinitext.c mi/miinitext.c
---- mi/miinitext.c 2010-01-07 18:14:14.866528563 -0800
-+++ mi/miinitext.c 2010-01-07 18:14:16.402610999 -0800
-@@ -163,6 +163,9 @@ extern Bool noGEExtension;
+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
+@@ -66,6 +66,7 @@ SOFTWARE.
+ #undef DAMAGE
+ #undef COMPOSITE
+ #undef MITSHM
++#undef TSOL
+ #endif
+
+ #ifdef HAVE_XNEST_CONFIG_H
+@@ -157,6 +158,9 @@ extern Bool noGEExtension;
#ifdef SolarisIAExtension
Bool noIAExtension;
#endif
@@ -472,27 +493,27 @@
#ifndef XFree86LOADER
#define INITARGS void
-@@ -197,6 +200,9 @@ typedef void (*InitExtension)(INITARGS);
- #ifdef SolarisIAExtension
+@@ -192,6 +196,9 @@ typedef void (*InitExtension)(INITARGS);
#include <X11/extensions/interactive.h>
+ #include "../IA/interactive_srv.h"
#endif
+#ifdef TSOL
-+#include "../tsol/tsol.h"
++#include "../tsol/tsolextension.h"
+#endif
/* FIXME: this whole block of externs should be from the appropriate headers */
#ifdef MITSHM
-@@ -333,6 +339,9 @@ static ExtensionToggle ExtensionToggleLi
+@@ -315,6 +322,9 @@ static ExtensionToggle ExtensionToggleLi
#ifdef SolarisIAExtension
{ IANAME /* "SolarisIA" */, &noIAExtension },
- #endif
+ #endif
+#ifdef TSOL
+ { TSOLNAME /* "SUN_TSOL" */, &noXTSolExtension },
-+#endif
++#endif
#ifdef RES
{ "X-Resource", &noResExtension },
#endif
-@@ -509,6 +518,11 @@ InitExtensions(int argc, char *argv[])
+@@ -486,6 +496,11 @@ InitExtensions(int argc, char *argv[])
#ifdef SolarisIAExtension
if (!noIAExtension) IAExtensionInit();
#endif
@@ -504,9 +525,9 @@
}
#else /* XFree86LOADER */
-diff -urp -x '*~' -x '*.orig' os/connection.c os/connection.c
---- os/connection.c 2009-10-27 23:56:24.000000000 -0700
-+++ os/connection.c 2010-01-07 18:14:16.403367950 -0800
+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
SOFTWARE.
@@ -566,15 +587,3 @@
/* Allow any client to connect without authorization on a launchd socket,
because it is securely created -- this prevents a race condition on launch */
if(trans_conn->flags & TRANS_NOXAUTH) {
-
---- include/input.h Thu Jan 7 14:44:57 2010
-+++ include/input.h.new Fri Jan 29 14:27:49 2010
-@@ -383,7 +383,7 @@
- int /*led*/,
- Bool /*on*/);
-
--extern void MaybeStopHint(
-+extern _X_EXPORT void MaybeStopHint(
- DeviceIntPtr /*device*/,
- ClientPtr /*client*/);
-