luo980/curl
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

CI: install libpsl or configure --without-libpsl in builds

Browse Source 
As a follow-up to the stricted libpsl check in configure
This commit is contained in:
Daniel Stenberg 2024-01-08 16:49:21 +01:00
parent 2998874bb6
commit d18811b52b
No known key found for this signature in database
GPG Key ID: 5CC908FDB71E12C2
9 changed files with 28 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
.azure-pipelines.yml
View File

@ -100,7 +100,7 @@ stages:
configure: --enable-debug --disable-shared --disable-threaded-resolver --with-openssl configure: --enable-debug --disable-shared --disable-threaded-resolver --with-openssl
tests: -n -t --shallow=25 !FTP tests: -n -t --shallow=25 !FTP
steps: steps:
- script: sudo apt-get update && sudo apt-get install -y stunnel4 python3-impacket libzstd-dev libbrotli-dev $(install) - script: sudo apt-get update && sudo apt-get install -y stunnel4 python3-impacket libzstd-dev libbrotli-dev libpsl-dev $(install)
displayName: 'apt install' displayName: 'apt install'
retryCountOnTaskFailure: 3 retryCountOnTaskFailure: 3
@ -169,59 +169,59 @@ stages:
container_img: ghcr.io/mback2k/curl-docker-winbuildenv/msys2-mingw32:ltsc2019 container_img: ghcr.io/mback2k/curl-docker-winbuildenv/msys2-mingw32:ltsc2019
container_cmd: C:\msys64\usr\bin\sh container_cmd: C:\msys64\usr\bin\sh
prepare: pacman -S --needed --noconfirm --noprogressbar libssh2-devel mingw-w64-i686-libssh2 prepare: pacman -S --needed --noconfirm --noprogressbar libssh2-devel mingw-w64-i686-libssh2
configure: --host=i686-w64-mingw32 --build=i686-w64-mingw32 --prefix=/mingw32 --enable-debug --enable-werror --with-libssh2 --with-openssl configure: --host=i686-w64-mingw32 --build=i686-w64-mingw32 --prefix=/mingw32 --enable-debug --enable-werror --with-libssh2 --with-openssl --without-libpsl
tests: "~571" tests: "~571"
mingw64_openssl: mingw64_openssl:
name: 64-bit OpenSSL/libssh2 name: 64-bit OpenSSL/libssh2
container_img: ghcr.io/mback2k/curl-docker-winbuildenv/msys2-mingw64:ltsc2019 container_img: ghcr.io/mback2k/curl-docker-winbuildenv/msys2-mingw64:ltsc2019
container_cmd: C:\msys64\usr\bin\sh container_cmd: C:\msys64\usr\bin\sh
prepare: pacman -S --needed --noconfirm --noprogressbar libssh2-devel mingw-w64-x86_64-libssh2 prepare: pacman -S --needed --noconfirm --noprogressbar libssh2-devel mingw-w64-x86_64-libssh2
configure: --host=x86_64-w64-mingw32 --build=x86_64-w64-mingw32 --prefix=/mingw64 --enable-debug --enable-werror --with-libssh2 --with-openssl configure: --host=x86_64-w64-mingw32 --build=x86_64-w64-mingw32 --prefix=/mingw64 --enable-debug --enable-werror --with-libssh2 --with-openssl --without-libpsl
tests: "~571" tests: "~571"
mingw64_libssh: mingw64_libssh:
name: 64-bit OpenSSL/libssh name: 64-bit OpenSSL/libssh
container_img: ghcr.io/mback2k/curl-docker-winbuildenv/msys2-mingw64:ltsc2019 container_img: ghcr.io/mback2k/curl-docker-winbuildenv/msys2-mingw64:ltsc2019
container_cmd: C:\msys64\usr\bin\sh container_cmd: C:\msys64\usr\bin\sh
prepare: pacman -S --needed --noconfirm --noprogressbar libssh-devel mingw-w64-x86_64-libssh prepare: pacman -S --needed --noconfirm --noprogressbar libssh-devel mingw-w64-x86_64-libssh
configure: --host=x86_64-w64-mingw32 --build=x86_64-w64-mingw32 --prefix=/mingw64 --enable-debug --enable-werror --with-libssh --with-openssl configure: --host=x86_64-w64-mingw32 --build=x86_64-w64-mingw32 --prefix=/mingw64 --enable-debug --enable-werror --with-libssh --with-openssl --without-libpsl
tests: "~571 ~614" tests: "~571 ~614"
mingw32: mingw32:
name: 32-bit w/o zlib name: 32-bit w/o zlib
container_img: ghcr.io/mback2k/curl-docker-winbuildenv/msys2-mingw32:ltsc2019 container_img: ghcr.io/mback2k/curl-docker-winbuildenv/msys2-mingw32:ltsc2019
container_cmd: C:\msys64\usr\bin\sh container_cmd: C:\msys64\usr\bin\sh
configure: --host=i686-w64-mingw32 --build=i686-w64-mingw32 --prefix=/mingw32 --enable-debug --enable-werror --without-zlib --without-ssl configure: --host=i686-w64-mingw32 --build=i686-w64-mingw32 --prefix=/mingw32 --enable-debug --enable-werror --without-zlib --without-ssl --without-libpsl
tests: "!203 !1143" tests: "!203 !1143"
mingw64: mingw64:
name: 64-bit w/o zlib name: 64-bit w/o zlib
container_img: ghcr.io/mback2k/curl-docker-winbuildenv/msys2-mingw64:ltsc2019 container_img: ghcr.io/mback2k/curl-docker-winbuildenv/msys2-mingw64:ltsc2019
container_cmd: C:\msys64\usr\bin\sh container_cmd: C:\msys64\usr\bin\sh
configure: --host=x86_64-w64-mingw32 --build=x86_64-w64-mingw32 --prefix=/mingw64 --enable-debug --enable-werror --without-zlib --without-ssl configure: --host=x86_64-w64-mingw32 --build=x86_64-w64-mingw32 --prefix=/mingw64 --enable-debug --enable-werror --without-zlib --without-ssl --without-libpsl
tests: "!203 !1143" tests: "!203 !1143"
mingw32_schannel: mingw32_schannel:
name: 32-bit Schannel/SSPI/WinIDN/libssh2 name: 32-bit Schannel/SSPI/WinIDN/libssh2
container_img: ghcr.io/mback2k/curl-docker-winbuildenv/msys2-mingw32:ltsc2019 container_img: ghcr.io/mback2k/curl-docker-winbuildenv/msys2-mingw32:ltsc2019
container_cmd: C:\msys64\usr\bin\sh container_cmd: C:\msys64\usr\bin\sh
prepare: pacman -S --needed --noconfirm --noprogressbar libssh2-devel mingw-w64-i686-libssh2 prepare: pacman -S --needed --noconfirm --noprogressbar libssh2-devel mingw-w64-i686-libssh2
configure: --host=i686-w64-mingw32 --build=i686-w64-mingw32 --prefix=/mingw32 --enable-debug --enable-werror --enable-sspi --with-schannel --with-winidn --with-libssh2 configure: --host=i686-w64-mingw32 --build=i686-w64-mingw32 --prefix=/mingw32 --enable-debug --enable-werror --enable-sspi --with-schannel --with-winidn --with-libssh2 --without-libpsl
tests: "~571" tests: "~571"
mingw64_schannel: mingw64_schannel:
name: 64-bit Schannel/SSPI/WinIDN/libssh2 name: 64-bit Schannel/SSPI/WinIDN/libssh2
container_img: ghcr.io/mback2k/curl-docker-winbuildenv/msys2-mingw64:ltsc2019 container_img: ghcr.io/mback2k/curl-docker-winbuildenv/msys2-mingw64:ltsc2019
container_cmd: C:\msys64\usr\bin\sh container_cmd: C:\msys64\usr\bin\sh
prepare: pacman -S --needed --noconfirm --noprogressbar libssh2-devel mingw-w64-x86_64-libssh2 prepare: pacman -S --needed --noconfirm --noprogressbar libssh2-devel mingw-w64-x86_64-libssh2
configure: --host=x86_64-w64-mingw32 --build=x86_64-w64-mingw32 --prefix=/mingw64 --enable-debug --enable-werror --enable-sspi --with-schannel --with-winidn --with-libssh2 configure: --host=x86_64-w64-mingw32 --build=x86_64-w64-mingw32 --prefix=/mingw64 --enable-debug --enable-werror --enable-sspi --with-schannel --with-winidn --with-libssh2 --without-libpsl
tests: "~571" tests: "~571"
mingw32_schannel_nozlib: mingw32_schannel_nozlib:
name: 32-bit Schannel/SSPI/WinIDN w/o zlib name: 32-bit Schannel/SSPI/WinIDN w/o zlib
container_img: ghcr.io/mback2k/curl-docker-winbuildenv/msys2-mingw32:ltsc2019 container_img: ghcr.io/mback2k/curl-docker-winbuildenv/msys2-mingw32:ltsc2019
container_cmd: C:\msys64\usr\bin\sh container_cmd: C:\msys64\usr\bin\sh
configure: --host=i686-w64-mingw32 --build=i686-w64-mingw32 --prefix=/mingw32 --enable-debug --enable-werror --enable-sspi --with-schannel --with-winidn --without-zlib configure: --host=i686-w64-mingw32 --build=i686-w64-mingw32 --prefix=/mingw32 --enable-debug --enable-werror --enable-sspi --with-schannel --with-winidn --without-zlib --without-libpsl
tests: "!203 !1143" tests: "!203 !1143"
mingw64_schannel_nozlib: mingw64_schannel_nozlib:
name: 64-bit Schannel/SSPI/WinIDN w/o zlib name: 64-bit Schannel/SSPI/WinIDN w/o zlib
container_img: ghcr.io/mback2k/curl-docker-winbuildenv/msys2-mingw64:ltsc2019 container_img: ghcr.io/mback2k/curl-docker-winbuildenv/msys2-mingw64:ltsc2019
container_cmd: C:\msys64\usr\bin\sh container_cmd: C:\msys64\usr\bin\sh
configure: --host=x86_64-w64-mingw32 --build=x86_64-w64-mingw32 --prefix=/mingw64 --enable-debug --enable-werror --enable-sspi --with-schannel --with-winidn --without-zlib configure: --host=x86_64-w64-mingw32 --build=x86_64-w64-mingw32 --prefix=/mingw64 --enable-debug --enable-werror --enable-sspi --with-schannel --with-winidn --without-zlib --without-libpsl
tests: "!203 !1143" tests: "!203 !1143"
container: container:
image: $(container_img) image: $(container_img)

