cpet/freebsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

net-p2p/openethereum: Fix build with rust 1.64.0

Browse Source 
Update socket2 crate to 0.3.19

PR:		267173
This commit is contained in:
Mikael Urankar 2022-10-14 13:22:06 +02:00
parent a1d57e9116
commit 96c552a027
3 changed files with 52 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
net-p2p/openethereum/Makefile.crates
View File

@ -329,7 +329,7 @@ CARGO_CRATES= addr2line-0.14.1 \
slab-0.4.2 \
smallvec-0.6.13 \
smallvec-1.6.1 \
socket2-0.3.11 \
socket2-0.3.19 \
spin-0.5.2 \
stable_deref_trait-1.1.1 \
static_assertions-1.1.0 \

22
net-p2p/openethereum/distinfo
View File

@ -1,4 +1,4 @@
TIMESTAMP = 1621231532
TIMESTAMP = 1665744548
SHA256 (rust/crates/addr2line-0.14.1.crate) = a55f82cfe485775d02112886f4169bde0c5894d75e79ead7eafe7e40a25e45f7
SIZE (rust/crates/addr2line-0.14.1.crate) = 31201
SHA256 (rust/crates/adler-1.0.2.crate) = f26201604c87b1e01bd3d98f8d5d9a8fcbb815e8cedb41ffccbeb4bf593a35fe
@ -661,8 +661,8 @@ SHA256 (rust/crates/smallvec-0.6.13.crate) = f7b0758c52e15a8b5e3691eae6cc559f08e
SIZE (rust/crates/smallvec-0.6.13.crate) = 22760
SHA256 (rust/crates/smallvec-1.6.1.crate) = fe0f37c9e8f3c5a4a66ad655a93c74daac4ad00c441533bf5c6e7990bb42604e
SIZE (rust/crates/smallvec-1.6.1.crate) = 26444
SHA256 (rust/crates/socket2-0.3.11.crate) = e8b74de517221a2cb01a53349cf54182acdc31a074727d3079068448c0676d85
SIZE (rust/crates/socket2-0.3.11.crate) = 27725
SHA256 (rust/crates/socket2-0.3.19.crate) = 122e570113d28d773067fab24266b66753f6ea915758651696b6e35e49f88d6e
SIZE (rust/crates/socket2-0.3.19.crate) = 33782
SHA256 (rust/crates/spin-0.5.2.crate) = 6e63cff320ae2c57904679ba7cb63280a3dc4613885beafb148ee7bf9aa9042d
SIZE (rust/crates/spin-0.5.2.crate) = 12004
SHA256 (rust/crates/stable_deref_trait-1.1.1.crate) = dba1a27d3efae4351c8051072d619e3ade2820635c3958d826bfea39d59b54c8
@ -863,17 +863,17 @@ SHA256 (rust/crates/xmltree-0.7.0.crate) = a9cfb54ca6b8f17d2377219ce485b134d5356
SIZE (rust/crates/xmltree-0.7.0.crate) = 6516
SHA256 (rust/crates/zeroize-1.2.0.crate) = 81a974bcdd357f0dca4d41677db03436324d45a4c9ed2d0b873a5a360ce41c36
SIZE (rust/crates/zeroize-1.2.0.crate) = 15450
SHA256 (openethereum-openethereum-v3.2.6_GH0.tar.gz) = 8678fcc1558f53ed5a424b2b46ebe56f881c13c0c36af3922ab406e555f3b70d
SIZE (openethereum-openethereum-v3.2.6_GH0.tar.gz) = 1909444
SHA256 (matter-labs-eip1962-ece6cbabc41948db4200e41f0bfdab7ab94c7af8_GH0.tar.gz) = 65f94a93d2c3bd795b852e1c1aa6fd0ca7deebb88a789029adb401a2f78d86cf
SIZE (matter-labs-eip1962-ece6cbabc41948db4200e41f0bfdab7ab94c7af8_GH0.tar.gz) = 43057728
SHA256 (paritytech-rust-secp256k1-9791e79f21a5309dcb6e0bd254b1ef88fca2f1f4_GH0.tar.gz) = b2b7c0a80a2f123a1a9ccd9b3933e6d3e67000569e1358e8649725458d7ed3a1
SIZE (paritytech-rust-secp256k1-9791e79f21a5309dcb6e0bd254b1ef88fca2f1f4_GH0.tar.gz) = 178184
SHA256 (gnosis-reth-573e128487d5651f301e21faa97fc8e80f91dee8_GH0.tar.gz) = 39faedcfb591b0dfec95505e5c3b7e527eacdb1995844ed976f17d24b0cbf223
SIZE (gnosis-reth-573e128487d5651f301e21faa97fc8e80f91dee8_GH0.tar.gz) = 180378
SHA256 (openethereum-app-dirs-rs-0b37f9481ce29e9d5174ad185bca695b206368eb_GH0.tar.gz) = c18dbbe2e31438f4cda5b05b3c838782288b36cf58d2e68febe78a3797556d96
SIZE (openethereum-app-dirs-rs-0b37f9481ce29e9d5174ad185bca695b206368eb_GH0.tar.gz) = 9285
SHA256 (paritytech-bn-6079255e65793038b9a6e5292203eab482737cc2_GH0.tar.gz) = 54ee86c1ead8429d9623ed16b89916729c2c4c0390ab673ce23fc3f5636a4e70
SIZE (paritytech-bn-6079255e65793038b9a6e5292203eab482737cc2_GH0.tar.gz) = 2676668
SHA256 (paritytech-rust-ctrlc-b523017108bb2d571a7a69bd97bc406e63bc7a9d_GH0.tar.gz) = e1f29d3d6ed6af7cde2747e32b41df4835c76babdebe9ebbbea125bc71899371
SIZE (paritytech-rust-ctrlc-b523017108bb2d571a7a69bd97bc406e63bc7a9d_GH0.tar.gz) = 2747
SHA256 (paritytech-rust-secp256k1-9791e79f21a5309dcb6e0bd254b1ef88fca2f1f4_GH0.tar.gz) = b2b7c0a80a2f123a1a9ccd9b3933e6d3e67000569e1358e8649725458d7ed3a1
SIZE (paritytech-rust-secp256k1-9791e79f21a5309dcb6e0bd254b1ef88fca2f1f4_GH0.tar.gz) = 178184
SHA256 (matter-labs-eip1962-ece6cbabc41948db4200e41f0bfdab7ab94c7af8_GH0.tar.gz) = 65f94a93d2c3bd795b852e1c1aa6fd0ca7deebb88a789029adb401a2f78d86cf
SIZE (matter-labs-eip1962-ece6cbabc41948db4200e41f0bfdab7ab94c7af8_GH0.tar.gz) = 43057728
SHA256 (gnosis-reth-573e128487d5651f301e21faa97fc8e80f91dee8_GH0.tar.gz) = 39faedcfb591b0dfec95505e5c3b7e527eacdb1995844ed976f17d24b0cbf223
SIZE (gnosis-reth-573e128487d5651f301e21faa97fc8e80f91dee8_GH0.tar.gz) = 180378
SHA256 (openethereum-openethereum-v3.2.6_GH0.tar.gz) = 8678fcc1558f53ed5a424b2b46ebe56f881c13c0c36af3922ab406e555f3b70d
SIZE (openethereum-openethereum-v3.2.6_GH0.tar.gz) = 1909444

