diff options
author | Pietro Cerutti <gahr@FreeBSD.org> | 2017-08-19 17:15:18 +0000 |
---|---|---|
committer | Pietro Cerutti <gahr@FreeBSD.org> | 2017-08-19 17:15:18 +0000 |
commit | 19192b35db6d6aee92be94c24e70f49b2336194c (patch) | |
tree | 4005f6179437f75b5609fad5f0c5c1b866638f0f /lang/tcl86/files | |
parent | 6b30b5cd0878e5edb1ed9d36dbed59faee471b80 (diff) | |
download | ports-19192b35db6d6aee92be94c24e70f49b2336194c.tar.gz ports-19192b35db6d6aee92be94c24e70f49b2336194c.zip |
lang/tcl86: update to 8.6.7
Announcement: https://sourceforge.net/p/tcl/mailman/message/35989025/
Notes
Notes:
svn path=/head/; revision=448343
Diffstat (limited to 'lang/tcl86/files')
-rw-r--r-- | lang/tcl86/files/patch-bug214205 | 64 | ||||
-rw-r--r-- | lang/tcl86/files/patch-unix-Makefile.in | 18 |
2 files changed, 9 insertions, 73 deletions
diff --git a/lang/tcl86/files/patch-bug214205 b/lang/tcl86/files/patch-bug214205 deleted file mode 100644 index 3e8f6cc5a552..000000000000 --- a/lang/tcl86/files/patch-bug214205 +++ /dev/null @@ -1,64 +0,0 @@ -Index: generic/tclListObj.c -================================================================== ---- generic/tclListObj.c -+++ generic/tclListObj.c -@@ -853,12 +853,15 @@ - */ - count = numElems - first; - } - - if (objc > LIST_MAX - (numElems - count)) { -- Tcl_SetObjResult(interp, Tcl_ObjPrintf( -- "max length of a Tcl list (%d elements) exceeded", LIST_MAX)); -+ if (interp != NULL) { -+ Tcl_SetObjResult(interp, Tcl_ObjPrintf( -+ "max length of a Tcl list (%d elements) exceeded", -+ LIST_MAX)); -+ } - return TCL_ERROR; - } - isShared = (listRepPtr->refCount > 1); - numRequired = numElems - count + objc; /* Known <= LIST_MAX */ - - -Index: generic/tclListObj.c -================================================================== ---- generic/tclListObj.c -+++ generic/tclListObj.c -@@ -895,15 +895,12 @@ - if (first >= numElems) { - first = numElems; /* So we'll insert after last element. */ - } - if (count < 0) { - count = 0; -- } else if (numElems < first+count || first+count < 0) { -- /* -- * The 'first+count < 0' condition here guards agains integer -- * overflow in determining 'first+count'. -- */ -+ } else if (first > INT_MAX - count /* Handle integer overflow */ -+ || numElems < first+count) { - - count = numElems - first; - } - - if (objc > LIST_MAX - (numElems - count)) { - -Index: generic/tclEnsemble.c -================================================================== ---- generic/tclEnsemble.c -+++ generic/tclEnsemble.c -@@ -3133,11 +3133,11 @@ - /* - * The length of the "replaced" list must be depth-1. Trim back - * any extra elements that might have been appended by failing - * pathways above. - */ -- (void) Tcl_ListObjReplace(NULL, replaced, depth-1, INT_MAX, 0, NULL); -+ (void) Tcl_ListObjReplace(NULL, replaced, depth-1, LIST_MAX, 0, NULL); - - /* - * TODO: Reconsider whether we ought to call CompileToInvokedCommand() - * when depth==1. In that case we are choosing to emit the - * INST_INVOKE_REPLACE bytecode when there is in fact no replacing - diff --git a/lang/tcl86/files/patch-unix-Makefile.in b/lang/tcl86/files/patch-unix-Makefile.in index bd078a811c26..fcf9e13f2609 100644 --- a/lang/tcl86/files/patch-unix-Makefile.in +++ b/lang/tcl86/files/patch-unix-Makefile.in @@ -116,20 +116,20 @@ @@ -841,31 +865,31 @@ install-libraries: libraries $(INSTALL_DATA) $$i "$(SCRIPT_INSTALL_DIR)"/http1.0; \ done; - @echo "Installing package http 2.8.9 as a Tcl Module"; -- @$(INSTALL_DATA) $(TOP_DIR)/library/http/http.tcl "$(SCRIPT_INSTALL_DIR)"/../tcl8/8.6/http-2.8.9.tm; -+ @$(INSTALL_DATA) $(TOP_DIR)/library/http/http.tcl "$(SCRIPT_INSTALL_DIR)"/http-2.8.9.tm; + @echo "Installing package http 2.8.11 as a Tcl Module"; +- @$(INSTALL_DATA) $(TOP_DIR)/library/http/http.tcl "$(SCRIPT_INSTALL_DIR)"/../tcl8/8.6/http-2.8.11.tm; ++ @$(INSTALL_DATA) $(TOP_DIR)/library/http/http.tcl "$(SCRIPT_INSTALL_DIR)"/http-2.8.11.tm; @echo "Installing package opt0.4 files to $(SCRIPT_INSTALL_DIR)/opt0.4/"; @for i in $(TOP_DIR)/library/opt/*.tcl ; \ do \ $(INSTALL_DATA) $$i "$(SCRIPT_INSTALL_DIR)"/opt0.4; \ done; - @echo "Installing package msgcat 1.6.0 as a Tcl Module"; -- @$(INSTALL_DATA) $(TOP_DIR)/library/msgcat/msgcat.tcl "$(SCRIPT_INSTALL_DIR)"/../tcl8/8.5/msgcat-1.6.0.tm; -+ @$(INSTALL_DATA) $(TOP_DIR)/library/msgcat/msgcat.tcl "$(SCRIPT_INSTALL_DIR)"/msgcat-1.6.0.tm; - @echo "Installing package tcltest 2.4.0 as a Tcl Module"; -- @$(INSTALL_DATA) $(TOP_DIR)/library/tcltest/tcltest.tcl "$(SCRIPT_INSTALL_DIR)"/../tcl8/8.5/tcltest-2.4.0.tm; -+ @$(INSTALL_DATA) $(TOP_DIR)/library/tcltest/tcltest.tcl "$(SCRIPT_INSTALL_DIR)"/tcltest-2.4.0.tm; + @echo "Installing package msgcat 1.6.1 as a Tcl Module"; +- @$(INSTALL_DATA) $(TOP_DIR)/library/msgcat/msgcat.tcl "$(SCRIPT_INSTALL_DIR)"/../tcl8/8.5/msgcat-1.6.1.tm; ++ @$(INSTALL_DATA) $(TOP_DIR)/library/msgcat/msgcat.tcl "$(SCRIPT_INSTALL_DIR)"/msgcat-1.6.1.tm; + @echo "Installing package tcltest 2.4.1 as a Tcl Module"; +- @$(INSTALL_DATA) $(TOP_DIR)/library/tcltest/tcltest.tcl "$(SCRIPT_INSTALL_DIR)"/../tcl8/8.5/tcltest-2.4.1.tm; ++ @$(INSTALL_DATA) $(TOP_DIR)/library/tcltest/tcltest.tcl "$(SCRIPT_INSTALL_DIR)"/tcltest-2.4.1.tm; @echo "Installing package platform 1.0.14 as a Tcl Module"; - @$(INSTALL_DATA) $(TOP_DIR)/library/platform/platform.tcl "$(SCRIPT_INSTALL_DIR)"/../tcl8/8.4/platform-1.0.14.tm; |