From 1d5dc6d2f96aca437ac95d8623f0a2e88b7b7121 Mon Sep 17 00:00:00 2001 From: Viktor Szakats Date: Tue, 21 Apr 2026 23:43:02 +0200 Subject: [PATCH] or later -> higher --- .github/workflows/linux-old.yml | 4 +- CMake/PickyWarnings.cmake | 2 +- configure.ac | 4 +- docs/HTTPSRR.md | 2 +- docs/INSTALL.md | 4 +- docs/INTERNALS.md | 4 +- docs/SSL-PROBLEMS.md | 2 +- docs/cmdline-opts/proxy-tls13-ciphers.md | 4 +- docs/cmdline-opts/tls13-ciphers.md | 4 +- docs/cmdline-opts/tlsv1.0.md | 3 +- docs/cmdline-opts/tlsv1.1.md | 3 +- docs/cmdline-opts/tlsv1.2.md | 3 +- docs/cmdline-opts/tlsv1.3.md | 2 +- docs/cmdline-opts/tlsv1.md | 2 +- docs/examples/parseurl.c | 2 +- docs/examples/urlapi.c | 2 +- docs/libcurl/libcurl-ws.md | 2 +- docs/libcurl/opts/CURLOPT_PROXY_SSLVERSION.md | 2 +- docs/libcurl/opts/CURLOPT_SSLVERSION.md | 12 +-- docs/tests/TEST-SUITE.md | 2 +- lib/curl_ntlm_core.c | 2 +- lib/curl_setup.h | 2 +- lib/hostip4.c | 4 +- lib/md5.c | 2 +- lib/sha256.c | 2 +- lib/version.c | 2 +- lib/vssh/ssh.h | 4 +- lib/vtls/mbedtls.c | 2 +- lib/vtls/openssl.c | 4 +- lib/vtls/openssl.h | 2 +- m4/curl-compilers.m4 | 94 +++++++++---------- projects/vms/build_gnv_curl_pcsi_text.com | 8 +- projects/vms/curl_release_note_start.txt | 2 +- projects/vms/gnv_link_curl.com | 2 +- projects/vms/readme | 4 +- tests/sshserver.pl | 8 +- 36 files changed, 106 insertions(+), 103 deletions(-) diff --git a/.github/workflows/linux-old.yml b/.github/workflows/linux-old.yml index 46fa9acffd..7d30e52d6f 100644 --- a/.github/workflows/linux-old.yml +++ b/.github/workflows/linux-old.yml @@ -116,8 +116,8 @@ jobs: echo '::group::raw'; cat bld-1/lib/curl_config.h || true; echo '::endgroup::' grep -F '#define' bld-1/lib/curl_config.h | sort || true - # when this job can get libssh 0.9.0 or greater, this should get that enabled again - # when this job can get c-ares 1.16.0 or greater, this should get that enabled again + # when this job can get libssh 0.9.0 or higher, this should get that enabled again + # when this job can get c-ares 1.16.0 or higher, this should get that enabled again - name: 'CM configure (out-of-tree, zstd, gssapi)' run: | diff --git a/CMake/PickyWarnings.cmake b/CMake/PickyWarnings.cmake index 1ce5f7bda6..bf4b183e2a 100644 --- a/CMake/PickyWarnings.cmake +++ b/CMake/PickyWarnings.cmake @@ -97,7 +97,7 @@ if(PICKY_COMPILER) # to suppress undesired warnings in case -Weverything is passed as a custom option. # Assume these options always exist with both clang and gcc. - # Require clang 3.0 / gcc 2.95 or later. + # Require clang 3.0 / gcc 2.95 or higher. list(APPEND _picky_enable -Wbad-function-cast # clang 2.7 gcc 2.95 -Wconversion # clang 2.7 gcc 2.95 diff --git a/configure.ac b/configure.ac index 38cf72111d..20de432c05 100644 --- a/configure.ac +++ b/configure.ac @@ -649,10 +649,10 @@ CURL_SET_COMPILER_WARNING_OPTS if test "$compiler_id" = "INTEL_UNIX_C"; then if test "$compiler_num" -ge "1000"; then - dnl icc 10.X or later + dnl icc 10.x or higher CFLAGS="$CFLAGS -shared-intel" elif test "$compiler_num" -ge "900"; then - dnl icc 9.X specific + dnl icc 9.x specific CFLAGS="$CFLAGS -i-dynamic" fi fi diff --git a/docs/HTTPSRR.md b/docs/HTTPSRR.md index fbdebc7fde..300e2e675c 100644 --- a/docs/HTTPSRR.md +++ b/docs/HTTPSRR.md @@ -65,7 +65,7 @@ returned, curl parses it and stores the retrieved information. If DoH is not used for name resolving in an HTTPS RR enabled build, we must provide the ability using the regular resolver backends. We use the c-ares DNS -library for the HTTPS RR lookup. Version 1.28.0 or later. +library for the HTTPS RR lookup. Version 1.28.0 or higher. ### c-ares diff --git a/docs/INSTALL.md b/docs/INSTALL.md index eae04e3c79..1b6751cf9a 100644 --- a/docs/INSTALL.md +++ b/docs/INSTALL.md @@ -206,8 +206,8 @@ Building for Windows Vista/Server 2008 is required as a minimum. You can build curl with: -- Microsoft Visual Studio 2010 v10.0 or later (`_MSC_VER >= 1600`) -- MinGW-w64 3.0 or later (`__MINGW64_VERSION_MAJOR >= 3`) +- Microsoft Visual Studio 2010 v10.0 or higher (`_MSC_VER >= 1600`) +- MinGW-w64 3.0 or higher (`__MINGW64_VERSION_MAJOR >= 3`) ## Building Windows DLLs and C runtime (CRT) linkage issues diff --git a/docs/INTERNALS.md b/docs/INTERNALS.md index 4fb876d21c..c617957ad6 100644 --- a/docs/INTERNALS.md +++ b/docs/INTERNALS.md @@ -24,7 +24,7 @@ want it to remain functional and buildable with these and later versions ## Dependencies -We aim to support these or later versions. +We aim to support these or higher versions. - brotli 1.0.0 (2017-09-21) - c-ares 1.16.0 (2020-03-13) @@ -51,7 +51,7 @@ When writing code (mostly for generating stuff included in release tarballs) we use a few "build tools" and we make sure that we remain functional with these versions: -- clang-tidy 17.0.0 (2023-09-19), recommended: 19.1.0 or later (2024-09-17) +- clang-tidy 17.0.0 (2023-09-19), recommended: 19.1.0 or higher (2024-09-17) - cmake 3.18 (2020-07-15) - GNU autoconf 2.59 (2003-11-06) - GNU automake 1.7 (2002-09-25) diff --git a/docs/SSL-PROBLEMS.md b/docs/SSL-PROBLEMS.md index 4809f84a97..66ac2ef962 100644 --- a/docs/SSL-PROBLEMS.md +++ b/docs/SSL-PROBLEMS.md @@ -47,7 +47,7 @@ An additional complication can be that modern SSL libraries sometimes are built with support for older SSL and TLS versions disabled. All versions of SSL and the TLS versions before 1.2 are considered insecure -and should be avoided. Use TLS 1.2 or later. +and should be avoided. Use TLS 1.2 or higher. ## Ciphers diff --git a/docs/cmdline-opts/proxy-tls13-ciphers.md b/docs/cmdline-opts/proxy-tls13-ciphers.md index 6fcf6d79dc..56a1088ecd 100644 --- a/docs/cmdline-opts/proxy-tls13-ciphers.md +++ b/docs/cmdline-opts/proxy-tls13-ciphers.md @@ -26,8 +26,8 @@ Read up on TLS 1.3 cipher suite details on this URL: https://curl.se/docs/ssl-ciphers.html -This option is used when curl is built to use OpenSSL 1.1.1 or later, -Schannel, wolfSSL, or mbedTLS 3.6.0 or later. +This option is used when curl is built to use OpenSSL 1.1.1 or higher, +Schannel, wolfSSL, or mbedTLS 3.6.0 or higher. Before curl 8.10.0 with mbedTLS or wolfSSL, TLS 1.3 cipher suites were set by using the --proxy-ciphers option. diff --git a/docs/cmdline-opts/tls13-ciphers.md b/docs/cmdline-opts/tls13-ciphers.md index cae224eb17..0f5c0fd119 100644 --- a/docs/cmdline-opts/tls13-ciphers.md +++ b/docs/cmdline-opts/tls13-ciphers.md @@ -24,8 +24,8 @@ suite details on this URL: https://curl.se/docs/ssl-ciphers.html -This option is used when curl is built to use OpenSSL 1.1.1 or later, -wolfSSL, or mbedTLS 3.6.0 or later. +This option is used when curl is built to use OpenSSL 1.1.1 or higher, +wolfSSL, or mbedTLS 3.6.0 or higher. Before curl 8.10.0 with mbedTLS or wolfSSL, TLS 1.3 cipher suites were set by using the --ciphers option. diff --git a/docs/cmdline-opts/tlsv1.0.md b/docs/cmdline-opts/tlsv1.0.md index 59eaae26e9..c2d97e9069 100644 --- a/docs/cmdline-opts/tlsv1.0.md +++ b/docs/cmdline-opts/tlsv1.0.md @@ -15,7 +15,8 @@ Example: # `--tlsv1.0` -Force curl to use TLS version 1.0 or later when connecting to a remote TLS server. +Force curl to use TLS version 1.0 or higher when connecting to a remote TLS +server. In old versions of curl this option was documented to allow _only_ TLS 1.0. That behavior was inconsistent depending on the TLS library. Use --tls-max if diff --git a/docs/cmdline-opts/tlsv1.1.md b/docs/cmdline-opts/tlsv1.1.md index 5f5e7c765c..5548c38060 100644 --- a/docs/cmdline-opts/tlsv1.1.md +++ b/docs/cmdline-opts/tlsv1.1.md @@ -16,7 +16,8 @@ Example: # `--tlsv1.1` -Force curl to use TLS version 1.1 or later when connecting to a remote TLS server. +Force curl to use TLS version 1.1 or higher when connecting to a remote TLS +server. In old versions of curl this option was documented to allow _only_ TLS 1.1. That behavior was inconsistent depending on the TLS library. Use --tls-max if diff --git a/docs/cmdline-opts/tlsv1.2.md b/docs/cmdline-opts/tlsv1.2.md index bf38762be7..51858ab9d6 100644 --- a/docs/cmdline-opts/tlsv1.2.md +++ b/docs/cmdline-opts/tlsv1.2.md @@ -16,7 +16,8 @@ Example: # `--tlsv1.2` -Force curl to use TLS version 1.2 or later when connecting to a remote TLS server. +Force curl to use TLS version 1.2 or higher when connecting to a remote TLS +server. In old versions of curl this option was documented to allow _only_ TLS 1.2. That behavior was inconsistent depending on the TLS library. Use --tls-max if diff --git a/docs/cmdline-opts/tlsv1.3.md b/docs/cmdline-opts/tlsv1.3.md index 6f14eccb5a..ebb7e77c3f 100644 --- a/docs/cmdline-opts/tlsv1.3.md +++ b/docs/cmdline-opts/tlsv1.3.md @@ -16,7 +16,7 @@ Example: # `--tlsv1.3` -Force curl to use TLS version 1.3 or later when connecting to a remote TLS +Force curl to use TLS version 1.3 or higher when connecting to a remote TLS server. If the connection is done without TLS, this option has no effect. This diff --git a/docs/cmdline-opts/tlsv1.md b/docs/cmdline-opts/tlsv1.md index c6fc9e9230..d5950c7762 100644 --- a/docs/cmdline-opts/tlsv1.md +++ b/docs/cmdline-opts/tlsv1.md @@ -21,4 +21,4 @@ Example: # `--tlsv1` Use at least TLS version 1.x when negotiating with a remote TLS server. That -means TLS version 1.0 or higher +means TLS version 1.0 or higher. diff --git a/docs/examples/parseurl.c b/docs/examples/parseurl.c index f70df19bef..2501cfbd6f 100644 --- a/docs/examples/parseurl.c +++ b/docs/examples/parseurl.c @@ -30,7 +30,7 @@ #include #if !CURL_AT_LEAST_VERSION(7, 62, 0) -#error "this example requires curl 7.62.0 or later" +#error "this example requires curl 7.62.0 or higher" #endif int main(void) diff --git a/docs/examples/urlapi.c b/docs/examples/urlapi.c index 50175da76e..fd5c0a98ae 100644 --- a/docs/examples/urlapi.c +++ b/docs/examples/urlapi.c @@ -29,7 +29,7 @@ #include #if !CURL_AT_LEAST_VERSION(7, 80, 0) -#error "this example requires curl 7.80.0 or later" +#error "this example requires curl 7.80.0 or higher" #endif int main(void) diff --git a/docs/libcurl/libcurl-ws.md b/docs/libcurl/libcurl-ws.md index cce13abb24..b1405b1451 100644 --- a/docs/libcurl/libcurl-ws.md +++ b/docs/libcurl/libcurl-ws.md @@ -117,7 +117,7 @@ callback configured in CURLOPT_WRITEFUNCTION(3), whenever an incoming chunk of WebSocket data is received. The callback is handed a pointer to the payload data as an argument and can call curl_ws_meta(3) to get relevant metadata. -With libcurl 8.16.0 or later, sending of WebSocket frames via a +With libcurl 8.16.0 or higher, sending of WebSocket frames via a CURLOPT_READFUNCTION(3) is supported. To use that on such a connection, register a callback via CURLOPT_READFUNCTION(3) and set CURLOPT_UPLOAD(3) as well. Once, the WebSocket connection is established, your callback is diff --git a/docs/libcurl/opts/CURLOPT_PROXY_SSLVERSION.md b/docs/libcurl/opts/CURLOPT_PROXY_SSLVERSION.md index eb35d9c323..b99ee21f9b 100644 --- a/docs/libcurl/opts/CURLOPT_PROXY_SSLVERSION.md +++ b/docs/libcurl/opts/CURLOPT_PROXY_SSLVERSION.md @@ -105,7 +105,7 @@ int main(void) CURLcode result; curl_easy_setopt(curl, CURLOPT_URL, "https://example.com"); - /* ask libcurl to use TLS version 1.0 or later */ + /* ask libcurl to use TLS version 1.0 or higher */ curl_easy_setopt(curl, CURLOPT_SSLVERSION, CURL_SSLVERSION_TLSv1); /* Perform the request */ diff --git a/docs/libcurl/opts/CURLOPT_SSLVERSION.md b/docs/libcurl/opts/CURLOPT_SSLVERSION.md index 411da989ef..aeda6bda1e 100644 --- a/docs/libcurl/opts/CURLOPT_SSLVERSION.md +++ b/docs/libcurl/opts/CURLOPT_SSLVERSION.md @@ -46,7 +46,7 @@ default TLS v1.2 since 8.16.0 (unless the TLS library has a stricter rule). ## CURL_SSLVERSION_TLSv1 -TLS v1.0 or later +TLS v1.0 or higher ## CURL_SSLVERSION_SSLv2 @@ -58,19 +58,19 @@ SSL v3 - refused ## CURL_SSLVERSION_TLSv1_0 -TLS v1.0 or later +TLS v1.0 or higher ## CURL_SSLVERSION_TLSv1_1 -TLS v1.1 or later +TLS v1.1 or higher ## CURL_SSLVERSION_TLSv1_2 -TLS v1.2 or later +TLS v1.2 or higher ## CURL_SSLVERSION_TLSv1_3 -TLS v1.3 or later +TLS v1.3 or higher ## @@ -117,7 +117,7 @@ int main(void) CURLcode result; curl_easy_setopt(curl, CURLOPT_URL, "https://example.com"); - /* ask libcurl to use TLS version 1.0 or later */ + /* ask libcurl to use TLS version 1.0 or higher */ curl_easy_setopt(curl, CURLOPT_SSLVERSION, CURL_SSLVERSION_TLSv1); /* Perform the request */ diff --git a/docs/tests/TEST-SUITE.md b/docs/tests/TEST-SUITE.md index 6856eb5f8a..a51475931f 100644 --- a/docs/tests/TEST-SUITE.md +++ b/docs/tests/TEST-SUITE.md @@ -136,7 +136,7 @@ set to identify the IP address and port number of the DNS server to use. host information - curl built to use `getaddrinfo()` for resolving *and* is built with c-ares - 1.26.0 or later, gets a special workaround. In such builds, when the + 1.26.0 or higher, gets a special workaround. In such builds, when the environment variable is set, curl instead invokes a getaddrinfo wrapper that emulates the function and acknowledges the DNS server environment variable. This way, the getaddrinfo-using code paths in curl are verified, diff --git a/lib/curl_ntlm_core.c b/lib/curl_ntlm_core.c index e774d282f7..78ceeb448f 100644 --- a/lib/curl_ntlm_core.c +++ b/lib/curl_ntlm_core.c @@ -76,7 +76,7 @@ #elif defined(USE_MBEDTLS) && defined(HAVE_MBEDTLS_DES_CRYPT_ECB) # include # if MBEDTLS_VERSION_NUMBER < 0x03020000 -# error "mbedTLS 3.2.0 or later required" +# error "mbedTLS 3.2.0 or higher required" # endif # include # define USE_MBEDTLS_DES diff --git a/lib/curl_setup.h b/lib/curl_setup.h index 0bbf717c89..56fdc4775d 100644 --- a/lib/curl_setup.h +++ b/lib/curl_setup.h @@ -77,7 +77,7 @@ #if defined(__MINGW32__) && \ (!defined(__MINGW64_VERSION_MAJOR) || (__MINGW64_VERSION_MAJOR < 3)) -#error "Building curl requires mingw-w64 3.0 or later" +#error "Building curl requires mingw-w64 3.0 or higher" #endif /* Visual Studio 2010 is the minimum Visual Studio version we support. diff --git a/lib/hostip4.c b/lib/hostip4.c index fb35e3992c..713d3546c8 100644 --- a/lib/hostip4.c +++ b/lib/hostip4.c @@ -204,7 +204,7 @@ struct Curl_addrinfo *Curl_ipv4_resolve_r(const char *hostname, #elif defined(HAVE_GETHOSTBYNAME_R_3) /* AIX, Digital UNIX/Tru64, HP-UX 10, more? */ - /* For AIX 4.3 or later, we do not use gethostbyname_r() at all, because of + /* For AIX 4.3 or higher, we do not use gethostbyname_r() at all, because of * the plain fact that it does not return unique full buffers on each * call, but instead several of the pointers in the hostent structs will * point to the same actual data! This have the unfortunate down-side that @@ -214,7 +214,7 @@ struct Curl_addrinfo *Curl_ipv4_resolve_r(const char *hostname, * the plain old gethostbyname() work fine even for multi-threaded * programs. * - * This AIX 4.3 or later detection is all made in the configure script. + * This AIX 4.3 or higher detection is all made in the configure script. * * Troels Walsted Hansen helped us work this out on March 3rd, 2003. * diff --git a/lib/md5.c b/lib/md5.c index 1f1b4f8ad6..65f6ade111 100644 --- a/lib/md5.c +++ b/lib/md5.c @@ -40,7 +40,7 @@ #ifdef USE_MBEDTLS #include #if MBEDTLS_VERSION_NUMBER < 0x03020000 -#error "mbedTLS 3.2.0 or later required" +#error "mbedTLS 3.2.0 or higher required" #endif #include #endif diff --git a/lib/sha256.c b/lib/sha256.c index 047119044b..805db63456 100644 --- a/lib/sha256.c +++ b/lib/sha256.c @@ -32,7 +32,7 @@ #ifdef USE_MBEDTLS #include #if MBEDTLS_VERSION_NUMBER < 0x03020000 -#error "mbedTLS 3.2.0 or later required" +#error "mbedTLS 3.2.0 or higher required" #endif #include #endif diff --git a/lib/version.c b/lib/version.c index 299caee9fb..18cf4459a6 100644 --- a/lib/version.c +++ b/lib/version.c @@ -616,7 +616,7 @@ curl_version_info_data *curl_version_info(CURLversion stamp) } #endif #ifdef USE_LIBIDN2 - /* This returns a version string if we use the given version or later, + /* This returns a version string if we use the given version or higher, otherwise it returns NULL */ version_info.libidn = idn2_check_version(IDN2_VERSION); #endif diff --git a/lib/vssh/ssh.h b/lib/vssh/ssh.h index de76c8a253..53c3df09de 100644 --- a/lib/vssh/ssh.h +++ b/lib/vssh/ssh.h @@ -35,7 +35,7 @@ extern const struct Curl_protocol Curl_protocol_scp; #include #include #elif defined(USE_LIBSSH) -/* in 0.10.0 or later, ignore deprecated warnings */ +/* in 0.10.0 or higher, ignore deprecated warnings */ #define SSH_SUPPRESS_DEPRECATED #include #include @@ -220,7 +220,7 @@ struct ssh_conn { #ifdef USE_LIBSSH #if LIBSSH_VERSION_INT < SSH_VERSION_INT(0, 9, 0) -#error "SCP/SFTP protocols require libssh 0.9.0 or later" +#error "SCP/SFTP protocols require libssh 0.9.0 or higher" #endif #endif diff --git a/lib/vtls/mbedtls.c b/lib/vtls/mbedtls.c index 57727613ae..fb93297120 100644 --- a/lib/vtls/mbedtls.c +++ b/lib/vtls/mbedtls.c @@ -36,7 +36,7 @@ #include #if MBEDTLS_VERSION_NUMBER < 0x03020000 -#error "mbedTLS 3.2.0 or later required" +#error "mbedTLS 3.2.0 or higher required" #endif #include #include diff --git a/lib/vtls/openssl.c b/lib/vtls/openssl.c index dfc14fbc30..43b7cbf1d3 100644 --- a/lib/vtls/openssl.c +++ b/lib/vtls/openssl.c @@ -87,11 +87,11 @@ #ifdef LIBRESSL_VERSION_NUMBER /* As of LibreSSL 2.0.0-4.0.0: OPENSSL_VERSION_NUMBER == 0x20000000L */ # if LIBRESSL_VERSION_NUMBER < 0x2090100fL /* 2019-04-13 */ -# error "LibreSSL 2.9.1 or later required" +# error "LibreSSL 2.9.1 or higher required" # endif #elif !defined(HAVE_BORINGSSL_LIKE) # ifndef HAVE_OPENSSL3 /* 2021-09-07 */ -# error "OpenSSL 3.0.0 or later required" +# error "OpenSSL 3.0.0 or higher required" # endif #endif diff --git a/lib/vtls/openssl.h b/lib/vtls/openssl.h index 4fa466b367..a83f14ffbd 100644 --- a/lib/vtls/openssl.h +++ b/lib/vtls/openssl.h @@ -71,7 +71,7 @@ #include "urldata.h" #if OPENSSL_VERSION_NUMBER >= 0x30000000L -#define HAVE_OPENSSL3 /* non-fork OpenSSL 3.x or later */ +#define HAVE_OPENSSL3 /* non-fork OpenSSL 3.x or higher */ #endif #if defined(OPENSSL_IS_AWSLC) || defined(OPENSSL_IS_BORINGSSL) diff --git a/m4/curl-compilers.m4 b/m4/curl-compilers.m4 index 36688bcff7..ed60902531 100644 --- a/m4/curl-compilers.m4 +++ b/m4/curl-compilers.m4 @@ -816,12 +816,12 @@ AC_DEFUN([CURL_SET_COMPILER_WARNING_OPTS], [ tmp_CFLAGS="$tmp_CFLAGS -Wno-system-headers" CURL_ADD_COMPILER_WARNINGS([tmp_CFLAGS], [shorten-64-to-32]) - dnl Only clang 1.1 or later + dnl Only clang 1.1 or higher if test "$compiler_num" -ge "101"; then CURL_ADD_COMPILER_WARNINGS([tmp_CFLAGS], [unused]) fi - dnl Only clang 2.7 or later + dnl Only clang 2.7 or higher if test "$compiler_num" -ge "207"; then CURL_ADD_COMPILER_WARNINGS([tmp_CFLAGS], [address]) CURL_ADD_COMPILER_WARNINGS([tmp_CFLAGS], [attributes]) @@ -843,13 +843,13 @@ AC_DEFUN([CURL_SET_COMPILER_WARNING_OPTS], [ CURL_ADD_COMPILER_WARNINGS([tmp_CFLAGS], [unreachable-code unused-parameter]) fi - dnl Only clang 2.8 or later + dnl Only clang 2.8 or higher if test "$compiler_num" -ge "208"; then CURL_ADD_COMPILER_WARNINGS([tmp_CFLAGS], [ignored-qualifiers]) CURL_ADD_COMPILER_WARNINGS([tmp_CFLAGS], [vla]) fi - dnl Only clang 2.9 or later + dnl Only clang 2.9 or higher if test "$compiler_num" -ge "209"; then tmp_CFLAGS="$tmp_CFLAGS -Wno-sign-conversion" tmp_CFLAGS="$tmp_CFLAGS -Wno-padded" # Not used because we cannot change public structs @@ -857,20 +857,20 @@ AC_DEFUN([CURL_SET_COMPILER_WARNING_OPTS], [ CURL_ADD_COMPILER_WARNINGS([tmp_CFLAGS], [shift-sign-overflow]) fi - dnl Only clang 3.0 or later + dnl Only clang 3.0 or higher if test "$compiler_num" -ge "300"; then CURL_ADD_COMPILER_WARNINGS([tmp_CFLAGS], [conditional-uninitialized]) CURL_ADD_COMPILER_WARNINGS([tmp_CFLAGS], [language-extension-token]) fi - dnl Only clang 3.1 or later + dnl Only clang 3.1 or higher if test "$compiler_num" -ge "301"; then CURL_ADD_COMPILER_WARNINGS([tmp_CFLAGS], [format-non-iso]) tmp_CFLAGS="$tmp_CFLAGS -Wno-covered-switch-default" # Annoying to fix or silence tmp_CFLAGS="$tmp_CFLAGS -Wno-disabled-macro-expansion" # for std headers, and curl/curl.h (rare combos) fi - dnl Only clang 3.2 or later + dnl Only clang 3.2 or higher if test "$compiler_num" -ge "302"; then CURL_ADD_COMPILER_WARNINGS([tmp_CFLAGS], [enum-conversion]) CURL_ADD_COMPILER_WARNINGS([tmp_CFLAGS], [sometimes-uninitialized]) @@ -885,29 +885,29 @@ AC_DEFUN([CURL_SET_COMPILER_WARNING_OPTS], [ esac fi - dnl Only clang 3.3 or later + dnl Only clang 3.3 or higher if test "$compiler_num" -ge "303"; then tmp_CFLAGS="$tmp_CFLAGS -Wno-documentation-unknown-command" fi - dnl Only clang 3.4 or later + dnl Only clang 3.4 or higher if test "$compiler_num" -ge "304"; then CURL_ADD_COMPILER_WARNINGS([tmp_CFLAGS], [header-guard]) CURL_ADD_COMPILER_WARNINGS([tmp_CFLAGS], [unused-const-variable]) fi - dnl Only clang 3.5 or later + dnl Only clang 3.5 or higher if test "$compiler_num" -ge "305"; then CURL_ADD_COMPILER_WARNINGS([tmp_CFLAGS], [pragmas]) # CURL_ADD_COMPILER_WARNINGS([tmp_CFLAGS], [unreachable-code-break]) # Not used: Silent in "unity" builds fi - dnl Only clang 3.6 or later + dnl Only clang 3.6 or higher if test "$compiler_num" -ge "306"; then CURL_ADD_COMPILER_WARNINGS([tmp_CFLAGS], [double-promotion]) fi - dnl Only clang 3.9 or later + dnl Only clang 3.9 or higher if test "$compiler_num" -ge "309"; then CURL_ADD_COMPILER_WARNINGS([tmp_CFLAGS], [comma]) dnl avoid the varargs warning, fixed in 4.0 @@ -917,46 +917,46 @@ AC_DEFUN([CURL_SET_COMPILER_WARNING_OPTS], [ fi fi - dnl clang 7 or later + dnl clang 7 or higher if test "$compiler_num" -ge "700"; then CURL_ADD_COMPILER_WARNINGS([tmp_CFLAGS], [assign-enum]) CURL_ADD_COMPILER_WARNINGS([tmp_CFLAGS], [extra-semi-stmt]) fi - dnl clang 10 or later + dnl clang 10 or higher if test "$compiler_num" -ge "1000"; then tmp_CFLAGS="$tmp_CFLAGS -Wimplicit-fallthrough" # we have silencing markup for clang 10.0 and above only CURL_ADD_COMPILER_WARNINGS([tmp_CFLAGS], [xor-used-as-pow]) fi - dnl clang 13 or later + dnl clang 13 or higher if test "$compiler_num" -ge "1300"; then CURL_ADD_COMPILER_WARNINGS([tmp_CFLAGS], [cast-function-type]) CURL_ADD_COMPILER_WARNINGS([tmp_CFLAGS], [reserved-identifier]) # Keep it before -Wno-reserved-macro-identifier tmp_CFLAGS="$tmp_CFLAGS -Wno-reserved-macro-identifier" # Sometimes such external macros need to be set fi - dnl clang 16 or later + dnl clang 16 or higher if test "$compiler_num" -ge "1600"; then tmp_CFLAGS="$tmp_CFLAGS -Wno-unsafe-buffer-usage" fi - dnl clang 17 or later + dnl clang 17 or higher if test "$compiler_num" -ge "1700"; then CURL_ADD_COMPILER_WARNINGS([tmp_CFLAGS], [cast-function-type-strict]) # with Apple clang it requires 16.0 or above fi - dnl clang 19 or later + dnl clang 19 or higher if test "$compiler_num" -ge "1901"; then CURL_ADD_COMPILER_WARNINGS([tmp_CFLAGS], [format-signedness]) fi - dnl clang 20 or later + dnl clang 20 or higher if test "$compiler_num" -ge "2001"; then CURL_ADD_COMPILER_WARNINGS([tmp_CFLAGS], [array-compare]) fi - dnl clang 21 or later + dnl clang 21 or higher if test "$compiler_num" -ge "2101"; then CURL_ADD_COMPILER_WARNINGS([tmp_CFLAGS], [c++-hidden-decl]) CURL_ADD_COMPILER_WARNINGS([tmp_CFLAGS], [implicit-int-enum-cast]) @@ -1011,7 +1011,7 @@ AC_DEFUN([CURL_SET_COMPILER_WARNING_OPTS], [ CURL_ADD_COMPILER_WARNINGS([tmp_CFLAGS], [all]) tmp_CFLAGS="$tmp_CFLAGS -W" - dnl Only gcc 1.4 or later + dnl Only gcc 1.4 or higher if test "$compiler_num" -ge "104"; then CURL_ADD_COMPILER_WARNINGS([tmp_CFLAGS], [pointer-arith write-strings]) dnl If not cross-compiling with a gcc older than 3.0 @@ -1021,7 +1021,7 @@ AC_DEFUN([CURL_SET_COMPILER_WARNING_OPTS], [ fi fi - dnl Only gcc 2.7 or later + dnl Only gcc 2.7 or higher if test "$compiler_num" -ge "207"; then CURL_ADD_COMPILER_WARNINGS([tmp_CFLAGS], [nested-externs]) dnl If not cross-compiling with a gcc older than 3.0 @@ -1032,24 +1032,24 @@ AC_DEFUN([CURL_SET_COMPILER_WARNING_OPTS], [ fi fi - dnl Only gcc 2.95 or later + dnl Only gcc 2.95 or higher if test "$compiler_num" -ge "295"; then tmp_CFLAGS="$tmp_CFLAGS -Wno-long-long" CURL_ADD_COMPILER_WARNINGS([tmp_CFLAGS], [bad-function-cast]) fi - dnl Only gcc 2.96 or later + dnl Only gcc 2.96 or higher if test "$compiler_num" -ge "296"; then CURL_ADD_COMPILER_WARNINGS([tmp_CFLAGS], [float-equal]) tmp_CFLAGS="$tmp_CFLAGS -Wno-multichar" CURL_ADD_COMPILER_WARNINGS([tmp_CFLAGS], [sign-compare]) - dnl -Wundef used only if gcc is 2.96 or later since we get + dnl -Wundef used only if gcc is 2.96 or higher since we get dnl lots of "`_POSIX_C_SOURCE' is not defined" in system dnl headers with gcc 2.95.4 on FreeBSD 4.9 CURL_ADD_COMPILER_WARNINGS([tmp_CFLAGS], [undef]) fi - dnl Only gcc 3.0 or later + dnl Only gcc 3.0 or higher if test "$compiler_num" -ge "300"; then dnl -Wunreachable-code seems totally unreliable on my gcc 3.3.2 on dnl on i686-Linux as it gives us heaps with false positives. @@ -1058,24 +1058,24 @@ AC_DEFUN([CURL_SET_COMPILER_WARNING_OPTS], [ tmp_CFLAGS="$tmp_CFLAGS" fi - dnl Only gcc 3.3 or later + dnl Only gcc 3.3 or higher if test "$compiler_num" -ge "303"; then CURL_ADD_COMPILER_WARNINGS([tmp_CFLAGS], [endif-labels strict-prototypes]) fi - dnl Only gcc 3.4 or later + dnl Only gcc 3.4 or higher if test "$compiler_num" -ge "304"; then CURL_ADD_COMPILER_WARNINGS([tmp_CFLAGS], [declaration-after-statement]) CURL_ADD_COMPILER_WARNINGS([tmp_CFLAGS], [old-style-definition]) fi - dnl Only gcc 4.0 or later + dnl Only gcc 4.0 or higher if test "$compiler_num" -ge "400"; then CURL_ADD_COMPILER_WARNINGS([tmp_CFLAGS], [cast-qual]) tmp_CFLAGS="$tmp_CFLAGS -Wstrict-aliasing=3" fi - dnl Only gcc 4.1 or later + dnl Only gcc 4.1 or higher if test "$compiler_num" -ge "401"; then CURL_ADD_COMPILER_WARNINGS([tmp_CFLAGS], [attributes]) CURL_ADD_COMPILER_WARNINGS([tmp_CFLAGS], [div-by-zero format-security]) @@ -1097,12 +1097,12 @@ AC_DEFUN([CURL_SET_COMPILER_WARNING_OPTS], [ # tmp_CFLAGS="$tmp_CFLAGS -Wno-error=unused-macros" fi - dnl Only gcc 4.2 or later + dnl Only gcc 4.2 or higher if test "$compiler_num" -ge "402"; then CURL_ADD_COMPILER_WARNINGS([tmp_CFLAGS], [cast-align]) fi - dnl Only gcc 4.3 or later + dnl Only gcc 4.3 or higher if test "$compiler_num" -ge "403"; then CURL_ADD_COMPILER_WARNINGS([tmp_CFLAGS], [address]) CURL_ADD_COMPILER_WARNINGS([tmp_CFLAGS], [type-limits old-style-declaration]) @@ -1115,12 +1115,12 @@ AC_DEFUN([CURL_SET_COMPILER_WARNING_OPTS], [ tmp_CFLAGS="$tmp_CFLAGS -ftree-vrp" fi - dnl Only gcc 4.4 or later + dnl Only gcc 4.4 or higher if test "$compiler_num" -ge "404"; then CURL_ADD_COMPILER_WARNINGS([tmp_CFLAGS], [logical-op]) fi - dnl Only gcc 4.5 or later + dnl Only gcc 4.5 or higher if test "$compiler_num" -ge "405"; then CURL_ADD_COMPILER_WARNINGS([tmp_CFLAGS], [jump-misses-init]) dnl Only Windows targets @@ -1135,24 +1135,24 @@ AC_DEFUN([CURL_SET_COMPILER_WARNING_OPTS], [ esac fi - dnl Only gcc 4.6 or later + dnl Only gcc 4.6 or higher if test "$compiler_num" -ge "406"; then CURL_ADD_COMPILER_WARNINGS([tmp_CFLAGS], [double-promotion]) CURL_ADD_COMPILER_WARNINGS([tmp_CFLAGS], [trampolines]) fi - dnl only gcc 4.8 or later + dnl only gcc 4.8 or higher if test "$compiler_num" -ge "408"; then tmp_CFLAGS="$tmp_CFLAGS -Wformat=2" fi - dnl Only gcc 5 or later + dnl Only gcc 5 or higher if test "$compiler_num" -ge "500"; then tmp_CFLAGS="$tmp_CFLAGS -Warray-bounds=2" CURL_ADD_COMPILER_WARNINGS([tmp_CFLAGS], [format-signedness]) fi - dnl Only gcc 6 or later + dnl Only gcc 6 or higher if test "$compiler_num" -ge "600"; then CURL_ADD_COMPILER_WARNINGS([tmp_CFLAGS], [shift-negative-value]) tmp_CFLAGS="$tmp_CFLAGS -Wshift-overflow=2" @@ -1162,7 +1162,7 @@ AC_DEFUN([CURL_SET_COMPILER_WARNING_OPTS], [ CURL_ADD_COMPILER_WARNINGS([tmp_CFLAGS], [unused-const-variable]) fi - dnl Only gcc 7 or later + dnl Only gcc 7 or higher if test "$compiler_num" -ge "700"; then CURL_ADD_COMPILER_WARNINGS([tmp_CFLAGS], [duplicated-branches]) CURL_ADD_COMPILER_WARNINGS([tmp_CFLAGS], [restrict]) @@ -1171,24 +1171,24 @@ AC_DEFUN([CURL_SET_COMPILER_WARNING_OPTS], [ tmp_CFLAGS="$tmp_CFLAGS -Wimplicit-fallthrough" fi - dnl Only gcc 10 or later + dnl Only gcc 10 or higher if test "$compiler_num" -ge "1000"; then CURL_ADD_COMPILER_WARNINGS([tmp_CFLAGS], [arith-conversion]) CURL_ADD_COMPILER_WARNINGS([tmp_CFLAGS], [enum-conversion]) fi - dnl Only gcc 12 or later + dnl Only gcc 12 or higher if test "$compiler_num" -ge "1200"; then CURL_ADD_COMPILER_WARNINGS([tmp_CFLAGS], [array-compare]) fi - dnl Only gcc 13 or later + dnl Only gcc 13 or higher if test "$compiler_num" -ge "1300"; then CURL_ADD_COMPILER_WARNINGS([tmp_CFLAGS], [enum-int-mismatch]) CURL_ADD_COMPILER_WARNINGS([tmp_CFLAGS], [xor-used-as-pow]) fi - dnl Only gcc 15 or later + dnl Only gcc 15 or higher if test "$compiler_num" -ge "1500"; then CURL_ADD_COMPILER_WARNINGS([tmp_CFLAGS], [leading-whitespace=spaces]) CURL_ADD_COMPILER_WARNINGS([tmp_CFLAGS], [trailing-whitespace=any]) @@ -1204,11 +1204,11 @@ AC_DEFUN([CURL_SET_COMPILER_WARNING_OPTS], [ dnl some warnings triggered on third party system headers. if test "$cross_compiling" = "yes"; then if test "$compiler_num" -ge "104"; then - dnl gcc 1.4 or later + dnl gcc 1.4 or higher tmp_CFLAGS="$tmp_CFLAGS -Wno-unused -Wno-shadow" fi if test "$compiler_num" -ge "207"; then - dnl gcc 2.7 or later + dnl gcc 2.7 or higher tmp_CFLAGS="$tmp_CFLAGS -Wno-missing-declarations" tmp_CFLAGS="$tmp_CFLAGS -Wno-missing-prototypes" fi @@ -1508,7 +1508,7 @@ AC_DEFUN([CURL_CHECK_COMPILER_SYMBOL_HIDING], [ supports_symbol_hiding="yes" ;; GNU_C) - dnl Only gcc 3.4 or later + dnl Only gcc 3.4 or higher if test "$compiler_num" -ge "304"; then if $CC --help --verbose 2>/dev/null | grep fvisibility= >/dev/null; then tmp_EXTERN="__attribute__((__visibility__(\"default\")))" @@ -1518,7 +1518,7 @@ AC_DEFUN([CURL_CHECK_COMPILER_SYMBOL_HIDING], [ fi ;; INTEL_UNIX_C) - dnl Only icc 9.0 or later + dnl Only icc 9.0 or higher if test "$compiler_num" -ge "900"; then if $CC --help --verbose 2>&1 | grep fvisibility= > /dev/null; then tmp_save_CFLAGS="$CFLAGS" diff --git a/projects/vms/build_gnv_curl_pcsi_text.com b/projects/vms/build_gnv_curl_pcsi_text.com index b67ad8f187..2106e37695 100644 --- a/projects/vms/build_gnv_curl_pcsi_text.com +++ b/projects/vms/build_gnv_curl_pcsi_text.com @@ -176,11 +176,11 @@ $ code = f$extract(0, 1, arch_type) $! $ write ptxt "1 NEED_VMS''vmstag'" $ write ptxt - - "=prompt OpenVMS ''vernum' or later is not installed on your system." -$ write ptxt "This product requires OpenVMS ''vernum' or later to function." + "=prompt OpenVMS ''vernum' or higher is not installed on your system." +$ write ptxt "This product requires OpenVMS ''vernum' or higher to function." $ write ptxt "1 NEED_ZLIB" -$ write ptxt "=prompt ZLIB 1.2-8 or later is not installed on your system." -$ write ptxt "This product requires ZLIB 1.2-8 or later to function." +$ write ptxt "=prompt ZLIB 1.2-8 or higher is not installed on your system." +$ write ptxt "This product requires ZLIB 1.2-8 or higher to function." $ write ptxt "1 SOURCE" $ write ptxt "=prompt Source modules for ''product'" $ write ptxt "The Source modules for ''product' will be installed." diff --git a/projects/vms/curl_release_note_start.txt b/projects/vms/curl_release_note_start.txt index 184b458dd6..587c3efe97 100644 --- a/projects/vms/curl_release_note_start.txt +++ b/projects/vms/curl_release_note_start.txt @@ -59,7 +59,7 @@ For the HP SSL work around to work for GNV do the following: ^Z Similar workarounds will be needed for any program linked with GNV$LIBCURL -until the HP OpenSSL is upgraded to the current 1.4 version or later. +until the HP OpenSSL is upgraded to the current 1.4 version or higher. If you are installing a "daily" build instead of a release build of curl, some things have been changed so that it can be installed at the same time as diff --git a/projects/vms/gnv_link_curl.com b/projects/vms/gnv_link_curl.com index 330613b76d..990037bda0 100644 --- a/projects/vms/gnv_link_curl.com +++ b/projects/vms/gnv_link_curl.com @@ -260,7 +260,7 @@ the shared images from the HP OpenSSL product that is kitted with that version or a compatible later version. For Alpha and IA64 platforms, see the URL below to register to get the -download URL. The kit will be HP 1.4-467 or later. +download URL. The kit will be HP 1.4-467 or higher. https://h41379.www4.hpe.com/openvms/products/ssl/ssl.html For VAX, use the same registration, but remove the kit name from any of the diff --git a/projects/vms/readme b/projects/vms/readme index 9db0ee3873..7b922a065f 100644 --- a/projects/vms/readme +++ b/projects/vms/readme @@ -19,8 +19,8 @@ curl_gnv_build_steps.txt and other useful information. Prerequisites: -OpenVMS v7.0 or later (any platform) -DECC v6.5 or later +OpenVMS v7.0 or higher (any platform) +DECC v6.5 or higher OpenSSL or HP SSL, if you want SSL support What is Here: diff --git a/tests/sshserver.pl b/tests/sshserver.pl index 4133e86db6..b8dff2951b 100755 --- a/tests/sshserver.pl +++ b/tests/sshserver.pl @@ -262,7 +262,7 @@ my ($sshdid, $sshdvernum, $sshdverstr, $sshderror) = sshversioninfo($sshd); if(!$sshdid) { # Not an OpenSSH or SunSSH ssh daemon logmsg "$sshderror\n" if($verbose); - logmsg "SCP and SFTP tests require OpenSSH 2.9.9 or later\n"; + logmsg "SCP and SFTP tests require OpenSSH 2.9.9 or higher\n"; exit 1; } logmsg "ssh server found $sshd is $sshdverstr\n" if($verbose); @@ -289,7 +289,7 @@ logmsg "ssh server found $sshd is $sshdverstr\n" if($verbose); # if((($sshdid =~ /OpenSSH/) && ($sshdvernum < 299)) || (($sshdid =~ /SunSSH/) && ($sshdvernum < 100))) { - logmsg "SCP and SFTP tests require OpenSSH 2.9.9 or later\n"; + logmsg "SCP and SFTP tests require OpenSSH 2.9.9 or higher\n"; exit 1; } @@ -339,7 +339,7 @@ my ($sshid, $sshvernum, $sshverstr, $ssherror) = sshversioninfo($ssh); if(!$sshid) { # Not an OpenSSH or SunSSH ssh client logmsg "$ssherror\n" if($verbose); - logmsg "SCP and SFTP tests require OpenSSH 2.9.9 or later\n"; + logmsg "SCP and SFTP tests require OpenSSH 2.9.9 or higher\n"; exit 1; } logmsg "ssh client found $ssh is $sshverstr\n" if($verbose); @@ -368,7 +368,7 @@ logmsg "ssh client found $ssh is $sshverstr\n" if($verbose); # if((($sshid =~ /OpenSSH/) && ($sshvernum < 299)) || (($sshid =~ /SunSSH/) && ($sshvernum < 100))) { - logmsg "SCP and SFTP tests require OpenSSH 2.9.9 or later\n"; + logmsg "SCP and SFTP tests require OpenSSH 2.9.9 or higher\n"; exit 1; }