40
net-p2p/openethereum/files/patch-rust-1.64.0 Normal file
View File

@ -0,0 +1,40 @@
error[E0512]: cannot transmute between types of different sizes, or dependently-sized types
--> socket2-0.3.XX/src/sockaddr.rs:176:9
|
176 | mem::transmute::<SocketAddrV4, sockaddr_in>(v4);
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
|
= note: source type: `SocketAddrV4` (48 bits)
= note: target type: `sockaddr_in` (128 bits)
For more information about this error, try `rustc --explain E0512`.
error: could not compile `socket2` due to previous error
--- Cargo.lock.orig 2022-10-14 12:49:21 UTC
+++ Cargo.lock
@@ -1,5 +1,7 @@
# This file is automatically @generated by Cargo.
# It is not intended for manual editing.
+version = 3
+
[[package]]
name = "addr2line"
version = "0.14.1"
@@ -4351,13 +4353,12 @@ name = "socket2"
[[package]]
name = "socket2"
-version = "0.3.11"
+version = "0.3.19"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e8b74de517221a2cb01a53349cf54182acdc31a074727d3079068448c0676d85"
+checksum = "122e570113d28d773067fab24266b66753f6ea915758651696b6e35e49f88d6e"
dependencies = [
- "cfg-if 0.1.10",
+ "cfg-if 1.0.0",
"libc",
- "redox_syscall 0.1.56",
"winapi 0.3.8",
]