net-mgmt/bandwhich: Fix build with rust 1.64.0

Update socket2 crate to 0.3.19 PR: 267173
freebsd · Oct 30, 2022 · a1d57e9 · a1d57e9
1 parent 264a6c5
commit a1d57e9
Show file tree

Hide file tree

Showing 3 changed files with 88 additions and 4 deletions.
diff --git a/net-mgmt/bandwhich/Makefile b/net-mgmt/bandwhich/Makefile
@@ -40,6 +40,7 @@ CARGO_CRATES=	adler-0.2.3 \
 		cassowary-0.3.0 \
 		cc-1.0.47 \
 		cfg-if-0.1.9 \
+		cfg-if-1.0.0 \
 		chrono-0.4.9 \
 		clap-2.33.0 \
 		clicolors-control-1.0.1 \
@@ -203,7 +204,7 @@ CARGO_CRATES=	adler-0.2.3 \
 		slab-0.4.2 \
 		smallvec-0.6.13 \
 		smallvec-1.0.0 \
-		socket2-0.3.11 \
+		socket2-0.3.19 \
 		strsim-0.8.0 \
 		structopt-0.2.18 \
 		structopt-0.3.4 \

diff --git a/net-mgmt/bandwhich/distinfo b/net-mgmt/bandwhich/distinfo
@@ -1,4 +1,4 @@
-TIMESTAMP = 1635678584
+TIMESTAMP = 1665743615
 SHA256 (rust/crates/adler-0.2.3.crate) = ee2a4ec343196209d6594e19543ae87a39f96d5534d7174822a3ad825dd6ed7e
 SIZE (rust/crates/adler-0.2.3.crate) = 12168
 SHA256 (rust/crates/adler32-1.2.0.crate) = aae1277d39aeec15cb388266ecc24b11c80469deae6067e17a1a7aa9e5c1f234
@@ -49,6 +49,8 @@ SHA256 (rust/crates/cc-1.0.47.crate) = aa87058dce70a3ff5621797f1506cb837edd02ac4
 SIZE (rust/crates/cc-1.0.47.crate) = 49645
 SHA256 (rust/crates/cfg-if-0.1.9.crate) = b486ce3ccf7ffd79fdeb678eac06a9e6c09fc88d33836340becb8fffe87c5e33
 SIZE (rust/crates/cfg-if-0.1.9.crate) = 7353
+SHA256 (rust/crates/cfg-if-1.0.0.crate) = baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd
+SIZE (rust/crates/cfg-if-1.0.0.crate) = 7934
 SHA256 (rust/crates/chrono-0.4.9.crate) = e8493056968583b0193c1bb04d6f7684586f3726992d6c573261941a895dbd68
 SIZE (rust/crates/chrono-0.4.9.crate) = 133671
 SHA256 (rust/crates/clap-2.33.0.crate) = 5067f5bb2d80ef5d68b4c87db81601f0b75bca627bc2ef76b141d7b846a3c6d9
@@ -375,8 +377,8 @@ SHA256 (rust/crates/smallvec-0.6.13.crate) = f7b0758c52e15a8b5e3691eae6cc559f08e
 SIZE (rust/crates/smallvec-0.6.13.crate) = 22760
 SHA256 (rust/crates/smallvec-1.0.0.crate) = 4ecf3b85f68e8abaa7555aa5abdb1153079387e60b718283d732f03897fcfc86
 SIZE (rust/crates/smallvec-1.0.0.crate) = 22962
-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/strsim-0.8.0.crate) = 8ea5119cdb4c55b55d432abb513a0429384878c15dde60cc77b1c99de1a95a6a
 SIZE (rust/crates/strsim-0.8.0.crate) = 9309
 SHA256 (rust/crates/structopt-0.2.18.crate) = 16c2cdbf9cc375f15d1b4141bc48aeef444806655cd0e904207edc8d68d86ed7

