svn commit: r441314 - in head/devel/tcltls: . files
Mikhail Teterin
mi at FreeBSD.org
Sat May 20 13:59:36 UTC 2017
Author: mi
Date: Sat May 20 13:59:35 2017
New Revision: 441314
URL: https://svnweb.freebsd.org/changeset/ports/441314
Log:
Upgrade to 1.7.12. It bothers me, that the port can not be
linked with the base OpenSSL, if some other implementation
is merely installed, but that seems like a common problem...
PR: 216174
Submitted by: gahr
Sponsored by: Unemployment Insurance
Added:
head/devel/tcltls/files/patch-gen_dh_params (contents, props changed)
Deleted:
head/devel/tcltls/files/patch-protocols
head/devel/tcltls/files/patch-warnings
Modified:
head/devel/tcltls/Makefile
head/devel/tcltls/distinfo
Modified: head/devel/tcltls/Makefile
==============================================================================
--- head/devel/tcltls/Makefile Sat May 20 12:52:56 2017 (r441313)
+++ head/devel/tcltls/Makefile Sat May 20 13:59:35 2017 (r441314)
@@ -2,11 +2,10 @@
# $FreeBSD$
PORTNAME= tcltls
-PORTVERSION= 1.6.7
-PORTREVISION= 1
-CATEGORIES= devel tcl
-MASTER_SITES= SF/tls/tls/${PORTVERSION}
-DISTNAME= tls${PORTVERSION}-src
+PORTVERSION= 1.7.12
+CATEGORIES= devel security tcl
+MASTER_SITES= http://core.tcl.tk/tcltls/uv/ \
+ http://tcltls.rkeene.org/uv/
MAINTAINER= mi at aldan.algebra.com
COMMENT= SSL extensions for TCL; dynamicly loadable
@@ -19,29 +18,22 @@ LICENSE_PERMS= dist-mirror dist-sell pkg
OPTIONS_DEFINE= DOCS
USES+= tcl:tea ssl
-CONFIGURE_ARGS+=--with-ssl-dir=${OPENSSLBASE}
+CONFIGURE_ARGS+=--with-ssl-dir=${OPENSSLBASE} \
+ --disable-rpath
-WRKSRC= ${WRKDIR}/${TCL_PKG}
-PLIST_FILES= lib/${TCL_PKG}/libtls.so.1 \
- lib/${TCL_PKG}/pkgIndex.tcl \
- lib/${TCL_PKG}/tls.tcl
+PLIST_FILES= lib/${TCL_PKG}/tcltls.so \
+ lib/${TCL_PKG}/pkgIndex.tcl
PORTDOCS= *
-INSTALL_TARGET= install-binaries install-doc
+MAKE_ARGS+= "PACKAGE_INSTALL_DIR=${PREFIX}/lib/${TCL_PKG}"
+TEST_TARGET= test
+MAKE_ENV+= PATH=${OPENSSLBASE}/bin:${PATH}
+CONFIGURE_ENV+= PATH=${OPENSSLBASE}/bin:${PATH}
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 <bsd.port.mk>
Modified: head/devel/tcltls/distinfo
==============================================================================
--- head/devel/tcltls/distinfo Sat May 20 12:52:56 2017 (r441313)
+++ head/devel/tcltls/distinfo Sat May 20 13:59:35 2017 (r441314)
@@ -1,2 +1,3 @@
-SHA256 (tls1.6.7-src.tar.gz) = 5119de3e5470359b97a8a00d861c9c48433571ee0167af0a952de66c99d3a3b8
-SIZE (tls1.6.7-src.tar.gz) = 173654
+TIMESTAMP = 1494970441
+SHA256 (tcltls-1.7.12.tar.gz) = 0e09e8e1cb3dcb3d419079fe40c521b7283d5e822dc914ffd1e4ff600b895caa
+SIZE (tcltls-1.7.12.tar.gz) = 162259
Added: head/devel/tcltls/files/patch-gen_dh_params
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/devel/tcltls/files/patch-gen_dh_params Sat May 20 13:59:35 2017 (r441314)
@@ -0,0 +1,27 @@
+--- gen_dh_params 2017-05-01 10:45:59.000000000 -0400
++++ gen_dh_params 2017-05-16 18:19:20.703957000 -0400
+@@ -12,11 +12,8 @@
+
+ openssl_dhparam() {
+- if [ -x "`which openssl 2>/dev/null`" ]; then
+- o_output="`openssl dhparam -C "$@" 2>/dev/null`" || return 1
+- o_output="`echo "${o_output}" | sed 's/get_dh[0-9]\+/get_dhParams/'`" || return 1
+- o_output="`echo "${o_output}" | sed '/^-----BEGIN DH PARAMETERS-----$/,/^-----END DH PARAMETERS-----$/ d;/^#/ d'`" || return 1
+-
+- echo "${o_output}"
+-
++ if openssl dhparam -C "$@" | sed \
++ -e 's/^DH \*get_dh[0-9]*/static DH *get_dhParams/' \
++ -e '/^-----BEGIN DH PARAMETERS-----$/,/^-----END DH PARAMETERS-----$/ d;/^#/ d'
++ then
+ return 0
+ fi
+@@ -273,6 +270,6 @@
+ echo "*****************************" >&2
+ gen_dh_params_openssl && exit 0
+-gen_dh_params_remote && exit 0
+-gen_dh_params_fallback && exit 0
++# gen_dh_params_remote && exit 0
++# gen_dh_params_fallback && exit 0
+
+ echo "Unable to generate parameters for DH of ${bits} bits" >&2
More information about the svn-ports-all
mailing list