diff --git a/install.sh b/install.sh index 587e0e1af..2453cdf8a 100755 --- a/install.sh +++ b/install.sh @@ -1,5 +1,5 @@ #!/bin/bash -CREW_INSTALLER_VERSION=2025111101 +CREW_INSTALLER_VERSION=2025111401 # Exit on fail. set -eE @@ -303,7 +303,7 @@ BOOTSTRAP_PACKAGES+=' pcre2 expat git' # Add curl dependencies to BOOTSTRAP_PACKAGES since curl is a git # dependency, installing curl last so we don't break the system curl. -BOOTSTRAP_PACKAGES+=' brotli c_ares libcyrussasl libidn2 libnghttp2 libpsl libssh libunistring openldap curl zstd ruby' +BOOTSTRAP_PACKAGES+=' brotli c_ares libcyrussasl libidn2 libnghttp2 libnghttp3 libngtcp2 libpsl libssh libunistring openldap curl zstd ruby' if [[ -n "${CHROMEOS_RELEASE_CHROME_MILESTONE}" ]] && [[ -n "${CREW_PRE_GLIBC_STANDALONE}" ]]; then # shellcheck disable=SC2231 diff --git a/manifest/armv7l/c/curl.filelist b/manifest/armv7l/c/curl.filelist index 45abf7f2a..f17cb8783 100644 --- a/manifest/armv7l/c/curl.filelist +++ b/manifest/armv7l/c/curl.filelist @@ -1,4 +1,4 @@ -# Total size: 10879248 +# Total size: 11260901 /usr/local/bin/curl /usr/local/bin/curl-config /usr/local/bin/wcurl diff --git a/manifest/i686/c/curl.filelist b/manifest/i686/c/curl.filelist index bd794c872..a3071acb6 100644 --- a/manifest/i686/c/curl.filelist +++ b/manifest/i686/c/curl.filelist @@ -1,4 +1,4 @@ -# Total size: 11338070 +# Total size: 11743005 /usr/local/bin/curl /usr/local/bin/curl-config /usr/local/bin/wcurl diff --git a/manifest/x86_64/c/curl.filelist b/manifest/x86_64/c/curl.filelist index 409328cdf..51b429215 100644 --- a/manifest/x86_64/c/curl.filelist +++ b/manifest/x86_64/c/curl.filelist @@ -1,4 +1,4 @@ -# Total size: 11636184 +# Total size: 12040053 /usr/local/bin/curl /usr/local/bin/curl-config /usr/local/bin/wcurl diff --git a/packages/curl.rb b/packages/curl.rb index e5b0a7993..5283a794e 100644 --- a/packages/curl.rb +++ b/packages/curl.rb @@ -3,7 +3,7 @@ require 'buildsystems/autotools' class Curl < Autotools description 'Command line tool and library for transferring data with URLs.' homepage 'https://curl.se/' - version '8.17.0' + version '8.17.0-1' license 'curl' compatibility 'all' source_url "https://curl.se/download/curl-#{version.split('-').first}.tar.xz" @@ -11,10 +11,10 @@ class Curl < Autotools binary_compression 'tar.zst' binary_sha256({ - aarch64: '59ca4a5f0a55d4b0854b94a9221b781c68bd39e762a6193459ddb392e37cfca7', - armv7l: '59ca4a5f0a55d4b0854b94a9221b781c68bd39e762a6193459ddb392e37cfca7', - i686: '48bcb46c76c33a7eec4b046e242ea4c0eda448ef8af2c94e3e3966cdc6fd3660', - x86_64: 'e90d023bf210a57f7e7df6d4a2f6e1e7d7e8e9f12121426ea7f39c28b60caf53' + aarch64: '287d58b7cf6e2554b95fe905364dcb787fd78bf233ec205c97dc8c3ed533dca0', + armv7l: '287d58b7cf6e2554b95fe905364dcb787fd78bf233ec205c97dc8c3ed533dca0', + i686: 'bb4a7e8d515a8da6c3ce13d970fbddc5eb565376c5e22e34302dc1b2b88a02a7', + x86_64: '499d5af908ade27a2305632d09e4b91dc6ded47a6673784571afd5a3a8fc2484' }) depends_on 'brotli' # R @@ -23,6 +23,8 @@ class Curl < Autotools depends_on 'glibc' # R depends_on 'libidn2' # R depends_on 'libnghttp2' # R + depends_on 'libnghttp3' # R + depends_on 'libngtcp2' # R depends_on 'libpsl' # R depends_on 'libssh' # R depends_on 'openldap' # R @@ -41,6 +43,7 @@ class Curl < Autotools --with-ca-fallback \ --with-ca-path=#{CREW_PREFIX}/etc/ssl/certs \ --with-libssh \ + --with-ngtcp2 \ --with-openssl \ --without-gnutls \ --without-librtmp"