Index: head/devel/tcltls/Makefile =================================================================== --- head/devel/tcltls/Makefile (revision 397224) +++ head/devel/tcltls/Makefile (revision 397225) @@ -1,51 +1,51 @@ # Created by: mi@aldan.algebra.com # $FreeBSD$ PORTNAME= tcltls -PORTVERSION= 1.6.4 +PORTVERSION= 1.6.7 CATEGORIES= devel tcl MASTER_SITES= SF/tls/tls/${PORTVERSION} DISTNAME= tls${PORTVERSION}-src MAINTAINER= mi@aldan.algebra.com COMMENT= SSL extensions for TCL; dynamicly loadable 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= DOCS USES+= tcl USE_OPENSSL= yes GNU_CONFIGURE= yes CONFIGURE_ARGS+=--exec-prefix=${PREFIX} \ --with-tcl=${TCL_LIBDIR} \ --with-ssl-dir=${OPENSSLBASE} TCLPKG= tls${PORTVERSION} WRKSRC= ${WRKDIR}/${TCLPKG} PLIST_FILES= include/tls.h \ lib/${TCLPKG}/libtls.so.1 \ lib/${TCLPKG}/pkgIndex.tcl \ lib/${TCLPKG}/tls.tcl PORTDOCS= * post-patch: ${REINPLACE_CMD} -e \ 's,package require tls.*,load ${WRKSRC}/libtls.so.1;\ source ${WRKSRC}/tls.tcl,' \ ${WRKSRC}/tests/*.test # The tests in ciphers.test are meaningless so far: ${MV} ${WRKSRC}/tests/ciphers.test ${WRKSRC}/tests/ciphers.test.broken post-install-DOCS-on: ${MKDIR} ${STAGEDIR}${DOCSDIR} ${INSTALL_DATA} ${WRKSRC}/tls.htm ${STAGEDIR}${DOCSDIR} xregression-test test check: build cd ${WRKSRC}/tests && ${SETENV} TCL_LIBRARY="${WRKSRC}" \ tclsh${TCL_VER} all.tcl .include Index: head/devel/tcltls/distinfo =================================================================== --- head/devel/tcltls/distinfo (revision 397224) +++ head/devel/tcltls/distinfo (revision 397225) @@ -1,2 +1,2 @@ -SHA256 (tls1.6.4-src.tar.gz) = 0cd2c5552244c55747092e30ace17eb728d130c9a2bd489b26fc7c9f3669e4b8 -SIZE (tls1.6.4-src.tar.gz) = 171517 +SHA256 (tls1.6.7-src.tar.gz) = 5119de3e5470359b97a8a00d861c9c48433571ee0167af0a952de66c99d3a3b8 +SIZE (tls1.6.7-src.tar.gz) = 173654 Index: head/devel/tcltls/files/patch-protocols =================================================================== --- head/devel/tcltls/files/patch-protocols (revision 397224) +++ head/devel/tcltls/files/patch-protocols (revision 397225) @@ -1,130 +1,121 @@ --- tls.c 2014-12-08 14:10:28.000000000 -0500 +++ tls.c 2015-03-25 19:37:53.000000000 -0400 -@@ -64,6 +64,6 @@ - Tcl_Interp *interp, int objc, Tcl_Obj *CONST objv[])); - --static SSL_CTX *CTX_Init _ANSI_ARGS_((State *statePtr, int proto, char *key, -- char *cert, char *CAdir, char *CAfile, char *ciphers)); -+static SSL_CTX *CTX_Init _ANSI_ARGS_((State *statePtr, int proto, const char *key, -+ const char *cert, const char *CAdir, const char *CAfile, const char *ciphers)); - - static int TlsLibInit _ANSI_ARGS_ (()) ; @@ -538,5 +538,5 @@ case TLS_SSL2: #if defined(NO_SSL2) - Tcl_AppendResult(interp, "protocol not supported", NULL); + Tcl_AppendResult(interp, protocols[index], ": protocol not supported", NULL); return TCL_ERROR; #else @@ -545,5 +545,5 @@ case TLS_SSL3: #if defined(NO_SSL3) - Tcl_AppendResult(interp, "protocol not supported", NULL); + Tcl_AppendResult(interp, protocols[index], ": protocol not supported", NULL); return TCL_ERROR; #else @@ -552,5 +552,5 @@ case TLS_TLS1: #if defined(NO_TLS1) - Tcl_AppendResult(interp, "protocol not supported", NULL); + Tcl_AppendResult(interp, protocols[index], ": protocol not supported", NULL); return TCL_ERROR; #else @@ -559,5 +559,5 @@ case TLS_TLS1_1: #if defined(NO_TLS1_1) - Tcl_AppendResult(interp, "protocol not supported", NULL); + Tcl_AppendResult(interp, protocols[index], ": protocol not supported", NULL); return TCL_ERROR; #else @@ -566,5 +566,5 @@ case TLS_TLS1_2: #if defined(NO_TLS1_2) - Tcl_AppendResult(interp, "protocol not supported", NULL); + Tcl_AppendResult(interp, protocols[index], ": protocol not supported", NULL); return TCL_ERROR; #else @@ -575,10 +575,10 @@ } if (ctx == NULL) { - Tcl_AppendResult(interp, REASON(), (char *) NULL); + Tcl_AppendResult(interp, REASON(), NULL); return TCL_ERROR; } ssl = SSL_new(ctx); if (ssl == NULL) { - Tcl_AppendResult(interp, REASON(), (char *) NULL); + Tcl_AppendResult(interp, REASON(), NULL); SSL_CTX_free(ctx); return TCL_ERROR; @@ -747,6 +747,18 @@ #endif int tls1 = 1; - int tls1_1 = 1; - int tls1_2 = 1; + int tls1_1 = +#if defined(NO_TLS1_1) + 0 +#else + 1 +#endif + ; + int tls1_2 = +#if defined(NO_TLS1_2) + 0 +#else + 1 +#endif + ; int proto = 0; int verify = 0, require = 0, request = 1; @@ -1029,9 +1029,9 @@ State *statePtr; int proto; - char *key; - char *cert; - char *CAdir; - char *CAfile; - char *ciphers; + const char *key; + const char *cert; + const char *CAdir; + const char *CAfile; + const char *ciphers; { Tcl_Interp *interp = statePtr->interp; @@ -1050,5 +1050,5 @@ #if defined(NO_SSL2) if (ENABLED(proto, TLS_PROTO_SSL2)) { - Tcl_AppendResult(interp, "protocol not supported", NULL); + Tcl_AppendResult(interp, "protocol SSL2 not supported", NULL); return (SSL_CTX *)0; } @@ -1056,5 +1056,5 @@ #if defined(NO_SSL3) if (ENABLED(proto, TLS_PROTO_SSL3)) { - Tcl_AppendResult(interp, "protocol not supported", NULL); + Tcl_AppendResult(interp, "protocol SSL3 not supported", NULL); return (SSL_CTX *)0; } @@ -1062,5 +1062,5 @@ #if defined(NO_TLS1) if (ENABLED(proto, TLS_PROTO_TLS1)) { - Tcl_AppendResult(interp, "protocol not supported", NULL); + Tcl_AppendResult(interp, "protocol TLS1 not supported", NULL); return (SSL_CTX *)0; } @@ -1068,5 +1068,5 @@ #if defined(NO_TLS1_1) if (ENABLED(proto, TLS_PROTO_TLS1_1)) { - Tcl_AppendResult(interp, "protocol not supported", NULL); + Tcl_AppendResult(interp, "protocol TLS1.1 not supported", NULL); return (SSL_CTX *)0; } @@ -1074,5 +1074,5 @@ #if defined(NO_TLS1_2) if (ENABLED(proto, TLS_PROTO_TLS1_2)) { - Tcl_AppendResult(interp, "protocol not supported", NULL); + Tcl_AppendResult(interp, "protocol TLS1.2 not supported", NULL); return (SSL_CTX *)0; }