7021972 rstart should be removed from Solaris [PSARC/2011/072]
authorAlan Coopersmith <Alan.Coopersmith@Oracle.COM>
Thu, 31 Mar 2011 14:07:34 -0700
changeset 1104 ad9538bd01b6
parent 1103 cd782ec1154c
child 1105 515c6398d9df
7021972 rstart should be removed from Solaris [PSARC/2011/072]
open-src/app/Makefile
open-src/app/rstart/Makefile
pkg/legacy/x11-network-rstart.mf
pkg/manifests/compatibility-packages-SUNWxwman.mf
pkg/manifests/compatibility-packages-SUNWxwplt.mf
pkg/manifests/x11-network-rstart.mf
--- a/open-src/app/Makefile	Tue Mar 29 18:50:33 2011 -0700
+++ b/open-src/app/Makefile	Thu Mar 31 14:07:34 2011 -0700
@@ -1,6 +1,6 @@
 # Makefile for X Consolidation Open Source Application modules
 #
-# 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"),
@@ -52,7 +52,6 @@
 	mkcookie \
 	oclock \
 	proxymngr \
-	rstart \
 	sessreg \
 	setxkbmap \
 	showfont \
@@ -130,6 +129,7 @@
 OS_SUBDIRS_i386 = $(OS_SUBDIRS_common)
 
 OBSOLETE_SUBDIRS = \
+	rstart \
 	xplsprinters \
 	xprehashprinterlist \
 	xscreensaver \
--- a/open-src/app/rstart/Makefile	Tue Mar 29 18:50:33 2011 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,56 +0,0 @@
-###############################################################################
-#
-# rstart 1.x Makefile
-#
-# Copyright (c) 2008, 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"),
-# to deal in the Software without restriction, including without limitation
-# the rights to use, copy, modify, merge, publish, distribute, sublicense,
-# and/or sell copies of the Software, and to permit persons to whom the
-# Software is furnished to do so, subject to the following conditions:
-#
-# The above copyright notice and this permission notice (including the next
-# paragraph) shall be included in all copies or substantial portions of the
-# Software.
-#
-# 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.  IN NO EVENT SHALL
-# THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-# 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.
-#
-#
-
-# Package name used in tarballs
-MODULE_NAME=rstart
-
-# pkg(5) name we deliver the files in (override default)
-MODULE_PKGNAME=x11/network/rstart
-MODULE_PKGNAME_SET=yes
-
-# Package classification (override default)
-MODULE_PKGCLASS=Applications/Internet
-MODULE_PKGCLASS_SET=yes
-
-# Version number (used in path names)
-MODULE_VERSION=1.0.4
-
-# Checksums for upstream tarball
-TARBALL_MD5  = eb82a6290dfbaa1fc09a3b7426b2eac2
-TARBALL_SHA1 = 92b1743af23e7bc8be732f314cba92dedf7907d3
-
-# Patches to apply to source after unpacking, in order
-SOURCE_PATCHES = 
-
-# Man pages to apply Sun footer to & attributes to list
-SUNTOUCHED_MANPAGES=*.man
-MODULE_STABILITY=Committed
-
-# Compatibility links from /usr/X11/bin to /usr/bin
-MODULE_X11_BINCOMPAT_LINKS = rstart rstartd
-
-include ../Makefile.inc
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/pkg/legacy/x11-network-rstart.mf	Thu Mar 31 14:07:34 2011 -0700
@@ -0,0 +1,23 @@
+# Copyright (c) 2010, 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"),
+# to deal in the Software without restriction, including without limitation
+# the rights to use, copy, modify, merge, publish, distribute, sublicense,
+# and/or sell copies of the Software, and to permit persons to whom the
+# Software is furnished to do so, subject to the following conditions:
+#
+# The above copyright notice and this permission notice (including the next
+# paragraph) shall be included in all copies or substantial portions of the
+# Software.
+#
+# 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.  IN NO EVENT SHALL
+# THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+# 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.
+#
+set name=pkg.fmri value=pkg:/x11/network/[email protected],5.11-0.164
+set name=pkg.obsolete value=true
--- a/pkg/manifests/compatibility-packages-SUNWxwman.mf	Tue Mar 29 18:50:33 2011 -0700
+++ b/pkg/manifests/compatibility-packages-SUNWxwman.mf	Thu Mar 31 14:07:34 2011 -0700
@@ -1,4 +1,4 @@
-# Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2010, 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"),
@@ -115,9 +115,6 @@
 # lib/libXpm
 depend fmri=pkg:/x11/library/libxpm type=require
 
