From ce6ffa00052cc1dbc1ef08e026ff23845142335a Mon Sep 17 00:00:00 2001 From: Fabio Valentini Date: Tue, 19 Sep 2023 21:05:09 +0200 Subject: [PATCH] Update to version 0.4.66+curl-8.3.0; Fixes RHBZ#2239531 --- .gitignore | 1 + ...lly-use-pkg-config-to-link-with-system-l.patch | 10 +++++----- curl-sys-fix-metadata-auto.diff | 15 ++++++--------- curl-sys-fix-metadata.diff | 8 ++++---- rust-curl-sys.spec | 4 ++-- sources | 2 +- 6 files changed, 19 insertions(+), 21 deletions(-) diff --git a/.gitignore b/.gitignore index f0aa9d4..4b3e4f8 100644 --- a/.gitignore +++ b/.gitignore @@ -37,3 +37,4 @@ /curl-sys-0.4.60+curl-7.88.1.crate /curl-sys-0.4.63+curl-8.1.2.crate /curl-sys-0.4.65+curl-8.2.1.crate +/curl-sys-0.4.66+curl-8.3.0.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 c2e3709..96d8a3b 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,6 +1,6 @@ -From 09efbb01afdad57593abde233df70701ccfff180 Mon Sep 17 00:00:00 2001 +From b0143ab5f65f5ddc83ca25a4a730fefd0b3cbf77 Mon Sep 17 00:00:00 2001 From: Fabio Valentini -Date: Sat, 29 Jul 2023 16:34:22 +0200 +Date: Tue, 19 Sep 2023 21:03:22 +0200 Subject: [PATCH] unconditionally use pkg-config to link with system libcurl --- @@ -8,7 +8,7 @@ Subject: [PATCH] unconditionally use pkg-config to link with system libcurl 1 file changed, 5 insertions(+), 578 deletions(-) diff --git a/build.rs b/build.rs -index 67c2772..497789c 100644 +index b373795..497789c 100644 --- a/build.rs +++ b/build.rs @@ -1,607 +1,34 @@ @@ -114,7 +114,7 @@ index 67c2772..497789c 100644 - .replace("@LIBCURL_LIBS@", "") - .replace("@SUPPORT_FEATURES@", "") - .replace("@SUPPORT_PROTOCOLS@", "") -- .replace("@CURLVERSION@", "8.2.1"), +- .replace("@CURLVERSION@", "8.3.0"), - ) - .unwrap(); - @@ -159,10 +159,10 @@ index 67c2772..497789c 100644 - .file("curl/lib/cookie.c") - .file("curl/lib/curl_addrinfo.c") - .file("curl/lib/curl_get_line.c") -- .file("curl/lib/curl_log.c") - .file("curl/lib/curl_memrchr.c") - .file("curl/lib/curl_range.c") - .file("curl/lib/curl_threads.c") +- .file("curl/lib/curl_trc.c") - .file("curl/lib/doh.c") - .file("curl/lib/dynbuf.c") - .file("curl/lib/dynhds.c") diff --git a/curl-sys-fix-metadata-auto.diff b/curl-sys-fix-metadata-auto.diff index a202cfe..b295260 100644 --- a/curl-sys-fix-metadata-auto.diff +++ b/curl-sys-fix-metadata-auto.diff @@ -1,18 +1,15 @@ ---- curl-sys-0.4.65+curl-8.2.1/Cargo.toml 1970-01-01T00:00:01+00:00 -+++ curl-sys-0.4.65+curl-8.2.1/Cargo.toml 2023-07-29T14:25:50.028197+00:00 -@@ -73,16 +73,6 @@ +--- curl-sys-0.4.66+curl-8.3.0/Cargo.toml 1970-01-01T00:00:01+00:00 ++++ curl-sys-0.4.66+curl-8.3.0/Cargo.toml 2023-09-19T18:57:08.513558+00:00 +@@ -73,13 +73,6 @@ version = "0.9.64" optional = true -[target."cfg(target_env = \"msvc\")".build-dependencies.vcpkg] -version = "0.2" - --[target."cfg(windows)".dependencies.winapi] --version = "0.3" --features = [ -- "winsock2", -- "ws2def", --] +-[target."cfg(windows)".dependencies.windows-sys] +-version = "0.48" +-features = ["Win32_Networking_WinSock"] - [badges.appveyor] repository = "alexcrichton/curl-rust" diff --git a/curl-sys-fix-metadata.diff b/curl-sys-fix-metadata.diff index b9548ac..8b27d1f 100644 --- a/curl-sys-fix-metadata.diff +++ b/curl-sys-fix-metadata.diff @@ -1,11 +1,11 @@ ---- curl-sys-0.4.65+curl-8.2.1/Cargo.toml 1970-01-01T00:00:01+00:00 -+++ curl-sys-0.4.65+curl-8.2.1/Cargo.toml 2023-07-29T14:26:43.338434+00:00 +--- curl-sys-0.4.66+curl-8.3.0/Cargo.toml 1970-01-01T00:00:01+00:00 ++++ curl-sys-0.4.66+curl-8.3.0/Cargo.toml 2023-09-19T18:58:10.795767+00:00 @@ -12,7 +12,7 @@ [package] edition = "2018" name = "curl-sys" --version = "0.4.65+curl-8.2.1" -+version = "0.4.65" +-version = "0.4.66+curl-8.3.0" ++version = "0.4.66" authors = ["Alex Crichton "] build = "build.rs" links = "curl" diff --git a/rust-curl-sys.spec b/rust-curl-sys.spec index ed6d582..35f4e44 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.65+curl-8.2.1 +%global crate_version 0.4.66+curl-8.3.0 Name: rust-curl-sys -Version: 0.4.65 +Version: 0.4.66 Release: %autorelease Summary: Native bindings to the libcurl library diff --git a/sources b/sources index ee890a2..99b52a4 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (curl-sys-0.4.65+curl-8.2.1.crate) = 7e10af5e6e92a9821ffbd6b8823ed7ff2e845795a174bdcb16246c3feca91165d1f17137d3adada3cce80840193028a916a996b696af93a6ab0935471b1d984f +SHA512 (curl-sys-0.4.66+curl-8.3.0.crate) = 2b13381ac0a88e46e0ec009bc5cc7e1ea71c94ea4156d002952e6ecb990e29ddcdb2947b2b7e21fb280823318cb93a8eceeb6e9de438917e65d91a0aa5d297ce