From 03ee6d4d8910b1e95308cf39f0e7f52962732d1a Mon Sep 17 00:00:00 2001
From: Jonas 'Sortie' Termansen <sortie@maxsi.org>
Date: Thu, 16 Mar 2023 11:11:33 +0100
Subject: [PATCH] Update to libressl-3.7.1.

---
 ports/libssl/libssl.patch | 30 ++++++++++++++++++++++--------
 ports/libssl/libssl.port  |  4 ++--
 2 files changed, 24 insertions(+), 10 deletions(-)

diff --git a/ports/libssl/libssl.patch b/ports/libssl/libssl.patch
index 75d6a85c..00d6d7cb 100644
--- a/ports/libssl/libssl.patch
+++ b/ports/libssl/libssl.patch
@@ -12,7 +12,7 @@ diff -Paur --no-dereference -- libssl.upstream/apps/nc/netcat.c libssl/apps/nc/n
  
  #include <ctype.h>
  #include <err.h>
-@@ -468,8 +471,12 @@
+@@ -467,8 +470,12 @@
  		} else {
  			strlcpy(unix_dg_tmp_socket_buf, "/tmp/nc.XXXXXXXXXX",
  			    UNIX_DG_TMP_SOCKET_SIZE);
@@ -26,7 +26,7 @@ diff -Paur --no-dereference -- libssl.upstream/apps/nc/netcat.c libssl/apps/nc/n
  			unix_dg_tmp_socket = unix_dg_tmp_socket_buf;
  		}
  	}
-@@ -1403,7 +1410,8 @@
+@@ -1385,7 +1392,8 @@
  	memset(&cmsgbuf, 0, sizeof(cmsgbuf));
  	memset(&iov, 0, sizeof(iov));
  
@@ -36,7 +36,7 @@ diff -Paur --no-dereference -- libssl.upstream/apps/nc/netcat.c libssl/apps/nc/n
  	mh.msg_controllen = sizeof(cmsgbuf.buf);
  	cmsg = CMSG_FIRSTHDR(&mh);
  	cmsg->cmsg_len = CMSG_LEN(sizeof(int));
-@@ -1440,6 +1448,7 @@
+@@ -1422,6 +1430,7 @@
  void
  atelnet(int nfd, unsigned char *buf, unsigned int size)
  {
@@ -44,7 +44,7 @@ diff -Paur --no-dereference -- libssl.upstream/apps/nc/netcat.c libssl/apps/nc/n
  	unsigned char *p, *end;
  	unsigned char obuf[4];
  
-@@ -1465,6 +1474,9 @@
+@@ -1447,6 +1456,9 @@
  		if (atomicio(vwrite, nfd, obuf, 3) != 3)
  			warn("Write Error!");
  	}
@@ -54,7 +54,7 @@ diff -Paur --no-dereference -- libssl.upstream/apps/nc/netcat.c libssl/apps/nc/n
  }
  
  int
-@@ -1578,16 +1590,20 @@
+@@ -1590,16 +1602,20 @@
  			err(1, NULL);
  	}
  	if (Tflag != -1) {
@@ -77,7 +77,7 @@ diff -Paur --no-dereference -- libssl.upstream/apps/nc/netcat.c libssl/apps/nc/n
  			errno = ENOPROTOOPT;
  			err(1, "set IPv6 traffic class not supported");
  		}
-@@ -1605,13 +1621,16 @@
+@@ -1617,13 +1633,16 @@
  	}
  
  	if (ttl != -1) {
@@ -96,7 +96,7 @@ diff -Paur --no-dereference -- libssl.upstream/apps/nc/netcat.c libssl/apps/nc/n
  	}
  
  	if (minttl != -1) {
-@@ -1649,7 +1668,9 @@
+@@ -1661,7 +1680,9 @@
  		{ "af41",		IPTOS_DSCP_AF41 },
  		{ "af42",		IPTOS_DSCP_AF42 },
  		{ "af43",		IPTOS_DSCP_AF43 },
@@ -106,7 +106,7 @@ diff -Paur --no-dereference -- libssl.upstream/apps/nc/netcat.c libssl/apps/nc/n
  		{ "cs0",		IPTOS_DSCP_CS0 },
  		{ "cs1",		IPTOS_DSCP_CS1 },
  		{ "cs2",		IPTOS_DSCP_CS2 },
-@@ -1659,11 +1680,21 @@
+@@ -1671,11 +1692,21 @@
  		{ "cs6",		IPTOS_DSCP_CS6 },
  		{ "cs7",		IPTOS_DSCP_CS7 },
  		{ "ef",			IPTOS_DSCP_EF },
@@ -214,6 +214,20 @@ diff -Paur --no-dereference -- libssl.upstream/apps/openssl/s_socket.c libssl/ap
  static int init_server(int *sock, int port, int type);
  static int init_server_long(int *sock, int port, char *ip, int type);
  static int do_accept(int acc_sock, int *sock);
+diff -Paur --no-dereference -- libssl.upstream/configure libssl/configure
+--- libssl.upstream/configure
++++ libssl/configure
+@@ -11775,6 +11775,10 @@
+ 		HOST_OS=midipix
+ 		CPPFLAGS="$CPPFLAGS -D_DEFAULT_SOURCE -D_BSD_SOURCE -D_POSIX_SOURCE -D_GNU_SOURCE"
+ 		;;
++	*sortix*)
++		HOST_OS=sortix
++		HOST_ABI=elf
++		;;
+ 	*netbsd*)
+ 		HOST_OS=netbsd
+ 		HOST_ABI=elf
 diff -Paur --no-dereference -- libssl.upstream/crypto/bio/b_sock.c libssl/crypto/bio/b_sock.c
 --- libssl.upstream/crypto/bio/b_sock.c
 +++ libssl/crypto/bio/b_sock.c
diff --git a/ports/libssl/libssl.port b/ports/libssl/libssl.port
index 5f0ac7cb..c3363470 100644
--- a/ports/libssl/libssl.port
+++ b/ports/libssl/libssl.port
@@ -1,10 +1,10 @@
 NAME=libssl
 BUILD_LIBRARIES=
-VERSION=3.7.0
+VERSION=3.7.1
 DISTNAME=libressl-$VERSION
 COMPRESSION=tar.gz
 ARCHIVE=$DISTNAME.$COMPRESSION
-SHA256SUM=3fc1290f4007ec75f6e9acecbb25512630d1b9ab8c53ba79844e395868c3e006
+SHA256SUM=98086961a2b8b657ed0fea3056fb2db14294b6bfa193c15a5236a0a35c843ded
 UPSTREAM_SITE=https://ftp.openbsd.org/pub/OpenBSD/LibreSSL
 UPSTREAM_ARCHIVE=$ARCHIVE
 LICENSE=OpenSSL