-# app/rstart
-depend fmri=pkg:/x11/network/rstart type=require
-
 # app/lbxproxy, proxymgr, xfindproxy, xfwp
 depend fmri=pkg:/x11/network/x11-network-proxies type=require
 
--- a/pkg/manifests/compatibility-packages-SUNWxwplt.mf	Tue Mar 29 18:50:33 2011 -0700
+++ b/pkg/manifests/compatibility-packages-SUNWxwplt.mf	Thu Mar 31 14:07:34 2011 -0700
@@ -1,4 +1,4 @@
-# Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2010, 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"),
@@ -164,9 +164,6 @@
 # lib/libxtrans
 depend fmri=pkg:/x11/library/xtrans type=require
 
-# app/rstart
-depend fmri=pkg:/x11/network/rstart type=require
-
 # app/sessreg
 depend fmri=pkg:/x11/session/sessreg type=require
 
--- a/pkg/manifests/x11-network-rstart.mf	Tue Mar 29 18:50:33 2011 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,64 +0,0 @@
-# Copyright (c) 2010, 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"),
-# to deal in the Software without restriction, including without limitation
-# the rights to use, copy, modify, merge, publish, distribute, sublicense,
-# and/or sell copies of the Software, and to permit persons to whom the
-# Software is furnished to do so, subject to the following conditions:
-#
-# The above copyright notice and this permission notice (including the next
-# paragraph) shall be included in all copies or substantial portions of the
-# Software.
-#
-# 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.  IN NO EVENT SHALL
-# THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-# 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.
-#
-set name=pkg.fmri value=pkg:/x11/network/rstart@__version:rstart__
-set name=pkg.description \
-    value="Rstart is a simple implementation of a Remote Start client. It uses rsh as its underlying remote execution mechanism.   Use of rstart is deprecated, with use of ssh X forwarding recommended instead."
-set name=pkg.summary \
-    value="rstart - a sample implementation of a Remote Start client"
-dir path=usr
-dir path=usr/X11
-dir path=usr/X11/bin
-dir path=usr/bin
-dir path=usr/lib
-dir path=usr/lib/X11
-dir path=usr/lib/X11/rstart
-dir path=usr/lib/X11/rstart/commands
-dir path=usr/lib/X11/rstart/commands/x11r6
-dir path=usr/lib/X11/rstart/contexts
-dir path=usr/share
-dir path=usr/share/man
-dir path=usr/share/man/man1
-file path=usr/bin/rstart
-file path=usr/bin/rstartd
-file path=usr/lib/X11/rstart/commands/@List
-file path=usr/lib/X11/rstart/commands/ListContexts mode=0555
-file path=usr/lib/X11/rstart/commands/ListGenericCommands mode=0555
-file path=usr/lib/X11/rstart/commands/x11r6/@List
-file path=usr/lib/X11/rstart/commands/x11r6/LoadMonitor mode=0555
-file path=usr/lib/X11/rstart/commands/x11r6/Terminal mode=0555
-file path=usr/lib/X11/rstart/config
-file path=usr/lib/X11/rstart/contexts/@List
-file path=usr/lib/X11/rstart/contexts/default
-file path=usr/lib/X11/rstart/contexts/x11r6
-file path=usr/lib/X11/rstart/rstartd.real mode=0555
-file path=usr/share/man/man1/rstart.1
-file path=usr/share/man/man1/rstartd.1
-link path=usr/X11/bin/rstart target=../../bin/rstart
-link path=usr/X11/bin/rstartd target=../../bin/rstartd
-link path=usr/lib/X11/rstart/commands/x target=x11r6
-link path=usr/lib/X11/rstart/commands/x11 target=x11r6
-link path=usr/lib/X11/rstart/contexts/x target=x11r6
-link path=usr/lib/X11/rstart/contexts/x11 target=x11r6
-# rstartx runs remsh (rsh) to connect to remote hosts
-depend fmri=pkg:/service/network/network-clients type=require
-# rstartx runs xauth to extract cookies from .Xauthority
-depend fmri=pkg:/x11/session/xauth type=require