Merge branch 'openssl-update' into 'master'

Update curl, openssl3 and nghttp2 See merge request redox-os/redox!2424
2026-11-05 04:06:38 +08:00 · 2026-11-02 17:43:36 -07:00 · 2026-11-02 17:43:36 -07:00 · 4639c04454
commit 4639c04454
parent 3650a613f3 c57bba090a
6 changed files with 33 additions and 63 deletions
--- a/recipes/libs/nghttp2/recipe.toml
+++ b/recipes/libs/nghttp2/recipe.toml
@ -1,6 +1,6 @@
 [source]
-tar = "https://github.com/nghttp2/nghttp2/releases/download/v1.64.0/nghttp2-1.64.0.tar.xz"
-blake3 = "1bbc08de4816769d800c42f501a00c1ba3f5efa1b76e1f65d2e5bdf3aa30354d"
+tar = "https://github.com/nghttp2/nghttp2/releases/download/v1.69.0/nghttp2-1.69.0.tar.xz"
+blake3 = "dd7432762ac454aaa14ff3b29d40d5b8f641ec3c33e4e24c5ed70e971ac6987b"
 script = """
 autotools_recursive_regenerate
 """
@ -14,4 +14,4 @@ COOKBOOK_CONFIGURE_FLAGS+=(
    --enable-lib-only
 )
 cookbook_configure
-"""
+"""
--- a/recipes/libs/openssl3/recipe.toml
+++ b/recipes/libs/openssl3/recipe.toml
@ -1,6 +1,6 @@
 [source]
-tar = "https://github.com/openssl/openssl/releases/download/openssl-3.5.3/openssl-3.5.3.tar.gz"
-blake3 = "e1622a4587c71c278355bf38ff5a619918bd51e3cd37214d53dd5345b187fc10"
+tar = "https://github.com/openssl/openssl/releases/download/openssl-3.5.9/openssl-3.5.9.tar.gz"
+blake3 = "be2f7530fe5cd02a06e67d8916e6574f1c53b8071393aae2364b4ed817cf0354"
 patches = [ "redox.patch" ]

 [build]
--- a/recipes/libs/openssl3/redox.patch
+++ b/recipes/libs/openssl3/redox.patch
@ -1,19 +1,19 @@
 diff -ruwN source/apps/lib/apps.c source-new/apps/lib/apps.c
--- source/apps/lib/apps.c	2025-09-16 19:05:33.000000000 +0700
-+++ source-new/apps/lib/apps.c	2026-05-05 05:08:40.007422945 +0700
-@@ -2839,7 +2839,7 @@
+--- source/apps/lib/apps.c	2026-09-29 14:05:00.000000000 +0000
+++ source-new/apps/lib/apps.c	2026-11-02 13:12:01.017080874 +0000
+@@ -2863,7 +2863,7 @@
     return ret;
 }
 
-#elif defined(_SC_CLK_TCK)      /* by means of unistd.h */
-+#elif defined(_SC_CLK_TCK) && !defined(__RELIBC__)      /* by means of unistd.h */
- # include <sys/times.h>
+-#elif defined(_SC_CLK_TCK) /* by means of unistd.h */
+#elif defined(_SC_CLK_TCK) && !defined(__RELIBC__) /* by means of unistd.h */
+ #include <sys/times.h>
 
 double app_tminterval(int stop, int usertime)
 diff -ruwN source/Configurations/10-main.conf source-new/Configurations/10-main.conf
--- source/Configurations/10-main.conf	2025-09-16 19:05:33.000000000 +0700
-+++ source-new/Configurations/10-main.conf	2026-05-05 05:08:44.812616321 +0700
-@@ -208,6 +208,40 @@
+--- source/Configurations/10-main.conf	2026-09-29 14:05:00.000000000 +0000
+++ source-new/Configurations/10-main.conf	2026-11-02 13:09:11.387128346 +0000
+@@ -209,6 +209,40 @@
         shared_extension => ".so",
     },
 
