CVS commit: pkgsrc/www/curl

["Thomas Klausner" <wiz%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   wiz
Date:           Wed Feb  5 08:51:32 UTC 2025

Modified Files:
        pkgsrc/www/curl: Makefile Makefile.common PLIST distinfo
        pkgsrc/www/curl/patches: patch-curl-config.in

Log Message:
curl: update to 8.12.0.

curl and libcurl 8.12.0

 Public curl releases:         264
 Command line options:         267
 curl_easy_setopt() options:   306
 Public functions in libcurl:  96
 Contributors:                 3332

This release includes the following changes:

 o curl: add byte range support to --variable reading from file [56]
 o curl: make --etag-save acknowledge --create-dirs [31]
 o getinfo: fix CURLINFO_QUEUE_TIME_T and add 'time_queue' var [55]
 o getinfo: provide info which auth was used for HTTP and proxy [40]
 o hyper: drop support [57]
 o openssl: add support to use keys and certificates from PKCS#11 provider [77]
 o QUIC: 0RTT for gnutls via CURLSSLOPT_EARLYDATA [61]
 o vtls: feature ssls-export for SSL session im-/export [141]

This release includes the following bugfixes:

 o altsvc: avoid integer overflow in expire calculation [16]
 o altsvc: return error on dot-only name [178]
 o android: add CI jobs, buildinfo, cmake docs, disable `CURL_USE_PKGCONFIG` by default [185]
 o asyn-ares: acknowledge CURLOPT_DNS_SERVERS set to NULL [190]
 o asyn-ares: fix memory leak [233]
 o asyn-ares: initial HTTPS resolve support [166]
 o asyn-thread: use c-ares to resolve HTTPS RR [205]
 o async-thread: avoid closing eventfd twice [9]
 o autotools: add support for mingw UWP builds [192]
 o autotools: silence gcc warnings in libtool code [96]
 o binmode: convert to macro and use it from tests [44]
 o build: delete `-Wsign-conversion` related FIXMEs [137]
 o build: drop `-Winline` picky warning [53]
 o build: drop `tool_hugehelp.c.cvs`, tidy up macros, drop `buildconf.bat` [200]
 o build: drop macro used to enable `-Wsign-conversion` warnings in CI [224]
 o build: drop unused feature macros, update exception list [51]
 o build: fix `-Wtrampolines` picky warning for gcc 4.x versions [156]
 o build: fix compiling with GCC 4.x versions [214]
 o build: fix the tidy targets for autotools [52]
 o build: fix unsigned `time_t` detection for cmake, MS-DOS, AmigaOS [104]
 o build: replace configure check with PP condition (Android <21) [97]
 o build: stop detecting `sched_yield()` on Windows [176]
 o c-ares: fix/tidy-up macro initializations, avoid a deprecated function [209]
 o cd2nroff: do not insist on quoted <> within backticks [222]
 o cd2nroff: support "none" as a TLS backend [29]
 o cf-https-connect: look into httpsrr alpns when available [152]
 o cf-socket: error if address can't be copied [72]
 o cfilters: kill connection filter events attach+detach [217]
 o checksrc.bat: remove explicit SNPRINTF bypass [174]
 o checksrc: ban use of sscanf() [7]
 o checksrc: check for return with parens around a value/name [130]
 o checksrc: exclude generated bundle files to avoid race condition [235]
 o checksrc: fix the return() checker [35]
 o checksrc: introduce 'banfunc' to ban specific functions [117]
 o cmake/Find: add `iphlpapi` for c-ares, omit syslibs if dep not found [203]
 o cmake/FindLDAP: avoid empty 'Requires' item when omitting `pkg-config` module [90]
 o cmake/FindLDAP: avoid framework locations for libs too (Apple) [122]
 o cmake/FindLibpsl: protect against `pkg-config` "half-detection" [89]
 o cmake/FindLibssh: sync header comment with other modules
 o cmake/FindMbedTLS: drop lib duplicates early [17]
 o cmake: add `librtmp` Find module [86]
 o cmake: add LDAP Find module [46]
 o cmake: add native `pkg-config` detection for remaining Find modules [37]
 o cmake: allow `CURL_LTO` regardless of `CURL_BUILD_TYPE`, enable in CI [88]
 o cmake: clang-cl improvements [42]
 o cmake: delete accidental debug message
 o cmake: deprecate winbuild, add migration guide from legacy build methods [157]
 o cmake: detect mingw-w64 version, pre-fill `HAVE_STRTOK_R` [179]
 o cmake: do not store `MINGW64_VERSION` in cache [175]
 o cmake: drop `CURL_USE_PKGCONFIG` from `curl-config.cmake.in` [208]
 o cmake: drop `fseeko()` pre-fill and check for Windows [201]
 o cmake: drop duplicate Windows cache value [81]
 o cmake: drop redundant FOUND checks (libgsasl, libssh, libuv) [49]
 o cmake: drop redundant opening/closing `.*` from `MATCH` expressions [64]
 o cmake: drop unused `HAVE_SYS_XATTR_H` detection [79]
 o cmake: drop VS2010 "Dialog Hell" workaround added in 2013 [136]
 o cmake: extend zlib's `AUTO` option to brotli, zstd and enable if found [36]
 o cmake: fix `net/in.h` detection for MS-DOS [103]
 o cmake: improve `curl_dumpvars()` and move to `Utilities.cmake` [50]
 o cmake: make libpsl required by default [45]
 o cmake: make system libraries `dl`, `m`, `pthread` customizable [123]
 o cmake: move `pkg-config` names to Find modules [87]
 o cmake: move GSS init before feature detections [93]
 o cmake: move mingw UWP workaround from GHA to `CMakeLists.txt` [194]
 o cmake: namespace functions and macros [41]
 o cmake: optimize out 4 picky warning option detections with gcc [78]
 o cmake: pick a better IPv6 feature flag when assembling the feature list [132]
 o cmake: pre-fill `HAVE_STDATOMIC_H`, `HAVE_ATOMIC` for mingw-w64 [180]
 o cmake: pre-fill `HAVE_STDINT_H` on Windows [149]
 o cmake: prefer dash-style MSVC options [216]
 o cmake: publish/check supported protocols/features via `CURLConfig.cmake` [100]
 o cmake: replace `unset(VAR)` with `set(VAR "")` for init [43]
 o cmake: sync OpenSSL QUIC fork detection with autotools [102]
 o cmake: use `CMAKE_REQUIRED_LINK_DIRECTORIES` [48]
 o cmake: use `STREQUAL` to detect Linux [68]
 o cmake: warn for OpenSSL versions missing TLS 1.3 support [221]
 o cmdline-opts/version.md: describe multissl, mention SSLS-EXPORT [170]
 o completion.pl: add completion for paths after @ for fish [82]
 o config-mac: drop `MACOS_SSL_SUPPORT` macro [63]
 o config: drop unused code and variables [135]
 o configure: do not inline 'dnl' comments
 o configure: drop unused detections and macros [105]
 o configure: streamline Windows large file feature check [138]
 o configure: UWP and Android follow-up fixes [184]
 o conncache: count shutdowns against host and max limits [154]
 o conncache: result_cb comment removed from function docs [1]
 o content_encoding: drop support for zlib before 1.2.0.4 [211]
 o content_encoding: namespace GZIP flag constants [147]
 o content_encoding: put the decomp buffers into the writer structs [210]
 o content_encoding: support use of custom libzstd memory functions [186]
 o cookie: cap expire times to 400 days [111]
 o cookie: fix crash in netscape cookie parsing [84]
 o cookie: parse only the exact expire date [3]
 o curl-functions.m4: fix indentation in `CURL_SIZEOF()` [131]
 o curl: return error if etag options are used with multiple URLs [5]
 o curl_multi_fdset: include the shutdown connections in the set [168]
 o curl_multi_waitfds.md: tidy up the example [162]
 o curl_multibyte: support Windows paths longer than MAX_PATH [76]
 o curl_setup: fix missing `ADDRESS_FAMILY` type in rare build cases [144]
 o curl_sha512_256: rename symbols to the curl namespace [124]
 o curl_url_set.md: adjust the added-in to 7.62.0 [94]
 o curl_ws_recv.md: fix typo
 o CURLOPT_CONNECT_ONLY.md: an easy handle with this option set cannot be reused [164]
 o CURLOPT_PROXY.md: clarify the crendential support in proxy URLs [66]
 o CURLOPT_RESOLVE.md: fix wording [30]
 o CURLOPT_SEEKFUNCTION.md: used for FTP, HTTP and SFTP (only) [109]
 o docs/BUGS.md: remove leading space from a link
 o docs/cmdline-opts/_ENVIRONMENT.md: minor language fix [119]
 o docs/cmdline-opts/location.md: fix typos for location flag [226]
 o docs/HTTP-COOKIES.md: link to more information [125]
 o docs/HTTPSRR.md: initial HTTPS RR documentation [204]
 o docs/libcurl/opts: clarify the return values [114]
 o docs/libcurl: return value overhall [120]
 o docs/TLS-SESSIONS: fix typo, the->they [189]
 o docs: document the behavior of -- in the curl command line [198]
 o docs: use lowercase curl and libcurl [113]
 o doh: cleanups and extended HTTPS RR code [161]
 o doh: send HTTPS RR requests for all HTTP(S) transfers [160]
 o easy: allow connect-only handle reuse with easy_perform [232]
 o easy: make curl_easy_perform() return error if connection still there [163]
 o easy_lock: use Sleep(1) for thread yield on old Windows [191]
 o ECH: update APIs to those agreed with OpenSSL maintainers [101]
 o examples/block-ip: drop redundant `memory.h` include
 o examples/block-ip: show how to block IP addresses [74]
 o examples/complicated: fix warnings, bump deprecated callback, tidy up [59]
 o examples/synctime.c: remove references to dead URLs and functionality [62]
 o examples: make them compile with compatibility functions disabled (Windows) [58]
 o examples: use return according to code style
 o file: drop `OPEN_NEEDS_ARG3` option [91]
 o file: fix Android compiler warning [85]
 o gitignore: add generated unity sources for lib and src
 o GnuTLS: fix 'time_appconnect' for early data [127]
 o hash: add asserts in hash_element_dtor() [126]
 o HTTP/2: strip TE request header [140]
 o http2: fix data_pending check [241]
 o http2: fix value stored to 'result' is never read [71]
 o http: fix build with `CURL_DISABLE_COOKIES` [95]
 o http: ignore invalid Retry-After times [107]
 o http_aws_sigv4: Fix invalid compare function handling zero-length pairs [24]
 o https-connect: start next immediately on failure [223]
 o INFRASTRUCTURE.md: project infra [99]
 o INSTALL-CMAKE.md: fix punctuation
 o INSTALL.md: add CMake examples for macOS and iOS [242]
 o INSTALL.md: document VS2008 and mingw-w64 [165]
 o INTERNALS.md: sync wolfSSL version requirement with source code
 o lib517: extend the getdate test with quotes and leading "junk" [4]
 o lib: clarify 'conn->httpversion' [213]
 o lib: redirect handling by protocol handler [212]
 o lib: remove `__EMX__` guards [83]
 o lib: replace `inline` redefine with `CURL_INLINE` macro [47]
 o lib: supress deprecation warnings in apple builds [32]
 o lib: TLS session ticket caching reworked [60]
 o libcurl/opts: do not save files in dirs where attackers have access [199]
 o Makefile.dist: delete [237]
 o Makefile.mk: drop in favour of autotools and cmake (MS-DOS, AmigaOS3) [38]
 o mbedtls: fix handling of blocked sends [116]
 o mbedtls: PSA can be used independently of TLS 1.3 (avoid runtime errors) [219]
 o mime: explicitly rewind subparts at attachment time. [80]
 o mprintf: fix integer handling in float precision [173]
 o mprintf: terminate snprintf output on windows [172]
 o msvc: add missing push/pop for warning pragmas [236]
 o msvc: assume `_INTEGRAL_MAX_BITS >= 64` [158]
 o msvc: drop checks for ancient versions [133]
 o msvc: fix building with `HAVE_INET_NTOP` and MSVC <=1900 [151]
 o msvc: require VS2005 for large file support [143]
 o msvc: tidy up `_CRT_*_NO_DEPRECATE` definitions [148]
 o multi: fix curl_multi_waitfds reporting of fd_count [73]
 o multi: fix return code for an already-removed easy handle [106]
 o multihandle: add an ssl_scache here [129]
 o multissl: auto-enable `OPENSSL_COEXIST` for wolfSSL + OpenSSL [92]
 o multissl: make openssl + wolfssl builds work [34]
 o netrc: 'default' with no credentials is not a match [108]
 o netrc: fix password-only entries [28]
 o netrc: restore _netrc fallback logic [6]
 o ngtcp2: fix memory leak on connect failure [225]
 o ngtcp2: fix two cases of value stored never read [65]
 o openssl: define `HAVE_KEYLOG_CALLBACK` before use [227]
 o openssl: drop unused `HAVE_SSL_GET_SHUTDOWN` macro [228]
 o openssl: fix ECH logic [67]
 o osslq: use SSL_poll to determine writeability of QUIC streams [139]
 o projects/Windows: remove wolfSSL from legacy projects [75]
 o projects: fix `INSTALL-CMAKE.md` references
 o pytest: remove 'repeat' parameter [182]
 o pytest: use httpd/apache2 directly, no apachectl [169]
 o RELEASE-PROCEDURE.md: mention how to publish security advisories [2]
 o runtests.pl: fix precedence issue [207]
 o scripts/mdlinkcheck: markdown link checker [19]
 o sectransp: free certificate on error [12]
 o select: avoid a NULL deref in cwfds_add_sock [128]
 o smb: fix compiler warning [112]
 o src: add `CURL_STRICMP()` macro, use `_stricmp()` on Windows [54]
 o src: drop support for `CURL_TESTDIR` debug env [121]
 o src: omit hugehelp and ca-embed from libcurltool [215]
 o ssl session cache: change cache dimensions [159]
 o strparse: string parsing helper functions [8]
 o symbols-in-versions: update version for LIBCURL_VERSION and LIBCURL_VERSION_NUM [193]
 o system.h: add 64-bit curl_off_t definitions for NonStop [11]
 o system.h: drop compilers lacking 64-bit integer type (Windows/MS-DOS) [155]
 o system.h: drop duplicate and no-op code [153]
 o system.h: fix indentation [142]
 o telnet: handle single-byte input option [177]
 o test1960: don't close the socket too early [220]
 o test483: require cookie support [98]
 o tests/http/clients: use proper sleep() call on NonStop [10]
 o tests: change the behavior of swsbounce [202]
 o tests: stop promoting perl warnings to fatal errors
 o TheArtOfHttpScripting.md: rewrite double 'that' [115]
 o tidy-up: `curl_setup.h`, `curl_setup_once.h`, `config-win32ce.h` [146]
 o tidy-up: drop parenthesis around `return` expression [167]
 o tidy-up: drop parenthesis around `return` values [134]
 o tidy-up: extend `CURL_O_BINARY` to lib and tests [195]
 o TLS: check connection for SSL use, not handler [181]
 o tool_formparse.c: make curlx_uztoso a static in here [39]
 o tool_formparse: accept digits in --form type= strings [33]
 o tool_getparam: ECH param parsing refix [150]
 o tool_getparam: fail --hostpubsha256 if libssh2 is not used [229]
 o tool_getparam: fix "Ignored Return Value" [21]
 o tool_getparam: fix memory leak on error in parse_ech [14]
 o tool_getparam: fix the ECH parser [20]
 o tool_operate: make --etag-compare always accept a non-existing file [22]
 o transfer: fix CURLOPT_CURLU override logic [171]
 o urlapi: fix redirect to a new fragment or query (only) [118]
 o urldata: tweak the UserDefined struct [240]
 o variable.md: mention --expand-variable for variables to variables [13]
 o variable.md: show function use with examples [18]
 o version: fix the IDN feature for winidn and appleidn [187]
 o vquic: fix 4th function call argument is an uninitialized value [70]
 o vquic: make vquic_send_packets not return without setting psent [69]
 o vtls: fix default SSL backend as a fallback [231]
 o vtls: only remember the expiry timestamp in session cache [110]
 o vtls: remove 'detach/attach' functions from TLS handler struct [25]
 o vtls: remove unusued 'check_cxn' from TLS handler struct [26]
 o vtls: replace "none"-functions with NULL pointers [27]
 o VULN-DISCLOSURE-POLICY.md: mention the not setting CVSS [23]
 o VULN-DISCLOSURE-POLICY: on legacy dependencies [239]
 o websocket: fix message send corruption [188]
 o windows: drop dupe macros, detect `CURL_OS` for WinCE ARM, indentation [183]
 o windows: drop redundant `USE_WIN32_SMALL_FILES` macro [145]
 o windows: drop two missed `buildconf.bat` references
 o windows: merge `config-win32ce.h` into `config-win32.h` [196]
 o ws-docs: extend WebSocket documentation [206]
 o ws-docs: remove the outdated texts saying ws support is experimental [15]
 o ws: reject frames with unknown reserved bits set [230]
 o x509asn1: add parse recursion limit [197]


To generate a diff of this commit:
cvs rdiff -u -r1.291 -r1.292 pkgsrc/www/curl/Makefile
cvs rdiff -u -r1.19 -r1.20 pkgsrc/www/curl/Makefile.common
cvs rdiff -u -r1.102 -r1.103 pkgsrc/www/curl/PLIST
cvs rdiff -u -r1.211 -r1.212 pkgsrc/www/curl/distinfo
cvs rdiff -u -r1.13 -r1.14 pkgsrc/www/curl/patches/patch-curl-config.in

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/www/curl/Makefile
diff -u pkgsrc/www/curl/Makefile:1.291 pkgsrc/www/curl/Makefile:1.292
--- pkgsrc/www/curl/Makefile:1.291      Wed Dec 11 12:02:21 2024
+++ pkgsrc/www/curl/Makefile    Wed Feb  5 08:51:31 2025
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.291 2024/12/11 12:02:21 ryoon Exp $
+# $NetBSD: Makefile,v 1.292 2025/02/05 08:51:31 wiz Exp $
 
 .include "Makefile.common"
-PKGREVISION=   1
 
 CONFIGURE_ARGS+=       --with-ssl=${BUILDLINK_PREFIX.openssl}
 

Index: pkgsrc/www/curl/Makefile.common
diff -u pkgsrc/www/curl/Makefile.common:1.19 pkgsrc/www/curl/Makefile.common:1.20
--- pkgsrc/www/curl/Makefile.common:1.19        Wed Dec 11 09:24:32 2024
+++ pkgsrc/www/curl/Makefile.common     Wed Feb  5 08:51:31 2025
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile.common,v 1.19 2024/12/11 09:24:32 wiz Exp $
+# $NetBSD: Makefile.common,v 1.20 2025/02/05 08:51:31 wiz Exp $
 # used by www/libcurl-gnutls/Makefile
 
-DISTNAME=      curl-8.11.1
+DISTNAME=      curl-8.12.0
 CATEGORIES=    www
 MASTER_SITES=  https://curl.se/download/
 EXTRACT_SUFX=  .tar.xz

Index: pkgsrc/www/curl/PLIST
diff -u pkgsrc/www/curl/PLIST:1.102 pkgsrc/www/curl/PLIST:1.103
--- pkgsrc/www/curl/PLIST:1.102 Wed Nov  6 08:19:26 2024
+++ pkgsrc/www/curl/PLIST       Wed Feb  5 08:51:31 2025
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.102 2024/11/06 08:19:26 wiz Exp $
+@comment $NetBSD: PLIST,v 1.103 2025/02/05 08:51:31 wiz Exp $
 bin/curl
 bin/curl-config
 include/curl/curl.h
@@ -41,6 +41,7 @@ man/man3/CURLINFO_FILETIME_T.3
 man/man3/CURLINFO_FTP_ENTRY_PATH.3
 man/man3/CURLINFO_HEADER_SIZE.3
 man/man3/CURLINFO_HTTPAUTH_AVAIL.3
+man/man3/CURLINFO_HTTPAUTH_USED.3
 man/man3/CURLINFO_HTTP_CONNECTCODE.3
 man/man3/CURLINFO_HTTP_VERSION.3
 man/man3/CURLINFO_LASTSOCKET.3
@@ -58,6 +59,7 @@ man/man3/CURLINFO_PRIMARY_PORT.3
 man/man3/CURLINFO_PRIVATE.3
 man/man3/CURLINFO_PROTOCOL.3
 man/man3/CURLINFO_PROXYAUTH_AVAIL.3
+man/man3/CURLINFO_PROXYAUTH_USED.3
 man/man3/CURLINFO_PROXY_ERROR.3
 man/man3/CURLINFO_PROXY_SSL_VERIFYRESULT.3
 man/man3/CURLINFO_QUEUE_TIME_T.3
@@ -436,6 +438,8 @@ man/man3/curl_easy_recv.3
 man/man3/curl_easy_reset.3
 man/man3/curl_easy_send.3
 man/man3/curl_easy_setopt.3
+man/man3/curl_easy_ssls_export.3
+man/man3/curl_easy_ssls_import.3
 man/man3/curl_easy_strerror.3
 man/man3/curl_easy_unescape.3
 man/man3/curl_easy_upkeep.3

Index: pkgsrc/www/curl/distinfo
diff -u pkgsrc/www/curl/distinfo:1.211 pkgsrc/www/curl/distinfo:1.212
--- pkgsrc/www/curl/distinfo:1.211      Wed Dec 11 09:24:32 2024
+++ pkgsrc/www/curl/distinfo    Wed Feb  5 08:51:31 2025
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.211 2024/12/11 09:24:32 wiz Exp $
+$NetBSD: distinfo,v 1.212 2025/02/05 08:51:31 wiz Exp $
 
-BLAKE2s (curl-8.11.1.tar.xz) = 058a2195b969d71c67c22b8882ff1e782185690c12516a022ab3bb865e87d841
-SHA512 (curl-8.11.1.tar.xz) = 7c7c47a49505575b610c56b455f0919ea5082a993bf5483eeb258ead167aadb87078d626b343b417dcfc5439c53556425c8fb4fe3b01b53a87b47c01686a3e57
-Size (curl-8.11.1.tar.xz) = 2751236 bytes
-SHA1 (patch-curl-config.in) = 1f84517a0a2060bb4ba96821d32e873f51722a7f
+BLAKE2s (curl-8.12.0.tar.xz) = 8ad736d92568a050f55a5ddc640b4d04d338e72b66d4e46f858569037284065a
+SHA512 (curl-8.12.0.tar.xz) = ed35f0020541050ce387f4ba80f9e87562ececd99082da1bae85840dee81c49b86a4a55909e15fcbf4eb116106a796c29a9b2678dee11326f80db75992c6edc5
+Size (curl-8.12.0.tar.xz) = 2777552 bytes
+SHA1 (patch-curl-config.in) = abc985fab71738206e87b65f0371350bf04f588f

Index: pkgsrc/www/curl/patches/patch-curl-config.in
diff -u pkgsrc/www/curl/patches/patch-curl-config.in:1.13 pkgsrc/www/curl/patches/patch-curl-config.in:1.14
--- pkgsrc/www/curl/patches/patch-curl-config.in:1.13   Wed Nov  6 08:19:26 2024
+++ pkgsrc/www/curl/patches/patch-curl-config.in        Wed Feb  5 08:51:32 2025
@@ -1,18 +1,18 @@
-$NetBSD: patch-curl-config.in,v 1.13 2024/11/06 08:19:26 wiz Exp $
+$NetBSD: patch-curl-config.in,v 1.14 2025/02/05 08:51:32 wiz Exp $
 
 Make "curl-config --libs" return proper ldflags for shared libraries.
 
---- curl-config.in.orig        2024-11-06 07:09:19.000000000 +0000
+--- curl-config.in.orig        2025-02-05 08:05:05.000000000 +0000
 +++ curl-config.in
-@@ -161,9 +161,9 @@ while test "$#" -gt 0; do
-       CURLLIBDIR=''
+@@ -155,9 +155,9 @@ while test "$#" -gt 0; do
+       curllibdir=''
      fi
      if test 'X@ENABLE_SHARED@' = 'Xno'; then
--      echo "${CURLLIBDIR}-lcurl @LIBCURL_PC_LIBS_PRIVATE@"
-+      echo "@LDFLAGS@ ${CURLLIBDIR}-lcurl @LIBCURL_PC_LIBS_PRIVATE@"
+-      echo "${curllibdir}-lcurl @LIBCURL_PC_LIBS_PRIVATE@"
++      echo "@LDFLAGS@ ${curllibdir}-lcurl @LIBCURL_PC_LIBS_PRIVATE@"
      else
--      echo "${CURLLIBDIR}-lcurl"
-+      echo "@LDFLAGS@ ${CURLLIBDIR}-lcurl"
+-      echo "${curllibdir}-lcurl"
++      echo "@LDFLAGS@ ${curllibdir}-lcurl"
      fi
      ;;