diff --git a/devel/py-maturin/Makefile b/devel/py-maturin/Makefile index 7ce3bd3ed882..27397910bc3b 100644 --- a/devel/py-maturin/Makefile +++ b/devel/py-maturin/Makefile @@ -1,6 +1,5 @@ PORTNAME= maturin -DISTVERSION= 1.8.2 -PORTREVISION= 1 +DISTVERSION= 1.8.3 CATEGORIES= devel python MASTER_SITES= PYPI PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} diff --git a/devel/py-maturin/Makefile.crates b/devel/py-maturin/Makefile.crates index 79d1a8c195e9..91c7311214eb 100644 --- a/devel/py-maturin/Makefile.crates +++ b/devel/py-maturin/Makefile.crates @@ -22,8 +22,8 @@ CARGO_CRATES= adler2-2.0.0 \ byteorder-1.5.0 \ bytes-1.9.0 \ bytesize-1.3.0 \ - bzip2-0.4.4 \ - bzip2-sys-0.1.11+1.0.8 \ + bzip2-0.5.2 \ + bzip2-sys-0.1.13+1.0.8 \ cab-0.6.0 \ camino-1.1.9 \ cargo-config2-0.1.26 \ @@ -32,8 +32,8 @@ CARGO_CRATES= adler2-2.0.0 \ cargo-xwin-0.18.4 \ cargo-zigbuild-0.19.7 \ cargo_metadata-0.19.0 \ - cbindgen-0.27.0 \ - cc-1.1.21 \ + cbindgen-0.28.0 \ + cc-1.2.16 \ cfb-0.10.0 \ cfg-if-1.0.0 \ charset-0.1.5 \ @@ -210,7 +210,7 @@ CARGO_CRATES= adler2-2.0.0 \ regex-syntax-0.8.5 \ relative-path-1.9.3 \ rfc2047-decoder-1.0.6 \ - ring-0.17.8 \ + ring-0.17.13 \ rstest-0.22.0 \ rstest_macros-0.22.0 \ rustc-hash-2.0.0 \ @@ -250,7 +250,6 @@ CARGO_CRATES= adler2-2.0.0 \ snapbox-0.6.16 \ snapbox-macros-0.3.10 \ socks-0.3.4 \ - spin-0.9.8 \ stable_deref_trait-1.2.0 \ stacker-0.1.15 \ static_assertions-1.1.0 \ @@ -359,5 +358,5 @@ CARGO_CRATES= adler2-2.0.0 \ zeroize-1.8.1 \ zerovec-0.10.4 \ zerovec-derive-0.10.3 \ - zip-2.1.6 \ + zip-2.2.3 \ zopfli-0.8.1 diff --git a/devel/py-maturin/distinfo b/devel/py-maturin/distinfo index 719dd3c319f4..88313ca87def 100644 --- a/devel/py-maturin/distinfo +++ b/devel/py-maturin/distinfo @@ -1,6 +1,6 @@ -TIMESTAMP = 1741417423 -SHA256 (maturin-1.8.2.tar.gz) = e31abc70f6f93285d6e63d2f4459c079c94c259dd757370482d2d4ceb9ec1fa0 -SIZE (maturin-1.8.2.tar.gz) = 199276 +TIMESTAMP = 1742666543 +SHA256 (maturin-1.8.3.tar.gz) = 304762f86fd53a8031b1bf006d12572a2aa0a5235485031113195cc0152e1e12 +SIZE (maturin-1.8.3.tar.gz) = 199656 SHA256 (rust/crates/adler2-2.0.0.crate) = 512761e0bb2578dd7380c6baaa0f4ce03e84f95e960231d1dec8bf4d7d6e2627 SIZE (rust/crates/adler2-2.0.0.crate) = 13529 SHA256 (rust/crates/ahash-0.8.11.crate) = e89da841a80418a9b391ebaea17f5c112ffaaa96f621d2c285b5174da76b9011 @@ -49,10 +49,10 @@ SHA256 (rust/crates/bytes-1.9.0.crate) = 325918d6fe32f23b19878fe4b34794ae41fc19d SIZE (rust/crates/bytes-1.9.0.crate) = 67320 SHA256 (rust/crates/bytesize-1.3.0.crate) = a3e368af43e418a04d52505cf3dbc23dda4e3407ae2fa99fd0e4f308ce546acc SIZE (rust/crates/bytesize-1.3.0.crate) = 10164 -SHA256 (rust/crates/bzip2-0.4.4.crate) = bdb116a6ef3f6c3698828873ad02c3014b3c85cadb88496095628e3ef1e347f8 -SIZE (rust/crates/bzip2-0.4.4.crate) = 34197 -SHA256 (rust/crates/bzip2-sys-0.1.11+1.0.8.crate) = 736a955f3fa7875102d57c82b8cac37ec45224a07fd32d58f9f7a186b6cd4cdc -SIZE (rust/crates/bzip2-sys-0.1.11+1.0.8.crate) = 633444 +SHA256 (rust/crates/bzip2-0.5.2.crate) = 49ecfb22d906f800d4fe833b6282cf4dc1c298f5057ca0b5445e5c209735ca47 +SIZE (rust/crates/bzip2-0.5.2.crate) = 38314 +SHA256 (rust/crates/bzip2-sys-0.1.13+1.0.8.crate) = 225bff33b2141874fe80d71e07d6eec4f85c5c216453dd96388240f96e1acc14 +SIZE (rust/crates/bzip2-sys-0.1.13+1.0.8.crate) = 633818 SHA256 (rust/crates/cab-0.6.0.crate) = 171228650e6721d5acc0868a462cd864f49ac5f64e4a42cde270406e64e404d2 SIZE (rust/crates/cab-0.6.0.crate) = 28390 SHA256 (rust/crates/camino-1.1.9.crate) = 8b96ec4966b5813e2c0507c1f86115c8c5abaadc3980879c3424042a02fd1ad3 @@ -69,10 +69,10 @@ SHA256 (rust/crates/cargo-zigbuild-0.19.7.crate) = 04cc649328f39bbf1ef92ef753406 SIZE (rust/crates/cargo-zigbuild-0.19.7.crate) = 43219 SHA256 (rust/crates/cargo_metadata-0.19.0.crate) = afc309ed89476c8957c50fb818f56fe894db857866c3e163335faa91dc34eb85 SIZE (rust/crates/cargo_metadata-0.19.0.crate) = 25876 -SHA256 (rust/crates/cbindgen-0.27.0.crate) = 3fce8dd7fcfcbf3a0a87d8f515194b49d6135acab73e18bd380d1d93bb1a15eb -SIZE (rust/crates/cbindgen-0.27.0.crate) = 215957 -SHA256 (rust/crates/cc-1.1.21.crate) = 07b1695e2c7e8fc85310cde85aeaab7e3097f593c91d209d3f9df76c928100f0 -SIZE (rust/crates/cc-1.1.21.crate) = 83463 +SHA256 (rust/crates/cbindgen-0.28.0.crate) = eadd868a2ce9ca38de7eeafdcec9c7065ef89b42b32f0839278d55f35c54d1ff +SIZE (rust/crates/cbindgen-0.28.0.crate) = 223401 +SHA256 (rust/crates/cc-1.2.16.crate) = be714c154be609ec7f5dad223a33bf1482fff90472de28f7362806e6d4832b8c +SIZE (rust/crates/cc-1.2.16.crate) = 103847 SHA256 (rust/crates/cfb-0.10.0.crate) = d8a4f8e55be323b378facfcf1f06aa97f6ec17cf4ac84fb17325093aaf62da41 SIZE (rust/crates/cfb-0.10.0.crate) = 70168 SHA256 (rust/crates/cfg-if-1.0.0.crate) = baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd @@ -425,8 +425,8 @@ SHA256 (rust/crates/relative-path-1.9.3.crate) = ba39f3699c378cd8970968dcbff9c43 SIZE (rust/crates/relative-path-1.9.3.crate) = 22400 SHA256 (rust/crates/rfc2047-decoder-1.0.6.crate) = bc36545d1021456a751b573517cb52e8c339b2f662e6b2778ef629282678de29 SIZE (rust/crates/rfc2047-decoder-1.0.6.crate) = 14674 -SHA256 (rust/crates/ring-0.17.8.crate) = c17fa4cb658e3583423e915b9f3acc01cceaee1860e33d59ebae66adc3a2dc0d -SIZE (rust/crates/ring-0.17.8.crate) = 4188554 +SHA256 (rust/crates/ring-0.17.13.crate) = 70ac5d832aa16abd7d1def883a8545280c20a60f523a370aa3a9617c2b8550ee +SIZE (rust/crates/ring-0.17.13.crate) = 1501917 SHA256 (rust/crates/rstest-0.22.0.crate) = 7b423f0e62bdd61734b67cd21ff50871dfaeb9cc74f869dcd6af974fbcb19936 SIZE (rust/crates/rstest-0.22.0.crate) = 44425 SHA256 (rust/crates/rstest_macros-0.22.0.crate) = c5e1711e7d14f74b12a58411c542185ef7fb7f2e7f8ee6e2940a883628522b42 @@ -505,8 +505,6 @@ SHA256 (rust/crates/snapbox-macros-0.3.10.crate) = 16569f53ca23a41bb6f62e0a5084a SIZE (rust/crates/snapbox-macros-0.3.10.crate) = 7129 SHA256 (rust/crates/socks-0.3.4.crate) = f0c3dbbd9ae980613c6dd8e28a9407b50509d3803b57624d5dfe8315218cd58b SIZE (rust/crates/socks-0.3.4.crate) = 13172 -SHA256 (rust/crates/spin-0.9.8.crate) = 6980e8d7511241f8acf4aebddbb1ff938df5eebe98691418c4468d0b72a96a67 -SIZE (rust/crates/spin-0.9.8.crate) = 38958 SHA256 (rust/crates/stable_deref_trait-1.2.0.crate) = a8f112729512f8e442d81f95a8a7ddf2b7c6b8a1a6f509a95864142b30cab2d3 SIZE (rust/crates/stable_deref_trait-1.2.0.crate) = 8054 SHA256 (rust/crates/stacker-0.1.15.crate) = c886bd4480155fd3ef527d45e9ac8dd7118a898a46530b7b94c3e21866259fce @@ -723,7 +721,7 @@ SHA256 (rust/crates/zerovec-0.10.4.crate) = aa2b893d79df23bfb12d5461018d408ea19d SIZE (rust/crates/zerovec-0.10.4.crate) = 126398 SHA256 (rust/crates/zerovec-derive-0.10.3.crate) = 6eafa6dfb17584ea3e2bd6e76e0cc15ad7af12b09abdd1ca55961bed9b1063c6 SIZE (rust/crates/zerovec-derive-0.10.3.crate) = 19438 -SHA256 (rust/crates/zip-2.1.6.crate) = 40dd8c92efc296286ce1fbd16657c5dbefff44f1b4ca01cc5f517d8b7b3d3e2e -SIZE (rust/crates/zip-2.1.6.crate) = 107876 +SHA256 (rust/crates/zip-2.2.3.crate) = b280484c454e74e5fff658bbf7df8fdbe7a07c6b2de4a53def232c15ef138f3a +SIZE (rust/crates/zip-2.2.3.crate) = 106439 SHA256 (rust/crates/zopfli-0.8.1.crate) = e5019f391bac5cf252e93bbcc53d039ffd62c7bfb7c150414d61369afe57e946 SIZE (rust/crates/zopfli-0.8.1.crate) = 50972 diff --git a/devel/py-maturin/files/patch-cargo-crates_ring-0.17.8_Cargo.toml b/devel/py-maturin/files/patch-cargo-crates_ring-0.17.8_Cargo.toml deleted file mode 100644 index 5b0a25c220fd..000000000000 --- a/devel/py-maturin/files/patch-cargo-crates_ring-0.17.8_Cargo.toml +++ /dev/null @@ -1,11 +0,0 @@ ---- cargo-crates/ring-0.17.8/Cargo.toml.orig 1970-01-01 00:00:01 UTC -+++ cargo-crates/ring-0.17.8/Cargo.toml -@@ -220,7 +220,7 @@ wasm32_unknown_unknown_js = ["getrandom/js"] - unstable-testing-arm-no-neon = [] - wasm32_unknown_unknown_js = ["getrandom/js"] - --[target."cfg(all(any(target_os = \"android\", target_os = \"linux\"), any(target_arch = \"aarch64\", target_arch = \"arm\")))".dependencies.libc] -+[target."cfg(all(any(target_os = \"android\", target_os = \"freebsd\", target_os = \"linux\"), any(target_arch = \"aarch64\", target_arch = \"arm\")))".dependencies.libc] - version = "0.2.148" - default-features = false - diff --git a/devel/py-maturin/files/patch-cargo-crates_ring-0.17.8_src_cpu_arm.rs b/devel/py-maturin/files/patch-cargo-crates_ring-0.17.8_src_cpu_arm.rs deleted file mode 100644 index b7bba2fec000..000000000000 --- a/devel/py-maturin/files/patch-cargo-crates_ring-0.17.8_src_cpu_arm.rs +++ /dev/null @@ -1,108 +0,0 @@ ---- cargo-crates/ring-0.17.8/src/cpu/arm.rs.orig 1973-11-29 21:33:09 UTC -+++ cargo-crates/ring-0.17.8/src/cpu/arm.rs -@@ -45,29 +45,59 @@ mod abi_assumptions { - // detection. - - #[cfg(all( -- any(target_os = "android", target_os = "linux"), -+ any(target_os = "android", target_os = "freebsd", target_os = "linux"), - any(target_arch = "aarch64", target_arch = "arm"), - not(target_env = "uclibc") - ))] - fn detect_features() -> u32 { - use libc::c_ulong; -+ #[cfg(target_os = "freebsd")] -+ use libc::{c_int, c_void}; -+ #[cfg(target_os = "freebsd")] -+ extern crate std; - - // XXX: The `libc` crate doesn't provide `libc::getauxval` consistently - // across all Android/Linux targets, e.g. musl. -+ #[cfg(any(target_os = "android", target_os = "linux"))] - extern "C" { - fn getauxval(type_: c_ulong) -> c_ulong; - } - -+ #[cfg(target_os = "freebsd")] -+ extern "C" { -+ fn elf_aux_info(aux: c_int, buf: *mut c_void, buflen: c_int) -> c_int; -+ } -+ -+ #[cfg(not(target_os = "freebsd"))] - const AT_HWCAP: c_ulong = 16; - -+ #[cfg(target_os = "freebsd")] -+ const AT_HWCAP: c_int = 25; -+ - #[cfg(target_arch = "aarch64")] - const HWCAP_NEON: c_ulong = 1 << 1; - - #[cfg(target_arch = "arm")] - const HWCAP_NEON: c_ulong = 1 << 12; - -+ #[cfg(not(target_os = "freebsd"))] - let caps = unsafe { getauxval(AT_HWCAP) }; - -+ #[cfg(target_os = "freebsd")] -+ let caps: c_ulong = 0; -+ -+ #[cfg(target_os = "freebsd")] -+ { -+ let buffer : *mut c_void = { let t: *const c_ulong = ∩︀ t} as *mut c_void; -+ unsafe { -+ let _ret = elf_aux_info( -+ AT_HWCAP, -+ buffer, -+ std::mem::size_of_val(&caps) as i32 -+ ); -+ } -+ } -+ - // We assume NEON is available on AARCH64 because it is a required - // feature. - #[cfg(target_arch = "aarch64")] -@@ -86,12 +116,27 @@ fn detect_features() -> u32 { - #[cfg(target_arch = "arm")] - const OFFSET: c_ulong = 0; - -- #[cfg(target_arch = "arm")] -+ #[cfg(target_os = "freebsd")] -+ let buffer : *mut c_void = { let t: *const c_ulong = ∩︀ t} as *mut c_void; -+ -+ #[cfg(not(target_os = "freebsd"))] - let caps = { - const AT_HWCAP2: c_ulong = 26; - unsafe { getauxval(AT_HWCAP2) } - }; - -+ #[cfg(target_os = "freebsd")] -+ { -+ const AT_HWCAP2: c_int = 26; -+ unsafe { -+ let _ret = elf_aux_info( -+ AT_HWCAP2, -+ buffer, -+ std::mem::size_of_val(&caps) as i32 -+ ); -+ }; -+ } -+ - const HWCAP_AES: c_ulong = 1 << 0 + OFFSET; - const HWCAP_PMULL: c_ulong = 1 << 1 + OFFSET; - const HWCAP_SHA2: c_ulong = 1 << 3 + OFFSET; -@@ -175,6 +220,7 @@ fn detect_features() -> u32 { - #[cfg(all( - any(target_arch = "aarch64", target_arch = "arm"), - not(any( -+ target_os = "freebsd", - target_os = "android", - target_os = "fuchsia", - all(target_os = "linux", not(target_env = "uclibc")), -@@ -235,6 +281,7 @@ impl Feature { - - #[cfg(all( - any( -+ target_os = "freebsd", - target_os = "android", - target_os = "fuchsia", - all(target_os = "linux", not(target_env = "uclibc")),