diff --git a/python-maturin.changes b/python-maturin.changes index f673316..5a29fc0 100644 --- a/python-maturin.changes +++ b/python-maturin.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Tue Sep 17 14:24:36 UTC 2024 - Nico Krapp + +- add update-dependencies.patch to update vendored crates: + * shlex to version 1.3.0 (bsc#1230027) + * rustix to version 0.36.17 (bsc#1229951) + ------------------------------------------------------------------- Mon May 8 08:24:57 UTC 2023 - Mia Herkt diff --git a/python-maturin.spec b/python-maturin.spec index 2964dba..386b2df 100644 --- a/python-maturin.spec +++ b/python-maturin.spec @@ -25,6 +25,8 @@ URL: https://github.com/PyO3/maturin Source: https://files.pythonhosted.org/packages/source/m/maturin/maturin-%{version}.tar.gz Source1: vendor.tar.xz Source2: cargo_config +#PATCH-FIX-UPSTREAM update-dependencies.patch bsc#1230027 bsc#1229951 +Patch1: update-dependencies.patch BuildRequires: %{python_module base >= 3.7} BuildRequires: %{python_module pip} BuildRequires: %{python_module setuptools-rust >= 1.4.0} diff --git a/update-dependencies.patch b/update-dependencies.patch new file mode 100644 index 0000000..419beb2 --- /dev/null +++ b/update-dependencies.patch @@ -0,0 +1,374 @@ +From c442263a21575a03aae93da9abc0794ae174e021 Mon Sep 17 00:00:00 2001 +From: nkrapp +Date: Thu, 19 Sep 2024 14:52:38 +0200 +Subject: [PATCH] python-maturin + +--- + Cargo.lock | 168 +++++++++++++----- + Cargo.toml | 6 + + 2 files changed, 125 insertions(+), 41 deletions(-) + +diff --git a/Cargo.lock b/Cargo.lock +index c26f50b5..592fc570 100644 +--- a/Cargo.lock ++++ b/Cargo.lock +@@ -420,7 +420,7 @@ dependencies = [ + "lazy_static", + "libc", + "unicode-width", +- "windows-sys", ++ "windows-sys 0.42.0", + ] + + [[package]] +@@ -611,23 +611,12 @@ dependencies = [ + + [[package]] + name = "errno" +-version = "0.2.8" +-source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "f639046355ee4f37944e44f60642c6f3a7efa3cf6b78c78a0d989a8ce6c396a1" +-dependencies = [ +- "errno-dragonfly", +- "libc", +- "winapi", +-] +- +-[[package]] +-name = "errno-dragonfly" +-version = "0.1.2" ++version = "0.3.9" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "aa68f1b12764fab894d2755d2518754e71b4fd80ecfb822714a1206c2aab39bf" ++checksum = "534c5cf6194dfab3db3242765c03bbe257cf92f22b38f6bc0c58d59108a820ba" + dependencies = [ +- "cc", + "libc", ++ "windows-sys 0.52.0", + ] + + [[package]] +@@ -657,7 +646,7 @@ dependencies = [ + "cfg-if", + "libc", + "redox_syscall", +- "windows-sys", ++ "windows-sys 0.42.0", + ] + + [[package]] +@@ -878,19 +867,17 @@ source = "registry+https://github.com/rust-lang/crates.io-index" + checksum = "e7d6c6f8c91b4b9ed43484ad1a938e393caf35960fce7f82a040497207bd8e9e" + dependencies = [ + "libc", +- "windows-sys", ++ "windows-sys 0.42.0", + ] + + [[package]] + name = "is-terminal" + version = "0.4.2" +-source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "28dfb6c8100ccc63462345b67d1bbc3679177c75ee4bf59bf29c8b1d110b8189" + dependencies = [ + "hermit-abi", + "io-lifetimes", + "rustix", +- "windows-sys", ++ "windows-sys 0.42.0", + ] + + [[package]] +@@ -1205,7 +1192,7 @@ version = "1.0.1" + source = "registry+https://github.com/rust-lang/crates.io-index" + checksum = "3a37f4eb793d70ebef49f4643fe4b8c0e60d266e3fb607158e64b6ee24b0d6d4" + dependencies = [ +- "windows-sys", ++ "windows-sys 0.42.0", + ] + + [[package]] +@@ -1301,7 +1288,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" + checksum = "c6a252f1f8c11e84b3ab59d7a488e48e4478a93937e027076638c49536204639" + dependencies = [ + "libc", +- "windows-sys", ++ "windows-sys 0.42.0", + ] + + [[package]] +@@ -1345,7 +1332,7 @@ dependencies = [ + "libc", + "redox_syscall", + "smallvec", +- "windows-sys", ++ "windows-sys 0.42.0", + ] + + [[package]] +@@ -1664,16 +1651,16 @@ dependencies = [ + + [[package]] + name = "rustix" +-version = "0.36.7" ++version = "0.36.17" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "d4fdebc4b395b7fbb9ab11e462e20ed9051e7b16e42d24042c776eca0ac81b03" ++checksum = "305efbd14fde4139eb501df5f136994bb520b033fa9fbdce287507dc23b8c7ed" + dependencies = [ + "bitflags", + "errno", + "io-lifetimes", + "libc", + "linux-raw-sys", +- "windows-sys", ++ "windows-sys 0.45.0", + ] + + [[package]] +@@ -1724,7 +1711,7 @@ version = "0.1.21" + source = "registry+https://github.com/rust-lang/crates.io-index" + checksum = "713cfb06c7059f3588fb8044c0fad1d09e3c01d225e25b9220dbfdcf16dbb1b3" + dependencies = [ +- "windows-sys", ++ "windows-sys 0.42.0", + ] + + [[package]] +@@ -1869,9 +1856,9 @@ checksum = "24188a676b6ae68c3b2cb3a01be17fbf7240ce009799bb56d5b1409051e78fde" + + [[package]] + name = "shlex" +-version = "1.1.0" ++version = "1.3.0" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "43b2853a4d09f215c24cc5489c992ce46052d359b5109343cbafbf26bc62f8a3" ++checksum = "0fda2ff0d084019ba4d7c6f371c95d8fd75ce3524c3cb8fb653a3023f6323e64" + + [[package]] + name = "similar" +@@ -1909,7 +1896,7 @@ dependencies = [ + "tempfile", + "wait-timeout", + "walkdir", +- "windows-sys", ++ "windows-sys 0.42.0", + "yansi", + ] + +@@ -1992,14 +1979,12 @@ checksum = "fd1ba337640d60c3e96bc6f0638a939b9c9a7f2c316a1598c279828b3d1dc8c5" + [[package]] + name = "tempfile" + version = "3.4.0" +-source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "af18f7ae1acd354b992402e9ec5864359d693cd8a79dcbef59f76891701c1e95" + dependencies = [ + "cfg-if", + "fastrand", + "redox_syscall", + "rustix", +- "windows-sys", ++ "windows-sys 0.42.0", + ] + + [[package]] +@@ -2014,11 +1999,9 @@ dependencies = [ + [[package]] + name = "terminal_size" + version = "0.2.3" +-source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "cb20089a8ba2b69debd491f8d2d023761cbf196e999218c591fa1e7e15a21907" + dependencies = [ + "rustix", +- "windows-sys", ++ "windows-sys 0.42.0", + ] + + [[package]] +@@ -2225,8 +2208,6 @@ dependencies = [ + [[package]] + name = "trycmd" + version = "0.14.11" +-source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "522dcafb4bf113bcf83e4f47a0499ea1f6798877439e6a0e96cf087a2abe97dc" + dependencies = [ + "glob", + "humantime", +@@ -2538,13 +2519,62 @@ version = "0.42.0" + source = "registry+https://github.com/rust-lang/crates.io-index" + checksum = "5a3e1820f08b8513f676f7ab6c1f99ff312fb97b553d30ff4dd86f9f15728aa7" + dependencies = [ +- "windows_aarch64_gnullvm", +- "windows_aarch64_msvc", +- "windows_i686_gnu", +- "windows_i686_msvc", +- "windows_x86_64_gnu", +- "windows_x86_64_gnullvm", +- "windows_x86_64_msvc", ++ "windows_aarch64_gnullvm 0.42.2", ++ "windows_aarch64_msvc 0.42.2", ++ "windows_i686_gnu 0.42.2", ++ "windows_i686_msvc 0.42.2", ++ "windows_x86_64_gnu 0.42.2", ++ "windows_x86_64_gnullvm 0.42.2", ++ "windows_x86_64_msvc 0.42.2", ++] ++ ++[[package]] ++name = "windows-sys" ++version = "0.45.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "75283be5efb2831d37ea142365f009c02ec203cd29a3ebecbc093d52315b66d0" ++dependencies = [ ++ "windows-targets 0.42.2", ++] ++ ++[[package]] ++name = "windows-sys" ++version = "0.52.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "282be5f36a8ce781fad8c8ae18fa3f9beff57ec1b52cb3de0789201425d9a33d" ++dependencies = [ ++ "windows-targets 0.52.6", ++] ++ ++[[package]] ++name = "windows-targets" ++version = "0.42.2" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "8e5180c00cd44c9b1c88adb3693291f1cd93605ded80c250a75d472756b4d071" ++dependencies = [ ++ "windows_aarch64_gnullvm 0.42.2", ++ "windows_aarch64_msvc 0.42.2", ++ "windows_i686_gnu 0.42.2", ++ "windows_i686_msvc 0.42.2", ++ "windows_x86_64_gnu 0.42.2", ++ "windows_x86_64_gnullvm 0.42.2", ++ "windows_x86_64_msvc 0.42.2", ++] ++ ++[[package]] ++name = "windows-targets" ++version = "0.52.6" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "9b724f72796e036ab90c1021d4780d4d3d648aca59e491e6b98e725b84e99973" ++dependencies = [ ++ "windows_aarch64_gnullvm 0.52.6", ++ "windows_aarch64_msvc 0.52.6", ++ "windows_i686_gnu 0.52.6", ++ "windows_i686_gnullvm", ++ "windows_i686_msvc 0.52.6", ++ "windows_x86_64_gnu 0.52.6", ++ "windows_x86_64_gnullvm 0.52.6", ++ "windows_x86_64_msvc 0.52.6", + ] + + [[package]] +@@ -2553,42 +2583,90 @@ version = "0.42.2" + source = "registry+https://github.com/rust-lang/crates.io-index" + checksum = "597a5118570b68bc08d8d59125332c54f1ba9d9adeedeef5b99b02ba2b0698f8" + ++[[package]] ++name = "windows_aarch64_gnullvm" ++version = "0.52.6" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "32a4622180e7a0ec044bb555404c800bc9fd9ec262ec147edd5989ccd0c02cd3" ++ + [[package]] + name = "windows_aarch64_msvc" + version = "0.42.2" + source = "registry+https://github.com/rust-lang/crates.io-index" + checksum = "e08e8864a60f06ef0d0ff4ba04124db8b0fb3be5776a5cd47641e942e58c4d43" + ++[[package]] ++name = "windows_aarch64_msvc" ++version = "0.52.6" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "09ec2a7bb152e2252b53fa7803150007879548bc709c039df7627cabbd05d469" ++ + [[package]] + name = "windows_i686_gnu" + version = "0.42.2" + source = "registry+https://github.com/rust-lang/crates.io-index" + checksum = "c61d927d8da41da96a81f029489353e68739737d3beca43145c8afec9a31a84f" + ++[[package]] ++name = "windows_i686_gnu" ++version = "0.52.6" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "8e9b5ad5ab802e97eb8e295ac6720e509ee4c243f69d781394014ebfe8bbfa0b" ++ ++[[package]] ++name = "windows_i686_gnullvm" ++version = "0.52.6" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "0eee52d38c090b3caa76c563b86c3a4bd71ef1a819287c19d586d7334ae8ed66" ++ + [[package]] + name = "windows_i686_msvc" + version = "0.42.2" + source = "registry+https://github.com/rust-lang/crates.io-index" + checksum = "44d840b6ec649f480a41c8d80f9c65108b92d89345dd94027bfe06ac444d1060" + ++[[package]] ++name = "windows_i686_msvc" ++version = "0.52.6" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "240948bc05c5e7c6dabba28bf89d89ffce3e303022809e73deaefe4f6ec56c66" ++ + [[package]] + name = "windows_x86_64_gnu" + version = "0.42.2" + source = "registry+https://github.com/rust-lang/crates.io-index" + checksum = "8de912b8b8feb55c064867cf047dda097f92d51efad5b491dfb98f6bbb70cb36" + ++[[package]] ++name = "windows_x86_64_gnu" ++version = "0.52.6" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "147a5c80aabfbf0c7d901cb5895d1de30ef2907eb21fbbab29ca94c5b08b1a78" ++ + [[package]] + name = "windows_x86_64_gnullvm" + version = "0.42.2" + source = "registry+https://github.com/rust-lang/crates.io-index" + checksum = "26d41b46a36d453748aedef1486d5c7a85db22e56aff34643984ea85514e94a3" + ++[[package]] ++name = "windows_x86_64_gnullvm" ++version = "0.52.6" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "24d5b23dc417412679681396f2b49f3de8c1473deb516bd34410872eff51ed0d" ++ + [[package]] + name = "windows_x86_64_msvc" + version = "0.42.2" + source = "registry+https://github.com/rust-lang/crates.io-index" + checksum = "9aec5da331524158c6d1a4ac0ab1541149c0b9505fde06423b02f5ef0106b9f0" + ++[[package]] ++name = "windows_x86_64_msvc" ++version = "0.52.6" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "589f6da84c646204747d1270a2a5661ea66ed1cced2631d546fdfb155959f9ec" ++ + [[package]] + name = "winnow" + version = "0.4.6" +diff --git a/Cargo.toml b/Cargo.toml +index dd7a0053..5c2f065a 100644 +--- a/Cargo.toml ++++ b/Cargo.toml +@@ -137,3 +137,9 @@ opt-level = 3 + opt-level = 3 + [profile.dev.package.msi] + opt-level = 3 ++ ++[patch.crates-io] ++trycmd = { path="vendor/trycmd" } ++is-terminal = { path="vendor/is-terminal" } ++tempfile = { path="vendor/tempfile" } ++terminal_size = { path="vendor/terminal_size"} +-- +2.46.0 + diff --git a/vendor.tar.xz b/vendor.tar.xz index 8b9addd..b92e544 100644 --- a/vendor.tar.xz +++ b/vendor.tar.xz @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:4e17ad011f769a62fb0ba9305f76acb1caf387ef858e51536979c24bbd465d0d -size 32991896 +oid sha256:6a1f408c65085d5bdf861da9144fe1b5a2863d58d50ee2b5751e5403f7f85020 +size 34391508