pkgsrc-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[pkgsrc/trunk]: pkgsrc/security/tcl-tls Update tcl-tls to 1.7.16.



details:   https://anonhg.NetBSD.org/pkgsrc/rev/83b796e0a058
branches:  trunk
changeset: 312385:83b796e0a058
user:      bsiegert <bsiegert%pkgsrc.org@localhost>
date:      Sun Sep 02 18:37:26 2018 +0000

description:
Update tcl-tls to 1.7.16.

This restores compatibility with OpenSSL 1.1.0. Local patches are no longer
needed.

Patch from Anthony Mallet in PR pkg/53534.

diffstat:

 security/tcl-tls/Makefile         |  21 +++++-----------
 security/tcl-tls/PLIST            |   8 ++----
 security/tcl-tls/distinfo         |  14 ++++-------
 security/tcl-tls/patches/patch-aa |  12 ----------
 security/tcl-tls/patches/patch-ab |  46 ---------------------------------------
 security/tcl-tls/patches/patch-ac |  12 ----------
 security/tcl-tls/patches/patch-ad |  11 ---------
 7 files changed, 15 insertions(+), 109 deletions(-)

diffs (170 lines):

diff -r deabccebf7da -r 83b796e0a058 security/tcl-tls/Makefile
--- a/security/tcl-tls/Makefile Sun Sep 02 16:34:58 2018 +0000
+++ b/security/tcl-tls/Makefile Sun Sep 02 18:37:26 2018 +0000
@@ -1,31 +1,24 @@
-# $NetBSD: Makefile,v 1.15 2016/03/05 11:29:27 jperkin Exp $
+# $NetBSD: Makefile,v 1.16 2018/09/02 18:37:26 bsiegert Exp $
 #
 
-DISTNAME=              tls1.5.0-src
-PKGNAME=               tcl-tls-1.5.0
-PKGREVISION=           8
+DISTNAME=              tcltls-1.7.16
+PKGNAME=               tcl-tls-1.7.16
 CATEGORIES=            security
-MASTER_SITES=          ${MASTER_SITE_SOURCEFORGE:=tls/}
+MASTER_SITES=          http://core.tcl.tk/tcltls/uv/
 
 MAINTAINER=            pkgsrc-users%NetBSD.org@localhost
-HOMEPAGE=              http://tls.sourceforge.net/
+HOMEPAGE=              http://core.tcl.tk/tcltls/home
 COMMENT=               TLS (aka SSL) Channel for the Tcl language
 LICENSE=               2-clause-bsd
 
-WRKSRC=                        ${WRKDIR}/tls1.5
-
 GNU_CONFIGURE=         yes
-CONFIGURE_ARGS+=       --with-ssl-dir=${BUILDLINK_PREFIX.openssl}
-CONFIGURE_ENV+=                LOCALBASE=${LOCALBASE:Q}
-MAKE_ENV+=             TCLLIB="${BUILDLINK_PREFIX.tcl}/lib"
+CONFIGURE_ARGS+=       --with-openssl-dir=${BUILDLINK_PREFIX.openssl}
+CONFIGURE_ARGS+=       --with-tcl="${BUILDLINK_PREFIX.tcl}/lib"
 
 TEST_TARGET=           test
 
 .include "../../lang/tcl/Makefile.version"
 
-PLIST_SUBST+=          TCL_SONUM=${TCL_SONUM}
-
-
 .include "../../lang/tcl/buildlink3.mk"
 .include "../../security/openssl/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff -r deabccebf7da -r 83b796e0a058 security/tcl-tls/PLIST