9
.circleci/config.yml
View File

@ -149,7 +149,7 @@ commands:
steps: steps:
- run: - run:
command: | command: |
sudo apt-get update && sudo apt-get install -y libpsl-dev libbrotli-dev libzstd-dev zlib1g-dev python3-pip sudo apt-get update && sudo apt-get install -y libpsl-dev libbrotli-dev libzstd-dev zlib1g-dev python3-pip libpsl-dev
sudo python3 -m pip install impacket sudo python3 -m pip install impacket
install-deps-brew: install-deps-brew:
@ -157,7 +157,7 @@ commands:
- run: - run:
command: | command: |
# Drop libressl as long as we're not trying to build it # Drop libressl as long as we're not trying to build it
echo libtool autoconf automake pkg-config nghttp2 libssh2 openssl libssh c-ares | xargs -Ix -n1 echo brew '"x"' > /tmp/Brewfile echo libtool autoconf automake pkg-config nghttp2 libssh2 openssl libssh c-ares libpsl | xargs -Ix -n1 echo brew '"x"' > /tmp/Brewfile
while [ $? -eq 0 ]; do for i in 1 2 3; do brew update && brew bundle install --no-lock --file /tmp/Brewfile && break 2 || { echo Error: wait to try again; sleep 10; } done; false Too many retries; done while [ $? -eq 0 ]; do for i in 1 2 3; do brew update && brew bundle install --no-lock --file /tmp/Brewfile && break 2 || { echo Error: wait to try again; sleep 10; } done; false Too many retries; done
sudo python3 -m pip install impacket sudo python3 -m pip install impacket
@ -249,6 +249,7 @@ jobs:
executor: ubuntu executor: ubuntu
steps: steps:
- checkout - checkout
- install-deps
- configure - configure
- build - build
- test - test
@ -284,6 +285,7 @@ jobs:
executor: ubuntu executor: ubuntu
steps: steps:
- checkout - checkout
- install-deps
- install-cares - install-cares
- configure-cares - configure-cares
- build - build
@ -293,6 +295,7 @@ jobs:
executor: ubuntu executor: ubuntu
steps: steps:
- checkout - checkout
- install-deps
- install-libssh - install-libssh
- configure-libssh - configure-libssh
- build - build
@ -304,6 +307,7 @@ jobs:
resource_class: arm.medium resource_class: arm.medium
steps: steps:
- checkout - checkout
- install-deps
- configure - configure
- build - build
- test - test
@ -314,6 +318,7 @@ jobs:
resource_class: arm.medium resource_class: arm.medium
steps: steps:
- checkout - checkout
- install-deps
- install-cares - install-cares
- configure-cares-debug - configure-cares-debug
- build - build

