diff --git a/.gitignore b/.gitignore index 5a70872..b37f35d 100644 --- a/.gitignore +++ b/.gitignore @@ -20,3 +20,4 @@ /curl-0.4.42.crate /curl-0.4.43.crate /curl-0.4.44.crate +/curl-0.4.46.crate diff --git a/curl-fix-metadata-auto.diff b/curl-fix-metadata-auto.diff index 5bb1526..6ca8dc3 100644 --- a/curl-fix-metadata-auto.diff +++ b/curl-fix-metadata-auto.diff @@ -1,17 +1,18 @@ ---- curl-0.4.44/Cargo.toml 1970-01-01T00:00:01+00:00 -+++ curl-0.4.44/Cargo.toml 2024-01-27T17:11:56.980334+00:00 -@@ -107,18 +107,9 @@ - version = "0.9.43" +--- curl-0.4.46/Cargo.toml 1970-01-01T00:00:01+00:00 ++++ curl-0.4.46/Cargo.toml 2024-04-25T14:57:35.573247+00:00 +@@ -116,19 +116,9 @@ + version = "0.9.64" optional = true -[target."cfg(target_env = \"msvc\")".dependencies.schannel] -version = "0.1.13" - --[target."cfg(target_env = \"msvc\")".dependencies.winapi] --version = "0.3" +-[target."cfg(target_env = \"msvc\")".dependencies.windows-sys] +-version = "0.52" -features = [ -- "libloaderapi", -- "wincrypt", +- "Win32_Foundation", +- "Win32_System_LibraryLoader", +- "Win32_Security_Cryptography", -] - [badges.appveyor] diff --git a/curl-fix-metadata.diff b/curl-fix-metadata.diff index 27ec3bd..f1f0e16 100644 --- a/curl-fix-metadata.diff +++ b/curl-fix-metadata.diff @@ -1,5 +1,5 @@ ---- curl-0.4.44/Cargo.toml 1970-01-01T00:00:01+00:00 -+++ curl-0.4.44/Cargo.toml 2024-01-27T17:13:39.065768+00:00 +--- curl-0.4.46/Cargo.toml 1970-01-01T00:00:01+00:00 ++++ curl-0.4.46/Cargo.toml 2024-04-25T14:58:06.815401+00:00 @@ -25,6 +25,7 @@ ] license = "MIT" @@ -8,7 +8,7 @@ [[example]] name = "https" -@@ -52,10 +53,6 @@ +@@ -57,10 +58,6 @@ name = "multi-dl" path = "examples/multi-dl.rs" required-features = ["ssl"] @@ -18,4 +18,4 @@ -harness = false [dependencies.curl-sys] - version = "0.4.56" + version = "0.4.72" diff --git a/rust-curl.spec b/rust-curl.spec index 94f93e7..0ba6d9d 100644 --- a/rust-curl.spec +++ b/rust-curl.spec @@ -1,11 +1,11 @@ -# Generated by rust2rpm 25 +# Generated by rust2rpm 26 %bcond_without check %global debug_package %{nil} %global crate curl Name: rust-curl -Version: 0.4.44 +Version: 0.4.46 Release: %autorelease Summary: Rust bindings to libcurl for making HTTP requests @@ -180,9 +180,10 @@ rm tests/post.rs %if %{with check} %check -# * skip a test that hangs indefinitely -# * skip two tests that require internet connectivity -%cargo_test -- -- --skip upload_lots --skip 'src/easy/handle.rs' --skip 'src/easy/handler.rs' +# * skip a test that hangs indefinitely: upload_lots +# * skip two tests that require internet connectivity: src/easy/handle{,r}.rs +# * skip a test that fails with curl 8.7+ for unknown reasons: abort_read +%cargo_test -- -- --skip abort_read --skip upload_lots --skip 'src/easy/handle.rs' --skip 'src/easy/handler.rs' %endif %changelog diff --git a/rust2rpm.toml b/rust2rpm.toml index d7b256a..5c93de2 100644 --- a/rust2rpm.toml +++ b/rust2rpm.toml @@ -5,17 +5,20 @@ hide = [ "rustls", "static-curl", "static-ssl", + "windows-static-ssl", "zlib-ng-compat", ] [tests] skip = [ + "abort_read", "upload_lots", "'src/easy/handle.rs'", "'src/easy/handler.rs'", ] comments = [ - "skip a test that hangs indefinitely", - "skip two tests that require internet connectivity", + "skip a test that hangs indefinitely: upload_lots", + "skip two tests that require internet connectivity: src/easy/handle{,r}.rs", + "skip a test that fails with curl 8.7+ for unknown reasons: abort_read", ] diff --git a/sources b/sources index 86cce42..cd88e13 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (curl-0.4.44.crate) = 499c3496cb019856773da10c5dcdf539c3fb7542a5e5dde4923d36e0f9274515b43a68bd31fc18a9adbfa9061d752fa698dfc2fbb6a6b1c1347001b3d112b3e5 +SHA512 (curl-0.4.46.crate) = c08f857b385582ba635a76744c940017b74c3f241d28cc7c8c6eeff958c76c01a1a51df41b3a7a6a9a38a31f8cf5b9b3b639eaa163c441fdec29d0b3f14c8336