3fcddc835c
Viktor Szakats
2025-04-29
Subject
scripts: fix perl indentation, whitespace, semicolons
Binary
Architecture & Compiler Flags
—
Build Log
$ git checkout -f 3fcddc835caf6f5490751d18eb2bbc085319259b
Previous HEAD position was d33b449271 CURLOPT_XFERINFOFUNCTION.md: fix the callback return type in example
HEAD is now at 3fcddc835c scripts: fix perl indentation, whitespace, semicolons
$ git clean -fdx
Removing Makefile
Removing Makefile.in
Removing aclocal.m4
Removing autom4te.cache/
Removing buildinfo.txt
Removing compile
Removing config.guess
Removing config.log
Removing config.status
Removing config.sub
Removing configure
Removing curl-config
Removing depcomp
Removing docs/Makefile
Removing docs/Makefile.in
Removing docs/cmdline-opts/Makefile
Removing docs/cmdline-opts/Makefile.in
Removing docs/examples/.deps/
Removing docs/examples/Makefile
Removing docs/examples/Makefile.in
Removing docs/libcurl/Makefile
Removing docs/libcurl/Makefile.in
Removing docs/libcurl/opts/Makefile
Removing docs/libcurl/opts/Makefile.in
Removing include/Makefile
Removing include/Makefile.in
Removing include/curl/Makefile
Removing include/curl/Makefile.in
Removing install-sh
Removing lib/.deps/
Removing lib/.dirstamp
Removing lib/.libs/
Removing lib/Makefile
Removing lib/Makefile.in
Removing lib/curl-base64.o
Removing lib/curl-curl_multibyte.o
Removing lib/curl-dynbuf.o
Removing lib/curl-nonblock.o
Removing lib/curl-strcase.o
Removing lib/curl-strparse.o
Removing lib/curl-timediff.o
Removing lib/curl-timeval.o
Removing lib/curl-version_win32.o
Removing lib/curl-warnless.o
Removing lib/curl_config.h
Removing lib/curl_config.h.in
Removing lib/libcurl.la
Removing lib/libcurl.vers
Removing lib/libcurl_la-altsvc.lo
Removing lib/libcurl_la-altsvc.o
Removing lib/libcurl_la-amigaos.lo
Removing lib/libcurl_la-amigaos.o
Removing lib/libcurl_la-asyn-ares.lo
Removing lib/libcurl_la-asyn-ares.o
Removing lib/libcurl_la-asyn-base.lo
Removing lib/libcurl_la-asyn-base.o
Removing lib/libcurl_la-asyn-thrdd.lo
Removing lib/libcurl_la-asyn-thrdd.o
Removing lib/libcurl_la-base64.lo
Removing lib/libcurl_la-base64.o
Removing lib/libcurl_la-bufq.lo
Removing lib/libcurl_la-bufq.o
Removing lib/libcurl_la-bufref.lo
Removing lib/libcurl_la-bufref.o
Removing lib/libcurl_la-cf-h1-proxy.lo
Removing lib/libcurl_la-cf-h1-proxy.o
Removing lib/libcurl_la-cf-h2-proxy.lo
Removing lib/libcurl_la-cf-h2-proxy.o
Removing lib/libcurl_la-cf-haproxy.lo
Removing lib/libcurl_la-cf-haproxy.o
Removing lib/libcurl_la-cf-https-connect.lo
Removing lib/libcurl_la-cf-https-connect.o
Removing lib/libcurl_la-cf-socket.lo
Removing lib/libcurl_la-cf-socket.o
Removing lib/libcurl_la-cfilters.lo
Removing lib/libcurl_la-cfilters.o
Removing lib/libcurl_la-conncache.lo
Removing lib/libcurl_la-conncache.o
Removing lib/libcurl_la-connect.lo
Removing lib/libcurl_la-connect.o
Removing lib/libcurl_la-content_encoding.lo
Removing lib/libcurl_la-content_encoding.o
Removing lib/libcurl_la-cookie.lo
Removing lib/libcurl_la-cookie.o
Removing lib/libcurl_la-cshutdn.lo
Removing lib/libcurl_la-cshutdn.o
Removing lib/libcurl_la-curl_addrinfo.lo
Removing lib/libcurl_la-curl_addrinfo.o
Removing lib/libcurl_la-curl_des.lo
Removing lib/libcurl_la-curl_des.o
Removing lib/libcurl_la-curl_endian.lo
Removing lib/libcurl_la-curl_endian.o
Removing lib/libcurl_la-curl_fnmatch.lo
Removing lib/libcurl_la-curl_fnmatch.o
Removing lib/libcurl_la-curl_get_line.lo
Removing lib/libcurl_la-curl_get_line.o
Removing lib/libcurl_la-curl_gethostname.lo
Removing lib/libcurl_la-curl_gethostname.o
Removing lib/libcurl_la-curl_gssapi.lo
Removing lib/libcurl_la-curl_gssapi.o
Removing lib/libcurl_la-curl_memrchr.lo
Removing lib/libcurl_la-curl_memrchr.o
Removing lib/libcurl_la-curl_multibyte.lo
Removing lib/libcurl_la-curl_multibyte.o
Removing lib/libcurl_la-curl_ntlm_core.lo
Removing lib/libcurl_la-curl_ntlm_core.o
Removing lib/libcurl_la-curl_range.lo
Removing lib/libcurl_la-curl_range.o
Removing lib/libcurl_la-curl_rtmp.lo
Removing lib/libcurl_la-curl_rtmp.o
Removing lib/libcurl_la-curl_sasl.lo
Removing lib/libcurl_la-curl_sasl.o
Removing lib/libcurl_la-curl_sha512_256.lo
Removing lib/libcurl_la-curl_sha512_256.o
Removing lib/libcurl_la-curl_sspi.lo
Removing lib/libcurl_la-curl_sspi.o
Removing lib/libcurl_la-curl_threads.lo
Removing lib/libcurl_la-curl_threads.o
Removing lib/libcurl_la-curl_trc.lo
Removing lib/libcurl_la-curl_trc.o
Removing lib/libcurl_la-cw-out.lo
Removing lib/libcurl_la-cw-out.o
Removing lib/libcurl_la-cw-pause.lo
Removing lib/libcurl_la-cw-pause.o
Removing lib/libcurl_la-dict.lo
Removing lib/libcurl_la-dict.o
Removing lib/libcurl_la-doh.lo
Removing lib/libcurl_la-doh.o
Removing lib/libcurl_la-dynbuf.lo
Removing lib/libcurl_la-dynbuf.o
Removing lib/libcurl_la-dynhds.lo
Removing lib/libcurl_la-dynhds.o
Removing lib/libcurl_la-easy.lo
Removing lib/libcurl_la-easy.o
Removing lib/libcurl_la-easygetopt.lo
Removing lib/libcurl_la-easygetopt.o
Removing lib/libcurl_la-easyoptions.lo
Removing lib/libcurl_la-easyoptions.o
Removing lib/libcurl_la-escape.lo
Removing lib/libcurl_la-escape.o
Removing lib/libcurl_la-fake_addrinfo.lo
Removing lib/libcurl_la-fake_addrinfo.o
Removing lib/libcurl_la-file.lo
Removing lib/libcurl_la-file.o
Removing lib/libcurl_la-fileinfo.lo
Removing lib/libcurl_la-fileinfo.o
Removing lib/libcurl_la-fopen.lo
Removing lib/libcurl_la-fopen.o
Removing lib/libcurl_la-formdata.lo
Removing lib/libcurl_la-formdata.o
Removing lib/libcurl_la-ftp.lo
Removing lib/libcurl_la-ftp.o
Removing lib/libcurl_la-ftplistparser.lo
Removing lib/libcurl_la-ftplistparser.o
Removing lib/libcurl_la-getenv.lo
Removing lib/libcurl_la-getenv.o
Removing lib/libcurl_la-getinfo.lo
Removing lib/libcurl_la-getinfo.o
Removing lib/libcurl_la-gopher.lo
Removing lib/libcurl_la-gopher.o
Removing lib/libcurl_la-hash.lo
Removing lib/libcurl_la-hash.o
Removing lib/libcurl_la-headers.lo
Removing lib/libcurl_la-headers.o
Removing lib/libcurl_la-hmac.lo
Removing lib/libcurl_la-hmac.o
Removing lib/libcurl_la-hostip.lo
Removing lib/libcurl_la-hostip.o
Removing lib/libcurl_la-hostip4.lo
Removing lib/libcurl_la-hostip4.o
Removing lib/libcurl_la-hostip6.lo
Removing lib/libcurl_la-hostip6.o
Removing lib/libcurl_la-hsts.lo
Removing lib/libcurl_la-hsts.o
Removing lib/libcurl_la-http.lo
Removing lib/libcurl_la-http.o
Removing lib/libcurl_la-http1.lo
Removing lib/libcurl_la-http1.o
Removing lib/libcurl_la-http2.lo
Removing lib/libcurl_la-http2.o
Removing lib/libcurl_la-http_aws_sigv4.lo
Removing lib/libcurl_la-http_aws_sigv4.o
Removing lib/libcurl_la-http_chunks.lo
Removing lib/libcurl_la-http_chunks.o
Removing lib/libcurl_la-http_digest.lo
Removing lib/libcurl_la-http_digest.o
Removing lib/libcurl_la-http_negotiate.lo
Removing lib/libcurl_la-http_negotiate.o
Removing lib/libcurl_la-http_ntlm.lo
Removing lib/libcurl_la-http_ntlm.o
Removing lib/libcurl_la-http_proxy.lo
Removing lib/libcurl_la-http_proxy.o
Removing lib/libcurl_la-httpsrr.lo
Removing lib/libcurl_la-httpsrr.o
Removing lib/libcurl_la-idn.lo
Removing lib/libcurl_la-idn.o
Removing lib/libcurl_la-if2ip.lo
Removing lib/libcurl_la-if2ip.o
Removing lib/libcurl_la-imap.lo
Removing lib/libcurl_la-imap.o
Removing lib/libcurl_la-inet_ntop.lo
Removing lib/libcurl_la-inet_ntop.o
Removing lib/libcurl_la-inet_pton.lo
Removing lib/libcurl_la-inet_pton.o
Removing lib/libcurl_la-krb5.lo
Removing lib/libcurl_la-krb5.o
Removing lib/libcurl_la-ldap.lo
Removing lib/libcurl_la-ldap.o
Removing lib/libcurl_la-llist.lo
Removing lib/libcurl_la-llist.o
Removing lib/libcurl_la-macos.lo
Removing lib/libcurl_la-macos.o
Removing lib/libcurl_la-md4.lo
Removing lib/libcurl_la-md4.o
Removing lib/libcurl_la-md5.lo
Removing lib/libcurl_la-md5.o
Removing lib/libcurl_la-memdebug.lo
Removing lib/libcurl_la-memdebug.o
Removing lib/libcurl_la-mime.lo
Removing lib/libcurl_la-mime.o
Removing lib/libcurl_la-mprintf.lo
Removing lib/libcurl_la-mprintf.o
Removing lib/libcurl_la-mqtt.lo
Removing lib/libcurl_la-mqtt.o
Removing lib/libcurl_la-multi.lo
Removing lib/libcurl_la-multi.o
Removing lib/libcurl_la-multi_ev.lo
Removing lib/libcurl_la-multi_ev.o
Removing lib/libcurl_la-netrc.lo
Removing lib/libcurl_la-netrc.o
Removing lib/libcurl_la-nonblock.lo
Removing lib/libcurl_la-nonblock.o
Removing lib/libcurl_la-noproxy.lo
Removing lib/libcurl_la-noproxy.o
Removing lib/libcurl_la-openldap.lo
Removing lib/libcurl_la-openldap.o
Removing lib/libcurl_la-parsedate.lo
Removing lib/libcurl_la-parsedate.o
Removing lib/libcurl_la-pingpong.lo
Removing lib/libcurl_la-pingpong.o
Removing lib/libcurl_la-pop3.lo
Removing lib/libcurl_la-pop3.o
Removing lib/libcurl_la-progress.lo
Removing lib/libcurl_la-progress.o
Removing lib/libcurl_la-psl.lo
Removing lib/libcurl_la-psl.o
Removing lib/libcurl_la-rand.lo
Removing lib/libcurl_la-rand.o
Removing lib/libcurl_la-rename.lo
Removing lib/libcurl_la-rename.o
Removing lib/libcurl_la-request.lo
Removing lib/libcurl_la-request.o
Removing lib/libcurl_la-rtsp.lo
Removing lib/libcurl_la-rtsp.o
Removing lib/libcurl_la-select.lo
Removing lib/libcurl_la-select.o
Removing lib/libcurl_la-sendf.lo
Removing lib/libcurl_la-sendf.o
Removing lib/libcurl_la-setopt.lo
Removing lib/libcurl_la-setopt.o
Removing lib/libcurl_la-sha256.lo
Removing lib/libcurl_la-sha256.o
Removing lib/libcurl_la-share.lo
Removing lib/libcurl_la-share.o
Removing lib/libcurl_la-slist.lo
Removing lib/libcurl_la-slist.o
Removing lib/libcurl_la-smb.lo
Removing lib/libcurl_la-smb.o
Removing lib/libcurl_la-smtp.lo
Removing lib/libcurl_la-smtp.o
Removing lib/libcurl_la-socketpair.lo
Removing lib/libcurl_la-socketpair.o
Removing lib/libcurl_la-socks.lo
Removing lib/libcurl_la-socks.o
Removing lib/libcurl_la-socks_gssapi.lo
Removing lib/libcurl_la-socks_gssapi.o
Removing lib/libcurl_la-socks_sspi.lo
Removing lib/libcurl_la-socks_sspi.o
Removing lib/libcurl_la-speedcheck.lo
Removing lib/libcurl_la-speedcheck.o
Removing lib/libcurl_la-splay.lo
Removing lib/libcurl_la-splay.o
Removing lib/libcurl_la-strcase.lo
Removing lib/libcurl_la-strcase.o
Removing lib/libcurl_la-strdup.lo
Removing lib/libcurl_la-strdup.o
Removing lib/libcurl_la-strequal.lo
Removing lib/libcurl_la-strequal.o
Removing lib/libcurl_la-strerror.lo
Removing lib/libcurl_la-strerror.o
Removing lib/libcurl_la-strparse.lo
Removing lib/libcurl_la-strparse.o
Removing lib/libcurl_la-system_win32.lo
Removing lib/libcurl_la-system_win32.o
Removing lib/libcurl_la-telnet.lo
Removing lib/libcurl_la-telnet.o
Removing lib/libcurl_la-tftp.lo
Removing lib/libcurl_la-tftp.o
Removing lib/libcurl_la-timediff.lo
Removing lib/libcurl_la-timediff.o
Removing lib/libcurl_la-timeval.lo
Removing lib/libcurl_la-timeval.o
Removing lib/libcurl_la-transfer.lo
Removing lib/libcurl_la-transfer.o
Removing lib/libcurl_la-uint-bset.lo
Removing lib/libcurl_la-uint-bset.o
Removing lib/libcurl_la-uint-hash.lo
Removing lib/libcurl_la-uint-hash.o
Removing lib/libcurl_la-uint-spbset.lo
Removing lib/libcurl_la-uint-spbset.o
Removing lib/libcurl_la-uint-table.lo
Removing lib/libcurl_la-uint-table.o
Removing lib/libcurl_la-url.lo
Removing lib/libcurl_la-url.o
Removing lib/libcurl_la-urlapi.lo
Removing lib/libcurl_la-urlapi.o
Removing lib/libcurl_la-version.lo
Removing lib/libcurl_la-version.o
Removing lib/libcurl_la-version_win32.lo
Removing lib/libcurl_la-version_win32.o
Removing lib/libcurl_la-warnless.lo
Removing lib/libcurl_la-warnless.o
Removing lib/libcurl_la-ws.lo
Removing lib/libcurl_la-ws.o
Removing lib/libcurltool_la-base64.lo
Removing lib/libcurltool_la-base64.o
Removing lib/libcurltool_la-curl_multibyte.lo
Removing lib/libcurltool_la-curl_multibyte.o
Removing lib/libcurltool_la-dynbuf.lo
Removing lib/libcurltool_la-dynbuf.o
Removing lib/libcurltool_la-nonblock.lo
Removing lib/libcurltool_la-nonblock.o
Removing lib/libcurltool_la-strcase.lo
Removing lib/libcurltool_la-strcase.o
Removing lib/libcurltool_la-strparse.lo
Removing lib/libcurltool_la-strparse.o
Removing lib/libcurltool_la-timediff.lo
Removing lib/libcurltool_la-timediff.o
Removing lib/libcurltool_la-timeval.lo
Removing lib/libcurltool_la-timeval.o
Removing lib/libcurltool_la-version_win32.lo
Removing lib/libcurltool_la-version_win32.o
Removing lib/libcurltool_la-warnless.lo
Removing lib/libcurltool_la-warnless.o
Removing lib/libcurlu.la
Removing lib/libcurlu_la-altsvc.lo
Removing lib/libcurlu_la-altsvc.o
Removing lib/libcurlu_la-amigaos.lo
Removing lib/libcurlu_la-amigaos.o
Removing lib/libcurlu_la-asyn-ares.lo
Removing lib/libcurlu_la-asyn-ares.o
Removing lib/libcurlu_la-asyn-base.lo
Removing lib/libcurlu_la-asyn-base.o
Removing lib/libcurlu_la-asyn-thrdd.lo
Removing lib/libcurlu_la-asyn-thrdd.o
Removing lib/libcurlu_la-base64.lo
Removing lib/libcurlu_la-base64.o
Removing lib/libcurlu_la-bufq.lo
Removing lib/libcurlu_la-bufq.o
Removing lib/libcurlu_la-bufref.lo
Removing lib/libcurlu_la-bufref.o
Removing lib/libcurlu_la-cf-h1-proxy.lo
Removing lib/libcurlu_la-cf-h1-proxy.o
Removing lib/libcurlu_la-cf-h2-proxy.lo
Removing lib/libcurlu_la-cf-h2-proxy.o
Removing lib/libcurlu_la-cf-haproxy.lo
Removing lib/libcurlu_la-cf-haproxy.o
Removing lib/libcurlu_la-cf-https-connect.lo
Removing lib/libcurlu_la-cf-https-connect.o
Removing lib/libcurlu_la-cf-socket.lo
Removing lib/libcurlu_la-cf-socket.o
Removing lib/libcurlu_la-cfilters.lo
Removing lib/libcurlu_la-cfilters.o
Removing lib/libcurlu_la-conncache.lo
Removing lib/libcurlu_la-conncache.o
Removing lib/libcurlu_la-connect.lo
Removing lib/libcurlu_la-connect.o
Removing lib/libcurlu_la-content_encoding.lo
Removing lib/libcurlu_la-content_encoding.o
Removing lib/libcurlu_la-cookie.lo
Removing lib/libcurlu_la-cookie.o
Removing lib/libcurlu_la-cshutdn.lo
Removing lib/libcurlu_la-cshutdn.o
Removing lib/libcurlu_la-curl_addrinfo.lo
Removing lib/libcurlu_la-curl_addrinfo.o
Removing lib/libcurlu_la-curl_des.lo
Removing lib/libcurlu_la-curl_des.o
Removing lib/libcurlu_la-curl_endian.lo
Removing lib/libcurlu_la-curl_endian.o
Removing lib/libcurlu_la-curl_fnmatch.lo
Removing lib/libcurlu_la-curl_fnmatch.o
Removing lib/libcurlu_la-curl_get_line.lo
Removing lib/libcurlu_la-curl_get_line.o
Removing lib/libcurlu_la-curl_gethostname.lo
Removing lib/libcurlu_la-curl_gethostname.o
Removing lib/libcurlu_la-curl_gssapi.lo
Removing lib/libcurlu_la-curl_gssapi.o
Removing lib/libcurlu_la-curl_memrchr.lo
Removing lib/libcurlu_la-curl_memrchr.o
Removing lib/libcurlu_la-curl_multibyte.lo
Removing lib/libcurlu_la-curl_multibyte.o
Removing lib/libcurlu_la-curl_ntlm_core.lo
Removing lib/libcurlu_la-curl_ntlm_core.o
Removing lib/libcurlu_la-curl_range.lo
Removing lib/libcurlu_la-curl_range.o
Removing lib/libcurlu_la-curl_rtmp.lo
Removing lib/libcurlu_la-curl_rtmp.o
Removing lib/libcurlu_la-curl_sasl.lo
Removing lib/libcurlu_la-curl_sasl.o
Removing lib/libcurlu_la-curl_sha512_256.lo
Removing lib/libcurlu_la-curl_sha512_256.o
Removing lib/libcurlu_la-curl_sspi.lo
Removing lib/libcurlu_la-curl_sspi.o
Removing lib/libcurlu_la-curl_threads.lo
Removing lib/libcurlu_la-curl_threads.o
Removing lib/libcurlu_la-curl_trc.lo
Removing lib/libcurlu_la-curl_trc.o
Removing lib/libcurlu_la-cw-out.lo
Removing lib/libcurlu_la-cw-out.o
Removing lib/libcurlu_la-cw-pause.lo
Removing lib/libcurlu_la-cw-pause.o
Removing lib/libcurlu_la-dict.lo
Removing lib/libcurlu_la-dict.o
Removing lib/libcurlu_la-doh.lo
Removing lib/libcurlu_la-doh.o
Removing lib/libcurlu_la-dynbuf.lo
Removing lib/libcurlu_la-dynbuf.o
Removing lib/libcurlu_la-dynhds.lo
Removing lib/libcurlu_la-dynhds.o
Removing lib/libcurlu_la-easy.lo
Removing lib/libcurlu_la-easy.o
Removing lib/libcurlu_la-easygetopt.lo
Removing lib/libcurlu_la-easygetopt.o
Removing lib/libcurlu_la-easyoptions.lo
Removing lib/libcurlu_la-easyoptions.o
Removing lib/libcurlu_la-escape.lo
Removing lib/libcurlu_la-escape.o
Removing lib/libcurlu_la-fake_addrinfo.lo
Removing lib/libcurlu_la-fake_addrinfo.o
Removing lib/libcurlu_la-file.lo
Removing lib/libcurlu_la-file.o
Removing lib/libcurlu_la-fileinfo.lo
Removing lib/libcurlu_la-fileinfo.o
Removing lib/libcurlu_la-fopen.lo
Removing lib/libcurlu_la-fopen.o
Removing lib/libcurlu_la-formdata.lo
Removing lib/libcurlu_la-formdata.o
Removing lib/libcurlu_la-ftp.lo
Removing lib/libcurlu_la-ftp.o
Removing lib/libcurlu_la-ftplistparser.lo
Removing lib/libcurlu_la-ftplistparser.o
Removing lib/libcurlu_la-getenv.lo
Removing lib/libcurlu_la-getenv.o
Removing lib/libcurlu_la-getinfo.lo
Removing lib/libcurlu_la-getinfo.o
Removing lib/libcurlu_la-gopher.lo
Removing lib/libcurlu_la-gopher.o
Removing lib/libcurlu_la-hash.lo
Removing lib/libcurlu_la-hash.o
Removing lib/libcurlu_la-headers.lo
Removing lib/libcurlu_la-headers.o
Removing lib/libcurlu_la-hmac.lo
Removing lib/libcurlu_la-hmac.o
Removing lib/libcurlu_la-hostip.lo
Removing lib/libcurlu_la-hostip.o
Removing lib/libcurlu_la-hostip4.lo
Removing lib/libcurlu_la-hostip4.o
Removing lib/libcurlu_la-hostip6.lo
Removing lib/libcurlu_la-hostip6.o
Removing lib/libcurlu_la-hsts.lo
Removing lib/libcurlu_la-hsts.o
Removing lib/libcurlu_la-http.lo
Removing lib/libcurlu_la-http.o
Removing lib/libcurlu_la-http1.lo
Removing lib/libcurlu_la-http1.o
Removing lib/libcurlu_la-http2.lo
Removing lib/libcurlu_la-http2.o
Removing lib/libcurlu_la-http_aws_sigv4.lo
Removing lib/libcurlu_la-http_aws_sigv4.o
Removing lib/libcurlu_la-http_chunks.lo
Removing lib/libcurlu_la-http_chunks.o
Removing lib/libcurlu_la-http_digest.lo
Removing lib/libcurlu_la-http_digest.o
Removing lib/libcurlu_la-http_negotiate.lo
Removing lib/libcurlu_la-http_negotiate.o
Removing lib/libcurlu_la-http_ntlm.lo
Removing lib/libcurlu_la-http_ntlm.o
Removing lib/libcurlu_la-http_proxy.lo
Removing lib/libcurlu_la-http_proxy.o
Removing lib/libcurlu_la-httpsrr.lo
Removing lib/libcurlu_la-httpsrr.o
Removing lib/libcurlu_la-idn.lo
Removing lib/libcurlu_la-idn.o
Removing lib/libcurlu_la-if2ip.lo
Removing lib/libcurlu_la-if2ip.o
Removing lib/libcurlu_la-imap.lo
Removing lib/libcurlu_la-imap.o
Removing lib/libcurlu_la-inet_ntop.lo
Removing lib/libcurlu_la-inet_ntop.o
Removing lib/libcurlu_la-inet_pton.lo
Removing lib/libcurlu_la-inet_pton.o
Removing lib/libcurlu_la-krb5.lo
Removing lib/libcurlu_la-krb5.o
Removing lib/libcurlu_la-ldap.lo
Removing lib/libcurlu_la-ldap.o
Removing lib/libcurlu_la-llist.lo
Removing lib/libcurlu_la-llist.o
Removing lib/libcurlu_la-macos.lo
Removing lib/libcurlu_la-macos.o
Removing lib/libcurlu_la-md4.lo
Removing lib/libcurlu_la-md4.o
Removing lib/libcurlu_la-md5.lo
Removing lib/libcurlu_la-md5.o
Removing lib/libcurlu_la-memdebug.lo
Removing lib/libcurlu_la-memdebug.o
Removing lib/libcurlu_la-mime.lo
Removing lib/libcurlu_la-mime.o
Removing lib/libcurlu_la-mprintf.lo
Removing lib/libcurlu_la-mprintf.o
Removing lib/libcurlu_la-mqtt.lo
Removing lib/libcurlu_la-mqtt.o
Removing lib/libcurlu_la-multi.lo
Removing lib/libcurlu_la-multi.o
Removing lib/libcurlu_la-multi_ev.lo
Removing lib/libcurlu_la-multi_ev.o
Removing lib/libcurlu_la-netrc.lo
Removing lib/libcurlu_la-netrc.o
Removing lib/libcurlu_la-nonblock.lo
Removing lib/libcurlu_la-nonblock.o
Removing lib/libcurlu_la-noproxy.lo
Removing lib/libcurlu_la-noproxy.o
Removing lib/libcurlu_la-openldap.lo
Removing lib/libcurlu_la-openldap.o
Removing lib/libcurlu_la-parsedate.lo
Removing lib/libcurlu_la-parsedate.o
Removing lib/libcurlu_la-pingpong.lo
Removing lib/libcurlu_la-pingpong.o
Removing lib/libcurlu_la-pop3.lo
Removing lib/libcurlu_la-pop3.o
Removing lib/libcurlu_la-progress.lo
Removing lib/libcurlu_la-progress.o
Removing lib/libcurlu_la-psl.lo
Removing lib/libcurlu_la-psl.o
Removing lib/libcurlu_la-rand.lo
Removing lib/libcurlu_la-rand.o
Removing lib/libcurlu_la-rename.lo
Removing lib/libcurlu_la-rename.o
Removing lib/libcurlu_la-request.lo
Removing lib/libcurlu_la-request.o
Removing lib/libcurlu_la-rtsp.lo
Removing lib/libcurlu_la-rtsp.o
Removing lib/libcurlu_la-select.lo
Removing lib/libcurlu_la-select.o
Removing lib/libcurlu_la-sendf.lo
Removing lib/libcurlu_la-sendf.o
Removing lib/libcurlu_la-setopt.lo
Removing lib/libcurlu_la-setopt.o
Removing lib/libcurlu_la-sha256.lo
Removing lib/libcurlu_la-sha256.o
Removing lib/libcurlu_la-share.lo
Removing lib/libcurlu_la-share.o
Removing lib/libcurlu_la-slist.lo
Removing lib/libcurlu_la-slist.o
Removing lib/libcurlu_la-smb.lo
Removing lib/libcurlu_la-smb.o
Removing lib/libcurlu_la-smtp.lo
Removing lib/libcurlu_la-smtp.o
Removing lib/libcurlu_la-socketpair.lo
Removing lib/libcurlu_la-socketpair.o
Removing lib/libcurlu_la-socks.lo
Removing lib/libcurlu_la-socks.o
Removing lib/libcurlu_la-socks_gssapi.lo
Removing lib/libcurlu_la-socks_gssapi.o
Removing lib/libcurlu_la-socks_sspi.lo
Removing lib/libcurlu_la-socks_sspi.o
Removing lib/libcurlu_la-speedcheck.lo
Removing lib/libcurlu_la-speedcheck.o
Removing lib/libcurlu_la-splay.lo
Removing lib/libcurlu_la-splay.o
Removing lib/libcurlu_la-strcase.lo
Removing lib/libcurlu_la-strcase.o
Removing lib/libcurlu_la-strdup.lo
Removing lib/libcurlu_la-strdup.o
Removing lib/libcurlu_la-strequal.lo
Removing lib/libcurlu_la-strequal.o
Removing lib/libcurlu_la-strerror.lo
Removing lib/libcurlu_la-strerror.o
Removing lib/libcurlu_la-strparse.lo
Removing lib/libcurlu_la-strparse.o
Removing lib/libcurlu_la-system_win32.lo
Removing lib/libcurlu_la-system_win32.o
Removing lib/libcurlu_la-telnet.lo
Removing lib/libcurlu_la-telnet.o
Removing lib/libcurlu_la-tftp.lo
Removing lib/libcurlu_la-tftp.o
Removing lib/libcurlu_la-timediff.lo
Removing lib/libcurlu_la-timediff.o
Removing lib/libcurlu_la-timeval.lo
Removing lib/libcurlu_la-timeval.o
Removing lib/libcurlu_la-transfer.lo
Removing lib/libcurlu_la-transfer.o
Removing lib/libcurlu_la-uint-bset.lo
Removing lib/libcurlu_la-uint-bset.o
Removing lib/libcurlu_la-uint-hash.lo
Removing lib/libcurlu_la-uint-hash.o
Removing lib/libcurlu_la-uint-spbset.lo
Removing lib/libcurlu_la-uint-spbset.o
Removing lib/libcurlu_la-uint-table.lo
Removing lib/libcurlu_la-uint-table.o
Removing lib/libcurlu_la-url.lo
Removing lib/libcurlu_la-url.o
Removing lib/libcurlu_la-urlapi.lo
Removing lib/libcurlu_la-urlapi.o
Removing lib/libcurlu_la-version.lo
Removing lib/libcurlu_la-version.o
Removing lib/libcurlu_la-version_win32.lo
Removing lib/libcurlu_la-version_win32.o
Removing lib/libcurlu_la-warnless.lo
Removing lib/libcurlu_la-warnless.o
Removing lib/libcurlu_la-ws.lo
Removing lib/libcurlu_la-ws.o
Removing lib/stamp-h1
Removing lib/vauth/.deps/
Removing lib/vauth/.dirstamp
Removing lib/vauth/libcurl_la-cleartext.lo
Removing lib/vauth/libcurl_la-cleartext.o
Removing lib/vauth/libcurl_la-cram.lo
Removing lib/vauth/libcurl_la-cram.o
Removing lib/vauth/libcurl_la-digest.lo
Removing lib/vauth/libcurl_la-digest.o
Removing lib/vauth/libcurl_la-digest_sspi.lo
Removing lib/vauth/libcurl_la-digest_sspi.o
Removing lib/vauth/libcurl_la-gsasl.lo
Removing lib/vauth/libcurl_la-gsasl.o
Removing lib/vauth/libcurl_la-krb5_gssapi.lo
Removing lib/vauth/libcurl_la-krb5_gssapi.o
Removing lib/vauth/libcurl_la-krb5_sspi.lo
Removing lib/vauth/libcurl_la-krb5_sspi.o
Removing lib/vauth/libcurl_la-ntlm.lo
Removing lib/vauth/libcurl_la-ntlm.o
Removing lib/vauth/libcurl_la-ntlm_sspi.lo
Removing lib/vauth/libcurl_la-ntlm_sspi.o
Removing lib/vauth/libcurl_la-oauth2.lo
Removing lib/vauth/libcurl_la-oauth2.o
Removing lib/vauth/libcurl_la-spnego_gssapi.lo
Removing lib/vauth/libcurl_la-spnego_gssapi.o
Removing lib/vauth/libcurl_la-spnego_sspi.lo
Removing lib/vauth/libcurl_la-spnego_sspi.o
Removing lib/vauth/libcurl_la-vauth.lo
Removing lib/vauth/libcurl_la-vauth.o
Removing lib/vauth/libcurlu_la-cleartext.lo
Removing lib/vauth/libcurlu_la-cleartext.o
Removing lib/vauth/libcurlu_la-cram.lo
Removing lib/vauth/libcurlu_la-cram.o
Removing lib/vauth/libcurlu_la-digest.lo
Removing lib/vauth/libcurlu_la-digest.o
Removing lib/vauth/libcurlu_la-digest_sspi.lo
Removing lib/vauth/libcurlu_la-digest_sspi.o
Removing lib/vauth/libcurlu_la-gsasl.lo
Removing lib/vauth/libcurlu_la-gsasl.o
Removing lib/vauth/libcurlu_la-krb5_gssapi.lo
Removing lib/vauth/libcurlu_la-krb5_gssapi.o
Removing lib/vauth/libcurlu_la-krb5_sspi.lo
Removing lib/vauth/libcurlu_la-krb5_sspi.o
Removing lib/vauth/libcurlu_la-ntlm.lo
Removing lib/vauth/libcurlu_la-ntlm.o
Removing lib/vauth/libcurlu_la-ntlm_sspi.lo
Removing lib/vauth/libcurlu_la-ntlm_sspi.o
Removing lib/vauth/libcurlu_la-oauth2.lo
Removing lib/vauth/libcurlu_la-oauth2.o
Removing lib/vauth/libcurlu_la-spnego_gssapi.lo
Removing lib/vauth/libcurlu_la-spnego_gssapi.o
Removing lib/vauth/libcurlu_la-spnego_sspi.lo
Removing lib/vauth/libcurlu_la-spnego_sspi.o
Removing lib/vauth/libcurlu_la-vauth.lo
Removing lib/vauth/libcurlu_la-vauth.o
Removing lib/vquic/.deps/
Removing lib/vquic/.dirstamp
Removing lib/vquic/libcurl_la-curl_msh3.lo
Removing lib/vquic/libcurl_la-curl_msh3.o
Removing lib/vquic/libcurl_la-curl_ngtcp2.lo
Removing lib/vquic/libcurl_la-curl_ngtcp2.o
Removing lib/vquic/libcurl_la-curl_osslq.lo
Removing lib/vquic/libcurl_la-curl_osslq.o
Removing lib/vquic/libcurl_la-curl_quiche.lo
Removing lib/vquic/libcurl_la-curl_quiche.o
Removing lib/vquic/libcurl_la-vquic-tls.lo
Removing lib/vquic/libcurl_la-vquic-tls.o
Removing lib/vquic/libcurl_la-vquic.lo
Removing lib/vquic/libcurl_la-vquic.o
Removing lib/vquic/libcurlu_la-curl_msh3.lo
Removing lib/vquic/libcurlu_la-curl_msh3.o
Removing lib/vquic/libcurlu_la-curl_ngtcp2.lo
Removing lib/vquic/libcurlu_la-curl_ngtcp2.o
Removing lib/vquic/libcurlu_la-curl_osslq.lo
Removing lib/vquic/libcurlu_la-curl_osslq.o
Removing lib/vquic/libcurlu_la-curl_quiche.lo
Removing lib/vquic/libcurlu_la-curl_quiche.o
Removing lib/vquic/libcurlu_la-vquic-tls.lo
Removing lib/vquic/libcurlu_la-vquic-tls.o
Removing lib/vquic/libcurlu_la-vquic.lo
Removing lib/vquic/libcurlu_la-vquic.o
Removing lib/vssh/.deps/
Removing lib/vssh/.dirstamp
Removing lib/vssh/libcurl_la-curl_path.lo
Removing lib/vssh/libcurl_la-curl_path.o
Removing lib/vssh/libcurl_la-libssh.lo
Removing lib/vssh/libcurl_la-libssh.o
Removing lib/vssh/libcurl_la-libssh2.lo
Removing lib/vssh/libcurl_la-libssh2.o
Removing lib/vssh/libcurl_la-wolfssh.lo
Removing lib/vssh/libcurl_la-wolfssh.o
Removing lib/vssh/libcurlu_la-curl_path.lo
Removing lib/vssh/libcurlu_la-curl_path.o
Removing lib/vssh/libcurlu_la-libssh.lo
Removing lib/vssh/libcurlu_la-libssh.o
Removing lib/vssh/libcurlu_la-libssh2.lo
Removing lib/vssh/libcurlu_la-libssh2.o
Removing lib/vssh/libcurlu_la-wolfssh.lo
Removing lib/vssh/libcurlu_la-wolfssh.o
Removing lib/vtls/.deps/
Removing lib/vtls/.dirstamp
Removing lib/vtls/libcurl_la-bearssl.lo
Removing lib/vtls/libcurl_la-bearssl.o
Removing lib/vtls/libcurl_la-cipher_suite.lo
Removing lib/vtls/libcurl_la-cipher_suite.o
Removing lib/vtls/libcurl_la-gtls.lo
Removing lib/vtls/libcurl_la-gtls.o
Removing lib/vtls/libcurl_la-hostcheck.lo
Removing lib/vtls/libcurl_la-hostcheck.o
Removing lib/vtls/libcurl_la-keylog.lo
Removing lib/vtls/libcurl_la-keylog.o
Removing lib/vtls/libcurl_la-mbedtls.lo
Removing lib/vtls/libcurl_la-mbedtls.o
Removing lib/vtls/libcurl_la-mbedtls_threadlock.lo
Removing lib/vtls/libcurl_la-mbedtls_threadlock.o
Removing lib/vtls/libcurl_la-openssl.lo
Removing lib/vtls/libcurl_la-openssl.o
Removing lib/vtls/libcurl_la-rustls.lo
Removing lib/vtls/libcurl_la-rustls.o
Removing lib/vtls/libcurl_la-schannel.lo
Removing lib/vtls/libcurl_la-schannel.o
Removing lib/vtls/libcurl_la-schannel_verify.lo
Removing lib/vtls/libcurl_la-schannel_verify.o
Removing lib/vtls/libcurl_la-sectransp.lo
Removing lib/vtls/libcurl_la-sectransp.o
Removing lib/vtls/libcurl_la-vtls.lo
Removing lib/vtls/libcurl_la-vtls.o
Removing lib/vtls/libcurl_la-vtls_scache.lo
Removing lib/vtls/libcurl_la-vtls_scache.o
Removing lib/vtls/libcurl_la-vtls_spack.lo
Removing lib/vtls/libcurl_la-vtls_spack.o
Removing lib/vtls/libcurl_la-wolfssl.lo
Removing lib/vtls/libcurl_la-wolfssl.o
Removing lib/vtls/libcurl_la-x509asn1.lo
Removing lib/vtls/libcurl_la-x509asn1.o
Removing lib/vtls/libcurlu_la-bearssl.lo
Removing lib/vtls/libcurlu_la-bearssl.o
Removing lib/vtls/libcurlu_la-cipher_suite.lo
Removing lib/vtls/libcurlu_la-cipher_suite.o
Removing lib/vtls/libcurlu_la-gtls.lo
Removing lib/vtls/libcurlu_la-gtls.o
Removing lib/vtls/libcurlu_la-hostcheck.lo
Removing lib/vtls/libcurlu_la-hostcheck.o
Removing lib/vtls/libcurlu_la-keylog.lo
Removing lib/vtls/libcurlu_la-keylog.o
Removing lib/vtls/libcurlu_la-mbedtls.lo
Removing lib/vtls/libcurlu_la-mbedtls.o
Removing lib/vtls/libcurlu_la-mbedtls_threadlock.lo
Removing lib/vtls/libcurlu_la-mbedtls_threadlock.o
Removing lib/vtls/libcurlu_la-openssl.lo
Removing lib/vtls/libcurlu_la-openssl.o
Removing lib/vtls/libcurlu_la-rustls.lo
Removing lib/vtls/libcurlu_la-rustls.o
Removing lib/vtls/libcurlu_la-schannel.lo
Removing lib/vtls/libcurlu_la-schannel.o
Removing lib/vtls/libcurlu_la-schannel_verify.lo
Removing lib/vtls/libcurlu_la-schannel_verify.o
Removing lib/vtls/libcurlu_la-sectransp.lo
Removing lib/vtls/libcurlu_la-sectransp.o
Removing lib/vtls/libcurlu_la-vtls.lo
Removing lib/vtls/libcurlu_la-vtls.o
Removing lib/vtls/libcurlu_la-vtls_scache.lo
Removing lib/vtls/libcurlu_la-vtls_scache.o
Removing lib/vtls/libcurlu_la-vtls_spack.lo
Removing lib/vtls/libcurlu_la-vtls_spack.o
Removing lib/vtls/libcurlu_la-wolfssl.lo
Removing lib/vtls/libcurlu_la-wolfssl.o
Removing lib/vtls/libcurlu_la-x509asn1.lo
Removing lib/vtls/libcurlu_la-x509asn1.o
Removing libcurl.pc
Removing libtool
Removing ltmain.sh
Removing m4/libtool.m4
Removing m4/ltoptions.m4
Removing m4/ltsugar.m4
Removing m4/ltversion.m4
Removing m4/lt~obsolete.m4
Removing missing
Removing packages/Makefile
Removing packages/Makefile.in
Removing packages/vms/Makefile
Removing packages/vms/Makefile.in
Removing scripts/Makefile
Removing scripts/Makefile.in
Removing src/.deps/
Removing src/.dirstamp
Removing src/.libs/
Removing src/Makefile
Removing src/Makefile.in
Removing src/curl
Removing src/curl-slist_wc.o
Removing src/curl-terminal.o
Removing src/curl-tool_bname.o
Removing src/curl-tool_ca_embed.o
Removing src/curl-tool_cb_dbg.o
Removing src/curl-tool_cb_hdr.o
Removing src/curl-tool_cb_prg.o
Removing src/curl-tool_cb_rea.o
Removing src/curl-tool_cb_see.o
Removing src/curl-tool_cb_soc.o
Removing src/curl-tool_cb_wrt.o
Removing src/curl-tool_cfgable.o
Removing src/curl-tool_dirhie.o
Removing src/curl-tool_doswin.o
Removing src/curl-tool_easysrc.o
Removing src/curl-tool_filetime.o
Removing src/curl-tool_findfile.o
Removing src/curl-tool_formparse.o
Removing src/curl-tool_getparam.o
Removing src/curl-tool_getpass.o
Removing src/curl-tool_help.o
Removing src/curl-tool_helpers.o
Removing src/curl-tool_hugehelp.o
Removing src/curl-tool_ipfs.o
Removing src/curl-tool_libinfo.o
Removing src/curl-tool_listhelp.o
Removing src/curl-tool_main.o
Removing src/curl-tool_msgs.o
Removing src/curl-tool_operate.o
Removing src/curl-tool_operhlp.o
Removing src/curl-tool_paramhlp.o
Removing src/curl-tool_parsecfg.o
Removing src/curl-tool_progress.o
Removing src/curl-tool_setopt.o
Removing src/curl-tool_sleep.o
Removing src/curl-tool_ssls.o
Removing src/curl-tool_stderr.o
Removing src/curl-tool_strdup.o
Removing src/curl-tool_urlglob.o
Removing src/curl-tool_util.o
Removing src/curl-tool_vms.o
Removing src/curl-tool_writeout.o
Removing src/curl-tool_writeout_json.o
Removing src/curl-tool_xattr.o
Removing src/curl-var.o
Removing src/curlinfo
Removing src/curlinfo.o
Removing src/libcurltool.la
Removing src/libcurltool_la-slist_wc.lo
Removing src/libcurltool_la-slist_wc.o
Removing src/libcurltool_la-terminal.lo
Removing src/libcurltool_la-terminal.o
Removing src/libcurltool_la-tool_bname.lo
Removing src/libcurltool_la-tool_bname.o
Removing src/libcurltool_la-tool_cb_dbg.lo
Removing src/libcurltool_la-tool_cb_dbg.o
Removing src/libcurltool_la-tool_cb_hdr.lo
Removing src/libcurltool_la-tool_cb_hdr.o
Removing src/libcurltool_la-tool_cb_prg.lo
Removing src/libcurltool_la-tool_cb_prg.o
Removing src/libcurltool_la-tool_cb_rea.lo
Removing src/libcurltool_la-tool_cb_rea.o
Removing src/libcurltool_la-tool_cb_see.lo
Removing src/libcurltool_la-tool_cb_see.o
Removing src/libcurltool_la-tool_cb_soc.lo
Removing src/libcurltool_la-tool_cb_soc.o
Removing src/libcurltool_la-tool_cb_wrt.lo
Removing src/libcurltool_la-tool_cb_wrt.o
Removing src/libcurltool_la-tool_cfgable.lo
Removing src/libcurltool_la-tool_cfgable.o
Removing src/libcurltool_la-tool_dirhie.lo
Removing src/libcurltool_la-tool_dirhie.o
Removing src/libcurltool_la-tool_doswin.lo
Removing src/libcurltool_la-tool_doswin.o
Removing src/libcurltool_la-tool_easysrc.lo
Removing src/libcurltool_la-tool_easysrc.o
Removing src/libcurltool_la-tool_filetime.lo
Removing src/libcurltool_la-tool_filetime.o
Removing src/libcurltool_la-tool_findfile.lo
Removing src/libcurltool_la-tool_findfile.o
Removing src/libcurltool_la-tool_formparse.lo
Removing src/libcurltool_la-tool_formparse.o
Removing src/libcurltool_la-tool_getparam.lo
Removing src/libcurltool_la-tool_getparam.o
Removing src/libcurltool_la-tool_getpass.lo
Removing src/libcurltool_la-tool_getpass.o
Removing src/libcurltool_la-tool_help.lo
Removing src/libcurltool_la-tool_help.o
Removing src/libcurltool_la-tool_helpers.lo
Removing src/libcurltool_la-tool_helpers.o
Removing src/libcurltool_la-tool_ipfs.lo
Removing src/libcurltool_la-tool_ipfs.o
Removing src/libcurltool_la-tool_libinfo.lo
Removing src/libcurltool_la-tool_libinfo.o
Removing src/libcurltool_la-tool_listhelp.lo
Removing src/libcurltool_la-tool_listhelp.o
Removing src/libcurltool_la-tool_main.lo
Removing src/libcurltool_la-tool_main.o
Removing src/libcurltool_la-tool_msgs.lo
Removing src/libcurltool_la-tool_msgs.o
Removing src/libcurltool_la-tool_operate.lo
Removing src/libcurltool_la-tool_operate.o
Removing src/libcurltool_la-tool_operhlp.lo
Removing src/libcurltool_la-tool_operhlp.o
Removing src/libcurltool_la-tool_paramhlp.lo
Removing src/libcurltool_la-tool_paramhlp.o
Removing src/libcurltool_la-tool_parsecfg.lo
Removing src/libcurltool_la-tool_parsecfg.o
Removing src/libcurltool_la-tool_progress.lo
Removing src/libcurltool_la-tool_progress.o
Removing src/libcurltool_la-tool_setopt.lo
Removing src/libcurltool_la-tool_setopt.o
Removing src/libcurltool_la-tool_sleep.lo
Removing src/libcurltool_la-tool_sleep.o
Removing src/libcurltool_la-tool_ssls.lo
Removing src/libcurltool_la-tool_ssls.o
Removing src/libcurltool_la-tool_stderr.lo
Removing src/libcurltool_la-tool_stderr.o
Removing src/libcurltool_la-tool_strdup.lo
Removing src/libcurltool_la-tool_strdup.o
Removing src/libcurltool_la-tool_urlglob.lo
Removing src/libcurltool_la-tool_urlglob.o
Removing src/libcurltool_la-tool_util.lo
Removing src/libcurltool_la-tool_util.o
Removing src/libcurltool_la-tool_vms.lo
Removing src/libcurltool_la-tool_vms.o
Removing src/libcurltool_la-tool_writeout.lo
Removing src/libcurltool_la-tool_writeout.o
Removing src/libcurltool_la-tool_writeout_json.lo
Removing src/libcurltool_la-tool_writeout_json.o
Removing src/libcurltool_la-tool_xattr.lo
Removing src/libcurltool_la-tool_xattr.o
Removing src/libcurltool_la-var.lo
Removing src/libcurltool_la-var.o
Removing src/tool_ca_embed.c
Removing src/tool_hugehelp.c
Removing tests/Makefile
Removing tests/Makefile.in
Removing tests/certs/Makefile
Removing tests/certs/Makefile.in
Removing tests/config
Removing tests/configurehelp.pm
Removing tests/data/Makefile
Removing tests/data/Makefile.in
Removing tests/http/Makefile
Removing tests/http/Makefile.in
Removing tests/http/clients/.deps/
Removing tests/http/clients/Makefile
Removing tests/http/clients/Makefile.in
Removing tests/http/config.ini
Removing tests/libtest/.deps/
Removing tests/libtest/Makefile
Removing tests/libtest/Makefile.in
Removing tests/server/.deps/
Removing tests/server/Makefile
Removing tests/server/Makefile.in
Removing tests/tunit/.deps/
Removing tests/tunit/Makefile
Removing tests/tunit/Makefile.in
Removing tests/unit/.deps/
Removing tests/unit/Makefile
Removing tests/unit/Makefile.in
$ autoreconf -fi
libtoolize: putting auxiliary files in '.'.
libtoolize: copying file './ltmain.sh'
libtoolize: putting macros in AC_CONFIG_MACRO_DIRS, 'm4'.
libtoolize: copying file 'm4/libtool.m4'
libtoolize: copying file 'm4/ltoptions.m4'
libtoolize: copying file 'm4/ltsugar.m4'
libtoolize: copying file 'm4/ltversion.m4'
libtoolize: copying file 'm4/lt~obsolete.m4'
libtoolize: Remember to add 'LT_INIT' to configure.ac.
configure.ac:127: installing './compile'
configure.ac:423: installing './config.guess'
configure.ac:423: installing './config.sub'
configure.ac:127: installing './install-sh'
configure.ac:133: installing './missing'
docs/examples/Makefile.am: installing './depcomp'
$ bash -c find . -name config.guess -exec cp /usr/share/misc/config.guess {} \;
$ bash -c find . -name config.sub -exec cp /usr/share/misc/config.sub {} \;
$ chmod +x configure
$ ./configure --disable-shared --without-ssl --disable-docs
checking whether to enable maintainer-specific portions of Makefiles... no
checking whether make supports nested variables... yes
checking whether to enable debug build options... no
checking whether to enable compiler optimizer... (assumed) yes
checking whether to enable strict compiler warnings... no
checking whether to enable compiler warnings as errors... no
checking whether to enable curl debug memory tracking... no
checking whether to enable hiding of library internal symbols... yes
checking whether to enable c-ares for DNS lookups... no
checking whether to disable dependency on -lrt... (assumed no)
checking whether to enable HTTPSRR support... no
checking whether to enable ECH support... no
checking whether to enable SSL session export support... no
checking for path separator... :
checking for sed... /usr/bin/sed
checking for grep... /usr/bin/grep
checking that grep -E works... yes
checking for ar... /usr/bin/ar
checking for a BSD-compatible install... /usr/bin/install -c
checking for gcc... ccache gcc
checking whether the C compiler works... yes
checking for C compiler default output file name... a.out
checking for suffix of executables...
checking whether we are cross compiling... no
checking for suffix of object files... o
checking whether the compiler supports GNU C... yes
checking whether ccache gcc accepts -g... yes
checking for ccache gcc option to enable C11 features... none needed
checking whether ccache gcc understands -c and -o together... yes
checking how to run the C preprocessor... ccache gcc -E
checking for stdio.h... yes
checking for stdlib.h... yes
checking for string.h... yes
checking for inttypes.h... yes
checking for stdint.h... yes
checking for strings.h... yes
checking for sys/stat.h... yes
checking for sys/types.h... yes
checking for unistd.h... yes
checking for stdatomic.h... yes
checking if _Atomic is available... yes
checking for a sed that does not truncate output... (cached) /usr/bin/sed
checking for code coverage support... no
checking whether build environment is sane... yes
checking for a race-free mkdir -p... /usr/bin/mkdir -p
checking for gawk... gawk
checking whether make sets $(MAKE)... yes
checking whether make supports the include directive... yes (GNU style)
checking dependency style of ccache gcc... gcc3
checking curl version... 8.14.0-DEV
checking for httpd... no
checking for apache2... no
checking for apxs... no
configure: httpd/apache2 not in PATH, http tests disabled
configure: apxs not in PATH, http tests disabled
checking for nghttpx... no
checking for caddy... /usr/bin/caddy
checking build system type... x86_64-pc-linux-gnu
checking host system type... x86_64-pc-linux-gnu
checking for grep that handles long lines and -e... (cached) /usr/bin/grep
checking for egrep... /usr/bin/grep -E
checking if OS is AIX (to define _ALL_SOURCE)... no
checking if _THREAD_SAFE is already defined... no
checking if _THREAD_SAFE is actually needed... no
checking if _THREAD_SAFE is onwards defined... no
checking if _REENTRANT is already defined... no
checking if _REENTRANT is actually needed... no
checking if _REENTRANT is onwards defined... no
checking for special C compiler options needed for large files... no
checking for _FILE_OFFSET_BITS value needed for large files... no
checking how to print strings... printf
checking for a sed that does not truncate output... (cached) /usr/bin/sed
checking for fgrep... /usr/bin/grep -F
checking for ld used by ccache gcc... /usr/bin/ld
checking if the linker (/usr/bin/ld) is GNU ld... yes
checking for BSD- or MS-compatible name lister (nm)... /usr/bin/nm -B
checking the name lister (/usr/bin/nm -B) interface... BSD nm
checking whether ln -s works... yes
checking the maximum length of command line arguments... 1572864
checking how to convert x86_64-pc-linux-gnu file names to x86_64-pc-linux-gnu format... func_convert_file_noop
checking how to convert x86_64-pc-linux-gnu file names to toolchain format... func_convert_file_noop
checking for /usr/bin/ld option to reload object files... -r
checking for objdump... objdump
checking how to recognize dependent libraries... pass_all
checking for dlltool... no
checking how to associate runtime and link libraries... printf %s\n
checking for archiver @FILE support... @
checking for strip... strip
checking for ranlib... ranlib
checking command to parse /usr/bin/nm -B output from ccache gcc object... ok
checking for sysroot... no
checking for a working dd... /usr/bin/dd
checking how to truncate binary pipes... /usr/bin/dd bs=4096 count=1
checking for mt... mt
checking if mt is a manifest tool... no
checking for dlfcn.h... yes
checking for objdir... .libs
checking if ccache gcc supports -fno-rtti -fno-exceptions... no
checking for ccache gcc option to produce PIC... -fPIC -DPIC
checking if ccache gcc PIC flag -fPIC -DPIC works... yes
checking if ccache gcc static flag -static works... yes
checking if ccache gcc supports -c -o file.o... yes
checking if ccache gcc supports -c -o file.o... (cached) yes
checking whether the ccache gcc linker (/usr/bin/ld -m elf_x86_64) supports shared libraries... yes
checking dynamic linker characteristics... GNU/Linux ld.so
checking how to hardcode library paths into programs... immediate
checking whether stripping libraries is possible... yes
checking if libtool supports shared libraries... yes
checking whether to build shared libraries... no
checking whether to build static libraries... yes
checking whether to build shared libraries with -version-info... yes
checking whether to build shared libraries with -no-undefined... no
checking whether to build shared libraries with -mimpure-text... no
checking whether to build shared libraries with PIC... yes
checking whether to build static libraries with PIC... yes
checking whether to build shared libraries only... no
checking whether to build static libraries only... yes
checking for windres... no
checking if cpp -P is needed... yes
checking if cpp -P works... yes
checking if compiler is DEC/Compaq/HP C... no
checking if compiler is HP-UX C... no
checking if compiler is IBM C... no
checking if compiler is Intel C... no
checking if compiler is clang... no
checking if compiler is GNU C... yes
checking compiler version... gcc '1100' (raw: '11')
checking if compiler is SunPro C... no
checking if compiler is Tiny C... no
checking whether build target is a native Windows one... no
checking if compiler accepts some basic options... yes
configure: compiler options added: -Werror-implicit-function-declaration
checking if compiler optimizer assumed setting might be used... yes
checking if compiler accepts optimizer enabling options... yes
configure: compiler options added: -O2
checking if compiler accepts strict warning options... yes
configure: compiler options added: -Wno-system-headers
checking if compiler halts on compilation errors... yes
checking if compiler halts on negative sized arrays... yes
checking if compiler halts on function prototype mismatch... yes
checking if compiler supports hiding library internal symbols... yes
no
checking whether build target supports Win32 crypto API... no
checking whether to build libcurl and curl in "unity" mode... no
checking whether to build tests into single-binary bundles... no
checking whether to support http... yes
checking whether to support ftp... yes
checking whether to support file... yes
checking whether to support IPFS... yes
checking whether to support ldap... yes
checking whether to support ldaps... yes
checking whether to support rtsp... yes
checking whether to support proxies... yes
checking whether to support dict... yes
checking whether to support telnet... yes
checking whether to support tftp... yes
checking whether to support pop3... yes
checking whether to support imap... yes
checking whether to support smb... yes
checking whether to support smtp... yes
checking whether to support gopher... yes
checking whether to support mqtt... no
checking whether to provide built-in manual... yes
checking whether to build documentation... no
checking whether to enable generation of C code... yes
checking whether to use libgcc... no
checking if X/Open network library is required... no
checking for gethostbyname... yes
checking whether build target is a native Windows one... (cached) no
checking for proto/bsdsocket.h... no
checking for connect in libraries... yes
checking for sys/types.h... (cached) yes
checking for sys/time.h... yes
checking for monotonic clock_gettime... yes
checking for clock_gettime in libraries... no additional lib required
checking if monotonic clock_gettime works... yes
checking for sys/types.h... (cached) yes
checking for sys/time.h... (cached) yes
checking for raw monotonic clock_gettime... yes
checking for pkg-config... /usr/bin/pkg-config
checking for zlib options with pkg-config... found
checking for zlib.h... yes
configure: found both libz and libz.h header
checking for BrotliDecoderDecompress in -lbrotlidec... no
checking for brotli/decode.h... no
checking for ZSTD_createDStream in -lzstd... no
checking for zstd.h... no
checking for lber.h... no
checking for ldap.h... no
checking for ldap_ssl.h... no
checking for LDAP libraries... cannot find LDAP libraries
checking whether to enable IPv6... yes
checking if struct sockaddr_in6 has sin6_scope_id member... yes
checking if argv can be written to... yes
checking if GSS-API support is requested... no
checking whether to enable Windows native SSL/TLS... no
checking whether to enable Secure Transport... no
checking whether to enable Amiga native SSL/TLS (AmiSSL v5)... no
checking for pkg-config... (cached) /usr/bin/pkg-config
checking for libpsl options with pkg-config... found
checking for psl_builtin in -lpsl... yes
checking for libpsl.h... yes
checking for library containing gsasl_init... no
checking for RTMP_Init in -lrtmp... no
checking whether versioned symbols are wanted... no
checking whether to build with libidn2... (assumed) yes
checking for pkg-config... (cached) /usr/bin/pkg-config
checking for libidn2 options with pkg-config... no
configure: IDN_LIBS: "-lidn2"
configure: IDN_LDFLAGS: ""
configure: IDN_CPPFLAGS: ""
configure: IDN_DIR: ""
checking if idn2_lookup_ul can be linked... no
checking for idn2.h... no
checking for pkg-config... (cached) /usr/bin/pkg-config
checking for libnghttp2 options with pkg-config... no
checking for nghttp2_session_get_stream_local_window_size in -lnghttp2... no
checking for sys/types.h... (cached) yes
checking for sys/time.h... (cached) yes
checking for sys/select.h... yes
checking for sys/socket.h... yes
checking for sys/ioctl.h... yes
checking for unistd.h... (cached) yes
checking for arpa/inet.h... yes
checking for net/if.h... yes
checking for netinet/in.h... yes
checking for netinet/in6.h... no
checking for sys/un.h... yes
checking for linux/tcp.h... yes
checking for netinet/tcp.h... yes
checking for netinet/udp.h... yes
checking for netdb.h... yes
checking for sys/sockio.h... no
checking for sys/stat.h... (cached) yes
checking for sys/param.h... yes
checking for termios.h... yes
checking for termio.h... yes
checking for fcntl.h... yes
checking for io.h... no
checking for pwd.h... yes
checking for utime.h... yes
checking for sys/utime.h... no
checking for sys/poll.h... yes
checking for poll.h... yes
checking for sys/resource.h... yes
checking for libgen.h... yes
checking for locale.h... yes
checking for stdbool.h... yes
checking for stdint.h... (cached) yes
checking for sys/filio.h... no
checking for sys/eventfd.h... yes
checking for an ANSI C-conforming const... yes
checking for size_t... yes
checking for sys/types.h... (cached) yes
checking for sys/time.h... (cached) yes
checking for sys/socket.h... (cached) yes
checking for struct timeval... yes
checking run-time libs availability... fine
checking size of size_t... 8
checking size of long... 8
checking size of int... 4
checking size of time_t... 8
checking size of off_t... 8
checking size of curl_off_t... 8
checking size of curl_socket_t... 4
checking for long long... yes
checking for ssize_t... yes
checking for bool... yes
checking for sa_family_t... yes
checking for suseconds_t... yes
checking if time_t is unsigned... no
checking for struct sockaddr_storage... yes
checking for sys/select.h... (cached) yes
checking for sys/socket.h... (cached) yes
checking for select... yes
checking for sys/types.h... (cached) yes
checking for sys/socket.h... (cached) yes
checking for recv... yes
checking for sys/types.h... (cached) yes
checking for sys/socket.h... (cached) yes
checking for send... yes
checking for sys/types.h... (cached) yes
checking for sys/socket.h... (cached) yes
checking for MSG_NOSIGNAL... yes
checking for sys/types.h... (cached) yes
checking for unistd.h... (cached) yes
checking if alarm can be linked... yes
checking if alarm is prototyped... yes
checking if alarm is compilable... yes
checking if alarm usage allowed... yes
checking if alarm might be used... yes
checking for sys/types.h... (cached) yes
checking for strings.h... (cached) yes
checking for sys/types.h... (cached) yes
checking for libgen.h... (cached) yes
checking if basename can be linked... yes
checking if basename is prototyped... yes
checking if basename is compilable... yes
checking if basename usage allowed... yes
checking if basename might be used... yes
checking if closesocket can be linked... no
checking if closesocket might be used... no
checking for sys/types.h... (cached) yes
checking for sys/socket.h... (cached) yes
checking if CloseSocket can be linked... no
checking if CloseSocket might be used... no
checking for sys/types.h... (cached) yes
checking for unistd.h... (cached) yes
checking for fcntl.h... (cached) yes
checking if fcntl can be linked... yes
checking if fcntl is prototyped... yes
checking if fcntl is compilable... yes
checking if fcntl usage allowed... yes
checking if fcntl might be used... yes
checking if fcntl O_NONBLOCK is compilable... yes
checking if fcntl O_NONBLOCK usage allowed... yes
checking if fcntl O_NONBLOCK might be used... yes
checking whether build target is a native Windows one... (cached) no
checking for sys/types.h... (cached) yes
checking for netdb.h... (cached) yes
checking if freeaddrinfo can be linked... yes
checking if freeaddrinfo is prototyped... yes
checking if freeaddrinfo is compilable... yes
checking if freeaddrinfo usage allowed... yes
checking if freeaddrinfo might be used... yes
checking for sys/types.h... (cached) yes
checking for sys/xattr.h... yes
checking if fsetxattr can be linked... yes
checking if fsetxattr is prototyped... yes
checking if fsetxattr takes 5 args.... yes
checking if fsetxattr is compilable... yes
checking if fsetxattr usage allowed... yes
checking if fsetxattr might be used... yes
checking if ftruncate can be linked... yes
checking if ftruncate is prototyped... yes
checking if ftruncate is compilable... yes
checking if ftruncate usage allowed... yes
checking if ftruncate might be used... yes
checking for sys/types.h... (cached) yes
checking if getaddrinfo can be linked... yes
checking if getaddrinfo is prototyped... yes
checking if getaddrinfo is compilable... yes
checking if getaddrinfo seems to work... yes
checking if getaddrinfo usage allowed... yes
checking if getaddrinfo might be used... yes
checking if getaddrinfo is threadsafe... yes
checking if gethostbyname_r can be linked... yes
checking if gethostbyname_r is prototyped... yes
checking if gethostbyname_r takes 3 args.... no
checking if gethostbyname_r takes 5 args.... no
checking if gethostbyname_r takes 6 args.... yes
checking if gethostbyname_r is compilable... yes
checking if gethostbyname_r usage allowed... yes
checking if gethostbyname_r might be used... yes
checking if gethostname can be linked... yes
checking if gethostname is prototyped... yes
checking if gethostname is compilable... yes
checking for gethostname arg 2 data type... size_t
checking if gethostname usage allowed... yes
checking if gethostname might be used... yes
checking for sys/types.h... (cached) yes
checking for sys/socket.h... (cached) yes
checking for netinet/in.h... (cached) yes
checking for ifaddrs.h... yes
checking if getifaddrs can be linked... yes
checking if getifaddrs is prototyped... yes
checking if getifaddrs is compilable... yes
checking if getifaddrs seems to work... yes
checking if getifaddrs usage allowed... yes
checking if getifaddrs might be used... yes
checking if getpeername can be linked... yes
checking if getpeername is prototyped... yes
checking if getpeername is compilable... yes
checking if getpeername usage allowed... yes
checking if getpeername might be used... yes
checking if getsockname can be linked... yes
checking if getsockname is prototyped... yes
checking if getsockname is compilable... yes
checking if getsockname usage allowed... yes
checking if getsockname might be used... yes
checking for sys/types.h... (cached) yes
checking for sys/time.h... (cached) yes
checking if gmtime_r can be linked... yes
checking if gmtime_r is prototyped... yes
checking if gmtime_r is compilable... yes
checking if gmtime_r seems to work... yes
checking if gmtime_r usage allowed... yes
checking if gmtime_r might be used... yes
checking for sys/types.h... (cached) yes
checking for unistd.h... (cached) yes
checking for sys/socket.h... (cached) yes
checking for sys/ioctl.h... (cached) yes
checking for stropts.h... no
checking if ioctl can be linked... yes
checking if ioctl is prototyped... yes
checking if ioctl is compilable... yes
checking if ioctl usage allowed... yes
checking if ioctl might be used... yes
checking if ioctl FIONBIO is compilable... yes
checking if ioctl FIONBIO usage allowed... yes
checking if ioctl FIONBIO might be used... yes
checking if ioctl SIOCGIFADDR is compilable... yes
checking if ioctl SIOCGIFADDR usage allowed... yes
checking if ioctl SIOCGIFADDR might be used... yes
checking if ioctlsocket can be linked... no
checking if ioctlsocket might be used... no
checking if IoctlSocket can be linked... no
checking if IoctlSocket might be used... no
checking if memrchr can be linked... yes
checking if memrchr is prototyped... yes
checking if memrchr is compilable... yes
checking if memrchr usage allowed... yes
checking if memrchr might be used... yes
checking for sys/types.h... (cached) yes
checking if sigaction can be linked... yes
checking if sigaction is prototyped... yes
checking if sigaction is compilable... yes
checking if sigaction usage allowed... yes
checking if sigaction might be used... yes
checking if siginterrupt can be linked... yes
checking if siginterrupt is prototyped... yes
checking if siginterrupt is compilable... yes
checking if siginterrupt usage allowed... yes
checking if siginterrupt might be used... yes
checking if signal can be linked... yes
checking if signal is prototyped... yes
checking if signal is compilable... yes
checking if signal usage allowed... yes
checking if signal might be used... yes
checking for sys/types.h... (cached) yes
checking if sigsetjmp can be linked... no
checking if sigsetjmp seems a macro... yes
checking if sigsetjmp is compilable... yes
checking if sigsetjmp usage allowed... yes
checking if sigsetjmp might be used... yes
checking if socket can be linked... yes
checking if socket is prototyped... yes
checking if socket is compilable... yes
checking if socket usage allowed... yes
checking if socket might be used... yes
checking if socketpair can be linked... yes
checking if socketpair is prototyped... yes
checking if socketpair is compilable... yes
checking if socketpair usage allowed... yes
checking if socketpair might be used... yes
checking if strdup can be linked... yes
checking if strdup is prototyped... yes
checking if strdup is compilable... yes
checking if strdup usage allowed... yes
checking if strdup might be used... yes
checking if strerror_r can be linked... yes
checking if strerror_r is prototyped... yes
checking if strerror_r is compilable... yes
checking if strerror_r is glibc like... yes
checking if strerror_r seems to work... yes
checking if strerror_r usage allowed... yes
checking if strerror_r might be used... yes
checking for accept4... yes
checking for eventfd... yes
checking for fnmatch... yes
checking for geteuid... yes
checking for getpass_r... no
checking for getppid... yes
checking for getpwuid... yes
checking for getpwuid_r... yes
checking for getrlimit... yes
checking for gettimeofday... yes
checking for mach_absolute_time... no
checking for pipe... yes
checking for pipe2... yes
checking for poll... yes
checking for sendmmsg... yes
checking for sendmsg... yes
checking for setlocale... yes
checking for setrlimit... yes
checking for snprintf... yes
checking for utime... yes
checking for utimes... yes
checking for if_nametoindex... yes
checking for realpath... yes
checking for sched_yield... yes
checking for sys/types.h... (cached) yes
checking for sys/socket.h... (cached) yes
checking for netinet/in.h... (cached) yes
checking for arpa/inet.h... (cached) yes
checking if inet_ntop can be linked... yes
checking if inet_ntop is prototyped... yes
checking if inet_ntop is compilable... yes
checking if inet_ntop seems to work... yes
checking if inet_ntop usage allowed... yes
checking if inet_ntop might be used... yes
checking if inet_pton can be linked... yes
checking if inet_pton is prototyped... yes
checking if inet_pton is compilable... yes
checking if inet_pton seems to work... yes
checking if inet_pton usage allowed... yes
checking if inet_pton might be used... yes
checking if strcasecmp can be linked... yes
checking if strcasecmp is prototyped... yes
checking if strcasecmp is compilable... yes
checking if strcasecmp usage allowed... yes
checking if strcasecmp might be used... yes
checking if strcmpi can be linked... no
checking if strcmpi might be used... no
checking if stricmp can be linked... no
checking if stricmp might be used... no
checking for setmode... no
checking for arc4random... no
checking for fseeko... yes
checking for ccache gcc options needed to detect all undeclared functions... none needed
checking whether fseeko is declared... yes
checking how to set a socket into non-blocking mode... fcntl O_NONBLOCK
checking for perl... /usr/bin/perl
checking whether to enable the threaded resolver... yes
checking for pthread.h... yes
checking for pthread_create... yes
checking for dirent.h... yes
checking for opendir... yes
checking convert -I options to -isystem... yes
checking whether to enable verbose strings... yes
checking whether to enable SSPI support (Windows native builds only)... no
checking whether to enable basic authentication method... yes
checking whether to enable bearer authentication method... yes
checking whether to enable digest authentication method... yes
checking whether to enable kerberos authentication method... yes
checking whether to enable negotiate authentication method... yes
checking whether to enable aws sig methods... yes
checking whether to support NTLM... yes
checking whether to enable TLS-SRP authentication... yes
checking whether to enable Unix domain sockets... auto
checking for struct sockaddr_un.sun_path... yes
checking whether to support cookies... yes
checking whether to support socketpair... yes
checking whether to support HTTP authentication... yes
checking whether to support DoH... yes
checking whether to support the MIME API... yes
checking whether to support binding connections locally... yes
checking whether to support the form API... yes
checking whether to support date parsing... yes
checking whether to support netrc parsing... yes
checking whether to support progress-meter... yes
checking whether to support the SHA-512/256 hash algorithm... yes
checking whether to support DNS shuffling... yes
checking whether to support curl_easy_option*... yes
checking whether to support alt-svc... yes
checking whether to support headers-api... yes
configure: disables HSTS due to lack of SSL
checking whether to enable HTTPS-RR support... no
checking whether to support WebSockets... yes
checking whether hiding of library internal symbols will actually happen... yes
checking if this build supports HTTPS-proxy... no
checking that generated files are newer than configure... done
configure: creating ./config.status
config.status: creating Makefile
config.status: creating docs/Makefile
config.status: creating docs/examples/Makefile
config.status: creating docs/libcurl/Makefile
config.status: creating docs/libcurl/opts/Makefile
config.status: creating docs/cmdline-opts/Makefile
config.status: creating include/Makefile
config.status: creating include/curl/Makefile
config.status: creating src/Makefile
config.status: creating lib/Makefile
config.status: creating scripts/Makefile
config.status: creating lib/libcurl.vers
config.status: creating tests/Makefile
config.status: creating tests/config
config.status: creating tests/configurehelp.pm
config.status: creating tests/certs/Makefile
config.status: creating tests/data/Makefile
config.status: creating tests/server/Makefile
config.status: creating tests/libtest/Makefile
config.status: creating tests/unit/Makefile
config.status: creating tests/tunit/Makefile
config.status: creating tests/http/config.ini
config.status: creating tests/http/Makefile
config.status: creating tests/http/clients/Makefile
config.status: creating packages/Makefile
config.status: creating packages/vms/Makefile
config.status: creating curl-config
config.status: creating libcurl.pc
config.status: creating lib/curl_config.h
config.status: executing depfiles commands
config.status: executing libtool commands
configure: Configured to build curl/libcurl:
Host setup: x86_64-pc-linux-gnu
Install prefix: /usr/local
Compiler: ccache gcc
CFLAGS: -Werror-implicit-function-declaration -O2 -Wno-system-headers
CFLAGS extras:
CPPFLAGS: -D_GNU_SOURCE
LDFLAGS:
curl-config:
LIBS: -lpsl -lz
curl version: 8.14.0-DEV
SSL: no (--with-{openssl,gnutls,mbedtls,wolfssl,schannel,secure-transport,amissl,bearssl,rustls} )
SSH: no (--with-{libssh,libssh2})
zlib: enabled
brotli: no (--with-brotli)
zstd: no (--with-zstd)
GSS-API: no (--with-gssapi)
GSASL: no (libgsasl not found)
TLS-SRP: no (--enable-tls-srp)
resolver: POSIX threaded
IPv6: enabled
Unix sockets: enabled
IDN: no (--with-{libidn2,winidn})
Build docs: no
Build libcurl: Shared=no, Static=yes
Built-in manual: no (--enable-manual)
--libcurl option: enabled (--disable-libcurl-option)
Verbose errors: enabled (--disable-verbose)
Code coverage: disabled
SSPI: no (--enable-sspi)
ca cert bundle: no
ca cert path:
ca cert embed: no
ca fallback:
LDAP: no (--enable-ldap / --with-ldap-lib / --with-lber-lib)
LDAPS: no (--enable-ldaps)
IPFS/IPNS: enabled
RTSP: enabled
RTMP: no (--with-librtmp)
PSL: enabled
Alt-svc: enabled (--disable-alt-svc)
Headers API: enabled (--disable-headers-api)
HSTS: no (--enable-hsts)
HTTP1: enabled (internal)
HTTP2: no (--with-nghttp2)
HTTP3: no (--with-ngtcp2 --with-nghttp3, --with-quiche, --with-openssl-quic, --with-msh3)
ECH: no (--enable-ech)
HTTPS RR: no (--enable-httpsrr)
SSLS-EXPORT: no (--enable-ssls-export)
Protocols: dict file ftp gopher http imap ipfs ipns mqtt pop3 rtsp smtp telnet tftp ws
Features: alt-svc AsynchDNS IPv6 Largefile libz PSL threadsafe UnixSockets
configure: WARNING: Cannot find libraries for LDAP support: LDAP disabled
configure: WARNING: libgsasl was not found
configure: WARNING: Cannot find libidn2
$ make -j3
Making all in lib
make[1]: Entering directory '/root/asi_db/builds/curl/_worktrees/w0/lib'
make all-am
make[2]: Entering directory '/root/asi_db/builds/curl/_worktrees/w0/lib'
CC libcurl_la-amigaos.lo
CC libcurl_la-altsvc.lo
CC libcurl_la-asyn-ares.lo
CC libcurl_la-asyn-base.lo
CC libcurl_la-asyn-thrdd.lo
CC libcurl_la-base64.lo
CC libcurl_la-bufq.lo
CC libcurl_la-bufref.lo
CC libcurl_la-cf-h1-proxy.lo
CC libcurl_la-cf-h2-proxy.lo
CC libcurl_la-cf-haproxy.lo
CC libcurl_la-cf-https-connect.lo
CC libcurl_la-cf-socket.lo
CC libcurl_la-cfilters.lo
CC libcurl_la-conncache.lo
CC libcurl_la-connect.lo
CC libcurl_la-content_encoding.lo
CC libcurl_la-cookie.lo
CC libcurl_la-cshutdn.lo
CC libcurl_la-curl_addrinfo.lo
CC libcurl_la-curl_des.lo
CC libcurl_la-curl_endian.lo
CC libcurl_la-curl_fnmatch.lo
CC libcurl_la-curl_get_line.lo
CC libcurl_la-curl_gethostname.lo
CC libcurl_la-curl_gssapi.lo
CC libcurl_la-curl_memrchr.lo
CC libcurl_la-curl_multibyte.lo
CC libcurl_la-curl_ntlm_core.lo
CC libcurl_la-curl_range.lo
CC libcurl_la-curl_sasl.lo
CC libcurl_la-curl_sha512_256.lo
CC libcurl_la-curl_rtmp.lo
CC libcurl_la-curl_sspi.lo
CC libcurl_la-curl_threads.lo
CC libcurl_la-curl_trc.lo
CC libcurl_la-cw-out.lo
CC libcurl_la-cw-pause.lo
CC libcurl_la-dict.lo
CC libcurl_la-doh.lo
CC libcurl_la-dynbuf.lo
CC libcurl_la-dynhds.lo
CC libcurl_la-easy.lo
CC libcurl_la-easygetopt.lo
CC libcurl_la-easyoptions.lo
CC libcurl_la-escape.lo
CC libcurl_la-fake_addrinfo.lo
CC libcurl_la-file.lo
CC libcurl_la-fileinfo.lo
CC libcurl_la-fopen.lo
CC libcurl_la-formdata.lo
CC libcurl_la-ftp.lo
CC libcurl_la-ftplistparser.lo
CC libcurl_la-getenv.lo
CC libcurl_la-getinfo.lo
CC libcurl_la-gopher.lo
CC libcurl_la-hash.lo
CC libcurl_la-headers.lo
CC libcurl_la-hmac.lo
CC libcurl_la-hostip.lo
CC libcurl_la-hostip4.lo
CC libcurl_la-hostip6.lo
CC libcurl_la-hsts.lo
CC libcurl_la-http.lo
CC libcurl_la-http1.lo
CC libcurl_la-http2.lo
CC libcurl_la-http_aws_sigv4.lo
CC libcurl_la-http_chunks.lo
CC libcurl_la-http_digest.lo
CC libcurl_la-http_negotiate.lo
CC libcurl_la-http_ntlm.lo
CC libcurl_la-http_proxy.lo
CC libcurl_la-httpsrr.lo
CC libcurl_la-idn.lo
CC libcurl_la-imap.lo
CC libcurl_la-if2ip.lo
CC libcurl_la-inet_ntop.lo
CC libcurl_la-inet_pton.lo
CC libcurl_la-krb5.lo
CC libcurl_la-ldap.lo
CC libcurl_la-llist.lo
CC libcurl_la-macos.lo
CC libcurl_la-md4.lo
CC libcurl_la-md5.lo
CC libcurl_la-memdebug.lo
CC libcurl_la-mime.lo
CC libcurl_la-mprintf.lo
CC libcurl_la-mqtt.lo
CC libcurl_la-multi.lo
CC libcurl_la-multi_ev.lo
CC libcurl_la-netrc.lo
CC libcurl_la-nonblock.lo
CC libcurl_la-noproxy.lo
CC libcurl_la-openldap.lo
CC libcurl_la-parsedate.lo
CC libcurl_la-pingpong.lo
CC libcurl_la-pop3.lo
CC libcurl_la-progress.lo
CC libcurl_la-psl.lo
CC libcurl_la-rand.lo
CC libcurl_la-rename.lo
CC libcurl_la-request.lo
CC libcurl_la-rtsp.lo
CC libcurl_la-select.lo
CC libcurl_la-sendf.lo
CC libcurl_la-setopt.lo
CC libcurl_la-sha256.lo
CC libcurl_la-share.lo
CC libcurl_la-slist.lo
CC libcurl_la-smb.lo
CC libcurl_la-smtp.lo
CC libcurl_la-socketpair.lo
CC libcurl_la-socks.lo
CC libcurl_la-socks_gssapi.lo
CC libcurl_la-socks_sspi.lo
CC libcurl_la-speedcheck.lo
CC libcurl_la-splay.lo
CC libcurl_la-strcase.lo
CC libcurl_la-strdup.lo
CC libcurl_la-strequal.lo
CC libcurl_la-strerror.lo
CC libcurl_la-strparse.lo
CC libcurl_la-system_win32.lo
CC libcurl_la-telnet.lo
CC libcurl_la-tftp.lo
CC libcurl_la-timediff.lo
CC libcurl_la-timeval.lo
CC libcurl_la-transfer.lo
CC libcurl_la-uint-bset.lo
CC libcurl_la-uint-hash.lo
CC libcurl_la-uint-spbset.lo
CC libcurl_la-uint-table.lo
CC libcurl_la-url.lo
CC libcurl_la-urlapi.lo
CC libcurl_la-version.lo
CC libcurl_la-version_win32.lo
CC libcurl_la-warnless.lo
CC libcurl_la-ws.lo
CC libcurlu_la-amigaos.lo
CC libcurlu_la-asyn-ares.lo
CC libcurlu_la-altsvc.lo
CC libcurlu_la-asyn-base.lo
CC libcurlu_la-asyn-thrdd.lo
CC libcurlu_la-base64.lo
CC libcurlu_la-bufq.lo
CC libcurlu_la-bufref.lo
CC libcurlu_la-cf-h1-proxy.lo
CC libcurlu_la-cf-h2-proxy.lo
CC libcurlu_la-cf-haproxy.lo
CC libcurlu_la-cf-https-connect.lo
CC libcurlu_la-cf-socket.lo
CC libcurlu_la-cfilters.lo
CC libcurlu_la-conncache.lo
CC libcurlu_la-connect.lo
CC libcurlu_la-content_encoding.lo
CC libcurlu_la-cookie.lo
CC libcurlu_la-cshutdn.lo
CC libcurlu_la-curl_addrinfo.lo
CC libcurlu_la-curl_des.lo
CC libcurlu_la-curl_endian.lo
CC libcurlu_la-curl_fnmatch.lo
CC libcurlu_la-curl_get_line.lo
CC libcurlu_la-curl_gethostname.lo
CC libcurlu_la-curl_gssapi.lo
CC libcurlu_la-curl_memrchr.lo
CC libcurlu_la-curl_multibyte.lo
CC libcurlu_la-curl_ntlm_core.lo
CC libcurlu_la-curl_range.lo
CC libcurlu_la-curl_rtmp.lo
CC libcurlu_la-curl_sasl.lo
CC libcurlu_la-curl_sha512_256.lo
CC libcurlu_la-curl_sspi.lo
CC libcurlu_la-curl_threads.lo
CC libcurlu_la-curl_trc.lo
CC libcurlu_la-cw-out.lo
CC libcurlu_la-cw-pause.lo
CC libcurlu_la-dict.lo
CC libcurlu_la-doh.lo
CC libcurlu_la-dynbuf.lo
CC libcurlu_la-dynhds.lo
CC libcurlu_la-easy.lo
CC libcurlu_la-easygetopt.lo
CC libcurlu_la-easyoptions.lo
CC libcurlu_la-escape.lo
CC libcurlu_la-fake_addrinfo.lo
CC libcurlu_la-file.lo
CC libcurlu_la-fileinfo.lo
CC libcurlu_la-fopen.lo
CC libcurlu_la-formdata.lo
CC libcurlu_la-ftp.lo
CC libcurlu_la-ftplistparser.lo
CC libcurlu_la-getenv.lo
CC libcurlu_la-getinfo.lo
CC libcurlu_la-gopher.lo
CC libcurlu_la-hash.lo
CC libcurlu_la-headers.lo
CC libcurlu_la-hmac.lo
CC libcurlu_la-hostip.lo
CC libcurlu_la-hostip4.lo
CC libcurlu_la-hostip6.lo
CC libcurlu_la-hsts.lo
CC libcurlu_la-http.lo
CC libcurlu_la-http1.lo
CC libcurlu_la-http2.lo
CC libcurlu_la-http_aws_sigv4.lo
CC libcurlu_la-http_chunks.lo
CC libcurlu_la-http_digest.lo
CC libcurlu_la-http_negotiate.lo
CC libcurlu_la-http_ntlm.lo
CC libcurlu_la-http_proxy.lo
CC libcurlu_la-httpsrr.lo
CC libcurlu_la-idn.lo
CC libcurlu_la-if2ip.lo
CC libcurlu_la-imap.lo
CC libcurlu_la-inet_ntop.lo
CC libcurlu_la-inet_pton.lo
CC libcurlu_la-krb5.lo
CC libcurlu_la-llist.lo
CC libcurlu_la-ldap.lo
CC libcurlu_la-macos.lo
CC libcurlu_la-md4.lo
CC libcurlu_la-md5.lo
CC libcurlu_la-memdebug.lo
CC libcurlu_la-mime.lo
CC libcurlu_la-mprintf.lo
CC libcurlu_la-mqtt.lo
CC libcurlu_la-multi_ev.lo
CC libcurlu_la-multi.lo
CC libcurlu_la-netrc.lo
CC libcurlu_la-nonblock.lo
CC libcurlu_la-noproxy.lo
CC libcurlu_la-openldap.lo
CC libcurlu_la-parsedate.lo
CC libcurlu_la-pingpong.lo
CC libcurlu_la-pop3.lo
CC libcurlu_la-progress.lo
CC libcurlu_la-psl.lo
CC libcurlu_la-rand.lo
CC libcurlu_la-rename.lo
CC libcurlu_la-request.lo
CC libcurlu_la-rtsp.lo
CC libcurlu_la-select.lo
CC libcurlu_la-sendf.lo
CC libcurlu_la-setopt.lo
CC libcurlu_la-sha256.lo
CC libcurlu_la-share.lo
CC libcurlu_la-slist.lo
CC libcurlu_la-smb.lo
CC libcurlu_la-smtp.lo
CC libcurlu_la-socketpair.lo
CC libcurlu_la-socks.lo
CC libcurlu_la-socks_gssapi.lo
CC libcurlu_la-socks_sspi.lo
CC libcurlu_la-speedcheck.lo
CC libcurlu_la-splay.lo
CC libcurlu_la-strcase.lo
CC libcurlu_la-strdup.lo
CC libcurlu_la-strequal.lo
CC libcurlu_la-strerror.lo
CC libcurlu_la-strparse.lo
CC libcurlu_la-system_win32.lo
CC libcurlu_la-telnet.lo
CC libcurlu_la-tftp.lo
CC libcurlu_la-timediff.lo
CC libcurlu_la-timeval.lo
CC libcurlu_la-transfer.lo
CC libcurlu_la-uint-bset.lo
CC libcurlu_la-uint-hash.lo
CC libcurlu_la-uint-spbset.lo
CC libcurlu_la-uint-table.lo
CC libcurlu_la-url.lo
CC libcurlu_la-version.lo
CC libcurlu_la-urlapi.lo
CC libcurlu_la-version_win32.lo
CC libcurlu_la-warnless.lo
CC libcurlu_la-ws.lo
CC vauth/libcurlu_la-cleartext.lo
CC vauth/libcurlu_la-cram.lo
CC vauth/libcurlu_la-digest.lo
CC vauth/libcurlu_la-digest_sspi.lo
CC vauth/libcurlu_la-gsasl.lo
CC vauth/libcurlu_la-krb5_gssapi.lo
CC vauth/libcurlu_la-krb5_sspi.lo
CC vauth/libcurlu_la-ntlm.lo
CC vauth/libcurlu_la-ntlm_sspi.lo
CC vauth/libcurlu_la-oauth2.lo
CC vauth/libcurlu_la-spnego_gssapi.lo
CC vauth/libcurlu_la-spnego_sspi.lo
CC vauth/libcurlu_la-vauth.lo
CC vtls/libcurlu_la-bearssl.lo
CC vtls/libcurlu_la-cipher_suite.lo
CC vtls/libcurlu_la-gtls.lo
CC vtls/libcurlu_la-hostcheck.lo
CC vtls/libcurlu_la-keylog.lo
CC vtls/libcurlu_la-mbedtls.lo
CC vtls/libcurlu_la-mbedtls_threadlock.lo
CC vtls/libcurlu_la-openssl.lo
CC vtls/libcurlu_la-rustls.lo
CC vtls/libcurlu_la-schannel.lo
CC vtls/libcurlu_la-schannel_verify.lo
CC vtls/libcurlu_la-sectransp.lo
CC vtls/libcurlu_la-vtls.lo
CC vtls/libcurlu_la-vtls_scache.lo
CC vtls/libcurlu_la-vtls_spack.lo
CC vtls/libcurlu_la-wolfssl.lo
CC vtls/libcurlu_la-x509asn1.lo
CC vquic/libcurlu_la-curl_msh3.lo
CC vquic/libcurlu_la-curl_ngtcp2.lo
CC vquic/libcurlu_la-curl_osslq.lo
CC vquic/libcurlu_la-curl_quiche.lo
CC vquic/libcurlu_la-vquic.lo
CC vquic/libcurlu_la-vquic-tls.lo
CC vssh/libcurlu_la-libssh.lo
CC vssh/libcurlu_la-libssh2.lo
CC vssh/libcurlu_la-curl_path.lo
CC vssh/libcurlu_la-wolfssh.lo
CC vauth/libcurl_la-cleartext.lo
CC vauth/libcurl_la-cram.lo
CC vauth/libcurl_la-digest.lo
CC vauth/libcurl_la-digest_sspi.lo
CC vauth/libcurl_la-gsasl.lo
CC vauth/libcurl_la-krb5_gssapi.lo
CC vauth/libcurl_la-krb5_sspi.lo
CC vauth/libcurl_la-ntlm.lo
CC vauth/libcurl_la-ntlm_sspi.lo
CC vauth/libcurl_la-oauth2.lo
CC vauth/libcurl_la-spnego_gssapi.lo
CC vauth/libcurl_la-spnego_sspi.lo
CC vauth/libcurl_la-vauth.lo
CC vtls/libcurl_la-bearssl.lo
CC vtls/libcurl_la-cipher_suite.lo
CC vtls/libcurl_la-gtls.lo
CC vtls/libcurl_la-hostcheck.lo
CC vtls/libcurl_la-keylog.lo
CC vtls/libcurl_la-mbedtls.lo
CC vtls/libcurl_la-mbedtls_threadlock.lo
CC vtls/libcurl_la-openssl.lo
CC vtls/libcurl_la-rustls.lo
CC vtls/libcurl_la-schannel.lo
CC vtls/libcurl_la-schannel_verify.lo
CC vtls/libcurl_la-sectransp.lo
CC vtls/libcurl_la-vtls.lo
CC vtls/libcurl_la-vtls_scache.lo
CC vtls/libcurl_la-vtls_spack.lo
CC vtls/libcurl_la-wolfssl.lo
CC vtls/libcurl_la-x509asn1.lo
CC vquic/libcurl_la-curl_msh3.lo
CC vquic/libcurl_la-curl_ngtcp2.lo
CC vquic/libcurl_la-curl_osslq.lo
CC vquic/libcurl_la-curl_quiche.lo
CC vquic/libcurl_la-vquic.lo
CC vquic/libcurl_la-vquic-tls.lo
CC vssh/libcurl_la-libssh.lo
CC vssh/libcurl_la-libssh2.lo
CC vssh/libcurl_la-curl_path.lo
CC vssh/libcurl_la-wolfssh.lo
CCLD libcurlu.la
CCLD libcurl.la
make[2]: Leaving directory '/root/asi_db/builds/curl/_worktrees/w0/lib'
make[1]: Leaving directory '/root/asi_db/builds/curl/_worktrees/w0/lib'
Making all in docs
make[1]: Entering directory '/root/asi_db/builds/curl/_worktrees/w0/docs'
Making all in .
make[2]: Entering directory '/root/asi_db/builds/curl/_worktrees/w0/docs'
make[2]: Nothing to be done for 'all-am'.
make[2]: Leaving directory '/root/asi_db/builds/curl/_worktrees/w0/docs'
Making all in cmdline-opts
make[2]: Entering directory '/root/asi_db/builds/curl/_worktrees/w0/docs/cmdline-opts'
make[2]: Nothing to be done for 'all'.
make[2]: Leaving directory '/root/asi_db/builds/curl/_worktrees/w0/docs/cmdline-opts'
Making all in libcurl
make[2]: Entering directory '/root/asi_db/builds/curl/_worktrees/w0/docs/libcurl'
Making all in opts
make[3]: Entering directory '/root/asi_db/builds/curl/_worktrees/w0/docs/libcurl/opts'
make[3]: Nothing to be done for 'all'.
make[3]: Leaving directory '/root/asi_db/builds/curl/_worktrees/w0/docs/libcurl/opts'
make[3]: Entering directory '/root/asi_db/builds/curl/_worktrees/w0/docs/libcurl'
make[3]: Nothing to be done for 'all-am'.
make[3]: Leaving directory '/root/asi_db/builds/curl/_worktrees/w0/docs/libcurl'
make[2]: Leaving directory '/root/asi_db/builds/curl/_worktrees/w0/docs/libcurl'
make[1]: Leaving directory '/root/asi_db/builds/curl/_worktrees/w0/docs'
Making all in src
make[1]: Entering directory '/root/asi_db/builds/curl/_worktrees/w0/src'
CC curl-slist_wc.o
CC curl-terminal.o
CC curl-tool_bname.o
CC curl-tool_cb_hdr.o
CC curl-tool_cb_dbg.o
CC curl-tool_cb_prg.o
CC curl-tool_cb_rea.o
CC curl-tool_cb_see.o
CC curl-tool_cb_soc.o
CC curl-tool_cb_wrt.o
CC curl-tool_cfgable.o
CC curl-tool_dirhie.o
CC curl-tool_doswin.o
CC curl-tool_easysrc.o
CC curl-tool_filetime.o
CC curl-tool_findfile.o
CC curl-tool_formparse.o
CC curl-tool_getparam.o
CC curl-tool_getpass.o
CC curl-tool_help.o
CC curl-tool_helpers.o
CC curl-tool_ipfs.o
CC curl-tool_libinfo.o
CC curl-tool_listhelp.o
CC curl-tool_main.o
CC curl-tool_msgs.o
CC curl-tool_operate.o
CC curl-tool_operhlp.o
CC curl-tool_paramhlp.o
CC curl-tool_parsecfg.o
CC curl-tool_progress.o
CC curl-tool_setopt.o
CC curl-tool_sleep.o
CC curl-tool_ssls.o
CC curl-tool_stderr.o
CC curl-tool_strdup.o
CC curl-tool_urlglob.o
CC curl-tool_util.o
CC curl-tool_vms.o
CC curl-tool_writeout.o
CC curl-tool_writeout_json.o
CC curl-tool_xattr.o
CC curl-var.o
echo '#include "tool_hugehelp.h"' >> ./tool_hugehelp.c
echo 'extern const void *curl_ca_embed; const void *curl_ca_embed;' > ./tool_ca_embed.c
CC curlinfo.o
CC libcurltool_la-slist_wc.lo
CC libcurltool_la-terminal.lo
CC libcurltool_la-tool_bname.lo
CC libcurltool_la-tool_cb_dbg.lo
CC libcurltool_la-tool_cb_hdr.lo
CC libcurltool_la-tool_cb_prg.lo
CC libcurltool_la-tool_cb_rea.lo
CC libcurltool_la-tool_cb_see.lo
CC libcurltool_la-tool_cb_soc.lo
CC libcurltool_la-tool_cb_wrt.lo
CC libcurltool_la-tool_cfgable.lo
CC libcurltool_la-tool_dirhie.lo
CC libcurltool_la-tool_easysrc.lo
CC libcurltool_la-tool_doswin.lo
CC libcurltool_la-tool_filetime.lo
CC libcurltool_la-tool_findfile.lo
CC libcurltool_la-tool_formparse.lo
CC libcurltool_la-tool_getparam.lo
CC libcurltool_la-tool_getpass.lo
CC libcurltool_la-tool_help.lo
CC libcurltool_la-tool_helpers.lo
CC libcurltool_la-tool_ipfs.lo
CC libcurltool_la-tool_libinfo.lo
CC libcurltool_la-tool_listhelp.lo
CC libcurltool_la-tool_main.lo
CC libcurltool_la-tool_msgs.lo
CC libcurltool_la-tool_operate.lo
CC libcurltool_la-tool_operhlp.lo
CC libcurltool_la-tool_parsecfg.lo
CC libcurltool_la-tool_paramhlp.lo
CC libcurltool_la-tool_progress.lo
CC libcurltool_la-tool_setopt.lo
CC libcurltool_la-tool_sleep.lo
CC libcurltool_la-tool_ssls.lo
CC libcurltool_la-tool_stderr.lo
CC libcurltool_la-tool_strdup.lo
CC libcurltool_la-tool_urlglob.lo
CC libcurltool_la-tool_util.lo
CC libcurltool_la-tool_vms.lo
CC libcurltool_la-tool_writeout.lo
CC libcurltool_la-tool_writeout_json.lo
CC libcurltool_la-tool_xattr.lo
CC ../lib/libcurltool_la-base64.lo
CC libcurltool_la-var.lo
CC ../lib/libcurltool_la-curl_multibyte.lo
CC ../lib/libcurltool_la-dynbuf.lo
CC ../lib/libcurltool_la-nonblock.lo
CC ../lib/libcurltool_la-strparse.lo
CC ../lib/libcurltool_la-strcase.lo
CC ../lib/libcurltool_la-timediff.lo
CC ../lib/libcurltool_la-timeval.lo
CC ../lib/libcurltool_la-version_win32.lo
CC ../lib/libcurltool_la-warnless.lo
CC ../lib/curl-base64.o
CC ../lib/curl-curl_multibyte.o
CC ../lib/curl-dynbuf.o
CC ../lib/curl-nonblock.o
CC ../lib/curl-strparse.o
CC ../lib/curl-strcase.o
CC ../lib/curl-timediff.o
CC ../lib/curl-timeval.o
CC ../lib/curl-version_win32.o
CC ../lib/curl-warnless.o
CC curl-tool_hugehelp.o
CC curl-tool_ca_embed.o
CCLD libcurltool.la
CCLD curlinfo
CCLD curl
make[1]: Leaving directory '/root/asi_db/builds/curl/_worktrees/w0/src'
Making all in scripts
make[1]: Entering directory '/root/asi_db/builds/curl/_worktrees/w0/scripts'
make[1]: Nothing to be done for 'all'.
make[1]: Leaving directory '/root/asi_db/builds/curl/_worktrees/w0/scripts'
make[1]: Entering directory '/root/asi_db/builds/curl/_worktrees/w0'
make[1]: Nothing to be done for 'all-am'.
make[1]: Leaving directory '/root/asi_db/builds/curl/_worktrees/w0'
Commit Diff GitHub →
.github/scripts/spacecheck.pl +5 -5lib/optiontable.pl +1 -1scripts/checksrc.pl +15 -15scripts/completion.pl +1 -1scripts/delta +1 -1scripts/mk-ca-bundle.pl +405 -409tests/directories.pm +196 -196tests/ftpserver.pl +56 -56tests/getpart.pm +50 -50tests/servers.pm +40 -40tests/test1173.pl +2 -2tests/test1222.pl +173 -173tests/test1544.pl +57 -57tests/testcurl.pl +430 -430
.github/scripts/spacecheck.pl+5 -5
| @@ -65,19 +65,19 @@ sub eol_detect { | |
| my $lf = () = $content =~ /\n/g; | |
| if($cr > 0 && $lf == 0) { | |
| - | return "cr" |
| + | return "cr"; |
| } | |
| elsif($cr == 0 && $lf > 0) { | |
| - | return "lf" |
| + | return "lf"; |
| } | |
| elsif($cr == 0 && $lf == 0) { | |
| - | return "bin" |
| + | return "bin"; |
| } | |
| elsif($cr == $lf) { | |
| - | return "crlf" |
| + | return "crlf"; |
| } | |
| - | return "" |
| + | return ""; |
| } | |
| my $issues = 0; | |
lib/optiontable.pl+1 -1
| @@ -109,7 +109,7 @@ while(<STDIN>) { | |
| $o =~ s/^CURLOPT_//; | |
| $n =~ s/^CURLOPT_//; | |
| $alias{$o} = $n; | |
| - | push @names, $o, |
| + | push @names, $o; |
| } | |
| } | |
| } | |
scripts/checksrc.pl+15 -15
| @@ -480,10 +480,10 @@ sub scanfile { | |
| my $count = 0; | |
| while($l =~ /([\d]{4})/g) { | |
| push @copyright, { | |
| - | year => $1, |
| - | line => $line, |
| - | col => index($l, $1), |
| - | code => $l |
| + | year => $1, |
| + | line => $line, |
| + | col => index($l, $1), |
| + | code => $l |
| }; | |
| $count++; | |
| } | |
| @@ -874,7 +874,7 @@ sub scanfile { | |
| $suff =~ s/\(/\\(/; | |
| $l =~ s/$prefix$bad$suff/$prefix$replace/; | |
| goto again; | |
| - | } |
| + | } |
| $l = $bl; # restore to pre-bannedfunc content | |
| if($warnings{"STDERR"}) { | |
| @@ -1040,16 +1040,16 @@ sub scanfile { | |
| } | |
| preproc: | |
| if($prep) { | |
| - | # scan for use of banned symbols on a preprocessor line |
| - | if($l =~ /^(^|.*\W) |
| - | (WIN32) |
| - | (\W|$) |
| - | /x) { |
| - | checkwarn("BANNEDPREPROC", |
| - | $line, length($1), $file, $ol, |
| - | "use of $2 is banned from preprocessor lines" . |
| - | (($2 eq "WIN32") ? ", use _WIN32 instead" : "")); |
| - | } |
| + | # scan for use of banned symbols on a preprocessor line |
| + | if($l =~ /^(^|.*\W) |
| + | (WIN32) |
| + | (\W|$) |
| + | /x) { |
| + | checkwarn("BANNEDPREPROC", |
| + | $line, length($1), $file, $ol, |
| + | "use of $2 is banned from preprocessor lines" . |
| + | (($2 eq "WIN32") ? ", use _WIN32 instead" : "")); |
| + | } |
| } | |
| $line++; | |
| $prevp = $prep; | |
scripts/completion.pl+1 -1
| @@ -52,7 +52,7 @@ if ($shell eq 'fish') { | |
| $opts_str .= qq{ $_ \\\n} foreach (@opts); | |
| chomp $opts_str; | |
| - | my $tmpl = <<"EOS"; |
| + | my $tmpl = <<"EOS"; |
| #compdef curl | |
| # curl zsh completion | |
scripts/delta+1 -1
| @@ -64,7 +64,7 @@ sub setopts { | |
| open(H, "$f"); | |
| my $opts; | |
| while(<H>) { | |
| - | if(/^ CURLOPT(|DEPRECATED)\(/ && ($_ !~ /OBSOLETE/)) { |
| + | if(/^ CURLOPT(|DEPRECATED)\(/ && ($_ !~ /OBSOLETE/)) { |
| $opts++; | |
| } | |
| } | |
scripts/mk-ca-bundle.pl+405 -409
| @@ -43,21 +43,17 @@ use Text::Wrap; | |
| use Time::Local; | |
| my $MOD_SHA = "Digest::SHA"; | |
| eval "require $MOD_SHA"; | |
| - | if ($@) { |
| - | $MOD_SHA = "Digest::SHA::PurePerl"; |
| - | eval "require $MOD_SHA"; |
| + | if($@) { |
| + | $MOD_SHA = "Digest::SHA::PurePerl"; |
| + | eval "require $MOD_SHA"; |
| } | |
| eval "require LWP::UserAgent"; | |
| my %urls = ( | |
| - | 'nss' => |
| - | 'https://hg.mozilla.org/projects/nss/raw-file/default/lib/ckfw/builtins/certdata.txt', |
| - | 'central' => |
| - | 'https://hg.mozilla.org/mozilla-central/raw-file/default/security/nss/lib/ckfw/builtins/certdata.txt', |
| - | 'beta' => |
| - | 'https://hg.mozilla.org/releases/mozilla-beta/raw-file/default/security/nss/lib/ckfw/builtins/certdata.txt', |
| - | 'release' => |
| - | 'https://hg.mozilla.org/releases/mozilla-release/raw-file/default/security/nss/lib/ckfw/builtins/certdata.txt', |
| + | 'nss' => 'https://hg.mozilla.org/projects/nss/raw-file/default/lib/ckfw/builtins/certdata.txt', |
| + | 'central' => 'https://hg.mozilla.org/mozilla-central/raw-file/default/security/nss/lib/ckfw/builtins/certdata.txt', |
| + | 'beta' => 'https://hg.mozilla.org/releases/mozilla-beta/raw-file/default/security/nss/lib/ckfw/builtins/certdata.txt', |
| + | 'release' => 'https://hg.mozilla.org/releases/mozilla-release/raw-file/default/security/nss/lib/ckfw/builtins/certdata.txt', |
| ); | |
| $opt_d = 'release'; | |
| @@ -76,43 +72,43 @@ my $default_mozilla_trust_levels = "TRUSTED_DELEGATOR"; | |
| $opt_p = $default_mozilla_trust_purposes . ":" . $default_mozilla_trust_levels; | |
| my @valid_mozilla_trust_purposes = ( | |
| - | "DIGITAL_SIGNATURE", |
| - | "NON_REPUDIATION", |
| - | "KEY_ENCIPHERMENT", |
| - | "DATA_ENCIPHERMENT", |
| - | "KEY_AGREEMENT", |
| - | "KEY_CERT_SIGN", |
| - | "CRL_SIGN", |
| - | "SERVER_AUTH", |
| - | "CLIENT_AUTH", |
| - | "CODE_SIGNING", |
| - | "EMAIL_PROTECTION", |
| - | "IPSEC_END_SYSTEM", |
| - | "IPSEC_TUNNEL", |
| - | "IPSEC_USER", |
| - | "TIME_STAMPING", |
| - | "STEP_UP_APPROVED" |
| + | "DIGITAL_SIGNATURE", |
| + | "NON_REPUDIATION", |
| + | "KEY_ENCIPHERMENT", |
| + | "DATA_ENCIPHERMENT", |
| + | "KEY_AGREEMENT", |
| + | "KEY_CERT_SIGN", |
| + | "CRL_SIGN", |
| + | "SERVER_AUTH", |
| + | "CLIENT_AUTH", |
| + | "CODE_SIGNING", |
| + | "EMAIL_PROTECTION", |
| + | "IPSEC_END_SYSTEM", |
| + | "IPSEC_TUNNEL", |
| + | "IPSEC_USER", |
| + | "TIME_STAMPING", |
| + | "STEP_UP_APPROVED" |
| ); | |
| my @valid_mozilla_trust_levels = ( | |
| - | "TRUSTED_DELEGATOR", # CAs |
| - | "NOT_TRUSTED", # Don't trust these certs. |
| - | "MUST_VERIFY_TRUST", # This explicitly tells us that it ISN'T a CA but is |
| - | # otherwise ok. In other words, this should tell the |
| - | # app to ignore any other sources that claim this is |
| - | # a CA. |
| - | "TRUSTED" # This cert is trusted, but only for itself and not |
| - | # for delegates (i.e. it is not a CA). |
| + | "TRUSTED_DELEGATOR", # CAs |
| + | "NOT_TRUSTED", # Don't trust these certs. |
| + | "MUST_VERIFY_TRUST", # This explicitly tells us that it ISN'T a CA but is |
| + | # otherwise ok. In other words, this should tell the |
| + | # app to ignore any other sources that claim this is |
| + | # a CA. |
| + | "TRUSTED" # This cert is trusted, but only for itself and not |
| + | # for delegates (i.e. it is not a CA). |
| ); | |
| my $default_signature_algorithms = $opt_s = "MD5"; | |
| my @valid_signature_algorithms = ( | |
| - | "MD5", |
| - | "SHA1", |
| - | "SHA256", |
| - | "SHA384", |
| - | "SHA512" |
| + | "MD5", |
| + | "SHA1", |
| + | "SHA256", |
| + | "SHA384", |
| + | "SHA512" |
| ); | |
| $0 =~ s@.*(/|\\)@@; | |
| @@ -127,155 +123,155 @@ if(!defined($opt_d)) { | |
| # Use predefined URL or else custom URL specified on command line. | |
| my $url; | |
| if(defined($urls{$opt_d})) { | |
| - | $url = $urls{$opt_d}; |
| - | if(!$opt_k && $url !~ /^https:\/\//i) { |
| - | die "The URL for '$opt_d' is not HTTPS. Use -k to override (insecure).\n"; |
| - | } |
| + | $url = $urls{$opt_d}; |
| + | if(!$opt_k && $url !~ /^https:\/\//i) { |
| + | die "The URL for '$opt_d' is not HTTPS. Use -k to override (insecure).\n"; |
| + | } |
| } | |
| else { | |
| $url = $opt_d; | |
| } | |
| - | if ($opt_i) { |
| - | print ("=" x 78 . "\n"); |
| - | print "Script Version : $version\n"; |
| - | print "Perl Version : $]\n"; |
| - | print "Operating System Name : $^O\n"; |
| - | print "Getopt::Std.pm Version : ${Getopt::Std::VERSION}\n"; |
| - | print "Encode::Encoding.pm Version : ${Encode::Encoding::VERSION}\n"; |
| - | print "MIME::Base64.pm Version : ${MIME::Base64::VERSION}\n"; |
| - | print "LWP::UserAgent.pm Version : ${LWP::UserAgent::VERSION}\n" if($LWP::UserAgent::VERSION); |
| - | print "LWP.pm Version : ${LWP::VERSION}\n" if($LWP::VERSION); |
| - | print "Digest::SHA.pm Version : ${Digest::SHA::VERSION}\n" if ($Digest::SHA::VERSION); |
| - | print "Digest::SHA::PurePerl.pm Version : ${Digest::SHA::PurePerl::VERSION}\n" if ($Digest::SHA::PurePerl::VERSION); |
| - | print ("=" x 78 . "\n"); |
| + | if($opt_i) { |
| + | print ("=" x 78 . "\n"); |
| + | print "Script Version : $version\n"; |
| + | print "Perl Version : $]\n"; |
| + | print "Operating System Name : $^O\n"; |
| + | print "Getopt::Std.pm Version : ${Getopt::Std::VERSION}\n"; |
| + | print "Encode::Encoding.pm Version : ${Encode::Encoding::VERSION}\n"; |
| + | print "MIME::Base64.pm Version : ${MIME::Base64::VERSION}\n"; |
| + | print "LWP::UserAgent.pm Version : ${LWP::UserAgent::VERSION}\n" if($LWP::UserAgent::VERSION); |
| + | print "LWP.pm Version : ${LWP::VERSION}\n" if($LWP::VERSION); |
| + | print "Digest::SHA.pm Version : ${Digest::SHA::VERSION}\n" if($Digest::SHA::VERSION); |
| + | print "Digest::SHA::PurePerl.pm Version : ${Digest::SHA::PurePerl::VERSION}\n" if($Digest::SHA::PurePerl::VERSION); |
| + | print ("=" x 78 . "\n"); |
| } | |
| sub warning_message() { | |
| - | if ( $opt_d =~ m/^risk$/i ) { # Long Form Warning and Exit |
| - | print "Warning: Use of this script may pose some risk:\n"; |
| - | print "\n"; |
| - | print " 1) If you use HTTP URLs they are subject to a man in the middle attack\n"; |
| - | print " 2) Default to 'release', but more recent updates may be found in other trees\n"; |
| - | print " 3) certdata.txt file format may change, lag time to update this script\n"; |
| - | print " 4) Generally unwise to blindly trust CAs without manual review & verification\n"; |
| - | print " 5) Mozilla apps use additional security checks aren't represented in certdata\n"; |
| - | print " 6) Use of this script will make a security engineer grind his teeth and\n"; |
| - | print " swear at you. ;)\n"; |
| - | exit; |
| - | } else { # Short Form Warning |
| - | print "Warning: Use of this script may pose some risk, -d risk for more details.\n"; |
| - | } |
| + | if($opt_d =~ m/^risk$/i) { # Long Form Warning and Exit |
| + | print "Warning: Use of this script may pose some risk:\n"; |
| + | print "\n"; |
| + | print " 1) If you use HTTP URLs they are subject to a man in the middle attack\n"; |
| + | print " 2) Default to 'release', but more recent updates may be found in other trees\n"; |
| + | print " 3) certdata.txt file format may change, lag time to update this script\n"; |
| + | print " 4) Generally unwise to blindly trust CAs without manual review & verification\n"; |
| + | print " 5) Mozilla apps use additional security checks aren't represented in certdata\n"; |
| + | print " 6) Use of this script will make a security engineer grind his teeth and\n"; |
| + | print " swear at you. ;)\n"; |
| + | exit; |
| + | } else { # Short Form Warning |
| + | print "Warning: Use of this script may pose some risk, -d risk for more details.\n"; |
| + | } |
| } | |
| sub HELP_MESSAGE() { | |
| - | print "Usage:\t${0} [-b] [-d<certdata>] [-f] [-i] [-k] [-l] [-n] [-p<purposes:levels>] [-q] [-s<algorithms>] [-t] [-u] [-v] [-w<l>] [<outputfile>]\n"; |
| - | print "\t-b\tbackup an existing version of ca-bundle.crt\n"; |
| - | print "\t-d\tspecify Mozilla tree to pull certdata.txt or custom URL\n"; |
| - | print "\t\t Valid names are:\n"; |
| - | print "\t\t ", join( ", ", map { ( $_ =~ m/$opt_d/ ) ? "$_ (default)" : "$_" } sort keys %urls ), "\n"; |
| - | print "\t-f\tforce rebuild even if certdata.txt is current\n"; |
| - | print "\t-i\tprint version info about used modules\n"; |
| - | print "\t-k\tallow URLs other than HTTPS, enable HTTP fallback (insecure)\n"; |
| - | print "\t-l\tprint license info about certdata.txt\n"; |
| - | print "\t-m\tinclude meta data in output\n"; |
| - | print "\t-n\tno download of certdata.txt (to use existing)\n"; |
| - | print wrap("\t","\t\t", "-p\tlist of Mozilla trust purposes and levels for certificates to include in output. Takes the form of a comma separated list of purposes, a colon, and a comma separated list of levels. (default: $default_mozilla_trust_purposes:$default_mozilla_trust_levels)"), "\n"; |
| - | print "\t\t Valid purposes are:\n"; |
| - | print wrap("\t\t ","\t\t ", join( ", ", "ALL", @valid_mozilla_trust_purposes ) ), "\n"; |
| - | print "\t\t Valid levels are:\n"; |
| - | print wrap("\t\t ","\t\t ", join( ", ", "ALL", @valid_mozilla_trust_levels ) ), "\n"; |
| - | print "\t-q\tbe really quiet (no progress output at all)\n"; |
| - | print wrap("\t","\t\t", "-s\tcomma separated list of certificate signatures/hashes to output in plain text mode. (default: $default_signature_algorithms)\n"); |
| - | print "\t\t Valid signature algorithms are:\n"; |
| - | print wrap("\t\t ","\t\t ", join( ", ", "ALL", @valid_signature_algorithms ) ), "\n"; |
| - | print "\t-t\tinclude plain text listing of certificates\n"; |
| - | print "\t-u\tunlink (remove) certdata.txt after processing\n"; |
| - | print "\t-v\tbe verbose and print out processed CAs\n"; |
| - | print "\t-w <l>\twrap base64 output lines after <l> chars (default: ${opt_w})\n"; |
| - | exit; |
| + | print "Usage:\t${0} [-b] [-d<certdata>] [-f] [-i] [-k] [-l] [-n] [-p<purposes:levels>] [-q] [-s<algorithms>] [-t] [-u] [-v] [-w<l>] [<outputfile>]\n"; |
| + | print "\t-b\tbackup an existing version of ca-bundle.crt\n"; |
| + | print "\t-d\tspecify Mozilla tree to pull certdata.txt or custom URL\n"; |
| + | print "\t\t Valid names are:\n"; |
| + | print "\t\t ", join( ", ", map { ( $_ =~ m/$opt_d/ ) ? "$_ (default)" : "$_" } sort keys %urls ), "\n"; |
| + | print "\t-f\tforce rebuild even if certdata.txt is current\n"; |
| + | print "\t-i\tprint version info about used modules\n"; |
| + | print "\t-k\tallow URLs other than HTTPS, enable HTTP fallback (insecure)\n"; |
| + | print "\t-l\tprint license info about certdata.txt\n"; |
| + | print "\t-m\tinclude meta data in output\n"; |
| + | print "\t-n\tno download of certdata.txt (to use existing)\n"; |
| + | print wrap("\t","\t\t", "-p\tlist of Mozilla trust purposes and levels for certificates to include in output. Takes the form of a comma separated list of purposes, a colon, and a comma separated list of levels. (default: $default_mozilla_trust_purposes:$default_mozilla_trust_levels)"), "\n"; |
| + | print "\t\t Valid purposes are:\n"; |
| + | print wrap("\t\t ","\t\t ", join( ", ", "ALL", @valid_mozilla_trust_purposes ) ), "\n"; |
| + | print "\t\t Valid levels are:\n"; |
| + | print wrap("\t\t ","\t\t ", join( ", ", "ALL", @valid_mozilla_trust_levels ) ), "\n"; |
| + | print "\t-q\tbe really quiet (no progress output at all)\n"; |
| + | print wrap("\t","\t\t", "-s\tcomma separated list of certificate signatures/hashes to output in plain text mode. (default: $default_signature_algorithms)\n"); |
| + | print "\t\t Valid signature algorithms are:\n"; |
| + | print wrap("\t\t ","\t\t ", join( ", ", "ALL", @valid_signature_algorithms ) ), "\n"; |
| + | print "\t-t\tinclude plain text listing of certificates\n"; |
| + | print "\t-u\tunlink (remove) certdata.txt after processing\n"; |
| + | print "\t-v\tbe verbose and print out processed CAs\n"; |
| + | print "\t-w <l>\twrap base64 output lines after <l> chars (default: ${opt_w})\n"; |
| + | exit; |
| } | |
| sub VERSION_MESSAGE() { | |
| - | print "${0} version ${version} running Perl ${]} on ${^O}\n"; |
| + | print "${0} version ${version} running Perl ${]} on ${^O}\n"; |
| } | |
| warning_message() unless ($opt_q || $url =~ m/^(ht|f)tps:/i ); | |
| - | HELP_MESSAGE() if ($opt_h); |
| + | HELP_MESSAGE() if($opt_h); |
| sub report($@) { | |
| - | my $output = shift; |
| + | my $output = shift; |
| - | print STDERR $output . "\n" unless $opt_q; |
| + | print STDERR $output . "\n" unless $opt_q; |
| } | |
| sub is_in_list($@) { | |
| - | my $target = shift; |
| + | my $target = shift; |
| - | return defined(List::Util::first { $target eq $_ } @_); |
| + | return defined(List::Util::first { $target eq $_ } @_); |
| } | |
| # Parses $param_string as a case insensitive comma separated list with optional | |
| # whitespace validates that only allowed parameters are supplied | |
| sub parse_csv_param($$@) { | |
| - | my $description = shift; |
| - | my $param_string = shift; |
| - | my @valid_values = @_; |
| - | |
| - | my @values = map { |
| - | s/^\s+//; # strip leading spaces |
| - | s/\s+$//; # strip trailing spaces |
| - | uc $_ # return the modified string as upper case |
| - | } split( ',', $param_string ); |
| - | |
| - | # Find all values which are not in the list of valid values or "ALL" |
| - | my @invalid = grep { !is_in_list($_,"ALL",@valid_values) } @values; |
| - | |
| - | if ( scalar(@invalid) > 0 ) { |
| - | # Tell the user which parameters were invalid and print the standard help |
| - | # message which will exit |
| - | print "Error: Invalid ", $description, scalar(@invalid) == 1 ? ": " : "s: ", join( ", ", map { "\"$_\"" } @invalid ), "\n"; |
| - | HELP_MESSAGE(); |
| - | } |
| + | my $description = shift; |
| + | my $param_string = shift; |
| + | my @valid_values = @_; |
| + | |
| + | my @values = map { |
| + | s/^\s+//; # strip leading spaces |
| + | s/\s+$//; # strip trailing spaces |
| + | uc $_ # return the modified string as upper case |
| + | } split( ',', $param_string ); |
| + | |
| + | # Find all values which are not in the list of valid values or "ALL" |
| + | my @invalid = grep { !is_in_list($_,"ALL",@valid_values) } @values; |
| + | |
| + | if(scalar(@invalid) > 0) { |
| + | # Tell the user which parameters were invalid and print the standard help |
| + | # message which will exit |
| + | print "Error: Invalid ", $description, scalar(@invalid) == 1 ? ": " : "s: ", join( ", ", map { "\"$_\"" } @invalid ), "\n"; |
| + | HELP_MESSAGE(); |
| + | } |
| - | @values = @valid_values if ( is_in_list("ALL",@values) ); |
| + | @values = @valid_values if(is_in_list("ALL",@values)); |
| - | return @values; |
| + | return @values; |
| } | |
| sub sha256 { | |
| - | my $result; |
| - | if ($Digest::SHA::VERSION || $Digest::SHA::PurePerl::VERSION) { |
| - | open(FILE, $_[0]) or die "Can't open '$_[0]': $!"; |
| - | binmode(FILE); |
| - | $result = $MOD_SHA->new(256)->addfile(*FILE)->hexdigest; |
| - | close(FILE); |
| - | } else { |
| - | # Use OpenSSL command if Perl Digest::SHA modules not available |
| - | $result = `"$openssl" dgst -r -sha256 "$_[0]"`; |
| - | $result =~ s/^([0-9a-f]{64}) .+/$1/is; |
| - | } |
| - | return $result; |
| + | my $result; |
| + | if($Digest::SHA::VERSION || $Digest::SHA::PurePerl::VERSION) { |
| + | open(FILE, $_[0]) or die "Can't open '$_[0]': $!"; |
| + | binmode(FILE); |
| + | $result = $MOD_SHA->new(256)->addfile(*FILE)->hexdigest; |
| + | close(FILE); |
| + | } else { |
| + | # Use OpenSSL command if Perl Digest::SHA modules not available |
| + | $result = `"$openssl" dgst -r -sha256 "$_[0]"`; |
| + | $result =~ s/^([0-9a-f]{64}) .+/$1/is; |
| + | } |
| + | return $result; |
| } | |
| sub oldhash { | |
| - | my $hash = ""; |
| - | open(C, "<$_[0]") || return 0; |
| - | while(<C>) { |
| - | chomp; |
| - | if($_ =~ /^\#\# SHA256: (.*)/) { |
| - | $hash = $1; |
| - | last; |
| + | my $hash = ""; |
| + | open(C, "<$_[0]") || return 0; |
| + | while(<C>) { |
| + | chomp; |
| + | if($_ =~ /^\#\# SHA256: (.*)/) { |
| + | $hash = $1; |
| + | last; |
| + | } |
| } | |
| - | } |
| - | close(C); |
| - | return $hash; |
| + | close(C); |
| + | return $hash; |
| } | |
| - | if ( $opt_p !~ m/:/ ) { |
| - | print "Error: Mozilla trust identifier list must include both purposes and levels\n"; |
| - | HELP_MESSAGE(); |
| + | if( $opt_p !~ m/:/ ) { |
| + | print "Error: Mozilla trust identifier list must include both purposes and levels\n"; |
| + | HELP_MESSAGE(); |
| } | |
| (my $included_mozilla_trust_purposes_string, my $included_mozilla_trust_levels_string) = split( ':', $opt_p ); | |
| @@ -285,15 +281,15 @@ my @included_mozilla_trust_levels = parse_csv_param( "trust level", $included_mo | |
| my @included_signature_algorithms = parse_csv_param( "signature algorithm", $opt_s, @valid_signature_algorithms ); | |
| sub should_output_cert(%) { | |
| - | my %trust_purposes_by_level = @_; |
| + | my %trust_purposes_by_level = @_; |
| - | foreach my $level (@included_mozilla_trust_levels) { |
| - | # for each level we want to output, see if any of our desired purposes are |
| - | # included |
| - | return 1 if ( defined( List::Util::first { is_in_list( $_, @included_mozilla_trust_purposes ) } @{$trust_purposes_by_level{$level}} ) ); |
| - | } |
| + | foreach my $level (@included_mozilla_trust_levels) { |
| + | # for each level we want to output, see if any of our desired purposes are |
| + | # included |
| + | return 1 if( defined( List::Util::first { is_in_list( $_, @included_mozilla_trust_purposes ) } @{$trust_purposes_by_level{$level}} ) ); |
| + | } |
| - | return 0; |
| + | return 0; |
| } | |
| my $crt = $ARGV[0] || 'ca-bundle.crt'; | |
| @@ -308,69 +304,69 @@ my $oldhash = oldhash($crt); | |
| report "SHA256 of old file: $oldhash"; | |
| if(!$opt_n) { | |
| - | report "Downloading $txt ..."; |
| - | |
| - | # If we have an HTTPS URL then use curl |
| - | if($url =~ /^https:\/\//i) { |
| - | my $curl = `curl -V`; |
| - | if($curl) { |
| - | if($curl =~ /^Protocols:.* https( |$)/m) { |
| - | report "Get certdata with curl!"; |
| - | my $proto = !$opt_k ? "--proto =https" : ""; |
| - | my $quiet = $opt_q ? "-s" : ""; |
| - | my @out = `curl -Lw %{response_code} $proto $quiet -o "$txt" "$url"`; |
| - | if(!$? && @out && $out[0] == 200) { |
| - | $fetched = 1; |
| - | report "Downloaded $txt"; |
| + | report "Downloading $txt ..."; |
| + | |
| + | # If we have an HTTPS URL then use curl |
| + | if($url =~ /^https:\/\//i) { |
| + | my $curl = `curl -V`; |
| + | if($curl) { |
| + | if($curl =~ /^Protocols:.* https( |$)/m) { |
| + | report "Get certdata with curl!"; |
| + | my $proto = !$opt_k ? "--proto =https" : ""; |
| + | my $quiet = $opt_q ? "-s" : ""; |
| + | my @out = `curl -Lw %{response_code} $proto $quiet -o "$txt" "$url"`; |
| + | if(!$? && @out && $out[0] == 200) { |
| + | $fetched = 1; |
| + | report "Downloaded $txt"; |
| + | } |
| + | else { |
| + | report "Failed downloading via HTTPS with curl"; |
| + | if(-e $txt && !unlink($txt)) { |
| + | report "Failed to remove '$txt': $!"; |
| + | } |
| + | } |
| + | } |
| + | else { |
| + | report "curl lacks https support"; |
| + | } |
| } | |
| else { | |
| - | report "Failed downloading via HTTPS with curl"; |
| - | if(-e $txt && !unlink($txt)) { |
| - | report "Failed to remove '$txt': $!"; |
| - | } |
| + | report "curl not found"; |
| } | |
| - | } |
| - | else { |
| - | report "curl lacks https support"; |
| - | } |
| } | |
| - | else { |
| - | report "curl not found"; |
| - | } |
| - | } |
| - | # If nothing was fetched then use LWP |
| - | if(!$fetched) { |
| - | if($url =~ /^https:\/\//i) { |
| - | report "Falling back to HTTP"; |
| - | $url =~ s/^https:\/\//http:\/\//i; |
| - | } |
| - | if(!$opt_k) { |
| - | report "URLs other than HTTPS are disabled by default, to enable use -k"; |
| - | exit 1; |
| - | } |
| - | report "Get certdata with LWP!"; |
| - | if(!defined(${LWP::UserAgent::VERSION})) { |
| - | report "LWP is not available (LWP::UserAgent not found)"; |
| - | exit 1; |
| - | } |
| - | my $ua = new LWP::UserAgent(agent => "$0/$version"); |
| - | $ua->env_proxy(); |
| - | $resp = $ua->mirror($url, $txt); |
| - | if($resp && $resp->code eq '304') { |
| - | report "Not modified"; |
| - | exit 0 if -e $crt && !$opt_f; |
| - | } |
| - | else { |
| - | $fetched = 1; |
| - | report "Downloaded $txt"; |
| - | } |
| - | if(!$resp || $resp->code !~ /^(?:200|304)$/) { |
| - | report "Unable to download latest data: " |
| - | . ($resp? $resp->code . ' - ' . $resp->message : "LWP failed"); |
| - | exit 1 if -e $crt || ! -r $txt; |
| + | # If nothing was fetched then use LWP |
| + | if(!$fetched) { |
| + | if($url =~ /^https:\/\//i) { |
| + | report "Falling back to HTTP"; |
| + | $url =~ s/^https:\/\//http:\/\//i; |
| + | } |
| + | if(!$opt_k) { |
| + | report "URLs other than HTTPS are disabled by default, to enable use -k"; |
| + | exit 1; |
| + | } |
| + | report "Get certdata with LWP!"; |
| + | if(!defined(${LWP::UserAgent::VERSION})) { |
| + | report "LWP is not available (LWP::UserAgent not found)"; |
| + | exit 1; |
| + | } |
| + | my $ua = new LWP::UserAgent(agent => "$0/$version"); |
| + | $ua->env_proxy(); |
| + | $resp = $ua->mirror($url, $txt); |
| + | if($resp && $resp->code eq '304') { |
| + | report "Not modified"; |
| + | exit 0 if -e $crt && !$opt_f; |
| + | } |
| + | else { |
| + | $fetched = 1; |
| + | report "Downloaded $txt"; |
| + | } |
| + | if(!$resp || $resp->code !~ /^(?:200|304)$/) { |
| + | report "Unable to download latest data: " |
| + | . ($resp? $resp->code . ' - ' . $resp->message : "LWP failed"); |
| + | exit 1 if -e $crt || ! -r $txt; |
| + | } |
| } | |
| - | } |
| } | |
| my $filedate = $resp ? $resp->last_modified : (stat($txt))[9]; | |
| @@ -397,7 +393,7 @@ report "SHA256 of new file: $newhash"; | |
| my $currentdate = scalar gmtime($filedate); | |
| my $format = $opt_t ? "plain text and " : ""; | |
| - | if( $stdout ) { |
| + | if($stdout) { |
| open(CRT, '> -') or die "Couldn't open STDOUT: $!\n"; | |
| } else { | |
| open(CRT,">$crt.~") or die "Couldn't open $crt.~: $!\n"; | |
| @@ -440,224 +436,224 @@ my $cka_value; | |
| my $valid = 0; | |
| open(TXT,"$txt") or die "Couldn't open $txt: $!\n"; | |
| - | while (<TXT>) { |
| - | if (/\*\*\*\*\* BEGIN LICENSE BLOCK \*\*\*\*\*/) { |
| - | print CRT; |
| - | print if ($opt_l); |
| - | while (<TXT>) { |
| - | print CRT; |
| - | print if ($opt_l); |
| - | last if (/\*\*\*\*\* END LICENSE BLOCK \*\*\*\*\*/); |
| - | } |
| - | next; |
| - | } |
| - | # The input file format consists of blocks of Mozilla objects. |
| - | # The blocks are separated by blank lines but may be related. |
| - | elsif(/^\s*$/) { |
| - | $main_block = 0; |
| - | $trust_block = 0; |
| - | next; |
| - | } |
| - | # Each certificate has a main block. |
| - | elsif(/^# Certificate "(.*)"/) { |
| - | (!$main_block && !$trust_block) or die "Unexpected certificate block"; |
| - | $main_block = 1; |
| - | $main_block_name = $1; |
| - | # Reset all other certificate variables. |
| - | $trust_block = 0; |
| - | $trust_block_name = ""; |
| - | $valid = 0; |
| - | $start_of_cert = 0; |
| - | $caname = ""; |
| - | $cka_value = ""; |
| - | undef @precert; |
| - | next; |
| - | } |
| - | # Each certificate's main block is followed by a trust block. |
| - | elsif(/^# Trust for (?:Certificate )?"(.*)"/) { |
| - | (!$main_block && !$trust_block) or die "Unexpected trust block"; |
| - | $trust_block = 1; |
| - | $trust_block_name = $1; |
| - | if($main_block_name ne $trust_block_name) { |
| - | die "cert name \"$main_block_name\" != trust name \"$trust_block_name\""; |
| - | } |
| - | next; |
| - | } |
| - | # Ignore other blocks. |
| - | # |
| - | # There is a documentation comment block, a BEGINDATA block, and a bunch of |
| - | # blocks starting with "# Explicitly Distrust <certname>". |
| - | # |
| - | # The latter is for certificates that have already been removed and are not |
| - | # included. Not all explicitly distrusted certificates are ignored at this |
| - | # point, just those without an actual certificate. |
| - | elsif(!$main_block && !$trust_block) { |
| - | next; |
| - | } |
| - | elsif(/^#/) { |
| - | # The commented lines in a main block are plaintext metadata that describes |
| - | # the certificate. Issuer, Subject, Fingerprint, etc. |
| - | if($main_block) { |
| - | push @precert, $_ if not /^#$/; |
| - | if(/^# Not Valid After : (.*)/) { |
| - | my $stamp = $1; |
| - | use Time::Piece; |
| - | # Not Valid After : Thu Sep 30 14:01:15 2021 |
| - | my $t = Time::Piece->strptime($stamp, "%a %b %d %H:%M:%S %Y"); |
| - | my $delta = ($t->epoch - time()); # negative means no longer valid |
| - | if($delta < 0) { |
| - | $skipnum++; |
| - | report "Skipping: $main_block_name is not valid anymore" if ($opt_v); |
| - | $valid = 0; |
| + | while(<TXT>) { |
| + | if(/\*\*\*\*\* BEGIN LICENSE BLOCK \*\*\*\*\*/) { |
| + | print CRT; |
| + | print if($opt_l); |
| + | while(<TXT>) { |
| + | print CRT; |
| + | print if($opt_l); |
| + | last if(/\*\*\*\*\* END LICENSE BLOCK \*\*\*\*\*/); |
| } | |
| - | else { |
| - | $valid = 1; |
| - | } |
| - | } |
| + | next; |
| + | } |
| + | # The input file format consists of blocks of Mozilla objects. |
| + | # The blocks are separated by blank lines but may be related. |
| + | elsif(/^\s*$/) { |
| + | $main_block = 0; |
| + | $trust_block = 0; |
| + | next; |
| } | |
| - | next; |
| - | } |
| - | elsif(!$valid) { |
| - | next; |
| - | } |
| - | |
| - | chomp; |
| - | |
| - | if($main_block) { |
| - | if(/^CKA_CLASS CK_OBJECT_CLASS CKO_CERTIFICATE/) { |
| - | !$start_of_cert or die "Duplicate CKO_CERTIFICATE object"; |
| - | $start_of_cert = 1; |
| - | next; |
| + | # Each certificate has a main block. |
| + | elsif(/^# Certificate "(.*)"/) { |
| + | (!$main_block && !$trust_block) or die "Unexpected certificate block"; |
| + | $main_block = 1; |
| + | $main_block_name = $1; |
| + | # Reset all other certificate variables. |
| + | $trust_block = 0; |
| + | $trust_block_name = ""; |
| + | $valid = 0; |
| + | $start_of_cert = 0; |
| + | $caname = ""; |
| + | $cka_value = ""; |
| + | undef @precert; |
| + | next; |
| } | |
| - | elsif(!$start_of_cert) { |
| - | next; |
| + | # Each certificate's main block is followed by a trust block. |
| + | elsif(/^# Trust for (?:Certificate )?"(.*)"/) { |
| + | (!$main_block && !$trust_block) or die "Unexpected trust block"; |
| + | $trust_block = 1; |
| + | $trust_block_name = $1; |
| + | if($main_block_name ne $trust_block_name) { |
| + | die "cert name \"$main_block_name\" != trust name \"$trust_block_name\""; |
| + | } |
| + | next; |
| } | |
| - | elsif(/^CKA_LABEL UTF8 \"(.*)\"/) { |
| - | ($caname eq "") or die "Duplicate CKA_LABEL attribute"; |
| - | $caname = $1; |
| - | if($caname ne $main_block_name) { |
| - | die "caname \"$caname\" != cert name \"$main_block_name\""; |
| - | } |
| - | next; |
| + | # Ignore other blocks. |
| + | # |
| + | # There is a documentation comment block, a BEGINDATA block, and a bunch of |
| + | # blocks starting with "# Explicitly Distrust <certname>". |
| + | # |
| + | # The latter is for certificates that have already been removed and are not |
| + | # included. Not all explicitly distrusted certificates are ignored at this |
| + | # point, just those without an actual certificate. |
| + | elsif(!$main_block && !$trust_block) { |
| + | next; |
| } | |
| - | elsif(/^CKA_VALUE MULTILINE_OCTAL/) { |
| - | ($cka_value eq "") or die "Duplicate CKA_VALUE attribute"; |
| - | while (<TXT>) { |
| - | last if (/^END/); |
| - | chomp; |
| - | my @octets = split(/\\/); |
| - | shift @octets; |
| - | for (@octets) { |
| - | $cka_value .= chr(oct); |
| + | elsif(/^#/) { |
| + | # The commented lines in a main block are plaintext metadata that describes |
| + | # the certificate. Issuer, Subject, Fingerprint, etc. |
| + | if($main_block) { |
| + | push @precert, $_ if not /^#$/; |
| + | if(/^# Not Valid After : (.*)/) { |
| + | my $stamp = $1; |
| + | use Time::Piece; |
| + | # Not Valid After : Thu Sep 30 14:01:15 2021 |
| + | my $t = Time::Piece->strptime($stamp, "%a %b %d %H:%M:%S %Y"); |
| + | my $delta = ($t->epoch - time()); # negative means no longer valid |
| + | if($delta < 0) { |
| + | $skipnum++; |
| + | report "Skipping: $main_block_name is not valid anymore" if($opt_v); |
| + | $valid = 0; |
| + | } |
| + | else { |
| + | $valid = 1; |
| + | } |
| + | } |
| } | |
| - | } |
| - | next; |
| + | next; |
| } | |
| - | else { |
| - | next; |
| + | elsif(!$valid) { |
| + | next; |
| } | |
| - | } |
| - | |
| - | if(!$trust_block || !$start_of_cert || $caname eq "" || $cka_value eq "") { |
| - | die "Certificate extraction failed"; |
| - | } |
| - | my %trust_purposes_by_level; |
| + | chomp; |
| - | if(/^CKA_CLASS CK_OBJECT_CLASS CKO_NSS_TRUST/) { |
| - | # now scan the trust part to determine how we should trust this cert |
| - | while (<TXT>) { |
| - | if(/^\s*$/) { |
| - | $trust_block = 0; |
| - | last; |
| - | } |
| - | if (/^CKA_TRUST_([A-Z_]+)\s+CK_TRUST\s+CKT_NSS_([A-Z_]+)\s*$/) { |
| - | if ( !is_in_list($1,@valid_mozilla_trust_purposes) ) { |
| - | report "Warning: Unrecognized trust purpose for cert: $caname. Trust purpose: $1. Trust Level: $2"; |
| - | } elsif ( !is_in_list($2,@valid_mozilla_trust_levels) ) { |
| - | report "Warning: Unrecognized trust level for cert: $caname. Trust purpose: $1. Trust Level: $2"; |
| - | } else { |
| - | push @{$trust_purposes_by_level{$2}}, $1; |
| + | if($main_block) { |
| + | if(/^CKA_CLASS CK_OBJECT_CLASS CKO_CERTIFICATE/) { |
| + | !$start_of_cert or die "Duplicate CKO_CERTIFICATE object"; |
| + | $start_of_cert = 1; |
| + | next; |
| + | } |
| + | elsif(!$start_of_cert) { |
| + | next; |
| + | } |
| + | elsif(/^CKA_LABEL UTF8 \"(.*)\"/) { |
| + | ($caname eq "") or die "Duplicate CKA_LABEL attribute"; |
| + | $caname = $1; |
| + | if($caname ne $main_block_name) { |
| + | die "caname \"$caname\" != cert name \"$main_block_name\""; |
| + | } |
| + | next; |
| + | } |
| + | elsif(/^CKA_VALUE MULTILINE_OCTAL/) { |
| + | ($cka_value eq "") or die "Duplicate CKA_VALUE attribute"; |
| + | while(<TXT>) { |
| + | last if(/^END/); |
| + | chomp; |
| + | my @octets = split(/\\/); |
| + | shift @octets; |
| + | for(@octets) { |
| + | $cka_value .= chr(oct); |
| + | } |
| + | } |
| + | next; |
| + | } |
| + | else { |
| + | next; |
| } | |
| - | } |
| } | |
| - | # Sanity check that an explicitly distrusted certificate only has trust |
| - | # purposes with a trust level of NOT_TRUSTED. |
| - | # |
| - | # Certificate objects that are explicitly distrusted are in a certificate |
| - | # block that starts # Certificate "Explicitly Distrust(ed) <certname>", |
| - | # where "Explicitly Distrust(ed) " was prepended to the original cert name. |
| - | if($caname =~ /distrust/i || |
| - | $main_block_name =~ /distrust/i || |
| - | $trust_block_name =~ /distrust/i) { |
| - | my @levels = keys %trust_purposes_by_level; |
| - | if(scalar(@levels) != 1 || $levels[0] ne "NOT_TRUSTED") { |
| - | die "\"$caname\" must have all trust purposes at level NOT_TRUSTED."; |
| - | } |
| + | if(!$trust_block || !$start_of_cert || $caname eq "" || $cka_value eq "") { |
| + | die "Certificate extraction failed"; |
| } | |
| - | if ( !should_output_cert(%trust_purposes_by_level) ) { |
| - | $skipnum ++; |
| - | report "Skipping: $caname lacks acceptable trust level" if ($opt_v); |
| - | } else { |
| - | my $encoded = MIME::Base64::encode_base64($cka_value, ''); |
| - | $encoded =~ s/(.{1,${opt_w}})/$1\n/g; |
| - | my $pem = "-----BEGIN CERTIFICATE-----\n" |
| - | . $encoded |
| - | . "-----END CERTIFICATE-----\n"; |
| - | print CRT "\n$caname\n"; |
| - | my $maxStringLength = length(decode('UTF-8', $caname, Encode::FB_CROAK | Encode::LEAVE_SRC)); |
| - | print CRT ("=" x $maxStringLength . "\n"); |
| - | if ($opt_t) { |
| - | foreach my $key (sort keys %trust_purposes_by_level) { |
| - | my $string = $key . ": " . join(", ", @{$trust_purposes_by_level{$key}}); |
| - | print CRT $string . "\n"; |
| - | } |
| - | } |
| - | if($opt_m) { |
| - | print CRT for @precert; |
| - | } |
| - | if (!$opt_t) { |
| - | print CRT $pem; |
| - | } else { |
| - | my $pipe = ""; |
| - | foreach my $hash (@included_signature_algorithms) { |
| - | $pipe = "|$openssl x509 -" . $hash . " -fingerprint -noout -inform PEM"; |
| - | if (!$stdout) { |
| - | $pipe .= " >> $crt.~"; |
| - | close(CRT) or die "Couldn't close $crt.~: $!"; |
| - | } |
| - | open(TMP, $pipe) or die "Couldn't open openssl pipe: $!"; |
| - | print TMP $pem; |
| - | close(TMP) or die "Couldn't close openssl pipe: $!"; |
| - | if (!$stdout) { |
| - | open(CRT, ">>$crt.~") or die "Couldn't open $crt.~: $!"; |
| - | } |
| + | my %trust_purposes_by_level; |
| + | |
| + | if(/^CKA_CLASS CK_OBJECT_CLASS CKO_NSS_TRUST/) { |
| + | # now scan the trust part to determine how we should trust this cert |
| + | while(<TXT>) { |
| + | if(/^\s*$/) { |
| + | $trust_block = 0; |
| + | last; |
| + | } |
| + | if(/^CKA_TRUST_([A-Z_]+)\s+CK_TRUST\s+CKT_NSS_([A-Z_]+)\s*$/) { |
| + | if(!is_in_list($1,@valid_mozilla_trust_purposes)) { |
| + | report "Warning: Unrecognized trust purpose for cert: $caname. Trust purpose: $1. Trust Level: $2"; |
| + | } elsif(!is_in_list($2,@valid_mozilla_trust_levels)) { |
| + | report "Warning: Unrecognized trust level for cert: $caname. Trust purpose: $1. Trust Level: $2"; |
| + | } else { |
| + | push @{$trust_purposes_by_level{$2}}, $1; |
| + | } |
| + | } |
| } | |
| - | $pipe = "|$openssl x509 -text -inform PEM"; |
| - | if (!$stdout) { |
| - | $pipe .= " >> $crt.~"; |
| - | close(CRT) or die "Couldn't close $crt.~: $!"; |
| + | |
| + | # Sanity check that an explicitly distrusted certificate only has trust |
| + | # purposes with a trust level of NOT_TRUSTED. |
| + | # |
| + | # Certificate objects that are explicitly distrusted are in a certificate |
| + | # block that starts # Certificate "Explicitly Distrust(ed) <certname>", |
| + | # where "Explicitly Distrust(ed) " was prepended to the original cert name. |
| + | if($caname =~ /distrust/i || |
| + | $main_block_name =~ /distrust/i || |
| + | $trust_block_name =~ /distrust/i) { |
| + | my @levels = keys %trust_purposes_by_level; |
| + | if(scalar(@levels) != 1 || $levels[0] ne "NOT_TRUSTED") { |
| + | die "\"$caname\" must have all trust purposes at level NOT_TRUSTED."; |
| + | } |
| } | |
| - | open(TMP, $pipe) or die "Couldn't open openssl pipe: $!"; |
| - | print TMP $pem; |
| - | close(TMP) or die "Couldn't close openssl pipe: $!"; |
| - | if (!$stdout) { |
| - | open(CRT, ">>$crt.~") or die "Couldn't open $crt.~: $!"; |
| + | |
| + | if(!should_output_cert(%trust_purposes_by_level)) { |
| + | $skipnum ++; |
| + | report "Skipping: $caname lacks acceptable trust level" if($opt_v); |
| + | } else { |
| + | my $encoded = MIME::Base64::encode_base64($cka_value, ''); |
| + | $encoded =~ s/(.{1,${opt_w}})/$1\n/g; |
| + | my $pem = "-----BEGIN CERTIFICATE-----\n" |
| + | . $encoded |
| + | . "-----END CERTIFICATE-----\n"; |
| + | print CRT "\n$caname\n"; |
| + | my $maxStringLength = length(decode('UTF-8', $caname, Encode::FB_CROAK | Encode::LEAVE_SRC)); |
| + | print CRT ("=" x $maxStringLength . "\n"); |
| + | if($opt_t) { |
| + | foreach my $key (sort keys %trust_purposes_by_level) { |
| + | my $string = $key . ": " . join(", ", @{$trust_purposes_by_level{$key}}); |
| + | print CRT $string . "\n"; |
| + | } |
| + | } |
| + | if($opt_m) { |
| + | print CRT for @precert; |
| + | } |
| + | if(!$opt_t) { |
| + | print CRT $pem; |
| + | } else { |
| + | my $pipe = ""; |
| + | foreach my $hash (@included_signature_algorithms) { |
| + | $pipe = "|$openssl x509 -" . $hash . " -fingerprint -noout -inform PEM"; |
| + | if(!$stdout) { |
| + | $pipe .= " >> $crt.~"; |
| + | close(CRT) or die "Couldn't close $crt.~: $!"; |
| + | } |
| + | open(TMP, $pipe) or die "Couldn't open openssl pipe: $!"; |
| + | print TMP $pem; |
| + | close(TMP) or die "Couldn't close openssl pipe: $!"; |
| + | if(!$stdout) { |
| + | open(CRT, ">>$crt.~") or die "Couldn't open $crt.~: $!"; |
| + | } |
| + | } |
| + | $pipe = "|$openssl x509 -text -inform PEM"; |
| + | if(!$stdout) { |
| + | $pipe .= " >> $crt.~"; |
| + | close(CRT) or die "Couldn't close $crt.~: $!"; |
| + | } |
| + | open(TMP, $pipe) or die "Couldn't open openssl pipe: $!"; |
| + | print TMP $pem; |
| + | close(TMP) or die "Couldn't close openssl pipe: $!"; |
| + | if(!$stdout) { |
| + | open(CRT, ">>$crt.~") or die "Couldn't open $crt.~: $!"; |
| + | } |
| + | } |
| + | report "Processed: $caname" if($opt_v); |
| + | $certnum++; |
| } | |
| - | } |
| - | report "Processed: $caname" if ($opt_v); |
| - | $certnum ++; |
| } | |
| - | } |
| } | |
| close(TXT) or die "Couldn't close $txt: $!\n"; | |
| close(CRT) or die "Couldn't close $crt.~: $!\n"; | |
| - | unless( $stdout ) { |
| - | if ($opt_b && -e $crt) { |
| + | unless($stdout) { |
| + | if($opt_b && -e $crt) { |
| my $bk = 1; | |
| - | while (-e "$crt.~${bk}~") { |
| + | while(-e "$crt.~${bk}~") { |
| $bk++; | |
| } | |
| rename $crt, "$crt.~${bk}~" or die "Failed to create backup $crt.~$bk}~: $!\n"; | |
| @@ -667,6 +663,6 @@ unless( $stdout ) { | |
| rename "$crt.~", $crt or die "Failed to rename $crt.~ to $crt: $!\n"; | |
| } | |
| if($opt_u && -e $txt && !unlink($txt)) { | |
| - | report "Failed to remove $txt: $!\n"; |
| + | report "Failed to remove $txt: $!\n"; |
| } | |
| report "Done ($certnum CA certs processed, $skipnum skipped)."; | |
tests/directories.pm+196 -196
| @@ -39,268 +39,268 @@ BEGIN { | |
| my %file_chmod1 = ( | |
| - | 'name' => 'chmod1', |
| - | 'content' => "This file should have permissions 444\n", |
| - | 'perm' => 'r--r--r--', |
| - | 'time' => 'Jan 11 10:00', |
| - | 'dostime' => '01-11-10 10:00AM', |
| + | 'name' => 'chmod1', |
| + | 'content' => "This file should have permissions 444\n", |
| + | 'perm' => 'r--r--r--', |
| + | 'time' => 'Jan 11 10:00', |
| + | 'dostime' => '01-11-10 10:00AM', |
| ); | |
| my %file_chmod2 = ( | |
| - | 'name' => 'chmod2', |
| - | 'content' => "This file should have permissions 666\n", |
| - | 'perm' => 'rw-rw-rw-', |
| - | 'time' => 'Feb 1 8:00', |
| - | 'dostime' => '02-01-10 08:00AM', |
| + | 'name' => 'chmod2', |
| + | 'content' => "This file should have permissions 666\n", |
| + | 'perm' => 'rw-rw-rw-', |
| + | 'time' => 'Feb 1 8:00', |
| + | 'dostime' => '02-01-10 08:00AM', |
| ); | |
| my %file_chmod3 = ( | |
| - | 'name' => 'chmod3', |
| - | 'content' => "This file should have permissions 777\n", |
| - | 'perm' => 'rwxrwxrwx', |
| - | 'time' => 'Feb 1 8:00', |
| - | 'dostime' => '02-01-10 08:00AM', |
| + | 'name' => 'chmod3', |
| + | 'content' => "This file should have permissions 777\n", |
| + | 'perm' => 'rwxrwxrwx', |
| + | 'time' => 'Feb 1 8:00', |
| + | 'dostime' => '02-01-10 08:00AM', |
| ); | |
| my %file_chmod4 = ( | |
| - | 'type' => 'd', |
| - | 'name' => 'chmod4', |
| - | 'content' => "This file should have permissions 001\n", |
| - | 'perm' => '--S--S--t', |
| - | 'time' => 'May 4 4:31', |
| - | 'dostime' => '05-04-10 04:31AM' |
| + | 'type' => 'd', |
| + | 'name' => 'chmod4', |
| + | 'content' => "This file should have permissions 001\n", |
| + | 'perm' => '--S--S--t', |
| + | 'time' => 'May 4 4:31', |
| + | 'dostime' => '05-04-10 04:31AM' |
| ); | |
| my %file_chmod5 = ( | |
| - | 'type' => 'd', |
| - | 'name' => 'chmod5', |
| - | 'content' => "This file should have permissions 110\n", |
| - | 'perm' => '--s--s--T', |
| - | 'time' => 'May 4 4:31', |
| - | 'dostime' => '05-04-10 04:31AM' |
| + | 'type' => 'd', |
| + | 'name' => 'chmod5', |
| + | 'content' => "This file should have permissions 110\n", |
| + | 'perm' => '--s--s--T', |
| + | 'time' => 'May 4 4:31', |
| + | 'dostime' => '05-04-10 04:31AM' |
| ); | |
| my %link_link = ( | |
| - | 'type' => 'l', |
| - | 'name' => 'link -> file.txt', |
| - | 'size' => '8', |
| - | 'perm' => 'rwxrwxrwx', |
| - | 'time' => 'Jan 6 4:42' |
| + | 'type' => 'l', |
| + | 'name' => 'link -> file.txt', |
| + | 'size' => '8', |
| + | 'perm' => 'rwxrwxrwx', |
| + | 'time' => 'Jan 6 4:42' |
| ); | |
| my %link_link_absolute = ( | |
| - | 'type' => 'l', |
| - | 'name' => 'link_absolute -> /data/ftp/file.txt', |
| - | 'size' => '15', |
| - | 'perm' => 'rwxrwxrwx', |
| - | 'time' => 'Jan 6 4:45' |
| + | 'type' => 'l', |
| + | 'name' => 'link_absolute -> /data/ftp/file.txt', |
| + | 'size' => '15', |
| + | 'perm' => 'rwxrwxrwx', |
| + | 'time' => 'Jan 6 4:45' |
| ); | |
| my %dir_dot = ( | |
| - | 'type' => "d", |
| - | 'name' => ".", |
| - | 'hlink' => "4", |
| - | 'time' => "Apr 27 5:12", |
| - | 'size' => "20480", |
| - | 'dostime' => "04-27-10 05:12AM", |
| - | 'perm' => "rwxrwxrwx" |
| + | 'type' => "d", |
| + | 'name' => ".", |
| + | 'hlink' => "4", |
| + | 'time' => "Apr 27 5:12", |
| + | 'size' => "20480", |
| + | 'dostime' => "04-27-10 05:12AM", |
| + | 'perm' => "rwxrwxrwx" |
| ); | |
| my %dir_ddot = ( | |
| - | 'type' => "d", |
| - | 'name' => "..", |
| - | 'hlink' => "4", |
| - | 'size' => "20480", |
| - | 'time' => "Apr 23 3:12", |
| - | 'dostime' => "04-23-10 03:12AM", |
| - | 'perm' => "rwxrwxrwx" |
| + | 'type' => "d", |
| + | 'name' => "..", |
| + | 'hlink' => "4", |
| + | 'size' => "20480", |
| + | 'time' => "Apr 23 3:12", |
| + | 'dostime' => "04-23-10 03:12AM", |
| + | 'perm' => "rwxrwxrwx" |
| ); | |
| my %dir_weirddir_txt = ( | |
| - | 'type' => "d", |
| - | 'name' => "weirddir.txt", |
| - | 'hlink' => "2", |
| - | 'size' => "4096", |
| - | 'time' => "Apr 23 3:12", |
| - | 'dostime' => "04-23-10 03:12AM", |
| - | 'perm' => "rwxr-xrwx" |
| + | 'type' => "d", |
| + | 'name' => "weirddir.txt", |
| + | 'hlink' => "2", |
| + | 'size' => "4096", |
| + | 'time' => "Apr 23 3:12", |
| + | 'dostime' => "04-23-10 03:12AM", |
| + | 'perm' => "rwxr-xrwx" |
| ); | |
| my %dir_UNIX = ( | |
| - | 'type' => "d", |
| - | 'name' => "UNIX", |
| - | 'hlink' => "11", |
| - | 'size' => "4096", |
| - | 'time' => "Nov 01 2008", |
| - | 'dostime' => "11-01-08 11:11AM", |
| - | 'perm' => "rwx--x--x" |
| + | 'type' => "d", |
| + | 'name' => "UNIX", |
| + | 'hlink' => "11", |
| + | 'size' => "4096", |
| + | 'time' => "Nov 01 2008", |
| + | 'dostime' => "11-01-08 11:11AM", |
| + | 'perm' => "rwx--x--x" |
| ); | |
| my %dir_DOS = ( | |
| - | 'type' => "d", |
| - | 'name' => "DOS", |
| - | 'hlink' => "11", |
| - | 'size' => "4096", |
| - | 'time' => "Nov 01 2008", |
| - | 'dostime' => "11-01-08 11:11AM", |
| - | 'perm' => "rwx--x--x" |
| + | 'type' => "d", |
| + | 'name' => "DOS", |
| + | 'hlink' => "11", |
| + | 'size' => "4096", |
| + | 'time' => "Nov 01 2008", |
| + | 'dostime' => "11-01-08 11:11AM", |
| + | 'perm' => "rwx--x--x" |
| ); | |
| my %dir_dot_NeXT = ( | |
| - | 'type' => "d", |
| - | 'name' => ".NeXT", |
| - | 'hlink' => "4", |
| - | 'size' => "4096", |
| - | 'time' => "Jan 23 2:05", |
| - | 'dostime' => "01-23-05 02:05AM", |
| - | 'perm' => "rwxrwxrwx" |
| + | 'type' => "d", |
| + | 'name' => ".NeXT", |
| + | 'hlink' => "4", |
| + | 'size' => "4096", |
| + | 'time' => "Jan 23 2:05", |
| + | 'dostime' => "01-23-05 02:05AM", |
| + | 'perm' => "rwxrwxrwx" |
| ); | |
| my %file_empty_file_dat = ( | |
| - | 'name' => "empty_file.dat", |
| - | 'content' => "", |
| - | 'perm' => "rw-r--r--", |
| - | 'time' => "Apr 27 11:01", |
| - | 'dostime' => "04-27-10 11:01AM" |
| + | 'name' => "empty_file.dat", |
| + | 'content' => "", |
| + | 'perm' => "rw-r--r--", |
| + | 'time' => "Apr 27 11:01", |
| + | 'dostime' => "04-27-10 11:01AM" |
| ); | |
| my %file_file_txt = ( | |
| - | 'name' => "file.txt", |
| - | 'content' => "This is content of file \"file.txt\"\n", |
| - | 'time' => "Apr 27 11:01", |
| - | 'dostime' => "04-27-10 11:01AM", |
| - | 'perm' => "rw-r--r--" |
| + | 'name' => "file.txt", |
| + | 'content' => "This is content of file \"file.txt\"\n", |
| + | 'time' => "Apr 27 11:01", |
| + | 'dostime' => "04-27-10 11:01AM", |
| + | 'perm' => "rw-r--r--" |
| ); | |
| my %file_someothertext_txt = ( | |
| - | 'name' => "someothertext.txt", |
| - | 'content' => "Some junk ;-) This file does not really exist.\n", |
| - | 'time' => "Apr 27 11:01", |
| - | 'dostime' => "04-27-10 11:01AM", |
| - | 'perm' => "rw-r--r--" |
| + | 'name' => "someothertext.txt", |
| + | 'content' => "Some junk ;-) This file does not really exist.\n", |
| + | 'time' => "Apr 27 11:01", |
| + | 'dostime' => "04-27-10 11:01AM", |
| + | 'perm' => "rw-r--r--" |
| ); | |
| my %lists = ( | |
| - | '/fully_simulated/' => { |
| - | 'files' => [ \%dir_dot, \%dir_ddot, \%dir_DOS, \%dir_UNIX ], |
| - | 'eol' => "\r\n", |
| - | 'type' => "unix" |
| - | }, |
| - | '/fully_simulated/UNIX/' => { |
| - | 'files' => [ \%dir_dot, \%dir_ddot, |
| - | \%file_chmod1, \%file_chmod2, \%file_chmod3, \%file_chmod4, \%file_chmod5, |
| - | \%file_empty_file_dat, \%file_file_txt, |
| - | \%link_link, \%link_link_absolute, \%dir_dot_NeXT, |
| - | \%file_someothertext_txt, \%dir_weirddir_txt ], |
| - | 'eol' => "\r\n", |
| - | 'type' => 'unix' |
| - | }, |
| - | '/fully_simulated/DOS/' => { |
| - | 'files' => [ \%dir_dot, \%dir_ddot, |
| - | \%file_chmod1, \%file_chmod2, \%file_chmod3, \%file_chmod4, \%file_chmod5, |
| - | \%file_empty_file_dat, \%file_file_txt, |
| - | \%dir_dot_NeXT, \%file_someothertext_txt, \%dir_weirddir_txt ], |
| - | 'eol' => "\r\n", |
| - | 'type' => 'dos' |
| - | } |
| + | '/fully_simulated/' => { |
| + | 'files' => [ \%dir_dot, \%dir_ddot, \%dir_DOS, \%dir_UNIX ], |
| + | 'eol' => "\r\n", |
| + | 'type' => "unix" |
| + | }, |
| + | '/fully_simulated/UNIX/' => { |
| + | 'files' => [ \%dir_dot, \%dir_ddot, |
| + | \%file_chmod1, \%file_chmod2, \%file_chmod3, \%file_chmod4, \%file_chmod5, |
| + | \%file_empty_file_dat, \%file_file_txt, |
| + | \%link_link, \%link_link_absolute, \%dir_dot_NeXT, |
| + | \%file_someothertext_txt, \%dir_weirddir_txt ], |
| + | 'eol' => "\r\n", |
| + | 'type' => 'unix' |
| + | }, |
| + | '/fully_simulated/DOS/' => { |
| + | 'files' => [ \%dir_dot, \%dir_ddot, |
| + | \%file_chmod1, \%file_chmod2, \%file_chmod3, \%file_chmod4, \%file_chmod5, |
| + | \%file_empty_file_dat, \%file_file_txt, |
| + | \%dir_dot_NeXT, \%file_someothertext_txt, \%dir_weirddir_txt ], |
| + | 'eol' => "\r\n", |
| + | 'type' => 'dos' |
| + | } |
| ); | |
| sub ftp_createcontent { | |
| - | my ($list) = $_[0]; |
| + | my ($list) = $_[0]; |
| - | my $type = $$list{'type'}; |
| - | my $eol = $$list{'eol'}; |
| - | my $list_ref = $$list{'files'}; |
| + | my $type = $$list{'type'}; |
| + | my $eol = $$list{'eol'}; |
| + | my $list_ref = $$list{'files'}; |
| - | my @contentlist; |
| - | if($type eq "unix") { |
| - | for(@$list_ref) { |
| - | my %file = %$_; |
| - | my $line = ""; |
| - | my $ftype = $file{'type'} ? $file{'type'} : "-"; |
| - | my $fperm = $file{'perm'} ? $file{'perm'} : "rwxr-xr-x"; |
| - | my $fuser = $file{'user'} ? sprintf("%15s", $file{'user'}) : "ftp-default"; |
| - | my $fgroup = $file{'group'} ? sprintf("%15s", $file{'group'}) : "ftp-default"; |
| - | my $fsize = ""; |
| - | if(exists($file{'type'}) && $file{'type'} eq "d") { |
| - | $fsize = $file{'size'} ? sprintf("%7s", $file{'size'}) : sprintf("%7d", 4096); |
| - | } |
| - | else { |
| - | $fsize = sprintf("%7d", exists($file{'content'}) ? length $file{'content'} : 0); |
| - | } |
| - | my $fhlink = $file{'hlink'} ? sprintf("%4d", $file{'hlink'}) : " 1"; |
| - | my $ftime = $file{'time'} ? sprintf("%10s", $file{'time'}) : "Jan 9 1933"; |
| - | push(@contentlist, "$ftype$fperm $fhlink $fuser $fgroup $fsize $ftime $file{'name'}$eol"); |
| - | } |
| + | my @contentlist; |
| + | if($type eq "unix") { |
| + | for(@$list_ref) { |
| + | my %file = %$_; |
| + | my $line = ""; |
| + | my $ftype = $file{'type'} ? $file{'type'} : "-"; |
| + | my $fperm = $file{'perm'} ? $file{'perm'} : "rwxr-xr-x"; |
| + | my $fuser = $file{'user'} ? sprintf("%15s", $file{'user'}) : "ftp-default"; |
| + | my $fgroup = $file{'group'} ? sprintf("%15s", $file{'group'}) : "ftp-default"; |
| + | my $fsize = ""; |
| + | if(exists($file{'type'}) && $file{'type'} eq "d") { |
| + | $fsize = $file{'size'} ? sprintf("%7s", $file{'size'}) : sprintf("%7d", 4096); |
| + | } |
| + | else { |
| + | $fsize = sprintf("%7d", exists($file{'content'}) ? length $file{'content'} : 0); |
| + | } |
| + | my $fhlink = $file{'hlink'} ? sprintf("%4d", $file{'hlink'}) : " 1"; |
| + | my $ftime = $file{'time'} ? sprintf("%10s", $file{'time'}) : "Jan 9 1933"; |
| + | push(@contentlist, "$ftype$fperm $fhlink $fuser $fgroup $fsize $ftime $file{'name'}$eol"); |
| + | } |
| - | return @contentlist; |
| - | } |
| - | elsif($type =~ /^dos$/) { |
| - | for(@$list_ref) { |
| - | my %file = %$_; |
| - | my $line = ""; |
| - | my $time = $file{'dostime'} ? $file{'dostime'} : "06-25-97 09:12AM"; |
| - | my $size_or_dir; |
| - | if(exists($file{'type'}) && $file{'type'} =~ /^d$/) { |
| - | $size_or_dir = " <DIR> "; |
| - | } |
| - | else { |
| - | $size_or_dir = sprintf("%20d", length $file{'content'}); |
| - | } |
| - | push(@contentlist, "$time $size_or_dir $file{'name'}$eol"); |
| + | return @contentlist; |
| + | } |
| + | elsif($type =~ /^dos$/) { |
| + | for(@$list_ref) { |
| + | my %file = %$_; |
| + | my $line = ""; |
| + | my $time = $file{'dostime'} ? $file{'dostime'} : "06-25-97 09:12AM"; |
| + | my $size_or_dir; |
| + | if(exists($file{'type'}) && $file{'type'} =~ /^d$/) { |
| + | $size_or_dir = " <DIR> "; |
| + | } |
| + | else { |
| + | $size_or_dir = sprintf("%20d", length $file{'content'}); |
| + | } |
| + | push(@contentlist, "$time $size_or_dir $file{'name'}$eol"); |
| + | } |
| + | return @contentlist; |
| } | |
| - | return @contentlist; |
| - | } |
| } | |
| sub wildcard_filesize { | |
| - | my ($list_type, $file) = @_; |
| - | my $list = $lists{$list_type}; |
| - | if($list) { |
| - | my $files = $list->{'files'}; |
| - | for(@$files) { |
| - | my %f = %$_; |
| - | if ($f{'name'} eq $file) { |
| - | if($f{'content'}) { |
| - | return length $f{'content'}; |
| + | my ($list_type, $file) = @_; |
| + | my $list = $lists{$list_type}; |
| + | if($list) { |
| + | my $files = $list->{'files'}; |
| + | for(@$files) { |
| + | my %f = %$_; |
| + | if($f{'name'} eq $file) { |
| + | if($f{'content'}) { |
| + | return length $f{'content'}; |
| + | } |
| + | elsif($f{'type'} ne "d"){ |
| + | return 0; |
| + | } |
| + | else { |
| + | return -1; |
| + | } |
| + | } |
| } | |
| - | elsif ($f{'type'} ne "d"){ |
| - | return 0; |
| - | } |
| - | else { |
| - | return -1; |
| - | } |
| - | } |
| } | |
| - | } |
| - | return -1; |
| + | return -1; |
| } | |
| sub wildcard_getfile { | |
| - | my ($list_type, $file) = @_; |
| - | my $list = $lists{$list_type}; |
| - | if($list) { |
| - | my $files = $list->{'files'}; |
| - | for(@$files) { |
| - | my %f = %$_; |
| - | if ($f{'name'} eq $file) { |
| - | if($f{'content'}) { |
| - | return (length $f{'content'}, $f{'content'}); |
| - | } |
| - | elsif (!exists($f{'type'}) or $f{'type'} ne "d"){ |
| - | return (0, ""); |
| - | } |
| - | else { |
| - | return (-1, 0); |
| + | my ($list_type, $file) = @_; |
| + | my $list = $lists{$list_type}; |
| + | if($list) { |
| + | my $files = $list->{'files'}; |
| + | for(@$files) { |
| + | my %f = %$_; |
| + | if($f{'name'} eq $file) { |
| + | if($f{'content'}) { |
| + | return (length $f{'content'}, $f{'content'}); |
| + | } |
| + | elsif(!exists($f{'type'}) or $f{'type'} ne "d"){ |
| + | return (0, ""); |
| + | } |
| + | else { |
| + | return (-1, 0); |
| + | } |
| + | } |
| } | |
| - | } |
| } | |
| - | } |
| - | return (-1, 0); |
| + | return (-1, 0); |
| } | |
| sub ftp_contentlist { | |
| - | my $listname = $_[0]; |
| - | my $list = $lists{$listname}; |
| - | return ftp_createcontent($list); |
| + | my $listname = $_[0]; |
| + | my $list = $lists{$listname}; |
| + | return ftp_createcontent($list); |
| } | |
tests/ftpserver.pl+56 -56
| @@ -2024,26 +2024,26 @@ sub REST_ftp { | |
| } | |
| sub switch_directory_goto { | |
| - | my $target_dir = $_; |
| + | my $target_dir = $_; |
| - | if(!$ftptargetdir) { |
| - | $ftptargetdir = "/"; |
| - | } |
| + | if(!$ftptargetdir) { |
| + | $ftptargetdir = "/"; |
| + | } |
| - | if($target_dir eq "") { |
| - | $ftptargetdir = "/"; |
| - | } |
| - | elsif($target_dir eq "..") { |
| - | if($ftptargetdir eq "/") { |
| - | $ftptargetdir = "/"; |
| + | if($target_dir eq "") { |
| + | $ftptargetdir = "/"; |
| + | } |
| + | elsif($target_dir eq "..") { |
| + | if($ftptargetdir eq "/") { |
| + | $ftptargetdir = "/"; |
| + | } |
| + | else { |
| + | $ftptargetdir =~ s/[[:alnum:]]+\/$//; |
| + | } |
| } | |
| else { | |
| - | $ftptargetdir =~ s/[[:alnum:]]+\/$//; |
| + | $ftptargetdir .= $target_dir . "/"; |
| } | |
| - | } |
| - | else { |
| - | $ftptargetdir .= $target_dir . "/"; |
| - | } |
| } | |
| sub switch_directory { | |
| @@ -2740,47 +2740,47 @@ sub PORT_ftp { | |
| sub datasockf_state { | |
| my $state = $_[0]; | |
| - | if($state eq 'STOPPED') { |
| - | # Data sockfilter initial state, not running, |
| - | # not connected and not used. |
| - | $datasockf_state = $state; |
| - | $datasockf_mode = 'none'; |
| - | $datasockf_runs = 'no'; |
| - | $datasockf_conn = 'no'; |
| - | } |
| - | elsif($state eq 'PASSIVE') { |
| - | # Data sockfilter accepted connection from client. |
| - | $datasockf_state = $state; |
| - | $datasockf_mode = 'passive'; |
| - | $datasockf_runs = 'yes'; |
| - | $datasockf_conn = 'yes'; |
| - | } |
| - | elsif($state eq 'ACTIVE') { |
| - | # Data sockfilter has connected to client. |
| - | $datasockf_state = $state; |
| - | $datasockf_mode = 'active'; |
| - | $datasockf_runs = 'yes'; |
| - | $datasockf_conn = 'yes'; |
| - | } |
| - | elsif($state eq 'PASSIVE_NODATACONN') { |
| - | # Data sockfilter bound port without listening, |
| - | # client won't be able to establish data connection. |
| - | $datasockf_state = $state; |
| - | $datasockf_mode = 'passive'; |
| - | $datasockf_runs = 'yes'; |
| - | $datasockf_conn = 'no'; |
| - | } |
| - | elsif($state eq 'ACTIVE_NODATACONN') { |
| - | # Data sockfilter does not even run, |
| - | # client awaits data connection from server in vain. |
| - | $datasockf_state = $state; |
| - | $datasockf_mode = 'active'; |
| - | $datasockf_runs = 'no'; |
| - | $datasockf_conn = 'no'; |
| - | } |
| - | else { |
| - | die "Internal error. Unknown datasockf state: $state!"; |
| - | } |
| + | if($state eq 'STOPPED') { |
| + | # Data sockfilter initial state, not running, |
| + | # not connected and not used. |
| + | $datasockf_state = $state; |
| + | $datasockf_mode = 'none'; |
| + | $datasockf_runs = 'no'; |
| + | $datasockf_conn = 'no'; |
| + | } |
| + | elsif($state eq 'PASSIVE') { |
| + | # Data sockfilter accepted connection from client. |
| + | $datasockf_state = $state; |
| + | $datasockf_mode = 'passive'; |
| + | $datasockf_runs = 'yes'; |
| + | $datasockf_conn = 'yes'; |
| + | } |
| + | elsif($state eq 'ACTIVE') { |
| + | # Data sockfilter has connected to client. |
| + | $datasockf_state = $state; |
| + | $datasockf_mode = 'active'; |
| + | $datasockf_runs = 'yes'; |
| + | $datasockf_conn = 'yes'; |
| + | } |
| + | elsif($state eq 'PASSIVE_NODATACONN') { |
| + | # Data sockfilter bound port without listening, |
| + | # client won't be able to establish data connection. |
| + | $datasockf_state = $state; |
| + | $datasockf_mode = 'passive'; |
| + | $datasockf_runs = 'yes'; |
| + | $datasockf_conn = 'no'; |
| + | } |
| + | elsif($state eq 'ACTIVE_NODATACONN') { |
| + | # Data sockfilter does not even run, |
| + | # client awaits data connection from server in vain. |
| + | $datasockf_state = $state; |
| + | $datasockf_mode = 'active'; |
| + | $datasockf_runs = 'no'; |
| + | $datasockf_conn = 'no'; |
| + | } |
| + | else { |
| + | die "Internal error. Unknown datasockf state: $state!"; |
| + | } |
| } | |
| #********************************************************************** | |
tests/getpart.pm+50 -50
| @@ -293,56 +293,56 @@ sub striparray { | |
| # pass array *REFERENCES* ! | |
| # | |
| sub compareparts { | |
| - | my ($firstref, $secondref)=@_; |
| - | |
| - | # we cannot compare arrays index per index since with data chunks, |
| - | # they may not be "evenly" distributed |
| - | my $first = join("", @$firstref); |
| - | my $second = join("", @$secondref); |
| - | |
| - | if($first =~ /%alternatives\[/) { |
| - | die "bad use of compareparts\n"; |
| - | } |
| - | |
| - | if($second =~ /%alternatives\[([^,]*),([^\]]*)\]/) { |
| - | # there can be many %alternatives in this chunk, so we call |
| - | # this function recursively |
| - | my $alt = $second; |
| - | $alt =~ s/%alternatives\[([^,]*),([^\]]*)\]/$1/; |
| - | |
| - | # check first alternative |
| - | { |
| - | my @f; |
| - | my @s; |
| - | push @f, $first; |
| - | push @s, $alt; |
| - | if(!compareparts(\@f, \@s)) { |
| - | return 0; |
| - | } |
| - | } |
| - | |
| - | $alt = $second; |
| - | $alt =~ s/%alternatives\[([^,]*),([^\]]*)\]/$2/; |
| - | # check second alternative |
| - | { |
| - | my @f; |
| - | my @s; |
| - | push @f, $first; |
| - | push @s, $alt; |
| - | if(!compareparts(\@f, \@s)) { |
| - | return 0; |
| - | } |
| - | } |
| - | |
| - | # neither matched |
| - | return 1; |
| - | } |
| - | |
| - | if($first ne $second) { |
| - | return 1; |
| - | } |
| - | |
| - | return 0; |
| + | my ($firstref, $secondref)=@_; |
| + | |
| + | # we cannot compare arrays index per index since with data chunks, |
| + | # they may not be "evenly" distributed |
| + | my $first = join("", @$firstref); |
| + | my $second = join("", @$secondref); |
| + | |
| + | if($first =~ /%alternatives\[/) { |
| + | die "bad use of compareparts\n"; |
| + | } |
| + | |
| + | if($second =~ /%alternatives\[([^,]*),([^\]]*)\]/) { |
| + | # there can be many %alternatives in this chunk, so we call |
| + | # this function recursively |
| + | my $alt = $second; |
| + | $alt =~ s/%alternatives\[([^,]*),([^\]]*)\]/$1/; |
| + | |
| + | # check first alternative |
| + | { |
| + | my @f; |
| + | my @s; |
| + | push @f, $first; |
| + | push @s, $alt; |
| + | if(!compareparts(\@f, \@s)) { |
| + | return 0; |
| + | } |
| + | } |
| + | |
| + | $alt = $second; |
| + | $alt =~ s/%alternatives\[([^,]*),([^\]]*)\]/$2/; |
| + | # check second alternative |
| + | { |
| + | my @f; |
| + | my @s; |
| + | push @f, $first; |
| + | push @s, $alt; |
| + | if(!compareparts(\@f, \@s)) { |
| + | return 0; |
| + | } |
| + | } |
| + | |
| + | # neither matched |
| + | return 1; |
| + | } |
| + | |
| + | if($first ne $second) { |
| + | return 1; |
| + | } |
| + | |
| + | return 0; |
| } | |
| # | |
tests/servers.pm+40 -40
| @@ -219,47 +219,47 @@ sub initserverconfig { | |
| # possible servers. | |
| # | |
| sub init_serverpidfile_hash { | |
| - | for my $proto (('ftp', 'gopher', 'http', 'imap', 'pop3', 'smtp', 'http/2', 'http/3')) { |
| - | for my $ssl (('', 's')) { |
| - | for my $ipvnum ((4, 6)) { |
| - | for my $idnum ((1, 2, 3)) { |
| - | my $serv = servername_id("$proto$ssl", $ipvnum, $idnum); |
| - | my $pidf = server_pidfilename("$LOGDIR/$PIDDIR", "$proto$ssl", |
| - | $ipvnum, $idnum); |
| - | $serverpidfile{$serv} = $pidf; |
| - | my $portf = server_portfilename("$LOGDIR/$PIDDIR", "$proto$ssl", |
| - | $ipvnum, $idnum); |
| - | $serverportfile{$serv} = $portf; |
| + | for my $proto (('ftp', 'gopher', 'http', 'imap', 'pop3', 'smtp', 'http/2', 'http/3')) { |
| + | for my $ssl (('', 's')) { |
| + | for my $ipvnum ((4, 6)) { |
| + | for my $idnum ((1, 2, 3)) { |
| + | my $serv = servername_id("$proto$ssl", $ipvnum, $idnum); |
| + | my $pidf = server_pidfilename("$LOGDIR/$PIDDIR", "$proto$ssl", |
| + | $ipvnum, $idnum); |
| + | $serverpidfile{$serv} = $pidf; |
| + | my $portf = server_portfilename("$LOGDIR/$PIDDIR", "$proto$ssl", |
| + | $ipvnum, $idnum); |
| + | $serverportfile{$serv} = $portf; |
| + | } |
| + | } |
| + | } |
| + | } |
| + | for my $proto (('tftp', 'sftp', 'socks', 'ssh', 'rtsp', 'httptls', |
| + | 'dict', 'smb', 'smbs', 'telnet', 'mqtt', 'https-mtls', |
| + | 'dns')) { |
| + | for my $ipvnum ((4, 6)) { |
| + | for my $idnum ((1, 2)) { |
| + | my $serv = servername_id($proto, $ipvnum, $idnum); |
| + | my $pidf = server_pidfilename("$LOGDIR/$PIDDIR", $proto, $ipvnum, |
| + | $idnum); |
| + | $serverpidfile{$serv} = $pidf; |
| + | my $portf = server_portfilename("$LOGDIR/$PIDDIR", $proto, $ipvnum, |
| + | $idnum); |
| + | $serverportfile{$serv} = $portf; |
| + | } |
| + | } |
| + | } |
| + | for my $proto (('http', 'imap', 'pop3', 'smtp', 'http/2', 'http/3')) { |
| + | for my $ssl (('', 's')) { |
| + | my $serv = servername_id("$proto$ssl", "unix", 1); |
| + | my $pidf = server_pidfilename("$LOGDIR/$PIDDIR", "$proto$ssl", |
| + | "unix", 1); |
| + | $serverpidfile{$serv} = $pidf; |
| + | my $portf = server_portfilename("$LOGDIR/$PIDDIR", "$proto$ssl", |
| + | "unix", 1); |
| + | $serverportfile{$serv} = $portf; |
| } | |
| - | } |
| - | } |
| - | } |
| - | for my $proto (('tftp', 'sftp', 'socks', 'ssh', 'rtsp', 'httptls', |
| - | 'dict', 'smb', 'smbs', 'telnet', 'mqtt', 'https-mtls', |
| - | 'dns')) { |
| - | for my $ipvnum ((4, 6)) { |
| - | for my $idnum ((1, 2)) { |
| - | my $serv = servername_id($proto, $ipvnum, $idnum); |
| - | my $pidf = server_pidfilename("$LOGDIR/$PIDDIR", $proto, $ipvnum, |
| - | $idnum); |
| - | $serverpidfile{$serv} = $pidf; |
| - | my $portf = server_portfilename("$LOGDIR/$PIDDIR", $proto, $ipvnum, |
| - | $idnum); |
| - | $serverportfile{$serv} = $portf; |
| - | } |
| - | } |
| - | } |
| - | for my $proto (('http', 'imap', 'pop3', 'smtp', 'http/2', 'http/3')) { |
| - | for my $ssl (('', 's')) { |
| - | my $serv = servername_id("$proto$ssl", "unix", 1); |
| - | my $pidf = server_pidfilename("$LOGDIR/$PIDDIR", "$proto$ssl", |
| - | "unix", 1); |
| - | $serverpidfile{$serv} = $pidf; |
| - | my $portf = server_portfilename("$LOGDIR/$PIDDIR", "$proto$ssl", |
| - | "unix", 1); |
| - | $serverportfile{$serv} = $portf; |
| - | } |
| - | } |
| + | } |
| } | |
tests/test1173.pl+2 -2
| @@ -195,13 +195,13 @@ sub scanmanpage { | |
| } | |
| } | |
| } | |
| - | elsif($inex) { |
| + | elsif($inex) { |
| $exsize++; | |
| if($_ =~ /[^\\]\\n/) { | |
| print STDERR "$file:$line '\\n' need to be '\\\\n'!\n"; | |
| } | |
| } | |
| - | elsif($insynop) { |
| + | elsif($insynop) { |
| $synopsize++; | |
| if(($synopsize == 1) && ($_ !~ /\.nf/)) { | |
| print STDERR "$file:$line:1:ERROR: be .nf for proper formatting\n"; | |
tests/test1222.pl+173 -173
| @@ -59,84 +59,84 @@ sub scan_header { | |
| open(my $h, "<", "$f"); | |
| while(<$h>) { | |
| - | s/^\s*(.*?)\s*$/$1/; # Trim. |
| - | # Remove multi-line comment trail. |
| - | if($incomment) { |
| - | if($_ !~ /.*?\*\/\s*(.*)$/) { |
| - | next; |
| + | s/^\s*(.*?)\s*$/$1/; # Trim. |
| + | # Remove multi-line comment trail. |
| + | if($incomment) { |
| + | if($_ !~ /.*?\*\/\s*(.*)$/) { |
| + | next; |
| + | } |
| + | $_ = $1; |
| + | $incomment = 0; |
| } | |
| - | $_ = $1; |
| - | $incomment = 0; |
| - | } |
| - | if($line ne "") { |
| - | # Unfold line. |
| - | $_ = "$line $1"; |
| - | $line = ""; |
| - | } |
| - | # Remove comments. |
| - | while($_ =~ /^(.*?)\/\*.*?\*\/(.*)$/) { |
| - | $_ = "$1 $2"; |
| - | } |
| - | if($_ =~ /^(.*)\/\*/) { |
| - | $_ = "$1 "; |
| - | $incomment = 1; |
| - | } |
| - | s/^\s*(.*?)\s*$/$1/; # Trim again. |
| - | # Ignore preprocessor directives and blank lines. |
| - | if($_ =~ /^(?:#|$)/) { |
| - | next; |
| - | } |
| - | # Handle lines that may be continued as if they were folded. |
| - | if($_ !~ /[;,{}]$/) { |
| - | # Folded line. |
| - | $line = $_; |
| - | next; |
| - | } |
| - | if($_ =~ /CURLOPTDEPRECATED\(/) { |
| - | # Handle deprecated CURLOPT_* option. |
| - | if($_ !~ /CURLOPTDEPRECATED\(\s*(\S+)\s*,(?:.*?,){2}\s*(.*?)\s*,.*"\)/) { |
| - | # Folded line. |
| - | $line = $_; |
| - | next; |
| + | if($line ne "") { |
| + | # Unfold line. |
| + | $_ = "$line $1"; |
| + | $line = ""; |
| } | |
| - | $hdr{$1} = $2; |
| - | } |
| - | elsif($_ =~ /CURLOPT\(/) { |
| - | # Handle non-deprecated CURLOPT_* option. |
| - | if($_ !~ /CURLOPT\(\s*(\S+)\s*(?:,.*?){2}\)/) { |
| - | # Folded line. |
| - | $line = $_; |
| - | next; |
| + | # Remove comments. |
| + | while($_ =~ /^(.*?)\/\*.*?\*\/(.*)$/) { |
| + | $_ = "$1 $2"; |
| } | |
| - | $hdr{$1} = "X"; |
| - | } |
| - | else { |
| - | my $version = "X"; |
| - | |
| - | # Get other kind of deprecation from this line. |
| - | if($_ =~ /CURL_DEPRECATED\(/) { |
| - | if($_ !~ /^(.*)CURL_DEPRECATED\(\s*(\S+?)\s*,.*?"\)(.*)$/) { |
| + | if($_ =~ /^(.*)\/\*/) { |
| + | $_ = "$1 "; |
| + | $incomment = 1; |
| + | } |
| + | s/^\s*(.*?)\s*$/$1/; # Trim again. |
| + | # Ignore preprocessor directives and blank lines. |
| + | if($_ =~ /^(?:#|$)/) { |
| + | next; |
| + | } |
| + | # Handle lines that may be continued as if they were folded. |
| + | if($_ !~ /[;,{}]$/) { |
| # Folded line. | |
| $line = $_; | |
| next; | |
| - | } |
| - | $version = $2; |
| - | $_ = "$1 $3"; |
| } | |
| - | if($_ =~ /^CURL_EXTERN\s+.*\s+(\S+?)\s*\(/) { |
| - | # Flag public function. |
| - | $hdr{$1} = $version; |
| + | if($_ =~ /CURLOPTDEPRECATED\(/) { |
| + | # Handle deprecated CURLOPT_* option. |
| + | if($_ !~ /CURLOPTDEPRECATED\(\s*(\S+)\s*,(?:.*?,){2}\s*(.*?)\s*,.*"\)/) { |
| + | # Folded line. |
| + | $line = $_; |
| + | next; |
| + | } |
| + | $hdr{$1} = $2; |
| } | |
| - | elsif($inenum && $_ =~ /(\w+)\s*[,=}]/) { |
| - | # Flag enum value. |
| - | $hdr{$1} = $version; |
| + | elsif($_ =~ /CURLOPT\(/) { |
| + | # Handle non-deprecated CURLOPT_* option. |
| + | if($_ !~ /CURLOPT\(\s*(\S+)\s*(?:,.*?){2}\)/) { |
| + | # Folded line. |
| + | $line = $_; |
| + | next; |
| + | } |
| + | $hdr{$1} = "X"; |
| + | } |
| + | else { |
| + | my $version = "X"; |
| + | |
| + | # Get other kind of deprecation from this line. |
| + | if($_ =~ /CURL_DEPRECATED\(/) { |
| + | if($_ !~ /^(.*)CURL_DEPRECATED\(\s*(\S+?)\s*,.*?"\)(.*)$/) { |
| + | # Folded line. |
| + | $line = $_; |
| + | next; |
| + | } |
| + | $version = $2; |
| + | $_ = "$1 $3"; |
| + | } |
| + | if($_ =~ /^CURL_EXTERN\s+.*\s+(\S+?)\s*\(/) { |
| + | # Flag public function. |
| + | $hdr{$1} = $version; |
| + | } |
| + | elsif($inenum && $_ =~ /(\w+)\s*[,=}]/) { |
| + | # Flag enum value. |
| + | $hdr{$1} = $version; |
| + | } |
| + | } |
| + | # Remember if we are in an enum definition. |
| + | $inenum |= ($_ =~ /\benum\b/); |
| + | if($_ =~ /}/) { |
| + | $inenum = 0; |
| } | |
| - | } |
| - | # Remember if we are in an enum definition. |
| - | $inenum |= ($_ =~ /\benum\b/); |
| - | if($_ =~ /}/) { |
| - | $inenum = 0; |
| - | } |
| } | |
| close $h; | |
| } | |
| @@ -151,31 +151,31 @@ sub scan_man_for_opts { | |
| open(my $m, "<", "$f"); | |
| while(<$m>) { | |
| - | if($_ =~ /^\./) { |
| - | # roff directive found: end current option paragraph. |
| - | my $o = $opt; |
| - | $opt = ""; |
| - | if($_ =~ /^\.IP\s+((?:$prefix)_\w+)/) { |
| - | # A new option has been found. |
| - | $opt = $1; |
| + | if($_ =~ /^\./) { |
| + | # roff directive found: end current option paragraph. |
| + | my $o = $opt; |
| + | $opt = ""; |
| + | if($_ =~ /^\.IP\s+((?:$prefix)_\w+)/) { |
| + | # A new option has been found. |
| + | $opt = $1; |
| + | } |
| + | $_ = $line; # Get full paragraph. |
| + | $line = ""; |
| + | s/\\f.//g; # Remove font formatting. |
| + | s/\s+/ /g; # One line with single space only. |
| + | if($o) { |
| + | $funcman{$o} = "X"; |
| + | # Check if paragraph is mentioning deprecation. |
| + | while($_ =~ /(?:deprecated|obsoleted?)\b\s*(?:in\b|since\b)?\s*(?:version\b|curl\b|libcurl\b)?\s*(\d[0-9.]*\d)?\b\s*(.*)$/i) { |
| + | $funcman{$o} = $1 || "?"; |
| + | $_ = $2; |
| + | } |
| + | } |
| } | |
| - | $_ = $line; # Get full paragraph. |
| - | $line = ""; |
| - | s/\\f.//g; # Remove font formatting. |
| - | s/\s+/ /g; # One line with single space only. |
| - | if($o) { |
| - | $funcman{$o} = "X"; |
| - | # Check if paragraph is mentioning deprecation. |
| - | while($_ =~ /(?:deprecated|obsoleted?)\b\s*(?:in\b|since\b)?\s*(?:version\b|curl\b|libcurl\b)?\s*(\d[0-9.]*\d)?\b\s*(.*)$/i) { |
| - | $funcman{$o} = $1 || "?"; |
| - | $_ = $2; |
| - | } |
| + | else { |
| + | # Text line: accumulate. |
| + | $line .= $_; |
| } | |
| - | } |
| - | else { |
| - | # Text line: accumulate. |
| - | $line .= $_; |
| - | } |
| } | |
| close $m; | |
| } | |
| @@ -186,52 +186,52 @@ sub scan_man_page { | |
| my $version = "X"; | |
| if(open(my $fh, "<", "$path")) { | |
| - | my $section = ""; |
| - | my $line = ""; |
| + | my $section = ""; |
| + | my $line = ""; |
| - | while(<$fh>) { |
| - | if($_ =~ /\.so\s+man3\/(.*\.3\b)/) { |
| - | # Handle manpage inclusion. |
| - | scan_man_page(dirname($path) . "/$1", $sym, $table); |
| - | $version = exists($$table{$sym})? $$table{$sym}: $version; |
| - | } |
| - | elsif($_ =~ /^\./) { |
| - | # Line is a roff directive. |
| - | if($_ =~ /^\.SH\b\s*(\w*)/) { |
| - | # Section starts. End previous one. |
| - | my $sh = $section; |
| + | while(<$fh>) { |
| + | if($_ =~ /\.so\s+man3\/(.*\.3\b)/) { |
| + | # Handle manpage inclusion. |
| + | scan_man_page(dirname($path) . "/$1", $sym, $table); |
| + | $version = exists($$table{$sym})? $$table{$sym}: $version; |
| + | } |
| + | elsif($_ =~ /^\./) { |
| + | # Line is a roff directive. |
| + | if($_ =~ /^\.SH\b\s*(\w*)/) { |
| + | # Section starts. End previous one. |
| + | my $sh = $section; |
| - | $section = $1; |
| - | $_ = $line; # Previous section text. |
| - | $line = ""; |
| - | s/\\f.//g; |
| - | s/\s+/ /g; |
| - | s/\\f.//g; # Remove font formatting. |
| - | s/\s+/ /g; # One line with single space only. |
| - | if($sh =~ /DESCRIPTION|DEPRECATED/) { |
| - | while($_ =~ /(?:deprecated|obsoleted?)\b\s*(?:in\b|since\b)?\s*(?:version\b|curl\b|libcurl\b)?\s*(\d[0-9.]*\d)?\b\s*(.*)$/i) { |
| - | # Flag deprecation status. |
| - | if($version ne "X" && $version ne "?") { |
| - | if($1 && $1 ne $version) { |
| - | print "error: $sym manpage lists unmatching deprecation versions $version and $1\n"; |
| - | $errcode++; |
| - | } |
| - | } |
| - | else { |
| - | $version = $1 || "?"; |
| + | $section = $1; |
| + | $_ = $line; # Previous section text. |
| + | $line = ""; |
| + | s/\\f.//g; |
| + | s/\s+/ /g; |
| + | s/\\f.//g; # Remove font formatting. |
| + | s/\s+/ /g; # One line with single space only. |
| + | if($sh =~ /DESCRIPTION|DEPRECATED/) { |
| + | while($_ =~ /(?:deprecated|obsoleted?)\b\s*(?:in\b|since\b)?\s*(?:version\b|curl\b|libcurl\b)?\s*(\d[0-9.]*\d)?\b\s*(.*)$/i) { |
| + | # Flag deprecation status. |
| + | if($version ne "X" && $version ne "?") { |
| + | if($1 && $1 ne $version) { |
| + | print "error: $sym manpage lists unmatching deprecation versions $version and $1\n"; |
| + | $errcode++; |
| + | } |
| + | } |
| + | else { |
| + | $version = $1 || "?"; |
| + | } |
| + | $_ = $2; |
| + | } |
| + | } |
| } | |
| - | $_ = $2; |
| - | } |
| } | |
| - | } |
| - | } |
| - | else { |
| - | # Text line: accumulate. |
| - | $line .= $_; |
| + | else { |
| + | # Text line: accumulate. |
| + | $line .= $_; |
| + | } |
| } | |
| - | } |
| - | close $fh; |
| - | $$table{$sym} = $version; |
| + | close $fh; |
| + | $$table{$sym} = $version; |
| } | |
| } | |
| @@ -240,14 +240,14 @@ sub scan_man_page { | |
| open(my $fh, "<", "$libdocdir/symbols-in-versions") || | |
| die "$libdocdir/symbols-in-versions"; | |
| while(<$fh>) { | |
| - | if($_ =~ /^((?:CURL|LIBCURL)\S+)\s+\S+\s*(\S*)\s*(\S*)$/) { |
| - | if($3 eq "") { |
| - | $syminver{$1} = "X"; |
| - | if($2 ne "" && $2 ne ".") { |
| - | $syminver{$1} = $2; |
| - | } |
| + | if($_ =~ /^((?:CURL|LIBCURL)\S+)\s+\S+\s*(\S*)\s*(\S*)$/) { |
| + | if($3 eq "") { |
| + | $syminver{$1} = "X"; |
| + | if($2 ne "" && $2 ne ".") { |
| + | $syminver{$1} = $2; |
| + | } |
| + | } |
| } | |
| - | } |
| } | |
| close($fh); | |
| @@ -258,14 +258,14 @@ closedir $dh; | |
| # Get functions and enum symbols from header files. | |
| for(@hfiles) { | |
| - | scan_header("$incdir/$_"); |
| + | scan_header("$incdir/$_"); |
| } | |
| # Get function statuses from manpages. | |
| foreach my $sym (keys %hdr) { | |
| - | if($sym =~/^(?:curl|curlx)_\w/) { |
| - | scan_man_page("$libdocdir/$sym.3", $sym, \%funcman); |
| - | } |
| + | if($sym =~/^(?:curl|curlx)_\w/) { |
| + | scan_man_page("$libdocdir/$sym.3", $sym, \%funcman); |
| + | } |
| } | |
| # Get options from function manpages. | |
| @@ -274,9 +274,9 @@ scan_man_for_opts("$libdocdir/curl_easy_getinfo.3", "CURLINFO"); | |
| # Get deprecation status from option manpages. | |
| foreach my $sym (keys %syminver) { | |
| - | if($sym =~ /^(?:CURLOPT|CURLINFO)_\w+$/) { |
| - | scan_man_page("$libdocdir/opts/$sym.3", $sym, \%optman); |
| - | } |
| + | if($sym =~ /^(?:CURLOPT|CURLINFO)_\w+$/) { |
| + | scan_man_page("$libdocdir/opts/$sym.3", $sym, \%optman); |
| + | } |
| } | |
| # Print results. | |
| @@ -293,37 +293,37 @@ Symbol symbols-in func man opt man .h | |
| HEADER | |
| ; | |
| foreach my $sym (sort {$a cmp $b} keys %keys) { | |
| - | if($sym =~ /^(?:CURLOPT|CURLINFO|curl|curlx)_\w/) { |
| - | my $s = exists($syminver{$sym})? $syminver{$sym}: " "; |
| - | my $f = exists($funcman{$sym})? $funcman{$sym}: " "; |
| - | my $o = exists($optman{$sym})? $optman{$sym}: " "; |
| - | my $h = exists($hdr{$sym})? $hdr{$sym}: " "; |
| - | my $r = " "; |
| + | if($sym =~ /^(?:CURLOPT|CURLINFO|curl|curlx)_\w/) { |
| + | my $s = exists($syminver{$sym})? $syminver{$sym}: " "; |
| + | my $f = exists($funcman{$sym})? $funcman{$sym}: " "; |
| + | my $o = exists($optman{$sym})? $optman{$sym}: " "; |
| + | my $h = exists($hdr{$sym})? $hdr{$sym}: " "; |
| + | my $r = " "; |
| - | # There are deprecated symbols in symbols-in-versions that are aliases |
| - | # and thus not listed anywhere else. Ignore them. |
| - | "$f$o$h" =~ /[X ]{3}/ && next; |
| + | # There are deprecated symbols in symbols-in-versions that are aliases |
| + | # and thus not listed anywhere else. Ignore them. |
| + | "$f$o$h" =~ /[X ]{3}/ && next; |
| - | # Check for inconsistencies between deprecations from the different sources. |
| - | foreach my $k ($s, $f, $o, $h) { |
| - | $r = $r eq " "? $k: $r; |
| - | if($k ne " " && $r ne $k) { |
| - | if($r eq "?") { |
| - | $r = $k ne "X"? $k: "!"; |
| - | } |
| - | elsif($r eq "X" || $k ne "?") { |
| - | $r = "!"; |
| + | # Check for inconsistencies between deprecations from the different sources. |
| + | foreach my $k ($s, $f, $o, $h) { |
| + | $r = $r eq " "? $k: $r; |
| + | if($k ne " " && $r ne $k) { |
| + | if($r eq "?") { |
| + | $r = $k ne "X"? $k: "!"; |
| + | } |
| + | elsif($r eq "X" || $k ne "?") { |
| + | $r = "!"; |
| + | } |
| + | } |
| } | |
| - | } |
| - | } |
| - | if($r eq "!") { |
| - | print $leader; |
| - | $leader = ""; |
| - | printf("%-38s %-11s %-9s %-9s %s\n", $sym, $s, $f, $o, $h); |
| - | $errcode++; |
| + | if($r eq "!") { |
| + | print $leader; |
| + | $leader = ""; |
| + | printf("%-38s %-11s %-9s %-9s %s\n", $sym, $s, $f, $o, $h); |
| + | $errcode++; |
| + | } |
| } | |
| - | } |
| } | |
| exit $errcode; | |
tests/test1544.pl+57 -57
| @@ -44,47 +44,47 @@ sub scan_header { | |
| open(my $h, "<", "$f"); | |
| while(<$h>) { | |
| - | s/^\s*(.*?)\s*$/$1/; # Trim. |
| - | # Remove multi-line comment trail. |
| - | if($incomment) { |
| - | if($_ !~ /.*?\*\/\s*(.*)$/) { |
| - | next; |
| + | s/^\s*(.*?)\s*$/$1/; # Trim. |
| + | # Remove multi-line comment trail. |
| + | if($incomment) { |
| + | if($_ !~ /.*?\*\/\s*(.*)$/) { |
| + | next; |
| + | } |
| + | $_ = $1; |
| + | $incomment = 0; |
| + | } |
| + | if($line ne "") { |
| + | # Unfold line. |
| + | $_ = "$line $1"; |
| + | $line = ""; |
| + | } |
| + | if($_ =~ /^(.*)\\$/) { |
| + | $line = "$1 "; |
| + | next; |
| + | } |
| + | # Remove comments. |
| + | while($_ =~ /^(.*?)\/\*.*?\*\/(.*)$/) { |
| + | $_ = "$1 $2"; |
| + | } |
| + | if($_ =~ /^(.*)\/\*/) { |
| + | $_ = "$1 "; |
| + | $incomment = 1; |
| + | } |
| + | s/^\s*(.*?)\s*$/$1/; # Trim again. |
| + | # Ignore preprocessor directives and blank lines. |
| + | if($_ =~ /^(?:#|$)/) { |
| + | next; |
| + | } |
| + | # Handle lines that may be continued as if they were folded. |
| + | if($_ !~ /[;,{}]$/ || $_ =~ /[^)],$/) { |
| + | # Folded line. |
| + | $line = $_; |
| + | next; |
| + | } |
| + | # Keep string options only. |
| + | if($_ =~ /CURLOPT(?:DEPRECATED)?\s*\(\s*([^, \t]+)\s*,\s*CURLOPTTYPE_STRINGPOINT/) { |
| + | push(@stringopts, $1); |
| } | |
| - | $_ = $1; |
| - | $incomment = 0; |
| - | } |
| - | if($line ne "") { |
| - | # Unfold line. |
| - | $_ = "$line $1"; |
| - | $line = ""; |
| - | } |
| - | if($_ =~ /^(.*)\\$/) { |
| - | $line = "$1 "; |
| - | next; |
| - | } |
| - | # Remove comments. |
| - | while($_ =~ /^(.*?)\/\*.*?\*\/(.*)$/) { |
| - | $_ = "$1 $2"; |
| - | } |
| - | if($_ =~ /^(.*)\/\*/) { |
| - | $_ = "$1 "; |
| - | $incomment = 1; |
| - | } |
| - | s/^\s*(.*?)\s*$/$1/; # Trim again. |
| - | # Ignore preprocessor directives and blank lines. |
| - | if($_ =~ /^(?:#|$)/) { |
| - | next; |
| - | } |
| - | # Handle lines that may be continued as if they were folded. |
| - | if($_ !~ /[;,{}]$/ || $_ =~ /[^)],$/) { |
| - | # Folded line. |
| - | $line = $_; |
| - | next; |
| - | } |
| - | # Keep string options only. |
| - | if($_ =~ /CURLOPT(?:DEPRECATED)?\s*\(\s*([^, \t]+)\s*,\s*CURLOPTTYPE_STRINGPOINT/) { |
| - | push(@stringopts, $1); |
| - | } |
| } | |
| close $h; | |
| return @stringopts; | |
| @@ -98,12 +98,12 @@ sub scan_wrapper_for_strings { | |
| open(my $h, "<", "$f"); | |
| while(<$h>) { | |
| - | if($_ =~ /(BEGIN|END) TRANSLATABLE STRING OPTIONS/) { |
| - | $inarmor = $1 eq "BEGIN"; |
| - | } |
| - | elsif($inarmor && $_ =~ /case\s+([^:]+):/) { |
| - | push(@stringopts, $1); |
| - | } |
| + | if($_ =~ /(BEGIN|END) TRANSLATABLE STRING OPTIONS/) { |
| + | $inarmor = $1 eq "BEGIN"; |
| + | } |
| + | elsif($inarmor && $_ =~ /case\s+([^:]+):/) { |
| + | push(@stringopts, $1); |
| + | } |
| } | |
| close $h; | |
| return @stringopts; | |
| @@ -121,27 +121,27 @@ my %diff; | |
| delete @diff{@stringrefs}; | |
| foreach(keys %diff) { | |
| - | print "$_ is not translated\n"; |
| - | delete $diff{$_}; |
| - | $errcount++; |
| + | print "$_ is not translated\n"; |
| + | delete $diff{$_}; |
| + | $errcount++; |
| } | |
| @diff{@stringrefs} = 0..$#stringrefs; | |
| delete @diff{@stringdefs}; | |
| foreach(keys %diff) { | |
| - | print "translated option $_ does not exist\n"; |
| - | $errcount++; |
| + | print "translated option $_ does not exist\n"; |
| + | $errcount++; |
| } | |
| # Check translated string option cases are sorted alphanumerically. | |
| foreach(my $i = 1; $i < $#stringrefs; $i++) { | |
| - | if($stringrefs[$i] lt $stringrefs[$i - 1]) { |
| - | print("Translated string options are not sorted (" . $stringrefs[$i - 1] . |
| - | "/" . $stringrefs[$i] . ")\n"); |
| - | $errcount++; |
| - | last; |
| - | } |
| + | if($stringrefs[$i] lt $stringrefs[$i - 1]) { |
| + | print("Translated string options are not sorted (" . $stringrefs[$i - 1] . |
| + | "/" . $stringrefs[$i] . ")\n"); |
| + | $errcount++; |
| + | last; |
| + | } |
| } | |
| exit !!$errcount; | |
tests/testcurl.pl+430 -430
| @@ -83,91 +83,91 @@ $fixed=0; | |
| # Determine if we're running from git or a canned copy of curl, | |
| # or if we got a specific target option or setup file option. | |
| $CURLDIR="curl"; | |
| - | if (-f ".git/config") { |
| - | $CURLDIR = "./"; |
| + | if(-f ".git/config") { |
| + | $CURLDIR = "./"; |
| } | |
| $git=1; | |
| $setupfile = 'setup'; | |
| $configurebuild = 1; | |
| - | while ($ARGV[0]) { |
| - | if ($ARGV[0] =~ /--target=/) { |
| - | $targetos = (split(/=/, shift @ARGV, 2))[1]; |
| - | } |
| - | elsif ($ARGV[0] =~ /--setup=/) { |
| - | $setupfile = (split(/=/, shift @ARGV, 2))[1]; |
| - | } |
| - | elsif ($ARGV[0] =~ /--extvercmd=/) { |
| - | $extvercmd = (split(/=/, shift @ARGV, 2))[1]; |
| - | } |
| - | elsif ($ARGV[0] =~ /--mktarball=/) { |
| - | $mktarball = (split(/=/, shift @ARGV, 2))[1]; |
| - | } |
| - | elsif ($ARGV[0] =~ /--name=/) { |
| - | $name = (split(/=/, shift @ARGV, 2))[1]; |
| - | } |
| - | elsif ($ARGV[0] =~ /--email=/) { |
| - | $email = (split(/=/, shift @ARGV, 2))[1]; |
| - | } |
| - | elsif ($ARGV[0] =~ /--desc=/) { |
| - | $desc = (split(/=/, shift @ARGV, 2))[1]; |
| - | } |
| - | elsif ($ARGV[0] =~ /--notes=/) { |
| - | $notes = (split(/=/, shift @ARGV, 2))[1]; |
| - | } |
| - | elsif ($ARGV[0] =~ /--configure=(.*)/) { |
| - | $confopts = $1; |
| - | shift @ARGV; |
| - | } |
| - | elsif (($ARGV[0] eq "--nocvsup") || ($ARGV[0] eq "--nogitpull")) { |
| - | $nogitpull=1; |
| - | shift @ARGV; |
| - | } |
| - | elsif ($ARGV[0] =~ /--nobuildconf/) { |
| - | $nobuildconf=1; |
| - | shift @ARGV; |
| - | } |
| - | elsif ($ARGV[0] =~ /--noconfigure/) { |
| - | $configurebuild=0; |
| - | shift @ARGV; |
| - | } |
| - | elsif ($ARGV[0] =~ /--crosscompile/) { |
| - | $crosscompile=1; |
| - | shift @ARGV; |
| - | } |
| - | elsif ($ARGV[0] =~ /--runtestopts=/) { |
| - | $runtestopts = (split(/=/, shift @ARGV, 2))[1]; |
| - | } |
| - | else { |
| - | $CURLDIR=shift @ARGV; |
| - | $git=0; # a given dir, assume not using git |
| - | } |
| + | while($ARGV[0]) { |
| + | if($ARGV[0] =~ /--target=/) { |
| + | $targetos = (split(/=/, shift @ARGV, 2))[1]; |
| + | } |
| + | elsif($ARGV[0] =~ /--setup=/) { |
| + | $setupfile = (split(/=/, shift @ARGV, 2))[1]; |
| + | } |
| + | elsif($ARGV[0] =~ /--extvercmd=/) { |
| + | $extvercmd = (split(/=/, shift @ARGV, 2))[1]; |
| + | } |
| + | elsif($ARGV[0] =~ /--mktarball=/) { |
| + | $mktarball = (split(/=/, shift @ARGV, 2))[1]; |
| + | } |
| + | elsif($ARGV[0] =~ /--name=/) { |
| + | $name = (split(/=/, shift @ARGV, 2))[1]; |
| + | } |
| + | elsif($ARGV[0] =~ /--email=/) { |
| + | $email = (split(/=/, shift @ARGV, 2))[1]; |
| + | } |
| + | elsif($ARGV[0] =~ /--desc=/) { |
| + | $desc = (split(/=/, shift @ARGV, 2))[1]; |
| + | } |
| + | elsif($ARGV[0] =~ /--notes=/) { |
| + | $notes = (split(/=/, shift @ARGV, 2))[1]; |
| + | } |
| + | elsif($ARGV[0] =~ /--configure=(.*)/) { |
| + | $confopts = $1; |
| + | shift @ARGV; |
| + | } |
| + | elsif(($ARGV[0] eq "--nocvsup") || ($ARGV[0] eq "--nogitpull")) { |
| + | $nogitpull=1; |
| + | shift @ARGV; |
| + | } |
| + | elsif($ARGV[0] =~ /--nobuildconf/) { |
| + | $nobuildconf=1; |
| + | shift @ARGV; |
| + | } |
| + | elsif($ARGV[0] =~ /--noconfigure/) { |
| + | $configurebuild=0; |
| + | shift @ARGV; |
| + | } |
| + | elsif($ARGV[0] =~ /--crosscompile/) { |
| + | $crosscompile=1; |
| + | shift @ARGV; |
| + | } |
| + | elsif($ARGV[0] =~ /--runtestopts=/) { |
| + | $runtestopts = (split(/=/, shift @ARGV, 2))[1]; |
| + | } |
| + | else { |
| + | $CURLDIR=shift @ARGV; |
| + | $git=0; # a given dir, assume not using git |
| + | } |
| } | |
| # Do the platform-specific stuff here | |
| $confheader = 'curl_config.h'; | |
| $binext = ''; | |
| $libext = '.la'; # .la since both libcurl and libcares are made with libtool | |
| - | if ($^O eq 'MSWin32' || $targetos) { |
| - | if (!$targetos) { |
| - | # If no target defined on Windows, let's assume vc |
| - | $targetos = 'vc'; |
| - | } |
| - | if ($targetos =~ /vc/ || $targetos =~ /borland/) { |
| - | $binext = '.exe'; |
| - | $libext = '.lib'; |
| - | } |
| - | elsif ($targetos =~ /mingw/) { |
| - | $binext = '.exe'; |
| - | if ($^O eq 'MSWin32') { |
| - | $libext = '.a'; |
| + | if($^O eq 'MSWin32' || $targetos) { |
| + | if(!$targetos) { |
| + | # If no target defined on Windows, let's assume vc |
| + | $targetos = 'vc'; |
| + | } |
| + | if($targetos =~ /vc/ || $targetos =~ /borland/) { |
| + | $binext = '.exe'; |
| + | $libext = '.lib'; |
| + | } |
| + | elsif($targetos =~ /mingw/) { |
| + | $binext = '.exe'; |
| + | if($^O eq 'MSWin32') { |
| + | $libext = '.a'; |
| + | } |
| } | |
| - | } |
| } | |
| - | if (($^O eq 'MSWin32' || $^O eq 'cygwin' || $^O eq 'msys') && |
| - | ($targetos =~ /vc/ || $targetos =~ /mingw32/ || |
| - | $targetos =~ /borland/)) { |
| + | if(($^O eq 'MSWin32' || $^O eq 'cygwin' || $^O eq 'msys') && |
| + | ($targetos =~ /vc/ || $targetos =~ /mingw32/ || |
| + | $targetos =~ /borland/)) { |
| # Set these things only when building ON Windows and for Win32 platform. | |
| # FOR Windows since we might be cross-compiling on another system. Non- | |
| @@ -183,24 +183,24 @@ $ENV{LANG}="C"; | |
| sub rmtree($) { | |
| my $target = $_[0]; | |
| - | if ($^O eq 'MSWin32') { |
| - | foreach (glob($target)) { |
| - | s:/:\\:g; |
| - | system("rd /s /q $_"); |
| - | } |
| + | if($^O eq 'MSWin32') { |
| + | foreach (glob($target)) { |
| + | s:/:\\:g; |
| + | system("rd /s /q $_"); |
| + | } |
| } else { | |
| - | system("rm -rf $target"); |
| + | system("rm -rf $target"); |
| } | |
| } | |
| sub grepfile($$) { | |
| my ($target, $fn) = @_; | |
| open(my $fh, "<", $fn) or die; | |
| - | while (<$fh>) { |
| - | if (/$target/) { |
| - | close($fh); |
| - | return 1; |
| - | } |
| + | while(<$fh>) { |
| + | if(/$target/) { |
| + | close($fh); |
| + | return 1; |
| + | } |
| } | |
| close($fh); | |
| return 0; | |
| @@ -208,15 +208,15 @@ sub grepfile($$) { | |
| sub logit($) { | |
| my $text=$_[0]; | |
| - | if ($text) { |
| - | print "testcurl: $text\n"; |
| + | if($text) { |
| + | print "testcurl: $text\n"; |
| } | |
| } | |
| sub logit_spaced($) { | |
| my $text=$_[0]; | |
| - | if ($text) { |
| - | print "\ntestcurl: $text\n\n"; |
| + | if($text) { |
| + | print "\ntestcurl: $text\n\n"; |
| } | |
| } | |
| @@ -225,15 +225,15 @@ sub mydie($){ | |
| logit "$text"; | |
| chdir $pwd; # cd back to the original root dir | |
| - | if ($pwd && $build) { |
| - | # we have a build directory name, remove the dir |
| - | logit "removing the $build dir"; |
| - | rmtree "$pwd/$build"; |
| + | if($pwd && $build) { |
| + | # we have a build directory name, remove the dir |
| + | logit "removing the $build dir"; |
| + | rmtree "$pwd/$build"; |
| } | |
| - | if (-r $buildlog) { |
| - | # we have a build log output file left, remove it |
| - | logit "removing the $buildlogname file"; |
| - | unlink "$buildlog"; |
| + | if(-r $buildlog) { |
| + | # we have a build log output file left, remove it |
| + | logit "removing the $buildlogname file"; |
| + | unlink "$buildlog"; |
| } | |
| logit "ENDING HERE"; # last line logged! | |
| exit 1; | |
| @@ -244,68 +244,68 @@ sub get_host_triplet { | |
| my $configfile = "$pwd/$build/lib/curl_config.h"; | |
| if(-f $configfile && -s $configfile && open(my $libconfigh, "<", "$configfile")) { | |
| - | while(<$libconfigh>) { |
| - | if($_ =~ /^\#define\s+CURL_OS\s+"*([^"][^"]*)"*\s*/) { |
| - | $triplet = $1; |
| - | last; |
| + | while(<$libconfigh>) { |
| + | if($_ =~ /^\#define\s+CURL_OS\s+"*([^"][^"]*)"*\s*/) { |
| + | $triplet = $1; |
| + | last; |
| + | } |
| } | |
| - | } |
| - | close($libconfigh); |
| + | close($libconfigh); |
| } | |
| return $triplet; | |
| } | |
| if($name && $email && $desc) { | |
| - | # having these fields set are enough to continue, skip reading the setup |
| - | # file |
| - | $infixed=4; |
| - | $fixed=4; |
| + | # having these fields set are enough to continue, skip reading the setup |
| + | # file |
| + | $infixed=4; |
| + | $fixed=4; |
| } | |
| elsif (open(my $f, "<", "$setupfile")) { | |
| - | while (<$f>) { |
| - | if (/(\w+)=(.*)/) { |
| - | eval "\$$1=$2;"; |
| + | while (<$f>) { |
| + | if (/(\w+)=(.*)/) { |
| + | eval "\$$1=$2;"; |
| + | } |
| } | |
| - | } |
| - | close($f); |
| - | $infixed=$fixed; |
| + | close($f); |
| + | $infixed=$fixed; |
| } | |
| else { | |
| - | $infixed=0; # so that "additional args to configure" works properly first time... |
| + | $infixed=0; # so that "additional args to configure" works properly first time... |
| } | |
| - | if (!$name) { |
| - | print "please enter your name\n"; |
| - | $name = <>; |
| - | chomp $name; |
| - | $fixed=1; |
| + | if(!$name) { |
| + | print "please enter your name\n"; |
| + | $name = <>; |
| + | chomp $name; |
| + | $fixed=1; |
| } | |
| - | if (!$email) { |
| - | print "please enter your contact email address\n"; |
| - | $email = <>; |
| - | chomp $email; |
| - | $fixed=2; |
| + | if(!$email) { |
| + | print "please enter your contact email address\n"; |
| + | $email = <>; |
| + | chomp $email; |
| + | $fixed=2; |
| } | |
| - | if (!$desc) { |
| - | print "please enter a one line system description\n"; |
| - | $desc = <>; |
| - | chomp $desc; |
| - | $fixed=3; |
| + | if(!$desc) { |
| + | print "please enter a one line system description\n"; |
| + | $desc = <>; |
| + | chomp $desc; |
| + | $fixed=3; |
| } | |
| - | if (!$confopts) { |
| - | if ($infixed < 4) { |
| - | print "please enter your additional arguments to configure\n"; |
| - | print "examples: --with-openssl --enable-debug --enable-ipv6\n"; |
| - | $confopts = <>; |
| - | chomp $confopts; |
| - | } |
| + | if(!$confopts) { |
| + | if ($infixed < 4) { |
| + | print "please enter your additional arguments to configure\n"; |
| + | print "examples: --with-openssl --enable-debug --enable-ipv6\n"; |
| + | $confopts = <>; |
| + | chomp $confopts; |
| + | } |
| } | |
| - | if ($fixed < 4) { |
| + | if($fixed < 4) { |
| $fixed=4; | |
| open(my $f, ">", "$setupfile") or die; | |
| print $f "name='$name'\n"; | |
| @@ -318,10 +318,10 @@ if ($fixed < 4) { | |
| } | |
| # Enable picky compiler warnings unless explicitly disabled | |
| - | if (($confopts !~ /--enable-debug/) && |
| - | ($confopts !~ /--enable-warnings/) && |
| - | ($confopts !~ /--disable-warnings/)) { |
| - | $confopts .= " --enable-warnings"; |
| + | if(($confopts !~ /--enable-debug/) && |
| + | ($confopts !~ /--enable-warnings/) && |
| + | ($confopts !~ /--disable-warnings/)) { |
| + | $confopts .= " --enable-warnings"; |
| } | |
| my $str1066os = 'o' x 1066; | |
| @@ -364,21 +364,21 @@ $pwd = getcwd(); | |
| my $have_embedded_ares = 0; | |
| - | if (-d $CURLDIR) { |
| - | if ($git && -d "$CURLDIR/.git") { |
| - | logit "$CURLDIR is verified to be a fine git source dir"; |
| - | # remove the generated sources to force them to be re-generated each |
| - | # time we run this test |
| - | unlink "$CURLDIR/src/tool_hugehelp.c"; |
| - | # find out if curl source dir has an in-tree c-ares repo |
| - | $have_embedded_ares = 1 if (-f "$CURLDIR/ares/GIT-INFO"); |
| - | } elsif (!$git && -f "$CURLDIR/tests/testcurl.pl") { |
| - | logit "$CURLDIR is verified to be a fine daily source dir"; |
| - | # find out if curl source dir has an in-tree c-ares extracted tarball |
| - | $have_embedded_ares = 1 if (-f "$CURLDIR/ares/ares_build.h"); |
| - | } else { |
| - | mydie "$CURLDIR is not a daily source dir or checked out from git!" |
| - | } |
| + | if(-d $CURLDIR) { |
| + | if($git && -d "$CURLDIR/.git") { |
| + | logit "$CURLDIR is verified to be a fine git source dir"; |
| + | # remove the generated sources to force them to be re-generated each |
| + | # time we run this test |
| + | unlink "$CURLDIR/src/tool_hugehelp.c"; |
| + | # find out if curl source dir has an in-tree c-ares repo |
| + | $have_embedded_ares = 1 if (-f "$CURLDIR/ares/GIT-INFO"); |
| + | } elsif (!$git && -f "$CURLDIR/tests/testcurl.pl") { |
| + | logit "$CURLDIR is verified to be a fine daily source dir"; |
| + | # find out if curl source dir has an in-tree c-ares extracted tarball |
| + | $have_embedded_ares = 1 if (-f "$CURLDIR/ares/ares_build.h"); |
| + | } else { |
| + | mydie "$CURLDIR is not a daily source dir or checked out from git!" |
| + | } |
| } | |
| # make the path absolute so we can use it everywhere | |
| @@ -393,153 +393,153 @@ rmtree "build-*"; | |
| rmtree "buildlog-*"; | |
| # this is to remove old build logs that ended up in the wrong dir | |
| - | foreach (glob("$CURLDIR/buildlog-*")) { unlink $_; } |
| + | foreach(glob("$CURLDIR/buildlog-*")) { unlink $_; } |
| # create a dir to build in | |
| mkdir $build, 0777; | |
| - | if (-d $build) { |
| - | logit "build dir $build was created fine"; |
| + | if(-d $build) { |
| + | logit "build dir $build was created fine"; |
| } else { | |
| - | mydie "failed to create dir $build"; |
| + | mydie "failed to create dir $build"; |
| } | |
| # get in the curl source tree root | |
| chdir $CURLDIR; | |
| # Do the git thing, or not... | |
| - | if ($git) { |
| - | my $gitstat = 0; |
| - | my @commits; |
| - | |
| - | # update quietly to the latest git |
| - | if($nogitpull) { |
| - | logit "skipping git pull (--nogitpull)"; |
| - | } else { |
| - | logit "run git pull in curl"; |
| - | system("git pull 2>&1"); |
| - | $gitstat += $?; |
| - | logit "failed to update from curl git ($?), continue anyway" if ($?); |
| - | |
| - | # Set timestamp to the UTC the git update took place. |
| - | $timestamp = scalar(gmtime)." UTC" if (!$gitstat); |
| - | } |
| - | |
| - | # get the last 5 commits for show (even if no pull was made) |
| - | @commits=`git log --pretty=oneline --abbrev-commit -5`; |
| - | logit "The most recent curl git commits:"; |
| - | for (@commits) { |
| - | chomp ($_); |
| - | logit " $_"; |
| - | } |
| - | |
| - | if (-d "ares/.git") { |
| - | chdir "ares"; |
| + | if($git) { |
| + | my $gitstat = 0; |
| + | my @commits; |
| + | # update quietly to the latest git |
| if($nogitpull) { | |
| - | logit "skipping git pull (--nogitpull) in ares"; |
| + | logit "skipping git pull (--nogitpull)"; |
| } else { | |
| - | logit "run git pull in ares"; |
| - | system("git pull 2>&1"); |
| - | $gitstat += $?; |
| - | logit "failed to update from ares git ($?), continue anyway" if ($?); |
| + | logit "run git pull in curl"; |
| + | system("git pull 2>&1"); |
| + | $gitstat += $?; |
| + | logit "failed to update from curl git ($?), continue anyway" if ($?); |
| - | # Set timestamp to the UTC the git update took place. |
| - | $timestamp = scalar(gmtime)." UTC" if (!$gitstat); |
| + | # Set timestamp to the UTC the git update took place. |
| + | $timestamp = scalar(gmtime)." UTC" if (!$gitstat); |
| } | |
| # get the last 5 commits for show (even if no pull was made) | |
| @commits=`git log --pretty=oneline --abbrev-commit -5`; | |
| - | logit "The most recent ares git commits:"; |
| - | for (@commits) { |
| - | chomp ($_); |
| - | logit " $_"; |
| + | logit "The most recent curl git commits:"; |
| + | for(@commits) { |
| + | chomp ($_); |
| + | logit " $_"; |
| } | |
| - | chdir "$CURLDIR"; |
| - | } |
| - | |
| - | if($nobuildconf) { |
| - | logit "told to not run autoreconf -fi"; |
| - | } |
| - | elsif ($configurebuild) { |
| - | # remove possible left-overs from the past |
| - | unlink "configure"; |
| - | unlink "autom4te.cache"; |
| - | |
| - | # generate the build files |
| - | logit "invoke autoreconf"; |
| - | open(my $f, "-|", "autoreconf -fi 2>&1") or die; |
| - | open(my $log, ">", "$buildlog") or die; |
| - | while (<$f>) { |
| - | my $ll = $_; |
| - | print $ll; |
| - | print $log $ll; |
| + | if(-d "ares/.git") { |
| + | chdir "ares"; |
| + | |
| + | if($nogitpull) { |
| + | logit "skipping git pull (--nogitpull) in ares"; |
| + | } else { |
| + | logit "run git pull in ares"; |
| + | system("git pull 2>&1"); |
| + | $gitstat += $?; |
| + | logit "failed to update from ares git ($?), continue anyway" if ($?); |
| + | |
| + | # Set timestamp to the UTC the git update took place. |
| + | $timestamp = scalar(gmtime)." UTC" if (!$gitstat); |
| + | } |
| + | |
| + | # get the last 5 commits for show (even if no pull was made) |
| + | @commits=`git log --pretty=oneline --abbrev-commit -5`; |
| + | logit "The most recent ares git commits:"; |
| + | for (@commits) { |
| + | chomp ($_); |
| + | logit " $_"; |
| + | } |
| + | |
| + | chdir "$CURLDIR"; |
| } | |
| - | close($f); |
| - | close($log); |
| - | logit "autoreconf -fi was successful"; |
| - | } |
| - | else { |
| - | logit "autoreconf -fi was successful (dummy message)"; |
| - | } |
| + | if($nobuildconf) { |
| + | logit "told to not run autoreconf -fi"; |
| + | } |
| + | elsif($configurebuild) { |
| + | # remove possible left-overs from the past |
| + | unlink "configure"; |
| + | unlink "autom4te.cache"; |
| + | |
| + | # generate the build files |
| + | logit "invoke autoreconf"; |
| + | open(my $f, "-|", "autoreconf -fi 2>&1") or die; |
| + | open(my $log, ">", "$buildlog") or die; |
| + | while(<$f>) { |
| + | my $ll = $_; |
| + | print $ll; |
| + | print $log $ll; |
| + | } |
| + | close($f); |
| + | close($log); |
| + | |
| + | logit "autoreconf -fi was successful"; |
| + | } |
| + | else { |
| + | logit "autoreconf -fi was successful (dummy message)"; |
| + | } |
| } else { | |
| # Show snapshot git commit when available | |
| - | if (open (my $f, '<', "docs/tarball-commit.txt")) { |
| - | my $commit = <$f>; |
| - | chomp $commit; |
| - | logit "The most recent curl git commits:"; |
| - | logit " $commit"; |
| - | close($f); |
| + | if(open (my $f, '<', "docs/tarball-commit.txt")) { |
| + | my $commit = <$f>; |
| + | chomp $commit; |
| + | logit "The most recent curl git commits:"; |
| + | logit " $commit"; |
| + | close($f); |
| } | |
| } | |
| # Set timestamp to the one in curlver.h if this isn't a git test build. | |
| - | if ((-f "include/curl/curlver.h") && |
| + | if((-f "include/curl/curlver.h") && |
| (open(my $f, "<", "include/curl/curlver.h"))) { | |
| - | while (<$f>) { |
| - | chomp; |
| - | if ($_ =~ /^\#define\s+LIBCURL_TIMESTAMP\s+\"(.+)\".*$/) { |
| - | my $stampstring = $1; |
| - | if ($stampstring !~ /DEV/) { |
| - | $stampstring =~ s/\s+UTC//; |
| - | $timestamp = $stampstring." UTC"; |
| - | } |
| - | last; |
| + | while (<$f>) { |
| + | chomp; |
| + | if($_ =~ /^\#define\s+LIBCURL_TIMESTAMP\s+\"(.+)\".*$/) { |
| + | my $stampstring = $1; |
| + | if($stampstring !~ /DEV/) { |
| + | $stampstring =~ s/\s+UTC//; |
| + | $timestamp = $stampstring." UTC"; |
| + | } |
| + | last; |
| + | } |
| } | |
| - | } |
| - | close($f); |
| + | close($f); |
| } | |
| # Show timestamp we are using for this test build. | |
| logit "timestamp = $timestamp"; | |
| if ($configurebuild) { | |
| - | if (-f "configure") { |
| - | logit "configure created (at least it exists)"; |
| - | } else { |
| - | mydie "no configure created/found"; |
| - | } |
| + | if (-f "configure") { |
| + | logit "configure created (at least it exists)"; |
| + | } else { |
| + | mydie "no configure created/found"; |
| + | } |
| } else { | |
| - | logit "configure created (dummy message)"; # dummy message to feign success |
| + | logit "configure created (dummy message)"; # dummy message to feign success |
| } | |
| sub findinpath { | |
| - | my $c; |
| - | my $e; |
| - | my $x = ($^O eq 'MSWin32') ? '.exe' : ''; |
| - | my $s = ($^O eq 'MSWin32') ? ';' : ':'; |
| - | my $p=$ENV{'PATH'}; |
| - | my @pa = split($s, $p); |
| - | for $c (@_) { |
| - | for $e (@pa) { |
| - | if( -x "$e/$c$x") { |
| - | return $c; |
| - | } |
| + | my $c; |
| + | my $e; |
| + | my $x = ($^O eq 'MSWin32') ? '.exe' : ''; |
| + | my $s = ($^O eq 'MSWin32') ? ';' : ':'; |
| + | my $p=$ENV{'PATH'}; |
| + | my @pa = split($s, $p); |
| + | for $c (@_) { |
| + | for $e (@pa) { |
| + | if( -x "$e/$c$x") { |
| + | return $c; |
| + | } |
| + | } |
| } | |
| - | } |
| } | |
| my $make = findinpath("gmake", "make", "nmake"); | |
| @@ -553,233 +553,233 @@ logit "going with $make as make"; | |
| # change to build dir | |
| chdir "$pwd/$build"; | |
| - | if ($configurebuild) { |
| - | # run configure script |
| - | print `$CURLDIR/configure $confopts 2>&1`; |
| + | if($configurebuild) { |
| + | # run configure script |
| + | print `$CURLDIR/configure $confopts 2>&1`; |
| - | if (-f "lib/Makefile") { |
| - | logit "configure seems to have finished fine"; |
| - | } else { |
| - | mydie "configure didn't work"; |
| - | } |
| + | if(-f "lib/Makefile") { |
| + | logit "configure seems to have finished fine"; |
| + | } else { |
| + | mydie "configure didn't work"; |
| + | } |
| } else { | |
| - | logit "copying files to build dir ..."; |
| - | if ($^O eq 'MSWin32') { |
| - | system("xcopy /s /q \"$CURLDIR\" ."); |
| - | } |
| + | logit "copying files to build dir ..."; |
| + | if($^O eq 'MSWin32') { |
| + | system("xcopy /s /q \"$CURLDIR\" ."); |
| + | } |
| } | |
| if(-f "./libcurl.pc") { | |
| - | logit_spaced "display libcurl.pc"; |
| - | if(open(my $f, "<", "libcurl.pc")) { |
| - | while(<$f>) { |
| - | my $ll = $_; |
| - | print $ll if(($ll !~ /^ *#/) && ($ll !~ /^ *$/)); |
| + | logit_spaced "display libcurl.pc"; |
| + | if(open(my $f, "<", "libcurl.pc")) { |
| + | while(<$f>) { |
| + | my $ll = $_; |
| + | print $ll if(($ll !~ /^ *#/) && ($ll !~ /^ *$/)); |
| + | } |
| + | close($f); |
| } | |
| - | close($f); |
| - | } |
| } | |
| logit_spaced "display lib/$confheader"; | |
| open(my $f, "<", "lib/$confheader") or die "lib/$confheader: $!"; | |
| - | while (<$f>) { |
| - | print if /^ *#/; |
| + | while(<$f>) { |
| + | print if /^ *#/; |
| } | |
| close($f); | |
| - | if (($have_embedded_ares) && |
| + | if(($have_embedded_ares) && |
| (grepfile("^#define USE_ARES", "lib/$confheader"))) { | |
| - | print "\n"; |
| - | logit "setup to build ares"; |
| - | |
| - | if(-f "./ares/libcares.pc") { |
| - | logit_spaced "display ares/libcares.pc"; |
| - | if(open($f, "<", "ares/libcares.pc")) { |
| - | while(<$f>) { |
| - | my $ll = $_; |
| - | print $ll if(($ll !~ /^ *#/) && ($ll !~ /^ *$/)); |
| - | } |
| - | close($f); |
| + | print "\n"; |
| + | logit "setup to build ares"; |
| + | |
| + | if(-f "./ares/libcares.pc") { |
| + | logit_spaced "display ares/libcares.pc"; |
| + | if(open($f, "<", "ares/libcares.pc")) { |
| + | while(<$f>) { |
| + | my $ll = $_; |
| + | print $ll if(($ll !~ /^ *#/) && ($ll !~ /^ *$/)); |
| + | } |
| + | close($f); |
| + | } |
| } | |
| - | } |
| - | if(-f "./ares/ares_build.h") { |
| - | logit_spaced "display ares/ares_build.h"; |
| - | if(open($f, "<", "ares/ares_build.h")) { |
| - | while(<$f>) { |
| - | my $ll = $_; |
| - | print $ll if(($ll =~ /^ *# *define *CARES_/) && ($ll !~ /__CARES_BUILD_H/)); |
| - | } |
| - | close($f); |
| + | if(-f "./ares/ares_build.h") { |
| + | logit_spaced "display ares/ares_build.h"; |
| + | if(open($f, "<", "ares/ares_build.h")) { |
| + | while(<$f>) { |
| + | my $ll = $_; |
| + | print $ll if(($ll =~ /^ *# *define *CARES_/) && ($ll !~ /__CARES_BUILD_H/)); |
| + | } |
| + | close($f); |
| + | } |
| + | } |
| + | else { |
| + | mydie "no ares_build.h created/found"; |
| } | |
| - | } |
| - | else { |
| - | mydie "no ares_build.h created/found"; |
| - | } |
| - | $confheader =~ s/curl/ares/; |
| - | logit_spaced "display ares/$confheader"; |
| - | if(open($f, "<", "ares/$confheader")) { |
| - | while (<$f>) { |
| - | print if /^ *#/; |
| - | } |
| - | close($f); |
| - | } |
| + | $confheader =~ s/curl/ares/; |
| + | logit_spaced "display ares/$confheader"; |
| + | if(open($f, "<", "ares/$confheader")) { |
| + | while (<$f>) { |
| + | print if /^ *#/; |
| + | } |
| + | close($f); |
| + | } |
| - | print "\n"; |
| - | logit "build ares"; |
| - | chdir "ares"; |
| + | print "\n"; |
| + | logit "build ares"; |
| + | chdir "ares"; |
| - | if ($targetos && !$configurebuild) { |
| - | logit "$make -f Makefile.$targetos"; |
| - | open($f, "-|", "$make -f Makefile.$targetos 2>&1") or die; |
| - | } |
| - | else { |
| - | logit "$make"; |
| - | open($f, "-|", "$make 2>&1") or die; |
| - | } |
| - | while (<$f>) { |
| - | s/$pwd//g; |
| - | print; |
| - | } |
| - | close($f); |
| + | if($targetos && !$configurebuild) { |
| + | logit "$make -f Makefile.$targetos"; |
| + | open($f, "-|", "$make -f Makefile.$targetos 2>&1") or die; |
| + | } |
| + | else { |
| + | logit "$make"; |
| + | open($f, "-|", "$make 2>&1") or die; |
| + | } |
| + | while(<$f>) { |
| + | s/$pwd//g; |
| + | print; |
| + | } |
| + | close($f); |
| - | if (-f "libcares$libext") { |
| - | logit "ares is now built successfully (libcares$libext)"; |
| - | } else { |
| - | mydie "ares build failed (libcares$libext)"; |
| - | } |
| + | if(-f "libcares$libext") { |
| + | logit "ares is now built successfully (libcares$libext)"; |
| + | } else { |
| + | mydie "ares build failed (libcares$libext)"; |
| + | } |
| - | # cd back to the curl build dir |
| - | chdir "$pwd/$build"; |
| + | # cd back to the curl build dir |
| + | chdir "$pwd/$build"; |
| } | |
| my $mkcmd = "$make -i" . ($targetos && !$configurebuild ? " $targetos" : ""); | |
| logit "$mkcmd"; | |
| open(my $f, "-|", "$mkcmd 2>&1") or die; | |
| while (<$f>) { | |
| - | s/$pwd//g; |
| - | print; |
| + | s/$pwd//g; |
| + | print; |
| } | |
| close($f); | |
| if (-f "lib/libcurl$libext") { | |
| - | logit "libcurl was created fine (libcurl$libext)"; |
| + | logit "libcurl was created fine (libcurl$libext)"; |
| } | |
| else { | |
| - | mydie "libcurl was not created (libcurl$libext)"; |
| + | mydie "libcurl was not created (libcurl$libext)"; |
| } | |
| if (-f "src/curl$binext") { | |
| - | logit "curl was created fine (curl$binext)"; |
| + | logit "curl was created fine (curl$binext)"; |
| } | |
| else { | |
| - | mydie "curl was not created (curl$binext)"; |
| + | mydie "curl was not created (curl$binext)"; |
| } | |
| if (!$crosscompile || (($extvercmd ne '') && (-x $extvercmd))) { | |
| - | logit "display curl${binext} --version output"; |
| - | my $cmd = ($extvercmd ne '' ? $extvercmd.' ' : '')."./src/curl${binext} --version|"; |
| - | open($f, "<", $cmd); |
| - | while(<$f>) { |
| - | # strip CR from output on non-Windows platforms (WINE on Linux) |
| - | s/\r// if ($^O ne 'MSWin32'); |
| - | print; |
| - | } |
| - | close($f); |
| - | } |
| - | |
| - | if ($configurebuild && !$crosscompile) { |
| - | my $host_triplet = get_host_triplet(); |
| - | # build example programs for selected build targets |
| - | if(($host_triplet =~ /([^-]+)-([^-]+)-irix(.*)/) || |
| - | ($host_triplet =~ /([^-]+)-([^-]+)-aix(.*)/) || |
| - | ($host_triplet =~ /([^-]+)-([^-]+)-osf(.*)/) || |
| - | ($host_triplet =~ /([^-]+)-([^-]+)-solaris2(.*)/)) { |
| - | chdir "$pwd/$build/docs/examples"; |
| - | logit_spaced "build examples"; |
| - | open($f, "-|", "$make -i 2>&1") or die; |
| + | logit "display curl${binext} --version output"; |
| + | my $cmd = ($extvercmd ne '' ? $extvercmd.' ' : '')."./src/curl${binext} --version|"; |
| + | open($f, "<", $cmd); |
| + | while(<$f>) { |
| + | # strip CR from output on non-Windows platforms (WINE on Linux) |
| + | s/\r// if ($^O ne 'MSWin32'); |
| + | print; |
| + | } |
| + | close($f); |
| + | } |
| + | |
| + | if($configurebuild && !$crosscompile) { |
| + | my $host_triplet = get_host_triplet(); |
| + | # build example programs for selected build targets |
| + | if(($host_triplet =~ /([^-]+)-([^-]+)-irix(.*)/) || |
| + | ($host_triplet =~ /([^-]+)-([^-]+)-aix(.*)/) || |
| + | ($host_triplet =~ /([^-]+)-([^-]+)-osf(.*)/) || |
| + | ($host_triplet =~ /([^-]+)-([^-]+)-solaris2(.*)/)) { |
| + | chdir "$pwd/$build/docs/examples"; |
| + | logit_spaced "build examples"; |
| + | open($f, "-|", "$make -i 2>&1") or die; |
| + | open(my $log, ">", "$buildlog") or die; |
| + | while (<$f>) { |
| + | s/$pwd//g; |
| + | print; |
| + | print $log $_; |
| + | } |
| + | close($f); |
| + | close($log); |
| + | chdir "$pwd/$build"; |
| + | } |
| + | # build and run full test suite |
| + | my $o; |
| + | if($runtestopts) { |
| + | $o = "TEST_F=\"$runtestopts\" "; |
| + | } |
| + | logit "$make -k ${o}test-full"; |
| + | open($f, "-|", "$make -k ${o}test-full 2>&1") or die; |
| open(my $log, ">", "$buildlog") or die; | |
| - | while (<$f>) { |
| - | s/$pwd//g; |
| - | print; |
| - | print $log $_; |
| + | while(<$f>) { |
| + | s/$pwd//g; |
| + | print; |
| + | print $log $_; |
| } | |
| close($f); | |
| close($log); | |
| - | chdir "$pwd/$build"; |
| - | } |
| - | # build and run full test suite |
| - | my $o; |
| - | if($runtestopts) { |
| - | $o = "TEST_F=\"$runtestopts\" "; |
| - | } |
| - | logit "$make -k ${o}test-full"; |
| - | open($f, "-|", "$make -k ${o}test-full 2>&1") or die; |
| - | open(my $log, ">", "$buildlog") or die; |
| - | while (<$f>) { |
| - | s/$pwd//g; |
| - | print; |
| - | print $log $_; |
| - | } |
| - | close($f); |
| - | close($log); |
| - | if (grepfile("^TEST", $buildlog)) { |
| - | logit "tests were run"; |
| - | } else { |
| - | mydie "test suite failure"; |
| - | } |
| + | if(grepfile("^TEST", $buildlog)) { |
| + | logit "tests were run"; |
| + | } else { |
| + | mydie "test suite failure"; |
| + | } |
| - | if (grepfile("^TESTFAIL:", $buildlog)) { |
| - | logit "the tests were not successful"; |
| - | } else { |
| - | logit "the tests were successful!"; |
| - | } |
| + | if(grepfile("^TESTFAIL:", $buildlog)) { |
| + | logit "the tests were not successful"; |
| + | } else { |
| + | logit "the tests were successful!"; |
| + | } |
| } | |
| else { | |
| - | if($crosscompile) { |
| - | my $host_triplet = get_host_triplet(); |
| - | # build example programs for selected cross-compiles |
| - | if(($host_triplet =~ /([^-]+)-([^-]+)-mingw(.*)/) || |
| - | ($host_triplet =~ /([^-]+)-([^-]+)-android(.*)/)) { |
| - | chdir "$pwd/$build/docs/examples"; |
| - | logit_spaced "build examples"; |
| - | open($f, "-|", "$make -i 2>&1") or die; |
| - | open(my $log, ">", "$buildlog") or die; |
| - | while (<$f>) { |
| - | s/$pwd//g; |
| - | print; |
| - | print $log $_; |
| - | } |
| - | close($f); |
| - | close($log); |
| - | chdir "$pwd/$build"; |
| - | } |
| - | # build test harness programs for selected cross-compiles |
| - | if($host_triplet =~ /([^-]+)-([^-]+)-mingw(.*)/) { |
| - | chdir "$pwd/$build/tests"; |
| - | logit_spaced "build test harness"; |
| - | open(my $f, "-|", "$make -i 2>&1") or die; |
| - | open(my $log, ">", "$buildlog") or die; |
| - | while (<$f>) { |
| - | s/$pwd//g; |
| - | print; |
| - | print $log $_; |
| - | } |
| - | close($f); |
| - | close($log); |
| - | chdir "$pwd/$build"; |
| + | if($crosscompile) { |
| + | my $host_triplet = get_host_triplet(); |
| + | # build example programs for selected cross-compiles |
| + | if(($host_triplet =~ /([^-]+)-([^-]+)-mingw(.*)/) || |
| + | ($host_triplet =~ /([^-]+)-([^-]+)-android(.*)/)) { |
| + | chdir "$pwd/$build/docs/examples"; |
| + | logit_spaced "build examples"; |
| + | open($f, "-|", "$make -i 2>&1") or die; |
| + | open(my $log, ">", "$buildlog") or die; |
| + | while (<$f>) { |
| + | s/$pwd//g; |
| + | print; |
| + | print $log $_; |
| + | } |
| + | close($f); |
| + | close($log); |
| + | chdir "$pwd/$build"; |
| + | } |
| + | # build test harness programs for selected cross-compiles |
| + | if($host_triplet =~ /([^-]+)-([^-]+)-mingw(.*)/) { |
| + | chdir "$pwd/$build/tests"; |
| + | logit_spaced "build test harness"; |
| + | open(my $f, "-|", "$make -i 2>&1") or die; |
| + | open(my $log, ">", "$buildlog") or die; |
| + | while (<$f>) { |
| + | s/$pwd//g; |
| + | print; |
| + | print $log $_; |
| + | } |
| + | close($f); |
| + | close($log); |
| + | chdir "$pwd/$build"; |
| + | } |
| + | logit_spaced "cross-compiling, can't run tests"; |
| } | |
| - | logit_spaced "cross-compiling, can't run tests"; |
| - | } |
| - | # dummy message to feign success |
| - | print "TESTDONE: 1 tests out of 0 (dummy message)\n"; |
| + | # dummy message to feign success |
| + | print "TESTDONE: 1 tests out of 0 (dummy message)\n"; |
| } | |
| # create a tarball if we got that option. | |
| - | if (($mktarball ne '') && (-x $mktarball)) { |
| - | system($mktarball); |
| + | if(($mktarball ne '') && (-x $mktarball)) { |
| + | system($mktarball); |
| } | |
| logit "enddate = ".scalar(gmtime)." UTC"; # When the run ends | |