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,26 +61,12 @@ 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; }
 
@@ -89,7 +75,7 @@ commands:
       - 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-verbose \
               || { tail -1000 config.log; false; }
 
@@ -98,7 +84,7 @@ commands:
       - 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 +93,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 +102,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; }
 
@@ -171,16 +147,6 @@ jobs:
       - configure-openssl-no-verbose
       - build
 
-  wolfssh:
-    executor: ubuntu
-    steps:
-      - checkout
-      - install-deps
-      - install-wolfssl
-      - install-wolfssh
-      - configure-wolfssh
-      - build
-
   no-proxy:
     executor: ubuntu
     steps:
@@ -254,10 +220,6 @@ workflows:
     jobs:
       - no-verbose
 
-  wolfssl-wolfssh:
-    jobs:
-      - wolfssh
-
   arm-openssl:
     jobs:
       - arm

.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

@@ -56,7 +56,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 +77,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

@@ -14,7 +14,6 @@ codespell \
   --skip 'docs/THANKS' \
   --skip 'packages/*' \
   --skip 'scripts/wcurl' \
-  --skip 'winbuild/*' \
   --ignore-regex '.*spellchecker:disable-line' \
   --ignore-words '.github/scripts/codespell-ignore.txt' \
   $(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)"

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==5.1.1
+ruff==0.13.2

.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 = (

.github/scripts/spellcheck.words

@@ -122,6 +122,7 @@ CMakeLists
 CNA
 CNAME
 CNAMEs
+CodeQL
 CODESET
 codeset
 CodeSonar
@@ -355,7 +356,6 @@ HTTPS
 https
 HTTPSRR
 hyper's
-Högskolan
 IANA
 Icecast
 ICONV
@@ -423,7 +423,6 @@ Krb
 krb
 Kubernetes
 Kuhrt
-Kungliga
 Largefile
 LDAP
 ldap
@@ -847,7 +846,6 @@ Tatsuhiro
 TBD
 TCP
 tcpdump
-Tekniska
 testability
 testcurl
 TFTP

.github/scripts/spellcheck.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

.github/scripts/typos.toml

@@ -25,5 +25,4 @@ extend-exclude = [
   "docs/THANKS",
   "packages/*",
   "scripts/wcurl",
-  "winbuild/*",
 ]

.github/scripts/verify-examples.pl

@@ -63,9 +63,9 @@ sub extract {
         elsif($syn == 1) {
             if(/^~~~/) {
                 $syn++;
-                print O "/* !checksrc! disable UNUSEDIGNORE all */\n";
+                print O "/* !checksrc! disable BANNEDFUNC all */\n";  # for fopen()
                 print O "/* !checksrc! disable COPYRIGHT all */\n";
-                print O "/* !checksrc! disable FOPENMODE all */\n";
+                print O "/* !checksrc! disable UNUSEDIGNORE all */\n";
                 printf O "#line %d \"$f\"\n", $iline+1;
             }
         }

.github/workflows/appveyor-status.yml

@@ -19,7 +19,7 @@ jobs:
     runs-on: ubuntu-latest
     if: ${{ github.event.sender.login == 'appveyor[bot]' }}
     permissions:
-      statuses: write
+      statuses: write  # To update build statuses
     steps:
       - name: 'Create individual AppVeyor build statuses'
         if: ${{ github.event.sha && github.event.target_url }}

.github/workflows/checkdocs.yml

@@ -39,7 +39,7 @@ jobs:
   #    name: 'proselint'
   #    runs-on: ubuntu-latest
   #    steps:
-  #      - uses: actions/checkout@eef61447b9ff4aafe5dcd4e0bbf5d482be7e7871 # v4
+  #      - uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5
   #        with:
   #          persist-credentials: false
   #
@@ -100,8 +100,8 @@ jobs:
       - name: 'mdlinkcheck'
         run: ./scripts/mdlinkcheck
 
-  spellcheck:
-    name: 'spellcheck'
+  pyspelling:
+    name: 'pyspelling'
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5
@@ -113,13 +113,23 @@ jobs:
           # shellcheck disable=SC2046
           .github/scripts/cleancmd.pl $(find docs -name '*.md')
 
-      - name: 'setup the custom wordlist'
-        run: grep -v '^#' .github/scripts/spellcheck.words > wordlist.txt
-
-      - name: 'check Spelling'
-        uses: rojopolis/spellcheck-github-actions@35a02bae020e6999c5c37fabaf447f2eb8822ca7 # v0
-        with:
-          config_path: .github/scripts/spellcheck.yaml
+      - name: 'install'
+        run: |
+          sudo rm -f /etc/apt/sources.list.d/microsoft-prod.list
+          sudo apt-get -o Dpkg::Use-Pty=0 update
+          sudo rm -f /var/lib/man-db/auto-update
+          sudo apt-get -o Dpkg::Use-Pty=0 install aspell aspell-en
+          python3 -m venv ~/venv
+          ~/venv/bin/pip --disable-pip-version-check --no-input --no-cache-dir install --progress-bar off --prefer-binary -r .github/scripts/requirements-docs.txt
+
+      - name: 'check spelling'
+        run: |
+          source ~/venv/bin/activate
+          # setup the custom wordlist
+          grep -v '^#' .github/scripts/spellcheck.words > wordlist.txt
+          aspell --version
+          pyspelling --version
+          pyspelling --verbose --jobs 5 --config .github/scripts/spellcheck.yaml
 
   badwords-synopsis:
     name: 'badwords, synopsis'