Merge pull request #27 from devkdas/resolve-conf

Resolve conf

Author: devkdas

.github/labeler.yml

@@ -65,7 +65,7 @@ build:
               **/*.mk,\
               *.m4,\
               docs/INSTALL-CMAKE.md,\
-              lib/curl_config.h.cmake,\
+              lib/curl_config-cmake.h.in,\
               lib/libcurl*.in,\
               CMake/**,\
               CMakeLists.txt,\
@@ -98,7 +98,7 @@ cmake:
               **/CMakeLists.txt,\
               CMake/**,\
               docs/INSTALL-CMAKE.md,\
-              lib/curl_config.h.cmake,\
+              lib/curl_config-cmake.h.in,\
               tests/cmake/**\
               }"
 

.github/scripts/badwords.ok

@@ -0,0 +1,7 @@
+# Copyright (C) Daniel Stenberg, <daniel@haxx.se>, et al.
+#
+# SPDX-License-Identifier: curl
+#
+# whitelisted uses of bad words
+# file:[line]:rule
+docs/FAQ.md::\bwill\b

.github/scripts/badwords.pl

@@ -30,13 +30,13 @@
 if($ARGV[0] eq "-w") {
     shift @ARGV;
     my $file = shift @ARGV;
-    open(W, "<$file");
+    open(W, "<$file") or die "Cannot open '$file': $!";
     while(<W>) {
         if(/^#/) {
             # allow #-comments
             next;
         }
-        if(/^([^:]*):(\d+):(.*)/) {
+        if(/^([^:]*):(\d*):(.*)/) {
             $wl{"$1:$2:$3"}=1;
             #print STDERR "whitelisted $1:$2:$3\n";
         }
@@ -93,7 +93,13 @@ sub file {
 
                 my $ch = "$f:$l:$w";
                 if($wl{$ch}) {
-                    # whitelisted
+                    # whitelisted filename + line + word
+                    print STDERR "$ch found but whitelisted\n";
+                    next;
+                }
+                $ch = $f . "::" . $w;
+                if($wl{$ch}) {
+                    # whitelisted filename + word
                     print STDERR "$ch found but whitelisted\n";
                     next;
                 }

.github/scripts/badwords.txt

@@ -10,14 +10,17 @@ tool chain:toolchain
 tool-chain:toolchain
 wild-card:wildcard
 wild card:wildcard
+\bthread ?safe[^."t]:thread-safe
+\bthread ?unsafe[^."t]:thread-unsafe
+multi ?thread:multi-thread
 \bit's:it is
 aren't:are not
 can't:cannot
 could've:could have
 couldn't:could not
 didn't:did not
 doesn't:does not
-don't=do not
+don't:do not
 haven't:have not
 i'd:I would
 i'll:I will
@@ -74,10 +77,10 @@ file names\b:filenames
 \buser names\b:usernames
 \bpass phrase:passphrase
 \bwill\b:rewrite to present tense
-\b32bit=32-bit
-\b64bit=64-bit
-32 bit\b=32-bit
-64 bit\b=64-bit
+\b32bit:32-bit
+\b64bit:64-bit
+32 bit\b:32-bit
+64 bit\b:64-bit
 64-bits:64 bits or 64-bit
 32-bits:32 bits or 32-bit
 \bvery\b:rephrase using an alternative word

.github/scripts/cmp-config.pl

@@ -68,7 +68,6 @@
     '#define HAVE_OPENSSL_PEM_H 1' => 1,
     '#define HAVE_OPENSSL_RSA_H 1' => 1,
     '#define HAVE_OPENSSL_SSL_H 1' => 1,
-    '#define HAVE_OPENSSL_X509_H 1' => 1,
     '#define HAVE_QUICHE_H 1' => 1,
     '#define HAVE_SSL_SET_QUIC_TLS_CBS 1' => 1,
     '#define HAVE_SSL_SET_QUIC_USE_LEGACY_CODEPOINT 1' => 1,
@@ -136,6 +135,5 @@ sub grepit {
     }
 }
 
-
 # return the exit code from diff
 exit system("diff -u /tmp/autotools /tmp/cmake") >> 8;

.github/scripts/codespell-ignore.words

@@ -7,7 +7,7 @@ bu
 clen
 CNA
 hel
-htpt
+htpts
 inout
 PASE
 passwor

.github/scripts/pyspelling.words

@@ -53,6 +53,7 @@ axTLS
 backend
 backends
 backoff
+backtick
 backticks
 balancers
 Baratov
@@ -171,8 +172,10 @@ dbg
 Debian
 DEBUGBUILD
 decrypt
+decrypted
 decrypting
 deepcode
+defacto
 DELE
 DER
 dereference
@@ -201,6 +204,7 @@ DLLs
 DNS
 dns
 dnsop
+DNSSEC
 DoH
 DoT
 doxygen
@@ -214,6 +218,7 @@ dynbuf
 EAGAIN
 EBCDIC
 ECC
+ECCN
 ECDHE
 ECH
 ECHConfig
@@ -258,6 +263,7 @@ Fedora
 Feltzing
 ffi
 filesize
+filesystem
 FindCURL
 FLOSS
 fnmatch
@@ -299,6 +305,7 @@ Ghedini
 giga
 Gisle
 Glesys
+glibc
 globbed
 globbing
 gmail
@@ -380,6 +387,7 @@ imap
 IMAPS
 imaps
 impacket
+implementers
 init
 initializer
 inlined
@@ -433,7 +441,9 @@ ldap
 LDAPS
 ldaps
 LF
+LGPL
 LGTM
+libbacktrace
 libbrotlidec
 libc
 libcurl
@@ -567,6 +577,7 @@ Necko
 NetBSD
 netrc
 netstat
+NetWare
 Netware
 NFS
 nghttp
@@ -710,6 +721,7 @@ ROADMAP
 Roadmap
 Rockbox
 roffit
+RPC
 RPG
 RR
 RRs
@@ -797,6 +809,7 @@ sprintf
 src
 SRP
 SRWLOCK
+SSI
 SSL
 ssl
 SSLeay
@@ -961,8 +974,10 @@ wcurl
 WebDAV
 WebOS
 webpage
+webpages
 WebSocket
 WEBSOCKET
+Wget
 WHATWG
 whitespace
 Whitespaces
@@ -981,6 +996,7 @@ www
 Xbox
 XDG
 xdigit
+XHTML
 Xilinx
 xmllint
 XP

.github/scripts/pyspelling.yaml

@@ -30,4 +30,4 @@ matrix:
             - 'strong'
             - 'em'
     sources:
-      - '**/*.md|!docs/BINDINGS.md|!docs/DISTROS.md|!docs/CIPHERS-TLS12.md|!docs/wcurl.md'
+      - '**/*.md|!docs/BINDINGS.md|!docs/DISTROS.md|!docs/CIPHERS-TLS12.md|!docs/wcurl.md|!tests/data/data*.md'

.github/scripts/randcurl.pl

@@ -116,7 +116,6 @@ sub randarg {
     '26' => 1,
     );
 
-
 sub runone {
     my $a;
     my $nargs = getnum(60) + 1;

.github/scripts/requirements-docs.txt

@@ -2,4 +2,4 @@
 #
 # SPDX-License-Identifier: curl
 
-pyspelling==2.12
+pyspelling==2.12.1