Update curl to version 7.70.0

Issue #3773

repos/libports/lib/import/import-curl.mk

@@ -1,13 +1,4 @@
+ARCH = $(filter 32bit 64bit,$(SPECS))
+
+INC_DIR += $(call select_from_repositories,src/lib/curl)/spec/$(ARCH)
 INC_DIR += $(call select_from_ports,curl)/include
-
-ifeq ($(filter-out $(SPECS),32bit),)
-TARGET_CPUARCH=32bit
-else ifeq ($(filter-out $(SPECS),64bit),)
-TARGET_CPUARCH=64bit
-endif
-
-# include architecture specific curlbuild.h
-REP_INC_DIR += src/lib/curl/spec/$(TARGET_CPUARCH)
-REP_INC_DIR += src/lib/curl/spec/$(TARGET_CPUARCH)/curl
-
-REP_INC_DIR += src/lib/curl

repos/libports/lib/mk/curl.inc

@@ -1,32 +1,162 @@
-CURL_PORT_DIR = $(call select_from_ports,curl)
+CURL_PORT_DIR := $(call select_from_ports,curl)
+LIB_SRC_DIR   := $(CURL_PORT_DIR)/src/lib/curl/lib
 
 SRC_C = \
-  file.c timeval.c base64.c hostip.c progress.c formdata.c              \
+	altsvc.c \
-  cookie.c http.c sendf.c ftp.c url.c dict.c if2ip.c speedcheck.c       \
+	amigaos.c \
-  ldap.c ssluse.c version.c getenv.c escape.c mprintf.c telnet.c        \
+	asyn-ares.c \
-  netrc.c getinfo.c transfer.c strequal.c easy.c security.c krb4.c      \
+	asyn-thread.c \
-  curl_fnmatch.c fileinfo.c ftplistparser.c wildcard.c krb5.c           \
+	base64.c \
-  memdebug.c http_chunks.c strtok.c connect.c llist.c hash.c multi.c    \
+	conncache.c \
-  content_encoding.c share.c http_digest.c md4.c md5.c curl_rand.c      \
+	connect.c \
-  http_negotiate.c inet_pton.c strtoofft.c strerror.c amigaos.c         \
+	content_encoding.c \
-  hostasyn.c hostip4.c hostip6.c hostsyn.c inet_ntop.c parsedate.c      \
+	cookie.c \
-  select.c gtls.c sslgen.c tftp.c splay.c strdup.c socks.c ssh.c nss.c  \
+	curl_addrinfo.c \
-  qssl.c rawstr.c curl_addrinfo.c socks_gssapi.c socks_sspi.c           \
+	curl_ctype.c \
-  curl_sspi.c slist.c nonblock.c curl_memrchr.c imap.c pop3.c smtp.c    \
+	curl_des.c \
-  pingpong.c rtsp.c curl_threads.c warnless.c hmac.c polarssl.c         \
+	curl_endian.c \
-  curl_rtmp.c openldap.c curl_gethostname.c gopher.c axtls.c            \
+	curl_fnmatch.c \
-  idn_win32.c http_negotiate_sspi.c cyassl.c http_proxy.c non-ascii.c   \
+	curl_get_line.c \
-  asyn-ares.c asyn-thread.c curl_gssapi.c curl_ntlm.c curl_ntlm_wb.c    \
+	curl_gethostname.c \
-  curl_ntlm_core.c curl_ntlm_msgs.c curl_sasl.c curl_schannel.c         \
+	curl_gssapi.c \
-  curl_multibyte.c curl_darwinssl.c hostcheck.c                         \
+	curl_memrchr.c \
-  bundles.c conncache.c
+	curl_multibyte.c \
+	curl_ntlm_core.c \
+	curl_ntlm_wb.c \
+	curl_path.c \
+	curl_range.c \
+	curl_rtmp.c \
+	curl_sasl.c \
+	curl_sspi.c \
+	curl_threads.c \
+	dict.c \
+	doh.c \
+	dotdot.c \
+	easy.c \
+	escape.c \
+	file.c \
+	fileinfo.c \
+	formdata.c \
+	ftp.c \
+	ftplistparser.c \
+	getenv.c \
+	getinfo.c \
+	gopher.c \
+	hash.c \
+	hmac.c \
+	hostasyn.c \
+	hostcheck.c \
+	hostip.c \
+	hostip4.c \
+	hostip6.c \
+	hostsyn.c \
+	http.c \
+	http2.c \
+	http_chunks.c \
+	http_digest.c \
+	http_negotiate.c \
+	http_ntlm.c \
+	http_proxy.c \
+	idn_win32.c \
+	if2ip.c \
+	imap.c \
+	inet_ntop.c \
+	inet_pton.c \
+	krb5.c \
+	ldap.c \
+	llist.c \
+	md4.c \
+	md5.c \
+	memdebug.c \
+	mime.c \
+	mprintf.c \
+	mqtt.c \
+	multi.c \
+	netrc.c \
+	non-ascii.c \
+	nonblock.c \
+	openldap.c \
+	parsedate.c \
+	pingpong.c \
+	pop3.c \
+	progress.c \
+	psl.c \
+	rand.c \
+	rename.c \
+	rtsp.c \
+	security.c \
+	select.c \
+	sendf.c \
+	setopt.c \
+	sha256.c \
+	share.c \
+	slist.c \
+	smb.c \
+	smtp.c \
+	socketpair.c \
+	socks.c \
+	socks_gssapi.c \
+	socks_sspi.c \
+	speedcheck.c \
+	splay.c \
+	strcase.c \
+	strdup.c \
+	strerror.c \
+	strtok.c \
+	strtoofft.c \
+	system_win32.c \
+	telnet.c \
+	tftp.c \
+	timeval.c \
+	transfer.c \
+	url.c \
+	urlapi.c \
+	vauth/cleartext.c \
+	vauth/cram.c \
+	vauth/digest.c \
+	vauth/digest_sspi.c \
+	vauth/krb5_gssapi.c \
+	vauth/krb5_sspi.c \
+	vauth/ntlm.c \
+	vauth/ntlm_sspi.c \
+	vauth/oauth2.c \
+	vauth/spnego_gssapi.c \
+	vauth/spnego_sspi.c \
+	vauth/vauth.c \
+	version.c \
+	vquic/ngtcp2.c \
+	vquic/quiche.c \
+	vssh/libssh.c \
+	vssh/libssh2.c \
+	vssh/wolfssh.c \
+	vtls/bearssl.c \
+	vtls/gskit.c \
+	vtls/gtls.c \
+	vtls/mbedtls.c \
+	vtls/mbedtls_threadlock.c \
+	vtls/mesalink.c \
+	vtls/nss.c \
+	vtls/openssl.c \
+	vtls/schannel.c \
+	vtls/schannel_verify.c \
+	vtls/sectransp.c \
+	vtls/vtls.c \
+	vtls/wolfssl.c \
+	warnless.c \
+	wildcard.c \
+	x509asn1.c \
+	# end of SRC_C
 
-CC_OPT += -DHAVE_CONFIG_H
+CC_OPT += -DHAVE_CONFIG_H -DBUILDING_LIBCURL=1
 
-LIBS += libc zlib libssh libssl
+LIBS += libc zlib libssl libssh
 
 include $(call select_from_repositories,lib/import/import-curl.mk)
 
+INC_DIR += $(LIB_SRC_DIR)
+
 SHARED_LIB = yes
 
-vpath %.c $(CURL_PORT_DIR)/src/lib/curl/lib
+vpath %.c $(LIB_SRC_DIR)
+
+# vi: set ft=make :

repos/libports/lib/symbols/curl