--- a/security/tcl-tls/PLIST    Sun Sep 02 16:34:58 2018 +0000
+++ b/security/tcl-tls/PLIST    Sun Sep 02 18:37:26 2018 +0000
@@ -1,5 +1,3 @@
-@comment $NetBSD: PLIST,v 1.3 2012/08/21 21:56:13 marino Exp $
-include/tls.h
-lib/libtls${TCL_SONUM}.so
-lib/tls1.50/pkgIndex.tcl
-lib/tls1.50/tls.tcl
+@comment $NetBSD: PLIST,v 1.4 2018/09/02 18:37:26 bsiegert Exp $
+lib/tcltls${PKGVERSION}/pkgIndex.tcl
+lib/tcltls${PKGVERSION}/tcltls.so
diff -r deabccebf7da -r 83b796e0a058 security/tcl-tls/distinfo
--- a/security/tcl-tls/distinfo Sun Sep 02 16:34:58 2018 +0000
+++ b/security/tcl-tls/distinfo Sun Sep 02 18:37:26 2018 +0000
@@ -1,10 +1,6 @@
-$NetBSD: distinfo,v 1.7 2015/11/04 01:18:11 agc Exp $
+$NetBSD: distinfo,v 1.8 2018/09/02 18:37:26 bsiegert Exp $
 
