Wed Nov 10 10:55:08 2021 UTC ()
curl: updated to 7.80.0

Fixed in 7.80.0

Changes:

CURLOPT_MAXLIFETIME_CONN: maximum allowed lifetime for conn reuse
CURLOPT_PREREQFUNCTION: add new callback
libssh2: add SHA256 fingerprint support
urlapi: add curl_url_strerror()
urlapi: support UNC paths in file: URLs on Windows
wolfssl: allow setting of groups/curves

Bugfixes:

.github: retry macos "brew install" command on failure
aws-sigv4: make signature work when post data is binary
BINDINGS: URL updates
build: remove checks for WinSock 1
c-hyper: don't abort CONNECT responses early when auth-in-progress
c-hyper: make Curl_http propagate errors better
c-hyper: make CURLOPT_SUPPRESS_CONNECT_HEADERS work
c-hyper: make test 217 run
c-hyper: use hyper_request_set_uri_parts to make h2 better
checksrc: ignore preprocessor lines
CI/makefiles: introduce dedicated test target
ci: update Lift config to match requirements of curl build
cirrus: remove FreeBSD 11.4 from the matrix
cirrus: switch to openldap24-client
cleanup: constify unmodified static structs
cmake: add CURL_ENABLE_SSL option
cmake: fix error getting LOCATION property on non-imported target
CMake: restore support for SecureTransport on iOS
cmake: with OpenSSL, define OPENSSL_SUPPRESS_DEPRECATED
cmdline-opts: made the 'Added:' field mandatory
configure.ac: replace krb5-config with pkg-config
configure: when hyper is selected, deselect nghttp2
connect: use sysaddr_un from sys/un.h or custom-defined for windows
curl-confopts.m4: remove --enable/disable-hidden-symbols
curl-openssl.m4: modify library order for openssl linking
curl-openssl: pass argument to sed single-quoted
curl.1: remove mentions of really old version changes
curl: actually append "-" to --range without number only
curl: correct grammar in generated libcurl code
curl: print help descriptions in an aligned right column
curl_gssapi: fix link error on macOS Monterey
curl_multi_socket_action.3: add a "RETURN VALUE" section
curl_ntlm_core: use OpenSSL only if DES is available
Curl_updateconninfo: store addresses for QUIC connections too
CURLOPT_ALTSVC_CTRL.3: mention conn reuse is preferred
CURLOPT_HSTSWRITEFUNCTION.3: using CURLOPT_HSTS_CTRL is required
CURLOPT_HTTPHEADER.3: add descripion for specific headers
docs/HTTP3: improve build instructions
docs/Makefile.am: repair 'make html'
docs: fix typo in CURLOPT_TRAILERFUNCTION example
docs: provide "RETURN VALUE" section for more func manpages
docs: reduce use of "very"
doh: remove experimental code for DoH with GET
examples/htmltidy: correct wrong printf() use
examples/imap-append: fix end-of-data check
ftp: make the MKD retry to retry once per directory
gen.pl: insert the current date and version in generated man page
gen.pl: replace leading single quotes with \(aq
http2: make getsock not wait for write if there's no remote window
HTTP3: fix the HTTP/3 Explained book link
http: fix Basic auth with empty name field in URL
http: reject HTTP response codes < 100
http: remove assert that breaks hyper
http: set content length earlier
http_proxy: make hyper CONNECT() return the correct error code
http_proxy: multiple CONNECT with hyper done better
hyper: disable test 1294 since hyper doesn't allow such crazy headers
hyper: does not support disabling CURLOPT_HTTP_TRANSFER_DECODING
hyper: pass the CONNECT line to the debug callback
imap: display quota information
INSTALL: update symbol hiding option
lib/mk-ca-bundle.pl: skip certs passed Not Valid After date
lib: avoid fallthrough cases in switch statements
libcurl.rc: switch out the copyright symbol for plain ASCII
libssh2: Get the version at runtime if possible
limit-rate.d: this is average over several seconds
llist: remove redundant code, branch will not be executed
Makefile.m32: fix to not require OpenSSL with -libssh2 or -rtmp options
maketgz: redirect updatemanpages.pl output to /dev/null
man pages: require all to use the same section header order
manpage: adjust the asterisk in some SYNOPSIS sections
md5: fix compilation with OpenSSL 3.0 API
misc: fix a few issues on MidnightBSD
misc: fix typos in docs and comments
ngtcp2: advertise h3 as well as h3-29
ngtcp2: compile with the latest nghttp3
ngtcp2: specify the missing required callback functions
ngtcp2: use latest QUIC TLS RFC9001
NTLM: use DES_set_key_unchecked with OpenSSL
openssl: if verifypeer is not requested, skip the CA loading
openssl: with OpenSSL 1.1.0+ a failed RAND_status means goaway
Revert "src/tool_filetime: disable -Wformat on mingw for this file"
sasl: binary messages
schannel: fix memory leak due to failed SSL connection
scripts/delta: count command line options in the new file
sendf: accept zero-length data in Curl_client_write()
sha256: use high-level EVP interface for OpenSSL
smooth-gtk-thread.c: enhance the mutex lock use
sws: fix memory leak on exit
test1160: edited to work with hyper
test1173: make manpage-syntax.pl spot \n errors in examples
test1185: verify checksrc
test1266/1267: disabled on hyper: no HTTP/0.9 support
test1287: make work on hyper
test207: accept a different error code for hyper
test262: don't attempt with hyper
test552: updated to work with hyper
test559: add 'HTTP' in keywords
tests/smbserver.py: fix compatibility with impacket 0.9.23+
tests: add Schannel-specific tests and disable unsupported ones
tests: disable test 2043
tests: kill some test servers afterwards to avoid locked logfiles
tests: use python3 in test 1451
tls: remove newline from three infof() calls
tool_cb_prg: make resumed upload progress bar show better
tool_listhelp: easier generated with gen.pl
tool_main: fix typo in comment
tool_operate: a failed etag save now only fails that transfer
URL-SYNTAX: add IMAP UID SEARCH example
url: check the return value of curl_url()
url: set "k->size" -1 at start of request
urlapi: skip a strlen(), pass in zero
urlapi: URL decode percent-encoded host names
version_win32: use actual version instead of manifested version
vtls: Fix a memory leak if an SSL session cannot be added to the cache
wolfssl: use for SHA256, MD4, MD5, and setting DES odd parity
zuul: pin the quiche build to use an older cmake-rs


(adam)
diff -r1.249 -r1.250 pkgsrc/www/curl/Makefile
diff -r1.86 -r1.87 pkgsrc/www/curl/PLIST
diff -r1.176 -r1.177 pkgsrc/www/curl/distinfo
diff -r1.12 -r1.13 pkgsrc/www/curl/patches/patch-configure

cvs diff -r1.249 -r1.250 pkgsrc/www/curl/Makefile (expand / switch to unified diff)

--- pkgsrc/www/curl/Makefile 2021/10/21 07:46:32 1.249
+++ pkgsrc/www/curl/Makefile 2021/11/10 10:55:08 1.250
@@ -1,17 +1,16 @@ @@ -1,17 +1,16 @@
1# $NetBSD: Makefile,v 1.249 2021/10/21 07:46:32 wiz Exp $ 1# $NetBSD: Makefile,v 1.250 2021/11/10 10:55:08 adam Exp $
2 2
3DISTNAME= curl-7.79.1 3DISTNAME= curl-7.80.0
4PKGREVISION= 2 
5CATEGORIES= www 4CATEGORIES= www
6MASTER_SITES= https://curl.haxx.se/download/ 5MASTER_SITES= https://curl.haxx.se/download/
7EXTRACT_SUFX= .tar.xz 6EXTRACT_SUFX= .tar.xz
8 7
9MAINTAINER= leot@NetBSD.org 8MAINTAINER= leot@NetBSD.org
10HOMEPAGE= https://curl.haxx.se/ 9HOMEPAGE= https://curl.haxx.se/
11COMMENT= Client that groks URLs 10COMMENT= Client that groks URLs
12# not completely, but near enough 11# not completely, but near enough
13LICENSE= mit 12LICENSE= mit
14 13
15BUILD_DEFS+= IPV6_READY 14BUILD_DEFS+= IPV6_READY
16 15
17TEST_DEPENDS+= ${PYPKGPREFIX}-impacket-[0-9]*:../../net/py-impacket 16TEST_DEPENDS+= ${PYPKGPREFIX}-impacket-[0-9]*:../../net/py-impacket

cvs diff -r1.86 -r1.87 pkgsrc/www/curl/PLIST (expand / switch to unified diff)

--- pkgsrc/www/curl/PLIST 2021/05/26 07:54:16 1.86
+++ pkgsrc/www/curl/PLIST 2021/11/10 10:55:08 1.87
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1@comment $NetBSD: PLIST,v 1.86 2021/05/26 07:54:16 wiz Exp $ 1@comment $NetBSD: PLIST,v 1.87 2021/11/10 10:55:08 adam Exp $
2bin/curl 2bin/curl
3bin/curl-config 3bin/curl-config
4include/curl/curl.h 4include/curl/curl.h
5include/curl/curlver.h 5include/curl/curlver.h
6include/curl/easy.h 6include/curl/easy.h
7include/curl/mprintf.h 7include/curl/mprintf.h
8include/curl/multi.h 8include/curl/multi.h
9include/curl/options.h 9include/curl/options.h
10include/curl/stdcheaders.h 10include/curl/stdcheaders.h
11include/curl/system.h 11include/curl/system.h
12include/curl/typecheck-gcc.h 12include/curl/typecheck-gcc.h
13include/curl/urlapi.h 13include/curl/urlapi.h
14lib/libcurl.la 14lib/libcurl.la
@@ -212,52 +212,55 @@ man/man3/CURLOPT_KRBLEVEL.3 @@ -212,52 +212,55 @@ man/man3/CURLOPT_KRBLEVEL.3
212man/man3/CURLOPT_LOCALPORT.3 212man/man3/CURLOPT_LOCALPORT.3
213man/man3/CURLOPT_LOCALPORTRANGE.3 213man/man3/CURLOPT_LOCALPORTRANGE.3
214man/man3/CURLOPT_LOGIN_OPTIONS.3 214man/man3/CURLOPT_LOGIN_OPTIONS.3
215man/man3/CURLOPT_LOW_SPEED_LIMIT.3 215man/man3/CURLOPT_LOW_SPEED_LIMIT.3
216man/man3/CURLOPT_LOW_SPEED_TIME.3 216man/man3/CURLOPT_LOW_SPEED_TIME.3
217man/man3/CURLOPT_MAIL_AUTH.3 217man/man3/CURLOPT_MAIL_AUTH.3
218man/man3/CURLOPT_MAIL_FROM.3 218man/man3/CURLOPT_MAIL_FROM.3
219man/man3/CURLOPT_MAIL_RCPT.3 219man/man3/CURLOPT_MAIL_RCPT.3
220man/man3/CURLOPT_MAIL_RCPT_ALLLOWFAILS.3 220man/man3/CURLOPT_MAIL_RCPT_ALLLOWFAILS.3
221man/man3/CURLOPT_MAXAGE_CONN.3 221man/man3/CURLOPT_MAXAGE_CONN.3
222man/man3/CURLOPT_MAXCONNECTS.3 222man/man3/CURLOPT_MAXCONNECTS.3
223man/man3/CURLOPT_MAXFILESIZE.3 223man/man3/CURLOPT_MAXFILESIZE.3
224man/man3/CURLOPT_MAXFILESIZE_LARGE.3 224man/man3/CURLOPT_MAXFILESIZE_LARGE.3
 225man/man3/CURLOPT_MAXLIFETIME_CONN.3
225man/man3/CURLOPT_MAXREDIRS.3 226man/man3/CURLOPT_MAXREDIRS.3
226man/man3/CURLOPT_MAX_RECV_SPEED_LARGE.3 227man/man3/CURLOPT_MAX_RECV_SPEED_LARGE.3
227man/man3/CURLOPT_MAX_SEND_SPEED_LARGE.3 228man/man3/CURLOPT_MAX_SEND_SPEED_LARGE.3
228man/man3/CURLOPT_MIMEPOST.3 229man/man3/CURLOPT_MIMEPOST.3
229man/man3/CURLOPT_NETRC.3 230man/man3/CURLOPT_NETRC.3
230man/man3/CURLOPT_NETRC_FILE.3 231man/man3/CURLOPT_NETRC_FILE.3
231man/man3/CURLOPT_NEW_DIRECTORY_PERMS.3 232man/man3/CURLOPT_NEW_DIRECTORY_PERMS.3
232man/man3/CURLOPT_NEW_FILE_PERMS.3 233man/man3/CURLOPT_NEW_FILE_PERMS.3
233man/man3/CURLOPT_NOBODY.3 234man/man3/CURLOPT_NOBODY.3
234man/man3/CURLOPT_NOPROGRESS.3 235man/man3/CURLOPT_NOPROGRESS.3
235man/man3/CURLOPT_NOPROXY.3 236man/man3/CURLOPT_NOPROXY.3
236man/man3/CURLOPT_NOSIGNAL.3 237man/man3/CURLOPT_NOSIGNAL.3
237man/man3/CURLOPT_OPENSOCKETDATA.3 238man/man3/CURLOPT_OPENSOCKETDATA.3
238man/man3/CURLOPT_OPENSOCKETFUNCTION.3 239man/man3/CURLOPT_OPENSOCKETFUNCTION.3
239man/man3/CURLOPT_PASSWORD.3 240man/man3/CURLOPT_PASSWORD.3
240man/man3/CURLOPT_PATH_AS_IS.3 241man/man3/CURLOPT_PATH_AS_IS.3
241man/man3/CURLOPT_PINNEDPUBLICKEY.3 242man/man3/CURLOPT_PINNEDPUBLICKEY.3
242man/man3/CURLOPT_PIPEWAIT.3 243man/man3/CURLOPT_PIPEWAIT.3
243man/man3/CURLOPT_PORT.3 244man/man3/CURLOPT_PORT.3
244man/man3/CURLOPT_POST.3 245man/man3/CURLOPT_POST.3
245man/man3/CURLOPT_POSTFIELDS.3 246man/man3/CURLOPT_POSTFIELDS.3
246man/man3/CURLOPT_POSTFIELDSIZE.3 247man/man3/CURLOPT_POSTFIELDSIZE.3
247man/man3/CURLOPT_POSTFIELDSIZE_LARGE.3 248man/man3/CURLOPT_POSTFIELDSIZE_LARGE.3
248man/man3/CURLOPT_POSTQUOTE.3 249man/man3/CURLOPT_POSTQUOTE.3
249man/man3/CURLOPT_POSTREDIR.3 250man/man3/CURLOPT_POSTREDIR.3
250man/man3/CURLOPT_PREQUOTE.3 251man/man3/CURLOPT_PREQUOTE.3
 252man/man3/CURLOPT_PREREQDATA.3
 253man/man3/CURLOPT_PREREQFUNCTION.3
251man/man3/CURLOPT_PRE_PROXY.3 254man/man3/CURLOPT_PRE_PROXY.3
252man/man3/CURLOPT_PRIVATE.3 255man/man3/CURLOPT_PRIVATE.3
253man/man3/CURLOPT_PROGRESSDATA.3 256man/man3/CURLOPT_PROGRESSDATA.3
254man/man3/CURLOPT_PROGRESSFUNCTION.3 257man/man3/CURLOPT_PROGRESSFUNCTION.3
255man/man3/CURLOPT_PROTOCOLS.3 258man/man3/CURLOPT_PROTOCOLS.3
256man/man3/CURLOPT_PROXY.3 259man/man3/CURLOPT_PROXY.3
257man/man3/CURLOPT_PROXYAUTH.3 260man/man3/CURLOPT_PROXYAUTH.3
258man/man3/CURLOPT_PROXYHEADER.3 261man/man3/CURLOPT_PROXYHEADER.3
259man/man3/CURLOPT_PROXYPASSWORD.3 262man/man3/CURLOPT_PROXYPASSWORD.3
260man/man3/CURLOPT_PROXYPORT.3 263man/man3/CURLOPT_PROXYPORT.3
261man/man3/CURLOPT_PROXYTYPE.3 264man/man3/CURLOPT_PROXYTYPE.3
262man/man3/CURLOPT_PROXYUSERNAME.3 265man/man3/CURLOPT_PROXYUSERNAME.3
263man/man3/CURLOPT_PROXYUSERPWD.3 266man/man3/CURLOPT_PROXYUSERPWD.3
@@ -310,26 +313,27 @@ man/man3/CURLOPT_SASL_AUTHZID.3 @@ -310,26 +313,27 @@ man/man3/CURLOPT_SASL_AUTHZID.3
310man/man3/CURLOPT_SASL_IR.3 313man/man3/CURLOPT_SASL_IR.3
311man/man3/CURLOPT_SEEKDATA.3 314man/man3/CURLOPT_SEEKDATA.3
312man/man3/CURLOPT_SEEKFUNCTION.3 315man/man3/CURLOPT_SEEKFUNCTION.3
313man/man3/CURLOPT_SERVICE_NAME.3 316man/man3/CURLOPT_SERVICE_NAME.3
314man/man3/CURLOPT_SHARE.3 317man/man3/CURLOPT_SHARE.3
315man/man3/CURLOPT_SOCKOPTDATA.3 318man/man3/CURLOPT_SOCKOPTDATA.3
316man/man3/CURLOPT_SOCKOPTFUNCTION.3 319man/man3/CURLOPT_SOCKOPTFUNCTION.3
317man/man3/CURLOPT_SOCKS5_AUTH.3 320man/man3/CURLOPT_SOCKS5_AUTH.3
318man/man3/CURLOPT_SOCKS5_GSSAPI_NEC.3 321man/man3/CURLOPT_SOCKS5_GSSAPI_NEC.3
319man/man3/CURLOPT_SOCKS5_GSSAPI_SERVICE.3 322man/man3/CURLOPT_SOCKS5_GSSAPI_SERVICE.3
320man/man3/CURLOPT_SSH_AUTH_TYPES.3 323man/man3/CURLOPT_SSH_AUTH_TYPES.3
321man/man3/CURLOPT_SSH_COMPRESSION.3 324man/man3/CURLOPT_SSH_COMPRESSION.3
322man/man3/CURLOPT_SSH_HOST_PUBLIC_KEY_MD5.3 325man/man3/CURLOPT_SSH_HOST_PUBLIC_KEY_MD5.3
 326man/man3/CURLOPT_SSH_HOST_PUBLIC_KEY_SHA256.3
323man/man3/CURLOPT_SSH_KEYDATA.3 327man/man3/CURLOPT_SSH_KEYDATA.3
324man/man3/CURLOPT_SSH_KEYFUNCTION.3 328man/man3/CURLOPT_SSH_KEYFUNCTION.3
325man/man3/CURLOPT_SSH_KNOWNHOSTS.3 329man/man3/CURLOPT_SSH_KNOWNHOSTS.3
326man/man3/CURLOPT_SSH_PRIVATE_KEYFILE.3 330man/man3/CURLOPT_SSH_PRIVATE_KEYFILE.3
327man/man3/CURLOPT_SSH_PUBLIC_KEYFILE.3 331man/man3/CURLOPT_SSH_PUBLIC_KEYFILE.3
328man/man3/CURLOPT_SSLCERT.3 332man/man3/CURLOPT_SSLCERT.3
329man/man3/CURLOPT_SSLCERTTYPE.3 333man/man3/CURLOPT_SSLCERTTYPE.3
330man/man3/CURLOPT_SSLCERT_BLOB.3 334man/man3/CURLOPT_SSLCERT_BLOB.3
331man/man3/CURLOPT_SSLENGINE.3 335man/man3/CURLOPT_SSLENGINE.3
332man/man3/CURLOPT_SSLENGINE_DEFAULT.3 336man/man3/CURLOPT_SSLENGINE_DEFAULT.3
333man/man3/CURLOPT_SSLKEY.3 337man/man3/CURLOPT_SSLKEY.3
334man/man3/CURLOPT_SSLKEYTYPE.3 338man/man3/CURLOPT_SSLKEYTYPE.3
335man/man3/CURLOPT_SSLKEY_BLOB.3 339man/man3/CURLOPT_SSLKEY_BLOB.3
@@ -451,26 +455,27 @@ man/man3/curl_share_cleanup.3 @@ -451,26 +455,27 @@ man/man3/curl_share_cleanup.3
451man/man3/curl_share_init.3 455man/man3/curl_share_init.3
452man/man3/curl_share_setopt.3 456man/man3/curl_share_setopt.3
453man/man3/curl_share_strerror.3 457man/man3/curl_share_strerror.3
454man/man3/curl_slist_append.3 458man/man3/curl_slist_append.3
455man/man3/curl_slist_free_all.3 459man/man3/curl_slist_free_all.3
456man/man3/curl_strequal.3 460man/man3/curl_strequal.3
457man/man3/curl_strnequal.3 461man/man3/curl_strnequal.3
458man/man3/curl_unescape.3 462man/man3/curl_unescape.3
459man/man3/curl_url.3 463man/man3/curl_url.3
460man/man3/curl_url_cleanup.3 464man/man3/curl_url_cleanup.3
461man/man3/curl_url_dup.3 465man/man3/curl_url_dup.3
462man/man3/curl_url_get.3 466man/man3/curl_url_get.3
463man/man3/curl_url_set.3 467man/man3/curl_url_set.3
 468man/man3/curl_url_strerror.3
464man/man3/curl_version.3 469man/man3/curl_version.3
465man/man3/curl_version_info.3 470man/man3/curl_version_info.3
466man/man3/libcurl-easy.3 471man/man3/libcurl-easy.3
467man/man3/libcurl-env.3 472man/man3/libcurl-env.3
468man/man3/libcurl-errors.3 473man/man3/libcurl-errors.3
469man/man3/libcurl-multi.3 474man/man3/libcurl-multi.3
470man/man3/libcurl-security.3 475man/man3/libcurl-security.3
471man/man3/libcurl-share.3 476man/man3/libcurl-share.3
472man/man3/libcurl-symbols.3 477man/man3/libcurl-symbols.3
473man/man3/libcurl-thread.3 478man/man3/libcurl-thread.3
474man/man3/libcurl-tutorial.3 479man/man3/libcurl-tutorial.3
475man/man3/libcurl-url.3 480man/man3/libcurl-url.3
476man/man3/libcurl.3 481man/man3/libcurl.3

cvs diff -r1.176 -r1.177 pkgsrc/www/curl/distinfo (expand / switch to unified diff)

--- pkgsrc/www/curl/distinfo 2021/10/26 11:29:24 1.176
+++ pkgsrc/www/curl/distinfo 2021/11/10 10:55:08 1.177
@@ -1,7 +1,7 @@ @@ -1,7 +1,7 @@
1$NetBSD: distinfo,v 1.176 2021/10/26 11:29:24 nia Exp $ 1$NetBSD: distinfo,v 1.177 2021/11/10 10:55:08 adam Exp $
2 2
3BLAKE2s (curl-7.79.1.tar.xz) = 98c4e52926f4903a3252bfc4a8c49e933bf95f29a75294fe64decf48d6bafe39 3BLAKE2s (curl-7.80.0.tar.xz) = 9ed20221204d08ee1f4b038b28d32ac817d85cc6be3fbb1b248cee75459d469a
4SHA512 (curl-7.79.1.tar.xz) = 1edb71647a7f4dbb070baf1a019b4751aefeda793ff523c504410bb5cc74e5bffc52f20dd889697d1585f9ca3c4e81b1a9caadd182c30c8358ffd25f33e4db4d 4SHA512 (curl-7.80.0.tar.xz) = e04ddd74b0d5b3607a29bcf5d379d83a01c7dffa4ad3e2f25d8c85a3df7dbdb0625b0df1f04f02351695674502828e0e17e8b46c889cbf1e43f86d6e6dd716ab
5Size (curl-7.79.1.tar.xz) = 2465212 bytes 5Size (curl-7.80.0.tar.xz) = 2474492 bytes
6SHA1 (patch-configure) = 89400a8a1a83b49d70de23d34794ecaeeb8b8c62 6SHA1 (patch-configure) = 898732721ea9c76ec8729c711eba018f6c88ff6c
7SHA1 (patch-curl-config.in) = a58c777fc1a0a087776e62ed2e2a1e0a339716df 7SHA1 (patch-curl-config.in) = a58c777fc1a0a087776e62ed2e2a1e0a339716df

cvs diff -r1.12 -r1.13 pkgsrc/www/curl/patches/patch-configure (expand / switch to unified diff)

--- pkgsrc/www/curl/patches/patch-configure 2021/09/15 06:26:01 1.12
+++ pkgsrc/www/curl/patches/patch-configure 2021/11/10 10:55:08 1.13
@@ -1,158 +1,145 @@ @@ -1,158 +1,145 @@
1$NetBSD: patch-configure,v 1.12 2021/09/15 06:26:01 wiz Exp $ 1$NetBSD: patch-configure,v 1.13 2021/11/10 10:55:08 adam Exp $
2 2
3- Builtin krb5-config in platforms such as solaris do not support 3- Builtin krb5-config in platforms such as solaris do not support
4 the gssapi option, and need an explicit -lgss 4 the gssapi option, and need an explicit -lgss
5- On Darwin, do not append custom CFLAGS. 5- On Darwin, do not append custom CFLAGS.
6- Do not strip debug flags. 6- Do not strip debug flags.
7- Support Minix. 7- Support Minix.
8 8
9--- configure.orig 2021-09-13 14:46:32.000000000 +0000 9--- configure.orig 2021-11-09 08:16:06.000000000 +0000
10+++ configure 10+++ configure
11@@ -4253,6 +4253,7 @@ printf "%s\n" "$as_me: $xc_bad_var_msg l 11@@ -4243,6 +4243,7 @@ printf "%s\n" "$as_me: $xc_bad_var_msg l
12 ;; 12 ;;
13 esac 13 esac
14 done 14 done
15+ xc_bad_var_cflags=no 15+ xc_bad_var_cflags=no
16 if test $xc_bad_var_cflags = yes; then 16 if test $xc_bad_var_cflags = yes; then
17 { printf "%s\n" "$as_me:${as_lineno-$LINENO}: using CFLAGS: $CFLAGS" >&5 17 { printf "%s\n" "$as_me:${as_lineno-$LINENO}: using CFLAGS: $CFLAGS" >&5
18 printf "%s\n" "$as_me: using CFLAGS: $CFLAGS" >&6;} 18 printf "%s\n" "$as_me: using CFLAGS: $CFLAGS" >&6;}
19@@ -8633,7 +8634,7 @@ else $as_nop 19@@ -8623,7 +8624,7 @@ else $as_nop
20 lt_cv_sys_max_cmd_len=8192; 20 lt_cv_sys_max_cmd_len=8192;
21 ;; 21 ;;
22  22
23- bitrig* | darwin* | dragonfly* | freebsd* | netbsd* | openbsd*) 23- bitrig* | darwin* | dragonfly* | freebsd* | netbsd* | openbsd*)
24+ bitrig* | darwin* | dragonfly* | freebsd* | minix* | netbsd* | openbsd*) 24+ bitrig* | darwin* | dragonfly* | freebsd* | minix* | netbsd* | openbsd*)
25 # This has been around since 386BSD, at least. Likely further. 25 # This has been around since 386BSD, at least. Likely further.
26 if test -x /sbin/sysctl; then 26 if test -x /sbin/sysctl; then
27 lt_cv_sys_max_cmd_len=`/sbin/sysctl -n kern.argmax` 27 lt_cv_sys_max_cmd_len=`/sbin/sysctl -n kern.argmax`
28@@ -9113,12 +9114,8 @@ linux* | k*bsd*-gnu | kopensolaris*-gnu  28@@ -9103,12 +9104,8 @@ linux* | k*bsd*-gnu | kopensolaris*-gnu
29 lt_cv_deplibs_check_method=pass_all 29 lt_cv_deplibs_check_method=pass_all
30 ;; 30 ;;
31  31
32-netbsd* | netbsdelf*-gnu) 32-netbsd* | netbsdelf*-gnu)
33- if echo __ELF__ | $CC -E - | $GREP __ELF__ > /dev/null; then 33- if echo __ELF__ | $CC -E - | $GREP __ELF__ > /dev/null; then
34- lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so\.[0-9]+\.[0-9]+|_pic\.a)$' 34- lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so\.[0-9]+\.[0-9]+|_pic\.a)$'
35- else 35- else
36- lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so|_pic\.a)$' 36- lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so|_pic\.a)$'
37- fi 37- fi
38+netbsd* | netbsdelf*-gnu | minix*) 38+netbsd* | netbsdelf*-gnu | minix*)
39+ lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so|_pic\.a)$' 39+ lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so|_pic\.a)$'
40 ;; 40 ;;
41  41
42 newos6*) 42 newos6*)
43@@ -13384,14 +13381,13 @@ _LT_EOF 43@@ -13374,14 +13371,13 @@ _LT_EOF
44 fi 44 fi
45 ;; 45 ;;
46  46
47- netbsd* | netbsdelf*-gnu) 47- netbsd* | netbsdelf*-gnu)
48- if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then 48- if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then
49- archive_cmds='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib' 49- archive_cmds='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
50- wlarc= 50- wlarc=
51- else 51- else
52- archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib' 52- archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib'
53- archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname $wl-retain-symbols-file $wl$export_symbols -o $lib' 53- archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname $wl-retain-symbols-file $wl$export_symbols -o $lib'
54- fi 54- fi
55+ netbsd* | netbsdelf*-gnu | minix*) 55+ netbsd* | netbsdelf*-gnu | minix*)
56+ archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' 56+ archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
57+ archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' 57+ archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
58+ hardcode_libdir_flag_spec='${wl}-rpath,$libdir' 58+ hardcode_libdir_flag_spec='${wl}-rpath,$libdir'
59+ hardcode_direct=yes 59+ hardcode_direct=yes
60+ hardcode_shlibpath_var=no 60+ hardcode_shlibpath_var=no
61+ output_verbose_link_cmd=func_echo_all 61+ output_verbose_link_cmd=func_echo_all
62 ;; 62 ;;
63  63
64 solaris*) 64 solaris*)
65@@ -14081,15 +14077,13 @@ printf "%s\n" "$lt_cv_irix_exported_symb 65@@ -14071,15 +14067,13 @@ printf "%s\n" "$lt_cv_irix_exported_symb
66 esac 66 esac
67 ;; 67 ;;
68  68
69- netbsd* | netbsdelf*-gnu) 69- netbsd* | netbsdelf*-gnu)
70- if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then 70- if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then
71- archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' # a.out 71- archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' # a.out
72- else 72- else
73- archive_cmds='$LD -shared -o $lib $libobjs $deplibs $linker_flags' # ELF 73- archive_cmds='$LD -shared -o $lib $libobjs $deplibs $linker_flags' # ELF
74- fi 74- fi
75- hardcode_libdir_flag_spec='-R$libdir' 75- hardcode_libdir_flag_spec='-R$libdir'
76+ netbsd* | netbsdelf*-gnu | minix*) 76+ netbsd* | netbsdelf*-gnu | minix*)
77+ archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' 77+ archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
78+ archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' 78+ archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
79+ hardcode_libdir_flag_spec='${wl}-rpath,$libdir' 79+ hardcode_libdir_flag_spec='${wl}-rpath,$libdir'
80 hardcode_direct=yes 80 hardcode_direct=yes
81 hardcode_shlibpath_var=no 81 hardcode_shlibpath_var=no
82+ output_verbose_link_cmd=func_echo_all 82+ output_verbose_link_cmd=func_echo_all
83 ;; 83 ;;
84  84
85 newsos6) 85 newsos6)
86@@ -15199,6 +15193,18 @@ fi 86@@ -15189,6 +15183,18 @@ fi
87 dynamic_linker='GNU/Linux ld.so' 87 dynamic_linker='GNU/Linux ld.so'
88 ;; 88 ;;
89  89
90+minix*) 90+minix*)
91+ version_type=linux 91+ version_type=linux
92+ need_lib_prefix=no 92+ need_lib_prefix=no
93+ need_version=no 93+ need_version=no
94+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}' 94+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
95+ soname_spec='${libname}${release}${shared_ext}$major' 95+ soname_spec='${libname}${release}${shared_ext}$major'
96+ dynamic_linker='Minix ld.elf_so' 96+ dynamic_linker='Minix ld.elf_so'
97+ shlibpath_var=LD_LIBRARY_PATH 97+ shlibpath_var=LD_LIBRARY_PATH
98+ shlibpath_overrides_runpath=yes 98+ shlibpath_overrides_runpath=yes
99+ hardcode_into_libs=yes 99+ hardcode_into_libs=yes
100+ ;; 100+ ;;
101+ 101+
102 netbsdelf*-gnu) 102 netbsdelf*-gnu)
103 version_type=linux 103 version_type=linux
104 need_lib_prefix=no 104 need_lib_prefix=no
105@@ -17759,7 +17765,7 @@ squeeze() { 105@@ -17749,7 +17755,7 @@ squeeze() {
106  106
107  107
108 # 108 #
109- if test "$compiler_id" != "unknown"; then 109- if test "$compiler_id" != "unknown"; then
110+ if false; then 110+ if false; then
111 # 111 #
112 tmp_save_CPPFLAGS="$CPPFLAGS" 112 tmp_save_CPPFLAGS="$CPPFLAGS"
113 tmp_save_CFLAGS="$CFLAGS" 113 tmp_save_CFLAGS="$CFLAGS"
114@@ -18014,13 +18020,6 @@ printf %s "checking if compiler accepts  114@@ -18004,13 +18010,6 @@ printf %s "checking if compiler accepts
115 tmp_options="$flags_dbg_yes" 115 tmp_options="$flags_dbg_yes"
116 fi 116 fi
117 # 117 #
118- if test "$flags_prefer_cppflags" = "yes"; then 118- if test "$flags_prefer_cppflags" = "yes"; then
119- CPPFLAGS="$tmp_CPPFLAGS $tmp_options" 119- CPPFLAGS="$tmp_CPPFLAGS $tmp_options"
120- CFLAGS="$tmp_CFLAGS" 120- CFLAGS="$tmp_CFLAGS"
121- else 121- else
122- CPPFLAGS="$tmp_CPPFLAGS" 122- CPPFLAGS="$tmp_CPPFLAGS"
123- CFLAGS="$tmp_CFLAGS $tmp_options" 123- CFLAGS="$tmp_CFLAGS $tmp_options"
124- fi 124- fi
125 squeeze CPPFLAGS 125 squeeze CPPFLAGS
126 squeeze CFLAGS 126 squeeze CFLAGS
127 fi 127 fi
128@@ -20734,7 +20733,7 @@ printf "%s\n" "no" >&6; } 128@@ -20667,7 +20666,7 @@ printf "%s\n" "no" >&6; }
129 tst_cflags="no" 129 tst_cflags="no"
130 case $host_os in 130 case $host_os in
131 darwin*) 131 darwin*)
132- tst_cflags="yes" 132- tst_cflags="yes"
133+ tst_cflags="no" 133+ tst_cflags="no"
134 ;; 134 ;;
135 esac 135 esac
136  136
137@@ -24428,7 +24427,11 @@ printf "%s\n" "yes" >&6; } 137@@ -24729,7 +24728,7 @@ printf "%s\n" "found" >&6; }
138 if test -n "$host_alias" -a -f "$GSSAPI_ROOT/bin/$host_alias-krb5-config"; then 
139 GSSAPI_INCS=`$GSSAPI_ROOT/bin/$host_alias-krb5-config --cflags gssapi` 
140 elif test -f "$KRB5CONFIG"; then 
141- GSSAPI_INCS=`$KRB5CONFIG --cflags gssapi` 
142+ if `$KRB5CONFIG --cflags gssapi` 2>&1 | grep "Unknown option" >/dev/null; then 
143+ GSSAPI_INCS=`$KRB5CONFIG --cflags` 
144+ else 
145+ GSSAPI_INCS=`$KRB5CONFIG --cflags gssapi` 
146+ fi 
147 elif test "$GSSAPI_ROOT" != "yes"; then 
148 GSSAPI_INCS="-I$GSSAPI_ROOT/include" 
149 fi 
150@@ -24600,7 +24603,7 @@ printf "%s\n" "#define HAVE_GSSAPI 1" >> 
151 LIBS="-lgss $LIBS" 138 LIBS="-lgss $LIBS"
152 ;; 139 ;;
153 *) 140 *)
154- LIBS="-lgssapi $LIBS" 141- LIBS="-lgssapi $LIBS"
155+ LIBS="-lgssapi -lkrb5 $LIBS" 142+ LIBS="-lgssapi -lkrb5 $LIBS"
156 ;; 143 ;;
157 esac 144 esac
158 fi 145 fi