@@ -1,309 +1,3 @@
-Curl_DIGEST_MD5 D 32
-Curl_FormBoundary T
-Curl_FormInit T
-Curl_FormReader T
-Curl_GetFTPResponse T
-Curl_HMAC_MD5 D 40
-Curl_HMAC_final T
-Curl_HMAC_init T
-Curl_HMAC_update T
-Curl_MD5_final T
-Curl_MD5_init T
-Curl_MD5_update T
-Curl_SOCKS4 T
-Curl_SOCKS5 T
-Curl_addHandleToPipeline T
-Curl_add_buffer T
-Curl_add_buffer_init T
-Curl_add_buffer_send T
-Curl_add_bufferf T
-Curl_add_custom_headers T
-Curl_add_timecondition T
-Curl_base64_decode T
-Curl_base64_encode T
-Curl_blockread_all T
-Curl_bundle_add_conn T
-Curl_bundle_create T
-Curl_bundle_destroy T
-Curl_bundle_remove_conn T
-Curl_cache_addr T
-Curl_ccalloc D 8
-Curl_cert_hostcheck T
-Curl_cfree D 8
-Curl_checkheaders T
-Curl_client_write T
-Curl_clone_ssl_config T
-Curl_close T
-Curl_closesocket T
-Curl_cmalloc D 8
-Curl_compareheader T
-Curl_conncache_add_conn T
-Curl_conncache_destroy T
-Curl_conncache_find_bundle T
-Curl_conncache_find_first_connection T
-Curl_conncache_foreach T
-Curl_conncache_init T
-Curl_conncache_remove_conn T
-Curl_connect T
-Curl_connected_proxy T
-Curl_connecthost T
-Curl_cookie_add T
-Curl_cookie_cleanup T
-Curl_cookie_clearall T
-Curl_cookie_clearsess T
-Curl_cookie_freelist T
-Curl_cookie_getlist T
-Curl_cookie_init T
-Curl_cookie_list T
-Curl_cookie_loadfiles T
-Curl_crealloc D 8
-Curl_cstrdup D 8
-Curl_debug T
-Curl_digest_cleanup T
-Curl_disconnect T
-Curl_do T
-Curl_do_more T
-Curl_doing_getsock T
-Curl_done T
-Curl_dupset T
-Curl_easy_addmulti T
-Curl_easy_initHandleData T
-Curl_expire T
-Curl_failf T
-Curl_fileinfo_alloc T
-Curl_fileinfo_dtor T
-Curl_fillreadbuffer T
-Curl_flush_cookies T
-Curl_fnmatch T
-Curl_follow T
-Curl_formclean T
-Curl_formpostheader T
-Curl_free_ssl_config T
-Curl_freeaddrinfo T
-Curl_freeset T
-Curl_ftp_parselist T
-Curl_ftp_parselist_data_alloc T
-Curl_ftp_parselist_data_free T
-Curl_ftp_parselist_geterror T
-Curl_ftpsendf T
-Curl_getaddrinfo T
-Curl_getaddrinfo_ex T
-Curl_getconnectinfo T
-Curl_getformdata T
-Curl_gethostname T
-Curl_getinfo T
-Curl_getoff_all_pipelines T
-Curl_global_host_cache_dtor T
-Curl_global_host_cache_init T
-Curl_gmtime T
-Curl_handler_dict D 128
-Curl_handler_file D 128
-Curl_handler_ftp D 128
-Curl_handler_ftps D 128
-Curl_handler_gopher D 128
-Curl_handler_http D 128
-Curl_handler_https D 128
-Curl_handler_imap D 128
-Curl_handler_imaps D 128
-Curl_handler_pop3 D 128
-Curl_handler_pop3s D 128
-Curl_handler_rtsp D 128
-Curl_handler_smtp D 128
-Curl_handler_smtps D 128
-Curl_handler_telnet D 128
-Curl_handler_tftp D 128
-Curl_hash_add T
-Curl_hash_alloc T
-Curl_hash_clean T
-Curl_hash_clean_with_criterium T
-Curl_hash_delete T
-Curl_hash_destroy T
-Curl_hash_init T
-Curl_hash_next_element T
-Curl_hash_pick T
-Curl_hash_start_iterate T
-Curl_hash_str T
-Curl_he2ai T
-Curl_hostcache_clean T
-Curl_hostcache_destroy T
-Curl_hostcache_prune T
-Curl_http T
-Curl_http_auth_act T
-Curl_http_connect T
-Curl_http_done T
-Curl_http_input_auth T
-Curl_http_ntlm_cleanup T
-Curl_http_output_auth T
-Curl_http_readwrite_headers T
-Curl_httpchunk_init T
-Curl_httpchunk_read T
-Curl_if2ip T
-Curl_if_is_interface_name T
-Curl_infof T
-Curl_init_userdefined T
-Curl_initinfo T
-Curl_input_digest T
-Curl_input_ntlm T
-Curl_ip2addr T
-Curl_ipv4_resolve_r T
-Curl_ipvalid T
-Curl_isPipeliningEnabled T
-Curl_is_connected T
-Curl_llist_alloc T
-Curl_llist_count T
-Curl_llist_destroy T
-Curl_llist_insert_next T
-Curl_llist_move T
-Curl_llist_remove T
-Curl_loadhostpairs T
-Curl_md5it T
-Curl_meets_timecondition T
-Curl_mk_dnscache T
-Curl_month D 96
-Curl_multi_canPipeline T
-Curl_multi_handlePipeBreak T
-Curl_ntlm_core_lm_resp T
-Curl_ntlm_core_mk_lm_hash T
-Curl_ntlm_core_mk_nt_hash T
-Curl_ntlm_create_type1_message T
-Curl_ntlm_create_type3_message T
-Curl_ntlm_decode_type2_message T
-Curl_num_addresses T
-Curl_open T
-Curl_ossl_check_cxn T
-Curl_ossl_cleanup T
-Curl_ossl_close T
-Curl_ossl_close_all T
-Curl_ossl_connect T
-Curl_ossl_connect_nonblocking T
-Curl_ossl_data_pending T
-Curl_ossl_engines_list T
-Curl_ossl_init T
-Curl_ossl_md5sum T
-Curl_ossl_random T
-Curl_ossl_seed T
-Curl_ossl_session_free T
-Curl_ossl_set_engine T
-Curl_ossl_set_engine_default T
-Curl_ossl_shutdown T
-Curl_ossl_version T
-Curl_output_digest T
-Curl_output_ntlm T
-Curl_parsenetrc T
-Curl_persistconninfo T
-Curl_pgrsDone T
-Curl_pgrsResetTimesSizes T
-Curl_pgrsSetDownloadCounter T
-Curl_pgrsSetDownloadSize T
-Curl_pgrsSetUploadCounter T
-Curl_pgrsSetUploadSize T
-Curl_pgrsStartNow T
-Curl_pgrsTime T
-Curl_pgrsUpdate T
-Curl_poll T
-Curl_pop3_write T
-Curl_posttransfer T
-Curl_pp_disconnect T
-Curl_pp_easy_statemach T
-Curl_pp_flushsend T
-Curl_pp_getsock T
-Curl_pp_init T
-Curl_pp_multi_statemach T
-Curl_pp_readresp T
-Curl_pp_sendf T
-Curl_pp_state_timeout T
-Curl_pp_vsendf T
-Curl_pretransfer T
-Curl_printable_address T
-Curl_protocol_connect T
-Curl_protocol_connecting T
-Curl_protocol_doing T
-Curl_protocol_getsock T
-Curl_proxyCONNECT T
-Curl_proxy_connect T
-Curl_rand T
-Curl_raw_equal T
-Curl_raw_nequal T
-Curl_raw_toupper T
-Curl_read T
-Curl_read_plain T
-Curl_readrewind T
-Curl_readwrite T
-Curl_reconnect_request T
-Curl_recv_plain T
-Curl_removeHandleFromPipeline T
-Curl_reset_reqproto T
-Curl_resolv T
-Curl_resolv_timeout T
-Curl_resolv_unlock T
-Curl_retry_request T
-Curl_rtsp_connisdead T
-Curl_rtsp_parseheader T
-Curl_sasl_cleanup T
-Curl_sasl_create_cram_md5_message T
-Curl_sasl_create_digest_md5_message T
-Curl_sasl_create_login_message T
-Curl_sasl_create_ntlm_type1_message T
-Curl_sasl_create_ntlm_type3_message T
-Curl_sasl_create_plain_message T
-Curl_send_plain T
-Curl_sendf T
-Curl_set_dns_servers T
-Curl_setopt T
-Curl_setup_conn T
-Curl_setup_transfer T
-Curl_share_lock T
-Curl_share_unlock T
-Curl_single_getsock T
-Curl_sleep_time T
-Curl_slist_duplicate T
-Curl_smtp_escape_eob T
-Curl_socket T
-Curl_socket_check T
-Curl_speedcheck T
-Curl_speedinit T
-Curl_splay T
-Curl_splaygetbest T
-Curl_splayinsert T
-Curl_splayremovebyaddr T
-Curl_srand T
-Curl_ssl_addsessionid T
-Curl_ssl_check_cxn T
-Curl_ssl_cleanup T
-Curl_ssl_close T
-Curl_ssl_close_all T
-Curl_ssl_config_matches T
-Curl_ssl_connect T
-Curl_ssl_connect_nonblocking T
-Curl_ssl_data_pending T
-Curl_ssl_delsessionid T
-Curl_ssl_engines_list T
-Curl_ssl_free_certinfo T
-Curl_ssl_getsessionid T
-Curl_ssl_init T
-Curl_ssl_initsessions T
-Curl_ssl_kill_session T
-Curl_ssl_md5sum T
-Curl_ssl_random T
-Curl_ssl_set_engine T
-Curl_ssl_set_engine_default T
-Curl_ssl_shutdown T
-Curl_ssl_version T
-Curl_str2addr T
-Curl_str_key_compare T
-Curl_strerror T
-Curl_strntoupper T
-Curl_timeleft T
-Curl_tvlong T
-Curl_updateconninfo T
-Curl_urldecode T
-Curl_verboseconnect T
-Curl_wait_ms T
-Curl_wildcard_dtor T
-Curl_wildcard_init T
-Curl_wkday D 56
-Curl_write T
-Curl_write_plain T
 curl_easy_cleanup T
 curl_easy_duphandle T
 curl_easy_escape T
@@ -317,6 +11,7 @@ curl_easy_send T
 curl_easy_setopt T
 curl_easy_strerror T
 curl_easy_unescape T
+curl_easy_upkeep T
 curl_escape T
 curl_formadd T
 curl_formfree T
@@ -327,8 +22,21 @@ curl_getenv T
 curl_global_cleanup T
 curl_global_init T
 curl_global_init_mem T
+curl_global_sslset T
 curl_maprintf T
 curl_mfprintf T
+curl_mime_addpart T
+curl_mime_data T
+curl_mime_data_cb T
+curl_mime_encoder T
+curl_mime_filedata T
+curl_mime_filename T
+curl_mime_free T
+curl_mime_headers T
+curl_mime_init T
+curl_mime_name T
+curl_mime_subparts T
+curl_mime_type T
 curl_mprintf T
 curl_msnprintf T
 curl_msprintf T
@@ -339,6 +47,7 @@ curl_multi_fdset T
 curl_multi_info_read T
 curl_multi_init T
 curl_multi_perform T
+curl_multi_poll T
 curl_multi_remove_handle T
 curl_multi_setopt T
 curl_multi_socket T
@@ -347,11 +56,14 @@ curl_multi_socket_all T
 curl_multi_strerror T
 curl_multi_timeout T
 curl_multi_wait T
+curl_multi_wakeup T
 curl_mvaprintf T
 curl_mvfprintf T
 curl_mvprintf T
 curl_mvsnprintf T
 curl_mvsprintf T
+curl_pushheader_byname T
+curl_pushheader_bynum T
 curl_share_cleanup T
 curl_share_init T
 curl_share_setopt T
@@ -361,22 +73,10 @@ curl_slist_free_all T
 curl_strequal T
 curl_strnequal T
 curl_unescape T
+curl_url T
+curl_url_cleanup T
+curl_url_dup T
+curl_url_get T
+curl_url_set T
 curl_version T
 curl_version_info T
-curlx_nonblock T
-curlx_sitouz T
-curlx_sltosi T
-curlx_sltoui T
-curlx_sltous T
-curlx_sotouz T
-curlx_sztosi T
-curlx_tvdiff T
-curlx_tvdiff_secs T
-curlx_tvnow T
-curlx_ultosi T
-curlx_ultouc T
-curlx_ultous T
-curlx_uztosi T
-curlx_uztosz T
-curlx_uztoui T
-curlx_uztoul T