-SHA1 (tls1.5.0-src.tar.gz) = 66611f384f4b1c5e126ac8fc1cd03040bbe8ac16
-RMD160 (tls1.5.0-src.tar.gz) = fa37bc819ffc63f93991c876ffd318405e6bad85
-SHA512 (tls1.5.0-src.tar.gz) = d77d09d3c9113d6888d2a53b04f81b553719d62fc027c241c88250477472101942b31e552d3ab08f2f0dabf5a792c25e0d65f1d643e1c1010057da5ef8bb5584
-Size (tls1.5.0-src.tar.gz) = 113600 bytes
-SHA1 (patch-aa) = 0d2637038ce203dabdc4c4e9ea36d09a99978d15
-SHA1 (patch-ab) = 19b2a615f710f5b9524dc58cb89f96089f6573d8
-SHA1 (patch-ac) = 350f1b3fc999c27522b2e17e6ba65072095e9b45
-SHA1 (patch-ad) = 59a302a2bd17ae5d5fa55788949de02744cd1d04
+SHA1 (tcltls-1.7.16.tar.gz) = 24f6022bc36bb8a0fe8215d82838d3599200f048
+RMD160 (tcltls-1.7.16.tar.gz) = 136e6c78c565eb3208a6fe2e45973c4b232765ce
+SHA512 (tcltls-1.7.16.tar.gz) = f63b885dbfaec5d9ae811c126bd0ff253787effd7b053282b9ee566e9fae54df940bc058a6c3dd22e31fcb9ec6ae1b286aa40efd69c3f01f5a3014aada730ab1
+Size (tcltls-1.7.16.tar.gz) = 166439 bytes
diff -r deabccebf7da -r 83b796e0a058 security/tcl-tls/patches/patch-aa
--- a/security/tcl-tls/patches/patch-aa Sun Sep 02 16:34:58 2018 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,12 +0,0 @@
-$NetBSD: patch-aa,v 1.1.1.1 2005/01/22 19:45:23 peter Exp $
-
---- configure.in.orig  2000-08-18 21:09:22.000000000 +0200
-+++ configure.in
-@@ -299,6 +299,7 @@ SHLIB_LD=${TCL_SHLIB_LD}
- STLIB_LD=${TCL_STLIB_LD}
- SHLIB_CFLAGS=${TCL_SHLIB_CFLAGS}
- 
-+AC_SUBST(TCL_CC)
- AC_SUBST(CFLAGS_DEBUG)
- AC_SUBST(CFLAGS_OPTIMIZE)
- AC_SUBST(STLIB_LD)
diff -r deabccebf7da -r 83b796e0a058 security/tcl-tls/patches/patch-ab
--- a/security/tcl-tls/patches/patch-ab Sun Sep 02 16:34:58 2018 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,46 +0,0 @@
-$NetBSD: patch-ab,v 1.4 2013/10/20 17:56:02 joerg Exp $
-
---- Makefile.in.orig   2004-02-04 04:02:17.000000000 +0000
-+++ Makefile.in
-@@ -122,6 +122,7 @@ POST_UNINSTALL = :
- PACKAGE = @PACKAGE@
- VERSION = @VERSION@
- CC = @CC@
-+TCL_CC = @TCL_CC@
- CFLAGS_DEBUG = @CFLAGS_DEBUG@
- CFLAGS_DEFAULT = @CFLAGS_DEFAULT@
- CFLAGS_OPTIMIZE = @CFLAGS_OPTIMIZE@
-@@ -136,7 +137,7 @@ MAKE_STATIC_LIB = @MAKE_STATIC_LIB@
- OBJEXT = @OBJEXT@
- RANLIB = @RANLIB@
- SHLIB_CFLAGS = @SHLIB_CFLAGS@
--SHLIB_LD = @SHLIB_LD@
-+SHLIB_LD = @SHLIB_LD@ $(COMPILER_RPATH_FLAG)${TCLLIB}
- SHLIB_LDFLAGS = @SHLIB_LDFLAGS@
- SHLIB_LD_LIBS = @SHLIB_LD_LIBS@
- STLIB_LD = @STLIB_LD@
-@@ -208,20 +209,20 @@ install-binaries: binaries install-lib-b
-       sed -e "s#\@RELPATH\@#$(RELPATH)#" \
-       -e "s#\@tls_LIB_FILE\@#$(tls_LIB_FILE)#" \
-       < $(srcdir)/pkgIndex.tcl.in > pkgIndex.tcl
--      $(INSTALL_DATA) pkgIndex.tcl $(pkglibdir)
-+      $(INSTALL_DATA) pkgIndex.tcl $(DESTDIR)$(pkglibdir)
- 
- #========================================================================
- # This rule installs platform-independent files, such as header files.
- #========================================================================
- 
- install-libraries: libraries
--      $(mkinstalldirs) $(includedir)
-+      $(mkinstalldirs) $(DESTDIR)$(includedir)
-       @echo "Installing header files in $(includedir)"
-       @for i in $(GENERIC_HDRS) ; do \
-           echo "Installing $$i" ; \
--          $(INSTALL_DATA) $$i $(includedir) ; \
-+          $(INSTALL_DATA) $$i $(DESTDIR)$(includedir) ; \
-       done;
--      $(INSTALL_DATA) $(srcdir)/tls.tcl $(pkglibdir)
-+      $(INSTALL_DATA) $(srcdir)/tls.tcl $(DESTDIR)$(pkglibdir)
- 
- #========================================================================
- # Install documentation.  Unix manpages should go in the $(mandir)
diff -r deabccebf7da -r 83b796e0a058 security/tcl-tls/patches/patch-ac
--- a/security/tcl-tls/patches/patch-ac Sun Sep 02 16:34:58 2018 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,12 +0,0 @@
-$NetBSD: patch-ac,v 1.1.1.1 2005/01/22 19:45:23 peter Exp $
-
---- configure.orig     2002-02-04 23:46:09.000000000 +0100
-+++ configure  2005-01-20 20:26:28.000000000 +0100
-@@ -2053,6 +2053,7 @@
- s%@TCL_BUILD_STUB_LIB_SPEC@%$TCL_BUILD_STUB_LIB_SPEC%g
- s%@TCL_INCLUDES@%$TCL_INCLUDES%g
- s%@CLEANFILES@%$CLEANFILES%g
-+s%@TCL_CC@%$TCL_CC%g
- s%@CFLAGS_DEBUG@%$CFLAGS_DEBUG%g
- s%@CFLAGS_OPTIMIZE@%$CFLAGS_OPTIMIZE%g
- s%@STLIB_LD@%$STLIB_LD%g
diff -r deabccebf7da -r 83b796e0a058 security/tcl-tls/patches/patch-ad
--- a/security/tcl-tls/patches/patch-ad Sun Sep 02 16:34:58 2018 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,11 +0,0 @@
-$NetBSD: patch-ad,v 1.1 2012/11/23 12:27:03 drochner Exp $
-
---- pkgIndex.tcl.in.orig       2003-12-15 18:46:20.000000000 +0000
-+++ pkgIndex.tcl.in
-@@ -5,5 +5,5 @@
- #    replace the original which didn't include the commands from "tls.tcl".
- #
- 
--package ifneeded tls 1.5 "[list load [file join $dir @RELPATH@ @tls_LIB_FILE@] ] ; [list source [file join $dir tls.tcl] ]"
-+package ifneeded tls 1.50 "[list load [file join $dir @RELPATH@ @tls_LIB_FILE@] ] ; [list source [file join $dir tls.tcl] ]"
- 



Home | Main Index | Thread Index | Old Index