Index: head/lang/tcl85/Makefile =================================================================== --- head/lang/tcl85/Makefile (revision 425330) +++ head/lang/tcl85/Makefile (revision 425331) @@ -1,71 +1,72 @@ # Created by: Martin Matuska # $FreeBSD$ PORTNAME= tcl PORTVERSION= 8.5.19 +PORTREVISION= 1 CATEGORIES= lang MASTER_SITES= TCLTK/tcl8_5 \ SF/tcl/Tcl/${PORTVERSION} PKGNAMESUFFIX= ${SHORT_TCL_VER} DISTNAME= ${PORTNAME}${PORTVERSION}-src MAINTAINER= tcltk@FreeBSD.org COMMENT= Tool Command Language LICENSE= TclTk LICENSE_NAME= Tcl/Tk License LICENSE_FILE= ${WRKSRC}/../license.terms LICENSE_PERMS= dist-mirror dist-sell pkg-mirror pkg-sell auto-accept OPTIONS_DEFINE= TCLMAN TZDATA MODULES THREADS OPTIONS_DEFAULT=MODULES THREADS TCLMAN_DESC= Install Tcl function manpages TZDATA_DESC= Install Tcl timezone data MODULES_DESC= Install Tcl common modules OPTIONS_SUB= yes WRKSRC= ${WRKDIR}/${DISTNAME:S/-src//:S/rc1//}/unix ALL_TARGET= all INSTALL_TARGET= install install-libraries TEST_TARGET= do-test USE_LDCONFIG= yes GNU_CONFIGURE= yes CONFIGURE_ARGS= --enable-shared \ --enable-man-suffix=.${MAN_SUFFIX} \ --includedir=${PREFIX}/include/tcl${TCL_VER} CONFIGURE_ENV= PORTSDIR=${PORTSDIR} TCL_VER= 8.5 SHORT_TCL_VER= ${TCL_VER:S/8./8/} MAN_SUFFIX= ${PORTNAME}${SHORT_TCL_VER} MAKE_ENV= SHORT_TCL_VER=${SHORT_TCL_VER} \ MAN_SUFFIX=.${MAN_SUFFIX} \ LANG=C LC_ALL=C PLIST_SUB= TCL_VER=${TCL_VER} \ SHORT_TCL_VER=${SHORT_TCL_VER} TCLMAN_VARS= INSTALL_TARGET+=install-doc MODULES_VARS= INSTALL_TARGET+=install-tm THREADS_CONFIGURE_ENABLE= threads TZDATA_CONFIGURE_WITH= tzdata post-patch: ${REINPLACE_CMD} -e \ 's|@TCL_BUILD_LIB_SPEC@|@TCL_LIB_SPEC@|; \ s|@TCL_BUILD_STUB_LIB_SPEC@|@TCL_STUB_LIB_SPEC@|; \ s|@TCL_BUILD_STUB_LIB_PATH@|@TCL_STUB_LIB_PATH@|; \ s|@TCL_SRC_DIR@|${PREFIX}/include/tcl${TCL_VER}|' \ ${WRKSRC}/tclConfig.sh.in post-configure: ${REINPLACE_CMD} \ -e 's,-DNO_MEMMOVE=1,,' -e 's,-DNO_STRING_H=1,,' \ -e 's,^COMPAT_OBJS.*,,' ${WRKSRC}/Makefile do-test: ${SETENV} ${MAKE_ENV} ${MAKE} -C ${WRKSRC} test .include Index: head/lang/tcl85/files/patch-bug214205 =================================================================== --- head/lang/tcl85/files/patch-bug214205 (nonexistent) +++ head/lang/tcl85/files/patch-bug214205 (revision 425331) @@ -0,0 +1,46 @@ +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 +@@ -844,15 +844,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)) { + if (interp != NULL) { + Property changes on: head/lang/tcl85/files/patch-bug214205 ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property