repos/libports/ports/curl.hash

@@ -1 +1 @@
-72c6accfc732b3002b7a3eef983b4aa0b8f23caa
+ba3c2049149311d614a70359426f5b0a49ea239f

repos/libports/ports/curl.port

@@ -1,27 +1,15 @@
 LICENSE   := MIT
 DOWNLOADS := curl.archive
-VERSION   := 7.29.0
+VERSION   := 7.70.0
 
-URL(curl) := http://curl.haxx.se/download/archeology/curl-$(VERSION).tar.gz
+URL(curl) := http://curl.haxx.se/download/curl-$(VERSION).tar.gz
-SHA(curl) := 67dc5b952ac489191b62dbe95b18d336b821649f61404a280186c72e8cd0b9d6
+SHA(curl) := ca2feeb8ef13368ce5d5e5849a5fd5e2dd4755fecf7d8f0cc94000a4206fb8e7
 SIG(curl) := ${URL(curl)}.asc
 KEY(curl) := daniel@haxx.se
 DIR(curl) := src/lib/curl
 
-PATCHES   := src/lib/curl/*.patch
+PATCHES   := src/lib/curl/curl_h.patch
 
-#
+DIRS := include
-# Assemble public include directory. Filter out 'curlbuild.h' because we
+DIR_CONTENT(include) = src/lib/curl/include/curl
-# provide a custom version of this file in 'libports/include/curl/'.
-#
-# Don't use ':=' for the definition of 'DIR_CONTENT(include/curl)' and
-# 'curl_headers' to defer the evaluation to the time when the directories are
-# created. Otherwise, the '$(wildcard)' would be executed before the
-# downloads are complete.
-#
-curl_include_dir := src/lib/curl/include/curl
-curl_headers      = $(filter-out curlbuild.h,$(notdir $(wildcard $(curl_include_dir)/*.h)))
-
-DIRS := include/curl
-DIR_CONTENT(include/curl) = $(addprefix $(curl_include_dir)/,$(curl_headers))
 

repos/libports/recipes/api/curl/content.mk

@@ -1,5 +1,6 @@
 MIRROR_FROM_REP_DIR := lib/import/import-curl.mk \
-                       lib/symbols/curl
+                       lib/symbols/curl \
+                       src/lib/curl
 
 content: $(MIRROR_FROM_REP_DIR)
 
@@ -11,18 +12,11 @@ PORT_DIR := $(call port_dir,$(REP_DIR)/ports/curl)
 content: include
 
 include:
-	mkdir -p $@/curl
+	mkdir -p $@
-	cp $(PORT_DIR)/include/curl/* $@/curl
+	cp -r $(PORT_DIR)/include/curl $@/
 
 content: src/lib/curl
 
-src/lib/curl:
-	mkdir -p $@
-	for spec in 32bit 64bit; do \
-	  mkdir -p $@/spec/$$spec/curl; \
-	  cp $(REP_DIR)/$@/spec/$$spec/curl/curlbuild.h $@/spec/$$spec/curl/; \
-	done
-
 content: LICENSE
 
 LICENSE:

repos/libports/recipes/src/curl/content.mk

@@ -1,22 +1,28 @@
-content: src/lib/curl/target.mk lib/mk LICENSE
+MIRROR_FROM_REP_DIR := \
+	lib/mk/curl.inc \
+	lib/mk/spec/32bit/curl.mk \
+	lib/mk/spec/64bit/curl.mk
 
-PORT_DIR := $(call port_dir,$(REP_DIR)/ports/curl)
+content: $(MIRROR_FROM_REP_DIR)
 
-src/lib/curl:
+$(MIRROR_FROM_REP_DIR):
-	mkdir -p $@
+	$(mirror_from_rep_dir)
-	cp -r $(REP_DIR)/$@/curl_config.h $@
+
-	cp -r $(PORT_DIR)/src/lib/curl/* $@
+content: src/lib/curl/target.mk
 
 src/lib/curl/target.mk: src/lib/curl
 	echo "LIBS += curl" > $@
 
-lib/mk:
+PORT_DIR := $(call port_dir,$(REP_DIR)/ports/curl)
+
+content: src/lib/curl
+
+src/lib/curl:
 	mkdir -p $@
-	cp $(REP_DIR)/lib/mk/curl.inc $@
+	cp -r $(PORT_DIR)/src/lib/curl/lib $@/
-	for spec in 32bit 64bit; do \
+	cp -r $(REP_DIR)/src/lib/curl/spec $@/
-	  mkdir -p $@/spec/$$spec; \
+
-	  cp $(REP_DIR)/$@/spec/$$spec/curl.mk $@/spec/$$spec/; \
+content: LICENSE
-	done
 
 LICENSE:
 	cp $(PORT_DIR)/src/lib/curl/COPYING $@

repos/libports/recipes/src/curl/used_apis

@@ -1,4 +1,4 @@
 libc
-zlib
 libssh
 openssl
+zlib

repos/libports/src/lib/curl/configure.patch

@@ -1,19 +0,0 @@
-Since noux.mk is using a brute-force approach for setting
-CFLAGS, CPPFLAGs etc. disable this check.
-
-+++ src/lib/curl/configure
-@@ -3671,8 +3671,8 @@
- 
--  if test $xc_bad_var_libs = yes ||
--     test $xc_bad_var_cflags = yes ||
--     test $xc_bad_var_ldflags = yes ||
--     test $xc_bad_var_cppflags = yes; then
--     as_fn_error $? "Can not continue. Fix errors mentioned immediately above this line." "$LINENO" 5
--  fi
-+#  if test $xc_bad_var_libs = yes ||
-+#     test $xc_bad_var_cflags = yes ||
-+#     test $xc_bad_var_ldflags = yes ||
-+#     test $xc_bad_var_cppflags = yes; then
-+#     as_fn_error $? "Can not continue. Fix errors mentioned immediately above this line." "$LINENO" 5
-+#  fi
- 

repos/libports/src/lib/curl/curl_h.patch

@@ -1,15 +1,9 @@
-We have no osreldate.h because this header is normally created by
++++ src/lib/curl/lib/socketpair.h
-`sys/conf/newvers.sh` but since our libc is based on FreeBSD 8.2
+@@ -32,5 +32,7 @@
-let's just define the symbol.
-
-+++ src/lib/curl/include/curl/curl.h
-@@ -47,8 +47,7 @@
- #include <limits.h>
  
- #if defined(__FreeBSD__) && (__FreeBSD__ >= 2)
+ /* Defined here to allow specific build configs to disable it completely */
--/* Needed for __FreeBSD_version symbol definition */
+ #define USE_SOCKETPAIR 1
--#include <osreldate.h>
++/* prevent use of socketpair on Genode */
-+#define __FreeBSD_version 802000
++#undef USE_SOCKETPAIR
- #endif
  
- /* The include stuff here below is mainly for time_t! */
+ #endif /* HEADER_CURL_SOCKETPAIR_H */

repos/libports/src/lib/curl/spec/32bit/curl/curlbuild.h

