Index: libraries/osx/build-osx-libs.sh =================================================================== --- libraries/osx/build-osx-libs.sh +++ libraries/osx/build-osx-libs.sh @@ -21,28 +21,28 @@ # -------------------------------------------------------------- # Library versions for ease of updating: ZLIB_VERSION="zlib-1.2.11" -CURL_VERSION="curl-7.71.0" +CURL_VERSION="curl-7.77.0" ICONV_VERSION="libiconv-1.16" -XML2_VERSION="libxml2-2.9.10" -SDL2_VERSION="SDL2-2.0.12" +XML2_VERSION="libxml2-2.9.11" +SDL2_VERSION="SDL2-2.0.14" # NOTE: remember to also update LIB_URL below when changing version BOOST_VERSION="boost_1_76_0" # NOTE: remember to also update LIB_URL below when changing version WXWIDGETS_VERSION="wxWidgets-3.1.4" # libpng was included as part of X11 but that's removed from Mountain Lion # (also the Snow Leopard version was ancient 1.2) -PNG_VERSION="libpng-1.6.36" -OGG_VERSION="libogg-1.3.3" +PNG_VERSION="libpng-1.6.37" +OGG_VERSION="libogg-1.3.4" VORBIS_VERSION="libvorbis-1.3.7" # gloox requires GnuTLS, GnuTLS requires Nettle and GMP -GMP_VERSION="gmp-6.2.0" -NETTLE_VERSION="nettle-3.6" +GMP_VERSION="gmp-6.2.1" +NETTLE_VERSION="nettle-3.7" # 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.7.2" # 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-67_1" +ICU_VERSION="icu4c-69_1" ENET_VERSION="enet-1.3.17" MINIUPNPC_VERSION="miniupnpc-2.2.2" SODIUM_VERSION="libsodium-1.0.18" @@ -663,10 +663,7 @@ tar -xf $LIB_ARCHIVE pushd $LIB_DIRECTORY - # Patch GNUTLS for a linking issue with isdigit - # Patch by Ross Nicholson: https://gitlab.com/gnutls/gnutls/-/issues/1033#note_379529145 - (patch -Np1 -i ../../patches/03-undo-libtasn1-cisdigit.patch \ - && ./configure CFLAGS="$CFLAGS" \ + (./configure CFLAGS="$CFLAGS" \ CXXFLAGS="$CXXFLAGS" \ LDFLAGS="$LDFLAGS" \ LIBS="-L${GMP_DIR}/lib -lgmp" \ @@ -746,7 +743,7 @@ LIB_VERSION="${ICU_VERSION}" LIB_ARCHIVE="$LIB_VERSION-src.tgz" LIB_DIRECTORY="icu" -LIB_URL="https://github.com/unicode-org/icu/releases/download/release-67-1/" +LIB_URL="https://github.com/unicode-org/icu/releases/download/release-69-1/" mkdir -p $LIB_DIRECTORY pushd icu > /dev/null Index: libraries/osx/patches/03-undo-libtasn1-cisdigit.patch =================================================================== --- libraries/osx/patches/03-undo-libtasn1-cisdigit.patch +++ /dev/null @@ -1,142 +0,0 @@ ---- a/lib/minitasn1/decoding.c -+++ b/lib/minitasn1/decoding.c -@@ -32,7 +32,6 @@ - #include - #include - #include --#include - - #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) - { ---- a/lib/minitasn1/element.c -+++ b/lib/minitasn1/element.c -@@ -30,7 +30,6 @@ - #include "parser_aux.h" - #include - #include "structure.h" --#include "c-ctype.h" - #include "element.h" - - void -@@ -380,7 +379,7 @@ - case ASN1_ETYPE_ENUMERATED: - if (len == 0) - { -- if ((c_isdigit (value[0])) || (value[0] == '-')) -+ if ((isdigit (value[0])) || (value[0] == '-')) - { - value_temp = malloc (SIZEOF_UNSIGNED_LONG_INT); - if (value_temp == NULL) -@@ -453,7 +452,7 @@ - p = node->down; - while (type_field (p->type) != ASN1_ETYPE_DEFAULT) - p = p->right; -- if ((c_isdigit (p->value[0])) || (p->value[0] == '-')) -+ if ((isdigit (p->value[0])) || (p->value[0] == '-')) - { - default_temp = malloc (SIZEOF_UNSIGNED_LONG_INT); - if (default_temp == NULL) -@@ -519,7 +518,7 @@ - break; - case ASN1_ETYPE_OBJECT_ID: - for (i = 0; i < _asn1_strlen (value); i++) -- if ((!c_isdigit (value[i])) && (value[i] != '.') && (value[i] != '+')) -+ if ((!isdigit (value[i])) && (value[i] != '.') && (value[i] != '+')) - return ASN1_VALUE_NOT_VALID; - if (node->type & CONST_DEFAULT) - { -@@ -540,7 +539,7 @@ - if (len < 11) - return ASN1_VALUE_NOT_VALID; - for (k = 0; k < 10; k++) -- if (!c_isdigit (value[k])) -+ if (!isdigit (value[k])) - return ASN1_VALUE_NOT_VALID; - switch (len) - { -@@ -549,7 +548,7 @@ - return ASN1_VALUE_NOT_VALID; - break; - case 13: -- if ((!c_isdigit (value[10])) || (!c_isdigit (value[11])) || -+ if ((!isdigit (value[10])) || (!isdigit (value[11])) || - (value[12] != 'Z')) - return ASN1_VALUE_NOT_VALID; - break; -@@ -557,16 +556,16 @@ - if ((value[10] != '+') && (value[10] != '-')) - return ASN1_VALUE_NOT_VALID; - for (k = 11; k < 15; k++) -- if (!c_isdigit (value[k])) -+ if (!isdigit (value[k])) - return ASN1_VALUE_NOT_VALID; - break; - case 17: -- if ((!c_isdigit (value[10])) || (!c_isdigit (value[11]))) -+ if ((!isdigit (value[10])) || (!isdigit (value[11]))) - return ASN1_VALUE_NOT_VALID; - if ((value[12] != '+') && (value[12] != '-')) - return ASN1_VALUE_NOT_VALID; - for (k = 13; k < 17; k++) -- if (!c_isdigit (value[k])) -+ if (!isdigit (value[k])) - return ASN1_VALUE_NOT_VALID; - break; - default: -@@ -890,7 +889,7 @@ - p = node->down; - while (type_field (p->type) != ASN1_ETYPE_DEFAULT) - p = p->right; -- if ((c_isdigit (p->value[0])) || (p->value[0] == '-') -+ if ((isdigit (p->value[0])) || (p->value[0] == '-') - || (p->value[0] == '+')) - { - result = _asn1_convert_integer - ---- a/lib/minitasn1/int.h -+++ b/lib/minitasn1/int.h -@@ -29,6 +29,7 @@ - #include - #include - #include -+#include - #include - - #ifdef HAVE_SYS_TYPES_H ---- a/lib/minitasn1/parser_aux.c -+++ b/lib/minitasn1/parser_aux.c -@@ -26,7 +26,6 @@ - #include "gstr.h" - #include "structure.h" - #include "element.h" --#include "c-ctype.h" - - char _asn1_identifierMissing[ASN1_MAX_NAME_SIZE + 1]; /* identifier name not found */ - -@@ -755,7 +754,7 @@ - p2 = p->down; - if (p2 && (type_field (p2->type) == ASN1_ETYPE_CONSTANT)) - { -- if (p2->value && !c_isdigit (p2->value[0])) -+ if (p2->value && !isdigit (p2->value[0])) - { - _asn1_str_cpy (name2, sizeof (name2), name_root); - _asn1_str_cat (name2, sizeof (name2), "."); -@@ -1067,7 +1066,7 @@ - p2 = p->down; - if (p2 && (type_field (p2->type) == ASN1_ETYPE_CONSTANT)) - { -- if (p2->value && !c_isdigit (p2->value[0])) -+ if (p2->value && !isdigit (p2->value[0])) - { - _asn1_str_cpy (name2, sizeof (name2), node->name); - _asn1_str_cat (name2, sizeof (name2), ".");