curl: Update to 7.67.0 Changes: 7.67.0 ------ This release includes the following changes: o curl: added --no-progress-meter o setopt: CURLMOPT_MAX_CONCURRENT_STREAMS is new o urlapi: CURLU_NO_AUTHORITY allows empty authority/host part This release includes the following bugfixes: o BINDINGS: five new bindings addded o CURLOPT_TIMEOUT.3: Clarify transfer timeout time includes queue time o CURLOPT_TIMEOUT.3: remove the mention of "minutes" o ESNI: initial build/setup support o FTP: FTPFILE_NOCWD: avoid redundant CWDs o FTP: allow "rubbish" prepended to the SIZE response o FTP: remove trailing slash from path for LIST/MLSD o FTP: skip CWD to entry dir when target is absolute o FTP: url-decode path before evaluation o HTTP3.md: move -p for mkdir, remove -j for make o HTTP3: fix invalid use of sendto for connected UDP socket o HTTP3: fix ngtcp2 Windows build o HTTP3: fix prefix parameter for ngtcp2 build o HTTP3: fix typo somehere1 > somewhere1 o HTTP3: show an --alt-svc using example too o INSTALL: add missing space for configure commands o INSTALL: add vcpkg installation instructions o README: minor grammar fix o altsvc: accept quoted ma and persist values o altsvc: both backends run h3-23 now o appveyor: Add MSVC ARM64 build o appveyor: Use two parallel compilation on appveyor with CMake o appveyor: add --disable-proxy autotools build o appveyor: add 32-bit MinGW-w64 build o appveyor: add a winbuild o appveyor: add a winbuild that uses VS2017 o appveyor: make winbuilds with DEBUG=no/yes and VS 2015/2017 o appveyor: publish artifacts on appveyor o appveyor: upgrade VS2017 to VS2019 o asyn-thread: make use of Curl_socketpair() where available o asyn-thread: s/AF_LOCAL/AF_UNIX for Solaris o build: Remove unused HAVE_LIBSSL and HAVE_LIBCRYPTO defines o checksrc: fix uninitialized variable warning o chunked-encoding: stop hiding the CURLE_BAD_CONTENT_ENCODING error o cirrus: Increase the git clone depth o cirrus: Switch the FreeBSD 11.x build to 11.3 and add a 13.0 build o cirrus: switch off blackhole status on the freebsd CI machines o cleanups: 21 various PVS-Studio warnings o configure: only say ipv6 enabled when the variable is set o configure: remove all cyassl references o conn-reuse: requests wanting NTLM can reuse non-NTLM connections o connect: return CURLE_OPERATION_TIMEDOUT for errno == ETIMEDOUT o connect: silence sign-compare warning o cookie: avoid harmless use after free o cookie: pass in the correct cookie amount to qsort() o cookies: change argument type for Curl_flush_cookies o cookies: using a share with cookies shouldn't enable the cookie engine o copyrights: update copyright notices to 2019 o curl: create easy handles on-demand and not ahead of time o curl: ensure HTTP 429 triggers --retry o curl: exit the create_transfers loop on errors o curl: fix memory leaked by parse_metalink() o curl: load large files with -d @ much faster o docs/HTTP3: fix `--with-ssl` ngtcp2 configure flag o docs: added multi-event.c example o docs: disambiguate CURLUPART_HOST is for host name (ie no port) o docs: note on failed handles not being counted by curl_multi_perform o doh: allow only http and https in debug mode o doh: avoid truncating DNS QTYPE to lower octet o doh: clean up dangling DOH memory on easy close o doh: fix (harmless) buffer overrun o doh: fix undefined behaviour and open up for gcc and clang optimization o doh: return early if there is no time left o examples/sslbackend: fix -Wchar-subscripts warning o examples: remove the "this exact code has not been verified" o git: add tests/server/disabled to .gitignore o gnutls: make gnutls_bye() not wait for response on shutdown o http2: expire a timeout at end of stream o http2: prevent dup'ed handles to send dummy PRIORITY frames o http2: relax verification of :authority in push promise requests o http2_recv: a closed stream trumps pause state o http: lowercase headernames for HTTP/2 and HTTP/3 o ldap: Stop using wide char version of ldapp_err2string o ldap: fix OOM error on missing query string o mbedtls: add error message for cert validity starting in the future o mime: when disabled, avoid C99 macro o ngtcp2: adapt to API change o ngtcp2: compile with latest ngtcp2 + nghttp3 draft-23 o ngtcp2: remove fprintf() calls o openssl: close_notify on the FTP data connection doesn't mean closure o openssl: fix compiler warning with LibreSSL o openssl: use strerror on SSL_ERROR_SYSCALL o os400: getpeername() and getsockname() return ebcdic AF_UNIX sockaddr o parsedate: fix date parsing disabled builds o quiche: don't close connection at end of stream o quiche: persist connection details (fixes -I with --http3) o quiche: set 'drain' when returning without having drained the queues o quiche: update HTTP/3 config creation to new API o redirect: handle redirects to absolute URLs containing spaces o runtests: get textaware info from curl instead of perl o schannel: reverse the order of certinfo insertions o schannel_verify: Fix concurrent openings of CA file o security: silence conversion warning o setopt: handle ALTSVC set to NULL o setopt: make it easier to add new enum values o setopt: store CURLOPT_RTSP_SERVER_CSEQ correctly o smb: check for full size message before reading message details o smbserver: fix Python 3 compatibility o socks: Fix destination host shown on SOCKS5 error o test1162: disable MSYS2's POSIX path conversion o test1591: fix spelling of http feature o tests: add `connect to non-listen` keywords o tests: fix narrowing conversion warnings o tests: fix the test 3001 cert failures o tests: makes tests succeed when using --disable-proxy o tests: use %FILE_PWD for file:// URLs o tests: use port 2 instead of 60000 for a safer non-listening port o tool_operate: Fix retry sleep time shown to user when Retry-After o travis: Add an ARM64 build o url: Curl_free_request_state() should also free doh handles o url: don't set appconnect time for non-ssl/non-ssh connections o url: fix the NULL hostname compiler warning o url: normalize CURLINFO_EFFECTIVE_URL o url: only reuse TLS connections with matching pinning o urlapi: avoid index underflow for short ipv6 hostnames o urlapi: fix URL encoding when setting a full URL o urlapi: fix unused variable warning o urlapi: question mark within fragment is still fragment o urldata: use 'bool' for the bit type on MSVC compilers o vtls: Fix comment typo about macosx-version-min compiler flag o vtls: fix narrowing conversion warnings o winbuild/MakefileBuild.vc: Add vssh o winbuild/MakefileBuild.vc: Fix line endings o winbuild: Add manifest to curl.exe for proper OS version detection o winbuild: add ENABLE_UNICODE optiondiff -r1.218 -r1.219 pkgsrc/www/curl/Makefile
(leot)
@@ -1,17 +1,16 @@ | @@ -1,17 +1,16 @@ | |||
1 | # $NetBSD: Makefile,v 1.218 2019/09/18 07:21:08 adam Exp $ | 1 | # $NetBSD: Makefile,v 1.219 2019/11/06 09:17:29 leot Exp $ | |
2 | 2 | |||
3 | DISTNAME= curl-7.66.0 | 3 | DISTNAME= curl-7.67.0 | |
4 | PKGREVISION= 1 | |||
5 | CATEGORIES= www | 4 | CATEGORIES= www | |
6 | MASTER_SITES= https://curl.haxx.se/download/ | 5 | MASTER_SITES= https://curl.haxx.se/download/ | |
7 | EXTRACT_SUFX= .tar.xz | 6 | EXTRACT_SUFX= .tar.xz | |
8 | 7 | |||
9 | MAINTAINER= leot@NetBSD.org | 8 | MAINTAINER= leot@NetBSD.org | |
10 | HOMEPAGE= https://curl.haxx.se/ | 9 | HOMEPAGE= https://curl.haxx.se/ | |
11 | COMMENT= Client that groks URLs | 10 | COMMENT= Client that groks URLs | |
12 | # not completely, but near enough | 11 | # not completely, but near enough | |
13 | LICENSE= mit | 12 | LICENSE= mit | |
14 | 13 | |||
15 | BUILD_DEFS+= IPV6_READY | 14 | BUILD_DEFS+= IPV6_READY | |
16 | 15 | |||
17 | USE_TOOLS+= nroff perl | 16 | USE_TOOLS+= nroff perl |
@@ -1,14 +1,14 @@ | @@ -1,14 +1,14 @@ | |||
1 | @comment $NetBSD: PLIST,v 1.76 2019/09/11 08:32:03 leot Exp $ | 1 | @comment $NetBSD: PLIST,v 1.77 2019/11/06 09:17:29 leot Exp $ | |
2 | bin/curl | 2 | bin/curl | |
3 | bin/curl-config | 3 | bin/curl-config | |
4 | include/curl/curl.h | 4 | include/curl/curl.h | |
5 | include/curl/curlver.h | 5 | include/curl/curlver.h | |
6 | include/curl/easy.h | 6 | include/curl/easy.h | |
7 | include/curl/mprintf.h | 7 | include/curl/mprintf.h | |
8 | include/curl/multi.h | 8 | include/curl/multi.h | |
9 | include/curl/stdcheaders.h | 9 | include/curl/stdcheaders.h | |
10 | include/curl/system.h | 10 | include/curl/system.h | |
11 | include/curl/typecheck-gcc.h | 11 | include/curl/typecheck-gcc.h | |
12 | include/curl/urlapi.h | 12 | include/curl/urlapi.h | |
13 | lib/libcurl.la | 13 | lib/libcurl.la | |
14 | lib/pkgconfig/libcurl.pc | 14 | lib/pkgconfig/libcurl.pc | |
@@ -71,26 +71,27 @@ man/man3/CURLINFO_SPEED_DOWNLOAD_T.3 | @@ -71,26 +71,27 @@ man/man3/CURLINFO_SPEED_DOWNLOAD_T.3 | |||
71 | man/man3/CURLINFO_SPEED_UPLOAD.3 | 71 | man/man3/CURLINFO_SPEED_UPLOAD.3 | |
72 | man/man3/CURLINFO_SPEED_UPLOAD_T.3 | 72 | man/man3/CURLINFO_SPEED_UPLOAD_T.3 | |
73 | man/man3/CURLINFO_SSL_ENGINES.3 | 73 | man/man3/CURLINFO_SSL_ENGINES.3 | |
74 | man/man3/CURLINFO_SSL_VERIFYRESULT.3 | 74 | man/man3/CURLINFO_SSL_VERIFYRESULT.3 | |
75 | man/man3/CURLINFO_STARTTRANSFER_TIME.3 | 75 | man/man3/CURLINFO_STARTTRANSFER_TIME.3 | |
76 | man/man3/CURLINFO_STARTTRANSFER_TIME_T.3 | 76 | man/man3/CURLINFO_STARTTRANSFER_TIME_T.3 | |
77 | man/man3/CURLINFO_TLS_SESSION.3 | 77 | man/man3/CURLINFO_TLS_SESSION.3 | |
78 | man/man3/CURLINFO_TLS_SSL_PTR.3 | 78 | man/man3/CURLINFO_TLS_SSL_PTR.3 | |
79 | man/man3/CURLINFO_TOTAL_TIME.3 | 79 | man/man3/CURLINFO_TOTAL_TIME.3 | |
80 | man/man3/CURLINFO_TOTAL_TIME_T.3 | 80 | man/man3/CURLINFO_TOTAL_TIME_T.3 | |
81 | man/man3/CURLMOPT_CHUNK_LENGTH_PENALTY_SIZE.3 | 81 | man/man3/CURLMOPT_CHUNK_LENGTH_PENALTY_SIZE.3 | |
82 | man/man3/CURLMOPT_CONTENT_LENGTH_PENALTY_SIZE.3 | 82 | man/man3/CURLMOPT_CONTENT_LENGTH_PENALTY_SIZE.3 | |
83 | man/man3/CURLMOPT_MAXCONNECTS.3 | 83 | man/man3/CURLMOPT_MAXCONNECTS.3 | |
84 | man/man3/CURLMOPT_MAX_CONCURRENT_STREAMS.3 | |||
84 | man/man3/CURLMOPT_MAX_HOST_CONNECTIONS.3 | 85 | man/man3/CURLMOPT_MAX_HOST_CONNECTIONS.3 | |
85 | man/man3/CURLMOPT_MAX_PIPELINE_LENGTH.3 | 86 | man/man3/CURLMOPT_MAX_PIPELINE_LENGTH.3 | |
86 | man/man3/CURLMOPT_MAX_TOTAL_CONNECTIONS.3 | 87 | man/man3/CURLMOPT_MAX_TOTAL_CONNECTIONS.3 | |
87 | man/man3/CURLMOPT_PIPELINING.3 | 88 | man/man3/CURLMOPT_PIPELINING.3 | |
88 | man/man3/CURLMOPT_PIPELINING_SERVER_BL.3 | 89 | man/man3/CURLMOPT_PIPELINING_SERVER_BL.3 | |
89 | man/man3/CURLMOPT_PIPELINING_SITE_BL.3 | 90 | man/man3/CURLMOPT_PIPELINING_SITE_BL.3 | |
90 | man/man3/CURLMOPT_PUSHDATA.3 | 91 | man/man3/CURLMOPT_PUSHDATA.3 | |
91 | man/man3/CURLMOPT_PUSHFUNCTION.3 | 92 | man/man3/CURLMOPT_PUSHFUNCTION.3 | |
92 | man/man3/CURLMOPT_SOCKETDATA.3 | 93 | man/man3/CURLMOPT_SOCKETDATA.3 | |
93 | man/man3/CURLMOPT_SOCKETFUNCTION.3 | 94 | man/man3/CURLMOPT_SOCKETFUNCTION.3 | |
94 | man/man3/CURLMOPT_TIMERDATA.3 | 95 | man/man3/CURLMOPT_TIMERDATA.3 | |
95 | man/man3/CURLMOPT_TIMERFUNCTION.3 | 96 | man/man3/CURLMOPT_TIMERFUNCTION.3 | |
96 | man/man3/CURLOPT_ABSTRACT_UNIX_SOCKET.3 | 97 | man/man3/CURLOPT_ABSTRACT_UNIX_SOCKET.3 |
@@ -1,8 +1,8 @@ | @@ -1,8 +1,8 @@ | |||
1 | $NetBSD: distinfo,v 1.157 2019/09/11 08:32:03 leot Exp $ | 1 | $NetBSD: distinfo,v 1.158 2019/11/06 09:17:29 leot Exp $ | |
2 | 2 | |||
3 | SHA1 (curl-7.66.0.tar.xz) = c4b5137302c74839bfa2211da72d960d0d5fedba | 3 | SHA1 (curl-7.67.0.tar.xz) = 61ddc68157c2cd1e2c2461b3fbdc0b24083c2e68 | |
4 | RMD160 (curl-7.66.0.tar.xz) = 24b4a7432d117efcca0c1de95fb4797dcf186216 | 4 | RMD160 (curl-7.67.0.tar.xz) = f9db855e7f76abeac1eeeb9ebc37b2b116be77f2 | |
5 | SHA512 (curl-7.66.0.tar.xz) = 81170e7e4fa9d99ee2038d96d7f2ab10dcf52435331c818c7565c1a733891720f845a08029915e52ba532c6a344c346e1678474624aac1cc333aea6d1eacde35 | 5 | SHA512 (curl-7.67.0.tar.xz) = 1d5a344be92dd61b1ba5189eff0fe337e492f2e850794943570fe71c985d0af60bd412082be646e07aaa8639908593e1ce4bb2d07db35394ec377e8ce8b9ae29 | |
6 | Size (curl-7.66.0.tar.xz) = 2414840 bytes | 6 | Size (curl-7.67.0.tar.xz) = 2418548 bytes | |
7 | SHA1 (patch-configure) = 9131ad23999f3987b7b67a59191aa6998bd370d0 | 7 | SHA1 (patch-configure) = 584c39ee826686c570bcf560c18292570cc76ab1 | |
8 | SHA1 (patch-curl-config.in) = 363359665985cc14f36ddf47fc3480f1200e3533 | 8 | SHA1 (patch-curl-config.in) = 363359665985cc14f36ddf47fc3480f1200e3533 |
@@ -1,158 +1,177 @@ | @@ -1,158 +1,177 @@ | |||
1 | $NetBSD: patch-configure,v 1.7 2019/05/22 09:00:48 leot Exp $ | 1 | $NetBSD: patch-configure,v 1.8 2019/11/06 09:17:29 leot 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 | - Avoid unportable `==' test(1) operator. | |||
8 | 9 | |||
9 | --- configure.orig 2019-03-25 21:03:50.000000000 +0000 | 10 | --- configure.orig 2019-11-06 06:38:18.000000000 +0000 | |
10 | +++ configure | 11 | +++ configure | |
11 | @@ -3746,6 +3746,7 @@ $as_echo "$as_me: $xc_bad_var_msg librar | 12 | @@ -3806,6 +3806,7 @@ $as_echo "$as_me: $xc_bad_var_msg librar | |
12 | ;; | 13 | ;; | |
13 | esac | 14 | esac | |
14 | done | 15 | done | |
15 | + xc_bad_var_cflags=no | 16 | + xc_bad_var_cflags=no | |
16 | if test $xc_bad_var_cflags = yes; then | 17 | if test $xc_bad_var_cflags = yes; then | |
17 | { $as_echo "$as_me:${as_lineno-$LINENO}: using CFLAGS: $CFLAGS" >&5 | 18 | { $as_echo "$as_me:${as_lineno-$LINENO}: using CFLAGS: $CFLAGS" >&5 | |
18 | $as_echo "$as_me: using CFLAGS: $CFLAGS" >&6;} | 19 | $as_echo "$as_me: using CFLAGS: $CFLAGS" >&6;} | |
19 | @@ -7881,7 +7882,7 @@ else | 20 | @@ -7939,7 +7940,7 @@ else | |
20 | lt_cv_sys_max_cmd_len=8192; | 21 | lt_cv_sys_max_cmd_len=8192; | |
21 | ;; | 22 | ;; | |
22 | 23 | |||
23 | - bitrig* | darwin* | dragonfly* | freebsd* | netbsd* | openbsd*) | 24 | - bitrig* | darwin* | dragonfly* | freebsd* | netbsd* | openbsd*) | |
24 | + bitrig* | darwin* | dragonfly* | freebsd* | minix* | netbsd* | openbsd*) | 25 | + bitrig* | darwin* | dragonfly* | freebsd* | minix* | netbsd* | openbsd*) | |
25 | # This has been around since 386BSD, at least. Likely further. | 26 | # This has been around since 386BSD, at least. Likely further. | |
26 | if test -x /sbin/sysctl; then | 27 | if test -x /sbin/sysctl; then | |
27 | lt_cv_sys_max_cmd_len=`/sbin/sysctl -n kern.argmax` | 28 | lt_cv_sys_max_cmd_len=`/sbin/sysctl -n kern.argmax` | |
28 | @@ -8347,12 +8348,8 @@ linux* | k*bsd*-gnu | kopensolaris*-gnu | 29 | @@ -8405,12 +8406,8 @@ linux* | k*bsd*-gnu | kopensolaris*-gnu | |
29 | lt_cv_deplibs_check_method=pass_all | 30 | lt_cv_deplibs_check_method=pass_all | |
30 | ;; | 31 | ;; | |
31 | 32 | |||
32 | -netbsd* | netbsdelf*-gnu) | 33 | -netbsd* | netbsdelf*-gnu) | |
33 | - if echo __ELF__ | $CC -E - | $GREP __ELF__ > /dev/null; then | 34 | - 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)$' | 35 | - lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so\.[0-9]+\.[0-9]+|_pic\.a)$' | |
35 | - else | 36 | - else | |
36 | - lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so|_pic\.a)$' | 37 | - lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so|_pic\.a)$' | |
37 | - fi | 38 | - fi | |
38 | +netbsd* | netbsdelf*-gnu | minix*) | 39 | +netbsd* | netbsdelf*-gnu | minix*) | |
39 | + lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so|_pic\.a)$' | 40 | + lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so|_pic\.a)$' | |
40 | ;; | 41 | ;; | |
41 | 42 | |||
42 | newos6*) | 43 | newos6*) | |
43 | @@ -12559,14 +12556,13 @@ _LT_EOF | 44 | @@ -12617,14 +12614,13 @@ _LT_EOF | |
44 | fi | 45 | fi | |
45 | ;; | 46 | ;; | |
46 | 47 | |||
47 | - netbsd* | netbsdelf*-gnu) | 48 | - netbsd* | netbsdelf*-gnu) | |
48 | - if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then | 49 | - if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then | |
49 | - archive_cmds='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib' | 50 | - archive_cmds='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib' | |
50 | - wlarc= | 51 | - wlarc= | |
51 | - else | 52 | - else | |
52 | - archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib' | 53 | - 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' | 54 | - 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 | 55 | - fi | |
55 | + netbsd* | netbsdelf*-gnu | minix*) | 56 | + netbsd* | netbsdelf*-gnu | minix*) | |
56 | + archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' | 57 | + 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' | 58 | + 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' | 59 | + hardcode_libdir_flag_spec='${wl}-rpath,$libdir' | |
59 | + hardcode_direct=yes | 60 | + hardcode_direct=yes | |
60 | + hardcode_shlibpath_var=no | 61 | + hardcode_shlibpath_var=no | |
61 | + output_verbose_link_cmd=func_echo_all | 62 | + output_verbose_link_cmd=func_echo_all | |
62 | ;; | 63 | ;; | |
63 | 64 | |||
64 | solaris*) | 65 | solaris*) | |
65 | @@ -13249,15 +13245,13 @@ $as_echo "$lt_cv_irix_exported_symbol" > | 66 | @@ -13307,15 +13303,13 @@ $as_echo "$lt_cv_irix_exported_symbol" > | |
66 | esac | 67 | esac | |
67 | ;; | 68 | ;; | |
68 | 69 | |||
69 | - netbsd* | netbsdelf*-gnu) | 70 | - netbsd* | netbsdelf*-gnu) | |
70 | - if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then | 71 | - if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then | |
71 | - archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' # a.out | 72 | - archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' # a.out | |
72 | - else | 73 | - else | |
73 | - archive_cmds='$LD -shared -o $lib $libobjs $deplibs $linker_flags' # ELF | 74 | - archive_cmds='$LD -shared -o $lib $libobjs $deplibs $linker_flags' # ELF | |
74 | - fi | 75 | - fi | |
75 | - hardcode_libdir_flag_spec='-R$libdir' | 76 | - hardcode_libdir_flag_spec='-R$libdir' | |
76 | + netbsd* | netbsdelf*-gnu | minix*) | 77 | + netbsd* | netbsdelf*-gnu | minix*) | |
77 | + archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' | 78 | + 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' | 79 | + 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' | 80 | + hardcode_libdir_flag_spec='${wl}-rpath,$libdir' | |
80 | hardcode_direct=yes | 81 | hardcode_direct=yes | |
81 | hardcode_shlibpath_var=no | 82 | hardcode_shlibpath_var=no | |
82 | + output_verbose_link_cmd=func_echo_all | 83 | + output_verbose_link_cmd=func_echo_all | |
83 | ;; | 84 | ;; | |
84 | 85 | |||
85 | newsos6) | 86 | newsos6) | |
86 | @@ -14363,6 +14357,18 @@ fi | 87 | @@ -14421,6 +14415,18 @@ fi | |
87 | dynamic_linker='GNU/Linux ld.so' | 88 | dynamic_linker='GNU/Linux ld.so' | |
88 | ;; | 89 | ;; | |
89 | 90 | |||
90 | +minix*) | 91 | +minix*) | |
91 | + version_type=linux | 92 | + version_type=linux | |
92 | + need_lib_prefix=no | 93 | + need_lib_prefix=no | |
93 | + need_version=no | 94 | + need_version=no | |
94 | + library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}' | 95 | + library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}' | |
95 | + soname_spec='${libname}${release}${shared_ext}$major' | 96 | + soname_spec='${libname}${release}${shared_ext}$major' | |
96 | + dynamic_linker='Minix ld.elf_so' | 97 | + dynamic_linker='Minix ld.elf_so' | |
97 | + shlibpath_var=LD_LIBRARY_PATH | 98 | + shlibpath_var=LD_LIBRARY_PATH | |
98 | + shlibpath_overrides_runpath=yes | 99 | + shlibpath_overrides_runpath=yes | |
99 | + hardcode_into_libs=yes | 100 | + hardcode_into_libs=yes | |
100 | + ;; | 101 | + ;; | |
101 | + | 102 | + | |
102 | netbsdelf*-gnu) | 103 | netbsdelf*-gnu) | |
103 | version_type=linux | 104 | version_type=linux | |
104 | need_lib_prefix=no | 105 | need_lib_prefix=no | |
105 | @@ -16931,7 +16937,7 @@ squeeze() { | 106 | @@ -16989,7 +16995,7 @@ squeeze() { | |
106 | 107 | |||
107 | 108 | |||
108 | # | 109 | # | |
109 | - if test "$compiler_id" != "unknown"; then | 110 | - if test "$compiler_id" != "unknown"; then | |
110 | + if false; then | 111 | + if false; then | |
111 | # | 112 | # | |
112 | if test "$compiler_id" = "GNU_C" || | 113 | if test "$compiler_id" = "GNU_C" || | |
113 | test "$compiler_id" = "CLANG"; then | 114 | test "$compiler_id" = "CLANG"; then | |
114 | @@ -17259,13 +17265,6 @@ $as_echo_n "checking if compiler accepts | 115 | @@ -17317,13 +17323,6 @@ $as_echo_n "checking if compiler accepts | |
115 | tmp_options="$flags_dbg_off" | 116 | tmp_options="$flags_dbg_off" | |
116 | fi | 117 | fi | |
117 | # | 118 | # | |
118 | - if test "$flags_prefer_cppflags" = "yes"; then | 119 | - if test "$flags_prefer_cppflags" = "yes"; then | |
119 | - CPPFLAGS="$tmp_CPPFLAGS $tmp_options" | 120 | - CPPFLAGS="$tmp_CPPFLAGS $tmp_options" | |
120 | - CFLAGS="$tmp_CFLAGS" | 121 | - CFLAGS="$tmp_CFLAGS" | |
121 | - else | 122 | - else | |
122 | - CPPFLAGS="$tmp_CPPFLAGS" | 123 | - CPPFLAGS="$tmp_CPPFLAGS" | |
123 | - CFLAGS="$tmp_CFLAGS $tmp_options" | 124 | - CFLAGS="$tmp_CFLAGS $tmp_options" | |
124 | - fi | 125 | - fi | |
125 | squeeze CPPFLAGS | 126 | squeeze CPPFLAGS | |
126 | squeeze CFLAGS | 127 | squeeze CFLAGS | |
127 | 128 | |||
128 | @@ -18933,7 +18932,7 @@ $as_echo "no" >&6; } | 129 | @@ -18991,7 +18990,7 @@ $as_echo "no" >&6; } | |
129 | tst_cflags="no" | 130 | tst_cflags="no" | |
130 | case $host_os in | 131 | case $host_os in | |
131 | darwin*) | 132 | darwin*) | |
132 | - tst_cflags="yes" | 133 | - tst_cflags="yes" | |
133 | + tst_cflags="no" | 134 | + tst_cflags="no" | |
134 | ;; | 135 | ;; | |
135 | esac | 136 | esac | |
136 | 137 | |||
137 | @@ -21934,7 +21933,11 @@ $as_echo "yes" >&6; } | 138 | @@ -21988,7 +21987,11 @@ $as_echo "yes" >&6; } | |
138 | if test -n "$host_alias" -a -f "$GSSAPI_ROOT/bin/$host_alias-krb5-config"; then | 139 | 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 | GSSAPI_INCS=`$GSSAPI_ROOT/bin/$host_alias-krb5-config --cflags gssapi` | |
140 | elif test -f "$KRB5CONFIG"; then | 141 | elif test -f "$KRB5CONFIG"; then | |
141 | - GSSAPI_INCS=`$KRB5CONFIG --cflags gssapi` | 142 | - GSSAPI_INCS=`$KRB5CONFIG --cflags gssapi` | |
142 | + if `$KRB5CONFIG --cflags gssapi` 2>&1 | grep "Unknown option" >/dev/null; then | 143 | + if `$KRB5CONFIG --cflags gssapi` 2>&1 | grep "Unknown option" >/dev/null; then | |
143 | + GSSAPI_INCS=`$KRB5CONFIG --cflags` | 144 | + GSSAPI_INCS=`$KRB5CONFIG --cflags` | |
144 | + else | 145 | + else | |
145 | + GSSAPI_INCS=`$KRB5CONFIG --cflags gssapi` | 146 | + GSSAPI_INCS=`$KRB5CONFIG --cflags gssapi` | |
146 | + fi | 147 | + fi | |
147 | elif test "$GSSAPI_ROOT" != "yes"; then | 148 | elif test "$GSSAPI_ROOT" != "yes"; then | |
148 | GSSAPI_INCS="-I$GSSAPI_ROOT/include" | 149 | GSSAPI_INCS="-I$GSSAPI_ROOT/include" | |
149 | fi | 150 | fi | |
150 | @@ -22107,7 +22110,7 @@ $as_echo "#define HAVE_GSSAPI 1" >>confd | 151 | @@ -22161,7 +22164,7 @@ $as_echo "#define HAVE_GSSAPI 1" >>confd | |
151 | LIBS="-lgss $LIBS" | 152 | LIBS="-lgss $LIBS" | |
152 | ;; | 153 | ;; | |
153 | *) | 154 | *) | |
154 | - LIBS="-lgssapi $LIBS" | 155 | - LIBS="-lgssapi $LIBS" | |
155 | + LIBS="-lgssapi -lkrb5 $LIBS" | 156 | + LIBS="-lgssapi -lkrb5 $LIBS" | |
156 | ;; | 157 | ;; | |
157 | esac | 158 | esac | |
158 | fi | 159 | fi | |
160 | @@ -42524,7 +42527,7 @@ $as_echo_n "checking whether ESNI suppor | |||
161 | ESNI_ENABLED=0 | |||
162 | ESNI_SUPPORT='' | |||
163 | ||||
164 | - if test "x$OPENSSL_ENABLED" == "x1"; then | |||
165 | + if test "x$OPENSSL_ENABLED" = "x1"; then | |||
166 | for ac_func in SSL_get_esni_status | |||
167 | do : | |||
168 | ac_fn_c_check_func "$LINENO" "SSL_get_esni_status" "ac_cv_func_SSL_get_esni_status" | |||
169 | @@ -42540,7 +42543,7 @@ done | |||
170 | ||||
171 | fi | |||
172 | ||||
173 | - if test "x$ESNI_ENABLED" == "x1"; then | |||
174 | + if test "x$ESNI_ENABLED" = "x1"; then | |||
175 | ||||
176 | $as_echo "#define USE_ESNI 1" >>confdefs.h | |||
177 |