Resolve conf

.circleci/config.yml

@@ -45,7 +45,7 @@ commands:
       - run:
           command: |
             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 --disable-pip-version-check --no-input --no-cache-dir install --progress-bar off --prefer-binary -r tests/requirements.txt
 
   install-wolfssl:
     steps:
@@ -61,44 +61,21 @@ commands:
             ./configure --disable-dependency-tracking --enable-tls13 --enable-all --enable-harden --prefix=$HOME/wssl
             make install
 
-  install-wolfssh:
-    steps:
-      - run:
-          command: |
-            # renovate: datasource=github-tags depName=wolfSSL/wolfssh versioning=semver extractVersion=^v?(?<version>.+)-stable$ registryUrl=https://github.com
-            WOLFSSH_VERSION=1.4.19
-            echo "Installing wolfSSH $WOLFSSH_VERSION"
-            curl --disable --fail --silent --show-error --connect-timeout 15 --max-time 120 --retry 6 --retry-connrefused \
-              --location "https://github.com/wolfSSL/wolfssh/archive/v$WOLFSSH_VERSION-stable.tar.gz" | tar -xz
-            cd wolfssh-$WOLFSSH_VERSION-stable
-            ./autogen.sh
-            ./configure --disable-dependency-tracking --with-wolfssl=$HOME/wssl --prefix=$HOME/wssh --enable-scp --enable-sftp --disable-term --disable-examples
-            make install
-
   configure:
     steps:
       - run:
           command: |
             autoreconf -fi
-            ./configure --disable-dependency-tracking --enable-unity --enable-test-bundles --enable-werror --enable-warnings \
+            ./configure --disable-dependency-tracking --enable-option-checking=fatal --enable-unity --enable-werror --enable-warnings \
               --with-openssl \
               || { tail -1000 config.log; false; }
 
-  configure-openssl-no-verbose:
-    steps:
-      - run:
-          command: |
-            autoreconf -fi
-            ./configure --disable-dependency-tracking --enable-unity --enable-test-bundles --enable-werror \
-              --with-openssl --disable-verbose \
-              || { tail -1000 config.log; false; }
-
   configure-no-proxy:
     steps:
       - run:
           command: |
             autoreconf -fi
-            ./configure --disable-dependency-tracking --enable-unity --enable-test-bundles --enable-werror \
+            ./configure --disable-dependency-tracking --enable-option-checking=fatal --enable-unity --enable-werror \
               --with-openssl --disable-proxy \
               || { tail -1000 config.log; false; }
 
@@ -107,7 +84,7 @@ commands:
       - run:
           command: |
             autoreconf -fi
-            ./configure --disable-dependency-tracking --enable-unity --enable-test-bundles --enable-werror --enable-warnings \
+            ./configure --disable-dependency-tracking --enable-option-checking=fatal --enable-unity --enable-werror --enable-warnings \
               --with-openssl --with-libssh \
               || { tail -1000 config.log; false; }
 
@@ -116,26 +93,16 @@ commands:
       - run:
           command: |
             autoreconf -fi
-            ./configure --disable-dependency-tracking --enable-unity --enable-test-bundles --enable-werror --enable-warnings \
+            ./configure --disable-dependency-tracking --enable-option-checking=fatal --enable-unity --enable-werror --enable-warnings \
               --with-openssl --enable-ares \
               || { tail -1000 config.log; false; }
 
-  configure-wolfssh:
-    steps:
-      - run:
-          command: |
-            autoreconf -fi
-            LDFLAGS="-Wl,-rpath,$HOME/wssh/lib" \
-            ./configure --disable-dependency-tracking --enable-unity --enable-test-bundles --enable-werror --enable-warnings \
-              --with-wolfssl=$HOME/wssl --with-wolfssh=$HOME/wssh \
-              || { tail -1000 config.log; false; }
-
   configure-cares-debug:
     steps:
       - run:
           command: |
             autoreconf -fi
-            ./configure --disable-dependency-tracking --enable-unity --enable-test-bundles --enable-werror --enable-debug \
+            ./configure --disable-dependency-tracking --enable-option-checking=fatal --enable-unity --enable-werror --enable-debug \
               --with-openssl --enable-ares \
               || { tail -1000 config.log; false; }
 
@@ -163,24 +130,6 @@ jobs:
       - build
       - test
 