@@ -1,198 +0,0 @@
-/* include/curl/curlbuild.h.  Generated from curlbuild.h.in by configure.  */
-#ifndef __CURL_CURLBUILD_H
-#define __CURL_CURLBUILD_H
-/***************************************************************************
- *                                  _   _ ____  _
- *  Project                     ___| | | |  _ \| |
- *                             / __| | | | |_) | |
- *                            | (__| |_| |  _ <| |___
- *                             \___|\___/|_| \_\_____|
- *
- * Copyright (C) 1998 - 2012, Daniel Stenberg, <daniel@haxx.se>, et al.
- *
- * This software is licensed as described in the file COPYING, which
- * you should have received as part of this distribution. The terms
- * are also available at http://curl.haxx.se/docs/copyright.html.
- *
- * You may opt to use, copy, modify, merge, publish, distribute and/or sell
- * copies of the Software, and permit persons to whom the Software is
- * furnished to do so, under the terms of the COPYING file.
- *
- * This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY
- * KIND, either express or implied.
- *
- ***************************************************************************/
-
-/* ================================================================ */
-/*               NOTES FOR CONFIGURE CAPABLE SYSTEMS                */
-/* ================================================================ */
-
-/*
- * NOTE 1:
- * -------
- *
- * Nothing in this file is intended to be modified or adjusted by the
- * curl library user nor by the curl library builder.
- *
- * If you think that something actually needs to be changed, adjusted
- * or fixed in this file, then, report it on the libcurl development
- * mailing list: http://cool.haxx.se/mailman/listinfo/curl-library/
- *
- * This header file shall only export symbols which are 'curl' or 'CURL'
- * prefixed, otherwise public name space would be polluted.
- *
- * NOTE 2:
- * -------
- *
- * Right now you might be staring at file include/curl/curlbuild.h.in or
- * at file include/curl/curlbuild.h, this is due to the following reason:
- *
- * On systems capable of running the configure script, the configure process
- * will overwrite the distributed include/curl/curlbuild.h file with one that
- * is suitable and specific to the library being configured and built, which
- * is generated from the include/curl/curlbuild.h.in template file.
- *
- */
-
-/* ================================================================ */
-/*  DEFINITION OF THESE SYMBOLS SHALL NOT TAKE PLACE ANYWHERE ELSE  */
-/* ================================================================ */
-
-#ifdef CURL_SIZEOF_LONG
-#error "CURL_SIZEOF_LONG shall not be defined except in curlbuild.h"
-   Error Compilation_aborted_CURL_SIZEOF_LONG_already_defined
-#endif
-
-#ifdef CURL_TYPEOF_CURL_SOCKLEN_T
-#error "CURL_TYPEOF_CURL_SOCKLEN_T shall not be defined except in curlbuild.h"
-   Error Compilation_aborted_CURL_TYPEOF_CURL_SOCKLEN_T_already_defined
-#endif
-
-#ifdef CURL_SIZEOF_CURL_SOCKLEN_T
-#error "CURL_SIZEOF_CURL_SOCKLEN_T shall not be defined except in curlbuild.h"
-   Error Compilation_aborted_CURL_SIZEOF_CURL_SOCKLEN_T_already_defined
-#endif
-
-#ifdef CURL_TYPEOF_CURL_OFF_T
-#error "CURL_TYPEOF_CURL_OFF_T shall not be defined except in curlbuild.h"
-   Error Compilation_aborted_CURL_TYPEOF_CURL_OFF_T_already_defined
-#endif
-
-#ifdef CURL_FORMAT_CURL_OFF_T
-#error "CURL_FORMAT_CURL_OFF_T shall not be defined except in curlbuild.h"
-   Error Compilation_aborted_CURL_FORMAT_CURL_OFF_T_already_defined
-#endif
-
-#ifdef CURL_FORMAT_CURL_OFF_TU
-#error "CURL_FORMAT_CURL_OFF_TU shall not be defined except in curlbuild.h"
-   Error Compilation_aborted_CURL_FORMAT_CURL_OFF_TU_already_defined
-#endif
-
-#ifdef CURL_FORMAT_OFF_T
-#error "CURL_FORMAT_OFF_T shall not be defined except in curlbuild.h"
-   Error Compilation_aborted_CURL_FORMAT_OFF_T_already_defined
-#endif
-
-#ifdef CURL_SIZEOF_CURL_OFF_T
-#error "CURL_SIZEOF_CURL_OFF_T shall not be defined except in curlbuild.h"
-   Error Compilation_aborted_CURL_SIZEOF_CURL_OFF_T_already_defined
-#endif
-
-#ifdef CURL_SUFFIX_CURL_OFF_T
-#error "CURL_SUFFIX_CURL_OFF_T shall not be defined except in curlbuild.h"
-   Error Compilation_aborted_CURL_SUFFIX_CURL_OFF_T_already_defined
-#endif
-
-#ifdef CURL_SUFFIX_CURL_OFF_TU
-#error "CURL_SUFFIX_CURL_OFF_TU shall not be defined except in curlbuild.h"
-   Error Compilation_aborted_CURL_SUFFIX_CURL_OFF_TU_already_defined
-#endif
-
-/* ================================================================ */
-/*  EXTERNAL INTERFACE SETTINGS FOR CONFIGURE CAPABLE SYSTEMS ONLY  */
-/* ================================================================ */
-
-/* Configure process defines this to 1 when it finds out that system  */
-/* header file ws2tcpip.h must be included by the external interface. */
-/* #undef CURL_PULL_WS2TCPIP_H */
-#ifdef CURL_PULL_WS2TCPIP_H
-#  ifndef WIN32_LEAN_AND_MEAN
-#    define WIN32_LEAN_AND_MEAN
-#  endif
-#  include <windows.h>
-#  include <winsock2.h>
-#  include <ws2tcpip.h>
-#endif
-
-/* Configure process defines this to 1 when it finds out that system   */
-/* header file sys/types.h must be included by the external interface. */
-#define CURL_PULL_SYS_TYPES_H 1
-#ifdef CURL_PULL_SYS_TYPES_H
-#  include <sys/types.h>
-#endif
-
-/* Configure process defines this to 1 when it finds out that system */
-/* header file stdint.h must be included by the external interface.  */
-#define CURL_PULL_STDINT_H 1
-#ifdef CURL_PULL_STDINT_H
-#  include <stdint.h>
-#endif
-
-/* Configure process defines this to 1 when it finds out that system  */
-/* header file inttypes.h must be included by the external interface. */
-#define CURL_PULL_INTTYPES_H 1
-#ifdef CURL_PULL_INTTYPES_H
-#  include <inttypes.h>
-#endif
-
-/* Configure process defines this to 1 when it finds out that system    */
-/* header file sys/socket.h must be included by the external interface. */
-#define CURL_PULL_SYS_SOCKET_H 1
-#ifdef CURL_PULL_SYS_SOCKET_H
-#  include <sys/socket.h>
-#endif
-
-/* Configure process defines this to 1 when it finds out that system  */
-/* header file sys/poll.h must be included by the external interface. */
-/* #undef CURL_PULL_SYS_POLL_H */
-#ifdef CURL_PULL_SYS_POLL_H
-#  include <sys/poll.h>
-#endif
-
-/* The size of `long', as computed by sizeof. */
-#define CURL_SIZEOF_LONG 4
-
-/* Integral data type used for curl_socklen_t. */
-#define CURL_TYPEOF_CURL_SOCKLEN_T socklen_t
-
-/* The size of `curl_socklen_t', as computed by sizeof. */
-#define CURL_SIZEOF_CURL_SOCKLEN_T 4
-
-/* Data type definition of curl_socklen_t. */
-typedef CURL_TYPEOF_CURL_SOCKLEN_T curl_socklen_t;
-
-/* Signed integral data type used for curl_off_t. */
-#define CURL_TYPEOF_CURL_OFF_T int64_t
-
-/* Data type definition of curl_off_t. */
-typedef CURL_TYPEOF_CURL_OFF_T curl_off_t;
-
-/* curl_off_t formatting string directive without "%" conversion specifier. */
-#define CURL_FORMAT_CURL_OFF_T "lld"
-
-/* unsigned curl_off_t formatting string without "%" conversion specifier. */
-#define CURL_FORMAT_CURL_OFF_TU "llu"
-
-/* curl_off_t formatting string directive with "%" conversion specifier. */
-#define CURL_FORMAT_OFF_T "%lld"
-
-/* The size of `curl_off_t', as computed by sizeof. */
-#define CURL_SIZEOF_CURL_OFF_T 8
-
-/* curl_off_t constant suffix. */
-#define CURL_SUFFIX_CURL_OFF_T LL
-
-/* unsigned curl_off_t constant suffix. */
-#define CURL_SUFFIX_CURL_OFF_TU ULL
-
-#endif /* __CURL_CURLBUILD_H */

repos/libports/src/lib/curl/spec/32bit/curl_config.h

@@ -1,15 +1,21 @@
 /* lib/curl_config.h.  Generated from curl_config.h.in by configure.  */
 /* lib/curl_config.h.in.  Generated from configure.ac by autoheader.  */
 
-/* when building libcurl itself */
+/* to enable curl debug memory tracking */
-/* #undef BUILDING_LIBCURL */
+/* #undef CURLDEBUG */
 
 /* Location of default ca bundle */
 #define CURL_CA_BUNDLE "/etc/ssl/certs/ca-certificates.crt"
 
+/* define "1" to use built in CA store of SSL library */
+/* #undef CURL_CA_FALLBACK */
+
 /* Location of default ca path */
 /* #undef CURL_CA_PATH */
 
+/* Default SSL backend */
+/* #undef CURL_DEFAULT_SSL_BACKEND */
+
 /* to disable cookies support */
 /* #undef CURL_DISABLE_COOKIES */
 
@@ -17,22 +23,28 @@
 /* #undef CURL_DISABLE_CRYPTO_AUTH */
 
 /* to disable DICT */
-/* #undef CURL_DISABLE_DICT */
+#define CURL_DISABLE_DICT 1
+
+/* disable DoH */
+/* #undef CURL_DISABLE_DOH */
 
 /* to disable FILE */
-/* #undef CURL_DISABLE_FILE */
+#define CURL_DISABLE_FILE 1
 
 /* to disable FTP */
 /* #undef CURL_DISABLE_FTP */
 
 /* to disable Gopher */
-/* #undef CURL_DISABLE_GOPHER */
+#define CURL_DISABLE_GOPHER 1
 
 /* to disable HTTP */
 /* #undef CURL_DISABLE_HTTP */
 
+/* disable HTTP authentication */
+/* #undef CURL_DISABLE_HTTP_AUTH */
+
 /* to disable IMAP */
-/* #undef CURL_DISABLE_IMAP */
+#define CURL_DISABLE_IMAP 1
 
 /* to disable LDAP */
 #define CURL_DISABLE_LDAP 1
@@ -43,62 +55,71 @@
 /* to disable --libcurl C code generation option */
 /* #undef CURL_DISABLE_LIBCURL_OPTION */
 
+/* disable mime API */
+/* #undef CURL_DISABLE_MIME */
+
+/* disable netrc parsing */
+/* #undef CURL_DISABLE_NETRC */
+
+/* if the OpenSSL configuration won't be loaded automatically */
+/* #undef CURL_DISABLE_OPENSSL_AUTO_LOAD_CONFIG */
+
+/* disable date parsing */
+/* #undef CURL_DISABLE_PARSEDATE */
+
 /* to disable POP3 */
-/* #undef CURL_DISABLE_POP3 */
+#define CURL_DISABLE_POP3 1
+
+/* disable progress-meter */
+/* #undef CURL_DISABLE_PROGRESS_METER */
 
 /* to disable proxies */
 /* #undef CURL_DISABLE_PROXY */
 
 /* to disable RTSP */
-/* #undef CURL_DISABLE_RTSP */
+#define CURL_DISABLE_RTSP 1
+
+/* disable DNS shuffling */
+/* #undef CURL_DISABLE_SHUFFLE_DNS */
+
+/* to disable SMB/CIFS */
+#define CURL_DISABLE_SMB 1
 
 /* to disable SMTP */
-/* #undef CURL_DISABLE_SMTP */
+#define CURL_DISABLE_SMTP 1
 
 /* to disable TELNET */
-/* #undef CURL_DISABLE_TELNET */
+#define CURL_DISABLE_TELNET 1
 
 /* to disable TFTP */
 /* #undef CURL_DISABLE_TFTP */
 
-/* to disable TLS-SRP authentication */
-/* #undef CURL_DISABLE_TLS_SRP */
-
 /* to disable verbose strings */
 /* #undef CURL_DISABLE_VERBOSE_STRINGS */
 
-/* to make a symbol visible */
+/* to enable MQTT */
-/* #undef CURL_EXTERN_SYMBOL */
+/* #undef CURL_ENABLE_MQTT */
 
-/* to enable hidden symbols */
+/* Definition to make a library symbol externally visible. */
-/* #undef CURL_HIDDEN_SYMBOLS */
+#define CURL_EXTERN_SYMBOL __attribute__ ((__visibility__ ("default")))
 
-/* Use Windows LDAP implementation */
+/* IP address type in sockaddr */
-/* #undef CURL_LDAP_WIN */
+#define CURL_SA_FAMILY_T sa_family_t
 
