# HG changeset patch
# User Liam Li<Liam.Li@Oracle.COM>
# Date 1310692891 25200
# Node ID f62f2053b65412572b6fa13c9384ad2864b6d38c
# Parent  7190c8bbb28d4cd32aa636f9941baf8982483273
7063147 migrate tcltls from SFW to userland

diff -r 7190c8bbb28d -r f62f2053b654 components/meta-packages/history/SUNWtcltls.p5m
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/components/meta-packages/history/SUNWtcltls.p5m	Thu Jul 14 18:21:31 2011 -0700
@@ -0,0 +1,34 @@
+#
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+# Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved.
+#
+
+#
+# Legacy package information for renamed SUNWtcltls package
+#
+
+set name=pkg.fmri value=pkg:/SUNWtcltls@1.6,5.11-0.133
+set name=pkg.renamed value=true
+
+set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
+
+depend fmri=runtime/tcl-8/tcl-openssl@1.6-0.133 type=require
+
diff -r 7190c8bbb28d -r f62f2053b654 components/tcltls/Makefile
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/components/tcltls/Makefile	Thu Jul 14 18:21:31 2011 -0700
@@ -0,0 +1,56 @@
+#
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+# Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved.
+#
+include ../../make-rules/shared-macros.mk
+
+COMPONENT_NAME=		tls
+COMPONENT_VERSION=	1.6
+COMPONENT_SRC=		$(COMPONENT_NAME)$(COMPONENT_VERSION)
+COMPONENT_ARCHIVE=	$(COMPONENT_SRC)-src.tar.gz
+COMPONENT_ARCHIVE_HASH=	sha1:badee4d0a096e9951ffc1f82a6530f78b2404a2c
+COMPONENT_ARCHIVE_URL=	http://sourceforge.net/projects/tls/files/tls/$(COMPONENT_VERSION)/$(COMPONENT_ARCHIVE)/download
+
+include ../../make-rules/prep.mk
+include ../../make-rules/configure.mk
+include ../../make-rules/ips.mk
+
+CONFIGURE_ENV += $(CONFIGURE_ENV.$(BITS))
+CONFIGURE_ENV.64 +=	MACH64DIR="$(MACH64)"
+
+CONFIGURE_OPTIONS +=	--with-tclinclude=/usr/include
+CONFIGURE_OPTIONS +=	--enable-shared
+CONFIGURE_OPTIONS +=	--enable-threads
+CONFIGURE_OPTIONS +=	CFLAGS="$(CFLAGS) -KPIC -xstrconst"
+CONFIGURE_OPTIONS +=	--with-tcl=$(CONFIGURE_LIBDIR.$(BITS))
+CONFIGURE_OPTIONS.64 += --enable-64bit
+
+COMPONENT_TEST_TARGETS = test
+
+build:		$(BUILD_32_and_64)
+
+install:	$(INSTALL_32_and_64)
+
+test:		$(TEST_32_and_64)
+
+BUILD_PKG_DEPENDENCIES =	$(BUILD_TOOLS)
+
+include ../../make-rules/depend.mk
diff -r 7190c8bbb28d -r f62f2053b654 components/tcltls/patches/tls.tcl.patch
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/components/tcltls/patches/tls.tcl.patch	Thu Jul 14 18:21:31 2011 -0700
@@ -0,0 +1,64 @@
+--- tls1.6/tls.tcl	Thu Mar 20 03:52:12 2008
++++ tls1.6/tls.tcl	Mon Apr 21 16:36:08 2008
+@@ -26,6 +26,9 @@
+     # Irrelevant to unixoids, but for Windows this enables the OS to find
+     # the dependent DLL's in the CWD, where they may be.
+     set cwd [pwd]
++    if {$::tcl_platform(wordSize) == 8} {
++	append dir "/64"
++    }
+     catch {cd $dir}
+     set res [catch {uplevel #0 [list load [file join [pwd] $dll]]} err]
+     catch {cd $cwd}
+--- tls1.6/configure	Wed Mar 19 15:37:51 2008
++++ tls1.6/configure	Mon Jul  4 23:20:00 2011
+@@ -8738,8 +8738,8 @@
+ echo "$as_me: WARNING: 64bit mode not supported with GCC on $system" >&2;}
+ 		    else
+ 			do64bit_ok=yes
+-			CFLAGS="$CFLAGS -xarch=amd64"
+-			LDFLAGS="$LDFLAGS -xarch=amd64"
++			CFLAGS="$CFLAGS -m64"
++			LDFLAGS="$LDFLAGS -m64"
+ 		    fi
+ 		else
+ 		    { echo "$as_me:$LINENO: WARNING: 64bit mode not supported for $arch" >&5
+@@ -10126,7 +10126,12 @@
+     eval "LD_SEARCH_FLAGS=\"${LD_SEARCH_FLAGS}\""
+     if test -n "${OPENSSL}"; then
+ 
+-    vars="${LD_SEARCH_FLAGS} -L${SSL_LIB_DIR} -lssl -lcrypto ${GCCPATH} ${GCCLIB}"
++    if test "${with_ssl_dir+set}" = set; then
++        vars="${LD_SEARCH_FLAGS} -L${SSL_LIB_DIR} -lssl -lcrypto ${GCCPATH} ${GCCLIB}"
++    else
++        vars="${LD_SEARCH_FLAGS} -lssl -lcrypto ${GCCPATH} ${GCCLIB}"
++    fi
++
+     for i in $vars; do
+ 	if test "${TEA_PLATFORM}" = "windows" -a "$GCC" = "yes" ; then
+ 	    # Convert foo.lib to -lfoo for GCC.  No-op if not *.lib
+@@ -10170,6 +10175,11 @@
+         else
+             TCLSH_PROG="${TCL_BIN_DIR}/tclsh"
+         fi
++        if test "$do64bit_ok" = "yes" ; then
++            TCLSH_PROG="${TCL_BIN_DIR}/${MACH64DIR}/${TCLSH_PROG}"
++        else
++            TCLSH_PROG="${TCL_BIN_DIR}/${TCLSH_PROG}"
++        fi
+     else
+         # tclConfig.sh is in install location
+         if test "${TEA_PLATFORM}" = "windows"; then
+@@ -10186,7 +10196,11 @@
+                 break
+             fi
+         done
+-        TCLSH_PROG="${REAL_TCL_BIN_DIR}/${TCLSH_PROG}"
++        if test "$do64bit_ok" = "yes" ; then
++            TCLSH_PROG="${REAL_TCL_BIN_DIR}/${MACH64DIR}/${TCLSH_PROG}"
++        else
++            TCLSH_PROG="${REAL_TCL_BIN_DIR}/${TCLSH_PROG}"
++        fi
+     fi
+     echo "$as_me:$LINENO: result: ${TCLSH_PROG}" >&5
+ echo "${ECHO_T}${TCLSH_PROG}" >&6
diff -r 7190c8bbb28d -r f62f2053b654 components/tcltls/tcltls.license
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/components/tcltls/tcltls.license	Thu Jul 14 18:21:31 2011 -0700
@@ -0,0 +1,53 @@
+Copyright (C) 1997-2000 Matt Newman <matt@novadigm.com>
+Copyright (C) 2000 Ajuba Solutions
+Copyright (C) 2008 ActiveState Software Inc.
+Copyright (c) 2001-2002 David Gravereaux.
+Copyright (c) 2003-2008 Patrick Thoyts
+Copyright (C) 2004 Pat Thoyts <patthoyts@users.sf.net>
+Copyright (c) 1994-1996 Sun Microsystems, Inc.
+Copyright (c) 2003-2006 Pat Thoyts
+Copyright (c) 1998-2000 Ajuba Solutions. 
+Copyright (C) 2004 Starfish Systems 
+Copyright (C) 2003 Free Software Foundation, Inc.
+Copyright (c) 2002-2005 ActiveState Corporation.
+Copyright (C) 1997-2000 Sensus Consulting Ltd.
+
+This software is copyrighted by Matt Newman <matt@novadigm.com> and other parties.
+The following terms apply to all files associated with the software
+unless explicitly disclaimed in individual files.
+
+The authors hereby grant permission to use, copy, modify, distribute,
+and license this software and its documentation for any purpose, provided
+that existing copyright notices are retained in all copies and that this
+notice is included verbatim in any distributions. No written agreement,
+license, or royalty fee is required for any of the authorized uses.
+Modifications to this software may be copyrighted by their authors
+and need not follow the licensing terms described here, provided that
+the new terms are clearly indicated on the first page of each file where
+they apply.
+
+IN NO EVENT SHALL THE AUTHORS OR DISTRIBUTORS BE LIABLE TO ANY PARTY
+FOR DIRECT, INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES
+ARISING OUT OF THE USE OF THIS SOFTWARE, ITS DOCUMENTATION, OR ANY
+DERIVATIVES THEREOF, EVEN IF THE AUTHORS HAVE BEEN ADVISED OF THE
+POSSIBILITY OF SUCH DAMAGE.
+
+THE AUTHORS AND DISTRIBUTORS SPECIFICALLY DISCLAIM ANY WARRANTIES,
+INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE, AND NON-INFRINGEMENT.  THIS SOFTWARE
+IS PROVIDED ON AN "AS IS" BASIS, AND THE AUTHORS AND DISTRIBUTORS HAVE
+NO OBLIGATION TO PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR
+MODIFICATIONS.
+
+GOVERNMENT USE: If you are acquiring this software on behalf of the
+U.S. government, the Government shall have only "Restricted Rights"
+in the software and related documentation as defined in the Federal 
+Acquisition Regulations (FARs) in Clause 52.227.19 (c) (2).  If you
+are acquiring the software on behalf of the Department of Defense, the
+software shall be classified as "Commercial Computer Software" and the
+Government shall have only "Restricted Rights" as defined in Clause
+252.227-7013 (c) (1) of DFARs.  Notwithstanding the foregoing, the
+authors grant the U.S. Government and others acting in its behalf
+permission to use and distribute the software in accordance with the
+terms specified in this license. 
+
diff -r 7190c8bbb28d -r f62f2053b654 components/tcltls/tcltls.p5m
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/components/tcltls/tcltls.p5m	Thu Jul 14 18:21:31 2011 -0700
@@ -0,0 +1,60 @@
+#
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+# Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved.
+#
+<transform file path=usr.*/man/.+ -> default mangler.man.stability uncommitted>
+set name=pkg.fmri \
+    value=pkg:/runtime/tcl-8/tcl-openssl@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
+set name=pkg.summary value="Tcl binding to openssl toolkit"
+set name=info.classification \
+    value="org.opensolaris.category.2008:Development/Other Languages"
+set name=info.source_url value=$(COMPONENT_ARCHIVE_URL)
+set name=info.upstream_url value=http://tls.sourceforge.net/
+set name=opensolaris.arc_url \
+    value=http://arc.opensolaris.org/caselog/PSARC/2008/266
+set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
+dir path=usr
+dir path=usr/include
+dir path=usr/lib
+dir path=usr/lib/tcl8.5
+dir path=usr/lib/tcl8.5/tls$(COMPONENT_VERSION)
+dir path=usr/lib/tcl8.5/tls$(COMPONENT_VERSION)/$(MACH64)
+dir path=usr/share
+dir path=usr/share/doc
+dir path=usr/share/doc/tls-$(COMPONENT_VERSION)
+dir path=usr/share/doc/tls-$(COMPONENT_VERSION)/html
+dir path=usr/share/man
+dir path=usr/share/man/man1t
+file path=usr/include/tls.h
+file usr/lib/$(MACH64)/tls$(COMPONENT_VERSION)/libtls$(COMPONENT_VERSION).so \
+    path=usr/lib/tcl8.5/tls$(COMPONENT_VERSION)/$(MACH64)/libtls$(COMPONENT_VERSION).so
+file usr/lib/tls$(COMPONENT_VERSION)/libtls1.6.so \
+    path=usr/lib/tcl8.5/tls$(COMPONENT_VERSION)/libtls$(COMPONENT_VERSION).so
+file usr/lib/tls$(COMPONENT_VERSION)/pkgIndex.tcl \
+    path=usr/lib/tcl8.5/tls$(COMPONENT_VERSION)/pkgIndex.tcl
+file usr/lib/tls$(COMPONENT_VERSION)/tls.tcl \
+    path=usr/lib/tcl8.5/tls$(COMPONENT_VERSION)/tls.tcl
+file tls.htm path=usr/share/doc/tls-$(COMPONENT_VERSION)/html/tls.htm
+file tls.1t.sunman path=usr/share/man/man1t/tls.1t
+link path=usr/lib/tcl8.5/tls$(COMPONENT_VERSION)/64 target=./$(MACH64)
+legacy pkg=SUNWtcltls desc="Tcl binding to openssl toolkit (1.6)" \
+    name="Tcl binding to openssl toolkit"
+license tcltls.license license=BSD-like
diff -r 7190c8bbb28d -r f62f2053b654 components/tcltls/tls.1t.sunman
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/components/tcltls/tls.1t.sunman	Thu Jul 14 18:21:31 2011 -0700
@@ -0,0 +1,33 @@
+'\" t
+.\" ident	"@(#)tls.1t.sunman	1.2	10/03/16 SMI"
+.\"
+.\" This man page created by Oracle to provide an overview of the tls
+.\"
+.TH "tls" 1T 1.6 tls "Tcl Extension Packages"
+.SH NAME
+tls \- binding to Openssl Toolkit.
+.SH DESCRIPTION
+This extension provides a generic binding to OpenSSL, utilizing the
+Tcl_StackChannel API for Tcl 8.2 and higher. The sockets behave exactly the
+same as channels created using Tcl's built-in socket command with additional 
+options for controlling the SSL session.
+.LP
+For the usage of the tls, see:
+.IP
+.B /usr/share/doc/tls-1.6/html/tls.htm
+.LP
+.SH LICENSE
+To view the license terms, attribution, and copyright for tls, run
+"pkg info --license runtime/tcl-8/tcl-openssl".
+.SH FILES
+.PD 0
+.TP 20
+/usr/lib/tcl8.5/tls1.6/libtls1.6.so
+shared object
+.TP
+/usr/lib/tcl8.5/tls1.6/tls.tcl 
+tcl script for the extension
+.PD
+.SH "SEE ALSO"
+openssl(5), libtcl(3)
+