diff --git a/.gitignore b/.gitignore index cc4c239..616ce22 100644 --- a/.gitignore +++ b/.gitignore @@ -35,3 +35,4 @@ /curl-sys-0.4.56+curl-7.83.1.crate /curl-sys-0.4.59+curl-7.86.0.crate /curl-sys-0.4.60+curl-7.88.1.crate +/curl-sys-0.4.63+curl-8.1.2.crate diff --git a/0001-unconditionally-use-pkg-config-to-link-with-system-l.patch b/0001-unconditionally-use-pkg-config-to-link-with-system-l.patch index d6cdd4c..fe34528 100644 --- a/0001-unconditionally-use-pkg-config-to-link-with-system-l.patch +++ b/0001-unconditionally-use-pkg-config-to-link-with-system-l.patch @@ -1,17 +1,17 @@ -From 28cabd6e1bb96e88105f57df1c7126f68899261d Mon Sep 17 00:00:00 2001 +From e3d51c5adba339fe2f1f2434399db940a666034e Mon Sep 17 00:00:00 2001 From: Fabio Valentini -Date: Tue, 28 Feb 2023 12:43:36 +0100 +Date: Mon, 12 Jun 2023 14:10:33 +0200 Subject: [PATCH] unconditionally use pkg-config to link with system libcurl --- - build.rs | 587 +------------------------------------------------------ - 1 file changed, 5 insertions(+), 582 deletions(-) + build.rs | 582 +------------------------------------------------------ + 1 file changed, 5 insertions(+), 577 deletions(-) diff --git a/build.rs b/build.rs -index e09ae14..0df5044 100644 +index aae0ac6..497789c 100644 --- a/build.rs +++ b/build.rs -@@ -1,610 +1,33 @@ +@@ -1,606 +1,34 @@ -use std::env; -use std::fs; -use std::path::{Path, PathBuf}; @@ -19,7 +19,6 @@ index e09ae14..0df5044 100644 fn main() { - println!("cargo:rerun-if-changed=curl"); -- let host = env::var("HOST").unwrap(); - let target = env::var("TARGET").unwrap(); - let windows = target.contains("windows"); - @@ -34,13 +33,6 @@ index e09ae14..0df5044 100644 - return println!("cargo:rustc-flags=-l curl"); - } - -- // When cross-compiling for Haiku, use the system's default supplied -- // libcurl (it supports http2). This is in the case where rustc and -- // cargo are built for Haiku, which is done from a Linux host. -- if host != target && target.contains("haiku") { -- return println!("cargo:rustc-flags=-l curl"); -- } -- - // If the static-curl feature is disabled, probe for a system-wide libcurl. - if !cfg!(feature = "static-curl") { - // OSX ships libcurl by default, so we just use that version @@ -122,7 +114,7 @@ index e09ae14..0df5044 100644 - .replace("@LIBCURL_LIBS@", "") - .replace("@SUPPORT_FEATURES@", "") - .replace("@SUPPORT_PROTOCOLS@", "") -- .replace("@CURLVERSION@", "7.88.1"), +- .replace("@CURLVERSION@", "8.1.2"), - ) - .unwrap(); - @@ -154,9 +146,12 @@ index e09ae14..0df5044 100644 - .file("curl/lib/asyn-thread.c") - .file("curl/lib/altsvc.c") - .file("curl/lib/base64.c") +- .file("curl/lib/bufq.c") - .file("curl/lib/bufref.c") - .file("curl/lib/cfilters.c") -- .file("curl/lib/cf-http.c") +- .file("curl/lib/cf-h1-proxy.c") +- .file("curl/lib/cf-haproxy.c") +- .file("curl/lib/cf-https-connect.c") - .file("curl/lib/cf-socket.c") - .file("curl/lib/conncache.c") - .file("curl/lib/connect.c") @@ -170,6 +165,7 @@ index e09ae14..0df5044 100644 - .file("curl/lib/curl_threads.c") - .file("curl/lib/doh.c") - .file("curl/lib/dynbuf.c") +- .file("curl/lib/dynhds.c") - .file("curl/lib/easy.c") - .file("curl/lib/escape.c") - .file("curl/lib/file.c") @@ -186,6 +182,7 @@ index e09ae14..0df5044 100644 - .file("curl/lib/hostip6.c") - .file("curl/lib/hsts.c") - .file("curl/lib/http.c") +- .file("curl/lib/http1.c") - .file("curl/lib/http_aws_sigv4.c") - .file("curl/lib/http_chunks.c") - .file("curl/lib/http_digest.c") @@ -237,7 +234,6 @@ index e09ae14..0df5044 100644 - .file("curl/lib/vtls/keylog.c") - .file("curl/lib/vtls/vtls.c") - .file("curl/lib/warnless.c") -- .file("curl/lib/wildcard.c") - .file("curl/lib/timediff.c") - .define("HAVE_GETADDRINFO", None) - .define("HAVE_GETPEERNAME", None) @@ -270,7 +266,7 @@ index e09ae14..0df5044 100644 - if cfg!(feature = "http2") { - cfg.define("USE_NGHTTP2", None) - .define("NGHTTP2_STATICLIB", None) -- .file("curl/lib/h2h3.c") +- .file("curl/lib/cf-h2-proxy.c") - .file("curl/lib/http2.c"); - - println!("cargo:rustc-cfg=link_libnghttp2"); @@ -596,7 +592,7 @@ index e09ae14..0df5044 100644 - ); return false; } -- + true } - @@ -628,5 +624,5 @@ index e09ae14..0df5044 100644 - None -} -- -2.39.2 +2.41.0 diff --git a/curl-sys-fix-metadata-auto.diff b/curl-sys-fix-metadata-auto.diff index 9622d51..69a65a7 100644 --- a/curl-sys-fix-metadata-auto.diff +++ b/curl-sys-fix-metadata-auto.diff @@ -1,5 +1,5 @@ ---- curl-sys-0.4.60+curl-7.88.1/Cargo.toml 1970-01-01T00:00:01+00:00 -+++ curl-sys-0.4.60+curl-7.88.1/Cargo.toml 2023-02-28T11:35:04.050827+00:00 +--- curl-sys-0.4.63+curl-8.1.2/Cargo.toml 1970-01-01T00:00:01+00:00 ++++ curl-sys-0.4.63+curl-8.1.2/Cargo.toml 2023-06-12T12:01:26.405394+00:00 @@ -73,16 +73,6 @@ version = "0.9" optional = true diff --git a/curl-sys-fix-metadata.diff b/curl-sys-fix-metadata.diff index 9261e50..670fc02 100644 --- a/curl-sys-fix-metadata.diff +++ b/curl-sys-fix-metadata.diff @@ -1,11 +1,11 @@ ---- curl-sys-0.4.60+curl-7.88.1/Cargo.toml 1970-01-01T00:00:01+00:00 -+++ curl-sys-0.4.60+curl-7.88.1/Cargo.toml 2023-02-28T11:40:40.008749+00:00 +--- curl-sys-0.4.63+curl-8.1.2/Cargo.toml 1970-01-01T00:00:01+00:00 ++++ curl-sys-0.4.63+curl-8.1.2/Cargo.toml 2023-06-12T12:02:48.309675+00:00 @@ -12,7 +12,7 @@ [package] edition = "2018" name = "curl-sys" --version = "0.4.60+curl-7.88.1" -+version = "0.4.60" +-version = "0.4.63+curl-8.1.2" ++version = "0.4.63" authors = ["Alex Crichton "] build = "build.rs" links = "curl" diff --git a/rust-curl-sys.spec b/rust-curl-sys.spec index f38639a..8a2f738 100644 --- a/rust-curl-sys.spec +++ b/rust-curl-sys.spec @@ -3,10 +3,10 @@ %global debug_package %{nil} %global crate curl-sys -%global crate_version 0.4.60+curl-7.88.1 +%global crate_version 0.4.63+curl-8.1.2 Name: rust-curl-sys -Version: 0.4.60 +Version: 0.4.63 Release: %autorelease Summary: Native bindings to the libcurl library @@ -158,7 +158,7 @@ use the "upkeep_7_62_0" feature of the "%{crate}" crate. %prep %autosetup -n %{crate}-%{crate_version} -p1 # remove bundled curl sources -rm -vr curl +rm -vr curl/ %cargo_prep %generate_buildrequires diff --git a/sources b/sources index 088c217..0e79e88 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (curl-sys-0.4.60+curl-7.88.1.crate) = de9cc21903a82f17b17bed296077961d71cea948e151a2166498f98c47c44d0ff1ac3992a16e8c388f877a9d92891e4d08e35f18cf64bc9653b787bcd3c87296 +SHA512 (curl-sys-0.4.63+curl-8.1.2.crate) = 50d2cacce02135dc316389eb2c486226f54c930bab26ca732d88b99970112a5528ec0bdd0e98bb82b17a8ed4db56ac82385bb36dbf5049aad376f930a5bfaaf5