-/* when not building a shared library */
+/* built with multiple SSL backends */
-/* #undef CURL_STATICLIB */
+/* #undef CURL_WITH_MULTI_SSL */
+
+/* enable debug build options */
+/* #undef DEBUGBUILD */
 
 /* your Entropy Gathering Daemon socket pathname */
 /* #undef EGD_SOCKET */
 
 /* Define if you want to enable IPv6 support */
-/* #undef ENABLE_IPV6 */
+#define ENABLE_IPV6 1
 
-/* Define to the type qualifier of arg 1 for getnameinfo. */
+/* Define to the type of arg 2 for gethostname. */
-#define GETNAMEINFO_QUAL_ARG1 const
+#define GETHOSTNAME_TYPE_ARG2 size_t
-
-/* Define to the type of arg 1 for getnameinfo. */
-#define GETNAMEINFO_TYPE_ARG1 struct sockaddr *
-
-/* Define to the type of arg 2 for getnameinfo. */
-#define GETNAMEINFO_TYPE_ARG2 socklen_t
-
-/* Define to the type of args 4 and 6 for getnameinfo. */
-#define GETNAMEINFO_TYPE_ARG46 size_t
-
-/* Define to the type of arg 7 for getnameinfo. */
-#define GETNAMEINFO_TYPE_ARG7 int
 
 /* Specifies the number of arguments to getservbyport_r */
 #define GETSERVBYPORT_R_ARGS 6
@@ -127,6 +148,18 @@
 /* Define to 1 if bool is an available type. */
 #define HAVE_BOOL_T 1
 
+/* Define to 1 if using BoringSSL. */
+/* #undef HAVE_BORINGSSL */
+
+/* if BROTLI is in use */
+/* #undef HAVE_BROTLI */
+
+/* Define to 1 if you have the <brotli/decode.h> header file. */
+/* #undef HAVE_BROTLI_DECODE_H */
+
+/* Define to 1 if you have the __builtin_available function. */
+/* #undef HAVE_BUILTIN_AVAILABLE */
+
 /* Define to 1 if you have the clock_gettime function and monotonic timer. */
 #define HAVE_CLOCK_GETTIME_MONOTONIC 1
 
@@ -139,24 +172,19 @@
 /* Define to 1 if you have the connect function. */
 #define HAVE_CONNECT 1
 
-/* Define to 1 if you have the `CRYPTO_cleanup_all_ex_data' function. */
-/* #undef HAVE_CRYPTO_CLEANUP_ALL_EX_DATA */
-
 /* Define to 1 if you have the <crypto.h> header file. */
 /* #undef HAVE_CRYPTO_H */
 
-/* Define to 1 if you have the <des.h> header file. */
+/* Define to 1 if you have the declaration of `getpwuid_r', and to 0 if you
-/* #undef HAVE_DES_H */
+   don't. */
+#define HAVE_DECL_GETPWUID_R 1
+
+/* "Set if getpwuid_r() declaration is missing" */
+/* #undef HAVE_DECL_GETPWUID_R_MISSING */
 
 /* Define to 1 if you have the <dlfcn.h> header file. */
 #define HAVE_DLFCN_H 1
 
-/* Define to 1 if you have the `ENGINE_cleanup' function. */
-/* #undef HAVE_ENGINE_CLEANUP */
-
-/* Define to 1 if you have the `ENGINE_load_builtin_engines' function. */
-/* #undef HAVE_ENGINE_LOAD_BUILTIN_ENGINES */
-
 /* Define to 1 if you have the <errno.h> header file. */
 #define HAVE_ERRNO_H 1
 
@@ -172,17 +200,14 @@
 /* Define to 1 if you have a working fcntl O_NONBLOCK function. */
 #define HAVE_FCNTL_O_NONBLOCK 1
 
-/* Define to 1 if you have the fdopen function. */
+/* Define to 1 if you have the `fnmatch' function. */
-#define HAVE_FDOPEN 1
+#define HAVE_FNMATCH 1
-
-/* Define to 1 if you have the `fork' function. */
-#define HAVE_FORK 1
 
 /* Define to 1 if you have the freeaddrinfo function. */
 #define HAVE_FREEADDRINFO 1
 
 /* Define to 1 if you have the freeifaddrs function. */
-/* #undef HAVE_FREEIFADDRS */
+#define HAVE_FREEIFADDRS 1
 
 /* Define to 1 if you have the fsetxattr function. */
 /* #undef HAVE_FSETXATTR */
@@ -242,29 +267,32 @@
 #define HAVE_GETHOSTNAME 1
 
 /* Define to 1 if you have a working getifaddrs function. */
-/* #undef HAVE_GETIFADDRS */
+#define HAVE_GETIFADDRS 1
-
-/* Define to 1 if you have the getnameinfo function. */
-#define HAVE_GETNAMEINFO 1
 
 /* Define to 1 if you have the `getpass_r' function. */
 /* #undef HAVE_GETPASS_R */
 
+/* Define to 1 if you have the getpeername function. */
+#define HAVE_GETPEERNAME 1
+
 /* Define to 1 if you have the `getppid' function. */
 #define HAVE_GETPPID 1
 
-/* Define to 1 if you have the `getprotobyname' function. */
-#define HAVE_GETPROTOBYNAME 1
-
 /* Define to 1 if you have the `getpwuid' function. */
 #define HAVE_GETPWUID 1
 
+/* Define to 1 if you have the `getpwuid_r' function. */
+#define HAVE_GETPWUID_R 1
+
 /* Define to 1 if you have the `getrlimit' function. */
 #define HAVE_GETRLIMIT 1
 
 /* Define to 1 if you have the getservbyport_r function. */
 #define HAVE_GETSERVBYPORT_R 1
 
+/* Define to 1 if you have the getsockname function. */
+#define HAVE_GETSOCKNAME 1
+
 /* Define to 1 if you have the `gettimeofday' function. */
 #define HAVE_GETTIMEOFDAY 1
 
@@ -277,7 +305,7 @@
 /* if you have the function gnutls_srp_verifier */
 /* #undef HAVE_GNUTLS_SRP */
 
-/* if you have the gssapi libraries */
+/* if you have GSS-API libraries */
 /* #undef HAVE_GSSAPI */
 
 /* Define to 1 if you have the <gssapi/gssapi_generic.h> header file. */
@@ -289,29 +317,23 @@
 /* Define to 1 if you have the <gssapi/gssapi_krb5.h> header file. */
 /* #undef HAVE_GSSAPI_GSSAPI_KRB5_H */
 
-/* if you have the GNU gssapi libraries */
+/* if you have GNU GSS */
 /* #undef HAVE_GSSGNU */
 
-/* if you have the Heimdal gssapi libraries */
+/* if you have Heimdal */
 /* #undef HAVE_GSSHEIMDAL */
 
-/* if you have the MIT gssapi libraries */
+/* if you have MIT Kerberos */
 /* #undef HAVE_GSSMIT */
 
-/* Define to 1 if you have the `idna_strerror' function. */
+/* Define to 1 if you have the <idn2.h> header file. */
-/* #undef HAVE_IDNA_STRERROR */
+#define HAVE_IDN2_H 1
-
-/* Define to 1 if you have the `idn_free' function. */
-/* #undef HAVE_IDN_FREE */
-
-/* Define to 1 if you have the <idn-free.h> header file. */
-/* #undef HAVE_IDN_FREE_H */
 
 /* Define to 1 if you have the <ifaddrs.h> header file. */
 #define HAVE_IFADDRS_H 1
 
-/* Define to 1 if you have the `inet_addr' function. */
+/* Define to 1 if you have the `if_nametoindex' function. */
-#define HAVE_INET_ADDR 1
+#define HAVE_IF_NAMETOINDEX 1
 
 /* Define to 1 if you have the inet_ntoa_r function. */
 #define HAVE_INET_NTOA_R 1
@@ -356,15 +378,6 @@
 /* Define to 1 if you have the <io.h> header file. */
 /* #undef HAVE_IO_H */
 
-/* if you have the Kerberos4 libraries (including -ldes) */
-/* #undef HAVE_KRB4 */
-
-/* Define to 1 if you have the `krb_get_our_ip_for_realm' function. */
-/* #undef HAVE_KRB_GET_OUR_IP_FOR_REALM */
-
-/* Define to 1 if you have the <krb.h> header file. */
-/* #undef HAVE_KRB_H */
-
 /* Define to 1 if you have the lber.h header file. */
 /* #undef HAVE_LBER_H */
 
@@ -386,50 +399,44 @@
 /* Define to 1 if you have the `ldap_url_parse' function. */
 /* #undef HAVE_LDAP_URL_PARSE */
 
+/* Define to 1 if you have the `brotlidec' library (-lbrotlidec). */
+/* #undef HAVE_LIBBROTLIDEC */
+
 /* Define to 1 if you have the <libgen.h> header file. */
 #define HAVE_LIBGEN_H 1
 
 /* Define to 1 if you have the `idn' library (-lidn). */
 /* #undef HAVE_LIBIDN */
 
-/* Define to 1 if you have the `resolv' library (-lresolv). */
+/* Define to 1 if using libressl. */
-/* #undef HAVE_LIBRESOLV */
+/* #undef HAVE_LIBRESSL */
-
-/* Define to 1 if you have the `resolve' library (-lresolve). */
-/* #undef HAVE_LIBRESOLVE */
 
 /* Define to 1 if you have the <librtmp/rtmp.h> header file. */
 /* #undef HAVE_LIBRTMP_RTMP_H */
 
+/* Define to 1 if you have the `ssh' library (-lssh). */
+#define HAVE_LIBSSH 1
+
 /* Define to 1 if you have the `ssh2' library (-lssh2). */
 /* #undef HAVE_LIBSSH2 */
 
-/* Define to 1 if you have the `libssh2_exit' function. */
-/* #undef HAVE_LIBSSH2_EXIT */
-
 /* Define to 1 if you have the <libssh2.h> header file. */
 /* #undef HAVE_LIBSSH2_H */
 
