1
0
forked from 0ad/0ad

Fix game crash when communicating with the lobby on macOS 13

Summary:
On macOS Ventura (at least version 13.2.1 and above), the game crashes
instantly when clicking on buttons communicating with the lobby.

This issue is solved by upgrading nettle to 3.9 and GNUTLS to 3.8.

Patch by: froissant
Accepted By: wraitii
Trac Tickets: #6807

Differential Revision: https://code.wildfiregames.com/D5018
This was SVN commit r27667.
This commit is contained in:
wraitii 2023-06-06 07:07:50 +00:00
parent 9707931878
commit 0d5cc1b994
3 changed files with 22 additions and 20 deletions

View File

@ -107,6 +107,7 @@
{ "nick": "fpre", "name": "Frederick Stallmeyer" },
{ "nick": "Freagarach" },
{ "nick": "freenity", "name": "Anton Galitch" },
{ "nick": "froissant", "name": "Anthony Froissant" },
{ "nick": "Gallaecio", "name": "Adrián Chaves" },
{ "nick": "gbish (aka Iny)", "name": "Grant Bishop" },
{ "nick": "Gee", "name": "Gustav Larsson" },

View File

@ -37,10 +37,10 @@ OGG_VERSION="libogg-1.3.3"
VORBIS_VERSION="libvorbis-1.3.7"
# gloox requires GnuTLS, GnuTLS requires Nettle and GMP
GMP_VERSION="gmp-6.2.1"
NETTLE_VERSION="nettle-3.6"
NETTLE_VERSION="nettle-3.9"
# NOTE: remember to also update LIB_URL below when changing version
GLOOX_VERSION="gloox-1.0.24"
GNUTLS_VERSION="gnutls-3.6.15"
GNUTLS_VERSION="gnutls-3.8.0"
# OS X only includes part of ICU, and only the dylib
# NOTE: remember to also update LIB_URL below when changing version
ICU_VERSION="icu4c-69_1"
@ -738,7 +738,7 @@ echo -e "Building GnuTLS..."
LIB_VERSION="${GNUTLS_VERSION}"
LIB_ARCHIVE="$LIB_VERSION.tar.xz"
LIB_DIRECTORY="$LIB_VERSION"
LIB_URL="https://www.gnupg.org/ftp/gcrypt/gnutls/v3.6/"
LIB_URL="https://www.gnupg.org/ftp/gcrypt/gnutls/v3.8/"
mkdir -p gnutls
pushd gnutls > /dev/null
@ -775,6 +775,7 @@ then
--with-included-unistring \
--with-included-libtasn1 \
--without-p11-kit \
--without-brotli \
--disable-tests \
--disable-guile \
--disable-doc \

View File

@ -4,19 +4,19 @@
#include <element.h>
#include <limits.h>
#include <intprops.h>
-#include <c-ctype.h>
-#include "c-ctype.h"
#ifdef DEBUG
# define warn() fprintf(stderr, "%s: %d\n", __func__, __LINE__)
@@ -353,7 +352,7 @@
p = &der[len_len];
for (i=0;i<(unsigned)(str_len-1);i++)
{
- if (c_isdigit(p[i]) == 0)
+ if (isdigit(p[i]) == 0)
{
if (type == ASN1_ETYPE_GENERALIZED_TIME)
{
@@ -355,7 +355,7 @@
p = &der[len_len];
for (i = 0; i < (unsigned) (str_len - 1); i++)
{
- if (c_isdigit (p[i]) == 0)
+ if (isdigit (p[i]) == 0)
{
if (type == ASN1_ETYPE_GENERALIZED_TIME)
{
--- a/lib/minitasn1/element.c
+++ b/lib/minitasn1/element.c
@@ -30,7 +30,6 @@
@ -105,13 +105,13 @@
--- a/lib/minitasn1/int.h
+++ b/lib/minitasn1/int.h
@@ -29,6 +29,7 @@
#include <string.h>
#include <stdlib.h>
#include <stdio.h>
+#include <ctype.h>
#include <stdint.h>
#ifdef HAVE_SYS_TYPES_H
# include <string.h>
# include <stdlib.h>
# include <stdio.h>
+# include <ctype.h>
# include <stdint.h>
# ifdef HAVE_SYS_TYPES_H
--- a/lib/minitasn1/parser_aux.c
+++ b/lib/minitasn1/parser_aux.c
@@ -26,7 +26,6 @@