Update to version 0.4.70+curl-8.5.0; Fixes RHBZ#2253472

.gitignore

@@ -40,7 +40,3 @@
 /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
-/curl-sys-0.4.73+curl-8.8.0.crate
-/curl-sys-0.4.74+curl-8.9.0.crate
-/curl-sys-0.4.77+curl-8.10.1.crate

0001-unconditionally-use-pkg-config-to-link-with-system-l.patch

@@ -1,17 +1,17 @@
-From b20169c69e40a568c510e39b24ef5c844f81ce25 Mon Sep 17 00:00:00 2001
+From fd991562a64708318e9750c1c0345b91a9cd22d2 Mon Sep 17 00:00:00 2001
 From: Fabio Valentini <decathorpe@gmail.com>
-Date: Mon, 7 Oct 2024 21:24:01 +0200
+Date: Tue, 17 Oct 2023 13:21:16 +0200
 Subject: [PATCH] unconditionally use pkg-config to link with system libcurl
 
 ---
- build.rs | 599 +------------------------------------------------------
+ build.rs | 584 +------------------------------------------------------
- 1 file changed, 5 insertions(+), 594 deletions(-)
+ 1 file changed, 5 insertions(+), 579 deletions(-)
 
 diff --git a/build.rs b/build.rs
-index fa57dd9..497789c 100644
+index 17a6861..497789c 100644
 --- a/build.rs
 +++ b/build.rs
-@@ -1,623 +1,34 @@
+@@ -1,608 +1,34 @@
 -use std::env;
 -use std::fs;
 -use std::path::{Path, PathBuf};
@@ -19,14 +19,6 @@ index fa57dd9..497789c 100644
  
  fn main() {
 -    println!("cargo:rerun-if-changed=curl");
--    println!(
--        "cargo:rustc-check-cfg=cfg(\
--            libcurl_vendored,\
--            link_libnghttp2,\
--            link_libz,\
--            link_openssl,\
--        )"
--    );
 -    let target = env::var("TARGET").unwrap();
 -    let windows = target.contains("windows");
 -
@@ -122,7 +114,7 @@ index fa57dd9..497789c 100644
 -            .replace("@LIBCURL_LIBS@", "")
 -            .replace("@SUPPORT_FEATURES@", "")
 -            .replace("@SUPPORT_PROTOCOLS@", "")
--            .replace("@CURLVERSION@", "8.10.1"),
+-            .replace("@CURLVERSION@", "8.5.0"),
 -    )
 -    .unwrap();
 -
@@ -144,7 +136,6 @@ index fa57dd9..497789c 100644
 -        .define("CURL_DISABLE_TFTP", None)
 -        .define("CURL_STATICLIB", None)
 -        .define("ENABLE_IPV6", None)
--        .define("HAVE_SOCKADDR_IN6_SIN6_SCOPE_ID", None)
 -        .define("HAVE_ASSERT_H", None)
 -        .define("OS", "\"unknown\"") // TODO
 -        .define("HAVE_ZLIB_H", None)