-/* Define to 1 if you have the `libssh2_init' function. */
+/* Define to 1 if you have the <libssh/libssh.h> header file. */
-/* #undef HAVE_LIBSSH2_INIT */
+#define HAVE_LIBSSH_LIBSSH_H 1
-
-/* Define to 1 if you have the `libssh2_scp_send64' function. */
-/* #undef HAVE_LIBSSH2_SCP_SEND64 */
-
-/* Define to 1 if you have the `libssh2_session_handshake' function. */
-/* #undef HAVE_LIBSSH2_SESSION_HANDSHAKE */
-
-/* Define to 1 if you have the `libssh2_version' function. */
-/* #undef HAVE_LIBSSH2_VERSION */
 
 /* Define to 1 if you have the `ssl' library (-lssl). */
-/* #undef HAVE_LIBSSL */
+#define HAVE_LIBSSL 1
+
+/* Define to 1 if you have the `wolfssh' library (-lwolfssh). */
+/* #undef HAVE_LIBWOLFSSH */
 
 /* if zlib is available */
-/* #undef HAVE_LIBZ */
+#define HAVE_LIBZ 1
 
-/* Define to 1 if you have the <limits.h> header file. */
+/* Define to 1 if you have the <linux/tcp.h> header file. */
-#define HAVE_LIMITS_H 1
+/* #undef HAVE_LINUX_TCP_H */
 
 /* if your compiler supports LL */
 #define HAVE_LL 1
@@ -443,6 +450,9 @@
 /* Define to 1 if the compiler supports the 'long long' data type. */
 #define HAVE_LONGLONG 1
 
+/* Define to 1 if you have the `mach_absolute_time' function. */
+/* #undef HAVE_MACH_ABSOLUTE_TIME */
+
 /* Define to 1 if you have the malloc.h header file. */
 /* #undef HAVE_MALLOC_H */
 
@@ -458,6 +468,9 @@
 /* Define to 1 if you have the <netdb.h> header file. */
 #define HAVE_NETDB_H 1
 
+/* Define to 1 if you have the <netinet/in6.h> header file. */
+/* #undef HAVE_NETINET_IN6_H */
+
 /* Define to 1 if you have the <netinet/in.h> header file. */
 #define HAVE_NETINET_IN_H 1
 
@@ -467,48 +480,57 @@
 /* Define to 1 if you have the <net/if.h> header file. */
 #define HAVE_NET_IF_H 1
 
-/* Define to 1 if NI_WITHSCOPEID exists and works. */
+/* Define to 1 if you have the <nghttp2/nghttp2.h> header file. */
-/* #undef HAVE_NI_WITHSCOPEID */
+/* #undef HAVE_NGHTTP2_NGHTTP2_H */
 
-/* if you have an old MIT gssapi library, lacking GSS_C_NT_HOSTBASED_SERVICE
+/* Define to 1 if you have the <nghttp3/nghttp3.h> header file. */
+/* #undef HAVE_NGHTTP3_NGHTTP3_H */
+
+/* Define to 1 if you have the <ngtcp2/ngtcp2_crypto.h> header file. */
+/* #undef HAVE_NGTCP2_NGTCP2_CRYPTO_H */
+
+/* Define to 1 if you have the <ngtcp2/ngtcp2.h> header file. */
+/* #undef HAVE_NGTCP2_NGTCP2_H */
+
+/* if you have an old MIT Kerberos version, lacking GSS_C_NT_HOSTBASED_SERVICE
    */
 /* #undef HAVE_OLD_GSSMIT */
 
-/* Define to 1 if you have the <openssl/crypto.h> header file. */
+/* Define to 1 if using OpenSSL 3 or later. */
-/* #undef HAVE_OPENSSL_CRYPTO_H */
+/* #undef HAVE_OPENSSL3 */
 
-/* Define to 1 if you have the <openssl/engine.h> header file. */
+/* Define to 1 if you have the <openssl/crypto.h> header file. */
-/* #undef HAVE_OPENSSL_ENGINE_H */
+#define HAVE_OPENSSL_CRYPTO_H 1
 
 /* Define to 1 if you have the <openssl/err.h> header file. */
-/* #undef HAVE_OPENSSL_ERR_H */
+#define HAVE_OPENSSL_ERR_H 1
 
 /* Define to 1 if you have the <openssl/pem.h> header file. */
-/* #undef HAVE_OPENSSL_PEM_H */
+#define HAVE_OPENSSL_PEM_H 1
-
-/* Define to 1 if you have the <openssl/pkcs12.h> header file. */
-/* #undef HAVE_OPENSSL_PKCS12_H */
 
 /* Define to 1 if you have the <openssl/rsa.h> header file. */
-/* #undef HAVE_OPENSSL_RSA_H */
+#define HAVE_OPENSSL_RSA_H 1
+
+/* if you have the function SRP_Calc_client_key */
+#define HAVE_OPENSSL_SRP 1
 
 /* Define to 1 if you have the <openssl/ssl.h> header file. */
-/* #undef HAVE_OPENSSL_SSL_H */
+#define HAVE_OPENSSL_SSL_H 1
+
+/* Define to 1 if you have the `OpenSSL_version' function. */
+#define HAVE_OPENSSL_VERSION 1
 
 /* Define to 1 if you have the <openssl/x509.h> header file. */
-/* #undef HAVE_OPENSSL_X509_H */
+#define HAVE_OPENSSL_X509_H 1
 
 /* Define to 1 if you have the <pem.h> header file. */
 /* #undef HAVE_PEM_H */
 
-/* Define to 1 if you have the `perror' function. */
-#define HAVE_PERROR 1
-
 /* Define to 1 if you have the `pipe' function. */
 #define HAVE_PIPE 1
 
-/* if you have the function PK11_CreateGenericObject */
+/* if you have the PK11_CreateManagedGenericObject function */
-/* #undef HAVE_PK11_CREATEGENERICOBJECT */
+/* #undef HAVE_PK11_CREATEMANAGEDGENERICOBJECT */
 
 /* Define to 1 if you have a working poll function. */
 #define HAVE_POLL 1
@@ -517,32 +539,29 @@
 /* #undef HAVE_POLL_FINE */
 
 /* Define to 1 if you have the <poll.h> header file. */
-/* #undef HAVE_POLL_H */
+#define HAVE_POLL_H 1
 
 /* Define to 1 if you have a working POSIX-style strerror_r function. */
 #define HAVE_POSIX_STRERROR_R 1
 
+/* Define to 1 if you have the <proto/bsdsocket.h> header file. */
+/* #undef HAVE_PROTO_BSDSOCKET_H */
+
 /* if you have <pthread.h> */
-/* #undef HAVE_PTHREAD_H */
+#define HAVE_PTHREAD_H 1
 
 /* Define to 1 if you have the <pwd.h> header file. */
 #define HAVE_PWD_H 1
 
+/* Define to 1 if you have the <quiche.h> header file. */
+/* #undef HAVE_QUICHE_H */
+
 /* Define to 1 if you have the `RAND_egd' function. */
 /* #undef HAVE_RAND_EGD */
 
-/* Define to 1 if you have the `RAND_screen' function. */
-/* #undef HAVE_RAND_SCREEN */
-
-/* Define to 1 if you have the `RAND_status' function. */
-/* #undef HAVE_RAND_STATUS */
-
 /* Define to 1 if you have the recv function. */
 #define HAVE_RECV 1
 
-/* Define to 1 if you have the recvfrom function. */
-#define HAVE_RECVFROM 1
-
 /* Define to 1 if you have the <rsa.h> header file. */
 /* #undef HAVE_RSA_H */
 
@@ -601,22 +620,16 @@
 #define HAVE_SOCKET 1
 
 /* Define to 1 if you have the socketpair function. */
-#define HAVE_SOCKETPAIR 1
+/* #undef HAVE_SOCKETPAIR */
 
 /* Define to 1 if you have the <socket.h> header file. */
 /* #undef HAVE_SOCKET_H */
 
-/* Define this if you have the SPNEGO library fbopenssl */
-/* #undef HAVE_SPNEGO */
-
-/* if you have the function SRP_Calc_client_key */
-/* #undef HAVE_SSLEAY_SRP */
-
 /* Define to 1 if you have the `SSLv2_client_method' function. */
 /* #undef HAVE_SSLV2_CLIENT_METHOD */
 
-/* Define to 1 if you have the `SSL_get_shutdown' function. */
+/* Define to 1 if you have the `SSL_get_esni_status' function. */
-/* #undef HAVE_SSL_GET_SHUTDOWN */
+/* #undef HAVE_SSL_GET_ESNI_STATUS */
 
 /* Define to 1 if you have the <ssl.h> header file. */
 /* #undef HAVE_SSL_H */
@@ -627,18 +640,12 @@
 /* Define to 1 if you have the <stdint.h> header file. */
 #define HAVE_STDINT_H 1
 
-/* Define to 1 if you have the <stdio.h> header file. */
-#define HAVE_STDIO_H 1
-
 /* Define to 1 if you have the <stdlib.h> header file. */
 #define HAVE_STDLIB_H 1
 
 /* Define to 1 if you have the strcasecmp function. */
 #define HAVE_STRCASECMP 1
 
-/* Define to 1 if you have the strcasestr function. */
-#define HAVE_STRCASESTR 1
-
 /* Define to 1 if you have the strcmpi function. */
 /* #undef HAVE_STRCMPI */
 
@@ -657,12 +664,6 @@
 /* Define to 1 if you have the <string.h> header file. */
 #define HAVE_STRING_H 1
 
-/* Define to 1 if you have the strlcat function. */
-#define HAVE_STRLCAT 1
-
-/* Define to 1 if you have the `strlcpy' function. */
-/* #undef HAVE_STRLCPY */
-
 /* Define to 1 if you have the strncasecmp function. */
 #define HAVE_STRNCASECMP 1
 
@@ -747,21 +748,21 @@
 /* Define to 1 if you have the <time.h> header file. */
 #define HAVE_TIME_H 1
 
-/* Define to 1 if you have the <tld.h> header file. */
+/* Define this if time_t is unsigned */
-/* #undef HAVE_TLD_H */
+/* #undef HAVE_TIME_T_UNSIGNED */
-
-/* Define to 1 if you have the `tld_strerror' function. */
-/* #undef HAVE_TLD_STRERROR */
-
-/* Define to 1 if you have the `uname' function. */
-#define HAVE_UNAME 1
 
 /* Define to 1 if you have the <unistd.h> header file. */
 #define HAVE_UNISTD_H 1
 
