Doh, as I was pointed out by czarkoff@, I should run with cvs -N
and attached this time, seems that my TB messes around with
the patch.
Sebastian
Am 3/31/2015 um 8:38 AM schrieb Sebastian Reitenbach:
Am 3/30/2015 um 10:33 PM schrieb Sebastian Reitenbach:
Hi,
update to current version 1.6.4.
tested with net/coccinella on amd64.
sorry, patch wasn't against current.
OK?
cheers,
Sebastian
Index: Makefile
===================================================================
RCS file: /cvs/ports/security/tcltls/Makefile,v
retrieving revision 1.11
diff -u -r1.11 Makefile
--- Makefile 16 Mar 2015 18:07:55 -0000 1.11
+++ Makefile 31 Mar 2015 06:30:14 -0000
@@ -4,11 +4,10 @@
COMMENT= OpenSSL Tcl extension
-VERSION= 1.6
+VERSION = 1.6.4
DISTNAME= tls${VERSION}-src
PKGNAME= tcltls-${VERSION}
-SHARED_LIBS= tls16 1.0
-REVISION= 1
+SHARED_LIBS = tls164 0.0
CATEGORIES= security
@@ -19,7 +18,7 @@
# BSD
PERMIT_PACKAGE_CDROM= Yes
-WANTLIB= ssl crypto
+WANTLIB = pthread ssl crypto
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=tls/}
@@ -37,7 +36,7 @@
--with-tclinclude=${MODTCL_INCDIR} \
--with-ssl-dir=/usr \
--includedir=${PREFIX}/include/tcltls \
- LIBtls16_VERSION=${LIBtls16_VERSION}
+ SHLIB_VERSION=${LIBtls164_VERSION}
FAKE_FLAGS = PKG_DIR=tls
TEST_TARGET= test
CFLAGS += -DNO_SSL2
Index: distinfo
===================================================================
RCS file: /cvs/ports/security/tcltls/distinfo,v
retrieving revision 1.4
diff -u -r1.4 distinfo
--- distinfo 18 Jan 2015 03:15:08 -0000 1.4
+++ distinfo 31 Mar 2015 06:30:14 -0000
@@ -1,2 +1,2 @@
-SHA256 (tls1.6-src.tar.gz) =
rexQFDqa1jSmcdJPfHu/JFVIfrXxLSkPQXl8MqmLk/M=
-SIZE (tls1.6-src.tar.gz) = 168043
+SHA256 (tls1.6.4-src.tar.gz) =
DNLFVSJExVdHCS4wrOF+tyjRMMmivUibJvx8nzZp5Lg=
+SIZE (tls1.6.4-src.tar.gz) = 171517
Index: pkg/PLIST
===================================================================
RCS file: /cvs/ports/security/tcltls/pkg/PLIST,v
retrieving revision 1.2
diff -u -r1.2 PLIST
--- pkg/PLIST 5 Jan 2011 18:04:58 -0000 1.2
+++ pkg/PLIST 31 Mar 2015 06:30:14 -0000
@@ -2,7 +2,7 @@
include/tcltls/
include/tcltls/tls.h
lib/tcl/tls/
-@lib lib/tcl/tls/libtls16.so.${LIBtls16_VERSION}
+@lib lib/tcl/tls/libtls164.so.${LIBtls164_VERSION}
lib/tcl/tls/pkgIndex.tcl
lib/tcl/tls/tls.tcl
share/doc/tcltls/
Index: Makefile
===================================================================
RCS file: /cvs/ports/security/tcltls/Makefile,v
retrieving revision 1.11
diff -u -p -u -r1.11 Makefile
--- Makefile 16 Mar 2015 18:07:55 -0000 1.11
+++ Makefile 31 Mar 2015 08:28:54 -0000
@@ -4,11 +4,10 @@ SHARED_ONLY = Yes
COMMENT= OpenSSL Tcl extension
-VERSION= 1.6
+VERSION = 1.6.4
DISTNAME= tls${VERSION}-src
PKGNAME= tcltls-${VERSION}
-SHARED_LIBS= tls16 1.0
-REVISION= 1
+SHARED_LIBS = tls164 0.0
CATEGORIES= security
@@ -19,7 +18,7 @@ MAINTAINER= Sebastian Reitenbach <sebast
# BSD
PERMIT_PACKAGE_CDROM= Yes
-WANTLIB= ssl crypto
+WANTLIB = pthread ssl crypto
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=tls/}
@@ -37,7 +36,7 @@ CONFIGURE_ARGS= ${CONFIGURE_SHARED} \
--with-tclinclude=${MODTCL_INCDIR} \
--with-ssl-dir=/usr \
--includedir=${PREFIX}/include/tcltls \
- LIBtls16_VERSION=${LIBtls16_VERSION}
+ SHLIB_VERSION=${LIBtls164_VERSION}
FAKE_FLAGS = PKG_DIR=tls
TEST_TARGET= test
CFLAGS += -DNO_SSL2
Index: distinfo
===================================================================
RCS file: /cvs/ports/security/tcltls/distinfo,v
retrieving revision 1.4
diff -u -p -u -r1.4 distinfo
--- distinfo 18 Jan 2015 03:15:08 -0000 1.4
+++ distinfo 31 Mar 2015 08:28:54 -0000
@@ -1,2 +1,2 @@
-SHA256 (tls1.6-src.tar.gz) = rexQFDqa1jSmcdJPfHu/JFVIfrXxLSkPQXl8MqmLk/M=
-SIZE (tls1.6-src.tar.gz) = 168043
+SHA256 (tls1.6.4-src.tar.gz) = DNLFVSJExVdHCS4wrOF+tyjRMMmivUibJvx8nzZp5Lg=
+SIZE (tls1.6.4-src.tar.gz) = 171517
Index: patches/patch-configure
===================================================================
RCS file: patches/patch-configure
diff -N patches/patch-configure
--- patches/patch-configure 5 Jan 2011 18:04:58 -0000 1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,12 +0,0 @@
-$OpenBSD: patch-configure,v 1.1 2011/01/05 18:04:58 sebastia Exp $
---- configure.orig Sun Dec 5 10:23:21 2010
-+++ configure Sun Dec 5 10:23:42 2010
-@@ -8155,7 +8155,7 @@ echo "${ECHO_T}$tcl_cv_ld_elf" >&6
- DL_LIBS=""
- CC_SEARCH_FLAGS='-Wl,-rpath,${LIB_RUNTIME_DIR}'
- LD_SEARCH_FLAGS=${CC_SEARCH_FLAGS}
-- SHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}.so.1.0'
-+ SHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}.so.${LIBtls16_VERSION}'
- echo "$as_me:$LINENO: checking for ELF" >&5
- echo $ECHO_N "checking for ELF... $ECHO_C" >&6
- if test "${tcl_cv_ld_elf+set}" = set; then
Index: patches/patch-tests_ciphers_test
===================================================================
RCS file: patches/patch-tests_ciphers_test
diff -N patches/patch-tests_ciphers_test
--- patches/patch-tests_ciphers_test 5 Jan 2011 18:04:58 -0000 1.2
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,41 +0,0 @@
-$OpenBSD: patch-tests_ciphers_test,v 1.2 2011/01/05 18:04:58 sebastia Exp $
-
-Those tests will fail.
-
---- tests/ciphers.test.orig Fri Jun 22 23:03:34 2007
-+++ tests/ciphers.test Sun Dec 5 12:57:05 2010
-@@ -105,22 +105,22 @@ test ciphers-1.2 {Tls::ciphers for tls1} {rsabsafe} {
- listcompare $::EXPECTEDCIPHERS(rsabsafe) [tls::ciphers tls1]
- } {}
-
--test ciphers-1.3 {Tls::ciphers for ssl3} {openssl} {
-- # This will fail if you compiled against RSA bsafe or with a
-- # different set of defines than the default.
-- # Change the constraint setting above.
-- listcompare $::EXPECTEDCIPHERS(openssl) [tls::ciphers ssl3]
--} {}
-+#test ciphers-1.3 {Tls::ciphers for ssl3} {openssl} {
-+# # This will fail if you compiled against RSA bsafe or with a
-+# # different set of defines than the default.
-+# # Change the constraint setting above.
-+# listcompare $::EXPECTEDCIPHERS(openssl) [tls::ciphers ssl3]
-+#} {}
-
- # This version of the test is correct for OpenSSL only.
- # An equivalent test for the RSA BSAFE SSL-C is earlier in this file.
-
--test ciphers-1.4 {Tls::ciphers for tls1} {openssl} {
-- # This will fail if you compiled against RSA bsafe or with a
-- # different set of defines than the default.
-- # Change the constraint setting in all.tcl
-- listcompare $::EXPECTEDCIPHERS(openssl) [tls::ciphers tls1]
--} {}
-+#test ciphers-1.4 {Tls::ciphers for tls1} {openssl} {
-+# # This will fail if you compiled against RSA bsafe or with a
-+# # different set of defines than the default.
-+# # Change the constraint setting in all.tcl
-+# listcompare $::EXPECTEDCIPHERS(openssl) [tls::ciphers tls1]
-+#} {}
-
-
- # cleanup
Index: pkg/PLIST
===================================================================
RCS file: /cvs/ports/security/tcltls/pkg/PLIST,v
retrieving revision 1.2
diff -u -p -u -r1.2 PLIST
--- pkg/PLIST 5 Jan 2011 18:04:58 -0000 1.2
+++ pkg/PLIST 31 Mar 2015 08:28:54 -0000
@@ -2,7 +2,7 @@
include/tcltls/
include/tcltls/tls.h
lib/tcl/tls/
-@lib lib/tcl/tls/libtls16.so.${LIBtls16_VERSION}
+@lib lib/tcl/tls/libtls164.so.${LIBtls164_VERSION}
lib/tcl/tls/pkgIndex.tcl
lib/tcl/tls/tls.tcl
share/doc/tcltls/