@ -54,7 +54,7 @@ diff -ruwN source/Configurations/10-main.conf source-new/Configurations/10-main.
 #### Solaris configurations
     "solaris-common" => {
         inherit_from     => [ "BASE_unix" ],
-@@ -693,7 +727,6 @@
+@@ -694,7 +728,6 @@
         shared_target    => "linux-shared",
         shared_cflag     => "-fPIC",
         shared_ldflag    => sub { $disabled{pinshared} ? () : "-Wl,-znodelete" },
@ -62,7 +62,7 @@ diff -ruwN source/Configurations/10-main.conf source-new/Configurations/10-main.
     },
     "linux-latomic" => {
         inherit_from     => [ "linux-generic32" ],
-@@ -890,7 +923,6 @@
+@@ -891,7 +924,6 @@
         bn_ops           => "SIXTY_FOUR_BIT_LONG",
         asm_arch         => 'x86_64',
         perlasm_scheme   => "elf",
@ -71,14 +71,14 @@ diff -ruwN source/Configurations/10-main.conf source-new/Configurations/10-main.
     "linux-x86_64-clang" => {
         inherit_from     => [ "linux-x86_64" ],
 diff -ruwN source/include/crypto/rand.h source-new/include/crypto/rand.h
--- source/include/crypto/rand.h	2025-09-16 19:05:33.000000000 +0700
-+++ source-new/include/crypto/rand.h	2026-05-05 05:08:40.007980910 +0700
-@@ -41,7 +41,7 @@
+--- source/include/crypto/rand.h	2026-09-29 14:05:00.000000000 +0000
+++ source-new/include/crypto/rand.h	2026-11-02 13:10:37.658190042 +0000
+@@ -40,7 +40,7 @@
  * default, we will try to read at least one of these files
  */
- # define DEVRANDOM "/dev/urandom", "/dev/random", "/dev/hwrng", "/dev/srandom"
-# if defined(__linux) && !defined(__ANDROID__)
-+# if defined(__linux) && !defined(__RELIBC__) && !defined(__ANDROID__) /* needs sys/shm.h */
- #  ifndef DEVRANDOM_WAIT
- #   define DEVRANDOM_WAIT   "/dev/random"
- #  endif
+ #define DEVRANDOM "/dev/urandom", "/dev/random", "/dev/hwrng", "/dev/srandom"
+-#if defined(__linux) && !defined(__ANDROID__)
+#if defined(__linux) && !defined(__ANDROID__) && !defined(__RELIBC__) /* needs sys/shm.h */
+ #ifndef DEVRANDOM_WAIT
+ #define DEVRANDOM_WAIT "/dev/random"
+ #endif
--- a/recipes/net/curl/ipv6.patch
+++ b/recipes/net/curl/ipv6.patch
@ -1,29 +0,0 @@
-diff --git a/lib/asyn-thrdd.c b/lib/asyn-thrdd.c
-index 90f055c2..4db5ab02 100644
--- a/lib/asyn-thrdd.c
-+++ b/lib/asyn-thrdd.c
-@@ -481,7 +481,11 @@ static void async_thrdd_report_item(struct Curl_easy *data,
-   struct dynbuf tmp;
-   const char *sep = "";
-   const struct Curl_addrinfo *ai = item->res;
-+#ifdef USE_IPV6
-   int ai_family = (item->dns_queries & CURL_DNSQ_AAAA) ? AF_INET6 : AF_INET;
-+#else
-+  int ai_family = AF_INET;
-+#endif
-   CURLcode result;
- 
-   if(!CURL_TRC_DNS_is_verbose(data))
-@@ -789,10 +793,12 @@ const struct Curl_addrinfo *Curl_async_get_ai(struct Curl_easy *data,
-     if(thrdd->res_A)
-       return async_thrdd_get_ai(thrdd->res_A->res, ai_family, index);
-     break;
-+#ifdef USE_IPV6
-   case AF_INET6:
-     if(thrdd->res_AAAA)
-       return async_thrdd_get_ai(thrdd->res_AAAA->res, ai_family, index);
-     break;
-+#endif
-   default:
-     break;
-   }
--- a/recipes/net/curl/recipe.toml
+++ b/recipes/net/curl/recipe.toml
@ -1,7 +1,7 @@
 [source]
 git = "https://github.com/curl/curl.git"
-rev = "curl-8_20_0"
-patches = ["ipv6.patch", "redox.patch"]
+rev = "curl-8_23_0"
+patches = ["redox.patch"]
 shallow_clone = true

 [build]
@ -16,12 +16,10 @@ cmakeflags = [
    "-DCURL_DISABLE_FTP=On",
    "-DCURL_DISABLE_TFTP=On",
    "-DENABLE_IPV6=Off",
-    "-DCURL_DISABLE_NTLM=On",
    "-DENABLE_THREADED_RESOLVER=On",
    "-DCURL_CA_PATH=/etc/ssl/certs",
    "-DUSE_NGHTTP2=On",
    "-DCURL_USE_OPENSSL=On",
-    "-DUSE_ZLIB=On",
    "-DCURL_USE_LIBPSL=Off",
 ]

--- a/recipes/net/curl/redox.patch
+++ b/recipes/net/curl/redox.patch
@ -1,5 +1,5 @@
 diff --git a/curl-config.in b/curl-config.in
-index a1c8185875..326ea2b9d3 100644
+index a1c81858..326ea2b9 100644
 --- a/curl-config.in
 +++ b/curl-config.in
@@ -167,7 +167,7 @@ while test "$#" -gt 0; do
@ -12,7 +12,7 @@ index a1c8185875..326ea2b9d3 100644
       echo 'curl was built with static libraries disabled' >&2
       exit 1
 diff --git a/include/curl/curl.h b/include/curl/curl.h
-index 6961a6c4c1..66221b85e3 100644
+index ccc9a09a..2aa0e69c 100644
 --- a/include/curl/curl.h
 +++ b/include/curl/curl.h
@@ -88,7 +88,7 @@
@ -24,7 +24,7 @@ index 6961a6c4c1..66221b85e3 100644
     defined(ANDROID) || defined(__ANDROID__) || defined(__OpenBSD__) || \
     defined(__CYGWIN__) || defined(AMIGA) || defined(__NuttX__) || \
    (defined(__FreeBSD_version) && (__FreeBSD_version < 800000)) || \
-@@ -975,11 +975,11 @@ typedef enum {
+@@ -987,11 +987,11 @@ typedef enum {
 /* Backwards compatibility with older names */
 /* These are scheduled to disappear by 2009 */
 
@ -42,10 +42,10 @@ index 6961a6c4c1..66221b85e3 100644
 #endif /* !CURL_NO_OLDIES */
 
 diff --git a/libcurl.pc.in b/libcurl.pc.in
-index c0ba5244a8..7898dae358 100644
+index 8f7e35dd..78650251 100644
 --- a/libcurl.pc.in
 +++ b/libcurl.pc.in
-@@ -36,6 +36,6 @@ Version: @CURLVERSION@
+@@ -40,7 +40,7 @@ Source: https://curl.se/download/curl-@CURLVERSION@.tar.gz
 Requires: @LIBCURL_PC_REQUIRES@
 Requires.private: @LIBCURL_PC_REQUIRES_PRIVATE@
 Libs: -L${libdir} -lcurl @LIBCURL_PC_LIBS@
@ -53,3 +53,4 @@ index c0ba5244a8..7898dae358 100644
 +Libs.private: @LIBCURL_PC_LIBS_PRIVATE@
 Cflags: -I${includedir} @LIBCURL_PC_CFLAGS@
 Cflags.private: @LIBCURL_PC_CFLAGS_PRIVATE@
+ Link.ABI: c