+/* Define to 1 if you have the `usleep' function. */
+#define HAVE_USLEEP 1
+
 /* Define to 1 if you have the `utime' function. */
 #define HAVE_UTIME 1
 
+/* Define to 1 if you have the `utimes' function. */
+#define HAVE_UTIMES 1
+
 /* Define to 1 if you have the <utime.h> header file. */
 #define HAVE_UTIME_H 1
 
@@ -786,6 +787,18 @@
 /* Define to 1 if you have the winsock.h header file. */
 /* #undef HAVE_WINSOCK_H */
 
+/* Define to 1 if you have the <wolfssh/ssh.h> header file. */
+/* #undef HAVE_WOLFSSH_SSH_H */
+
+/* Define to 1 if you have the `wolfSSLv3_client_method' function. */
+/* #undef HAVE_WOLFSSLV3_CLIENT_METHOD */
+
+/* Define to 1 if you have the `wolfSSL_get_peer_certificate' function. */
+/* #undef HAVE_WOLFSSL_GET_PEER_CERTIFICATE */
+
+/* Define to 1 if you have the `wolfSSL_UseALPN' function. */
+/* #undef HAVE_WOLFSSL_USEALPN */
+
 /* Define this symbol if your OS supports changing the contents of argv */
 /* #undef HAVE_WRITABLE_ARGV */
 
@@ -799,15 +812,11 @@
 /* #undef HAVE_X509_H */
 
 /* if you have the zlib.h header file */
-/* #undef HAVE_ZLIB_H */
+#define HAVE_ZLIB_H 1
 
-/* Define to the sub-directory in which libtool stores uninstalled libraries.
+/* Define to the sub-directory where libtool stores uninstalled libraries. */
-   */
 #define LT_OBJDIR ".libs/"
 
-/* Define to 1 if you are building a native Windows target. */
-/* #undef NATIVE_WINDOWS */
-
 /* Define to 1 if you need the lber.h header file even with ldap.h */
 /* #undef NEED_LBER_H */
 
@@ -830,13 +839,13 @@
 /* #undef NTLM_WB_FILE */
 
 /* cpu-machine-OS */
-#define OS "x86_64-pc-elf"
+#define OS "i386-pc-elf"
 
 /* Name of package */
 #define PACKAGE "curl"
 
 /* Define to the address where bug reports for this package should be sent. */
-#define PACKAGE_BUGREPORT "a suitable curl mailing list: http://curl.haxx.se/mail/"
+#define PACKAGE_BUGREPORT "a suitable curl mailing list: https://curl.haxx.se/mail/"
 
 /* Define to the full name of this package. */
 #define PACKAGE_NAME "curl"
@@ -856,39 +865,6 @@
 /* a suitable file to read random data from */
 /* #undef RANDOM_FILE */
 
-/* Define to the type qualifier pointed by arg 5 for recvfrom. */
-#define RECVFROM_QUAL_ARG5 
-
-/* Define to the type of arg 1 for recvfrom. */
-#define RECVFROM_TYPE_ARG1 int
-
-/* Define to the type pointed by arg 2 for recvfrom. */
-#define RECVFROM_TYPE_ARG2 void
-
-/* Define to 1 if the type pointed by arg 2 for recvfrom is void. */
-#define RECVFROM_TYPE_ARG2_IS_VOID 1
-
-/* Define to the type of arg 3 for recvfrom. */
-#define RECVFROM_TYPE_ARG3 size_t
-
-/* Define to the type of arg 4 for recvfrom. */
-#define RECVFROM_TYPE_ARG4 int
-
-/* Define to the type pointed by arg 5 for recvfrom. */
-#define RECVFROM_TYPE_ARG5 struct sockaddr
-
-/* Define to 1 if the type pointed by arg 5 for recvfrom is void. */
-/* #undef RECVFROM_TYPE_ARG5_IS_VOID */
-
-/* Define to the type pointed by arg 6 for recvfrom. */
-#define RECVFROM_TYPE_ARG6 socklen_t
-
-/* Define to 1 if the type pointed by arg 6 for recvfrom is void. */
-/* #undef RECVFROM_TYPE_ARG6_IS_VOID */
-
-/* Define to the function return type for recvfrom. */
-#define RECVFROM_TYPE_RETV int
-
 /* Define to the type of arg 1 for recv. */
 #define RECV_TYPE_ARG1 int
 
@@ -902,7 +878,7 @@
 #define RECV_TYPE_ARG4 int
 
 /* Define to the function return type for recv. */
-#define RECV_TYPE_RETV int
+#define RECV_TYPE_RETV ssize_t
 
 /* Define as the return type of signal handlers (`int' or `void'). */
 #define RETSIGTYPE void
@@ -938,29 +914,32 @@
 #define SEND_TYPE_ARG4 int
 
 /* Define to the function return type for send. */
-#define SEND_TYPE_RETV int
+#define SEND_TYPE_RETV ssize_t
 
-/* The size of `int', as computed by sizeof. */
+/* The number of bytes in type curl_off_t */
+#define SIZEOF_CURL_OFF_T 8
+
+/* The number of bytes in type int */
 #define SIZEOF_INT 4
 
-/* The size of `long', as computed by sizeof. */
+/* The number of bytes in type long */
 #define SIZEOF_LONG 4
 
-/* The size of `off_t', as computed by sizeof. */
+/* The number of bytes in type long long */
+/* #undef SIZEOF_LONG_LONG */
+
+/* The number of bytes in type off_t */
 #define SIZEOF_OFF_T 8
 
-/* The size of `short', as computed by sizeof. */
+/* The number of bytes in type short */
 #define SIZEOF_SHORT 2
 
-/* The size of `size_t', as computed by sizeof. */
+/* The number of bytes in type size_t */
 #define SIZEOF_SIZE_T 4
 
-/* The size of `time_t', as computed by sizeof. */
+/* The number of bytes in type time_t */
 #define SIZEOF_TIME_T 4
 
-/* The size of `void*', as computed by sizeof. */
-#define SIZEOF_VOIDP 4
-
 /* Define to 1 if you have the ANSI C header files. */
 #define STDC_HEADERS 1
 
@@ -970,17 +949,20 @@
 /* Define to 1 if you can safely include both <sys/time.h> and <time.h>. */
 #define TIME_WITH_SYS_TIME 1
 
+/* to enable alt-svc */
+/* #undef USE_ALTSVC */
+
+/* if AmiSSL is in use */
+/* #undef USE_AMISSL */
+
 /* Define to enable c-ares support */
 /* #undef USE_ARES */
 
-/* if axTLS is enabled */
+/* if BearSSL is enabled */
-/* #undef USE_AXTLS */
+/* #undef USE_BEARSSL */
 
-/* Define to disable non-blocking sockets. */
+/* if ESNI support is available */
-/* #undef USE_BLOCKING_SOCKETS */
+/* #undef USE_ESNI */
-
-/* if CyaSSL is enabled */
-/* #undef USE_CYASSL */
 
 /* if GnuTLS is enabled */
 /* #undef USE_GNUTLS */
@@ -988,15 +970,45 @@
 /* if GnuTLS uses nettle as crypto backend */
 /* #undef USE_GNUTLS_NETTLE */
 
+/* PSL support enabled */
+/* #undef USE_LIBPSL */
+
 /* if librtmp is in use */
 /* #undef USE_LIBRTMP */
 
+/* if libSSH is in use */
+#define USE_LIBSSH 1
+
 /* if libSSH2 is in use */
 /* #undef USE_LIBSSH2 */
 
 /* If you want to build curl with the built-in manual */
 #define USE_MANUAL 1
 
+/* if mbedTLS is enabled */
+/* #undef USE_MBEDTLS */
+
+/* if MesaLink is enabled */
+/* #undef USE_MESALINK */
+
+/* Define to enable metalink support */
+/* #undef USE_METALINK */
+
+/* if nghttp2 is in use */
+/* #undef USE_NGHTTP2 */
+
+/* if nghttp3 is in use */
+/* #undef USE_NGHTTP3 */
+
+/* if ngtcp2 is in use */
+/* #undef USE_NGTCP2 */
+
+/* if ngtcp2_crypto_gnutls is in use */
+/* #undef USE_NGTCP2_CRYPTO_GNUTLS */
+
+/* if ngtcp2_crypto_openssl is in use */
+/* #undef USE_NGTCP2_CRYPTO_OPENSSL */
+
 /* if NSS is enabled */
 /* #undef USE_NSS */
 
@@ -1006,22 +1018,37 @@
 /* if OpenSSL is in use */
 #define USE_OPENSSL 1
 
-/* if PolarSSL is enabled */
+/* if quiche is in use */
-/* #undef USE_POLARSSL */
+/* #undef USE_QUICHE */
 
-/* if SSL is enabled */
+/* to enable Windows native SSL/TLS support */
-#define USE_SSLEAY 1
+/* #undef USE_SCHANNEL */
+
+/* enable Secure Transport */
+/* #undef USE_SECTRANSP */
 
 /* if you want POSIX threaded DNS lookup */
-/* #undef USE_THREADS_POSIX */
+#define USE_THREADS_POSIX 1
+
+/* if you want Win32 threaded DNS lookup */
+/* #undef USE_THREADS_WIN32 */
 
 /* Use TLS-SRP authentication */
-/* #undef USE_TLS_SRP */
+#define USE_TLS_SRP 1
+
+/* Use Unix domain sockets */
+/* #undef USE_UNIX_SOCKETS */
+
+/* Define to 1 if you have the `normaliz' (WinIDN) library (-lnormaliz). */
+/* #undef USE_WIN32_IDN */
 
 /* Define to 1 if you are building a Windows target with large file support.
    */
 /* #undef USE_WIN32_LARGE_FILES */
 
+/* Use Windows LDAP implementation */
+/* #undef USE_WIN32_LDAP */
+
 /* Define to 1 if you are building a Windows target without large file
    support. */
 /* #undef USE_WIN32_SMALL_FILES */