@@ -170,10 +161,8 @@ index fa57dd9..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")
@@ -216,7 +205,6 @@ index fa57dd9..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")
@@ -241,10 +229,8 @@ index fa57dd9..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")
@@ -260,6 +246,7 @@ index fa57dd9..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")
@@ -305,7 +292,6 @@ index fa57dd9..497789c 100644
 -    // features, make sure we only compile one vtls.
 -    if cfg!(feature = "rustls") {
 -        cfg.define("USE_RUSTLS", None)
--            .file("curl/lib/vtls/cipher_suite.c")
 -            .file("curl/lib/vtls/rustls.c")
 -            .include(env::var_os("DEP_RUSTLS_FFI_INCLUDE").unwrap());
 -    } else if cfg!(feature = "windows-static-ssl") {
@@ -344,7 +330,6 @@ index fa57dd9..497789c 100644
 -                .file("curl/lib/vtls/x509asn1.c");
 -        } else if target.contains("-apple-") {
 -            cfg.define("USE_SECTRANSP", None)
--                .file("curl/lib/vtls/cipher_suite.c")
 -                .file("curl/lib/vtls/sectransp.c")
 -                .file("curl/lib/vtls/x509asn1.c");
 -            if xcode_major_version().map_or(true, |v| v >= 9) {
@@ -641,5 +626,5 @@ index fa57dd9..497789c 100644
 -    None
 -}
 -- 
-2.46.2
+2.43.0
 

curl-sys-fix-metadata-auto.diff

@@ -1,21 +1,29 @@
---- curl-sys-0.4.77+curl-8.10.1/Cargo.toml	1970-01-01T00:00:01+00:00
+--- curl-sys-0.4.70+curl-8.5.0/Cargo.toml	1970-01-01T00:00:01+00:00
-+++ curl-sys-0.4.77+curl-8.10.1/Cargo.toml	2024-10-07T19:20:21.308338+00:00
++++ curl-sys-0.4.70+curl-8.5.0/Cargo.toml	2024-01-13T14:56:26.426384+00:00
 @@ -12,7 +12,7 @@
  [package]
  edition = "2018"
  name = "curl-sys"
--version = "0.4.77+curl-8.10.1"
+-version = "0.4.70+curl-8.5.0"
-+version = "0.4.77"
++version = "0.4.70"
  authors = ["Alex Crichton <alex@alexcrichton.com>"]
  build = "build.rs"
  links = "curl"
-@@ -82,9 +82,4 @@
+@@ -73,15 +73,10 @@
  version = "0.9.64"
  optional = true
  
--[target.'cfg(target_env = "msvc")'.build-dependencies.vcpkg]
+-[target."cfg(target_env = \"msvc\")".build-dependencies.vcpkg]
 -version = "0.2"
- 
+-
 -[target."cfg(windows)".dependencies.windows-sys]
--version = "0.52"
+-version = "0.48"
 -features = ["Win32_Networking_WinSock"]
+-
+ [badges.appveyor]
+ repository = "alexcrichton/curl-rust"
+ 
+ [badges.travis-ci]
+ repository = "alexcrichton/curl-rust"
++
++

curl-sys-fix-metadata.diff

@@ -1,6 +1,6 @@
---- curl-sys-0.4.77+curl-8.10.1/Cargo.toml	1970-01-01T00:00:01+00:00
+--- curl-sys-0.4.70+curl-8.5.0/Cargo.toml	1970-01-01T00:00:01+00:00
-+++ curl-sys-0.4.77+curl-8.10.1/Cargo.toml	2024-10-07T19:21:27.146697+00:00
++++ curl-sys-0.4.70+curl-8.5.0/Cargo.toml	2024-01-13T14:57:15.083595+00:00
-@@ -38,20 +38,6 @@
+@@ -29,20 +29,6 @@
  [dependencies.libc]
  version = "0.2.2"
  
@@ -14,14 +14,14 @@
 -default-features = false
 -
 -[dependencies.rustls-ffi]
--version = "0.14"
+-version = "0.8"
 -features = ["no_log_capture"]
 -optional = true
 -
  [build-dependencies.cc]
  version = "1.0"
  
-@@ -60,23 +46,13 @@
+@@ -51,23 +37,13 @@
  
  [features]
  default = ["ssl"]
@@ -44,5 +44,5 @@
 -    "static-curl",
 -]
  
- [target.'cfg(all(unix, not(target_os = "macos")))'.dependencies.openssl-sys]
+ [target."cfg(all(unix, not(target_os = \"macos\")))".dependencies.openssl-sys]
  version = "0.9.64"

rust-curl-sys.spec

@@ -1,12 +1,12 @@
-# Generated by rust2rpm 26
+# Generated by rust2rpm 25
 %bcond_without check
 %global debug_package %{nil}
 
 %global crate curl-sys
-%global upstream_version 0.4.77+curl-8.10.1
+%global upstream_version 0.4.70+curl-8.5.0
 
 Name:           rust-curl-sys
-Version:        0.4.77
+Version:        0.4.70
 Release:        %autorelease
 Summary:        Native bindings to the libcurl library
 
@@ -16,6 +16,7 @@ Source:         %{crates_source %{crate} %{upstream_version}}
 # Automatically generated patch to strip dependencies and normalize metadata
 Patch:          curl-sys-fix-metadata-auto.diff
 # Manually created patch for downstream crate metadata changes
+# * 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)
@@ -23,10 +24,9 @@ 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
-Patch10:        0001-unconditionally-use-pkg-config-to-link-with-system-l.patch
+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,6 +163,7 @@ rm -vr curl/
 
 %generate_buildrequires
 %cargo_generate_buildrequires
+echo 'pkgconfig(libcurl)'
 
 %build
 %cargo_build

rust2rpm.toml

@@ -1,26 +1,4 @@
-[package]
-cargo-toml-patch-comments = [
-    "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/",
-]
-

sources

@@ -1 +1 @@
-SHA512 (curl-sys-0.4.77+curl-8.10.1.crate) = c233786490b8e0342877bf8a20e6ec7916f8b8a4aa6e11da120a5b389d8d273bb57149ce89ac13c7bd678a03a387d76f1a1d0590de54e4c31735e7b1f2534fbd
+SHA512 (curl-sys-0.4.70+curl-8.5.0.crate) = 349fb40ef95da3595425056c44bac9bf122f8e9b2095fbe0f2ea7442460cc40ad49bc30b7aec5961cd625d804348306971d53783f13208e6813158c9096e58b4