-  no-verbose:
-    executor: ubuntu
-    steps:
-      - checkout
-      - install-deps
-      - configure-openssl-no-verbose
-      - build
-
-  wolfssh:
-    executor: ubuntu
-    steps:
-      - checkout
-      - install-deps
-      - install-wolfssl
-      - install-wolfssh
-      - configure-wolfssh
-      - build
-
   no-proxy:
     executor: ubuntu
     steps:
@@ -250,14 +199,6 @@ workflows:
     jobs:
       - no-proxy
 
-  openssl-no-verbose:
-    jobs:
-      - no-verbose
-
-  wolfssl-wolfssh:
-    jobs:
-      - wolfssh
-
   arm-openssl:
     jobs:
       - arm

.github/dependabot.yml

@@ -7,4 +7,15 @@ updates:
   - package-ecosystem: 'github-actions'
     directory: '/'
     schedule:
-      interval: 'weekly'
+      interval: 'monthly'
+    commit-message:
+      prefix: 'GHA:'
+
+  - package-ecosystem: 'pip'
+    directories:
+      - '/.github/scripts'
+      - '/tests'
+    schedule:
+      interval: 'monthly'
+    commit-message:
+      prefix: 'GHA:'

.github/labeler.yml

@@ -75,7 +75,6 @@ build:
               packages/**,\
               plan9/**,\
               projects/**,\
-              winbuild/**,\
               lib/libcurl.def,\
               tests/cmake/**\
               }"
@@ -520,6 +519,5 @@ Windows:
               m4/curl-schannel.m4,\
               projects/**,\
               src/tool_doswin.c,\
-              winbuild/**,\
               lib/libcurl.def\
               }"

.github/scripts/cmp-config.pl

@@ -45,6 +45,8 @@
     '#define HAVE_BROTLI 1' => 1,
     '#define HAVE_BROTLI_DECODE_H 1' => 1,
     '#define HAVE_DLFCN_H 1' => 1,
+    '#define HAVE_GSSAPI_GSSAPI_GENERIC_H 1' => 1,
+    '#define HAVE_GSSAPI_GSSAPI_H 1' => 1,
     '#define HAVE_GSSAPI_GSSAPI_KRB5_H 1' => 1,
     '#define HAVE_INTTYPES_H 1' => 1,
     '#define HAVE_LDAP_H 1' => 1,
@@ -56,7 +58,6 @@
     '#define HAVE_LIBSSH' => 1,
     '#define HAVE_LIBSSH2 1' => 1,
     '#define HAVE_LIBSSL 1' => 1,
-    '#define HAVE_LIBWOLFSSH' => 1,
     '#define HAVE_LIBZSTD 1' => 1,
     '#define HAVE_NGHTTP2_NGHTTP2_H 1' => 1,
     '#define HAVE_NGHTTP3_NGHTTP3_H 1' => 1,
@@ -78,7 +79,6 @@
     '#define HAVE_SYS_STAT_H 1' => 1,
     '#define HAVE_SYS_XATTR_H 1' => 1,
     '#define HAVE_UNICODE_UIDNA_H 1' => 1,
-    '#define HAVE_WOLFSSH_SSH_H 1' => 1,
     '#define HAVE_WOLFSSL_SET_QUIC_USE_LEGACY_CODEPOINT 1' => 1,
     '#define HAVE_ZSTD 1' => 1,
     '#define HAVE_ZSTD_H 1' => 1,

.github/scripts/codespell.sh

@@ -9,12 +9,11 @@ cd "$(dirname "${0}")"/../..
 
 # shellcheck disable=SC2046
 codespell \
-  --skip '.github/scripts/spellcheck.words' \
+  --skip '.github/scripts/pyspelling.words' \
   --skip '.github/scripts/typos.toml' \
   --skip 'docs/THANKS' \
   --skip 'packages/*' \
   --skip 'scripts/wcurl' \
-  --skip 'winbuild/*' \
   --ignore-regex '.*spellchecker:disable-line' \
-  --ignore-words '.github/scripts/codespell-ignore.txt' \
+  --ignore-words '.github/scripts/codespell-ignore.words' \
   $(git ls-files)

.github/scripts/distfiles.sh

@@ -19,6 +19,7 @@ gitonly=".git*
 ^SECURITY.md
 ^LICENSES/*
 ^docs/examples/adddocsref.pl
+^docs/tests/CI.md
 ^docs/THANKS-filter
 ^projects/Windows/*
 ^scripts/ciconfig.pl
@@ -28,8 +29,7 @@ gitonly=".git*
 ^scripts/delta
 ^scripts/installcheck.sh
 ^scripts/release-notes.pl
-^scripts/singleuse.pl
-^tests/CI.md"
+^scripts/singleuse.pl"
 
 tarfiles="$(mktemp)"
 gitfiles="$(mktemp)"

.github/scripts/spellcheck.words → .github/scripts/pyspelling.words

@@ -97,6 +97,7 @@ changeset
 CharConv
 charset
 charsets
+checkdocs
 checksrc
 checksums
 chgrp
@@ -122,6 +123,7 @@ CMakeLists
 CNA
 CNAME
 CNAMEs
+CodeQL
 CODESET
 codeset
 CodeSonar
@@ -230,9 +232,9 @@ else's
 encodings
 enctype
 endianness
-enums
 Engler
 enum
+enums
 epoll
 EPRT
 EPSV
@@ -292,7 +294,9 @@ getinfo
 GETing
 getpwuid
 ggcov
+GHA
 Ghedini
+giga
 Gisle
 Glesys
 globbed
@@ -355,7 +359,6 @@ HTTPS
 https
 HTTPSRR
 hyper's
-Högskolan
 IANA
 Icecast
 ICONV
@@ -423,7 +426,6 @@ Krb
 krb
 Kubernetes
 Kuhrt
-Kungliga
 Largefile
 LDAP
 ldap
@@ -618,6 +620,7 @@ PEM
 pem
 perl
 permafailing
+peta
 PINGs
 pipelining
 PKCS
@@ -742,6 +745,7 @@ scp
 SDK
 se
 SEB
+SecTrust
 SEK
 selectable
 Serv
@@ -847,7 +851,7 @@ Tatsuhiro
 TBD
 TCP
 tcpdump
-Tekniska
+tera
 testability
 testcurl
 TFTP
@@ -929,6 +933,7 @@ VC
 vcpkg
 vexxhost
 Viktor
+virtualized
 Virtuozzo
 VLAN
 VM

.github/scripts/spellcheck.yaml → .github/scripts/pyspelling.yaml

@@ -2,6 +2,7 @@
 #
 # SPDX-License-Identifier: curl
 #
+# Docs: https://facelessuser.github.io/pyspelling/configuration/
 # Docs: https://github.com/UnicornGlobal/spellcheck-github-actions
 matrix:
   - name: Markdown

winbuild/.gitignore → .github/scripts/requirements-docs.txt

@@ -2,5 +2,4 @@
 #
 # SPDX-License-Identifier: curl
 
-*.idb
-*.inc
+pyspelling==2.11

.github/scripts/requirements.txt

@@ -0,0 +1,9 @@
+# Copyright (C) Daniel Stenberg, <daniel@haxx.se>, et al.
+#
+# SPDX-License-Identifier: curl
+
+cmakelang==0.6.13
+codespell==2.4.1
+pytype==2024.10.11
+reuse==6.1.2
+ruff==0.14.0

.github/scripts/spacecheck.pl

@@ -30,7 +30,7 @@
     "^m4/zz40-xc-ovr.m4",
     "Makefile\\.(am|example)\$",
     "/mkfile",
-    "\\.(sln|vc)\$",
+    "\\.sln\$",
     "^tests/data/test",
 );
 
@@ -40,7 +40,6 @@
 
 my @need_crlf = (
     "\\.(bat|sln)\$",
-    "^winbuild/.+\\.md\$",
 );
 
 my @space_at_eol = (
@@ -54,7 +53,7 @@
 my $non_ascii_allowed = join(', ', @non_ascii_allowed);
 
 my @non_ascii = (
-    ".github/scripts/spellcheck.words",
+    ".github/scripts/pyspelling.words",
     ".mailmap",
     "RELEASE-NOTES",
     "docs/BINDINGS.md",

.github/scripts/spellcheck.curl

@@ -133,9 +133,10 @@ curl_multi_setopt
 curl_multi_assign
 curl_multi_get_handles
 curl_multi_get_offt
+curl_multi_notify_disable
+curl_multi_notify_enable
 curl_pushheader_bynum
 curl_pushheader_byname
-curl_multi_waitfds
 curl_easy_option_by_name
 curl_easy_option_by_id
 curl_easy_option_next