--- a/make_release_packages Mon Sep 28 08:57:37 2009 -0700
+++ b/make_release_packages Mon Sep 28 09:30:54 2009 -0700
@@ -28,7 +28,7 @@
# or other dealings in this Software without prior written authorization
# of the copyright holder.
#
-# ident "@(#)make_release_packages 1.76 09/09/22 SMI"
+# ident "@(#)make_release_packages 1.77 09/09/28 SMI"
#
# Create and fill a package staging area for X
#
@@ -59,6 +59,7 @@
SUNWsynergy
SUNWttf-google-droid
SUNWpciaccess SUNWpixman SUNWfreetype2 SUNWvncviewer SUNWxcursor-themes
+ SUNWxdm SUNWxdm-root
SUNWxorg-client-docs SUNWxorg-client-programs
SUNWxorg-clientlibs SUNWxorg-compatlinks
SUNWxorg-graphics-ddx SUNWxorg-headers
--- a/open-src/app/Makefile Mon Sep 28 08:57:37 2009 -0700
+++ b/open-src/app/Makefile Mon Sep 28 09:30:54 2009 -0700
@@ -28,7 +28,7 @@
# or other dealings in this Software without prior written authorization
# of the copyright holder.
#
-# ident "@(#)Makefile 1.88 09/09/22 SMI"
+# ident "@(#)Makefile 1.89 09/09/28 SMI"
#
###############################################################################
@@ -78,6 +78,7 @@
xconsole \
xcursorgen \
xditview \
+ xdm \
xdpyinfo \
xdriinfo \
xedit \
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/open-src/app/xdm/Makefile Mon Sep 28 09:30:54 2009 -0700
@@ -0,0 +1,127 @@
+###############################################################################
+#
+# xdm Makefile
+#
+# Copyright 2009 Sun Microsystems, Inc. All rights reserved.
+# Use is subject to license terms.
+#
+# 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.
+#
+#
+
+# Package name used in tarballs
+MODULE_NAME=xdm
+
+# Version number (used in path names)
+MODULE_VERSION=1.1.9
+
+# Patches to apply to source after unpacking, in order
+SOURCE_PATCHES = \
+ mkdir.patch,-p1 \
+ bindir.patch \
+ terminateServer.patch \
+ Xsession.patch
+
+# Man pages to apply Sun footer to & attributes to list
+SUNTOUCHED_MANPAGES=xdm.man.cpp
+SUN_PACKAGE=SUNWxdm
+MODULE_STABILITY=Committed
+MODULE_SUNTOUCH_MAN_FLAGS= -p $(MODULE_PREFIX)/sbin/
+
+# Where to install xdm files
+MODULE_PREFIX=/usr
+MODULE_PREFIX_SET=yes
+
+# Additional configure script options
+# Only build shared greeter module, not static
+# Set various paths to better match Solaris
+MODULE_CONFIG_OPTS= \
+ --enable-shared=yes --enable-static=no \
+ --with-xdmconfigdir=/etc/X11/xdm \
+ --with-piddir=/var/run/xdm \
+ --with-authdir=/var/run/xdm \
+ --bindir=/usr/sbin \
+ DEF_USER_PATH=/usr/bin:/usr/X11/bin:/usr/sbin:/sbin \
+ DEF_SYSTEM_PATH=/usr/bin:/usr/X11/bin:/usr/sbin:/sbin
+
+
+# Special handling while xdm is moved to /usr but other apps are still in
+# /usr/X11
+MODULE_CONFIG_OPTS += \
+ --with-xrdb='/usr/X11/bin/xrdb' \
+ --with-default-session=command='/usr/X11/bin/xterm -ls' \
+
+# Additional build & install targets
+MODULE_ADD_BUILD_TARGETS=build_xdm_configs
+MODULE_ADD_INSTALL_TARGETS=install_xdmshell install_xdm_configs
+
+include ../Makefile.inc
+
+# Move xdmshell from default location to the place we put in our packages
+install_xdmshell: default_install
+ -rm -f $(PROTODIR)/usr/lib/X11/xdm/xdmshell
+ mv $(PROTODIR)/usr/sbin/xdmshell $(PROTODIR)/usr/lib/X11/xdm/xdmshell
+
+# Copy xdm config files from /etc to /usr for use as prototypes
+XDM_CONFIG_FILES=Xaccess Xresources Xservers xdm-config
+XDM_ETC_CONFIGDIR=/etc/X11/xdm
+XDM_USR_CONFIGDIR=/usr/lib/X11/xdm
+XCF_USR_FILES=$(XDM_CONFIG_FILES:%=$(PROTODIR)/$(XDM_USR_CONFIGDIR)/%)
+XCF_ETC_SRCDIR=$(SOURCE_DIR)/config
+XCF_ETC_SRCFILES=$(XDM_CONFIG_FILES:%=$(XCF_ETC_SRCDIR)/%)
+XCF_USR_SRCDIR=$(SOURCE_DIR)/config/annotated
+XCF_USR_SRCFILES=$(XDM_CONFIG_FILES:%=$(XCF_USR_SRCDIR)/%)
+
+build_xdm_configs: $(XCF_USR_SRCFILES)
+install_xdm_configs: $(XCF_USR_FILES) $(PROTODIR)/$(XDM_USR_CONFIGDIR)/README
+$(XCF_ETC_SRCFILES): default_build
+
+XCF_HEADER = %1$$s----------------------------------------------------------------------------
+XCF_HEADER += \n%1$$s NOTE: The file provided in $(XDM_USR_CONFIGDIR) is a sample %2$$s
+XCF_HEADER += \n%1$$s configuration file provided for your reference.
+XCF_HEADER += \n%1$$s
+XCF_HEADER += \n%1$$s xdm reads the actual configuration from the copies located in $(XDM_ETC_CONFIGDIR)
+XCF_HEADER += \n%1$$s (unless configured otherwise by $(XDM_ETC_CONFIGDIR)/xdm-config or
+XCF_HEADER += \n%1$$s a file specified via the -config command line option).
+XCF_HEADER += \n%1$$s----------------------------------------------------------------------------\n
+
+$(PROTODIR)/$(XDM_USR_CONFIGDIR) $(XCF_USR_SRCDIR):
+ mkdir -p $@
+
+$(XCF_USR_FILES): $(PROTODIR)/$(XDM_USR_CONFIGDIR) $(XCF_USR_SRCFILES)
+ -rm -f $@
+ mkdir -p $(PROTODIR)/$(XDM_USR_CONFIGDIR)
+ @ set -x ; cp -p $(XCF_USR_SRCDIR)/$$(basename $@) $@
+
+$(XCF_USR_SRCFILES): $(XCF_USR_SRCDIR) $(XCF_ETC_SRCFILES)
+ -rm -f $@
+ FILENAME=$$(basename $@) ; \
+ COMMENT_CHAR=$$(head -n 1 $(XCF_ETC_SRCDIR)/$${FILENAME}) ; \
+ printf '$(XCF_HEADER)' $${COMMENT_CHAR} $${FILENAME} > $@ ; \
+ cat $(XCF_ETC_SRCDIR)/$${FILENAME} >> $@
+
+$(PROTODIR)/$(XDM_USR_CONFIGDIR)/README:$(PROTODIR)/$(XDM_USR_CONFIGDIR) config-README.txt
+ cp -p config-README.txt $@
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/open-src/app/xdm/Xsession.patch Mon Sep 28 09:30:54 2009 -0700
@@ -0,0 +1,60 @@
+###############################################################################
+#
+# Copyright 2009 Sun Microsystems, Inc. All rights reserved.
+# Use is subject to license terms.
+#
+# 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.
+#
+###############################################################################
+
+Set default Xsession scripts/programs for Solaris/OpenSolaris.
+
+diff -urp -x '*~' -x '*.orig' config/Xsession.cpp config/Xsession.cpp
+--- config/Xsession.cpp 2009-09-17 19:24:37.000000000 -0700
++++ config/Xsession.cpp 2009-09-21 22:46:44.165111000 -0700
+@@ -47,6 +47,14 @@ case $# in
+ esac
+ esac
+
++XCOMM Run system session script if present - these will do various setup,
++XCOMM then run $HOME/.xsession if it exists, so we can just run them
++if [[ -x /etc/X11/gdm/Xsession && -x /usr/bin/dtstart ]] ; then
++ exec /etc/X11/gdm/Xsession /usr/bin/dtstart jds
++elif [[ -x /usr/dt/config/Xsession.jds ]] ; then
++ exec /usr/dt/config/Xsession.jds
++fi
++
+ XCOMM The startup script is not intended to have arguments.
+
+ startup=$HOME/.xsession
+@@ -80,5 +88,6 @@ else
+ exec `eval $XDESKTOP`
+ }
+ #endif
+- exec BINDIR/xsm
++ BINDIR/xterm -geometry 80x24+10+10 -ls &
++ exec BINDIR/twm
+ fi
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/open-src/app/xdm/bindir.patch Mon Sep 28 09:30:54 2009 -0700
@@ -0,0 +1,135 @@
+###############################################################################
+#
+# Copyright 2009 Sun Microsystems, Inc. All rights reserved.
+# Use is subject to license terms.
+#
+# 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.
+#
+###############################################################################
+
+Set paths used in config files for finding X utilities to look in /usr/X11/bin
+until everything else is moved to /usr/bin too.
+
+diff -urp -x '*~' -x '*.orig' config/Makefile.am config/Makefile.am
+--- config/Makefile.am 2009-09-17 19:24:37.000000000 -0700
++++ config/Makefile.am 2009-09-24 15:02:04.421431000 -0700
+@@ -49,7 +49,7 @@ XPMDEFINES = -DXPM -DBITMAPDIR=$(XDM_PIX
+ MKTEMP_DEFINES = -DMKTEMP_COMMAND=$(MKTEMP_COMMAND)
+ #endif
+
+-CPP_FILES_FLAGS = -DBINDIR="$(bindir)" -DDEFAULTVT="$(DEFAULTVT)" \
++CPP_FILES_FLAGS = -DBINDIR="/usr/X11/bin" -DDEFAULTVT="$(DEFAULTVT)" \
+ -DUTMP_FILE="$(UTMP_FILE)" -DWTMP_FILE="$(WTMP_FILE)" \
+ -DXDMDIR="$(XDMLIBDIR)" -DXDMLOGDIR="$(XDMLOGDIR)" \
+ -DXDMXAUTHDIR="$(XDMXAUTHDIR)" \
+diff -urp -x '*~' -x '*.orig' config/Makefile.in config/Makefile.in
+--- config/Makefile.in 2009-09-18 15:32:28.000000000 -0700
++++ config/Makefile.in 2009-09-24 15:02:04.431540000 -0700
+@@ -340,7 +340,7 @@ XPMDEFINES = -DXPM -DBITMAPDIR=$(XDM_PIX
+ #if HAVE_MKTEMP_COMMAND
+ MKTEMP_DEFINES = -DMKTEMP_COMMAND=$(MKTEMP_COMMAND)
+ #endif
+-CPP_FILES_FLAGS = -DBINDIR="$(bindir)" -DDEFAULTVT="$(DEFAULTVT)" \
++CPP_FILES_FLAGS = -DBINDIR="/usr/X11/bin" -DDEFAULTVT="$(DEFAULTVT)" \
+ -DUTMP_FILE="$(UTMP_FILE)" -DWTMP_FILE="$(WTMP_FILE)" \
+ -DXDMDIR="$(XDMLIBDIR)" -DXDMLOGDIR="$(XDMLOGDIR)" \
+ -DXDMXAUTHDIR="$(XDMXAUTHDIR)" \
+diff -urp -x '*~' -x '*.orig' xdm.man.cpp xdm.man.cpp
+--- xdm.man.cpp 2009-09-17 19:24:37.000000000 -0700
++++ xdm.man.cpp 2009-09-24 15:02:04.446548000 -0700
+@@ -413,7 +413,7 @@ See the sections \fBXDMCP Access Control
+ .IP "\fBDisplayManager.\fP\fIDISPLAY\fP\fB.xrdb\fP"
+ Specifies the program used to load the resources. By default,
+ .I xdm
+-uses \fI BINDIR/xrdb\fP.
++uses \fI /usr/X11/bin/xrdb\fP.
+ .IP "\fBDisplayManager.\fP\fIDISPLAY\fP\fB.cpp\fP"
+ This specifies the name of the C preprocessor which is used by \fIxrdb\fP.
+ .IP "\fBDisplayManager.\fP\fIDISPLAY\fP\fB.setup\fP"
+@@ -431,7 +431,7 @@ file used here is \fIXstartup\fP.
+ See the section \fBStartup Program.\fP
+ .IP "\fBDisplayManager.\fP\fIDISPLAY\fP\fB.session\fP"
+ This specifies the session to be executed (not running as root).
+-By default, \fI BINDIR/xterm\fP is
++By default, \fI /usr/X11/bin/xterm\fP is
+ run. The conventional name is \fIXsession\fP.
+ See the section
+ .B "Session Program."
+@@ -512,7 +512,7 @@ If the default session fails to execute,
+ will fall back to this program. This program is executed with no
+ arguments, but executes using the same environment variables as
+ the session would have had (see the section \fBSession Program\fP).
+-By default, \fI BINDIR/xterm\fP is used.
++By default, \fI /usr/X11/bin/xterm\fP is used.
+ .IP "\fBDisplayManager.\fP\fIDISPLAY\fP\fB.grabServer\fP"
+ .IP "\fBDisplayManager.\fP\fIDISPLAY\fP\fB.grabTimeout\fP"
+ To improve security,
+@@ -816,7 +816,7 @@ line to start the server. A typical ent
+ be:
+ .nf
+
+- :0 Digital-QV local BINDIR/X :0
++ :0 Digital-QV local /usr/X11/bin/X :0
+
+ .fi
+ The display types are:
+@@ -831,8 +831,8 @@ foreign remote display: \fIxdm\fP opens
+ The display name must be something that can be passed in the \fB\-display\fP
+ option to an X program. This string is used to generate the display-specific
+ resource names, so be careful to match the
+-names (e.g., use ``:0 Sun-CG3 local BINDIR/X :0'' instead of
+-``localhost:0 Sun-CG3 local BINDIR/X :0''
++names (e.g., use ``:0 Sun-CG3 local /usr/X11/bin/X :0'' instead of
++``localhost:0 Sun-CG3 local /usr/X11/bin/X :0''
+ if your other resources are specified as
+ ``DisplayManager._0.session''). The display class portion is also used in the
+ display-specific resources, as the class of the resource. This is
+@@ -1374,7 +1374,7 @@ line:
+ .nf
+ .ta .5i
+
+- xdm \-server \(lq:0 SUN-3/60CG4 local BINDIR/X :0\(rq
++ xdm \-server \(lq:0 SUN-3/60CG4 local /usr/X11/bin/X :0\(rq
+
+ .fi
+ .PP
+@@ -1414,13 +1414,13 @@ user authorization file where \fIxdm\fP
+ .I CHOOSERPATH
+ the default chooser
+ .TP 20
+-.I BINDIR/xrdb
++.I /usr/X11/bin/xrdb
+ the default resource database loader
+ .TP 20
+-.I BINDIR/X
++.I /usr/X11/bin/X
+ the default server
+ .TP 20
+-.I BINDIR/xterm
++.I /usr/X11/bin/xterm
+ the default session program and failsafe client
+ .TP 20
+ .I XDMXAUTHDIR/A<display>\-<suffix>
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/open-src/app/xdm/config-README.txt Mon Sep 28 09:30:54 2009 -0700
@@ -0,0 +1,57 @@
+Xdm Default Configuration
+-------------------------
+
+The /usr/lib/X11/xdm directory contains a collection of scripts run by
+the default configuration of xdm, and a collection of sample configuration
+files.
+
+All of these files will be overwritten by upgrades and should not be
+edited in place in /usr/lib/X11/xdm.
+
+The xdm-config file (/etc/X11/xdm/xdm-config unless overridden by the -config
+command line option to xdm) specifies the path in which to find the other
+configuration files and scripts.
+
+To change a setting in the configuration files (xdm-config, Xaccess,
+Xresources, Xservers), edit the copies in /etc/X11/xdm or create a new
+directory for your configuration and copy the appropriate files there.
+
+To change the actions performed by one of the scripts, copy it to your
+configuration directory, edit the copy, and then edit the path to it in
+the xdm-config file for your configuration.
+
+For more information about the contents of these files, see the xdm(1)
+manual page.
+
+
+###############################################################################
+#
+# Copyright 2009 Sun Microsystems, Inc. All rights reserved.
+# Use is subject to license terms.
+#
+# 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.
+#
+###############################################################################
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/open-src/app/xdm/mkdir.patch Mon Sep 28 09:30:54 2009 -0700
@@ -0,0 +1,167 @@
+From 619af82effb9125c904d34c9fbc4bf93385d7b9e Mon Sep 17 00:00:00 2001
+From: Alan Coopersmith <[email protected]>
+Date: Tue, 22 Sep 2009 13:41:38 -0700
+Subject: [PATCH:app/xdm] Create piddir if needed on startup
+
+Allows setting piddir to /var/run/xdm/
+
+Signed-off-by: Alan Coopersmith <[email protected]>
+---
+ dm.c | 22 ++++++++++++++++++++++
+ 1 files changed, 22 insertions(+), 0 deletions(-)
+
+diff --git a/dm.c b/dm.c
+index c482017..abe4453 100644
+--- a/dm.c
++++ b/dm.c
+@@ -863,7 +863,29 @@ StorePid (void)
+ if (pidFile[0] != '\0') {
+ pidFd = open (pidFile, O_RDWR);
+ if (pidFd == -1 && errno == ENOENT)
++ {
++ /* Make sure directory exists if needed
++ Allows setting pidDir to /var/run/xdm
++ */
++ char *pidDir = strdup(pidFile);
++
++ if (pidDir != NULL)
++ {
++ char *p = strrchr(pidDir, '/');
++ int r;
++
++ if ((p != NULL) && (p != pidDir)) {
++ *p = '\0';
++ }
++ r = mkdir(pidDir, 0755);
++ if ( (r < 0) && (errno != EEXIST) ) {
++ LogError ("process-id directory %s cannot be created\n",
++ pidDir);
++ }
++ }
++
+ pidFd = open (pidFile, O_RDWR|O_CREAT, 0666);
++ }
+ if (pidFd == -1 || !(pidFilePtr = fdopen (pidFd, "r+")))
+ {
+ LogError ("process-id file %s cannot be opened\n",
+--
+1.5.6.5
+
+From 748cfcc771c7f599d8087c7aa044bc5ff770da1d Mon Sep 17 00:00:00 2001
+From: Alan Coopersmith <[email protected]>
+Date: Tue, 22 Sep 2009 13:42:31 -0700
+Subject: [PATCH:app/xdm] Make parent authdir if needed at startup
+
+Allows setting authdir to /var/run/xdm
+
+Also refactor directory creation code for less duplication
+
+Signed-off-by: Alan Coopersmith <[email protected]>
+---
+ auth.c | 68 ++++++++++++++++++++++++++++++++++++++++++++-------------------
+ 1 files changed, 47 insertions(+), 21 deletions(-)
+
+diff --git a/auth.c b/auth.c
+index a2cd9d6..d7cb30b 100644
+--- a/auth.c
++++ b/auth.c
+@@ -270,6 +270,38 @@ CleanUpFileName (char *src, char *dst, int len)
+ *dst = '\0';
+ }
+
++/* Checks to see if specified directory exists, makes it if not
++ * Returns: 0 if already exists, 1 if created, < 0 if error occured
++ */
++static int
++CheckServerAuthDir (const char *path, struct stat *statb, int mode)
++{
++ int r = stat(path, statb);
++
++ if (r != 0) {
++ if (errno == ENOENT) {
++ r = mkdir(path, mode);
++ if (r < 0) {
++ LogError ("cannot make authentication directory %s: %s\n",
++ path, _SysErrorMsg (errno));
++ } else {
++ r = 1;
++ }
++ } else {
++ LogError ("cannot access authentication directory %s: %s\n",
++ path, _SysErrorMsg (errno));
++ }
++ } else { /* Directory already exists */
++ if (!S_ISDIR(statb->st_mode)) {
++ LogError ("cannot make authentication directory %s: %s\n",
++ path, "file with that name already exists");
++ return -1;
++ }
++ }
++
++ return r;
++}
++
+ static char authdir1[] = "authdir";
+ static char authdir2[] = "authfiles";
+
+@@ -298,6 +330,13 @@ MakeServerAuthFile (struct display *d, FILE ** file)
+ return FALSE;
+ } else {
+ CleanUpFileName (d->name, cleanname, NAMELEN - 8);
++
++ /* Make authDir if it doesn't already exist */
++ r = CheckServerAuthDir(authDir, &statb, 0755);
++ if (r < 0) {
++ return FALSE;
++ }
++
+ len = strlen (authDir) + strlen (authdir1) + strlen (authdir2)
+ + strlen (cleanname) + 14;
+ d->authFile = malloc (len);
+@@ -305,35 +344,22 @@ MakeServerAuthFile (struct display *d, FILE ** file)
+ return FALSE;
+
+ snprintf (d->authFile, len, "%s/%s", authDir, authdir1);
+- r = stat(d->authFile, &statb);
++ r = CheckServerAuthDir(d->authFile, &statb, 0700);
+ if (r == 0) {
+ if (statb.st_uid != 0)
+ (void) chown(d->authFile, 0, statb.st_gid);
+ if ((statb.st_mode & 0077) != 0)
+ (void) chmod(d->authFile, statb.st_mode & 0700);
+- } else {
+- if (errno == ENOENT) {
+- r = mkdir(d->authFile, 0700);
+- if (r < 0) {
+- LogError ("cannot make authentication directory %s: "
+- "%s\n", d->authFile, _SysErrorMsg (errno));
+- }
+- } else {
+- LogError ("cannot access authentication directory %s: "
+- "%s\n", d->authFile, _SysErrorMsg (errno));
+- }
+- if (r < 0) {
+- free (d->authFile);
+- d->authFile = NULL;
+- return FALSE;
+- }
++ } else if (r < 0) {
++ free (d->authFile);
++ d->authFile = NULL;
++ return FALSE;
+ }
++
+ snprintf (d->authFile, len, "%s/%s/%s",
+ authDir, authdir1, authdir2);
+- r = mkdir(d->authFile, 0700);
+- if (r < 0 && errno != EEXIST) {
+- LogError ("cannot make authentication directory %s: %s\n",
+- d->authFile, _SysErrorMsg (errno));
++ r = CheckServerAuthDir(d->authFile, &statb, 0700);
++ if (r < 0) {
+ free (d->authFile);
+ d->authFile = NULL;
+ return FALSE;
+--
+1.5.6.5
+
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/open-src/app/xdm/terminateServer.patch Mon Sep 28 09:30:54 2009 -0700
@@ -0,0 +1,42 @@
+###############################################################################
+#
+# Copyright 2009 Sun Microsystems, Inc. All rights reserved.
+# Use is subject to license terms.
+#
+# 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.
+#
+###############################################################################
+
+diff -urp -x '*~' -x '*.orig' config/xdm-config.cpp config/xdm-config.cpp
+--- config/xdm-config.cpp 2009-09-17 19:24:37.000000000 -0700
++++ config/xdm-config.cpp 2009-09-21 22:46:43.151325000 -0700
+@@ -37,3 +37,6 @@ DisplayManager*loginmoveInterval: 10
+ ! SECURITY: do not listen for XDMCP or Chooser requests
+ ! Comment out this line if you want to manage X terminals with xdm
+ DisplayManager.requestPort: 0
++
++! Restart X server for each session
++DisplayManager*terminateServer: true
--- a/open-src/lib/libXdmcp/spec/Xdmcp.spec Mon Sep 28 08:57:37 2009 -0700
+++ b/open-src/lib/libXdmcp/spec/Xdmcp.spec Mon Sep 28 09:30:54 2009 -0700
@@ -2,7 +2,7 @@
# Copyright 2009 Sun Microsystems, Inc. All rights reserved.
# Use is subject to license terms.
#
-# ident "@(#)Xdmcp.spec 1.2 09/07/15 SMI"
+# ident "@(#)Xdmcp.spec 1.3 09/09/28 SMI"
#
Function XdmcpARRAY8Equal
@@ -300,11 +300,29 @@
End
Function XdmcpUnwrap
-Includde <X11/Xdmcp.h>
+Include <X11/Xdmcp.h>
Declaration void XdmcpUnwrap (unsigned char* input, unsigned char* wrapper, unsigned char* output, int bytes)
Exception $return == FALSE
Version SUNW_1.2
Arch all
End
+# Private functions from Wrap.h needed by xdm
+Function _XdmcpAuthSetup
+Declaration void _XdmcpAuthSetup (auth_cblock key, auth_wrapper_schedule schedule)
+Version SUNWprivate
+Arch all
+End
+
+Function _XdmcpAuthDoIt
+Declaration void _XdmcpAuthDoIt (auth_cblock input, auth_cblock output, auth_wrapper_schedule schedule, int edflag)
+Version SUNWprivate
+Arch all
+End
+
+Function _XdmcpWrapperToOddParity
+Declaration void _XdmcpWrapperToOddParity (unsigned char *in, unsigned char *out)
+Version SUNWprivate
+Arch all
+End
--- a/packages/SUNW0xwplt/prototype Mon Sep 28 08:57:37 2009 -0700
+++ b/packages/SUNW0xwplt/prototype Mon Sep 28 09:30:54 2009 -0700
@@ -30,7 +30,7 @@
#
##########################################################################
#
-# ident "@(#)prototype 1.22 09/07/22 SMI"
+# ident "@(#)prototype 1.23 09/09/28 SMI"
#
# X Window System required core package localizable files
@@ -44,17 +44,6 @@
d none X11/lib 0755 root bin
d none X11/lib/X11 0755 root bin
-!search $HOME/openwin/lib/X11/app-defaults
-d none openwin 0755 root bin
-d none openwin/lib 0755 root bin
-d none openwin/lib/locale 0755 root bin
-d none openwin/lib/locale/C 0755 root bin
-d none openwin/lib/locale/C/app-defaults 0755 root bin
-f none openwin/lib/locale/C/app-defaults/Chooser 0644 root bin
-
-!search $HOME/openwin/lib/locale/C/LC_MESSAGES
-d none openwin/lib/locale/C/LC_MESSAGES 0755 root bin
-
!search $HOME/X11/share/locale/C/LC_MESSAGES
d none X11/share 0755 root bin
d none X11/share/locale 0755 root bin
@@ -69,15 +58,17 @@
d none X11/lib/X11/app-defaults 0755 root bin
d none X11/lib/X11/app-defaults/C 0755 root bin
f none X11/lib/X11/app-defaults/C/Bitmap 0444 root bin
-f none X11/lib/X11/app-defaults/XClock 0444 root bin
f none X11/lib/X11/app-defaults/C/Bitmap-color 0444 root bin
f none X11/lib/X11/app-defaults/C/Bitmap-nocase 0444 root bin
+f none X11/lib/X11/app-defaults/C/Chooser 0444 root bin
f none X11/lib/X11/app-defaults/C/Clock-color 0444 root bin
f none X11/lib/X11/app-defaults/C/Editres 0444 root bin
f none X11/lib/X11/app-defaults/C/Editres-color 0444 root bin
f none X11/lib/X11/app-defaults/C/XCalc 0444 root bin
f none X11/lib/X11/app-defaults/C/XCalc-color 0444 root bin
f none X11/lib/X11/app-defaults/C/XClipboard 0444 root bin
+f none X11/lib/X11/app-defaults/C/XClock 0444 root bin
+f none X11/lib/X11/app-defaults/C/XClock-color 0444 root bin
f none X11/lib/X11/app-defaults/C/XConsole 0444 root bin
f none X11/lib/X11/app-defaults/C/Xfd 0444 root bin
f none X11/lib/X11/app-defaults/C/XLogo 0444 root bin
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/packages/SUNWxdm-root/copyright.add Mon Sep 28 09:30:54 2009 -0700
@@ -0,0 +1,2 @@
+include app/xdm/COPYING
+
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/packages/SUNWxdm-root/pkginfo.tmpl Mon Sep 28 09:30:54 2009 -0700
@@ -0,0 +1,47 @@
+# Copyright 2009 Sun Microsystems, Inc. All rights reserved.
+# Use is subject to license terms.
+#
+# 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.
+#
+# @(#)pkginfo.tmpl 1.1 09/09/28
+#
+
+PKG="SUNWxdm-root"
+NAME="xdm Display Manager - / filesystem"
+ARCH="ISA"
+VERSION=6.4.2.0,REV=0.2000.02.02
+CATEGORY="system"
+SUNW_PRODNAME="Solaris X11"
+SUNW_PRODVERS=6.4.2
+DESC="X Window System xdm Display Manager components located outside of /usr"
+BASEDIR="/"
+VENDOR="Sun Microsystems, Inc."
+HOTLINE="Please contact your local service provider"
+EMAIL=""
+MAXINST="1000"
+SUNW_PKGTYPE="root"
+CLASSES="none preserve"
+SUNW_PKGVERS=1.0
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/packages/SUNWxdm-root/prototype Mon Sep 28 09:30:54 2009 -0700
@@ -0,0 +1,44 @@
+# Copyright 2009 Sun Microsystems, Inc. All rights reserved.
+# Use is subject to license terms.
+#
+# 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.
+#
+# xdm display manager
+
+i pkginfo
+i copyright
+i depend=../depend
+
+!HOME=../
+
+!search $HOME/etc/X11/xdm
+d none etc 0755 root sys
+d none etc/X11 0755 root sys
+d none etc/X11/xdm 0755 root sys
+e preserve etc/X11/xdm/Xaccess 0644 root sys
+e preserve etc/X11/xdm/Xresources 0644 root sys
+e preserve etc/X11/xdm/Xservers 0644 root sys
+e preserve etc/X11/xdm/xdm-config 0644 root sys
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/packages/SUNWxdm/copyright.add Mon Sep 28 09:30:54 2009 -0700
@@ -0,0 +1,2 @@
+include app/xdm/COPYING
+
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/packages/SUNWxdm/depend.tmpl Mon Sep 28 09:30:54 2009 -0700
@@ -0,0 +1,45 @@
+###########################################################################
+#
+# Copyright 2009 Sun Microsystems, Inc. All rights reserved.
+# Use is subject to license terms.
+#
+# 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.
+#
+###########################################################################
+
+P SUNWxdm-root xdm Display Manager (Root)
+P SUNWxwxft Xft (X Freetype) Library
+P SUNWfontconfig Fontconfig library
+P SUNWfreetype2 FreeType Font library
+
+# /usr/lib/X11/xdm/Xwilling calls sort from SUNWesu
+P SUNWesu Extended System Utilities
+
+# Default session uses twm
+P SUNWxwopt X Window System Optional Clients
+
+# common dependencies
+include ../depend
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/packages/SUNWxdm/pkginfo.tmpl Mon Sep 28 09:30:54 2009 -0700
@@ -0,0 +1,47 @@
+# Copyright 2009 Sun Microsystems, Inc. All rights reserved.
+# Use is subject to license terms.
+#
+# 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.
+#
+# @(#)pkginfo.tmpl 1.1 09/09/28
+#
+
+PKG="SUNWxdm"
+NAME="xdm Display Manager"
+ARCH="ISA"
+VERSION=6.4.2.0,REV=0.2000.02.02
+CATEGORY="system"
+SUNW_PRODNAME="Solaris X11"
+SUNW_PRODVERS=6.4.2
+DESC="X Window System xdm Display Manager"
+BASEDIR="/usr"
+VENDOR="Sun Microsystems, Inc."
+HOTLINE="Please contact your local service provider"
+EMAIL=""
+MAXINST="1000"
+SUNW_PKGTYPE="usr"
+CLASSES=none
+SUNW_PKGVERS=1.0
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/packages/SUNWxdm/prototype Mon Sep 28 09:30:54 2009 -0700
@@ -0,0 +1,91 @@
+# Copyright 2009 Sun Microsystems, Inc. All rights reserved.
+# Use is subject to license terms.
+#
+# 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.
+#
+# xdm display manager
+
+i pkginfo
+i copyright
+i depend
+
+!HOME=../usr
+
+
+!search $HOME/sbin
+d none sbin 0755 root bin
+f none sbin/xdm 0555 root bin
+
+d none lib 0755 root bin
+d none lib/X11 0755 root bin
+
+!search $HOME/lib/X11/xdm
+d none lib/X11/xdm 0755 root bin
+# scripts & binaries run by xdm
+f none lib/X11/xdm/GiveConsole 0555 root bin
+f none lib/X11/xdm/TakeConsole 0555 root bin
+f none lib/X11/xdm/Xreset 0555 root bin
+f none lib/X11/xdm/Xsession 0555 root bin
+f none lib/X11/xdm/Xsetup_0 0555 root bin
+f none lib/X11/xdm/Xstartup 0555 root bin
+f none lib/X11/xdm/Xwilling 0555 root bin
+f none lib/X11/xdm/chooser 0555 root bin
+f none lib/X11/xdm/libXdmGreet.so 0555 root bin
+f none lib/X11/xdm/xdmshell 0555 root bin
+
+# prototype files for users who have edited the versions in etc
+f none lib/X11/xdm/Xaccess 0444 root bin
+f none lib/X11/xdm/Xresources 0444 root bin
+f none lib/X11/xdm/Xservers 0444 root bin
+f none lib/X11/xdm/xdm-config 0444 root bin
+f none lib/X11/xdm/README 0444 root bin
+
+!search $HOME/lib/X11/xdm/pixmaps
+d none lib/X11/xdm/pixmaps 0755 root bin
+f none lib/X11/xdm/pixmaps/xorg-bw.xpm 0444 root bin
+f none lib/X11/xdm/pixmaps/xorg.xpm 0444 root bin
+
+!search $HOME/X11/lib/X11/app-defaults
+d none X11/lib 0755 root bin
+d none X11/lib/X11 0755 root bin
+d none X11/lib/X11/app-defaults 0755 root bin
+f none X11/lib/X11/app-defaults/Chooser 0444 root bin
+
+
+!search $HOME/share/man/man1
+d none share 0755 root sys
+d none share/man 0755 root bin
+d none share/man/man1 0755 root bin
+f none share/man/man1/xdm.1 0444 root bin
+
+# Backwards compatibility links
+d none openwin 0755 root bin
+d none openwin/bin 0755 root bin
+s none openwin/bin/xdm=../../sbin/xdm
+s none openwin/bin/xdmshell=../../lib/X11/xdm/xdmshell
+d none openwin/lib 0755 root bin
+s none openwin/lib/xdm=X11/xdm
+s none openwin/lib/X11/xdm=../../../lib/X11/xdm
--- a/packages/SUNWxorg-compatlinks/prototype Mon Sep 28 08:57:37 2009 -0700
+++ b/packages/SUNWxorg-compatlinks/prototype Mon Sep 28 09:30:54 2009 -0700
@@ -1,6 +1,6 @@
##########################################################################
#
-# Copyright 2008 Sun Microsystems, Inc. All rights reserved.
+# Copyright 2009 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
@@ -29,7 +29,7 @@
#
##########################################################################
#
-# ident "@(#)prototype 1.3 08/03/10 SMI"
+# ident "@(#)prototype 1.4 09/09/28 SMI"
#
# Symlinks for compatibility with X11 delivery locations on other systems
@@ -44,6 +44,6 @@
s none X11R6=X11
d none lib 0755 root bin
-s none lib/X11=../X11/lib
+d none lib/X11 0755 root bin
d none bin 0755 root bin
s none bin/X11=../X11/bin
--- a/packages/SUNWxwman/prototype_com Mon Sep 28 08:57:37 2009 -0700
+++ b/packages/SUNWxwman/prototype_com Mon Sep 28 09:30:54 2009 -0700
@@ -27,7 +27,7 @@
# or other dealings in this Software without prior written authorization
# of the copyright holder.
#
-# ident "@(#)prototype_com 35.121 09/09/15 SMI"
+# ident "@(#)prototype_com 35.122 09/09/28 SMI"
#
# X Window System online user man pages
@@ -53,7 +53,6 @@
d none openwin/share/man/man1 0755 root bin
f none openwin/share/man/man1/makepsres.1 0444 root bin
f none openwin/share/man/man1/pswrap.1 0444 root bin
-f none openwin/share/man/man1/xdm.1 0444 root bin
!search $HOME/man4
d none openwin/share/man/man4 0755 root bin
--- a/packages/SUNWxwopt/prototype Mon Sep 28 08:57:37 2009 -0700
+++ b/packages/SUNWxwopt/prototype Mon Sep 28 09:30:54 2009 -0700
@@ -1,5 +1,6 @@
#
# Copyright 2009 Sun Microsystems, Inc. All rights reserved.
+# Use is subject to license terms.
#
# Permission is hereby granted, free of charge, to any person obtaining a
# copy of this software and associated documentation files (the
@@ -26,7 +27,7 @@
# or other dealings in this Software without prior written authorization
# of the copyright holder.
#
-# ident "@(#)prototype 35.74 09/07/29 SMI"
+# ident "@(#)prototype 35.75 09/09/28 SMI"
##
# nonessential X core clients and server extensions
@@ -41,74 +42,17 @@
!search $HOME/openwin/bin
d none openwin/bin 0755 root bin
f none openwin/bin/pswrap 0755 root bin
-f none openwin/bin/xdm 0755 root bin
-f none openwin/bin/xdmshell 0755 root bin
-
-d none openwin/lib 0755 root bin
-d none openwin/lib/X11 0755 root bin
-d none openwin/lib/app-defaults 0755 root bin
-s none openwin/lib/X11/app-defaults/= ../app-defaults
# modified from original
!search $HOME/X11/share/X11/twm
d none X11/share 0755 root bin
d none X11/share/X11 0755 root bin
d none X11/share/X11/twm 0755 root bin
-s none X11/share/X11/system.twmrc= ./twm/system.twmrc
+s none X11/share/X11/system.twmrc=./twm/system.twmrc
f none X11/share/X11/twm/system.twmrc 0644 root bin
-#d none openwin/lib/xdm 0755 root bin
-#!search $HOME/openwin/lib/xdm
-#f none openwin/lib/xdm/StartOW 0755 root bin
-#f none openwin/lib/xdm/Startup 0755 root bin
-#f none openwin/lib/xdm/Reset 0755 root bin
-##f none openwin/lib/xdm/Xreset 0775 root bin
-#f none openwin/lib/xdm/Xresources 0644 root bin
-#f none openwin/lib/xdm/Xservers 0644 root bin
-#f none openwin/lib/xdm/Xsession 0755 root bin
-#f none openwin/lib/xdm/xdm-config 0644 root bin
-##f none openwin/lib/xdm/xrdb.sh 0775 root bin
-#s none openwin/lib/xdm/chooser=../X11/xdm/chooser
-
-# There is a new path to xdm in r6 keep old version around
-# for compatibility
-
-#!search $HOME/openwin/lib/xdm
-#d none openwin/lib/xdm 0755 root bin
-
-#f none openwin/lib/xdm/GiveConsole 0755 root bin
-#f none openwin/lib/xdm/TakeConsole 0755 root bin
-#f none openwin/lib/xdm/Xaccess 0755 root bin
-#f none openwin/lib/xdm/Xsetup_0 0755 root bin
-
-
-# new place for xdm in r6
-
-!search $HOME/openwin/lib/X11/xdm
-d none openwin/lib/X11/xdm 0755 root bin
-
-#s none openwin/lib/X11/xdm/GiveConsole=../../xdm/GiveConsole
-#s none openwin/lib/X11/xdm/TakeConsole=../../xdm/TakeConsole
-#s none openwin/lib/X11/xdm/Xaccess=../../xdm/Xaccess
-#s none openwin/lib/X11/xdm/Xsetup_0=../../xdm/Xsetup_0
-f none openwin/lib/X11/xdm/GiveConsole 0755 root bin
-f none openwin/lib/X11/xdm/TakeConsole 0755 root bin
-f none openwin/lib/X11/xdm/Xaccess 0755 root bin
-f none openwin/lib/X11/xdm/Xsetup_0 0755 root bin
-f none openwin/lib/X11/xdm/chooser 0755 root bin
-f none openwin/lib/X11/xdm/Xresources 0755 root bin
-f none openwin/lib/X11/xdm/Xservers 0755 root bin
-f none openwin/lib/X11/xdm/Xsession 0755 root bin
-f none openwin/lib/X11/xdm/Startup 0755 root bin
-f none openwin/lib/X11/xdm/Reset 0755 root bin
-s none openwin/lib/X11/xdm/libXdmGreet.so=./libXdmGreet.so.1.0
-f none openwin/lib/X11/xdm/libXdmGreet.so.1.0 0755 root bin
-f none openwin/lib/X11/xdm/xdm-config 0755 root bin
-f none openwin/lib/X11/xdm/StartX 0755 root bin
-
-!search $HOME/openwin/lib/xdm
-s none openwin/lib/xdm=X11/xdm
-
+d none openwin/lib 0755 root bin
+d none openwin/lib/X11 0755 root bin
s none openwin/lib/X11/config=../config
s none openwin/lib/config=../../X11/lib/X11/config
d none X11/lib/X11/config 0755 root bin
@@ -222,7 +166,7 @@
# no openwin link since it was never delivered into /usr/openwin
f none X11/bin/luit 0755 root bin
-#open-src/app/xclock
+# open-src/app/xclock
f none X11/bin/xclock 0755 root bin
s none openwin/bin/xclock=../../X11/bin/xclock
--- a/packages/SUNWxwplt/prototype_com Mon Sep 28 08:57:37 2009 -0700
+++ b/packages/SUNWxwplt/prototype_com Mon Sep 28 09:30:54 2009 -0700
@@ -27,7 +27,7 @@
# or other dealings in this Software without prior written authorization
# of the copyright holder.
#
-# "@(#)prototype_com 35.219 09/09/15 Sun Microsystems"
+# "@(#)prototype_com 35.220 09/09/28 Sun Microsystems"
#
# X Window System required core package
@@ -726,11 +726,6 @@
d none openwin/lib/X11 0755 root bin
#
-!search $HOME/openwin/lib/X11/app-defaults
-d none openwin/lib/app-defaults 0755 root bin
-s none openwin/lib/X11/app-defaults=../app-defaults
-f none openwin/lib/app-defaults/Chooser 0644 root bin
-
!search $HOME/X11/share/X11
# open-src/lib/libX11
d none X11/share 0755 root bin
@@ -1448,6 +1443,8 @@
f none X11/lib/X11/rstart/rstartd.real 0755 root bin
# Create links back to openwin
+d none openwin/lib/app-defaults 0755 root bin
+s none openwin/lib/X11/app-defaults=../app-defaults
s none openwin/lib/app-defaults/XClock=../../../X11/lib/X11/app-defaults/XClock
s none openwin/lib/app-defaults/Bitmap=../../../X11/lib/X11/app-defaults/Bitmap
s none openwin/lib/app-defaults/Bitmap-color=../../../X11/lib/X11/app-defaults/Bitmap-color
--- a/packages/upgrade-X Mon Sep 28 08:57:37 2009 -0700
+++ b/packages/upgrade-X Mon Sep 28 09:30:54 2009 -0700
@@ -31,7 +31,7 @@
#
###########################################################################
#
-# ident "@(#)upgrade-X 1.58 09/09/22 SMI"
+# ident "@(#)upgrade-X 1.59 09/09/28 SMI"
#
# Description: This script upgrades X software on a Solaris Nevada
# system. It should be run as root from a X package area.
@@ -174,6 +174,8 @@
SUNWvncviewer
SUNWsynergy
SUNWxcursor-themes
+ SUNWxdm-root
+ SUNWxdm
SUNWxorg-client-docs
SUNWxorg-client-programs
SUNWxorg-clientlibs