Date: Sun, 28 May 2023 18:21:45 GMT From: =?utf-8?Q?Stefan=20E=C3=9Fer?= <se@FreeBSD.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org Subject: git: 31d32a206ade - main - sysutils/erdtree: update to version 3.0.0 Message-ID: <202305281821.34SILjdu094348@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch main has been updated by se: URL: https://cgit.FreeBSD.org/ports/commit/?id=31d32a206ade807e5f5cafaa5561251f42307dfa commit 31d32a206ade807e5f5cafaa5561251f42307dfa Author: Stefan Eßer <se@FreeBSD.org> AuthorDate: 2023-05-28 18:21:32 +0000 Commit: Stefan Eßer <se@FreeBSD.org> CommitDate: 2023-05-28 18:21:32 +0000 sysutils/erdtree: update to version 3.0.0 --- sysutils/erdtree/Makefile | 2 +- sysutils/erdtree/Makefile.crates | 19 +++++++++++- sysutils/erdtree/distinfo | 44 ++++++++++++++++++++++++---- sysutils/erdtree/files/patch-src_fs_xattr.rs | 19 ++++++++++-- 4 files changed, 74 insertions(+), 10 deletions(-) diff --git a/sysutils/erdtree/Makefile b/sysutils/erdtree/Makefile index 2a7963b80f58..b38928852760 100644 --- a/sysutils/erdtree/Makefile +++ b/sysutils/erdtree/Makefile @@ -1,6 +1,6 @@ PORTNAME= erdtree DISTVERSIONPREFIX= v -DISTVERSION= 2.0.0 +DISTVERSION= 3.0.0 CATEGORIES= sysutils MAINTAINER= se@FreeBSD.org diff --git a/sysutils/erdtree/Makefile.crates b/sysutils/erdtree/Makefile.crates index 821bcea2f621..8f1ec2e8de5f 100644 --- a/sysutils/erdtree/Makefile.crates +++ b/sysutils/erdtree/Makefile.crates @@ -15,16 +15,21 @@ CARGO_CRATES= aho-corasick-0.7.20 \ clap_lex-0.3.3 \ codespan-reporting-0.11.1 \ core-foundation-sys-0.8.4 \ + crossterm-0.26.1 \ + crossterm_winapi-0.9.0 \ cxx-1.0.94 \ cxx-build-1.0.94 \ cxxbridge-flags-1.0.94 \ cxxbridge-macro-1.0.94 \ + dirs-5.0.0 \ + dirs-sys-0.4.0 \ errno-0.2.8 \ - errno-0.3.0 \ + errno-0.3.1 \ errno-dragonfly-0.1.2 \ fastrand-1.9.0 \ filesize-0.2.0 \ fnv-1.0.7 \ + getrandom-0.2.9 \ globset-0.4.10 \ heck-0.4.1 \ hermit-abi-0.3.1 \ @@ -42,27 +47,37 @@ CARGO_CRATES= aho-corasick-0.7.20 \ link-cplusplus-1.0.8 \ linux-raw-sys-0.1.4 \ linux-raw-sys-0.3.1 \ + lock_api-0.4.9 \ log-0.4.17 \ lscolors-0.13.0 \ memchr-2.5.0 \ + mio-0.8.6 \ nu-ansi-term-0.46.0 \ num-integer-0.1.45 \ num-traits-0.2.15 \ once_cell-1.17.1 \ os_str_bytes-6.4.1 \ overload-0.1.1 \ + parking_lot-0.12.1 \ + parking_lot_core-0.9.7 \ proc-macro-error-1.0.4 \ proc-macro-error-attr-1.0.4 \ proc-macro2-1.0.52 \ quote-1.0.26 \ redox_syscall-0.2.16 \ + redox_users-0.4.3 \ regex-1.7.3 \ regex-syntax-0.6.29 \ rustix-0.36.9 \ rustix-0.37.7 \ same-file-1.0.6 \ + scopeguard-1.1.0 \ scratch-1.0.5 \ serde-1.0.156 \ + signal-hook-0.3.15 \ + signal-hook-mio-0.2.3 \ + signal-hook-registry-1.4.1 \ + smallvec-1.10.0 \ strip-ansi-escapes-0.1.1 \ strsim-0.10.0 \ syn-1.0.109 \ @@ -81,6 +96,7 @@ CARGO_CRATES= aho-corasick-0.7.20 \ vte_generate_state_changes-0.1.1 \ walkdir-2.3.3 \ wasi-0.10.0+wasi-snapshot-preview1 \ + wasi-0.11.0+wasi-snapshot-preview1 \ wasm-bindgen-0.2.84 \ wasm-bindgen-backend-0.2.84 \ wasm-bindgen-macro-0.2.84 \ @@ -93,6 +109,7 @@ CARGO_CRATES= aho-corasick-0.7.20 \ windows-0.48.0 \ windows-sys-0.42.0 \ windows-sys-0.45.0 \ + windows-sys-0.48.0 \ windows-targets-0.42.2 \ windows-targets-0.48.0 \ windows_aarch64_gnullvm-0.42.2 \ diff --git a/sysutils/erdtree/distinfo b/sysutils/erdtree/distinfo index 6ce8efba9813..aa2ded92ce51 100644 --- a/sysutils/erdtree/distinfo +++ b/sysutils/erdtree/distinfo @@ -1,4 +1,4 @@ -TIMESTAMP = 1682538635 +TIMESTAMP = 1685273310 SHA256 (rust/crates/aho-corasick-0.7.20.crate) = cc936419f96fa211c1b9166887b38e5e40b19958e5b895be7c1f93adec7071ac SIZE (rust/crates/aho-corasick-0.7.20.crate) = 111440 SHA256 (rust/crates/android_system_properties-0.1.5.crate) = 819e7219dbd41043ac279b19830f2efc897156490d7fd6ea916720117ee66311 @@ -33,6 +33,10 @@ SHA256 (rust/crates/codespan-reporting-0.11.1.crate) = 3538270d33cc669650c4b0938 SIZE (rust/crates/codespan-reporting-0.11.1.crate) = 48963 SHA256 (rust/crates/core-foundation-sys-0.8.4.crate) = e496a50fda8aacccc86d7529e2c1e0892dbd0f898a6b5645b5561b89c3210efa SIZE (rust/crates/core-foundation-sys-0.8.4.crate) = 17725 +SHA256 (rust/crates/crossterm-0.26.1.crate) = a84cda67535339806297f1b331d6dd6320470d2a0fe65381e79ee9e156dd3d13 +SIZE (rust/crates/crossterm-0.26.1.crate) = 122317 +SHA256 (rust/crates/crossterm_winapi-0.9.0.crate) = 2ae1b35a484aa10e07fe0638d02301c5ad24de82d310ccbd2f3693da5f09bf1c +SIZE (rust/crates/crossterm_winapi-0.9.0.crate) = 15561 SHA256 (rust/crates/cxx-1.0.94.crate) = f61f1b6389c3fe1c316bf8a4dccc90a38208354b330925bce1f74a6c4756eb93 SIZE (rust/crates/cxx-1.0.94.crate) = 196058 SHA256 (rust/crates/cxx-build-1.0.94.crate) = 12cee708e8962df2aeb38f594aae5d827c022b6460ac71a7a3e2c3c2aae5a07b @@ -41,10 +45,14 @@ SHA256 (rust/crates/cxxbridge-flags-1.0.94.crate) = 7944172ae7e4068c533afbb98411 SIZE (rust/crates/cxxbridge-flags-1.0.94.crate) = 5253 SHA256 (rust/crates/cxxbridge-macro-1.0.94.crate) = 2345488264226bf682893e25de0769f3360aac9957980ec49361b083ddaa5bc5 SIZE (rust/crates/cxxbridge-macro-1.0.94.crate) = 59873 +SHA256 (rust/crates/dirs-5.0.0.crate) = dece029acd3353e3a58ac2e3eb3c8d6c35827a892edc6cc4138ef9c33df46ecd +SIZE (rust/crates/dirs-5.0.0.crate) = 12235 +SHA256 (rust/crates/dirs-sys-0.4.0.crate) = 04414300db88f70d74c5ff54e50f9e1d1737d9a5b90f53fcf2e95ca2a9ab554b +SIZE (rust/crates/dirs-sys-0.4.0.crate) = 10509 SHA256 (rust/crates/errno-0.2.8.crate) = f639046355ee4f37944e44f60642c6f3a7efa3cf6b78c78a0d989a8ce6c396a1 SIZE (rust/crates/errno-0.2.8.crate) = 9276 -SHA256 (rust/crates/errno-0.3.0.crate) = 50d6a0976c999d473fe89ad888d5a284e55366d9dc9038b1ba2aa15128c4afa0 -SIZE (rust/crates/errno-0.3.0.crate) = 10268 +SHA256 (rust/crates/errno-0.3.1.crate) = 4bcfec3a70f97c962c307b2d2c56e358cf1d00b558d74262b5f929ee8cc7e73a +SIZE (rust/crates/errno-0.3.1.crate) = 10348 SHA256 (rust/crates/errno-dragonfly-0.1.2.crate) = aa68f1b12764fab894d2755d2518754e71b4fd80ecfb822714a1206c2aab39bf SIZE (rust/crates/errno-dragonfly-0.1.2.crate) = 1810 SHA256 (rust/crates/fastrand-1.9.0.crate) = e51093e27b0797c359783294ca4f0a911c270184cb10f85783b118614a1501be @@ -53,6 +61,8 @@ SHA256 (rust/crates/filesize-0.2.0.crate) = 12d741e2415d4e2e5bd1c1d00409d1a8865a SIZE (rust/crates/filesize-0.2.0.crate) = 5066 SHA256 (rust/crates/fnv-1.0.7.crate) = 3f9eec918d3f24069decb9af1554cad7c880e2da24a9afd88aca000531ab82c1 SIZE (rust/crates/fnv-1.0.7.crate) = 11266 +SHA256 (rust/crates/getrandom-0.2.9.crate) = c85e1d9ab2eadba7e5040d4e09cbd6d072b76a557ad64e797c2cb9d4da21d7e4 +SIZE (rust/crates/getrandom-0.2.9.crate) = 34457 SHA256 (rust/crates/globset-0.4.10.crate) = 029d74589adefde59de1a0c4f4732695c32805624aec7b68d91503d4dba79afc SIZE (rust/crates/globset-0.4.10.crate) = 22923 SHA256 (rust/crates/heck-0.4.1.crate) = 95505c38b4572b2d910cecb0281560f54b440a19336cbbcb27bf6ce6adc6f5a8 @@ -87,12 +97,16 @@ SHA256 (rust/crates/linux-raw-sys-0.1.4.crate) = f051f77a7c8e6957c0696eac88f26b0 SIZE (rust/crates/linux-raw-sys-0.1.4.crate) = 878981 SHA256 (rust/crates/linux-raw-sys-0.3.1.crate) = d59d8c75012853d2e872fb56bc8a2e53718e2cafe1a4c823143141c6d90c322f SIZE (rust/crates/linux-raw-sys-0.3.1.crate) = 932203 +SHA256 (rust/crates/lock_api-0.4.9.crate) = 435011366fe56583b16cf956f9df0095b405b82d76425bc8981c0e22e60ec4df +SIZE (rust/crates/lock_api-0.4.9.crate) = 25685 SHA256 (rust/crates/log-0.4.17.crate) = abb12e687cfb44aa40f41fc3978ef76448f9b6038cad6aef4259d3c095a2382e SIZE (rust/crates/log-0.4.17.crate) = 38028 SHA256 (rust/crates/lscolors-0.13.0.crate) = c2dedc85d67baf5327114fad78ab9418f8893b1121c17d5538dd11005ad1ddf2 SIZE (rust/crates/lscolors-0.13.0.crate) = 21948 SHA256 (rust/crates/memchr-2.5.0.crate) = 2dffe52ecf27772e601905b7522cb4ef790d2cc203488bbd0e2fe85fcb74566d SIZE (rust/crates/memchr-2.5.0.crate) = 65812 +SHA256 (rust/crates/mio-0.8.6.crate) = 5b9d9a46eff5b4ff64b45a9e316a6d1e0bc719ef429cbec4dc630684212bfdf9 +SIZE (rust/crates/mio-0.8.6.crate) = 93658 SHA256 (rust/crates/nu-ansi-term-0.46.0.crate) = 77a8165726e8236064dbb45459242600304b42a5ea24ee2948e18e023bf7ba84 SIZE (rust/crates/nu-ansi-term-0.46.0.crate) = 24311 SHA256 (rust/crates/num-integer-0.1.45.crate) = 225d3389fb3509a24c93f5c29eb6bde2586b98d9f016636dff58d7c6f7569cd9 @@ -105,6 +119,10 @@ SHA256 (rust/crates/os_str_bytes-6.4.1.crate) = 9b7820b9daea5457c9f21c69448905d7 SIZE (rust/crates/os_str_bytes-6.4.1.crate) = 23101 SHA256 (rust/crates/overload-0.1.1.crate) = b15813163c1d831bf4a13c3610c05c0d03b39feb07f7e09fa234dac9b15aaf39 SIZE (rust/crates/overload-0.1.1.crate) = 24439 +SHA256 (rust/crates/parking_lot-0.12.1.crate) = 3742b2c103b9f06bc9fff0a37ff4912935851bee6d36f3c02bcc755bcfec228f +SIZE (rust/crates/parking_lot-0.12.1.crate) = 40967 +SHA256 (rust/crates/parking_lot_core-0.9.7.crate) = 9069cbb9f99e3a5083476ccb29ceb1de18b9118cafa53e90c9551235de2b9521 +SIZE (rust/crates/parking_lot_core-0.9.7.crate) = 32412 SHA256 (rust/crates/proc-macro-error-1.0.4.crate) = da25490ff9892aab3fcf7c36f08cfb902dd3e71ca0f9f9517bea02a73a5ce38c SIZE (rust/crates/proc-macro-error-1.0.4.crate) = 25293 SHA256 (rust/crates/proc-macro-error-attr-1.0.4.crate) = a1be40180e52ecc98ad80b184934baf3d0d29f979574e439af5a55274b35f869 @@ -115,6 +133,8 @@ SHA256 (rust/crates/quote-1.0.26.crate) = 4424af4bf778aae2051a77b60283332f386554 SIZE (rust/crates/quote-1.0.26.crate) = 28397 SHA256 (rust/crates/redox_syscall-0.2.16.crate) = fb5a58c1855b4b6819d59012155603f0b22ad30cad752600aadfcb695265519a SIZE (rust/crates/redox_syscall-0.2.16.crate) = 24012 +SHA256 (rust/crates/redox_users-0.4.3.crate) = b033d837a7cf162d7993aded9304e30a83213c648b6e389db233191f891e5c2b +SIZE (rust/crates/redox_users-0.4.3.crate) = 15353 SHA256 (rust/crates/regex-1.7.3.crate) = 8b1f693b24f6ac912f4893ef08244d70b6067480d2f1a46e950c9691e6749d1d SIZE (rust/crates/regex-1.7.3.crate) = 239886 SHA256 (rust/crates/regex-syntax-0.6.29.crate) = f162c6dd7b008981e4d40210aca20b4bd0f9b60ca9271061b07f78537722f2e1 @@ -125,10 +145,20 @@ SHA256 (rust/crates/rustix-0.37.7.crate) = 2aae838e49b3d63e9274e1c01833cc8139d3f SIZE (rust/crates/rustix-0.37.7.crate) = 307751 SHA256 (rust/crates/same-file-1.0.6.crate) = 93fc1dc3aaa9bfed95e02e6eadabb4baf7e3078b0bd1b4d7b6b0b68378900502 SIZE (rust/crates/same-file-1.0.6.crate) = 10183 +SHA256 (rust/crates/scopeguard-1.1.0.crate) = d29ab0c6d3fc0ee92fe66e2d99f700eab17a8d57d1c1d3b748380fb20baa78cd +SIZE (rust/crates/scopeguard-1.1.0.crate) = 11470 SHA256 (rust/crates/scratch-1.0.5.crate) = 1792db035ce95be60c3f8853017b3999209281c24e2ba5bc8e59bf97a0c590c1 SIZE (rust/crates/scratch-1.0.5.crate) = 8013 SHA256 (rust/crates/serde-1.0.156.crate) = 314b5b092c0ade17c00142951e50ced110ec27cea304b1037c6969246c2469a4 SIZE (rust/crates/serde-1.0.156.crate) = 77019 +SHA256 (rust/crates/signal-hook-0.3.15.crate) = 732768f1176d21d09e076c23a93123d40bba92d50c4058da34d45c8de8e682b9 +SIZE (rust/crates/signal-hook-0.3.15.crate) = 50138 +SHA256 (rust/crates/signal-hook-mio-0.2.3.crate) = 29ad2e15f37ec9a6cc544097b78a1ec90001e9f71b81338ca39f430adaca99af +SIZE (rust/crates/signal-hook-mio-0.2.3.crate) = 9064 +SHA256 (rust/crates/signal-hook-registry-1.4.1.crate) = d8229b473baa5980ac72ef434c4415e70c4b5e71b423043adb4ba059f89c99a1 +SIZE (rust/crates/signal-hook-registry-1.4.1.crate) = 17987 +SHA256 (rust/crates/smallvec-1.10.0.crate) = a507befe795404456341dfab10cef66ead4c041f62b8b11bbb92bffe5d0953e0 +SIZE (rust/crates/smallvec-1.10.0.crate) = 31564 SHA256 (rust/crates/strip-ansi-escapes-0.1.1.crate) = 011cbb39cf7c1f62871aea3cc46e5817b0937b49e9447370c93cacbe93a766d8 SIZE (rust/crates/strip-ansi-escapes-0.1.1.crate) = 8668 SHA256 (rust/crates/strsim-0.10.0.crate) = 73473c0e59e6d5812c5dfe2a064a6444949f089e20eec9a2e5506596494e4623 @@ -165,6 +195,8 @@ SHA256 (rust/crates/walkdir-2.3.3.crate) = 36df944cda56c7d8d8b7496af378e6b16de92 SIZE (rust/crates/walkdir-2.3.3.crate) = 23125 SHA256 (rust/crates/wasi-0.10.0+wasi-snapshot-preview1.crate) = 1a143597ca7c7793eff794def352d41792a93c481eb1042423ff7ff72ba2c31f SIZE (rust/crates/wasi-0.10.0+wasi-snapshot-preview1.crate) = 26964 +SHA256 (rust/crates/wasi-0.11.0+wasi-snapshot-preview1.crate) = 9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423 +SIZE (rust/crates/wasi-0.11.0+wasi-snapshot-preview1.crate) = 28131 SHA256 (rust/crates/wasm-bindgen-0.2.84.crate) = 31f8dcbc21f30d9b8f2ea926ecb58f6b91192c17e9d33594b3df58b2007ca53b SIZE (rust/crates/wasm-bindgen-0.2.84.crate) = 172947 SHA256 (rust/crates/wasm-bindgen-backend-0.2.84.crate) = 95ce90fd5bcc06af55a641a86428ee4229e44e07033963a2290a8e241607ccb9 @@ -189,6 +221,8 @@ SHA256 (rust/crates/windows-sys-0.42.0.crate) = 5a3e1820f08b8513f676f7ab6c1f99ff SIZE (rust/crates/windows-sys-0.42.0.crate) = 3006791 SHA256 (rust/crates/windows-sys-0.45.0.crate) = 75283be5efb2831d37ea142365f009c02ec203cd29a3ebecbc093d52315b66d0 SIZE (rust/crates/windows-sys-0.45.0.crate) = 2568659 +SHA256 (rust/crates/windows-sys-0.48.0.crate) = 677d2418bec65e3338edb076e806bc1ec15693c5d0104683f2efe857f61056a9 +SIZE (rust/crates/windows-sys-0.48.0.crate) = 2628884 SHA256 (rust/crates/windows-targets-0.42.2.crate) = 8e5180c00cd44c9b1c88adb3693291f1cd93605ded80c250a75d472756b4d071 SIZE (rust/crates/windows-targets-0.42.2.crate) = 5492 SHA256 (rust/crates/windows-targets-0.48.0.crate) = 7b1eb6f0cd7c80c79759c929114ef071b87354ce476d9d94271031c0497adfd5 @@ -221,5 +255,5 @@ SHA256 (rust/crates/windows_x86_64_msvc-0.42.2.crate) = 9aec5da331524158c6d1a4ac SIZE (rust/crates/windows_x86_64_msvc-0.42.2.crate) = 666936 SHA256 (rust/crates/windows_x86_64_msvc-0.48.0.crate) = 1a515f5799fe4961cb532f983ce2b23082366b898e52ffbce459c86f67c8378a SIZE (rust/crates/windows_x86_64_msvc-0.48.0.crate) = 671422 -SHA256 (solidiquis-erdtree-v2.0.0_GH0.tar.gz) = 9e85f1d92ce4668fa4648348e98aed53fdca4bcbf61c2d5ba53174d459693099 -SIZE (solidiquis-erdtree-v2.0.0_GH0.tar.gz) = 4004453 +SHA256 (solidiquis-erdtree-v3.0.0_GH0.tar.gz) = 6f296241e6bd47f9901dc4b6a711d842de73d3d66adadadfdd7709fc50637580 +SIZE (solidiquis-erdtree-v3.0.0_GH0.tar.gz) = 4709782 diff --git a/sysutils/erdtree/files/patch-src_fs_xattr.rs b/sysutils/erdtree/files/patch-src_fs_xattr.rs index 96d5fa2ce3ef..3a264cf3241e 100644 --- a/sysutils/erdtree/files/patch-src_fs_xattr.rs +++ b/sysutils/erdtree/files/patch-src_fs_xattr.rs @@ -1,6 +1,6 @@ ---- src/fs/xattr.rs.orig 2023-04-26 05:18:54 UTC +--- src/fs/xattr.rs.orig 2023-05-25 21:01:19 UTC +++ src/fs/xattr.rs -@@ -22,17 +22,5 @@ unsafe fn has_xattrs(path: &Path) -> bool { +@@ -22,17 +22,18 @@ unsafe fn has_xattrs(path: &Path) -> bool { /// Checks to see if a directory entry referred to by `path` has extended attributes. If the file /// at the provided `path` is symlink the file it points to is interrogated. unsafe fn has_xattrs(path: &Path) -> bool { @@ -12,10 +12,23 @@ - slice_ptr.cast::<c_char>() - }; - -- #[cfg(target_os = "linux")] +- #[cfg(not(target_os = "macos"))] - return 0 < listxattr(path_ptr, ptr::null_mut::<c_char>(), 0); - - #[cfg(target_os = "macos")] - return 0 < listxattr(path_ptr, ptr::null_mut::<c_char>(), 0, 0); ++// use libc::{c_char, listxattr}; ++// ++// let path_ptr = { ++// let slice = path.as_os_str().as_bytes(); ++// let slice_ptr = slice.as_ptr(); ++// slice_ptr.cast::<c_char>() ++// }; ++// ++// #[cfg(not(target_os = "macos"))] ++// return 0 < listxattr(path_ptr, ptr::null_mut::<c_char>(), 0); ++// ++// #[cfg(target_os = "macos")] ++// return 0 < listxattr(path_ptr, ptr::null_mut::<c_char>(), 0, 0); + return false; }
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202305281821.34SILjdu094348>