2
.cirrus.yml
View File

@ -54,7 +54,7 @@ freebsd_task:
pkginstall_script: pkginstall_script:
- pkg update -f - pkg update -f
- pkg install -y autoconf automake libtool pkgconf brotli openldap26-client heimdal libpsl libssh2 libidn2 librtmp libnghttp2 nghttp2 stunnel py39-openssl py39-impacket py39-cryptography - pkg install -y autoconf automake libtool pkgconf brotli openldap26-client heimdal libpsl libssh2 libidn2 librtmp libnghttp2 nghttp2 stunnel py39-openssl py39-impacket py39-cryptography libpsl
- pkg delete -y curl - pkg delete -y curl
configure_script: configure_script:
- autoreconf -fi - autoreconf -fi

2
.github/workflows/awslc.yml vendored
View File

@ -53,7 +53,7 @@ jobs:
steps: steps:
- run: | - run: |
sudo apt-get update --yes sudo apt-get update --yes
sudo apt-get install --yes libtool autoconf automake pkg-config stunnel4 sudo apt-get install --yes libtool autoconf automake pkg-config stunnel4 libpsl-dev
# ensure we don't pick up openssl in this build # ensure we don't pick up openssl in this build
sudo apt remove --yes libssl-dev sudo apt remove --yes libssl-dev
sudo python3 -m pip install impacket sudo python3 -m pip install impacket

