From 3b37e7ae6b65c313bdcf0bb4343fb2f1dd3277b5 Mon Sep 17 00:00:00 2001
From: Dirk Meyer <dinoex@FreeBSD.org>
Date: Wed, 14 Nov 2001 08:44:08 +0000
Subject:  Tcl will get hostname using uname(3). It seems FreeBSD's uname(3) 
 returns only 31 letters by /usr/include/sys/utsname.h.

 Problem was that configure detects uname(3) and uses uname(3) in
 the hostname-function, while gethostname gives more (=longer)
 information.

 keep uname around, as it is be used in TclpSetVariables.

 took maintainership 8.2

 apply a fix for unsafe tempfile handling from 8.3

PR:		18896
Submitted by:	yoshint@flab.fujitsu.co.jp
---
 lang/tcl84/Makefile                  |  2 +-
 lang/tcl84/files/patch-tclUnixPipe.c | 15 +++++++++++++++
 lang/tcl84/files/patch-tclUnixSock.c | 11 +++++++++++
 lang/tcl84/files/patch-tmpnam        | 15 ---------------
 4 files changed, 27 insertions(+), 16 deletions(-)
 create mode 100644 lang/tcl84/files/patch-tclUnixPipe.c
 create mode 100644 lang/tcl84/files/patch-tclUnixSock.c

(limited to 'lang/tcl84')

diff --git a/lang/tcl84/Makefile b/lang/tcl84/Makefile
index 3249f6b2aa3e..6d97c53ba62e 100644
--- a/lang/tcl84/Makefile
+++ b/lang/tcl84/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	tcl
 PORTVERSION=	8.3.4
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	lang tcl83
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	tcl
diff --git a/lang/tcl84/files/patch-tclUnixPipe.c b/lang/tcl84/files/patch-tclUnixPipe.c
new file mode 100644
index 000000000000..535259b7af2c
--- /dev/null
+++ b/lang/tcl84/files/patch-tclUnixPipe.c
@@ -0,0 +1,15 @@
+--- tclUnixPipe.c.orig	Wed Apr  4 00:54:39 2001
++++ tclUnixPipe.c	Thu May 10 22:00:30 2001
+@@ -195,10 +195,8 @@
+      * We should also check against making more then TMP_MAX of these.
+      */
+ 
+-    if (tmpnam(fileName) == NULL) {			/* INTL: Native. */
+-	return NULL;
+-    }
+-    fd = open(fileName, O_RDWR|O_CREAT|O_EXCL, 0666);	/* INTL: Native. */
++    strlcpy(fileName, "/var/tmp/tcltmp.XXXXXX", L_tmpnam);
++    fd = mkstemp(fileName);				/* INTL: Native. */
+     if (fd == -1) {
+ 	return NULL;
+     }
diff --git a/lang/tcl84/files/patch-tclUnixSock.c b/lang/tcl84/files/patch-tclUnixSock.c
new file mode 100644
index 000000000000..44f7e59d6789
--- /dev/null
+++ b/lang/tcl84/files/patch-tclUnixSock.c
@@ -0,0 +1,11 @@
+--- tclUnixSock.c.orig	Fri Apr 16 02:48:05 1999
++++ tclUnixSock.c	Wed Nov 14 09:25:20 2001
+@@ -80,7 +80,7 @@
+     }
+ 
+     native = NULL;
+-#ifndef NO_UNAME
++#if 0
+     (VOID *) memset((VOID *) &u, (int) 0, sizeof(struct utsname));
+     if (uname(&u) > -1) {				/* INTL: Native. */
+         hp = gethostbyname(u.nodename);			/* INTL: Native. */
diff --git a/lang/tcl84/files/patch-tmpnam b/lang/tcl84/files/patch-tmpnam
index 535259b7af2c..e69de29bb2d1 100644
--- a/lang/tcl84/files/patch-tmpnam
+++ b/lang/tcl84/files/patch-tmpnam
@@ -1,15 +0,0 @@
---- tclUnixPipe.c.orig	Wed Apr  4 00:54:39 2001
-+++ tclUnixPipe.c	Thu May 10 22:00:30 2001
-@@ -195,10 +195,8 @@
-      * We should also check against making more then TMP_MAX of these.
-      */
- 
--    if (tmpnam(fileName) == NULL) {			/* INTL: Native. */
--	return NULL;
--    }
--    fd = open(fileName, O_RDWR|O_CREAT|O_EXCL, 0666);	/* INTL: Native. */
-+    strlcpy(fileName, "/var/tmp/tcltmp.XXXXXX", L_tmpnam);
-+    fd = mkstemp(fileName);				/* INTL: Native. */
-     if (fd == -1) {
- 	return NULL;
-     }
-- 
cgit v1.2.3