diff --git a/.gitignore b/.gitignore index 7fbcce6..7826da7 100644 --- a/.gitignore +++ b/.gitignore @@ -41,3 +41,4 @@ /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 +/curl-sys-0.4.73+curl-8.8.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 0cefb4c..e73c603 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 d679b1712f7cd346d16378adf051863b78645402 Mon Sep 17 00:00:00 2001 +From 9d4f7c7f5c00875892508e24fe86a1244f038b78 Mon Sep 17 00:00:00 2001 From: Fabio Valentini -Date: Thu, 25 Apr 2024 17:03:41 +0200 +Date: Sun, 7 Jul 2024 15:00:34 +0200 Subject: [PATCH] unconditionally use pkg-config to link with system libcurl --- - build.rs | 586 +------------------------------------------------------ - 1 file changed, 5 insertions(+), 581 deletions(-) + build.rs | 588 +------------------------------------------------------ + 1 file changed, 5 insertions(+), 583 deletions(-) diff --git a/build.rs b/build.rs -index 7cc5831..497789c 100644 +index 407bc25..497789c 100644 --- a/build.rs +++ b/build.rs -@@ -1,610 +1,34 @@ +@@ -1,612 +1,34 @@ -use std::env; -use std::fs; -use std::path::{Path, PathBuf}; @@ -114,7 +114,7 @@ index 7cc5831..497789c 100644 - .replace("@LIBCURL_LIBS@", "") - .replace("@SUPPORT_FEATURES@", "") - .replace("@SUPPORT_PROTOCOLS@", "") -- .replace("@CURLVERSION@", "8.6.0"), +- .replace("@CURLVERSION@", "8.8.0"), - ) - .unwrap(); - @@ -161,8 +161,10 @@ index 7cc5831..497789c 100644 - .file("curl/lib/curl_get_line.c") - .file("curl/lib/curl_memrchr.c") - .file("curl/lib/curl_range.c") +- .file("curl/lib/curl_sha512_256.c") - .file("curl/lib/curl_threads.c") - .file("curl/lib/curl_trc.c") +- .file("curl/lib/cw-out.c") - .file("curl/lib/doh.c") - .file("curl/lib/dynbuf.c") - .file("curl/lib/dynhds.c") @@ -205,6 +207,7 @@ index 7cc5831..497789c 100644 - .file("curl/lib/progress.c") - .file("curl/lib/rand.c") - .file("curl/lib/rename.c") +- .file("curl/lib/request.c") - .file("curl/lib/select.c") - .file("curl/lib/sendf.c") - .file("curl/lib/setopt.c") @@ -248,7 +251,6 @@ index 7cc5831..497789c 100644 - .file("curl/lib/curl_endian.c") - .file("curl/lib/curl_gethostname.c") - .file("curl/lib/curl_ntlm_core.c") -- .file("curl/lib/curl_ntlm_wb.c") - .file("curl/lib/http_ntlm.c") - .file("curl/lib/md4.c") - .file("curl/lib/vauth/ntlm.c") @@ -628,5 +630,5 @@ index 7cc5831..497789c 100644 - None -} -- -2.44.0 +2.45.2 diff --git a/curl-sys-fix-metadata-auto.diff b/curl-sys-fix-metadata-auto.diff index a96ba1c..020a907 100644 --- a/curl-sys-fix-metadata-auto.diff +++ b/curl-sys-fix-metadata-auto.diff @@ -1,15 +1,15 @@ ---- 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 +--- curl-sys-0.4.73+curl-8.8.0/Cargo.toml 1970-01-01T00:00:01+00:00 ++++ curl-sys-0.4.73+curl-8.8.0/Cargo.toml 2024-07-07T12:52:12.629501+00:00 @@ -12,7 +12,7 @@ [package] edition = "2018" name = "curl-sys" --version = "0.4.72+curl-8.6.0" -+version = "0.4.72" +-version = "0.4.73+curl-8.8.0" ++version = "0.4.73" authors = ["Alex Crichton "] build = "build.rs" links = "curl" -@@ -73,15 +73,10 @@ +@@ -77,15 +77,10 @@ version = "0.9.64" optional = true diff --git a/curl-sys-fix-metadata.diff b/curl-sys-fix-metadata.diff index 10b6a97..a80d8dc 100644 --- a/curl-sys-fix-metadata.diff +++ b/curl-sys-fix-metadata.diff @@ -1,6 +1,6 @@ ---- 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 @@ +--- curl-sys-0.4.73+curl-8.8.0/Cargo.toml 1970-01-01T00:00:01+00:00 ++++ curl-sys-0.4.73+curl-8.8.0/Cargo.toml 2024-07-07T12:52:44.962640+00:00 +@@ -33,20 +33,6 @@ [dependencies.libc] version = "0.2.2" @@ -14,14 +14,14 @@ -default-features = false - -[dependencies.rustls-ffi] --version = "0.8" +-version = "0.13" -features = ["no_log_capture"] -optional = true - [build-dependencies.cc] version = "1.0" -@@ -51,23 +37,13 @@ +@@ -55,23 +41,13 @@ [features] default = ["ssl"] diff --git a/rust-curl-sys.spec b/rust-curl-sys.spec index 6533d69..a327157 100644 --- a/rust-curl-sys.spec +++ b/rust-curl-sys.spec @@ -3,10 +3,10 @@ %global debug_package %{nil} %global crate curl-sys -%global upstream_version 0.4.72+curl-8.6.0 +%global upstream_version 0.4.73+curl-8.8.0 Name: rust-curl-sys -Version: 0.4.72 +Version: 0.4.73 Release: %autorelease Summary: Native bindings to the libcurl library @@ -24,7 +24,7 @@ Patch: curl-sys-fix-metadata-auto.diff Patch: curl-sys-fix-metadata.diff # * remove code related to building vendored curl sources # * unconditionally use pkg-config to link with system libcurl -Patch: 0001-unconditionally-use-pkg-config-to-link-with-system-l.patch +Patch10: 0001-unconditionally-use-pkg-config-to-link-with-system-l.patch BuildRequires: cargo-rpm-macros >= 24 BuildRequires: pkgconfig(libcurl) diff --git a/rust2rpm.toml b/rust2rpm.toml index 271e847..3e3321e 100644 --- a/rust2rpm.toml +++ b/rust2rpm.toml @@ -1,4 +1,27 @@ +[package] +cargo-toml-patch-comments = [ + "remove curl version suffix from crate version", + "drop windows-specific features and dependencies", + "drop optional dependencies and unused features (libnghttp2, mesalink)", + "drop rustls support (rustls is not supported on all architectures)", + "drop optional, unused zlib-ng support", +] + +[[package.extra-patches]] +number = 10 +file = "0001-unconditionally-use-pkg-config-to-link-with-system-l.patch" +comments = [ + "remove code related to building vendored curl sources", + "unconditionally use pkg-config to link with system libcurl", +] + [requires] build = ["pkgconfig(libcurl)"] lib = ["pkgconfig(libcurl)"] +[scripts] +prep.post = [ + "# remove bundled curl sources", + "rm -vr curl/", +] + diff --git a/sources b/sources index 75009c5..bab8d4d 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (curl-sys-0.4.72+curl-8.6.0.crate) = d77db758acab7cacbab724bf9d6f5a3a40083be7290c9b6dfdf91370f1d965e21d8ce01f1d3df79eb40da2ec759c2b0609d3c6176a0517acbcdc5a2bbb66a1ce +SHA512 (curl-sys-0.4.73+curl-8.8.0.crate) = 7c669747ede48191e6a75f118084bc473fac3ec2fe78882bd13527df3d98a0c26c00b30055230298685afc741aa99e369b8bc2bb6d89712aaa3e5208c7ee9fc0