summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--devel/tcltls/Makefile5
-rw-r--r--devel/tcltls/distinfo4
-rw-r--r--devel/tcltls/files/patch-warnings29
3 files changed, 20 insertions, 18 deletions
diff --git a/devel/tcltls/Makefile b/devel/tcltls/Makefile
index 13e6b5b..187f504 100644
--- a/devel/tcltls/Makefile
+++ b/devel/tcltls/Makefile
@@ -2,8 +2,7 @@
# $FreeBSD$
PORTNAME= tcltls
-PORTVERSION= 1.6
-PORTREVISION= 2
+PORTVERSION= 1.6.4
CATEGORIES= devel tcl
MASTER_SITES= SF/tls/tls/${PORTVERSION}
DISTNAME= tls${PORTVERSION}-src
@@ -28,7 +27,7 @@ CONFIGURE_ARGS+=--exec-prefix=${PREFIX} \
TCLPKG= tls${PORTVERSION}
WRKSRC= ${WRKDIR}/${TCLPKG}
PLIST_FILES= include/tls.h \
- lib/${TCLPKG}/lib${TCLPKG}.so \
+ lib/${TCLPKG}/libtls.so.1 \
lib/${TCLPKG}/pkgIndex.tcl \
lib/${TCLPKG}/tls.tcl
PORTDOCS= *
diff --git a/devel/tcltls/distinfo b/devel/tcltls/distinfo
index 080d230..1478f8f 100644
--- a/devel/tcltls/distinfo
+++ b/devel/tcltls/distinfo
@@ -1,2 +1,2 @@
-SHA256 (tls1.6-src.tar.gz) = adec50143a9ad634a671d24f7c7bbf2455487eb5f12d290f41797c32a98b93f3
-SIZE (tls1.6-src.tar.gz) = 168043
+SHA256 (tls1.6.4-src.tar.gz) = 0cd2c5552244c55747092e30ace17eb728d130c9a2bd489b26fc7c9f3669e4b8
+SIZE (tls1.6.4-src.tar.gz) = 171517
diff --git a/devel/tcltls/files/patch-warnings b/devel/tcltls/files/patch-warnings
index 765f844..716aa45 100644
--- a/devel/tcltls/files/patch-warnings
+++ b/devel/tcltls/files/patch-warnings
@@ -85,28 +85,23 @@
for (;;) {
---- tls.c.orig 2008-03-19 23:06:13.000000000 +0100
-+++ tls.c 2013-10-22 14:32:14.000000000 +0200
-@@ -468,7 +468,7 @@
- "ssl2", "ssl3", "tls1", NULL
+--- tls.c 2014-12-08 14:10:28.000000000 -0500
++++ tls.c 2015-03-25 18:22:52.000000000 -0400
+@@ -514,5 +514,5 @@
};
enum protocol {
-- TLS_SSL2, TLS_SSL3, TLS_TLS1, TLS_NONE
-+ TLS_SSL2, TLS_SSL3, TLS_TLS1
+- TLS_SSL2, TLS_SSL3, TLS_TLS1, TLS_TLS1_1, TLS_TLS1_2, TLS_NONE
++ TLS_SSL2, TLS_SSL3, TLS_TLS1, TLS_TLS1_1, TLS_TLS1_2,
};
Tcl_Obj *objPtr;
- SSL_CTX *ctx = NULL;
-@@ -1225,7 +1225,7 @@
- Tcl_Obj *CONST objv[];
+@@ -1361,5 +1361,5 @@
{
- CONST84 char *commands [] = { "req", NULL };
+ static CONST84 char *commands [] = { "req", NULL };
- enum command { C_REQ, C_DUMMY };
+ enum command { C_REQ };
int cmd;
- if (objc < 2) {
-@@ -1329,13 +1329,13 @@
-
+@@ -1465,11 +1465,11 @@
name=X509_get_subject_name(cert);
- X509_NAME_add_entry_by_txt(name,"C", MBSTRING_ASC, k_C, -1, -1, 0);
@@ -125,4 +120,12 @@
+ X509_NAME_add_entry_by_txt(name,"Email", MBSTRING_ASC, (const unsigned char *)k_Email, -1, -1, 0);
X509_set_subject_name(cert,name);
+--- tlsInt.h 2014-12-08 14:10:28.000000000 -0500
++++ tlsInt.h 2015-03-25 18:29:34.000000000 -0400
+@@ -18,5 +18,5 @@
+ *
+ */
+-#ifndef _TSLINT_H
++#ifndef _TLSINT_H
+ #define _TLSINT_H
OpenPOWER on IntegriCloud