Re: pkg_add coccinella: Can't find tcltls-1.6p4

===> tcltls-1.7.22 depends on: tcl->=8.5,<8.6 -> tcl-8.5.19p6
===> Verifying specs: ssl crypto
===> found ssl.52.0 crypto.49.0
===> Checking files for tcltls-1.7.22
>> Fetch http://core.tcl-lang.org/tcltls/uv/tcltls-1.7.22.tar.gz
tcltls-1.7.22.tar.gz 0% | | 0 --:-- ETA tcltls-1.7.22.tar.gz 100% |*****************************| 161 KB 00:00
>> (SHA256) tcltls-1.7.22.tar.gz: OK
===> Extracting for tcltls-1.7.22
===> Patching for tcltls-1.7.22
===> Applying OpenBSD patch patch-tlsBIO_c
Hmm... Looks like a unified diff to me...
The text leading up to this was:
--------------------------
|Found in the Debian port:
|http://deb.debian.org/debian/pool/main/t/tcltls/tcltls_1.7.22-2.debian.tar.xz
|
|Index: tlsBIO.c
|--- tlsBIO.c.orig
|+++ tlsBIO.c
--------------------------
Patching file tlsBIO.c using Plan A...
Hunk #1 succeeded at 231.
done
===> Applying OpenBSD patch patch-tlsInt_h
Hmm... Looks like a unified diff to me...
The text leading up to this was:
--------------------------
|Index: tlsInt.h
|--- tlsInt.h.orig
|+++ tlsInt.h
--------------------------
Patching file tlsInt.h using Plan A...
Hunk #1 succeeded at 54.
done
===> Compiler link: clang -> /usr/bin/clang
===> Compiler link: clang++ -> /usr/bin/clang++
===> Compiler link: cc -> /usr/bin/cc
===> Compiler link: c++ -> /usr/bin/c++
===> Generating configure for tcltls-1.7.22
===> Configuring for tcltls-1.7.22
Using /usr/ports/pobj/tcltls-1.7.22/config.site (generated)
configure: WARNING: unrecognized options: --disable-silent-rules, --disable-gtk-doc
configure: loading site script /usr/ports/pobj/tcltls-1.7.22/config.site
checking for gcc... cc
checking whether the C compiler works... yes
checking for C compiler default output file name... a.out
checking for suffix of executables...
checking whether we are cross compiling... no
checking for suffix of object files... (cached) o
checking whether we are using the GNU C compiler... (cached) yes
checking whether cc accepts -g... (cached) yes
checking for cc option to accept ISO C89... none needed
checking whether make sets $(MAKE)... (cached) yes
checking for a BSD-compatible install... /usr/ports/pobj/tcltls-1.7.22/bin/install -c
checking how to run the C preprocessor... cc -E
checking for grep that handles long lines and -e... (cached) /usr/bin/grep
checking for egrep... (cached) /usr/bin/egrep
checking for ANSI C header files... (cached) yes
checking for sys/types.h... (cached) yes
checking for sys/stat.h... (cached) yes
checking for stdlib.h... (cached) yes
checking for string.h... (cached) yes
checking for memory.h... (cached) yes
checking for strings.h... (cached) yes
checking for inttypes.h... (cached) yes
checking for stdint.h... (cached) yes
checking for unistd.h... (cached) yes
checking minix/config.h usability... no
checking minix/config.h presence... no
checking for minix/config.h... no
checking whether it is safe to define __EXTENSIONS__... yes
checking build system type... x86_64-unknown-openbsd7.1
checking host system type... x86_64-unknown-openbsd7.1
checking host operating system... openbsd7.1
checking for unistd.h... (cached) yes
checking for stdlib.h... (cached) yes
checking for string.h... (cached) yes
checking for strings.h... (cached) yes
checking for path to tclConfig.sh... /usr/local/lib/tcl/tcl8.5
checking for runnable tclsh... /usr/local/bin/tclsh8.5
checking for working tclConfig.sh... found
checking how to create shared objects... -DPIC -fPIC -shared
checking whether C compiler accepts -Wno-unused-value... yes
checking whether C compiler accepts -Wno-unused-parameter... yes
checking whether C compiler accepts -Wno-deprecated-declarations... yes
checking for pkg-config... pkg-config
checking whether C compiler accepts -Wall... yes
checking whether C compiler accepts -W... yes
checking whether C compiler accepts -Wno-self-assign... yes
checking whether C compiler accepts -fstack-protector-all... yes
checking whether C compiler accepts -fno-strict-overflow... yes
checking which TLS library to use... openssl
checking if a basic OpenSSL program works... yes
checking for TLS_method... yes
checking for SSLv2_method... no
checking for SSLv3_method... no
checking for TLSv1_method... yes
checking for TLSv1_1_method... yes
checking for TLSv1_2_method... yes
checking for tlsv1.3 protocol support... yes
checking for SSL_set_tlsext_host_name... yes
checking how to use openssl... -lssl -lcrypto
checking for objcopy... objcopy
checking for strip... (cached) strip
checking for how to set version script... -Wl,--version-script,/usr/ports/pobj/tcltls-1.7.22/tcltls-1.7.22/tcltls.vers
configure: creating ./config.status
config.status: creating Makefile
config.status: creating pkgIndex.tcl
config.status: creating tcltls.syms
configure: WARNING: unrecognized options: --disable-silent-rules, --disable-gtk-doc
===> Building for tcltls-1.7.22
od -A n -v -t xC < '/usr/ports/pobj/tcltls-1.7.22/tcltls-1.7.22/tls.tcl' > tls.tcl.h.new.1
sed 's@[^0-9A-Fa-f]@@g;s@..@0x&, @g' < tls.tcl.h.new.1 > tls.tcl.h.new.2
rm -f tls.tcl.h.new.1
mv tls.tcl.h.new.2 tls.tcl.h
sh /usr/ports/pobj/tcltls-1.7.22/tcltls-1.7.22/gen_dh_params fallback > dh_params.h.new
mv dh_params.h.new dh_params.h
cc -I/usr/local/include/tcl8.5 -I/usr/ports/pobj/tcltls-1.7.22/tcltls-1.7.22 -I. -DPACKAGE_NAME=\"tcltls\" -DPACKAGE_TARNAME=\"tcltls\" -DPACKAGE_VERSION=\"1.7.22\" -DPACKAGE_STRING=\"tcltls\ 1.7.22\" -DPACKAGE_BUGREPORT=\"\" -DPACKAGE_URL=\"\" -DSTDC_HEADERS=1 -DHAVE_SYS_TYPES_H=1 -DHAVE_SYS_STAT_H=1 -DHAVE_STDLIB_H=1 -DHAVE_STRING_H=1 -DHAVE_MEMORY_H=1 -DHAVE_STRINGS_H=1 -DHAVE_INTTYPES_H=1 -DHAVE_STDINT_H=1 -DHAVE_UNISTD_H=1 -D__EXTENSIONS__=1 -D_ALL_SOURCE=1 -D_GNU_SOURCE=1 -D_POSIX_PTHREAD_SEMANTICS=1 -D_TANDEM_SOURCE=1 -DHAVE_UNISTD_H=1 -DHAVE_STDLIB_H=1 -DHAVE_STRING_H=1 -DHAVE_STRINGS_H=1 -DMODULE_SCOPE=static -DUSE_TCL_STUBS=1 -DTCLTLS_SSL_USE_FASTPATH=1 -D_FORTIFY_SOURCE=2 -DHAVE_TLS_METHOD=1 -DNO_SSL2=1 -DNO_SSL3=1 '-DTCL_CFGVAL_ENCODING="iso8859-1"' '-DTCL_SHLIB_EXT=".so"' '-DTCL_CFG_OPTIMIZED=1' '-DTCL_TOMMATH=1' '-DTCL_WIDE_INT_IS_LONG=1' '-DTCL_UNLOAD_DLLS=1' '-DTCL_STACK_GROWS_UP=1' -O2 -pipe -I/usr/local/include/tcl8.5 -Wno-unused-value -Wno-unused-parameter -Wno-deprecated-declarations -Wall -W -Wno-self-assign -fstack-protector-all -fno-strict-overflow -fPIC -o tls.o -c /usr/ports/pobj/tcltls-1.7.22/tcltls-1.7.22/tls.c
/usr/ports/pobj/tcltls-1.7.22/tcltls-1.7.22/tls.c:1072:9: warning: unused parameter 'isServer' [-Wunused-parameter]
int isServer;
^
1 warning generated.
cc -I/usr/local/include/tcl8.5 -I/usr/ports/pobj/tcltls-1.7.22/tcltls-1.7.22 -I. -DPACKAGE_NAME=\"tcltls\" -DPACKAGE_TARNAME=\"tcltls\" -DPACKAGE_VERSION=\"1.7.22\" -DPACKAGE_STRING=\"tcltls\ 1.7.22\" -DPACKAGE_BUGREPORT=\"\" -DPACKAGE_URL=\"\" -DSTDC_HEADERS=1 -DHAVE_SYS_TYPES_H=1 -DHAVE_SYS_STAT_H=1 -DHAVE_STDLIB_H=1 -DHAVE_STRING_H=1 -DHAVE_MEMORY_H=1 -DHAVE_STRINGS_H=1 -DHAVE_INTTYPES_H=1 -DHAVE_STDINT_H=1 -DHAVE_UNISTD_H=1 -D__EXTENSIONS__=1 -D_ALL_SOURCE=1 -D_GNU_SOURCE=1 -D_POSIX_PTHREAD_SEMANTICS=1 -D_TANDEM_SOURCE=1 -DHAVE_UNISTD_H=1 -DHAVE_STDLIB_H=1 -DHAVE_STRING_H=1 -DHAVE_STRINGS_H=1 -DMODULE_SCOPE=static -DUSE_TCL_STUBS=1 -DTCLTLS_SSL_USE_FASTPATH=1 -D_FORTIFY_SOURCE=2 -DHAVE_TLS_METHOD=1 -DNO_SSL2=1 -DNO_SSL3=1 '-DTCL_CFGVAL_ENCODING="iso8859-1"' '-DTCL_SHLIB_EXT=".so"' '-DTCL_CFG_OPTIMIZED=1' '-DTCL_TOMMATH=1' '-DTCL_WIDE_INT_IS_LONG=1' '-DTCL_UNLOAD_DLLS=1' '-DTCL_STACK_GROWS_UP=1' -O2 -pipe -I/usr/local/include/tcl8.5 -Wno-unused-value -Wno-unused-parameter -Wno-deprecated-declarations -Wall -W -Wno-self-assign -fstack-protector-all -fno-strict-overflow -fPIC -o tlsBIO.o -c /usr/ports/pobj/tcltls-1.7.22/tcltls-1.7.22/tlsBIO.c
cc -I/usr/local/include/tcl8.5 -I/usr/ports/pobj/tcltls-1.7.22/tcltls-1.7.22 -I. -DPACKAGE_NAME=\"tcltls\" -DPACKAGE_TARNAME=\"tcltls\" -DPACKAGE_VERSION=\"1.7.22\" -DPACKAGE_STRING=\"tcltls\ 1.7.22\" -DPACKAGE_BUGREPORT=\"\" -DPACKAGE_URL=\"\" -DSTDC_HEADERS=1 -DHAVE_SYS_TYPES_H=1 -DHAVE_SYS_STAT_H=1 -DHAVE_STDLIB_H=1 -DHAVE_STRING_H=1 -DHAVE_MEMORY_H=1 -DHAVE_STRINGS_H=1 -DHAVE_INTTYPES_H=1 -DHAVE_STDINT_H=1 -DHAVE_UNISTD_H=1 -D__EXTENSIONS__=1 -D_ALL_SOURCE=1 -D_GNU_SOURCE=1 -D_POSIX_PTHREAD_SEMANTICS=1 -D_TANDEM_SOURCE=1 -DHAVE_UNISTD_H=1 -DHAVE_STDLIB_H=1 -DHAVE_STRING_H=1 -DHAVE_STRINGS_H=1 -DMODULE_SCOPE=static -DUSE_TCL_STUBS=1 -DTCLTLS_SSL_USE_FASTPATH=1 -D_FORTIFY_SOURCE=2 -DHAVE_TLS_METHOD=1 -DNO_SSL2=1 -DNO_SSL3=1 '-DTCL_CFGVAL_ENCODING="iso8859-1"' '-DTCL_SHLIB_EXT=".so"' '-DTCL_CFG_OPTIMIZED=1' '-DTCL_TOMMATH=1' '-DTCL_WIDE_INT_IS_LONG=1' '-DTCL_UNLOAD_DLLS=1' '-DTCL_STACK_GROWS_UP=1' -O2 -pipe -I/usr/local/include/tcl8.5 -Wno-unused-value -Wno-unused-parameter -Wno-deprecated-declarations -Wall -W -Wno-self-assign -fstack-protector-all -fno-strict-overflow -fPIC -o tlsIO.o -c /usr/ports/pobj/tcltls-1.7.22/tcltls-1.7.22/tlsIO.c
cc -I/usr/local/include/tcl8.5 -I/usr/ports/pobj/tcltls-1.7.22/tcltls-1.7.22 -I. -DPACKAGE_NAME=\"tcltls\" -DPACKAGE_TARNAME=\"tcltls\" -DPACKAGE_VERSION=\"1.7.22\" -DPACKAGE_STRING=\"tcltls\ 1.7.22\" -DPACKAGE_BUGREPORT=\"\" -DPACKAGE_URL=\"\" -DSTDC_HEADERS=1 -DHAVE_SYS_TYPES_H=1 -DHAVE_SYS_STAT_H=1 -DHAVE_STDLIB_H=1 -DHAVE_STRING_H=1 -DHAVE_MEMORY_H=1 -DHAVE_STRINGS_H=1 -DHAVE_INTTYPES_H=1 -DHAVE_STDINT_H=1 -DHAVE_UNISTD_H=1 -D__EXTENSIONS__=1 -D_ALL_SOURCE=1 -D_GNU_SOURCE=1 -D_POSIX_PTHREAD_SEMANTICS=1 -D_TANDEM_SOURCE=1 -DHAVE_UNISTD_H=1 -DHAVE_STDLIB_H=1 -DHAVE_STRING_H=1 -DHAVE_STRINGS_H=1 -DMODULE_SCOPE=static -DUSE_TCL_STUBS=1 -DTCLTLS_SSL_USE_FASTPATH=1 -D_FORTIFY_SOURCE=2 -DHAVE_TLS_METHOD=1 -DNO_SSL2=1 -DNO_SSL3=1 '-DTCL_CFGVAL_ENCODING="iso8859-1"' '-DTCL_SHLIB_EXT=".so"' '-DTCL_CFG_OPTIMIZED=1' '-DTCL_TOMMATH=1' '-DTCL_WIDE_INT_IS_LONG=1' '-DTCL_UNLOAD_DLLS=1' '-DTCL_STACK_GROWS_UP=1' -O2 -pipe -I/usr/local/include/tcl8.5 -Wno-unused-value -Wno-unused-parameter -Wno-deprecated-declarations -Wall -W -Wno-self-assign -fstack-protector-all -fno-strict-overflow -fPIC -o tlsX509.o -c /usr/ports/pobj/tcltls-1.7.22/tcltls-1.7.22/tlsX509.c
cc -I/usr/local/include/tcl8.5 -I/usr/ports/pobj/tcltls-1.7.22/tcltls-1.7.22 -I. -DPACKAGE_NAME=\"tcltls\" -DPACKAGE_TARNAME=\"tcltls\" -DPACKAGE_VERSION=\"1.7.22\" -DPACKAGE_STRING=\"tcltls\ 1.7.22\" -DPACKAGE_BUGREPORT=\"\" -DPACKAGE_URL=\"\" -DSTDC_HEADERS=1 -DHAVE_SYS_TYPES_H=1 -DHAVE_SYS_STAT_H=1 -DHAVE_STDLIB_H=1 -DHAVE_STRING_H=1 -DHAVE_MEMORY_H=1 -DHAVE_STRINGS_H=1 -DHAVE_INTTYPES_H=1 -DHAVE_STDINT_H=1 -DHAVE_UNISTD_H=1 -D__EXTENSIONS__=1 -D_ALL_SOURCE=1 -D_GNU_SOURCE=1 -D_POSIX_PTHREAD_SEMANTICS=1 -D_TANDEM_SOURCE=1 -DHAVE_UNISTD_H=1 -DHAVE_STDLIB_H=1 -DHAVE_STRING_H=1 -DHAVE_STRINGS_H=1 -DMODULE_SCOPE=static -DUSE_TCL_STUBS=1 -DTCLTLS_SSL_USE_FASTPATH=1 -D_FORTIFY_SOURCE=2 -DHAVE_TLS_METHOD=1 -DNO_SSL2=1 -DNO_SSL3=1 '-DTCL_CFGVAL_ENCODING="iso8859-1"' '-DTCL_SHLIB_EXT=".so"' '-DTCL_CFG_OPTIMIZED=1' '-DTCL_TOMMATH=1' '-DTCL_WIDE_INT_IS_LONG=1' '-DTCL_UNLOAD_DLLS=1' '-DTCL_STACK_GROWS_UP=1' -O2 -pipe -I/usr/local/include/tcl8.5 -Wno-unused-value -Wno-unused-parameter -Wno-deprecated-declarations -Wall -W -Wno-self-assign -fstack-protector-all -fno-strict-overflow -fPIC -shared -Wl,--version-script,/usr/ports/pobj/tcltls-1.7.22/tcltls-1.7.22/tcltls.vers -o shared-tcltls.so tls.o tlsBIO.o tlsIO.o tlsX509.o -lssl -lcrypto -L/usr/local/lib -ltclstub85 -lssl -lcrypto
objcopy --keep-global-symbols=tcltls.syms shared-tcltls.so
objcopy --discard-all shared-tcltls.so
mv shared-tcltls.so tcltls.so
Hello Stu!

(sebastia@ removed from CC:)

I used your script and it worked, full tcltls make log attached.

Thanks!

Marcus

3d0g@bell.net (Stuart Cassoff), 2022.05.24 (Tue) 16:57 (CEST):
> Bummer, I was hoping the patch wouldn't get mangled. Oh well. Patch
> attached.
>
> This'll set it up:
>
> $ cat uptcltls.sh
> d=/path/to/tcltls.diff.gz
> mkdir -p /usr/ports/mystuff/security
> cd /usr/ports/mystuff/security
> rm -Rf tcltls
> cp -a /usr/ports/security/tcltls .
> cd tcltls
> gzcat $d | patch -p0 -E
> find . -name '*.orig' -exec rm {} +
>
>
> Stu
>
> ------ Original Message ------
> From: mcmer-openbsd@tor.at
> To: 3d0g@bell.net
> Cc: ports@openbsd.org; sebastia@openbsd.org
> Sent: Tuesday, May 24, 2022 8:50 AM
> Subject: Re: pkg_add coccinella: Can't find tcltls-1.6p4
>
> Hello Stu,
>
> your patch landed somewhat garbled in my inbox, long lines gained a
> line break. I attempted a repair, following patch(1)'s advice, and ran
> patch < your.patch in security/tcltls. I ended up with two patch files
> in security/tcltls instead of patches/. Moved these into patches/, ran
> make but got:
>
> Patching file tlsX509.c using Plan A...
> Reversed (or previously applied) patch detected! Assume -R? [y] n
> Apply anyway? [n] n
> Hunk #1 ignored at 104.
> Hunk #2 ignored at 144.
> 2 out of 2 hunks ignored--saving rejects to tlsX509.c.rej
> done
> ***> patch-tlsX509_c did not apply cleanly
> ===> Ignoring patchfile patch-tlsX509_c.orig
> ===> Ignoring patchfile patch-tlsX509_c.rej
> ===> Failed patches:
> patch-tests_ciphers_test
> patch-tlsX509_c
>
> I'm at my wits end.
>
> Marcus
>
> 3d0g@bell.net (Stuart Cassoff), 2022.05.23 (Mon) 23:06 (CEST):
> > Hi,
> >
> > I've brought the port up to the latest version
> > but I'm not pleased with the test failures
> > when not using --enable-ssl-fastpath.
> >
> > I don't see anything about this problem in
> > the FreeBSD, NetBSD or Debian ports.
> > Only NetBSD uses --enable-ssl-fastpath.
> >
> > My best guess is something to do with EAGAIN
> > handling and BIO_should_read/write() in the BioRead
> > and BioWrite functions in tlsBIO.c.
> >
> > This is about as far as my brain can take me.
> > Additional notes in the patches.
> >
> > Same results on amd64 and i386.
> >
> >
> > Stu
> >
> >
> > diff -u -rNp /usr/ports/security/tcltls/Makefile ./Makefile
> > --- /usr/ports/security/tcltls/Makefile Fri Mar 11 14:54:07 2022
> > +++ ./Makefile Mon May 23 16:52:38 2022
> > @@ -1,16 +1,12 @@
> > -BROKEN= Needs update to less outdated version and checking of dependent
> > ports
> > -
> > COMMENT= OpenSSL Tcl extension
> >
> > -VERSION= 1.6
> > +VERSION= 1.7.22
> >
> > -DISTNAME= tls${VERSION}-src
> > -PKGNAME= tcltls-${VERSION}
> > -REVISION= 4
> > +DISTNAME= tcltls-${VERSION}
> >
> > CATEGORIES= security
> >
> > -HOMEPAGE= http://tls.sourceforge.net/
> > +HOMEPAGE= http://core.tcl-lang.org/tcltls/
> >
> > MAINTAINER= Sebastian Reitenbach <sebastia@openbsd.org>
> >
> > @@ -19,29 +15,54 @@ PERMIT_PACKAGE= Yes
> >
> > WANTLIB= ssl crypto
> >
> > -MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=tls/}
> > +MASTER_SITES= ${HOMEPAGE:=uv/}
> >
> > MODULES= lang/tcl
> >
> > RUN_DEPENDS= ${MODTCL_RUN_DEPENDS}
> > BUILD_DEPENDS= ${RUN_DEPENDS}
> >
> > -WRKDIST= ${WRKDIR}/tls${VERSION}
> > +FAKE_FLAGS = PACKAGE_INSTALL_DIR='$$(TCL_PACKAGE_PATH)/tcltls' \
> > + INSTALL_PROGRAM='$$(INSTALL_DATA)'
> > +
> > +TEST_FLAGS = TESTFLAGS='${TESTFLAGS}'
> > SEPARATE_BUILD =Yes
> > CONFIGURE_STYLE=gnu
> > +
> > CONFIGURE_ARGS= --libdir=${MODTCL_TCLDIR} \
> > --with-tcl=${MODTCL_LIBDIR} \
> > - --with-tclinclude=${MODTCL_INCDIR} \
> > - --with-ssl-dir=/usr \
> > - --includedir=${PREFIX}/include/tcltls
> > + --includedir=${PREFIX}/include/tcltls \
> > + --disable-rpath \
> > + --enable-deterministic \
> > + --enable-ssl-fastpath
> >
> > -FAKE_FLAGS = PKG_DIR='$$(PACKAGE_NAME)'
> INSTALL_PROGRAM='$$(INSTALL_DATA)'
> > -INSTALL_TARGET= install-binaries
> > +
> > +# Tests will fail without this. Not a good sign.
> > +# --enable-ssl-fastpath
> > +
> > +# Use premade DH primes instead of generating new ones; builds faster.
> > +# --enable-deterministic
> > +
> > +# Print lots of debugging info
> > +# --enable-debug
> > +
> > +
> > +# Tcltls configure will always choose tclsh8.6 (if installed) over
> > tclsh8.5.
> > +# Ensure that the tclsh chosen is the one matching MODTCL_VERSION.
> > +CONFIGURE_ENV += TCLSH_NATIVE=${MODTCL_BIN}
> > +
> > TEST_TARGET= test
> > -CFLAGS += -DNO_SSL2 -DNO_SSL3
> > -SUBST_VARS= VER
> >
> > -VER= ${VERSION:S/.//g}
> > +# Use TESTFLAGS to control the Tclthread tests
> > +TESTFLAGS =
> > +
> > +
> > +# These tests fail without --enable-ssl-fastpath.
> > +#TESTFLAGS='-skip "tlsIO-9.2 tlsIO-2.11 tlsIO-12.3"'
> > +
> > +# To run one test only:
> > +#TESTFLAGS='-match "tlsIO-9.2"'
> > +
> >
> > post-install:
> > ${INSTALL_DATA_DIR} ${PREFIX}/share/doc/tcltls/
> > diff -u -rNp /usr/ports/security/tcltls/distinfo ./distinfo
> > --- /usr/ports/security/tcltls/distinfo Sat Jan 17 22:15:08 2015
> > +++ ./distinfo Sat May 21 09:18:13 2022
> > @@ -1,2 +1,2 @@
> > -SHA256 (tls1.6-src.tar.gz) =
> rexQFDqa1jSmcdJPfHu/JFVIfrXxLSkPQXl8MqmLk/M=
> > -SIZE (tls1.6-src.tar.gz) = 168043
> > +SHA256 (tcltls-1.7.22.tar.gz) =
> > 6E4reideyCxKqp0bH5eG2+Q1jIFekXU5/+f2Z/9Lw7Q=
> > +SIZE (tcltls-1.7.22.tar.gz) = 165206
> > diff -u -rNp /usr/ports/security/tcltls/patches/patch-configure
> > ./patches/patch-configure
> > --- /usr/ports/security/tcltls/patches/patch-configure Fri Mar 11
> 14:54:07
> > 2022
> > +++ ./patches/patch-configure Wed Dec 31 19:00:00 1969
> > @@ -1,12 +0,0 @@
> > -Index: configure
> > ---- configure.orig
> > -+++ configure
> > -@@ -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'
> > - 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
> > diff -u -rNp /usr/ports/security/tcltls/patches/patch-tests_ciphers_test
> > ./patches/patch-tests_ciphers_test
> > --- /usr/ports/security/tcltls/patches/patch-tests_ciphers_test Fri Mar
> 11
> > 14:54:07 2022
> > +++ ./patches/patch-tests_ciphers_test Wed Dec 31 19:00:00 1969
> > @@ -1,39 +0,0 @@
> > -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
> > diff -u -rNp /usr/ports/security/tcltls/patches/patch-tlsBIO_c
> > ./patches/patch-tlsBIO_c
> > --- /usr/ports/security/tcltls/patches/patch-tlsBIO_c Wed Dec 31 19:00:00
> > 1969
> > +++ ./patches/patch-tlsBIO_c Sun May 22 21:25:55 2022
> > @@ -0,0 +1,20 @@
> > +Found in the Debian port:
> > +http://deb.debian.org/debian/pool/main/t/tcltls/tcltls_1.7.22-2.debian.tar.xz
> > +
> > +Index: tlsBIO.c
> > +--- tlsBIO.c.orig
> > ++++ tlsBIO.c
> > +@@ -231,9 +231,12 @@ static long BioCtrl(BIO *bio, int cmd, long num,
> void
> > + switch (cmd) {
> > + case BIO_CTRL_RESET:
> > + dprintf("Got BIO_CTRL_RESET");
> > +- num = 0;
> > ++ ret = 0;
> > ++ break;
> > + case BIO_C_FILE_SEEK:
> > + dprintf("Got BIO_C_FILE_SEEK");
> > ++ ret = 0;
> > ++ break;
> > + case BIO_C_FILE_TELL:
> > + dprintf("Got BIO_C_FILE_TELL");
> > + ret = 0;
> > diff -u -rNp /usr/ports/security/tcltls/patches/patch-tlsInt_h
> > ./patches/patch-tlsInt_h
> > --- /usr/ports/security/tcltls/patches/patch-tlsInt_h Wed Dec 31 19:00:00
> > 1969
> > +++ ./patches/patch-tlsInt_h Sun May 22 10:10:19 2022
> > @@ -0,0 +1,12 @@
> > +Index: tlsInt.h
> > +--- tlsInt.h.orig
> > ++++ tlsInt.h
> > +@@ -54,7 +54,7 @@
> > + * Determine if we should use the pre-OpenSSL 1.1.0 API
> > + */
> > + #undef TCLTLS_OPENSSL_PRE_1_1
> > +-#if (defined(LIBRESSL_VERSION_NUMBER)) || OPENSSL_VERSION_NUMBER <
> > 0x10100000L
> > ++#if OPENSSL_VERSION_NUMBER < 0x10100000L
> > + # define TCLTLS_OPENSSL_PRE_1_1_API 1
> > +