diff --git a/net-mgmt/bandwhich/files/patch-rust-1.64.0 b/net-mgmt/bandwhich/files/patch-rust-1.64.0
@@ -0,0 +1,81 @@
+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	2020-10-15 09:05:36 UTC
++++ Cargo.lock
+@@ -214,6 +214,12 @@ source = "registry+https://github.com/rust-lang/crates
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+
+ [[package]]
++name = "cfg-if"
++version = "1.0.0"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd"
++
++[[package]]
+ name = "chrono"
+ version = "0.4.9"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+@@ -716,7 +722,7 @@ dependencies = [
+ version = "0.2.1"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+ dependencies = [
+- "socket2 0.3.11 (registry+https://github.com/rust-lang/crates.io-index)",
++ "socket2 0.3.19 (registry+https://github.com/rust-lang/crates.io-index)",
+  "widestring 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
+  "winapi 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)",
+  "winreg 0.6.2 (registry+https://github.com/rust-lang/crates.io-index)",
+@@ -900,7 +906,7 @@ dependencies = [
+ version = "0.3.5"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+ dependencies = [
+- "socket2 0.3.11 (registry+https://github.com/rust-lang/crates.io-index)",
++ "socket2 0.3.19 (registry+https://github.com/rust-lang/crates.io-index)",
+  "winapi 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)",
+ ]
+
+@@ -1643,7 +1649,7 @@ name = "socket2"
+
+ [[package]]
+ name = "socket2"
+-version = "0.3.11"
++version = "0.3.19"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+ dependencies = [
+  "cfg-if 0.1.9 (registry+https://github.com/rust-lang/crates.io-index)",
+@@ -1889,7 +1895,7 @@ dependencies = [
+  "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)",
+  "rand 0.7.2 (registry+https://github.com/rust-lang/crates.io-index)",
+  "smallvec 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)",
+- "socket2 0.3.11 (registry+https://github.com/rust-lang/crates.io-index)",
++ "socket2 0.3.19 (registry+https://github.com/rust-lang/crates.io-index)",
+  "tokio 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)",
+  "url 2.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ ]
+@@ -2146,6 +2152,7 @@ dependencies = [
+ "checksum cassowary 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)" = "df8670b8c7b9dae1793364eafadf7239c40d669904660c5960d74cfd80b46a53"
+ "checksum cc 1.0.47 (registry+https://github.com/rust-lang/crates.io-index)" = "aa87058dce70a3ff5621797f1506cb837edd02ac4c0ae642b4542dce802908b8"
+ "checksum cfg-if 0.1.9 (registry+https://github.com/rust-lang/crates.io-index)" = "b486ce3ccf7ffd79fdeb678eac06a9e6c09fc88d33836340becb8fffe87c5e33"
++"checksum cfg-if 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)" = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd"
+ "checksum chrono 0.4.9 (registry+https://github.com/rust-lang/crates.io-index)" = "e8493056968583b0193c1bb04d6f7684586f3726992d6c573261941a895dbd68"
+ "checksum clap 2.33.0 (registry+https://github.com/rust-lang/crates.io-index)" = "5067f5bb2d80ef5d68b4c87db81601f0b75bca627bc2ef76b141d7b846a3c6d9"
+ "checksum clicolors-control 1.0.1 (registry+https://github.com/rust-lang/crates.io-index)" = "90082ee5dcdd64dc4e9e0d37fbf3ee325419e39c0092191e0393df65518f741e"
+@@ -2310,7 +2317,7 @@ dependencies = [
+ "checksum slab 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)" = "c111b5bd5695e56cffe5129854aa230b39c93a305372fdbb2668ca2394eea9f8"
+ "checksum smallvec 0.6.13 (registry+https://github.com/rust-lang/crates.io-index)" = "f7b0758c52e15a8b5e3691eae6cc559f08eee9406e548a4477ba4e67770a82b6"
+ "checksum smallvec 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)" = "4ecf3b85f68e8abaa7555aa5abdb1153079387e60b718283d732f03897fcfc86"
+-"checksum socket2 0.3.11 (registry+https://github.com/rust-lang/crates.io-index)" = "e8b74de517221a2cb01a53349cf54182acdc31a074727d3079068448c0676d85"
++"checksum socket2 0.3.19 (registry+https://github.com/rust-lang/crates.io-index)" = "122e570113d28d773067fab24266b66753f6ea915758651696b6e35e49f88d6e"
+ "checksum strsim 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)" = "8ea5119cdb4c55b55d432abb513a0429384878c15dde60cc77b1c99de1a95a6a"
+ "checksum structopt 0.2.18 (registry+https://github.com/rust-lang/crates.io-index)" = "16c2cdbf9cc375f15d1b4141bc48aeef444806655cd0e904207edc8d68d86ed7"
+ "checksum structopt 0.3.4 (registry+https://github.com/rust-lang/crates.io-index)" = "c167b61c7d4c126927f5346a4327ce20abf8a186b8041bbeb1ce49e5db49587b"