diff --git a/.gitignore b/.gitignore index 8ae80a2..7fbcce6 100644 --- a/.gitignore +++ b/.gitignore @@ -40,3 +40,4 @@ /curl-sys-0.4.66+curl-8.3.0.crate /curl-sys-0.4.68+curl-8.4.0.crate /curl-sys-0.4.70+curl-8.5.0.crate +/curl-sys-0.4.72+curl-8.6.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 d1ed42e..0cefb4c 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 fd991562a64708318e9750c1c0345b91a9cd22d2 Mon Sep 17 00:00:00 2001 +From d679b1712f7cd346d16378adf051863b78645402 Mon Sep 17 00:00:00 2001 From: Fabio Valentini -Date: Tue, 17 Oct 2023 13:21:16 +0200 +Date: Thu, 25 Apr 2024 17:03:41 +0200 Subject: [PATCH] unconditionally use pkg-config to link with system libcurl --- - build.rs | 584 +------------------------------------------------------ - 1 file changed, 5 insertions(+), 579 deletions(-) + build.rs | 586 +------------------------------------------------------ + 1 file changed, 5 insertions(+), 581 deletions(-) diff --git a/build.rs b/build.rs -index 17a6861..497789c 100644 +index 7cc5831..497789c 100644 --- a/build.rs +++ b/build.rs -@@ -1,608 +1,34 @@ +@@ -1,610 +1,34 @@ -use std::env; -use std::fs; -use std::path::{Path, PathBuf}; @@ -114,7 +114,7 @@ index 17a6861..497789c 100644 - .replace("@LIBCURL_LIBS@", "") - .replace("@SUPPORT_FEATURES@", "") - .replace("@SUPPORT_PROTOCOLS@", "") -- .replace("@CURLVERSION@", "8.5.0"), +- .replace("@CURLVERSION@", "8.6.0"), - ) - .unwrap(); - @@ -229,8 +229,10 @@ index 17a6861..497789c 100644 - .file("curl/lib/vauth/vauth.c") - .file("curl/lib/vquic/curl_msh3.c") - .file("curl/lib/vquic/curl_ngtcp2.c") +- .file("curl/lib/vquic/curl_osslq.c") - .file("curl/lib/vquic/curl_quiche.c") - .file("curl/lib/vquic/vquic.c") +- .file("curl/lib/vquic/vquic-tls.c") - .file("curl/lib/vtls/hostcheck.c") - .file("curl/lib/vtls/keylog.c") - .file("curl/lib/vtls/vtls.c") @@ -626,5 +628,5 @@ index 17a6861..497789c 100644 - None -} -- -2.43.0 +2.44.0 diff --git a/curl-sys-fix-metadata-auto.diff b/curl-sys-fix-metadata-auto.diff index 4e0b3f4..a96ba1c 100644 --- a/curl-sys-fix-metadata-auto.diff +++ b/curl-sys-fix-metadata-auto.diff @@ -1,11 +1,11 @@ ---- curl-sys-0.4.70+curl-8.5.0/Cargo.toml 1970-01-01T00:00:01+00:00 -+++ curl-sys-0.4.70+curl-8.5.0/Cargo.toml 2024-01-13T14:56:26.426384+00:00 +--- curl-sys-0.4.72+curl-8.6.0/Cargo.toml 1970-01-01T00:00:01+00:00 ++++ curl-sys-0.4.72+curl-8.6.0/Cargo.toml 2024-04-25T14:55:40.389679+00:00 @@ -12,7 +12,7 @@ [package] edition = "2018" name = "curl-sys" --version = "0.4.70+curl-8.5.0" -+version = "0.4.70" +-version = "0.4.72+curl-8.6.0" ++version = "0.4.72" authors = ["Alex Crichton "] build = "build.rs" links = "curl" @@ -17,7 +17,7 @@ -version = "0.2" - -[target."cfg(windows)".dependencies.windows-sys] --version = "0.48" +-version = "0.52" -features = ["Win32_Networking_WinSock"] - [badges.appveyor] diff --git a/curl-sys-fix-metadata.diff b/curl-sys-fix-metadata.diff index 95a66b3..10b6a97 100644 --- a/curl-sys-fix-metadata.diff +++ b/curl-sys-fix-metadata.diff @@ -1,5 +1,5 @@ ---- curl-sys-0.4.70+curl-8.5.0/Cargo.toml 1970-01-01T00:00:01+00:00 -+++ curl-sys-0.4.70+curl-8.5.0/Cargo.toml 2024-01-13T14:57:15.083595+00:00 +--- curl-sys-0.4.72+curl-8.6.0/Cargo.toml 1970-01-01T00:00:01+00:00 ++++ curl-sys-0.4.72+curl-8.6.0/Cargo.toml 2024-04-25T14:56:04.961800+00:00 @@ -29,20 +29,6 @@ [dependencies.libc] version = "0.2.2" diff --git a/rust-curl-sys.spec b/rust-curl-sys.spec index a592c3d..6533d69 100644 --- a/rust-curl-sys.spec +++ b/rust-curl-sys.spec @@ -1,12 +1,12 @@ -# Generated by rust2rpm 25 +# Generated by rust2rpm 26 %bcond_without check %global debug_package %{nil} %global crate curl-sys -%global upstream_version 0.4.70+curl-8.5.0 +%global upstream_version 0.4.72+curl-8.6.0 Name: rust-curl-sys -Version: 0.4.70 +Version: 0.4.72 Release: %autorelease Summary: Native bindings to the libcurl library @@ -27,6 +27,7 @@ Patch: curl-sys-fix-metadata.diff Patch: 0001-unconditionally-use-pkg-config-to-link-with-system-l.patch BuildRequires: cargo-rpm-macros >= 24 +BuildRequires: pkgconfig(libcurl) %global _description %{expand: Native bindings to the libcurl library.} @@ -163,7 +164,6 @@ rm -vr curl/ %generate_buildrequires %cargo_generate_buildrequires -echo 'pkgconfig(libcurl)' %build %cargo_build diff --git a/sources b/sources index a439948..75009c5 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (curl-sys-0.4.70+curl-8.5.0.crate) = 349fb40ef95da3595425056c44bac9bf122f8e9b2095fbe0f2ea7442460cc40ad49bc30b7aec5961cd625d804348306971d53783f13208e6813158c9096e58b4 +SHA512 (curl-sys-0.4.72+curl-8.6.0.crate) = d77db758acab7cacbab724bf9d6f5a3a40083be7290c9b6dfdf91370f1d965e21d8ce01f1d3df79eb40da2ec759c2b0609d3c6176a0517acbcdc5a2bbb66a1ce