diff --git a/abi_libs b/abi_libs --- a/abi_libs +++ b/abi_libs @@ -1 +1,2 @@ +libcurl-gnutls.so.4 libcurl.so.4 diff --git a/abi_libs32 b/abi_libs32 --- a/abi_libs32 +++ b/abi_libs32 @@ -1 +1,2 @@ +libcurl-gnutls.so.4 libcurl.so.4 diff --git a/abi_symbols b/abi_symbols --- a/abi_symbols +++ b/abi_symbols @@ -1,3 +1,89 @@ +libcurl-gnutls.so.4:curl_easy_cleanup +libcurl-gnutls.so.4:curl_easy_duphandle +libcurl-gnutls.so.4:curl_easy_escape +libcurl-gnutls.so.4:curl_easy_getinfo +libcurl-gnutls.so.4:curl_easy_init +libcurl-gnutls.so.4:curl_easy_option_by_id +libcurl-gnutls.so.4:curl_easy_option_by_name +libcurl-gnutls.so.4:curl_easy_option_next +libcurl-gnutls.so.4:curl_easy_pause +libcurl-gnutls.so.4:curl_easy_perform +libcurl-gnutls.so.4:curl_easy_recv +libcurl-gnutls.so.4:curl_easy_reset +libcurl-gnutls.so.4:curl_easy_send +libcurl-gnutls.so.4:curl_easy_setopt +libcurl-gnutls.so.4:curl_easy_strerror +libcurl-gnutls.so.4:curl_easy_unescape +libcurl-gnutls.so.4:curl_easy_upkeep +libcurl-gnutls.so.4:curl_escape +libcurl-gnutls.so.4:curl_formadd +libcurl-gnutls.so.4:curl_formfree +libcurl-gnutls.so.4:curl_formget +libcurl-gnutls.so.4:curl_free +libcurl-gnutls.so.4:curl_getdate +libcurl-gnutls.so.4:curl_getenv +libcurl-gnutls.so.4:curl_global_cleanup +libcurl-gnutls.so.4:curl_global_init +libcurl-gnutls.so.4:curl_global_init_mem +libcurl-gnutls.so.4:curl_global_sslset +libcurl-gnutls.so.4:curl_maprintf +libcurl-gnutls.so.4:curl_mfprintf +libcurl-gnutls.so.4:curl_mime_addpart +libcurl-gnutls.so.4:curl_mime_data +libcurl-gnutls.so.4:curl_mime_data_cb +libcurl-gnutls.so.4:curl_mime_encoder +libcurl-gnutls.so.4:curl_mime_filedata +libcurl-gnutls.so.4:curl_mime_filename +libcurl-gnutls.so.4:curl_mime_free +libcurl-gnutls.so.4:curl_mime_headers +libcurl-gnutls.so.4:curl_mime_init +libcurl-gnutls.so.4:curl_mime_name +libcurl-gnutls.so.4:curl_mime_subparts +libcurl-gnutls.so.4:curl_mime_type +libcurl-gnutls.so.4:curl_mprintf +libcurl-gnutls.so.4:curl_msnprintf +libcurl-gnutls.so.4:curl_msprintf +libcurl-gnutls.so.4:curl_multi_add_handle +libcurl-gnutls.so.4:curl_multi_assign +libcurl-gnutls.so.4:curl_multi_cleanup +libcurl-gnutls.so.4:curl_multi_fdset +libcurl-gnutls.so.4:curl_multi_info_read +libcurl-gnutls.so.4:curl_multi_init +libcurl-gnutls.so.4:curl_multi_perform +libcurl-gnutls.so.4:curl_multi_poll +libcurl-gnutls.so.4:curl_multi_remove_handle +libcurl-gnutls.so.4:curl_multi_setopt +libcurl-gnutls.so.4:curl_multi_socket +libcurl-gnutls.so.4:curl_multi_socket_action +libcurl-gnutls.so.4:curl_multi_socket_all +libcurl-gnutls.so.4:curl_multi_strerror +libcurl-gnutls.so.4:curl_multi_timeout +libcurl-gnutls.so.4:curl_multi_wait +libcurl-gnutls.so.4:curl_multi_wakeup +libcurl-gnutls.so.4:curl_mvaprintf +libcurl-gnutls.so.4:curl_mvfprintf +libcurl-gnutls.so.4:curl_mvprintf +libcurl-gnutls.so.4:curl_mvsnprintf +libcurl-gnutls.so.4:curl_mvsprintf +libcurl-gnutls.so.4:curl_pushheader_byname +libcurl-gnutls.so.4:curl_pushheader_bynum +libcurl-gnutls.so.4:curl_share_cleanup +libcurl-gnutls.so.4:curl_share_init +libcurl-gnutls.so.4:curl_share_setopt +libcurl-gnutls.so.4:curl_share_strerror +libcurl-gnutls.so.4:curl_slist_append +libcurl-gnutls.so.4:curl_slist_free_all +libcurl-gnutls.so.4:curl_strequal +libcurl-gnutls.so.4:curl_strnequal +libcurl-gnutls.so.4:curl_unescape +libcurl-gnutls.so.4:curl_url +libcurl-gnutls.so.4:curl_url_cleanup +libcurl-gnutls.so.4:curl_url_dup +libcurl-gnutls.so.4:curl_url_get +libcurl-gnutls.so.4:curl_url_set +libcurl-gnutls.so.4:curl_url_strerror +libcurl-gnutls.so.4:curl_version +libcurl-gnutls.so.4:curl_version_info libcurl.so.4:curl_easy_cleanup libcurl.so.4:curl_easy_duphandle libcurl.so.4:curl_easy_escape diff --git a/abi_symbols32 b/abi_symbols32 --- a/abi_symbols32 +++ b/abi_symbols32 @@ -1,3 +1,89 @@ +libcurl-gnutls.so.4:curl_easy_cleanup +libcurl-gnutls.so.4:curl_easy_duphandle +libcurl-gnutls.so.4:curl_easy_escape +libcurl-gnutls.so.4:curl_easy_getinfo +libcurl-gnutls.so.4:curl_easy_init +libcurl-gnutls.so.4:curl_easy_option_by_id +libcurl-gnutls.so.4:curl_easy_option_by_name +libcurl-gnutls.so.4:curl_easy_option_next +libcurl-gnutls.so.4:curl_easy_pause +libcurl-gnutls.so.4:curl_easy_perform +libcurl-gnutls.so.4:curl_easy_recv +libcurl-gnutls.so.4:curl_easy_reset +libcurl-gnutls.so.4:curl_easy_send +libcurl-gnutls.so.4:curl_easy_setopt +libcurl-gnutls.so.4:curl_easy_strerror +libcurl-gnutls.so.4:curl_easy_unescape +libcurl-gnutls.so.4:curl_easy_upkeep +libcurl-gnutls.so.4:curl_escape +libcurl-gnutls.so.4:curl_formadd +libcurl-gnutls.so.4:curl_formfree +libcurl-gnutls.so.4:curl_formget +libcurl-gnutls.so.4:curl_free +libcurl-gnutls.so.4:curl_getdate +libcurl-gnutls.so.4:curl_getenv +libcurl-gnutls.so.4:curl_global_cleanup +libcurl-gnutls.so.4:curl_global_init +libcurl-gnutls.so.4:curl_global_init_mem +libcurl-gnutls.so.4:curl_global_sslset +libcurl-gnutls.so.4:curl_maprintf +libcurl-gnutls.so.4:curl_mfprintf +libcurl-gnutls.so.4:curl_mime_addpart +libcurl-gnutls.so.4:curl_mime_data +libcurl-gnutls.so.4:curl_mime_data_cb +libcurl-gnutls.so.4:curl_mime_encoder +libcurl-gnutls.so.4:curl_mime_filedata +libcurl-gnutls.so.4:curl_mime_filename +libcurl-gnutls.so.4:curl_mime_free +libcurl-gnutls.so.4:curl_mime_headers +libcurl-gnutls.so.4:curl_mime_init +libcurl-gnutls.so.4:curl_mime_name +libcurl-gnutls.so.4:curl_mime_subparts +libcurl-gnutls.so.4:curl_mime_type +libcurl-gnutls.so.4:curl_mprintf +libcurl-gnutls.so.4:curl_msnprintf +libcurl-gnutls.so.4:curl_msprintf +libcurl-gnutls.so.4:curl_multi_add_handle +libcurl-gnutls.so.4:curl_multi_assign +libcurl-gnutls.so.4:curl_multi_cleanup +libcurl-gnutls.so.4:curl_multi_fdset +libcurl-gnutls.so.4:curl_multi_info_read +libcurl-gnutls.so.4:curl_multi_init +libcurl-gnutls.so.4:curl_multi_perform +libcurl-gnutls.so.4:curl_multi_poll +libcurl-gnutls.so.4:curl_multi_remove_handle +libcurl-gnutls.so.4:curl_multi_setopt +libcurl-gnutls.so.4:curl_multi_socket +libcurl-gnutls.so.4:curl_multi_socket_action +libcurl-gnutls.so.4:curl_multi_socket_all +libcurl-gnutls.so.4:curl_multi_strerror +libcurl-gnutls.so.4:curl_multi_timeout +libcurl-gnutls.so.4:curl_multi_wait +libcurl-gnutls.so.4:curl_multi_wakeup +libcurl-gnutls.so.4:curl_mvaprintf +libcurl-gnutls.so.4:curl_mvfprintf +libcurl-gnutls.so.4:curl_mvprintf +libcurl-gnutls.so.4:curl_mvsnprintf +libcurl-gnutls.so.4:curl_mvsprintf +libcurl-gnutls.so.4:curl_pushheader_byname +libcurl-gnutls.so.4:curl_pushheader_bynum +libcurl-gnutls.so.4:curl_share_cleanup +libcurl-gnutls.so.4:curl_share_init +libcurl-gnutls.so.4:curl_share_setopt +libcurl-gnutls.so.4:curl_share_strerror +libcurl-gnutls.so.4:curl_slist_append +libcurl-gnutls.so.4:curl_slist_free_all +libcurl-gnutls.so.4:curl_strequal +libcurl-gnutls.so.4:curl_strnequal +libcurl-gnutls.so.4:curl_unescape +libcurl-gnutls.so.4:curl_url +libcurl-gnutls.so.4:curl_url_cleanup +libcurl-gnutls.so.4:curl_url_dup +libcurl-gnutls.so.4:curl_url_get +libcurl-gnutls.so.4:curl_url_set +libcurl-gnutls.so.4:curl_url_strerror +libcurl-gnutls.so.4:curl_version +libcurl-gnutls.so.4:curl_version_info libcurl.so.4:curl_easy_cleanup libcurl.so.4:curl_easy_duphandle libcurl.so.4:curl_easy_escape diff --git a/abi_used_libs b/abi_used_libs --- a/abi_used_libs +++ b/abi_used_libs @@ -1,6 +1,8 @@ libc.so.6 libcrypto.so.1.1 +libgnutls.so.30 libgssapi_krb5.so.2 +libnettle.so.8 libnghttp2.so.14 libssh2.so.1 libssl.so.1.1 diff --git a/abi_used_libs32 b/abi_used_libs32 --- a/abi_used_libs32 +++ b/abi_used_libs32 @@ -1,6 +1,8 @@ libc.so.6 libcrypto.so.1.1 +libgnutls.so.30 libgssapi_krb5.so.2 +libnettle.so.8 libssh2.so.1 libssl.so.1.1 libz.so.1 diff --git a/abi_used_symbols b/abi_used_symbols --- a/abi_used_symbols +++ b/abi_used_symbols @@ -280,6 +280,77 @@ libcrypto.so.1.1:i2a_ASN1_OBJECT libcrypto.so.1.1:i2d_X509_PUBKEY libcrypto.so.1.1:i2t_ASN1_OBJECT +libgnutls.so.30:gnutls_alert_get +libgnutls.so.30:gnutls_alert_get_name +libgnutls.so.30:gnutls_alpn_get_selected_protocol +libgnutls.so.30:gnutls_alpn_set_protocols +libgnutls.so.30:gnutls_bye +libgnutls.so.30:gnutls_certificate_allocate_credentials +libgnutls.so.30:gnutls_certificate_free_credentials +libgnutls.so.30:gnutls_certificate_get_peers +libgnutls.so.30:gnutls_certificate_set_verify_flags +libgnutls.so.30:gnutls_certificate_set_x509_crl_file +libgnutls.so.30:gnutls_certificate_set_x509_key_file +libgnutls.so.30:gnutls_certificate_set_x509_key_file2 +libgnutls.so.30:gnutls_certificate_set_x509_trust_dir +libgnutls.so.30:gnutls_certificate_set_x509_trust_file +libgnutls.so.30:gnutls_certificate_verify_peers2 +libgnutls.so.30:gnutls_check_version +libgnutls.so.30:gnutls_cipher_get +libgnutls.so.30:gnutls_cipher_suite_get_name +libgnutls.so.30:gnutls_credentials_set +libgnutls.so.30:gnutls_deinit +libgnutls.so.30:gnutls_error_is_fatal +libgnutls.so.30:gnutls_free +libgnutls.so.30:gnutls_global_deinit +libgnutls.so.30:gnutls_global_init +libgnutls.so.30:gnutls_handshake +libgnutls.so.30:gnutls_init +libgnutls.so.30:gnutls_kx_get +libgnutls.so.30:gnutls_mac_get +libgnutls.so.30:gnutls_ocsp_resp_deinit +libgnutls.so.30:gnutls_ocsp_resp_get_single +libgnutls.so.30:gnutls_ocsp_resp_import +libgnutls.so.30:gnutls_ocsp_resp_init +libgnutls.so.30:gnutls_ocsp_status_request_enable_client +libgnutls.so.30:gnutls_ocsp_status_request_get +libgnutls.so.30:gnutls_ocsp_status_request_is_checked +libgnutls.so.30:gnutls_pk_algorithm_get_name +libgnutls.so.30:gnutls_priority_set_direct +libgnutls.so.30:gnutls_protocol_get_name +libgnutls.so.30:gnutls_protocol_get_version +libgnutls.so.30:gnutls_pubkey_deinit +libgnutls.so.30:gnutls_pubkey_export +libgnutls.so.30:gnutls_pubkey_import_x509 +libgnutls.so.30:gnutls_pubkey_init +libgnutls.so.30:gnutls_record_check_pending +libgnutls.so.30:gnutls_record_get_direction +libgnutls.so.30:gnutls_record_recv +libgnutls.so.30:gnutls_record_send +libgnutls.so.30:gnutls_rnd +libgnutls.so.30:gnutls_server_name_set +libgnutls.so.30:gnutls_session_get_data +libgnutls.so.30:gnutls_session_set_data +libgnutls.so.30:gnutls_set_default_priority +libgnutls.so.30:gnutls_srp_allocate_client_credentials +libgnutls.so.30:gnutls_srp_free_client_credentials +libgnutls.so.30:gnutls_srp_set_client_credentials +libgnutls.so.30:gnutls_strerror +libgnutls.so.30:gnutls_transport_set_ptr +libgnutls.so.30:gnutls_transport_set_pull_function +libgnutls.so.30:gnutls_transport_set_push_function +libgnutls.so.30:gnutls_x509_crt_check_hostname +libgnutls.so.30:gnutls_x509_crt_check_issuer +libgnutls.so.30:gnutls_x509_crt_deinit +libgnutls.so.30:gnutls_x509_crt_get_activation_time +libgnutls.so.30:gnutls_x509_crt_get_dn2 +libgnutls.so.30:gnutls_x509_crt_get_dn_by_oid +libgnutls.so.30:gnutls_x509_crt_get_expiration_time +libgnutls.so.30:gnutls_x509_crt_get_issuer_dn2 +libgnutls.so.30:gnutls_x509_crt_get_pk_algorithm +libgnutls.so.30:gnutls_x509_crt_get_version +libgnutls.so.30:gnutls_x509_crt_import +libgnutls.so.30:gnutls_x509_crt_init libgssapi_krb5.so.2:GSS_C_NT_HOSTBASED_SERVICE libgssapi_krb5.so.2:gss_delete_sec_context libgssapi_krb5.so.2:gss_display_name @@ -291,6 +362,17 @@ libgssapi_krb5.so.2:gss_release_name libgssapi_krb5.so.2:gss_unwrap libgssapi_krb5.so.2:gss_wrap +libnettle.so.8:nettle_des_encrypt +libnettle.so.8:nettle_des_set_key +libnettle.so.8:nettle_md4_digest +libnettle.so.8:nettle_md4_init +libnettle.so.8:nettle_md4_update +libnettle.so.8:nettle_md5_digest +libnettle.so.8:nettle_md5_init +libnettle.so.8:nettle_md5_update +libnettle.so.8:nettle_sha256_digest +libnettle.so.8:nettle_sha256_init +libnettle.so.8:nettle_sha256_update libnghttp2.so.14:nghttp2_http2_strerror libnghttp2.so.14:nghttp2_is_fatal libnghttp2.so.14:nghttp2_pack_settings_payload diff --git a/abi_used_symbols32 b/abi_used_symbols32 --- a/abi_used_symbols32 +++ b/abi_used_symbols32 @@ -1,3 +1,4 @@ +libc.so.6:__ctype_b_loc libc.so.6:__ctype_tolower_loc libc.so.6:__errno_location libc.so.6:__fdelt_chk @@ -258,6 +259,77 @@ libcrypto.so.1.1:i2a_ASN1_OBJECT libcrypto.so.1.1:i2d_X509_PUBKEY libcrypto.so.1.1:i2t_ASN1_OBJECT +libgnutls.so.30:gnutls_alert_get +libgnutls.so.30:gnutls_alert_get_name +libgnutls.so.30:gnutls_alpn_get_selected_protocol +libgnutls.so.30:gnutls_alpn_set_protocols +libgnutls.so.30:gnutls_bye +libgnutls.so.30:gnutls_certificate_allocate_credentials +libgnutls.so.30:gnutls_certificate_free_credentials +libgnutls.so.30:gnutls_certificate_get_peers +libgnutls.so.30:gnutls_certificate_set_verify_flags +libgnutls.so.30:gnutls_certificate_set_x509_crl_file +libgnutls.so.30:gnutls_certificate_set_x509_key_file +libgnutls.so.30:gnutls_certificate_set_x509_key_file2 +libgnutls.so.30:gnutls_certificate_set_x509_trust_dir +libgnutls.so.30:gnutls_certificate_set_x509_trust_file +libgnutls.so.30:gnutls_certificate_verify_peers2 +libgnutls.so.30:gnutls_check_version +libgnutls.so.30:gnutls_cipher_get +libgnutls.so.30:gnutls_cipher_suite_get_name +libgnutls.so.30:gnutls_credentials_set +libgnutls.so.30:gnutls_deinit +libgnutls.so.30:gnutls_error_is_fatal +libgnutls.so.30:gnutls_free +libgnutls.so.30:gnutls_global_deinit +libgnutls.so.30:gnutls_global_init +libgnutls.so.30:gnutls_handshake +libgnutls.so.30:gnutls_init +libgnutls.so.30:gnutls_kx_get +libgnutls.so.30:gnutls_mac_get +libgnutls.so.30:gnutls_ocsp_resp_deinit +libgnutls.so.30:gnutls_ocsp_resp_get_single +libgnutls.so.30:gnutls_ocsp_resp_import +libgnutls.so.30:gnutls_ocsp_resp_init +libgnutls.so.30:gnutls_ocsp_status_request_enable_client +libgnutls.so.30:gnutls_ocsp_status_request_get +libgnutls.so.30:gnutls_ocsp_status_request_is_checked +libgnutls.so.30:gnutls_pk_algorithm_get_name +libgnutls.so.30:gnutls_priority_set_direct +libgnutls.so.30:gnutls_protocol_get_name +libgnutls.so.30:gnutls_protocol_get_version +libgnutls.so.30:gnutls_pubkey_deinit +libgnutls.so.30:gnutls_pubkey_export +libgnutls.so.30:gnutls_pubkey_import_x509 +libgnutls.so.30:gnutls_pubkey_init +libgnutls.so.30:gnutls_record_check_pending +libgnutls.so.30:gnutls_record_get_direction +libgnutls.so.30:gnutls_record_recv +libgnutls.so.30:gnutls_record_send +libgnutls.so.30:gnutls_rnd +libgnutls.so.30:gnutls_server_name_set +libgnutls.so.30:gnutls_session_get_data +libgnutls.so.30:gnutls_session_set_data +libgnutls.so.30:gnutls_set_default_priority +libgnutls.so.30:gnutls_srp_allocate_client_credentials +libgnutls.so.30:gnutls_srp_free_client_credentials +libgnutls.so.30:gnutls_srp_set_client_credentials +libgnutls.so.30:gnutls_strerror +libgnutls.so.30:gnutls_transport_set_ptr +libgnutls.so.30:gnutls_transport_set_pull_function +libgnutls.so.30:gnutls_transport_set_push_function +libgnutls.so.30:gnutls_x509_crt_check_hostname +libgnutls.so.30:gnutls_x509_crt_check_issuer +libgnutls.so.30:gnutls_x509_crt_deinit +libgnutls.so.30:gnutls_x509_crt_get_activation_time +libgnutls.so.30:gnutls_x509_crt_get_dn2 +libgnutls.so.30:gnutls_x509_crt_get_dn_by_oid +libgnutls.so.30:gnutls_x509_crt_get_expiration_time +libgnutls.so.30:gnutls_x509_crt_get_issuer_dn2 +libgnutls.so.30:gnutls_x509_crt_get_pk_algorithm +libgnutls.so.30:gnutls_x509_crt_get_version +libgnutls.so.30:gnutls_x509_crt_import +libgnutls.so.30:gnutls_x509_crt_init libgssapi_krb5.so.2:GSS_C_NT_HOSTBASED_SERVICE libgssapi_krb5.so.2:gss_delete_sec_context libgssapi_krb5.so.2:gss_display_name @@ -269,6 +341,17 @@ libgssapi_krb5.so.2:gss_release_name libgssapi_krb5.so.2:gss_unwrap libgssapi_krb5.so.2:gss_wrap +libnettle.so.8:nettle_des_encrypt +libnettle.so.8:nettle_des_set_key +libnettle.so.8:nettle_md4_digest +libnettle.so.8:nettle_md4_init +libnettle.so.8:nettle_md4_update +libnettle.so.8:nettle_md5_digest +libnettle.so.8:nettle_md5_init +libnettle.so.8:nettle_md5_update +libnettle.so.8:nettle_sha256_digest +libnettle.so.8:nettle_sha256_init +libnettle.so.8:nettle_sha256_update libssh2.so.1:libssh2_agent_connect libssh2.so.1:libssh2_agent_disconnect libssh2.so.1:libssh2_agent_free diff --git a/package.yml b/package.yml --- a/package.yml +++ b/package.yml @@ -1,24 +1,34 @@ name : curl version : 7.82.0 -release : 73 +release : 74 source : - https://github.com/curl/curl/releases/download/curl-7_82_0/curl-7.82.0.tar.xz : 0aaa12d7bd04b0966254f2703ce80dd5c38dbbd76af0297d3d690cdce58a583c homepage : https://curl.haxx.se license : MIT -component : system.base +component : + - system.base + - gnutls : binary.compat + - gnutls-32bit : binary.compat +summary : + - Get a file from an HTTP, HTTPS or FTP server + - gnutls : GnuTLS version of curl + - gnutls-32bit : GnuTLS version of curl +description: + - curl is a client to get files from servers using any of the supported protocols. The command is designed to work without user interaction or any kind of interactivity. curl offers a busload of useful tricks like proxy support, user authentication, ftp upload, HTTP post, file transfer resume and more. + - gnutls : This package provides binary compatibility only and enables the running of content expecting a GnuTLS version of curl. It is forbidden to build against it. + - gnutls-32bit : This package provides binary compatibility only and enables the running of content expecting a GnuTLS version of curl. It is forbidden to build against it. emul32 : yes -summary : Get a file from an HTTP, HTTPS or FTP server -description: | - curl is a client to get files from servers using any of the supported protocols. The command is designed to work without user interaction or any kind of interactivity. curl offers a busload of useful tricks like proxy support, user authentication, ftp upload, HTTP post, file transfer resume and more. builddeps : - pkgconfig32(com_err) + - pkgconfig32(gnutls) - pkgconfig32(krb5) - pkgconfig32(libssh2) - pkgconfig32(libzstd) - pkgconfig32(zlib) - pkgconfig(libnghttp2) - groff - - openssh-server + - openssh-server # Check. + - patchelf rundeps : - devel : - kerberos-devel @@ -29,22 +39,48 @@ - libssh2-32bit-devel setup : | %patch -p1 < $pkgfiles/fix-cn-check-error-code.patch - %reconfigure --disable-static \ - --enable-threaded-resolver \ - --without-gnutls \ - --enable-libcurl-option \ - --with-ca-path=/etc/ssl/certs \ - --with-libssh2 \ - --with-openssl \ - --with-gssapi + mkdir main gnutls + common="\ + --disable-static \ + --enable-threaded-resolver \ + --with-ca-path=/etc/ssl/certs" + + cd $workdir/main + ../configure %CONFOPTS% $common \ + --with-libssh2 \ + --with-openssl \ + --with-gssapi \ + --without-gnutls + + cd $workdir/gnutls + ../configure %CONFOPTS% $common \ + --with-gnutls \ + --without-openssl build : | - %make - %make -C scripts + %make -C main + %make -C main/scripts + %make -C gnutls/lib + %make_install -C gnutls/lib DESTDIR=$workdir/gnutlsinst install : | - %make_install - %make_install -C scripts + %make_install -C main + %make_install -C main/scripts + + pushd $workdir/gnutlsinst/%libdir% + # Forbid linking against curl-gnutls. + rm *.{la,so} + for lib in *; do + # Don't collide with OpenSSL-based curl. + gnuname=$(echo $lib | sed 's|libcurl|libcurl-gnutls|') + if [ -L $lib ]; then + patchelf --set-soname $gnuname $lib + fi + mv $lib $gnuname + done + popd + cp -a $workdir/gnutlsinst/* $installdir check : | - %make -k check + %make check -C main patterns : - - /usr/share/man - devel : /usr/share/aclocal/libcurl.m4 + - gnutls : /usr/lib64/libcurl-gnutls* + - gnutls-32bit : /usr/lib32/libcurl-gnutls* diff --git a/pspec_x86_64.xml b/pspec_x86_64.xml --- a/pspec_x86_64.xml +++ b/pspec_x86_64.xml @@ -3,21 +3,19 @@ curl https://curl.haxx.se - Joey Riches - josephriches@gmail.com + Fabio Forni + livingsilver94.solus@redaril.me MIT system.base Get a file from an HTTP, HTTPS or FTP server - curl is a client to get files from servers using any of the supported protocols. The command is designed to work without user interaction or any kind of interactivity. curl offers a busload of useful tricks like proxy support, user authentication, ftp upload, HTTP post, file transfer resume and more. - + curl is a client to get files from servers using any of the supported protocols. The command is designed to work without user interaction or any kind of interactivity. curl offers a busload of useful tricks like proxy support, user authentication, ftp upload, HTTP post, file transfer resume and more. https://getsol.us/sources/README.Solus curl Get a file from an HTTP, HTTPS or FTP server - curl is a client to get files from servers using any of the supported protocols. The command is designed to work without user interaction or any kind of interactivity. curl offers a busload of useful tricks like proxy support, user authentication, ftp upload, HTTP post, file transfer resume and more. - + curl is a client to get files from servers using any of the supported protocols. The command is designed to work without user interaction or any kind of interactivity. curl offers a busload of useful tricks like proxy support, user authentication, ftp upload, HTTP post, file transfer resume and more. system.base /usr/bin/curl @@ -503,11 +501,10 @@ curl-32bit 32-bit libraries for curl - curl is a client to get files from servers using any of the supported protocols. The command is designed to work without user interaction or any kind of interactivity. curl offers a busload of useful tricks like proxy support, user authentication, ftp upload, HTTP post, file transfer resume and more. - + curl is a client to get files from servers using any of the supported protocols. The command is designed to work without user interaction or any kind of interactivity. curl offers a busload of useful tricks like proxy support, user authentication, ftp upload, HTTP post, file transfer resume and more. emul32 - curl + curl /usr/lib32/libcurl.so.4 @@ -517,12 +514,11 @@ curl-32bit-devel Development files for 32-bit curl - curl is a client to get files from servers using any of the supported protocols. The command is designed to work without user interaction or any kind of interactivity. curl offers a busload of useful tricks like proxy support, user authentication, ftp upload, HTTP post, file transfer resume and more. - + curl is a client to get files from servers using any of the supported protocols. The command is designed to work without user interaction or any kind of interactivity. curl offers a busload of useful tricks like proxy support, user authentication, ftp upload, HTTP post, file transfer resume and more. programming.devel - curl-32bit - curl-devel + curl-32bit + curl-devel /usr/lib32/libcurl.so @@ -532,11 +528,10 @@ curl-devel Development files for curl - curl is a client to get files from servers using any of the supported protocols. The command is designed to work without user interaction or any kind of interactivity. curl offers a busload of useful tricks like proxy support, user authentication, ftp upload, HTTP post, file transfer resume and more. - + curl is a client to get files from servers using any of the supported protocols. The command is designed to work without user interaction or any kind of interactivity. curl offers a busload of useful tricks like proxy support, user authentication, ftp upload, HTTP post, file transfer resume and more. programming.devel - curl + curl /usr/include/curl/curl.h @@ -554,13 +549,33 @@ /usr/share/aclocal/libcurl.m4 + + curl-gnutls + GnuTLS version of curl + This package provides binary compatibility only and enables the running of content expecting a GnuTLS version of curl. It is forbidden to build against it. + binary.compat + + /usr/lib64/libcurl-gnutls.so.4 + /usr/lib64/libcurl-gnutls.so.4.7.0 + + + + curl-gnutls-32bit + GnuTLS version of curl + This package provides binary compatibility only and enables the running of content expecting a GnuTLS version of curl. It is forbidden to build against it. + binary.compat + + /usr/lib32/libcurl-gnutls.so.4 + /usr/lib32/libcurl-gnutls.so.4.7.0 + + - - 2022-04-26 + + 2022-04-30 7.82.0 Packaging update - Joey Riches - josephriches@gmail.com + Fabio Forni + livingsilver94.solus@redaril.me \ No newline at end of file