2
.github/workflows/configure-vs-cmake.yml vendored
View File

@ -35,7 +35,7 @@ jobs:
- name: run configure --with-openssl - name: run configure --with-openssl
run: | run: |
autoreconf -fi autoreconf -fi
./configure --with-openssl ./configure --with-openssl --without-libpsl
- name: run cmake - name: run cmake
run: | run: |

8
.github/workflows/distcheck.yml vendored
View File

@ -30,7 +30,7 @@ jobs:
- run: autoreconf -fi - run: autoreconf -fi
name: 'autoreconf' name: 'autoreconf'
- run: ./configure --without-ssl - run: ./configure --without-ssl --without-libpsl
name: 'configure' name: 'configure'
- run: make V=1 && make V=1 clean - run: make V=1 && make V=1 clean
@ -48,7 +48,7 @@ jobs:
echo "::stop-commands::$(uuidgen)" echo "::stop-commands::$(uuidgen)"
tar xvf curl-99.98.97.tar.gz tar xvf curl-99.98.97.tar.gz
pushd curl-99.98.97 pushd curl-99.98.97
./configure --prefix=$HOME/temp --without-ssl ./configure --prefix=$HOME/temp --without-ssl --without-libpsl
make make
make test-ci make test-ci
make install make install
@ -73,7 +73,7 @@ jobs:
touch curl-99.98.97/docs/{cmdline-opts,libcurl}/Makefile.inc touch curl-99.98.97/docs/{cmdline-opts,libcurl}/Makefile.inc
mkdir build mkdir build
pushd build pushd build
../curl-99.98.97/configure --without-ssl ../curl-99.98.97/configure --without-ssl --without-libpsl
make make
make test-ci make test-ci
popd popd
@ -96,7 +96,7 @@ jobs:
pushd curl-99.98.97 pushd curl-99.98.97
mkdir build mkdir build
pushd build pushd build
../configure --without-ssl --enable-debug "--prefix=${PWD}/pkg" ../configure --without-ssl --enable-debug "--prefix=${PWD}/pkg" --without-libpsl
make -j3 make -j3
make -j3 test-ci make -j3 test-ci
make -j3 install make -j3 install

