[rpms/tcltls] epel10.2: Upgrade to 1.7.21 and spec file modernization (#1753651)

[Robert Scheck <robert@fedoraproject.org>]

A new commit has been pushed.

Repo   : rpms/tcltls
Branch : epel10.2
Commit : e7b31bd822091de6f40ca938de28107d84e40b45
Author : Robert Scheck <robert@fedoraproject.org>
Date   : 2020-06-24T23:47:13+02:00
Stats  : +140/-27 in 5 file(s)
URL    : https://src.fedoraproject.org/rpms/tcltls/c/e7b31bd822091de6f40ca938de28107d84e40b45?branch=epel10.2

Log:
Upgrade to 1.7.21 and spec file modernization (#1753651)

---
diff --git a/.gitignore b/.gitignore
index 8b75914..a779629 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,9 +1,2 @@
-tls1.6-src.tar.gz
-/tls1.6.7-src.tar.gz
-/tcltls-1.7.11.tar.gz
-/tcltls-1.7.12.tar.gz
-/tcltls-1.7.13.tar.gz
-/tcltls-1.7.14.tar.gz
-/tcltls-1.7.16.tar.gz
-/tcltls-1.7.17.tar.gz
-/tcltls-1.7.18.tar.gz
+/tls*-src.tar.gz
+/tcltls-*.tar.gz

diff --git a/sources b/sources
index 20ab7a7..bb1ff44 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (tcltls-1.7.18.tar.gz) = 0bad4f116e09295e6eb6eb8d6f050342ff4378edd2aba14dd21704506b730d5155a405bb02e944cacfed9d86dcad09d96b59ca1e3d4fe8dbd11091c019f8400a
+SHA512 (tcltls-1.7.21.tar.gz) = 92b8b82c6f19b78f3361d6d382a14978341fd6ba8a184f064dde6c274ea063ef9cae8aa38c8f5cf9c5df425d97d2247a1decca8dc79a3636ff8a1fc1e6fbaf28

diff --git a/tcltls-1.7.21-cipher-tests.patch b/tcltls-1.7.21-cipher-tests.patch
new file mode 100644
index 0000000..e699ba2
--- /dev/null
+++ b/tcltls-1.7.21-cipher-tests.patch
@@ -0,0 +1,15 @@
+Downstream-specific hack by Sergei Golovan (Debian) to disable tests which list available
+SSL/TLS ciphers, because upstream's expected ciphers are weak and not available in common
+Fedora and/or RHEL/CentOS builds of OpenSSL anymore.
+
+--- tcltls-1.7.21/tests/ciphers.test			2020-05-04 17:12:10.000000000 +0200
++++ tcltls-1.7.21/tests/ciphers.test.ciphers-test	2020-06-24 22:39:30.534467434 +0200
+@@ -23,7 +23,7 @@
+ # tls was compiled against. (RSA BSAFE SSL-C or OpenSSL).
+ #
+ set ::tcltest::testConstraints(rsabsafe) 0
+-set ::tcltest::testConstraints(openssl) [string match "OpenSSL*" [tls::version]]
++set ::tcltest::testConstraints(openssl) 0
+ 
+ set ::EXPECTEDCIPHERS(rsabsafe) {
+     EDH-DSS-RC4-SHA

diff --git a/tcltls-1.7.21-hostname-tests.patch b/tcltls-1.7.21-hostname-tests.patch
new file mode 100644
index 0000000..5b52dd3
--- /dev/null
+++ b/tcltls-1.7.21-hostname-tests.patch
@@ -0,0 +1,104 @@
+Patch by Sergei Golovan (Debian) to make the client socket to connect to localhost instead
+of [info hostname] to prevent intermittent test failures inside mock(1). Also, account for
+a change in error message "unsupported protocol" instead of "wrong version number".
+
+--- tcltls-1.7.21/tests/tlsIO.test			2020-05-04 17:12:10.000000000 +0200
++++ tcltls-1.7.21/tests/tlsIO.test.hostname-tests	2020-06-24 22:56:02.521910556 +0200
+@@ -428,7 +428,7 @@
+ 	package require tls
+ 	set timer [after 2000 "set x done"]
+     }
+-    puts $f "set f \[tls::socket -server accept -certfile $serverCert -cafile $caCert -keyfile $serverKey -myaddr [info hostname] 8831 \]"
++    puts $f "set f \[tls::socket -server accept -certfile $serverCert -cafile $caCert -keyfile $serverKey -myaddr localhost 8831 \]"
+     puts $f {
+ 	proc accept {sock addr port} {
+             global x
+@@ -445,7 +445,7 @@
+     set f [open "|[list $::tcltest::tcltest script] 2> /dev/null" r]
+     gets $f x
+     if {[catch {tls::socket -certfile $clientCert -cafile $caCert \
+-	-keyfile $clientKey [info hostname] 8831} sock]} {
++	-keyfile $clientKey localhost 8831} sock]} {
+         set x $sock
+     } else {
+         puts $sock hello
+@@ -635,7 +635,7 @@
+ 	set done 1
+     }
+     set cs [tls::socket -certfile $clientCert -cafile $caCert \
+-	-keyfile $clientKey [info hostname] 8830]
++	-keyfile $clientKey localhost 8830]
+     close $cs
+ 
+     vwait done
+@@ -1042,7 +1042,7 @@
+     }
+     set s1 [tls::socket \
+ 	-certfile $clientCert -cafile $caCert -keyfile $clientKey \
+-    	[info hostname] 8823]
++    	localhost 8823]
+     set timer [after 10000 "set x timed_out"]
+     vwait x
+     after cancel $timer
+@@ -1095,7 +1095,7 @@
+     }
+     set s1 [tls::socket \
+ 	    -certfile $clientCert -cafile $caCert -keyfile $clientKey \
+-	    -async [info hostname] 8830]
++	    -async localhost 8830]
+     # when doing an in-process client/server test, both sides need
+     # to be non-blocking for the TLS handshake  Also make sure to
+     # return the channel to line buffering mode (TLS sets it to 'none').
+@@ -1139,7 +1139,7 @@
+ 	    -server accept 8831]
+     set c [tls::socket \
+ 	    -certfile $clientCert -cafile $caCert -keyfile $clientKey \
+-	    [info hostname] 8831]
++	    localhost 8831]
+     # This differs from socket-9.1 in that both sides need to be
+     # non-blocking because of TLS' required handshake
+     fconfigure $c -blocking 0
+@@ -1186,7 +1186,7 @@
+ 	    -server accept 8832]
+     set c [tls::socket \
+ 	    -certfile $clientCert -cafile $caCert -keyfile $clientKey \
+-	    [info hostname] 8832]
++	    localhost 8832]
+     fconfigure $c -blocking 0 -trans lf -buffering line
+     set count 0
+     puts $c hello
+@@ -1247,7 +1247,7 @@
+ 	    -server accept 8833]
+     set c [tls::socket \
+ 	    -certfile $clientCert -cafile $caCert -keyfile $clientKey \
+-	    [info hostname] 8833]
++	    localhost 8833]
+     fconfigure $c -blocking 0 -buffering line -translation lf
+     fileevent $c readable "count_to_eof $c"
+     set timer [after 2000 timerproc]
+@@ -2019,7 +2019,7 @@
+ 	    -server accept 8831]
+     set c [tls::socket \
+ 	    -certfile $clientCert -cafile $caCert -keyfile $clientKey \
+-	    [info hostname] 8831]
++	    localhost 8831]
+     # only the client gets tls::import
+     set res [tls::unimport $c]
+     list $res [catch {close $c} err] $err \
+@@ -2050,13 +2050,14 @@
+     set c [tls::socket -async \
+                -cafile $caCert \
+                -request 0 -require 0 -ssl2 0 -ssl3 0 -tls1 1 -tls1.1 0 -tls1.2 0 \
+-               [info hostname] 8831]
++               localhost 8831]
+     fconfigure $c -blocking 0
+     puts $c a ; flush $c
+     after 5000 [list set ::done timeout]
+     vwait ::done
+     switch -exact -- $::done {
+-        "handshake failed: wrong ssl version" {
++        "handshake failed: wrong ssl version" -
++        "handshake failed: unsupported protocol" {
+             set ::done "handshake failed: wrong version number"
+         }
+     }

diff --git a/tcltls.spec b/tcltls.spec
index a9c3742..6a76212 100644
--- a/tcltls.spec
+++ b/tcltls.spec
@@ -1,31 +1,30 @@
-%{!?tcl_version: %global tcl_version %(echo 'puts $tcl_version' | tclsh)}
+%{!?tcl_version: %global tcl_version %((echo '8.5'; echo 'puts $tcl_version' | tclsh 2>/dev/null) | tail -1)}
 %{!?tcl_sitearch: %global tcl_sitearch %{_libdir}/tcl%{tcl_version}}
 
 Name:           tcltls
-Version:        1.7.18
-Release:        3%{?dist}
+Version:        1.7.21
+Release:        1%{?dist}
 Summary:        OpenSSL extension for Tcl
 
 License:        BSD
 URL:            https://core.tcl.tk/tcltls/home
 Source0:        https://core.tcl.tk/tcltls/uv/%{name}-%{version}.tar.gz
 
+Patch0:         tcltls-1.7.21-cipher-tests.patch
+Patch1:         tcltls-1.7.21-hostname-tests.patch
+
 BuildRequires:  openssl-devel
 BuildRequires:  tcl-devel
 BuildRequires:  gcc
 
-%if 0%{?el7}
-Requires: tcl(abi) = 8.5
-%else
-Requires: tcl(abi) = 8.6
-%endif
+Requires:       tcl(abi) = %{tcl_version}
 
 %description
 A TLS OpenSSL extension for Tcl
 
 %package devel
 Summary:        Header files for the OpenSSL extension for Tcl
-Requires:       %{name} = %{version}-%{release}
+Requires:       %{name}%{?_isa} = %{version}-%{release}
 
 %description devel
 The TLS OpenSSL extension to Tcl
@@ -33,30 +32,32 @@ The TLS OpenSSL extension to Tcl
 This package contains the development files for tls.
 
 %prep
-%autosetup
+%autosetup -p1
 
 %build
-%configure --disable-rpath --with-ssl-dir=%{_prefix}
-make %{?_smp_mflags}
+%configure --disable-rpath --with-ssl-dir=%{_prefix} --enable-debug
+%make_build
 
 %check
 make test
 
 %install
-rm -rf $RPM_BUILD_ROOT
-make install libdir=${RPM_BUILD_ROOT}%{tcl_sitearch}/ includedir=${RPM_BUILD_ROOT}%{_includedir}
+%make_install libdir=%{tcl_sitearch}
 
-%{__install} -d -p %{buildroot}%{_includedir}
-%{__install} -m 0644 tls.h %{buildroot}%{_includedir}/tls.h
+%{__install} -D -p -m 0644 tls.h %{buildroot}%{_includedir}/tls.h
 
 %files
-%doc README.txt ChangeLog license.terms
+%license license.terms
+%doc README.txt ChangeLog
 %{tcl_sitearch}/%{name}%{version}
 
 %files devel
 %{_includedir}/tls.h
 
 %changelog
+* Wed Jun 24 2020 Robert Scheck <robert@fedoraproject.org> - 1.7.21-1
+- Upgrade to 1.7.21 and spec file modernization (#1753651)
+
 * Fri Jan 31 2020 Fedora Release Engineering <releng@fedoraproject.org> - 1.7.18-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild