From 85eea94598ff4b543777df4bf34d44ef5dfc06c6 Mon Sep 17 00:00:00 2001
From: Brent Cook <busterb@gmail.com>
Date: Thu, 20 Aug 2020 10:19:23 -0500
Subject: [PATCH] disable some additional libtls-standalone bits

---
 patches/tls.h.patch | 20 ++------------------
 update.sh           | 21 +--------------------
 2 files changed, 3 insertions(+), 38 deletions(-)

diff --git a/patches/tls.h.patch b/patches/tls.h.patch
index 3d72749..180101d 100644
--- a/patches/tls.h.patch
+++ b/patches/tls.h.patch
@@ -3,7 +3,7 @@
 @@ -22,6 +22,13 @@
  extern "C" {
  #endif
- 
+
 +#ifdef _MSC_VER
 +#ifndef LIBRESSL_INTERNAL
 +#include <basetsd.h>
@@ -12,21 +12,5 @@
 +#endif
 +
  #include <sys/types.h>
- 
- #include <stddef.h>
---- libtls-standalone/include/tls.h.orig	2017-02-13 20:21:48.297958529 +0900
-+++ libtls-standalone/include/tls.h	2017-02-13 20:21:48.296958502 +0900
-@@ -22,6 +22,13 @@
- extern "C" {
- #endif
- 
-+#ifdef _MSC_VER
-+#ifndef LIBRESSL_INTERNAL
-+#include <basetsd.h>
-+typedef SSIZE_T ssize_t;
-+#endif
-+#endif
-+
- #include <sys/types.h>
- 
+
  #include <stddef.h>
diff --git a/update.sh b/update.sh
index cc1deb7..afff2f4 100755
--- a/update.sh
+++ b/update.sh
@@ -46,7 +46,6 @@ echo $libssl_version > ssl/VERSION
 libtls_version=$major:$minor:0
 echo "libtls version $libtls_version"
 echo $libtls_version > tls/VERSION
-echo $major.$minor.0 > libtls-standalone/VERSION
 
 do_mv() {
 	if ! cmp -s "$1" "$2"
@@ -76,9 +75,8 @@ $CP $libcrypto_src/opensslfeatures.h include/openssl
 $CP $libssl_src/pqueue.h include
 
 $CP $libtls_src/tls.h include
-$CP $libtls_src/tls.h libtls-standalone/include
 
-for i in crypto/compat libtls-standalone/compat; do
+for i in crypto/compat; do
 	for j in $libc_src/crypt/arc4random.c \
 	    $libc_src/crypt/arc4random_uniform.c \
 	    $libc_src/crypt/chacha_private.h \
@@ -99,15 +97,6 @@ for i in crypto/compat libtls-standalone/compat; do
 	done
 done
 
-$CP include/compat/stdlib.h \
-	include/compat/string.h \
-	include/compat/unistd.h \
-	libtls-standalone/include
-
-$CP crypto/compat/arc4random*.h \
-	crypto/compat/bsd-asprintf.c \
-	libtls-standalone/compat
-
 (cd $libcrypto_src/objects/;
 	perl objects.pl objects.txt obj_mac.num obj_mac.h;
 	perl obj_dat.pl obj_mac.h obj_dat.h )
@@ -243,19 +232,11 @@ rm -f tls/*.c tls/*.h libtls/src/*.c libtls/src/*.h
 for i in `awk '/SOURCES|HEADERS/ { print $3 }' tls/Makefile.am` ; do
 	if [ -e $libtls_src/$i ]; then
 		$CP $libtls_src/$i tls
-		$CP $libtls_src/$i libtls-standalone/src
 	fi
 done
 # add the libtls symbol export list
 $GREP '^[A-Za-z0-9_]' < $libtls_src/Symbols.list > tls/tls.sym
 
-mkdir -p libtls-standalone/m4
-$CP m4/check*.m4 \
-	m4/disable*.m4 \
-	libtls-standalone/m4
-sed -e "s/compat\///" crypto/Makefile.am.arc4random > \
-	libtls-standalone/compat/Makefile.am.arc4random
-
 # copy nc(1) source
 echo "copying nc(1) source"
 $CP $bin_src/nc/nc.1 apps/nc