2
.github/workflows/linux.yml vendored
View File

@ -154,7 +154,7 @@ jobs:
singleuse: --unit singleuse: --unit
- name: rustls - name: rustls
install_steps: rust rustls pytest valgrind install_steps: rust rustls pytest valgrind libpsl-dev
configure: --with-rustls=$HOME/rustls --enable-debug configure: --with-rustls=$HOME/rustls --enable-debug
singleuse: --unit singleuse: --unit

4
.github/workflows/macos.yml vendored
View File

@ -117,7 +117,7 @@ jobs:
configure: --enable-debug --with-secure-transport --enable-websockets configure: --enable-debug --with-secure-transport --enable-websockets
macosx-version-min: 10.8 macosx-version-min: 10.8
- name: gcc SecureTransport - name: gcc SecureTransport
configure: CC=gcc-12 --enable-debug --with-secure-transport --enable-websockets configure: CC=gcc-12 --enable-debug --with-secure-transport --enable-websockets --without-libpsl
macosx-version-min: 10.8 macosx-version-min: 10.8
- name: OpenSSL http2 - name: OpenSSL http2
install: nghttp2 openssl install: nghttp2 openssl
@ -142,7 +142,7 @@ jobs:
configure: --enable-debug --disable-ldap --with-openssl=/usr/local/opt/openssl --enable-websockets configure: --enable-debug --disable-ldap --with-openssl=/usr/local/opt/openssl --enable-websockets
macosx-version-min: 10.15 macosx-version-min: 10.15
steps: steps:
- run: echo libtool autoconf automake pkg-config ${{ matrix.build.install }} | xargs -Ix -n1 echo brew '"x"' > /tmp/Brewfile - run: echo libtool autoconf automake pkg-config libpsl ${{ matrix.build.install }} | xargs -Ix -n1 echo brew '"x"' > /tmp/Brewfile
name: 'brew bundle' name: 'brew bundle'
# Run this command with retries because of spurious failures seen # Run this command with retries because of spurious failures seen

2
.github/workflows/wolfssl.yml vendored
View File

@ -68,7 +68,7 @@ jobs:
steps: steps:
- run: | - run: |
sudo apt-get update sudo apt-get update
sudo apt-get install libtool autoconf automake pkg-config stunnel4 ${{ matrix.build.install }} sudo apt-get install libtool autoconf automake pkg-config stunnel4 libpsl-dev ${{ matrix.build.install }}
sudo python3 -m pip install impacket sudo python3 -m pip install impacket
name: 'install prereqs and impacket' name: 'install prereqs and impacket'