Update to libressl-3.7.1.
This commit is contained in:
parent
98c92bcdcc
commit
03ee6d4d89
|
@ -12,7 +12,7 @@ diff -Paur --no-dereference -- libssl.upstream/apps/nc/netcat.c libssl/apps/nc/n
|
||||||
|
|
||||||
#include <ctype.h>
|
#include <ctype.h>
|
||||||
#include <err.h>
|
#include <err.h>
|
||||||
@@ -468,8 +471,12 @@
|
@@ -467,8 +470,12 @@
|
||||||
} else {
|
} else {
|
||||||
strlcpy(unix_dg_tmp_socket_buf, "/tmp/nc.XXXXXXXXXX",
|
strlcpy(unix_dg_tmp_socket_buf, "/tmp/nc.XXXXXXXXXX",
|
||||||
UNIX_DG_TMP_SOCKET_SIZE);
|
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;
|
unix_dg_tmp_socket = unix_dg_tmp_socket_buf;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -1403,7 +1410,8 @@
|
@@ -1385,7 +1392,8 @@
|
||||||
memset(&cmsgbuf, 0, sizeof(cmsgbuf));
|
memset(&cmsgbuf, 0, sizeof(cmsgbuf));
|
||||||
memset(&iov, 0, sizeof(iov));
|
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);
|
mh.msg_controllen = sizeof(cmsgbuf.buf);
|
||||||
cmsg = CMSG_FIRSTHDR(&mh);
|
cmsg = CMSG_FIRSTHDR(&mh);
|
||||||
cmsg->cmsg_len = CMSG_LEN(sizeof(int));
|
cmsg->cmsg_len = CMSG_LEN(sizeof(int));
|
||||||
@@ -1440,6 +1448,7 @@
|
@@ -1422,6 +1430,7 @@
|
||||||
void
|
void
|
||||||
atelnet(int nfd, unsigned char *buf, unsigned int size)
|
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 *p, *end;
|
||||||
unsigned char obuf[4];
|
unsigned char obuf[4];
|
||||||
|
|
||||||
@@ -1465,6 +1474,9 @@
|
@@ -1447,6 +1456,9 @@
|
||||||
if (atomicio(vwrite, nfd, obuf, 3) != 3)
|
if (atomicio(vwrite, nfd, obuf, 3) != 3)
|
||||||
warn("Write Error!");
|
warn("Write Error!");
|
||||||
}
|
}
|
||||||
|
@ -54,7 +54,7 @@ diff -Paur --no-dereference -- libssl.upstream/apps/nc/netcat.c libssl/apps/nc/n
|
||||||
}
|
}
|
||||||
|
|
||||||
int
|
int
|
||||||
@@ -1578,16 +1590,20 @@
|
@@ -1590,16 +1602,20 @@
|
||||||
err(1, NULL);
|
err(1, NULL);
|
||||||
}
|
}
|
||||||
if (Tflag != -1) {
|
if (Tflag != -1) {
|
||||||
|
@ -77,7 +77,7 @@ diff -Paur --no-dereference -- libssl.upstream/apps/nc/netcat.c libssl/apps/nc/n
|
||||||
errno = ENOPROTOOPT;
|
errno = ENOPROTOOPT;
|
||||||
err(1, "set IPv6 traffic class not supported");
|
err(1, "set IPv6 traffic class not supported");
|
||||||
}
|
}
|
||||||
@@ -1605,13 +1621,16 @@
|
@@ -1617,13 +1633,16 @@
|
||||||
}
|
}
|
||||||
|
|
||||||
if (ttl != -1) {
|
if (ttl != -1) {
|
||||||
|
@ -96,7 +96,7 @@ diff -Paur --no-dereference -- libssl.upstream/apps/nc/netcat.c libssl/apps/nc/n
|
||||||
}
|
}
|
||||||
|
|
||||||
if (minttl != -1) {
|
if (minttl != -1) {
|
||||||
@@ -1649,7 +1668,9 @@
|
@@ -1661,7 +1680,9 @@
|
||||||
{ "af41", IPTOS_DSCP_AF41 },
|
{ "af41", IPTOS_DSCP_AF41 },
|
||||||
{ "af42", IPTOS_DSCP_AF42 },
|
{ "af42", IPTOS_DSCP_AF42 },
|
||||||
{ "af43", IPTOS_DSCP_AF43 },
|
{ "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 },
|
{ "cs0", IPTOS_DSCP_CS0 },
|
||||||
{ "cs1", IPTOS_DSCP_CS1 },
|
{ "cs1", IPTOS_DSCP_CS1 },
|
||||||
{ "cs2", IPTOS_DSCP_CS2 },
|
{ "cs2", IPTOS_DSCP_CS2 },
|
||||||
@@ -1659,11 +1680,21 @@
|
@@ -1671,11 +1692,21 @@
|
||||||
{ "cs6", IPTOS_DSCP_CS6 },
|
{ "cs6", IPTOS_DSCP_CS6 },
|
||||||
{ "cs7", IPTOS_DSCP_CS7 },
|
{ "cs7", IPTOS_DSCP_CS7 },
|
||||||
{ "ef", IPTOS_DSCP_EF },
|
{ "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(int *sock, int port, int type);
|
||||||
static int init_server_long(int *sock, int port, char *ip, int type);
|
static int init_server_long(int *sock, int port, char *ip, int type);
|
||||||
static int do_accept(int acc_sock, int *sock);
|
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
|
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.upstream/crypto/bio/b_sock.c
|
||||||
+++ libssl/crypto/bio/b_sock.c
|
+++ libssl/crypto/bio/b_sock.c
|
||||||
|
|
|
@ -1,10 +1,10 @@
|
||||||
NAME=libssl
|
NAME=libssl
|
||||||
BUILD_LIBRARIES=
|
BUILD_LIBRARIES=
|
||||||
VERSION=3.7.0
|
VERSION=3.7.1
|
||||||
DISTNAME=libressl-$VERSION
|
DISTNAME=libressl-$VERSION
|
||||||
COMPRESSION=tar.gz
|
COMPRESSION=tar.gz
|
||||||
ARCHIVE=$DISTNAME.$COMPRESSION
|
ARCHIVE=$DISTNAME.$COMPRESSION
|
||||||
SHA256SUM=3fc1290f4007ec75f6e9acecbb25512630d1b9ab8c53ba79844e395868c3e006
|
SHA256SUM=98086961a2b8b657ed0fea3056fb2db14294b6bfa193c15a5236a0a35c843ded
|
||||||
UPSTREAM_SITE=https://ftp.openbsd.org/pub/OpenBSD/LibreSSL
|
UPSTREAM_SITE=https://ftp.openbsd.org/pub/OpenBSD/LibreSSL
|
||||||
UPSTREAM_ARCHIVE=$ARCHIVE
|
UPSTREAM_ARCHIVE=$ARCHIVE
|
||||||
LICENSE=OpenSSL
|
LICENSE=OpenSSL
|
||||||
|
|
Loading…
Reference in New Issue