diff --git a/community/bpftop/APKBUILD b/community/bpftop/APKBUILD index 522f40ad7ed..db521249782 100644 --- a/community/bpftop/APKBUILD +++ b/community/bpftop/APKBUILD @@ -1,7 +1,7 @@ maintainer="Achill Gilgenast " pkgname=bpftop pkgver=0.8.0 -pkgrel=0 +pkgrel=1 pkgdesc="Dynamic real-time view of running eBPF programs" url="https://github.com/Netflix/bpftop" arch="all" @@ -13,7 +13,9 @@ makedepends=" elfutils-dev clang " -source="$pkgname-$pkgver.tar.gz::https://github.com/Netflix/bpftop/archive/refs/tags/v$pkgver.tar.gz" +source="$pkgname-$pkgver.tar.gz::https://github.com/Netflix/bpftop/archive/refs/tags/v$pkgver.tar.gz + bump-nix-crate.patch + " options="net" # crates prepare() { @@ -36,4 +38,5 @@ package() { sha512sums=" 03a1cd7baec4b75ba0ed5b9df43d5f6c5cfdeead6e19f7dce51ca6d7dabc930809061f3898e4a436008ab472ccc16592ca8aeff86238f59740a2ed068b00968d bpftop-0.8.0.tar.gz +731f3b4aac01381ad38a46b1080603dd56ffc1d51ae98ef6dafd22df970a7b5d5b7cccabacd523e3bab39e4036cf0b9052420b81d0ff7725495dc306fcb9a255 bump-nix-crate.patch " diff --git a/community/bpftop/bump-nix-crate.patch b/community/bpftop/bump-nix-crate.patch new file mode 100644 index 00000000000..62fe0f9b61d --- /dev/null +++ b/community/bpftop/bump-nix-crate.patch @@ -0,0 +1,293 @@ +--- a/Cargo.toml ++++ b/Cargo.toml +@@ -18,7 +18,7 @@ libbpf-sys = "1.5.0" + crossterm = "0.29.0" + anyhow = "1.0.99" + ratatui = { version = "0.30.0", default-features = false, features = ['crossterm'] } +-nix = { version = "0.29.0", features = ["user"] } ++nix = { version = "0.31.0", features = ["user"] } + circular-buffer = "1.1.0" + procfs = "0.18.0" + tui-input = "0.15.0" +--- a/Cargo.lock ++++ b/Cargo.lock +@@ -110,9 +110,9 @@ checksum = "0c4b4d0bd25bd0b74681c0ad2149 + + [[package]] + name = "base64" +-version = "0.22.1" ++version = "0.21.7" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "72b3254f16251a8381aa12e40e3c4d2f0199f8c6508fbecb9d91f575e0fbb8c6" ++checksum = "9d297deb1925b89f2ccc13d7635fa0714f12c87adce1c75356b39ca9b7178567" + + [[package]] + name = "bit-set" +@@ -161,7 +161,7 @@ dependencies = [ + "libbpf-cargo", + "libbpf-rs", + "libbpf-sys", +- "nix", ++ "nix 0.31.2", + "procfs", + "ratatui", + "tracing", +@@ -225,9 +225,13 @@ dependencies = [ + + [[package]] + name = "cc" +-version = "1.1.7" ++version = "1.2.60" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "26a5c3fd7bfa1ce3897a3a3501d362b2d87b7f2583ebcb4a949ec25911025cbc" ++checksum = "43c5703da9466b66a946814e1adf53ea2c90f10063b86290cc9eb67ce3478a20" ++dependencies = [ ++ "find-msvc-tools", ++ "shlex", ++] + + [[package]] + name = "cfg-if" +@@ -237,6 +241,12 @@ checksum = "9330f8b2ff13f34540b44e946ef3 + + [[package]] + name = "cfg_aliases" ++version = "0.1.1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "fd16c4719339c4530435d38e511904438d07cce7950afa3718a84ac36c10e89e" ++ ++[[package]] ++name = "cfg_aliases" + version = "0.2.1" + source = "registry+https://github.com/rust-lang/crates.io-index" + checksum = "613afe47fcd5fac7ccf1db93babcb082c5994d996f20b8b159f2ad1658eb5724" +@@ -514,6 +524,12 @@ dependencies = [ + ] + + [[package]] ++name = "find-msvc-tools" ++version = "0.1.9" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "5baebc0774151f905a1a2cc41989300b1e6fbb29aff0ceffa1064fdd3088d582" ++ ++[[package]] + name = "finl_unicode" + version = "1.4.0" + source = "registry+https://github.com/rust-lang/crates.io-index" +@@ -565,14 +581,13 @@ dependencies = [ + + [[package]] + name = "getrandom" +-version = "0.3.4" ++version = "0.2.17" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "899def5c37c4fd7b2664648c28120ecec138e4d395b459e5ca34f9cce2dd77fd" ++checksum = "ff2abc00be7fca6ebc474524697ae276ad847ad0a6b3faa4bcb027e9a4614ad0" + dependencies = [ + "cfg-if", + "libc", +- "r-efi 5.3.0", +- "wasip2", ++ "wasi", + ] + + [[package]] +@@ -583,7 +598,7 @@ checksum = "0de51e6874e94e7bf76d726fc5d1 + dependencies = [ + "cfg-if", + "libc", +- "r-efi 6.0.0", ++ "r-efi", + "wasip2", + "wasip3", + ] +@@ -775,20 +790,20 @@ dependencies = [ + + [[package]] + name = "libbpf-sys" +-version = "1.5.0+v1.5.0" ++version = "1.7.0+v1.7.0" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "2d8306b516a70a129cb6afed17c1e51e162d35aadfcc6339364addcebe32de90" ++checksum = "a109478760b2900aa2a6f2087e9d0de1d9c535b1758602af2845d5d2ccfaed7c" + dependencies = [ + "cc", +- "nix", ++ "nix 0.31.2", + "pkg-config", + ] + + [[package]] + name = "libc" +-version = "0.2.178" ++version = "0.2.185" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "37c93d8daa9d8a012fd8ab92f088405fb202ea0b6ab73ee2482ae66af4f42091" ++checksum = "52ff2c0fe9bc6cb6b14a0592c2ff4fa9ceb83eea9db979b0487cd054946a2b8f" + + [[package]] + name = "line-clipping" +@@ -844,11 +859,11 @@ dependencies = [ + + [[package]] + name = "mac_address" +-version = "1.1.8" ++version = "1.1.7" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "c0aeb26bf5e836cc1c341c8106051b573f1766dfa05aa87f0b98be5e51b02303" ++checksum = "8836fae9d0d4be2c8b4efcdd79e828a2faa058a90d005abf42f91cac5493a08e" + dependencies = [ +- "nix", ++ "nix 0.28.0", + "winapi", + ] + +@@ -912,18 +927,30 @@ dependencies = [ + + [[package]] + name = "nix" +-version = "0.29.0" ++version = "0.28.0" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "71e2746dc3a24dd78b3cfcb7be93368c6de9963d30f43a6a73998a9cf4b17b46" ++checksum = "ab2156c4fce2f8df6c499cc1c763e4394b7482525bf2a9701c9d79d215f519e4" + dependencies = [ + "bitflags 2.11.0", + "cfg-if", +- "cfg_aliases", ++ "cfg_aliases 0.1.1", + "libc", + "memoffset", + ] + + [[package]] ++name = "nix" ++version = "0.31.2" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "5d6d0705320c1e6ba1d912b5e37cf18071b6c2e9b7fa8215a1e8a7651966f5d3" ++dependencies = [ ++ "bitflags 2.11.0", ++ "cfg-if", ++ "cfg_aliases 0.2.1", ++ "libc", ++] ++ ++[[package]] + name = "nom" + version = "7.1.3" + source = "registry+https://github.com/rust-lang/crates.io-index" +@@ -1107,7 +1134,7 @@ version = "0.11.3" + source = "registry+https://github.com/rust-lang/crates.io-index" + checksum = "67eabc2ef2a60eb7faa00097bd1ffdb5bd28e62bf39990626a582201b7a754e5" + dependencies = [ +- "siphasher", ++ "siphasher 1.0.2", + ] + + [[package]] +@@ -1118,9 +1145,9 @@ checksum = "bda66fc9667c18cb2758a2ac84d1 + + [[package]] + name = "pkg-config" +-version = "0.3.30" ++version = "0.3.33" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "d231b230927b5e4ad203db57bbcbee2802f6bce620b1e4a9024a07d94e2907ec" ++checksum = "19f132c84eca552bf34cab8ec81f1c1dcc229b811638f9d283dceabe58c5569e" + + [[package]] + name = "portable-atomic" +@@ -1188,12 +1215,6 @@ dependencies = [ + + [[package]] + name = "r-efi" +-version = "5.3.0" +-source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "69cdb34c158ceb288df11e18b4bd39de994f6657d83847bdffdbd7f346754b0f" +- +-[[package]] +-name = "r-efi" + version = "6.0.0" + source = "registry+https://github.com/rust-lang/crates.io-index" + checksum = "f8dcc9c7d52a811697d2151c701e0d08956f92b0e24136cf4cf27b57a6a0d9bf" +@@ -1461,6 +1482,12 @@ dependencies = [ + ] + + [[package]] ++name = "shlex" ++version = "1.3.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "0fda2ff0d084019ba4d7c6f371c95d8fd75ce3524c3cb8fb653a3023f6323e64" ++ ++[[package]] + name = "signal-hook" + version = "0.3.17" + source = "registry+https://github.com/rust-lang/crates.io-index" +@@ -1492,6 +1519,12 @@ dependencies = [ + + [[package]] + name = "siphasher" ++version = "0.3.11" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "38b58827f4464d87d377d175e90bf58eb00fd8716ff0a62f80356b5e61555d0d" ++ ++[[package]] ++name = "siphasher" + version = "1.0.2" + source = "registry+https://github.com/rust-lang/crates.io-index" + checksum = "b2aa850e253778c88a04c3d7323b043aeda9d3e30d5971937c1855769763678e" +@@ -1592,9 +1625,9 @@ dependencies = [ + + [[package]] + name = "termwiz" +-version = "0.23.3" ++version = "0.23.0" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "4676b37242ccbd1aabf56edb093a4827dc49086c0ffd764a5705899e0f35f8f7" ++checksum = "ed32af792ae81937cb8640b03eaef737408e5c8feee47b35e8b80c49bcb64524" + dependencies = [ + "anyhow", + "base64", +@@ -1608,7 +1641,7 @@ dependencies = [ + "libc", + "log", + "memmem", +- "nix", ++ "nix 0.28.0", + "num-derive", + "num-traits", + "ordered-float", +@@ -1617,7 +1650,7 @@ dependencies = [ + "phf", + "sha2", + "signal-hook", +- "siphasher", ++ "siphasher 0.3.11", + "terminfo", + "termios", + "thiserror 1.0.69", +@@ -1992,12 +2025,13 @@ dependencies = [ + + [[package]] + name = "wezterm-blob-leases" +-version = "0.1.1" ++version = "0.1.0" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "692daff6d93d94e29e4114544ef6d5c942a7ed998b37abdc19b17136ea428eb7" ++checksum = "8e5a5e0adf7eed68976410def849a4bdab6f6e9f6163f152de9cb89deea9e60b" + dependencies = [ +- "getrandom 0.3.4", ++ "getrandom 0.2.17", + "mac_address", ++ "once_cell", + "sha2", + "thiserror 1.0.69", + "uuid", +@@ -2048,7 +2082,6 @@ dependencies = [ + "bitflags 1.3.2", + "euclid", + "lazy_static", +- "serde", + "wezterm-dynamic", + ] +