@@ -1029,20 +1056,28 @@
 /* to enable SSPI support */
 /* #undef USE_WINDOWS_SSPI */
 
-/* Define to 1 if using yaSSL in OpenSSL compatibility mode. */
+/* if wolfSSH is in use */
-/* #undef USE_YASSLEMUL */
+/* #undef USE_WOLFSSH */
+
+/* if wolfSSL is enabled */
+/* #undef USE_WOLFSSL */
 
 /* Version number of package */
 #define VERSION "-"
 
-/* Define to avoid automatic inclusion of winsock.h */
+/* Define to 1 to provide own prototypes. */
-/* #undef WIN32_LEAN_AND_MEAN */
+/* #undef WANT_IDN_PROTOTYPES */
 
 /* Define to 1 if OS is AIX. */
 #ifndef _ALL_SOURCE
 /* #  undef _ALL_SOURCE */
 #endif
 
+/* Enable large inode numbers on Mac OS X 10.5.  */
+#ifndef _DARWIN_USE_64_BIT_INODE
+# define _DARWIN_USE_64_BIT_INODE 1
+#endif
+
 /* Number of bits in a file offset, on hosts where this is settable. */
 /* #undef _FILE_OFFSET_BITS */
 

repos/libports/src/lib/curl/spec/64bit/curl/curlbuild.h

@@ -1,198 +0,0 @@
-/* include/curl/curlbuild.h.  Generated from curlbuild.h.in by configure.  */
-#ifndef __CURL_CURLBUILD_H
-#define __CURL_CURLBUILD_H
-/***************************************************************************
- *                                  _   _ ____  _
- *  Project                     ___| | | |  _ \| |
- *                             / __| | | | |_) | |
- *                            | (__| |_| |  _ <| |___
- *                             \___|\___/|_| \_\_____|
- *
- * Copyright (C) 1998 - 2012, Daniel Stenberg, <daniel@haxx.se>, et al.
- *
- * This software is licensed as described in the file COPYING, which
- * you should have received as part of this distribution. The terms
- * are also available at http://curl.haxx.se/docs/copyright.html.
- *
- * You may opt to use, copy, modify, merge, publish, distribute and/or sell
- * copies of the Software, and permit persons to whom the Software is
- * furnished to do so, under the terms of the COPYING file.
- *
- * This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY
- * KIND, either express or implied.
- *
- ***************************************************************************/
-
-/* ================================================================ */
-/*               NOTES FOR CONFIGURE CAPABLE SYSTEMS                */
-/* ================================================================ */
-
-/*
- * NOTE 1:
- * -------
- *
- * Nothing in this file is intended to be modified or adjusted by the
- * curl library user nor by the curl library builder.
- *
- * If you think that something actually needs to be changed, adjusted
- * or fixed in this file, then, report it on the libcurl development
- * mailing list: http://cool.haxx.se/mailman/listinfo/curl-library/
- *
- * This header file shall only export symbols which are 'curl' or 'CURL'
- * prefixed, otherwise public name space would be polluted.
- *
- * NOTE 2:
- * -------
- *
- * Right now you might be staring at file include/curl/curlbuild.h.in or
- * at file include/curl/curlbuild.h, this is due to the following reason:
- *
- * On systems capable of running the configure script, the configure process
- * will overwrite the distributed include/curl/curlbuild.h file with one that
- * is suitable and specific to the library being configured and built, which
- * is generated from the include/curl/curlbuild.h.in template file.
- *
- */
-
-/* ================================================================ */
-/*  DEFINITION OF THESE SYMBOLS SHALL NOT TAKE PLACE ANYWHERE ELSE  */
-/* ================================================================ */
-
-#ifdef CURL_SIZEOF_LONG
-#error "CURL_SIZEOF_LONG shall not be defined except in curlbuild.h"
-   Error Compilation_aborted_CURL_SIZEOF_LONG_already_defined
-#endif
-
-#ifdef CURL_TYPEOF_CURL_SOCKLEN_T
-#error "CURL_TYPEOF_CURL_SOCKLEN_T shall not be defined except in curlbuild.h"
-   Error Compilation_aborted_CURL_TYPEOF_CURL_SOCKLEN_T_already_defined
-#endif
-
-#ifdef CURL_SIZEOF_CURL_SOCKLEN_T
-#error "CURL_SIZEOF_CURL_SOCKLEN_T shall not be defined except in curlbuild.h"
-   Error Compilation_aborted_CURL_SIZEOF_CURL_SOCKLEN_T_already_defined
-#endif
-
-#ifdef CURL_TYPEOF_CURL_OFF_T
-#error "CURL_TYPEOF_CURL_OFF_T shall not be defined except in curlbuild.h"
-   Error Compilation_aborted_CURL_TYPEOF_CURL_OFF_T_already_defined
-#endif
-
-#ifdef CURL_FORMAT_CURL_OFF_T
-#error "CURL_FORMAT_CURL_OFF_T shall not be defined except in curlbuild.h"
-   Error Compilation_aborted_CURL_FORMAT_CURL_OFF_T_already_defined
-#endif
-
-#ifdef CURL_FORMAT_CURL_OFF_TU
-#error "CURL_FORMAT_CURL_OFF_TU shall not be defined except in curlbuild.h"
-   Error Compilation_aborted_CURL_FORMAT_CURL_OFF_TU_already_defined
-#endif
-
-#ifdef CURL_FORMAT_OFF_T
-#error "CURL_FORMAT_OFF_T shall not be defined except in curlbuild.h"
-   Error Compilation_aborted_CURL_FORMAT_OFF_T_already_defined
-#endif
-
-#ifdef CURL_SIZEOF_CURL_OFF_T
-#error "CURL_SIZEOF_CURL_OFF_T shall not be defined except in curlbuild.h"
-   Error Compilation_aborted_CURL_SIZEOF_CURL_OFF_T_already_defined
-#endif
-
-#ifdef CURL_SUFFIX_CURL_OFF_T
-#error "CURL_SUFFIX_CURL_OFF_T shall not be defined except in curlbuild.h"
-   Error Compilation_aborted_CURL_SUFFIX_CURL_OFF_T_already_defined
-#endif
-
-#ifdef CURL_SUFFIX_CURL_OFF_TU
-#error "CURL_SUFFIX_CURL_OFF_TU shall not be defined except in curlbuild.h"
-   Error Compilation_aborted_CURL_SUFFIX_CURL_OFF_TU_already_defined
-#endif
-
-/* ================================================================ */
-/*  EXTERNAL INTERFACE SETTINGS FOR CONFIGURE CAPABLE SYSTEMS ONLY  */
-/* ================================================================ */
-
-/* Configure process defines this to 1 when it finds out that system  */
-/* header file ws2tcpip.h must be included by the external interface. */
-/* #undef CURL_PULL_WS2TCPIP_H */
-#ifdef CURL_PULL_WS2TCPIP_H
-#  ifndef WIN32_LEAN_AND_MEAN
-#    define WIN32_LEAN_AND_MEAN
-#  endif
-#  include <windows.h>
-#  include <winsock2.h>
-#  include <ws2tcpip.h>
-#endif
-
-/* Configure process defines this to 1 when it finds out that system   */
-/* header file sys/types.h must be included by the external interface. */
-#define CURL_PULL_SYS_TYPES_H 1
-#ifdef CURL_PULL_SYS_TYPES_H
-#  include <sys/types.h>
-#endif
-
-/* Configure process defines this to 1 when it finds out that system */
-/* header file stdint.h must be included by the external interface.  */
-/* #undef CURL_PULL_STDINT_H */
-#ifdef CURL_PULL_STDINT_H
-#  include <stdint.h>
-#endif
-
-/* Configure process defines this to 1 when it finds out that system  */
-/* header file inttypes.h must be included by the external interface. */
-/* #undef CURL_PULL_INTTYPES_H */
-#ifdef CURL_PULL_INTTYPES_H
-#  include <inttypes.h>
-#endif
-
-/* Configure process defines this to 1 when it finds out that system    */
-/* header file sys/socket.h must be included by the external interface. */
-#define CURL_PULL_SYS_SOCKET_H 1
-#ifdef CURL_PULL_SYS_SOCKET_H
-#  include <sys/socket.h>
-#endif
-
-/* Configure process defines this to 1 when it finds out that system  */
-/* header file sys/poll.h must be included by the external interface. */
-/* #undef CURL_PULL_SYS_POLL_H */
-#ifdef CURL_PULL_SYS_POLL_H
-#  include <sys/poll.h>
-#endif
-
-/* The size of `long', as computed by sizeof. */
-#define CURL_SIZEOF_LONG 8
-
-/* Integral data type used for curl_socklen_t. */
-#define CURL_TYPEOF_CURL_SOCKLEN_T socklen_t
-
-/* The size of `curl_socklen_t', as computed by sizeof. */
-#define CURL_SIZEOF_CURL_SOCKLEN_T 4
-
-/* Data type definition of curl_socklen_t. */
-typedef CURL_TYPEOF_CURL_SOCKLEN_T curl_socklen_t;
-
-/* Signed integral data type used for curl_off_t. */
-#define CURL_TYPEOF_CURL_OFF_T long
-
-/* Data type definition of curl_off_t. */
-typedef CURL_TYPEOF_CURL_OFF_T curl_off_t;
-
-/* curl_off_t formatting string directive without "%" conversion specifier. */
-#define CURL_FORMAT_CURL_OFF_T "ld"
-
-/* unsigned curl_off_t formatting string without "%" conversion specifier. */
-#define CURL_FORMAT_CURL_OFF_TU "lu"
-
-/* curl_off_t formatting string directive with "%" conversion specifier. */
-#define CURL_FORMAT_OFF_T "%ld"
-
-/* The size of `curl_off_t', as computed by sizeof. */
-#define CURL_SIZEOF_CURL_OFF_T 8
-
-/* curl_off_t constant suffix. */
-#define CURL_SUFFIX_CURL_OFF_T L
-
-/* unsigned curl_off_t constant suffix. */
-#define CURL_SUFFIX_CURL_OFF_TU UL
-
-#endif /* __CURL_CURLBUILD_H */