Date: Thu, 9 May 2024 19:43:03 GMT From: Jan Beich <jbeich@FreeBSD.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-branches@FreeBSD.org Subject: git: 73f7e9c3e7ed - 2024Q2 - devel/busd: update to 0.3.1 Message-ID: <202405091943.449Jh3Fl092481@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch 2024Q2 has been updated by jbeich: URL: https://cgit.FreeBSD.org/ports/commit/?id=73f7e9c3e7ed22983c4b621b6520af4221a0b131 commit 73f7e9c3e7ed22983c4b621b6520af4221a0b131 Author: Jan Beich <jbeich@FreeBSD.org> AuthorDate: 2024-05-09 13:51:26 +0000 Commit: Jan Beich <jbeich@FreeBSD.org> CommitDate: 2024-05-09 19:42:57 +0000 devel/busd: update to 0.3.1 Changes: https://github.com/dbus2/busd/releases/tag/0.3.1 Reported by: GitHub (watch releases) (cherry picked from commit b0c6b341225d029385dee455dab79bd34311d3e9) --- devel/busd/Makefile | 3 +- devel/busd/Makefile.crates | 12 ++--- devel/busd/distinfo | 30 ++++++------ devel/busd/files/patch-zbus | 114 -------------------------------------------- 4 files changed, 22 insertions(+), 137 deletions(-) diff --git a/devel/busd/Makefile b/devel/busd/Makefile index 3a8ffc92d850..cd9324c07776 100644 --- a/devel/busd/Makefile +++ b/devel/busd/Makefile @@ -1,6 +1,5 @@ PORTNAME= busd -DISTVERSION= 0.3.0 -PORTREVISION= 2 +DISTVERSION= 0.3.1 CATEGORIES= devel MAINTAINER= jbeich@FreeBSD.org diff --git a/devel/busd/Makefile.crates b/devel/busd/Makefile.crates index 3bde8f433582..2bce4b0f1a3e 100644 --- a/devel/busd/Makefile.crates +++ b/devel/busd/Makefile.crates @@ -6,7 +6,7 @@ CARGO_CRATES= addr2line-0.21.0 \ anstyle-parse-0.2.3 \ anstyle-query-1.0.2 \ anstyle-wincon-3.0.2 \ - anyhow-1.0.82 \ + anyhow-1.0.83 \ async-broadcast-0.7.0 \ async-channel-2.2.0 \ async-io-2.3.1 \ @@ -124,7 +124,7 @@ CARGO_CRATES= addr2line-0.21.0 \ polling-3.4.0 \ ppv-lite86-0.2.17 \ proc-macro-crate-3.1.0 \ - proc-macro2-1.0.78 \ + proc-macro2-1.0.82 \ prost-0.12.3 \ prost-derive-0.12.3 \ prost-types-0.12.3 \ @@ -141,8 +141,8 @@ CARGO_CRATES= addr2line-0.21.0 \ rustix-0.38.31 \ rustversion-1.0.14 \ ryu-1.0.16 \ - serde-1.0.199 \ - serde_derive-1.0.199 \ + serde-1.0.201 \ + serde_derive-1.0.201 \ serde_json-1.0.113 \ serde_repr-0.1.19 \ sha1-0.10.6 \ @@ -204,8 +204,8 @@ CARGO_CRATES= addr2line-0.21.0 \ windows_x86_64_msvc-0.52.0 \ winnow-0.5.39 \ xdg-home-1.1.0 \ - zbus-4.2.0 \ - zbus_macros-4.2.0 \ + zbus-4.2.1 \ + zbus_macros-4.2.1 \ zbus_names-3.0.0 \ zvariant-4.0.3 \ zvariant_derive-4.0.3 \ diff --git a/devel/busd/distinfo b/devel/busd/distinfo index d7ade3cbba24..3381f927ac34 100644 --- a/devel/busd/distinfo +++ b/devel/busd/distinfo @@ -1,4 +1,4 @@ -TIMESTAMP = 1714562550 +TIMESTAMP = 1715262686 SHA256 (rust/crates/addr2line-0.21.0.crate) = 8a30b2e23b9e17a9f90641c7ab1549cd9b44f296d3ccbf309d2863cfe398a0cb SIZE (rust/crates/addr2line-0.21.0.crate) = 40807 SHA256 (rust/crates/adler-1.0.2.crate) = f26201604c87b1e01bd3d98f8d5d9a8fcbb815e8cedb41ffccbeb4bf593a35fe @@ -15,8 +15,8 @@ SHA256 (rust/crates/anstyle-query-1.0.2.crate) = e28923312444cdd728e4738b3f9c9ca SIZE (rust/crates/anstyle-query-1.0.2.crate) = 8739 SHA256 (rust/crates/anstyle-wincon-3.0.2.crate) = 1cd54b81ec8d6180e24654d0b371ad22fc3dd083b6ff8ba325b72e00c87660a7 SIZE (rust/crates/anstyle-wincon-3.0.2.crate) = 11272 -SHA256 (rust/crates/anyhow-1.0.82.crate) = f538837af36e6f6a9be0faa67f9a314f8119e4e4b5867c6ab40ed60360142519 -SIZE (rust/crates/anyhow-1.0.82.crate) = 45361 +SHA256 (rust/crates/anyhow-1.0.83.crate) = 25bdb32cbbdce2b519a9cd7df3a678443100e265d5e25ca763b7572a5104f5f3 +SIZE (rust/crates/anyhow-1.0.83.crate) = 45650 SHA256 (rust/crates/async-broadcast-0.7.0.crate) = 258b52a1aa741b9f09783b2d86cf0aeeb617bbf847f6933340a39644227acbdb SIZE (rust/crates/async-broadcast-0.7.0.crate) = 20852 SHA256 (rust/crates/async-channel-2.2.0.crate) = f28243a43d821d11341ab73c80bed182dc015c514b951616cf79bd4af39af0c3 @@ -251,8 +251,8 @@ SHA256 (rust/crates/ppv-lite86-0.2.17.crate) = 5b40af805b3121feab8a3c29f04d8ad26 SIZE (rust/crates/ppv-lite86-0.2.17.crate) = 22242 SHA256 (rust/crates/proc-macro-crate-3.1.0.crate) = 6d37c51ca738a55da99dc0c4a34860fd675453b8b36209178c2249bb13651284 SIZE (rust/crates/proc-macro-crate-3.1.0.crate) = 11084 -SHA256 (rust/crates/proc-macro2-1.0.78.crate) = e2422ad645d89c99f8f3e6b88a9fdeca7fabeac836b1002371c4367c8f984aae -SIZE (rust/crates/proc-macro2-1.0.78.crate) = 47158 +SHA256 (rust/crates/proc-macro2-1.0.82.crate) = 8ad3d49ab951a01fbaafe34f2ec74122942fe18a3f9814c3268f1bb72042131b +SIZE (rust/crates/proc-macro2-1.0.82.crate) = 48452 SHA256 (rust/crates/prost-0.12.3.crate) = 146c289cda302b98a28d40c8b3b90498d6e526dd24ac2ecea73e4e491685b94a SIZE (rust/crates/prost-0.12.3.crate) = 29461 SHA256 (rust/crates/prost-derive-0.12.3.crate) = efb6c9a1dd1def8e2124d17e83a20af56f1570d6c2d2bd9e266ccb768df3840e @@ -285,10 +285,10 @@ SHA256 (rust/crates/rustversion-1.0.14.crate) = 7ffc183a10b4478d04cbbbfc96d08732 SIZE (rust/crates/rustversion-1.0.14.crate) = 17261 SHA256 (rust/crates/ryu-1.0.16.crate) = f98d2aa92eebf49b69786be48e4477826b256916e84a57ff2a4f21923b48eb4c SIZE (rust/crates/ryu-1.0.16.crate) = 47351 -SHA256 (rust/crates/serde-1.0.199.crate) = 0c9f6e76df036c77cd94996771fb40db98187f096dd0b9af39c6c6e452ba966a -SIZE (rust/crates/serde-1.0.199.crate) = 77598 -SHA256 (rust/crates/serde_derive-1.0.199.crate) = 11bd257a6541e141e42ca6d24ae26f7714887b47e89aa739099104c7e4d3b7fc -SIZE (rust/crates/serde_derive-1.0.199.crate) = 55793 +SHA256 (rust/crates/serde-1.0.201.crate) = 780f1cebed1629e4753a1a38a3c72d30b97ec044f0aef68cb26650a3c5cf363c +SIZE (rust/crates/serde-1.0.201.crate) = 77725 +SHA256 (rust/crates/serde_derive-1.0.201.crate) = c5e405930b9796f1c00bee880d03fc7e0bb4b9a11afc776885ffe84320da2865 +SIZE (rust/crates/serde_derive-1.0.201.crate) = 55865 SHA256 (rust/crates/serde_json-1.0.113.crate) = 69801b70b1c3dac963ecb03a364ba0ceda9cf60c71cfe475e99864759c8b8a79 SIZE (rust/crates/serde_json-1.0.113.crate) = 146970 SHA256 (rust/crates/serde_repr-0.1.19.crate) = 6c64451ba24fc7a6a2d60fc75dd9c83c90903b19028d4eff35e88fc1e86564e9 @@ -411,10 +411,10 @@ SHA256 (rust/crates/winnow-0.5.39.crate) = 5389a154b01683d28c77f8f68f49dea75f0a4 SIZE (rust/crates/winnow-0.5.39.crate) = 159300 SHA256 (rust/crates/xdg-home-1.1.0.crate) = 21e5a325c3cb8398ad6cf859c1135b25dd29e186679cf2da7581d9679f63b38e SIZE (rust/crates/xdg-home-1.1.0.crate) = 3600 -SHA256 (rust/crates/zbus-4.2.0.crate) = 6aea58d1af0aaa8abf87f3d9ade9b8f46bf13727e5f9fb24bc31ee9d94a9b4ad -SIZE (rust/crates/zbus-4.2.0.crate) = 156978 -SHA256 (rust/crates/zbus_macros-4.2.0.crate) = 1bf2b496ec1e2d3c4a7878e351607f7a2bec1e1029b353683dfc28a22999e369 -SIZE (rust/crates/zbus_macros-4.2.0.crate) = 28836 +SHA256 (rust/crates/zbus-4.2.1.crate) = e5915716dff34abef1351d2b10305b019c8ef33dcf6c72d31a6e227d5d9d7a21 +SIZE (rust/crates/zbus-4.2.1.crate) = 157271 +SHA256 (rust/crates/zbus_macros-4.2.1.crate) = 66fceb36d0c1c4a6b98f3ce40f410e64e5a134707ed71892e1b178abc4c695d4 +SIZE (rust/crates/zbus_macros-4.2.1.crate) = 28865 SHA256 (rust/crates/zbus_names-3.0.0.crate) = 4b9b1fef7d021261cc16cba64c351d291b715febe0fa10dc3a443ac5a5022e6c SIZE (rust/crates/zbus_names-3.0.0.crate) = 10650 SHA256 (rust/crates/zvariant-4.0.3.crate) = 4e9282c6945d9e27742ba7ad7191325546636295de7b83f6735af73159b32ac7 @@ -423,5 +423,5 @@ SHA256 (rust/crates/zvariant_derive-4.0.3.crate) = 0142549e559746ff09d194dd43d25 SIZE (rust/crates/zvariant_derive-4.0.3.crate) = 11000 SHA256 (rust/crates/zvariant_utils-1.1.1.crate) = 75fa7291bdd68cd13c4f97cc9d78cbf16d96305856dfc7ac942aeff4c2de7d5a SIZE (rust/crates/zvariant_utils-1.1.1.crate) = 6859 -SHA256 (dbus2-busd-0.3.0_GH0.tar.gz) = 250c31099015c54b71ccbdd762286815694ab2dd571d9a25db99620cff34c0b6 -SIZE (dbus2-busd-0.3.0_GH0.tar.gz) = 40667 +SHA256 (dbus2-busd-0.3.1_GH0.tar.gz) = bf7c860702b3e70cfb0503c07e5d2b0a261cf45bcd2dd560cfd30aa5a7709676 +SIZE (dbus2-busd-0.3.1_GH0.tar.gz) = 40665 diff --git a/devel/busd/files/patch-zbus b/devel/busd/files/patch-zbus deleted file mode 100644 index 194aa47b6311..000000000000 --- a/devel/busd/files/patch-zbus +++ /dev/null @@ -1,114 +0,0 @@ -https://github.com/dbus2/zbus/pull/757 - ---- cargo-crates/zbus-4.2.0/src/connection/handshake/client.rs.orig 2006-07-24 01:21:28 UTC -+++ cargo-crates/zbus-4.2.0/src/connection/handshake/client.rs -@@ -95,21 +95,16 @@ impl Client { - #[instrument(skip(self))] - #[cfg(any(target_os = "freebsd", target_os = "dragonfly"))] - async fn send_zero_byte(&mut self) -> Result<()> { -- let written = self -- .common -- .socket_mut() -- .write_mut() -- .send_zero_byte() -- .await -- .map_err(|e| { -- Error::Handshake(format!("Could not send zero byte with credentials: {}", e)) -- }) -- .and_then(|n| match n { -- None => Err(Error::Handshake( -- "Could not send zero byte with credentials".to_string(), -- )), -- Some(n) => Ok(n), -- })?; -+ let write = self.common.socket_mut().write_mut(); -+ -+ let written = match write.send_zero_byte().await.map_err(|e| { -+ Error::Handshake(format!("Could not send zero byte with credentials: {}", e)) -+ })? { -+ // This likely means that the socket type is unable to send SCM_CREDS. -+ // Let's try to send the 0 byte as a regular message. -+ None => write.sendmsg(&[0], &[]).await?, -+ Some(n) => n, -+ }; - - if written != 1 { - return Err(Error::Handshake( ---- cargo-crates/zbus-4.2.0/src/connection/handshake/common.rs.orig 2006-07-24 01:21:28 UTC -+++ cargo-crates/zbus-4.2.0/src/connection/handshake/common.rs -@@ -122,17 +122,13 @@ impl Common { - if self.first_command { - // The first command is sent by the client so we can assume it's the server. - self.first_command = false; -- // leading 0 is sent separately for `freebsd` and `dragonfly`. -- #[cfg(not(any(target_os = "freebsd", target_os = "dragonfly")))] -- { -- if self.recv_buffer[0] != b'\0' { -- return Err(Error::Handshake( -- "First client byte is not NUL!".to_string(), -- )); -- } -- -- start_index = 1; -+ if self.recv_buffer[0] != b'\0' { -+ return Err(Error::Handshake( -+ "First client byte is not NUL!".to_string(), -+ )); - } -+ -+ start_index = 1; - }; - - let line_bytes = self.recv_buffer.drain(..=lf_index); ---- cargo-crates/zbus-4.2.0/src/connection/socket/tcp.rs.orig 2006-07-24 01:21:28 UTC -+++ cargo-crates/zbus-4.2.0/src/connection/socket/tcp.rs -@@ -26,32 +26,25 @@ impl ReadHalf for Arc<Async<TcpStream>> { - } - } - -+ #[cfg(windows)] - async fn peer_credentials(&mut self) -> io::Result<crate::fdo::ConnectionCredentials> { -- #[cfg(windows)] -- let creds = { -- let stream = self.clone(); -- crate::Task::spawn_blocking( -- move || { -- use crate::win32::{tcp_stream_get_peer_pid, ProcessToken}; -+ let stream = self.clone(); -+ crate::Task::spawn_blocking( -+ move || { -+ use crate::win32::{tcp_stream_get_peer_pid, ProcessToken}; - -- let pid = tcp_stream_get_peer_pid(stream.get_ref())? as _; -- let sid = ProcessToken::open(if pid != 0 { Some(pid as _) } else { None }) -- .and_then(|process_token| process_token.sid())?; -- io::Result::Ok( -- crate::fdo::ConnectionCredentials::default() -- .set_process_id(pid) -- .set_windows_sid(sid), -- ) -- }, -- "peer credentials", -- ) -- .await -- }?; -- -- #[cfg(not(windows))] -- let creds = crate::fdo::ConnectionCredentials::default(); -- -- Ok(creds) -+ let pid = tcp_stream_get_peer_pid(stream.get_ref())? as _; -+ let sid = ProcessToken::open(if pid != 0 { Some(pid as _) } else { None }) -+ .and_then(|process_token| process_token.sid())?; -+ io::Result::Ok( -+ crate::fdo::ConnectionCredentials::default() -+ .set_process_id(pid) -+ .set_windows_sid(sid), -+ ) -+ }, -+ "peer credentials", -+ ) -+ .await - } - } -
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202405091943.449Jh3Fl092481>