Update to version 0.4.73+curl-8.8.0; Fixes RHBZ#2295453

epel10
Fabio Valentini 8 months ago
parent e1890e2e12
commit bc2f4c3a58
No known key found for this signature in database
GPG Key ID: 5AC5F572E5D410AF

1
.gitignore vendored

@ -41,3 +41,4 @@
/curl-sys-0.4.68+curl-8.4.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.70+curl-8.5.0.crate
/curl-sys-0.4.72+curl-8.6.0.crate /curl-sys-0.4.72+curl-8.6.0.crate
/curl-sys-0.4.73+curl-8.8.0.crate

@ -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 <decathorpe@gmail.com> From: Fabio Valentini <decathorpe@gmail.com>
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 Subject: [PATCH] unconditionally use pkg-config to link with system libcurl
--- ---
build.rs | 586 +------------------------------------------------------ build.rs | 588 +------------------------------------------------------
1 file changed, 5 insertions(+), 581 deletions(-) 1 file changed, 5 insertions(+), 583 deletions(-)
diff --git a/build.rs b/build.rs diff --git a/build.rs b/build.rs
index 7cc5831..497789c 100644 index 407bc25..497789c 100644
--- a/build.rs --- a/build.rs
+++ b/build.rs +++ b/build.rs
@@ -1,610 +1,34 @@ @@ -1,612 +1,34 @@
-use std::env; -use std::env;
-use std::fs; -use std::fs;
-use std::path::{Path, PathBuf}; -use std::path::{Path, PathBuf};
@ -114,7 +114,7 @@ index 7cc5831..497789c 100644
- .replace("@LIBCURL_LIBS@", "") - .replace("@LIBCURL_LIBS@", "")
- .replace("@SUPPORT_FEATURES@", "") - .replace("@SUPPORT_FEATURES@", "")
- .replace("@SUPPORT_PROTOCOLS@", "") - .replace("@SUPPORT_PROTOCOLS@", "")
- .replace("@CURLVERSION@", "8.6.0"), - .replace("@CURLVERSION@", "8.8.0"),
- ) - )
- .unwrap(); - .unwrap();
- -
@ -161,8 +161,10 @@ index 7cc5831..497789c 100644
- .file("curl/lib/curl_get_line.c") - .file("curl/lib/curl_get_line.c")
- .file("curl/lib/curl_memrchr.c") - .file("curl/lib/curl_memrchr.c")
- .file("curl/lib/curl_range.c") - .file("curl/lib/curl_range.c")
- .file("curl/lib/curl_sha512_256.c")
- .file("curl/lib/curl_threads.c") - .file("curl/lib/curl_threads.c")
- .file("curl/lib/curl_trc.c") - .file("curl/lib/curl_trc.c")
- .file("curl/lib/cw-out.c")
- .file("curl/lib/doh.c") - .file("curl/lib/doh.c")
- .file("curl/lib/dynbuf.c") - .file("curl/lib/dynbuf.c")
- .file("curl/lib/dynhds.c") - .file("curl/lib/dynhds.c")
@ -205,6 +207,7 @@ index 7cc5831..497789c 100644
- .file("curl/lib/progress.c") - .file("curl/lib/progress.c")
- .file("curl/lib/rand.c") - .file("curl/lib/rand.c")
- .file("curl/lib/rename.c") - .file("curl/lib/rename.c")
- .file("curl/lib/request.c")
- .file("curl/lib/select.c") - .file("curl/lib/select.c")
- .file("curl/lib/sendf.c") - .file("curl/lib/sendf.c")
- .file("curl/lib/setopt.c") - .file("curl/lib/setopt.c")
@ -248,7 +251,6 @@ index 7cc5831..497789c 100644
- .file("curl/lib/curl_endian.c") - .file("curl/lib/curl_endian.c")
- .file("curl/lib/curl_gethostname.c") - .file("curl/lib/curl_gethostname.c")
- .file("curl/lib/curl_ntlm_core.c") - .file("curl/lib/curl_ntlm_core.c")
- .file("curl/lib/curl_ntlm_wb.c")
- .file("curl/lib/http_ntlm.c") - .file("curl/lib/http_ntlm.c")
- .file("curl/lib/md4.c") - .file("curl/lib/md4.c")
- .file("curl/lib/vauth/ntlm.c") - .file("curl/lib/vauth/ntlm.c")
@ -628,5 +630,5 @@ index 7cc5831..497789c 100644
- None - None
-} -}
-- --
2.44.0 2.45.2

@ -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.73+curl-8.8.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 2024-07-07T12:52:12.629501+00:00
@@ -12,7 +12,7 @@ @@ -12,7 +12,7 @@
[package] [package]
edition = "2018" edition = "2018"
name = "curl-sys" name = "curl-sys"
-version = "0.4.72+curl-8.6.0" -version = "0.4.73+curl-8.8.0"
+version = "0.4.72" +version = "0.4.73"
authors = ["Alex Crichton <alex@alexcrichton.com>"] authors = ["Alex Crichton <alex@alexcrichton.com>"]
build = "build.rs" build = "build.rs"
links = "curl" links = "curl"
@@ -73,15 +73,10 @@ @@ -77,15 +77,10 @@
version = "0.9.64" version = "0.9.64"
optional = true optional = true

@ -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.73+curl-8.8.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 +++ curl-sys-0.4.73+curl-8.8.0/Cargo.toml 2024-07-07T12:52:44.962640+00:00
@@ -29,20 +29,6 @@ @@ -33,20 +33,6 @@
[dependencies.libc] [dependencies.libc]
version = "0.2.2" version = "0.2.2"
@ -14,14 +14,14 @@
-default-features = false -default-features = false
- -
-[dependencies.rustls-ffi] -[dependencies.rustls-ffi]
-version = "0.8" -version = "0.13"
-features = ["no_log_capture"] -features = ["no_log_capture"]
-optional = true -optional = true
- -
[build-dependencies.cc] [build-dependencies.cc]
version = "1.0" version = "1.0"
@@ -51,23 +37,13 @@ @@ -55,23 +41,13 @@
[features] [features]
default = ["ssl"] default = ["ssl"]

@ -3,10 +3,10 @@
%global debug_package %{nil} %global debug_package %{nil}
%global crate curl-sys %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 Name: rust-curl-sys
Version: 0.4.72 Version: 0.4.73
Release: %autorelease Release: %autorelease
Summary: Native bindings to the libcurl library Summary: Native bindings to the libcurl library
@ -24,7 +24,7 @@ Patch: curl-sys-fix-metadata-auto.diff
Patch: curl-sys-fix-metadata.diff Patch: curl-sys-fix-metadata.diff
# * remove code related to building vendored curl sources # * remove code related to building vendored curl sources
# * unconditionally use pkg-config to link with system libcurl # * 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: cargo-rpm-macros >= 24
BuildRequires: pkgconfig(libcurl) BuildRequires: pkgconfig(libcurl)

@ -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] [requires]
build = ["pkgconfig(libcurl)"] build = ["pkgconfig(libcurl)"]
lib = ["pkgconfig(libcurl)"] lib = ["pkgconfig(libcurl)"]
[scripts]
prep.post = [
"# remove bundled curl sources",
"rm -vr curl/",
]

@ -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

Loading…
Cancel
Save