diff --git a/.github/workflows/build-and-test-make.yml b/.github/workflows/build-and-test-make.yml index 888aa9e8..1c7c634b 100644 --- a/.github/workflows/build-and-test-make.yml +++ b/.github/workflows/build-and-test-make.yml @@ -74,9 +74,7 @@ jobs: # Needed to compile 'minicurl' sudo apt-get install libcurl4-openssl-dev # More dependencies for the tests - sudo apt-get install tcpdump nghttp2-server libnss3 - # zstd - sudo apt-get install zstd libzstd-dev + sudo apt-get install tcpdump nghttp2-server - name: Build zlib run: | @@ -89,15 +87,25 @@ jobs: # Make sure curl will link with libz.so.1 and not libz.so rm -f ${{ runner.temp }}/zlib/lib/libz.so + - name: Build libzstd + run: | + curl -LO https://github.com/facebook/zstd/releases/download/v1.5.6/zstd-1.5.6.tar.gz + tar xf zstd-1.5.6.tar.gz + cd zstd-1.5.6 + make + mkdir -p ${{ runner.temp }}/zstd/lib + # move libzstd to temp + cp lib/libzstd.a lib/libzstd.so.1.5.6 lib/libzstd.mk lib/libzstd.pc lib/libzstd.pc.in ${{ runner.temp }}/zstd/lib/ + - name: Run configure script run: | mkdir ${{ runner.temp }}/install ./configure --prefix=${{ runner.temp }}/install \ --host=${{ matrix.host }} \ --with-zlib=${{ runner.temp }}/zlib \ + --with-zstd=${{ runner.temp }}/zstd \ --with-ca-path=/etc/ssl/certs \ --with-ca-bundle=/etc/ssl/certs/ca-certificates.crt \ - --with-libnssckbi=/usr/lib/${{ matrix.host }}/nss # Cache the build of BoringSSL, which is the longest part of the build # We must cache the .zip as well, otherwise the Makefile will @@ -194,9 +202,9 @@ jobs: ./configure --prefix=${{ runner.temp }}/install --enable-static \ --host=${{ matrix.host }} \ --with-zlib=${{ runner.temp }}/zlib \ + --with-zstd=${{ runner.temp }}/zstd \ --with-ca-path=/etc/ssl/certs \ --with-ca-bundle=/etc/ssl/certs/ca-certificates.crt \ - --with-libnssckbi=/usr/lib/${{ matrix.host }}/nss - name: Rebuild statically run: | diff --git a/chrome/curl_chrome123 b/chrome/curl_chrome123 index 21a0671b..a4c50cc1 100755 --- a/chrome/curl_chrome123 +++ b/chrome/curl_chrome123 @@ -1,7 +1,7 @@ #!/usr/bin/env bash # Updates in this version: -# 1. Added zstd encoding support +# 1. Added zstd encoding support, see: https://chromestatus.com/feature/6186023867908096 # Find the directory of this script dir=${0%/*} @@ -15,7 +15,7 @@ dir=${0%/*} -H 'sec-ch-ua-mobile: ?0' \ -H 'sec-ch-ua-platform: "macOS"' \ -H 'Upgrade-Insecure-Requests: 1' \ - -H 'User-Agent: Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15_7) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/124.0.0.0 Safari/537.36' \ + -H 'User-Agent: Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15_7) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/123.0.0.0 Safari/537.36' \ -H 'Accept: text/html,application/xhtml+xml,application/xml;q=0.9,image/avif,image/webp,image/apng,*/*;q=0.8,application/signed-exchange;v=b3;q=0.7' \ -H 'Sec-Fetch-Site: none' \ -H 'Sec-Fetch-Mode: navigate' \