community/zenith: fix build

    error: failed to run custom build command for `linux-taskstats v0.2.0`
    thread 'main' panicked at '"__kernel_sockaddr_storage_union_(anonymous_at_/usr/include/linux/socket_h_17_2)" is not a valid Ident', /home/buildozer/.cargo/registry/src/index.crates.io-1cd66030c949c28d/proc-macro2-1.0.47/src/fallback.rs:756:9

2 files changed, 418 insertions, 1 deletions

diff --git a/community/zenith/APKBUILD b/community/zenith/APKBUILD
index 1adc98a26e9..5041131d101 100644
--- a/community/zenith/APKBUILD
+++ b/community/zenith/APKBUILD
@@ -15,7 +15,9 @@ makedepends="
 	linux-headers
 	llvm-dev
 	"
-source="https://github.com/bvaisvil/zenith/archive/$pkgver/zenith-$pkgver.tar.gz"
+source="https://github.com/bvaisvil/zenith/archive/$pkgver/zenith-$pkgver.tar.gz
+	update-linux-taskstats.patch
+	"
 # !check: no tests provided
 # net: fetch dependencies
 options="!check net"
@@ -40,4 +42,5 @@ package() {
 
 sha512sums="
 dac74b0fa9e3563655dc1e9cbdda7e809791d2c9d865ba990dfbd020d6f01a52585595feb28f60fa4f3ada147dc21d2a953062c8b5eeecfa77be5bfc378a055a  zenith-0.14.0.tar.gz
+c71f8bd8fceec4a441b46d212b17ec08af1b595d9a034e145db821832a382094700913f29dc15721e13385afd1482b55f55cfb1be1be07638291966cd8bea954  update-linux-taskstats.patch
 "
diff --git a/community/zenith/update-linux-taskstats.patch b/community/zenith/update-linux-taskstats.patch
new file mode 100644
index 00000000000..8112d6bfbd5
--- /dev/null
+++ b/community/zenith/update-linux-taskstats.patch
@@ -0,0 +1,414 @@
+--- a/Cargo.toml
++++ b/Cargo.toml
+@@ -39,4 +39,4 @@
+ nvml-wrapper = { version = "0.8.0", optional = true }
+ unicode-width = "0.1.9"
+ [target.'cfg(target_os = "linux")'.dependencies]
+-linux-taskstats = { version = "0.2.0", default-features = false }
++linux-taskstats = { version = "0.4.0", default-features = false }
+--- a/Cargo.lock
++++ b/Cargo.lock
+@@ -9,15 +9,6 @@
+ checksum = "f26201604c87b1e01bd3d98f8d5d9a8fcbb815e8cedb41ffccbeb4bf593a35fe"
+ 
+ [[package]]
+-name = "aho-corasick"
+-version = "0.7.15"
+-source = "registry+https://github.com/rust-lang/crates.io-index"
+-checksum = "7404febffaa47dac81aa44dba71523c9d069b1bdc50a77db41195149e17f68e5"
+-dependencies = [
+- "memchr",
+-]
+-
+-[[package]]
+ name = "android_system_properties"
+ version = "0.1.5"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+@@ -27,15 +18,6 @@
+ ]
+ 
+ [[package]]
+-name = "ansi_term"
+-version = "0.12.1"
+-source = "registry+https://github.com/rust-lang/crates.io-index"
+-checksum = "d52a9bb7ec0cf484c551830a7ce27bd20d67eac647e1befb56b0be4ee39a55d2"
+-dependencies = [
+- "winapi",
+-]
+-
+-[[package]]
+ name = "async-channel"
+ version = "1.7.1"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+@@ -146,7 +128,7 @@
+ dependencies = [
+  "proc-macro2",
+  "quote",
+- "syn",
++ "syn 1.0.103",
+ ]
+ 
+ [[package]]
+@@ -156,17 +138,6 @@
+ checksum = "065374052e7df7ee4047b1160cca5e1467a12351a40b3da123c870ba0b8eda2a"
+ 
+ [[package]]
+-name = "atty"
+-version = "0.2.14"
+-source = "registry+https://github.com/rust-lang/crates.io-index"
+-checksum = "d9b39be18770d11421cdb1b9947a45dd3f37e93092cbf377614828a319d5fee8"
+-dependencies = [
+- "hermit-abi",
+- "libc",
+- "winapi",
+-]
+-
+-[[package]]
+ name = "autocfg"
+ version = "1.1.0"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+@@ -183,15 +154,13 @@
+ 
+ [[package]]
+ name = "bindgen"
+-version = "0.59.2"
++version = "0.63.0"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+-checksum = "2bd2a9a458e8f4304c52c43ebb0cfbd520289f8379a52e329a38afda99bf8eb8"
++checksum = "36d860121800b2a9a94f9b5604b332d5cffb234ce17609ea479d723dbc9d3885"
+ dependencies = [
+  "bitflags",
+  "cexpr",
+  "clang-sys",
+- "clap",
+- "env_logger 0.9.1",
+  "lazy_static",
+  "lazycell",
+  "log",
+@@ -201,6 +170,7 @@
+  "regex",
+  "rustc-hash",
+  "shlex",
++ "syn 1.0.103",
+  "which",
+ ]
+ 
+@@ -312,21 +282,6 @@
+ ]
+ 
+ [[package]]
+-name = "clap"
+-version = "2.34.0"
+-source = "registry+https://github.com/rust-lang/crates.io-index"
+-checksum = "a0610544180c38b88101fecf2dd634b174a62eef6946f84dfc6a7127512b381c"
+-dependencies = [
+- "ansi_term",
+- "atty",
+- "bitflags",
+- "strsim 0.8.0",
+- "textwrap",
+- "unicode-width",
+- "vec_map",
+-]
+-
+-[[package]]
+ name = "codespan-reporting"
+ version = "0.11.1"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+@@ -478,7 +433,7 @@
+  "proc-macro2",
+  "quote",
+  "scratch",
+- "syn",
++ "syn 1.0.103",
+ ]
+ 
+ [[package]]
+@@ -495,7 +450,7 @@
+ dependencies = [
+  "proc-macro2",
+  "quote",
+- "syn",
++ "syn 1.0.103",
+ ]
+ 
+ [[package]]
+@@ -518,8 +473,8 @@
+  "ident_case",
+  "proc-macro2",
+  "quote",
+- "strsim 0.9.3",
+- "syn",
++ "strsim",
++ "syn 1.0.103",
+ ]
+ 
+ [[package]]
+@@ -530,7 +485,7 @@
+ dependencies = [
+  "darling_core",
+  "quote",
+- "syn",
++ "syn 1.0.103",
+ ]
+ 
+ [[package]]
+@@ -588,19 +543,6 @@
+ 
+ [[package]]
+ name = "env_logger"
+-version = "0.9.1"
+-source = "registry+https://github.com/rust-lang/crates.io-index"
+-checksum = "c90bf5f19754d10198ccb95b70664fc925bd1fc090a0fd9a6ebc54acc8cd6272"
+-dependencies = [
+- "atty",
+- "humantime",
+- "log",
+- "regex",
+- "termcolor",
+-]
+-
+-[[package]]
+-name = "env_logger"
+ version = "0.10.0"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+ checksum = "85cdab6a89accf66733ad5a1693a4dcced6aeff64602b634530dd73c1f3ee9f0"
+@@ -710,7 +652,7 @@
+ dependencies = [
+  "proc-macro2",
+  "quote",
+- "syn",
++ "syn 1.0.103",
+ ]
+ 
+ [[package]]
+@@ -783,7 +725,7 @@
+ dependencies = [
+  "proc-macro2",
+  "quote",
+- "syn",
++ "syn 1.0.103",
+ ]
+ 
+ [[package]]
+@@ -969,12 +911,6 @@
+ ]
+ 
+ [[package]]
+-name = "humantime"
+-version = "2.1.0"
+-source = "registry+https://github.com/rust-lang/crates.io-index"
+-checksum = "9a3a5bfb195931eeb336b2a7b4d761daec841b97f947d34394601737a7bba5e4"
+-
+-[[package]]
+ name = "iana-time-zone"
+ version = "0.1.53"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+@@ -1036,9 +972,9 @@
+ 
+ [[package]]
+ name = "libc"
+-version = "0.2.137"
++version = "0.2.140"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+-checksum = "fc7fcc620a3bff7cdd7a365be3376c97191aeaccc2a603e600951e452615bf89"
++checksum = "99227334921fae1a979cf0bfdfcc6b3e5ce376ef57e16fb6fb3ea2ed6095f80c"
+ 
+ [[package]]
+ name = "libloading"
+@@ -1061,9 +997,9 @@
+ 
+ [[package]]
+ name = "linux-taskstats"
+-version = "0.2.0"
++version = "0.4.0"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+-checksum = "b5fe0070f80bc563d4fc21f2b064eb314a944ad167edb64dc76eb37fa8826401"
++checksum = "60fdd14efd42f7d3383f76d5da9cbc1056ac6497be7352eadfabef14a5d699c0"
+ dependencies = [
+  "bindgen",
+  "libc",
+@@ -1199,7 +1135,7 @@
+ dependencies = [
+  "proc-macro2",
+  "quote",
+- "syn",
++ "syn 1.0.103",
+ ]
+ 
+ [[package]]
+@@ -1349,18 +1285,18 @@
+ 
+ [[package]]
+ name = "proc-macro2"
+-version = "1.0.47"
++version = "1.0.54"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+-checksum = "5ea3d908b0e36316caf9e9e2c4625cdde190a7e6f440d794667ed17a1855e725"
++checksum = "e472a104799c74b514a57226160104aa483546de37e839ec50e3c2e41dd87534"
+ dependencies = [
+  "unicode-ident",
+ ]
+ 
+ [[package]]
+ name = "quote"
+-version = "1.0.21"
++version = "1.0.26"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+-checksum = "bbe448f377a7d6961e30f5955f9b8d106c3f5e449d493ee1b125c1d43c2b5179"
++checksum = "4424af4bf778aae2051a77b60283332f386554255d722233d09fbfc7e30da2fc"
+ dependencies = [
+  "proc-macro2",
+ ]
+@@ -1420,20 +1356,18 @@
+ 
+ [[package]]
+ name = "regex"
+-version = "1.4.6"
++version = "1.7.3"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+-checksum = "2a26af418b574bd56588335b3a3659a65725d4e636eb1016c2f9e3b38c7cc759"
++checksum = "8b1f693b24f6ac912f4893ef08244d70b6067480d2f1a46e950c9691e6749d1d"
+ dependencies = [
+- "aho-corasick",
+- "memchr",
+  "regex-syntax",
+ ]
+ 
+ [[package]]
+ name = "regex-syntax"
+-version = "0.6.27"
++version = "0.6.29"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+-checksum = "a3f87b73ce11b1619a3c6332f45341e0047173771e8b8b73f87bfeefb7b56244"
++checksum = "f162c6dd7b008981e4d40210aca20b4bd0f9b60ca9271061b07f78537722f2e1"
+ 
+ [[package]]
+ name = "rustc-hash"
+@@ -1470,7 +1404,7 @@
+ dependencies = [
+  "proc-macro2",
+  "quote",
+- "syn",
++ "syn 1.0.103",
+ ]
+ 
+ [[package]]
+@@ -1577,12 +1511,6 @@
+ 
+ [[package]]
+ name = "strsim"
+-version = "0.8.0"
+-source = "registry+https://github.com/rust-lang/crates.io-index"
+-checksum = "8ea5119cdb4c55b55d432abb513a0429384878c15dde60cc77b1c99de1a95a6a"
+-
+-[[package]]
+-name = "strsim"
+ version = "0.9.3"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+ checksum = "6446ced80d6c486436db5c078dde11a9f73d42b57fb273121e160b84f63d894c"
+@@ -1599,6 +1527,17 @@
+ ]
+ 
+ [[package]]
++name = "syn"
++version = "2.0.10"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "5aad1363ed6d37b84299588d62d3a7d95b5a5c2d9aad5c85609fda12afaa1f40"
++dependencies = [
++ "proc-macro2",
++ "quote",
++ "unicode-ident",
++]
++
++[[package]]
+ name = "sysinfo"
+ version = "0.15.1"
+ source = "git+https://github.com/bvaisvil/sysinfo.git?branch=zenith_changes_15.1#bcff3dc5c5b53320c53984cef5773ed850001fd8"
+@@ -1622,32 +1561,23 @@
+ ]
+ 
+ [[package]]
+-name = "textwrap"
+-version = "0.11.0"
+-source = "registry+https://github.com/rust-lang/crates.io-index"
+-checksum = "d326610f408c7a4eb6f51c37c330e496b08506c9457c9d34287ecc38809fb060"
+-dependencies = [
+- "unicode-width",
+-]
+-
+-[[package]]
+ name = "thiserror"
+-version = "1.0.37"
++version = "1.0.40"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+-checksum = "10deb33631e3c9018b9baf9dcbbc4f737320d2b576bac10f6aefa048fa407e3e"
++checksum = "978c9a314bd8dc99be594bc3c175faaa9794be04a5a5e153caba6915336cebac"
+ dependencies = [
+  "thiserror-impl",
+ ]
+ 
+ [[package]]
+ name = "thiserror-impl"
+-version = "1.0.37"
++version = "1.0.40"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+-checksum = "982d17546b47146b28f7c22e3d08465f6b8903d0ea13c1660d9d84a6e7adcdbb"
++checksum = "f9456a42c5b0d803c8cd86e73dd7cc9edd429499f37a3550d286d5e86720569f"
+ dependencies = [
+  "proc-macro2",
+  "quote",
+- "syn",
++ "syn 2.0.10",
+ ]
+ 
+ [[package]]
+@@ -1736,12 +1666,6 @@
+ checksum = "5190c9442dcdaf0ddd50f37420417d219ae5261bbf5db120d0f9bab996c9cba1"
+ 
+ [[package]]
+-name = "vec_map"
+-version = "0.8.2"
+-source = "registry+https://github.com/rust-lang/crates.io-index"
+-checksum = "f1bddf1187be692e79c5ffeab891132dfb0f236ed36a43c7ed39f1165ee20191"
+-
+-[[package]]
+ name = "waker-fn"
+ version = "1.1.0"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+@@ -1780,7 +1704,7 @@
+  "once_cell",
+  "proc-macro2",
+  "quote",
+- "syn",
++ "syn 1.0.103",
+  "wasm-bindgen-shared",
+ ]
+ 
+@@ -1802,7 +1726,7 @@
+ dependencies = [
+  "proc-macro2",
+  "quote",
+- "syn",
++ "syn 1.0.103",
+  "wasm-bindgen-backend",
+  "wasm-bindgen-shared",
+ ]
+@@ -1936,7 +1860,7 @@
+  "darling",
+  "proc-macro2",
+  "quote",
+- "syn",
++ "syn 1.0.103",
+ ]
+ 
+ [[package]]
+@@ -1948,7 +1872,7 @@
+  "chrono",
+  "crossterm",
+  "dirs-next",
+- "env_logger 0.10.0",
++ "env_logger",
+  "flate2",
+  "futures",
+  "gumdrop",