diff --git a/0001-lib-shim-v2-add-support-for-loongarch64.patch b/0001-lib-shim-v2-add-support-for-loongarch64.patch index 44ec073..f90b76c 100644 --- a/0001-lib-shim-v2-add-support-for-loongarch64.patch +++ b/0001-lib-shim-v2-add-support-for-loongarch64.patch @@ -1,6 +1,6 @@ -From 20ca47d68c406ae0eac306b1baf61e671fe1a66e Mon Sep 17 00:00:00 2001 -From: doupengda -Date: Thu, 18 Apr 2024 06:48:36 +0000 +From a7a9976b9dcd3197308ea5ce0cef4032bff75df8 Mon Sep 17 00:00:00 2001 +From: vegbir +Date: Thu, 16 Jan 2025 07:32:16 +0000 Subject: [PATCH] lib-shim-v2 add support for loongarch64 --- @@ -11,46 +11,48 @@ Subject: [PATCH] lib-shim-v2 add support for loongarch64 4 files changed, 5 insertions(+), 3 deletions(-) diff --git a/vendor/nix/.cargo-checksum.json b/vendor/nix/.cargo-checksum.json -index f6d4447..e08dfd1 100644 +index 221f98f..8499535 100644 --- a/vendor/nix/.cargo-checksum.json +++ b/vendor/nix/.cargo-checksum.json @@ -1 +1 @@ --{"files":{"CHANGELOG.md":"47ccde565d3bccf9947ae7192ebdef76cc06d22e27969287e420ccaacab3e936","CONTRIBUTING.md":"a9101e3d1487170d691d5f062ff49a433c167582ac8984dd41a744be92652f74","CONVENTIONS.md":"df0d4fe9fe65af0bfa4723dc7b641d5130087259799e6b404ad63884f79031cb","Cargo.toml":"10bb1283ca1dc67defbd1579a89bfffd6b4037dac93bcd63f0d719c5698b009d","LICENSE":"66e3ee1fa7f909ad3c612d556f2a0cdabcd809ad6e66f3b0605015ac64841b70","README.md":"a19b713af6c2516fbb47448d2220c83d83343db222e399937a9fc8f0881030a9","build.rs":"14c9c678c33f5894509da47f77d6a326b14aecb4190ce87a24cce98687ca63b2","src/dir.rs":"df41cf42ce92d284f70f0e7ff3ba171715f98eeba06284207e9fdb5ecf62f40b","src/errno.rs":"27bc724fd57ca9d614613e2023346fc7ac6eca4b0f6a24ed85c2e57ff221cc40","src/errno_dragonfly.c":"a857e47b114acb85fddcb252a610ab5734d225c26b7bedd7c35d7789d46c8526","src/fcntl.rs":"f491c98ee9aa1af6e02e11cd423abae21bd68dc3c4b847492a5aeff667bd4b44","src/features.rs":"22ff626ff8287a07dd55bcfc63c9f518c19c56144e15f9b6f9e3bbdcda51c2a8","src/ifaddrs.rs":"aff966a2b8eb46db2d9898157446607112bbf57d946d5dcd209aee967a230e41","src/kmod.rs":"4d8a695d3d761f351a39d654303a1bd168e74295b7d142b918737e355b24f34d","src/lib.rs":"d0a582b2185886f02419c2acd6fca0ebb6408ae5272227b72c55fa1e5ed658a2","src/macros.rs":"bf93a5a1869033e2ce2668269d8af0f40bf213c2fc5c279c9074e1eff389fa84","src/mount.rs":"cdf5db8409017483132db9d7493b5d6cc96df5560d0fa5ad8f385aff72db10ca","src/mqueue.rs":"e94e858814f66272b31a3669e9e19284f8131a92f9e5206bdd5971bb975b44d7","src/net/if_.rs":"f7e02076fcf3cadf3fdf141884c9bd2c468a7047ba60bc490f0057df802b53ce","src/net/mod.rs":"577f70170e53d4a6de1abb70bf8f1031ec3e65c0e63ef5fcf05c907125e7ac17","src/poll.rs":"e31ed102ee621a5e03d2893be3b22c3b2d7102f856a2f8979bab4438e6181b22","src/pty.rs":"9f2a92de983f3b9a76fe8d350e28b078056fe5d4cc3480d1684f54cd79bfd47a","src/sched.rs":"6651f0ea2f8792bca44e7228abdbea44536710f42de62ce043166df46cd349ab","src/sys/aio.rs":"e7d16a5711d90fff83dc25ab4b42d12d904aa9f2f75d3fd2f43e580db3f4dd64","src/sys/epoll.rs":"f0b539e0645569657f2142db91a38c94ebe1925f44852d64c61c818758dbbf0b","src/sys/event.rs":"88798385aed11be86da09b03f8ad2cd369a289ece926e89181b01ef32c77b863","src/sys/eventfd.rs":"08008cf3dc64c2216847c02c0dd8d7189cf08edbaafe35ba2c57c053fde09ef4","src/sys/inotify.rs":"687c8417d737939aa93f805d6003afc4f84f50828b1bd9429ef5d00bef0e0955","src/sys/ioctl/bsd.rs":"56ca6ecf5f7cfb566f4f3ba589fcc778f747a517dd45e13780981922e6215344","src/sys/ioctl/linux.rs":"642b25d3997518815dea454fa976e9067ad5fe4ed75622e7540e3f0d0c7d320a","src/sys/ioctl/mod.rs":"20bc3cf1fcbbc7c31e4d507baa4e576a793ea42fb33618d2e7afeda730c4324f","src/sys/memfd.rs":"11cd93c867fdbdbc9588cecb94268691de42b2ef2a38fe33525be7c7f60c85d5","src/sys/mman.rs":"f77d28611a7ff3bf62784a3c4f26d7d79969395b1d9bbc6ff15e734f52dc404f","src/sys/mod.rs":"f39a08c72e37638c7cecfb9c087e0a41e2b69409aa545b0ef7bbd59c0a063ee2","src/sys/pthread.rs":"cfa9ccd6f3b86c0c3fe012773c9c82a7813b298c2f20f8ab629781db627ce56b","src/sys/ptrace/bsd.rs":"279f5b3a1534b1f6a04a95b85eea6db7bc60250772df29e41810c4bc8cf815da","src/sys/ptrace/linux.rs":"254a613058b79801df987bdca336f8f60b606d4f923c69c85fe86ad05e271540","src/sys/ptrace/mod.rs":"671a6ccac955e75d5998f7e53ffc45ed4c7b6522a0f24a0937d60141f692dd39","src/sys/quota.rs":"754b90390e103e479cf009f1db5756fef547472893aaec078f55211c081a9e47","src/sys/reboot.rs":"fde9da27c2928f7026231430fa14fec2058df4e49a0aeda2a237a60524f11241","src/sys/select.rs":"152fef5e5add14c5e4522d0cfa22aa339feefd2914d6196be83a98f9a6f3d2a2","src/sys/sendfile.rs":"91aabfb801dcb1048a9f4f62d1d35d248ee806debca6c28414d0b0e1bcc6ae30","src/sys/signal.rs":"8c0c30875733743b29e4a6be23f7ba641d2f752f9e4cf8d3faba4a30f3ca6e61","src/sys/signalfd.rs":"fe90180bd099183e95130197f6288391ee1c76eaea0b601c9f3bfc530b2e073d","src/sys/socket/addr.rs":"f539ac91a88afcdbab3388e4841271b7ac9e5e1dbffe9399e64abbe96ab0b529","src/sys/socket/mod.rs":"d292c77c7642cf1fd643f0f10116e55e635e2d124e3add74751214325fe1c8e5","src/sys/socket/sockopt.rs":"069b90408386b00d155c6bcb7b60555297c05526c720468771f1bf9052661165","src/sys/stat.rs":"78c31f661fe652fd1b1b863f40b1118c42ddc6d8a850858ca6c14ae7a9ed5a01","src/sys/statfs.rs":"cc4100541a467f6728a7e208bcb2792c5c5230f1dac4a4d635bcb9a2a0afd09f","src/sys/statvfs.rs":"e10e7ae608c3a09a26aa6497a3b95a3c22efd7b1d8dac4a56760a7cb5e19eea0","src/sys/sysinfo.rs":"759ad12061d517753425d1a9b732d915fa4e77575949b684bc56a6d85164c3ca","src/sys/termios.rs":"dd359d248464d3eac991dad9ec49de4b25198fc0054f7363d9277b02cf955997","src/sys/time.rs":"5d3466c895b09e49454f866cec39b94d1a0ea91c0111d6412c77925183860849","src/sys/uio.rs":"60a974275ff8c485ea183bdd6f7e25894e6f2360a5bfb25442391a825a3b9b8c","src/sys/utsname.rs":"9509a092c837d1700f9f4ac30e4568e5b9b63ad8925a56cd8ad7add05d0ac452","src/sys/wait.rs":"a4cc7ac1a2d942c8b03dfadb1c6086eac89992919831a815f1d78e187edf0d0b","src/ucontext.rs":"ebf57ba74caaf073e3483d9cca479938b916941aacd2022db0d1c6fed4e9c841","src/unistd.rs":"be5bbbce2ea784db0f860dfaa4a2d1331596aeb3ab49d62083dffe22d34f23d4","test/sys/mod.rs":"e0821cbc289ad952f17229609c7de4282cca1e44cd13e1a7494a6378ecbc12f8","test/sys/test_aio.rs":"c9844cfd4259f1c84f4da2f9f32bba22f03ff71d7bea49da79e1b437b1ea3ead","test/sys/test_aio_drop.rs":"30dd1d238269d00381fa50f6d3cb2b13794b7cceb9f6455f3878fcbffa9aa62d","test/sys/test_epoll.rs":"35093d0cb1096a934dfc4f6efc737eadc4bdc2e2134d2a879061374a51b10c97","test/sys/test_inotify.rs":"a4f804bcf414b6635d9863c8534769a609009c451c3476cc839cdc30c439b3b1","test/sys/test_ioctl.rs":"5ae688bd9ec9ee25126459dfaf665d6bbd57568551db6492c27a415d1eb7eb15","test/sys/test_lio_listio_resubmit.rs":"203a583313542593148f375b087ae30620222a745680173fa98fc448d1e5ae7f","test/sys/test_pthread.rs":"3890e5ecbf2082e0d05d102cc9cec6e76ede3c15f250d104e3483b1c1c3400b1","test/sys/test_ptrace.rs":"9d7c0ba12d8957522ad274b915aa0b771c9c61981c74ad203dfc09510143ec23","test/sys/test_select.rs":"bdb20211fc6ec1e3f186337eac51e08757acb6901d307d67c71bf9011f0d54bd","test/sys/test_signal.rs":"2a208a9a458696f0e0e295bba641912c0711a50a931616ca9df60891c80a989b","test/sys/test_signalfd.rs":"9e75274113d23e65447b97ed7b6d4779c17930717db58d3a626a6b40ffd9e0f5","test/sys/test_socket.rs":"f62784f4f184880cdfd992da16284fe941381bbea56bbf9e5583365f731c2da6","test/sys/test_sockopt.rs":"b3d386c8279f86bf9439c772317bafcdba5630fa806c8319e87ddac0ccfa3a03","test/sys/test_sysinfo.rs":"1e1bea9130fe38ccb07cd0ad7334c7be1e45efc33f7656a5973f8cad7126f225","test/sys/test_termios.rs":"fa4be3ade859b527bf33408f85a6f57b127917cf5f2afb662d09f6019d07913a","test/sys/test_uio.rs":"259ce81677b453c3c9ad7271ef70fb41155d049a5c7c89e62f73ef3b57783705","test/sys/test_wait.rs":"832ebc04ad236d38f1b3b08305a136b2974532d318f4a38078ec98565e6e2415","test/test.rs":"8506471d3b19506d48a8e4b2d2b337fb10e2e75df12929e8f25f30cad2a5eb2e","test/test_dir.rs":"5d137a62f11d1a4993b4bb35dccc38a4c4416b7da374887f2335a9895b4fdee4","test/test_fcntl.rs":"b7a0504d019081783221851da608176c96ae5fd6036b33eee81e99f1a2b74fd6","test/test_kmod/hello_mod/Makefile":"0219f7bce0603f97d997fb377ca071966c90333ecc665e78a54dfeb97a9c811b","test/test_kmod/hello_mod/hello.c":"bcac6b19c5bd807e1f3878c15e426acc85785a8ade9840c3bb4d068635c9188c","test/test_kmod/mod.rs":"f4754f028402a8ba788c87686288424cd3784e77c7eb5d96682ef491b1dd5262","test/test_mount.rs":"78ddc657f5098360c764fffa3a7d844503e4b6b65b44bfd42d9aa9045b415cb6","test/test_mq.rs":"ee653fade4d769576702fa54440660d353ed7ab1284aa5a321f73fa1f6fedf93","test/test_net.rs":"ec6d580b87292519d514b0236bdd5abdd576fcf4835cfe49ed1ddb47c5f1aea3","test/test_nix_path.rs":"e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855","test/test_poll.rs":"46c71ee988fe1b85561ea0530d099750be8c1b8f95ab6e845c8a9f46f16f060c","test/test_pty.rs":"f6beeaa2d1ac30dfda9432f07413a4ab682f4d107904cb1d3d13a673a1b75dce","test/test_ptymaster_drop.rs":"5cfbbb79551c205ab510c2d4ef497bf937ceac9151fbe2f2e543d6515e406990","test/test_sched.rs":"f8ad92eb554164b0f92428f716db99040186d741cc6e1976f7930f099652f70c","test/test_sendfile.rs":"e0cbabbd34052ccaa03d6555d5631686aa076728f6378ee90f7ecec68f891144","test/test_stat.rs":"457af188428f64bf6c5744e152d92d2ee3d956d9892f75453666b98d6a8ee07d","test/test_unistd.rs":"694093e9e5b2c1d90d7513e34ba751221964aa3c8d861c9da8cf16481dff4cff"},"package":"dd0eaf8df8bab402257e0a5c17a254e4cc1f72a93588a1ddfb5d356c801aa7cb"} -+{"files":{"CHANGELOG.md":"47ccde565d3bccf9947ae7192ebdef76cc06d22e27969287e420ccaacab3e936","CONTRIBUTING.md":"a9101e3d1487170d691d5f062ff49a433c167582ac8984dd41a744be92652f74","CONVENTIONS.md":"df0d4fe9fe65af0bfa4723dc7b641d5130087259799e6b404ad63884f79031cb","Cargo.toml":"10bb1283ca1dc67defbd1579a89bfffd6b4037dac93bcd63f0d719c5698b009d","LICENSE":"66e3ee1fa7f909ad3c612d556f2a0cdabcd809ad6e66f3b0605015ac64841b70","README.md":"a19b713af6c2516fbb47448d2220c83d83343db222e399937a9fc8f0881030a9","build.rs":"14c9c678c33f5894509da47f77d6a326b14aecb4190ce87a24cce98687ca63b2","src/dir.rs":"df41cf42ce92d284f70f0e7ff3ba171715f98eeba06284207e9fdb5ecf62f40b","src/errno.rs":"27bc724fd57ca9d614613e2023346fc7ac6eca4b0f6a24ed85c2e57ff221cc40","src/errno_dragonfly.c":"a857e47b114acb85fddcb252a610ab5734d225c26b7bedd7c35d7789d46c8526","src/fcntl.rs":"f491c98ee9aa1af6e02e11cd423abae21bd68dc3c4b847492a5aeff667bd4b44","src/features.rs":"22ff626ff8287a07dd55bcfc63c9f518c19c56144e15f9b6f9e3bbdcda51c2a8","src/ifaddrs.rs":"aff966a2b8eb46db2d9898157446607112bbf57d946d5dcd209aee967a230e41","src/kmod.rs":"4d8a695d3d761f351a39d654303a1bd168e74295b7d142b918737e355b24f34d","src/lib.rs":"d0a582b2185886f02419c2acd6fca0ebb6408ae5272227b72c55fa1e5ed658a2","src/macros.rs":"bf93a5a1869033e2ce2668269d8af0f40bf213c2fc5c279c9074e1eff389fa84","src/mount.rs":"cdf5db8409017483132db9d7493b5d6cc96df5560d0fa5ad8f385aff72db10ca","src/mqueue.rs":"e94e858814f66272b31a3669e9e19284f8131a92f9e5206bdd5971bb975b44d7","src/net/if_.rs":"f7e02076fcf3cadf3fdf141884c9bd2c468a7047ba60bc490f0057df802b53ce","src/net/mod.rs":"577f70170e53d4a6de1abb70bf8f1031ec3e65c0e63ef5fcf05c907125e7ac17","src/poll.rs":"e31ed102ee621a5e03d2893be3b22c3b2d7102f856a2f8979bab4438e6181b22","src/pty.rs":"9f2a92de983f3b9a76fe8d350e28b078056fe5d4cc3480d1684f54cd79bfd47a","src/sched.rs":"6651f0ea2f8792bca44e7228abdbea44536710f42de62ce043166df46cd349ab","src/sys/aio.rs":"e7d16a5711d90fff83dc25ab4b42d12d904aa9f2f75d3fd2f43e580db3f4dd64","src/sys/epoll.rs":"f0b539e0645569657f2142db91a38c94ebe1925f44852d64c61c818758dbbf0b","src/sys/event.rs":"88798385aed11be86da09b03f8ad2cd369a289ece926e89181b01ef32c77b863","src/sys/eventfd.rs":"08008cf3dc64c2216847c02c0dd8d7189cf08edbaafe35ba2c57c053fde09ef4","src/sys/inotify.rs":"687c8417d737939aa93f805d6003afc4f84f50828b1bd9429ef5d00bef0e0955","src/sys/ioctl/bsd.rs":"56ca6ecf5f7cfb566f4f3ba589fcc778f747a517dd45e13780981922e6215344","src/sys/ioctl/linux.rs":"82076eeed8f315ed86d913655d326f5f6c49e62e460c27bc4a54bceb6c3e62c7","src/sys/ioctl/mod.rs":"20bc3cf1fcbbc7c31e4d507baa4e576a793ea42fb33618d2e7afeda730c4324f","src/sys/memfd.rs":"11cd93c867fdbdbc9588cecb94268691de42b2ef2a38fe33525be7c7f60c85d5","src/sys/mman.rs":"f77d28611a7ff3bf62784a3c4f26d7d79969395b1d9bbc6ff15e734f52dc404f","src/sys/mod.rs":"f39a08c72e37638c7cecfb9c087e0a41e2b69409aa545b0ef7bbd59c0a063ee2","src/sys/pthread.rs":"cfa9ccd6f3b86c0c3fe012773c9c82a7813b298c2f20f8ab629781db627ce56b","src/sys/ptrace/bsd.rs":"279f5b3a1534b1f6a04a95b85eea6db7bc60250772df29e41810c4bc8cf815da","src/sys/ptrace/linux.rs":"254a613058b79801df987bdca336f8f60b606d4f923c69c85fe86ad05e271540","src/sys/ptrace/mod.rs":"671a6ccac955e75d5998f7e53ffc45ed4c7b6522a0f24a0937d60141f692dd39","src/sys/quota.rs":"754b90390e103e479cf009f1db5756fef547472893aaec078f55211c081a9e47","src/sys/reboot.rs":"fde9da27c2928f7026231430fa14fec2058df4e49a0aeda2a237a60524f11241","src/sys/select.rs":"152fef5e5add14c5e4522d0cfa22aa339feefd2914d6196be83a98f9a6f3d2a2","src/sys/sendfile.rs":"91aabfb801dcb1048a9f4f62d1d35d248ee806debca6c28414d0b0e1bcc6ae30","src/sys/signal.rs":"8c0c30875733743b29e4a6be23f7ba641d2f752f9e4cf8d3faba4a30f3ca6e61","src/sys/signalfd.rs":"fe90180bd099183e95130197f6288391ee1c76eaea0b601c9f3bfc530b2e073d","src/sys/socket/addr.rs":"f539ac91a88afcdbab3388e4841271b7ac9e5e1dbffe9399e64abbe96ab0b529","src/sys/socket/mod.rs":"d292c77c7642cf1fd643f0f10116e55e635e2d124e3add74751214325fe1c8e5","src/sys/socket/sockopt.rs":"069b90408386b00d155c6bcb7b60555297c05526c720468771f1bf9052661165","src/sys/stat.rs":"78c31f661fe652fd1b1b863f40b1118c42ddc6d8a850858ca6c14ae7a9ed5a01","src/sys/statfs.rs":"cc4100541a467f6728a7e208bcb2792c5c5230f1dac4a4d635bcb9a2a0afd09f","src/sys/statvfs.rs":"e10e7ae608c3a09a26aa6497a3b95a3c22efd7b1d8dac4a56760a7cb5e19eea0","src/sys/sysinfo.rs":"759ad12061d517753425d1a9b732d915fa4e77575949b684bc56a6d85164c3ca","src/sys/termios.rs":"dd359d248464d3eac991dad9ec49de4b25198fc0054f7363d9277b02cf955997","src/sys/time.rs":"5d3466c895b09e49454f866cec39b94d1a0ea91c0111d6412c77925183860849","src/sys/uio.rs":"60a974275ff8c485ea183bdd6f7e25894e6f2360a5bfb25442391a825a3b9b8c","src/sys/utsname.rs":"9509a092c837d1700f9f4ac30e4568e5b9b63ad8925a56cd8ad7add05d0ac452","src/sys/wait.rs":"a4cc7ac1a2d942c8b03dfadb1c6086eac89992919831a815f1d78e187edf0d0b","src/ucontext.rs":"ebf57ba74caaf073e3483d9cca479938b916941aacd2022db0d1c6fed4e9c841","src/unistd.rs":"be5bbbce2ea784db0f860dfaa4a2d1331596aeb3ab49d62083dffe22d34f23d4","test/sys/mod.rs":"e0821cbc289ad952f17229609c7de4282cca1e44cd13e1a7494a6378ecbc12f8","test/sys/test_aio.rs":"c9844cfd4259f1c84f4da2f9f32bba22f03ff71d7bea49da79e1b437b1ea3ead","test/sys/test_aio_drop.rs":"30dd1d238269d00381fa50f6d3cb2b13794b7cceb9f6455f3878fcbffa9aa62d","test/sys/test_epoll.rs":"35093d0cb1096a934dfc4f6efc737eadc4bdc2e2134d2a879061374a51b10c97","test/sys/test_inotify.rs":"a4f804bcf414b6635d9863c8534769a609009c451c3476cc839cdc30c439b3b1","test/sys/test_ioctl.rs":"5ae688bd9ec9ee25126459dfaf665d6bbd57568551db6492c27a415d1eb7eb15","test/sys/test_lio_listio_resubmit.rs":"203a583313542593148f375b087ae30620222a745680173fa98fc448d1e5ae7f","test/sys/test_pthread.rs":"3890e5ecbf2082e0d05d102cc9cec6e76ede3c15f250d104e3483b1c1c3400b1","test/sys/test_ptrace.rs":"9d7c0ba12d8957522ad274b915aa0b771c9c61981c74ad203dfc09510143ec23","test/sys/test_select.rs":"bdb20211fc6ec1e3f186337eac51e08757acb6901d307d67c71bf9011f0d54bd","test/sys/test_signal.rs":"2a208a9a458696f0e0e295bba641912c0711a50a931616ca9df60891c80a989b","test/sys/test_signalfd.rs":"9e75274113d23e65447b97ed7b6d4779c17930717db58d3a626a6b40ffd9e0f5","test/sys/test_socket.rs":"f62784f4f184880cdfd992da16284fe941381bbea56bbf9e5583365f731c2da6","test/sys/test_sockopt.rs":"b3d386c8279f86bf9439c772317bafcdba5630fa806c8319e87ddac0ccfa3a03","test/sys/test_sysinfo.rs":"1e1bea9130fe38ccb07cd0ad7334c7be1e45efc33f7656a5973f8cad7126f225","test/sys/test_termios.rs":"fa4be3ade859b527bf33408f85a6f57b127917cf5f2afb662d09f6019d07913a","test/sys/test_uio.rs":"259ce81677b453c3c9ad7271ef70fb41155d049a5c7c89e62f73ef3b57783705","test/sys/test_wait.rs":"832ebc04ad236d38f1b3b08305a136b2974532d318f4a38078ec98565e6e2415","test/test.rs":"8506471d3b19506d48a8e4b2d2b337fb10e2e75df12929e8f25f30cad2a5eb2e","test/test_dir.rs":"5d137a62f11d1a4993b4bb35dccc38a4c4416b7da374887f2335a9895b4fdee4","test/test_fcntl.rs":"b7a0504d019081783221851da608176c96ae5fd6036b33eee81e99f1a2b74fd6","test/test_kmod/hello_mod/Makefile":"0219f7bce0603f97d997fb377ca071966c90333ecc665e78a54dfeb97a9c811b","test/test_kmod/hello_mod/hello.c":"bcac6b19c5bd807e1f3878c15e426acc85785a8ade9840c3bb4d068635c9188c","test/test_kmod/mod.rs":"f4754f028402a8ba788c87686288424cd3784e77c7eb5d96682ef491b1dd5262","test/test_mount.rs":"78ddc657f5098360c764fffa3a7d844503e4b6b65b44bfd42d9aa9045b415cb6","test/test_mq.rs":"ee653fade4d769576702fa54440660d353ed7ab1284aa5a321f73fa1f6fedf93","test/test_net.rs":"ec6d580b87292519d514b0236bdd5abdd576fcf4835cfe49ed1ddb47c5f1aea3","test/test_nix_path.rs":"e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855","test/test_poll.rs":"46c71ee988fe1b85561ea0530d099750be8c1b8f95ab6e845c8a9f46f16f060c","test/test_pty.rs":"f6beeaa2d1ac30dfda9432f07413a4ab682f4d107904cb1d3d13a673a1b75dce","test/test_ptymaster_drop.rs":"5cfbbb79551c205ab510c2d4ef497bf937ceac9151fbe2f2e543d6515e406990","test/test_sched.rs":"f8ad92eb554164b0f92428f716db99040186d741cc6e1976f7930f099652f70c","test/test_sendfile.rs":"e0cbabbd34052ccaa03d6555d5631686aa076728f6378ee90f7ecec68f891144","test/test_stat.rs":"457af188428f64bf6c5744e152d92d2ee3d956d9892f75453666b98d6a8ee07d","test/test_unistd.rs":"694093e9e5b2c1d90d7513e34ba751221964aa3c8d861c9da8cf16481dff4cff"},"package":"dd0eaf8df8bab402257e0a5c17a254e4cc1f72a93588a1ddfb5d356c801aa7cb"} +-{"files":{"CHANGELOG.md":"83e6a1be6fd80a5b6a2bf99dcc19e96741ac18192cf857550e85cd0bec954796","Cargo.toml":"68cf729f84ed289740a62455ead120c947a33d7c33156ee2f64a06d2522eb103","LICENSE":"66e3ee1fa7f909ad3c612d556f2a0cdabcd809ad6e66f3b0605015ac64841b70","README.md":"1ed9a0e26ae6e575b3262ae734dd02889455593b761ee62403ea5a64104f3c9c","src/dir.rs":"fa8d1de7e82409a40a70901294bb7875ea2b1f8054af2eb90b066650a67f4d0e","src/env.rs":"028bc5e20139ebba418a655a2978a53335dc7680bf1de43d2c8333dd72cfa5c4","src/errno.rs":"e55d075858e349d9afea9ce0480f7fb7ba4dccccf0694fd7b3280b918836203c","src/fcntl.rs":"243eb14eb31c692f872c7f8cde5d82f654b072384400bda9bd783e13a3820021","src/features.rs":"5b4a0831e5f4b79a6f0e42ed052fd66c875da18959750be51e41fb59ac19feed","src/ifaddrs.rs":"377865eb48040d28c392a1aec0221320108e3392ea285d23405ae2cfa5c54b20","src/kmod.rs":"c818ced08d55ae36fdf82fa914ba856b688e37234d574d3faa37128211d512fb","src/lib.rs":"f7fb6b983728b622ede62de2d2bc7f351adfee3991027203a5883e3b658929f0","src/macros.rs":"e23d7d8be22ef0bf9febaaf2739585453103607c0139bd3995a324e4a16d011e","src/mount/bsd.rs":"a0be56c5b0b75cad2367cb358030383a3a682abf7653b516485cb8542734518d","src/mount/linux.rs":"6e5d61788dedf1ca4416c6c6a3a9c6c747f9352c26d863f4a1d4142e288584d6","src/mount/mod.rs":"ba9f60eb831224ab73bdd87e00e15d13b9ce9efb70b18bf8f3fe60406d522b3e","src/mqueue.rs":"ed0a189036b2437b5f7f7f1312fa545540b06ca72171b451d8bce42cc3627534","src/net/if_.rs":"b32a8a1f952de60d95e549779a5c673fd72aa665e86bfdfc8ec6badf3016b9b1","src/net/mod.rs":"577f70170e53d4a6de1abb70bf8f1031ec3e65c0e63ef5fcf05c907125e7ac17","src/poll.rs":"2fc1d144fb40db51811c6357b520ab7993529702d8f0d8060c903118ff4f7259","src/pty.rs":"27b4f76c23acf02542674017067fee74cdcac907338458700a1aa4d6f6a62e27","src/sched.rs":"403aa5ebed81910263d42a94717612b737550bf053227b7d90f1c8949188d919","src/sys/aio.rs":"ae091de8540c97da374a39e7d154c1b3ce50f41e6fc20a45c6b06eb838e74366","src/sys/epoll.rs":"28e22debf474d1b047e8044a00b354c25dab2fa125960f9f2f14cc34289fd5c9","src/sys/event.rs":"5961981ae5f66a6cf860ba456d0bfe541ab7437f9a909158b1b7a307e940b727","src/sys/eventfd.rs":"c8db8f5874726fdad289ad5e2603a7d71a1ae5a899dcde3a35d3edff8b498b7e","src/sys/inotify.rs":"5b4da774313afa9c28c3f92f9d07dce9bf4c8d044fd6a16f19480e79a19e808b","src/sys/ioctl/bsd.rs":"bbd02e30b0a78c1cb22777d9b00cfcbba9c68505cffc06118ac68474cf6fea39","src/sys/ioctl/linux.rs":"028181834d119b834bf399f2b8a6176cc57e75144693f28f32059d087d8c8018","src/sys/ioctl/mod.rs":"80e683efac7d1e2bd88680f028370f7c778e6a5097cae7845566bc8f43f4ff4f","src/sys/memfd.rs":"f58d7fbe67c4b994832d72f5fbd59c136c8f1ae88ea8b0bc1c099db2d847ee6c","src/sys/mman.rs":"17df1bc34ba92bdd6bad1e11e4ef139998117f6c468c8f560421858f3cc899a5","src/sys/mod.rs":"baabf649f758ad4acce849ec1795dd4e4f9c6539e677bad5fa777300a4871dcb","src/sys/personality.rs":"8fbd8b522b8be4591a4cf25cba023884d3ad39b26666708d43eb79b81bf1c203","src/sys/pthread.rs":"258cdf7ff0b61a4afa6d228109e4cb4fb88d859bb8dfe6c959d95130fb010906","src/sys/ptrace/bsd.rs":"4c590d8f023ff52f396f8b6f2150c08e5c9486d3088d9c173db33a70d616b800","src/sys/ptrace/linux.rs":"c82db3fb18aa97755f9ccb440a957cd46d664968a94045830c5d74d2d53bc19f","src/sys/ptrace/mod.rs":"3b5e4cc9cf447e989f40c73cb1951a4705322852009023c5a3d7e39ec1e9c39b","src/sys/quota.rs":"02e698a25f0986fb43aa88689f3d3d8b9edc6ae48496ad02f7214fccaa493e00","src/sys/reboot.rs":"eacdf57694a6629fb05787e16450446102a62818274495f2ad4e445807d09221","src/sys/resource.rs":"d498d0c00fd30e35e1269a8902cb812014d813f63ec95364f8f59f1912ba5657","src/sys/select.rs":"65c39b129d3cc85b8ca026ff26dcf80c5639824f43715881c3c1bbb6bf0c8a60","src/sys/sendfile.rs":"7a62099f9771fecff49b9c11210341e3c1a4acf22f8dfb96d395e29421648676","src/sys/signal.rs":"c3e13a2edea54d190a4b051f62efc97953c00b5051a9fda0e39e3bc732a31939","src/sys/signalfd.rs":"583524434fd37143be3db37fa6f6cbd339f7946416f05b58a95e246947e5cc9d","src/sys/socket/addr.rs":"569b9f532211963851470ad31ccb3b4ce7a53ba7e509bfce02f62df41ada8863","src/sys/socket/mod.rs":"bd8e3f84041e8dda0f57ca949b93bdb953d37496e0b5ed0820cf39bd7a059376","src/sys/socket/sockopt.rs":"7770027dc55f64b9ff08e5113886bf09e7eb35ec655d8ebe3e0727a7453020de","src/sys/stat.rs":"337dea8d55d6177dc85b3235b40b8a3e81af7f4a6e2806a0b2f730bec5424350","src/sys/statfs.rs":"17103659a85279bac046c69cb3b22bf2c11c2492cffb0edfa4c3b233d161a2f2","src/sys/statvfs.rs":"f81e3900ef90d62e7eceaf1b6ff8dcfd965466714c033eb4717687f692171f48","src/sys/sysinfo.rs":"b4519b1ca091c9dbe94d2a6fd6304944bf3df5626973d2c6884022559706f0d9","src/sys/termios.rs":"7923f9846a8122096b6b1cd240d3618b876ce500a751ac434954d172e2e85745","src/sys/time.rs":"9026033b60a5ccc95b70424aef043c8c748722e2ea8c7c86366ecd4585b651a0","src/sys/timer.rs":"8c10f0e7cfac857ad00460be30bc68b957909cc9296e70718d3b5d4a0babafde","src/sys/timerfd.rs":"ef7c48aefdcfac13316eeddbef5da04cf12e9f574b8d9f43402c02b6b8db86b3","src/sys/uio.rs":"8958600c3137ef1ca4ad24ebe5542e15375fa5d3759373b5b865147b16d611a4","src/sys/utsname.rs":"0cdda0cc111caaa0e4ebe2d4588bdc825d878e5bcb7a9136073b15f87a20e11f","src/sys/wait.rs":"cc70d2d9b880ff6c48577a479c209af6127067bc013a90ee22538e4dfad7d2b4","src/time.rs":"d4e0872361a57810837f5bd790cbca3a2b9db1ac4694a3c52d1564ad3532d3be","src/ucontext.rs":"b8f2e04757a9c2bc38c3b1e259d3a013da8a730fe9bfbe5487637395681b43d3","src/unistd.rs":"e19be456124731c5b93aef92ed72a7c4c9092e28db0649814ba3fcc1f0d620fa","test/common/mod.rs":"1d7e28e3635754664cd056f3a1079232ff5c118df619e1d0551a9972eb0b3cd6","test/sys/mod.rs":"87b2891d83067ff21f72b8ff7fde3019dc45b6877282ac278b6da151de45c7a7","test/sys/test_aio.rs":"28396c1774ac17e59bf72d2dbc2407ab11eb2e98ce0c0de12659579c1f7cd4b2","test/sys/test_aio_drop.rs":"614070155fa16a979b7341d001639c5ce24a1d6f632c3abce45a5a6d49c4039b","test/sys/test_epoll.rs":"ffe95e36c79e37426ef8e8ca3b137b7f35ea0333ce666a20a4b7878db17680e9","test/sys/test_inotify.rs":"a141b9a995892547b51ceeb6761a70a6b86d37e8f38d13ea2c497b81b4b0f49f","test/sys/test_ioctl.rs":"00ccc5afb665e533a0a4b6d6a6be438bcaea19fce335390feef4e91d17b3036c","test/sys/test_mman.rs":"2b4161964c9204b74659028b0f89a88f4e3bcc9886137a3039737cd91d2698cb","test/sys/test_pthread.rs":"ace36a2f5587f1874854281b4fd84e4e4d892a1e3c5cc38ced57975739522ad6","test/sys/test_ptrace.rs":"0385eebc8b1b8c72f655b745769decd9143ad83018198375982da0896310456b","test/sys/test_select.rs":"54cea1c34ad28d5770a613c1c3cbc3b1064b22037ec2b9d3fcd422d3be9e60a7","test/sys/test_signal.rs":"acc9941227bd3e2afad323613c2b8c83902ed0486d3745fd72704f395924f1e4","test/sys/test_signalfd.rs":"0e1060143e2612c490bc3d0168d0bbb042ef55e3f1d91d2578b9e42e4310a14d","test/sys/test_socket.rs":"727b7658e4bed13d3e41653b33eeb1c0d848d4ddc9ceddb35a59fd86d88d9ac7","test/sys/test_sockopt.rs":"4465f22f718442f3f7b502e052dad02b93cebfa3b71fa55ff4f25fb02534acab","test/sys/test_stat.rs":"6630a28217fd708bb84cd4f7e7101836b74f2420f9888923fdab664ccc331c1d","test/sys/test_sysinfo.rs":"ffd49bc96375914a2c4a4a59730cae8072f85771e2c4a80d3403df38d967e272","test/sys/test_termios.rs":"e5bcef10c84bd7583d600d5601835bcb3cfc88781cb283ab0185bbef5faf4327","test/sys/test_timerfd.rs":"cfed3abf58118611d08f6985251a7739cff67108e11214222a1d2394a3a026ce","test/sys/test_uio.rs":"32656bd0a5699e4d019aa928edf104637937179782914a82d50d37226e84c421","test/sys/test_wait.rs":"6fd59fffeeb09ff620c359baefd062ba777598982b6cb001ccc07b6bc7605493","test/test.rs":"11f40b0718ddd1a150cb9e703d56d0b2a9462306505a2245ddf273a2011f48b5","test/test_clearenv.rs":"45ca548035b3c20ec87314715feaba2be973709a635d85b8cde46fd1d9f1ecd4","test/test_dir.rs":"ae3c11c58cb06da6557aa2a839c6653c54cd7724283fffe9df5a5d3feabdd89a","test/test_fcntl.rs":"6958f71f013937dde7ea24ac87e2ad39fa318fb094f143e18b6a47356f65558c","test/test_kmod/hello_mod/Makefile":"0219f7bce0603f97d997fb377ca071966c90333ecc665e78a54dfeb97a9c811b","test/test_kmod/hello_mod/hello.c":"bcac6b19c5bd807e1f3878c15e426acc85785a8ade9840c3bb4d068635c9188c","test/test_kmod/mod.rs":"b4ae25841c2f06f32de9f1acd8230eeccd7095721302ebe78ad454e4e4f9c783","test/test_mount.rs":"6dd242b6e23c9c39e1a75612bbea62573898818ab374c3c032c2cdb97033554d","test/test_mq.rs":"136071f24131aac0e65d5f29ac18e3806641dfae1164813f5570c0e3a6f70553","test/test_net.rs":"f2912327ebb2a3d37e6cff02a5ac3106cf889cc5c74404db4ef0034059ba26f1","test/test_nix_path.rs":"01ba4719c80b6fe911b091a7c05124b64eeece964e09c058ef8f9805daca546b","test/test_nmount.rs":"d6c112547bb80968170b5497cda4b6cbf69dabec6f51d494bd52298995ceff18","test/test_poll.rs":"3e0b8f0397ba080785c61a3bfc3d637bc87f324bc4e52b5f1bf3ca0d32dbc9fe","test/test_pty.rs":"b26238a0783746cb31880e11eebc1913149be999ce75fbc2d6677bdd1e2731b2","test/test_ptymaster_drop.rs":"ae63c815f5028ddc67d194e86559483018ab1816316bdb917f40cee9364fd8a5","test/test_resource.rs":"40aef790ab745cec31a4b333d2ca406b462aa9bdf4a6d3756371e498b8d51e9a","test/test_sched.rs":"c4579bd376fab8816e63b07fa9ace31dc08e63ebb7c855a2c450698090d1d1e8","test/test_sendfile.rs":"f1042dd5d59e869ea10a1ac7b80ed7f11f8a716e7992fad40e63ed114438e0d8","test/test_stat.rs":"c407ca47a5258750076d041afad2f6add4c3563be36628bde1c5b314f5d0765d","test/test_time.rs":"f7a21b1e279e60e84909d5dadda97ded66d3326b131fe317badf9af0a1b50335","test/test_timer.rs":"3ae20d364f075d2811f3ff94eda9886682cc21d8807656007d2464fe36d1e361","test/test_unistd.rs":"20a00be4fbe26302ea5fe50ce25b99265dc763db138663d6aa1d7ac729a1d292"},"package":"598beaf3cc6fdd9a5dfb1630c2800c7acd31df7aaf0f565796fba2b53ca1af1b"} +\ No newline at end of file ++{"files":{"CHANGELOG.md":"83e6a1be6fd80a5b6a2bf99dcc19e96741ac18192cf857550e85cd0bec954796","Cargo.toml":"68cf729f84ed289740a62455ead120c947a33d7c33156ee2f64a06d2522eb103","LICENSE":"66e3ee1fa7f909ad3c612d556f2a0cdabcd809ad6e66f3b0605015ac64841b70","README.md":"1ed9a0e26ae6e575b3262ae734dd02889455593b761ee62403ea5a64104f3c9c","src/dir.rs":"fa8d1de7e82409a40a70901294bb7875ea2b1f8054af2eb90b066650a67f4d0e","src/env.rs":"028bc5e20139ebba418a655a2978a53335dc7680bf1de43d2c8333dd72cfa5c4","src/errno.rs":"e55d075858e349d9afea9ce0480f7fb7ba4dccccf0694fd7b3280b918836203c","src/fcntl.rs":"243eb14eb31c692f872c7f8cde5d82f654b072384400bda9bd783e13a3820021","src/features.rs":"5b4a0831e5f4b79a6f0e42ed052fd66c875da18959750be51e41fb59ac19feed","src/ifaddrs.rs":"377865eb48040d28c392a1aec0221320108e3392ea285d23405ae2cfa5c54b20","src/kmod.rs":"c818ced08d55ae36fdf82fa914ba856b688e37234d574d3faa37128211d512fb","src/lib.rs":"f7fb6b983728b622ede62de2d2bc7f351adfee3991027203a5883e3b658929f0","src/macros.rs":"e23d7d8be22ef0bf9febaaf2739585453103607c0139bd3995a324e4a16d011e","src/mount/bsd.rs":"a0be56c5b0b75cad2367cb358030383a3a682abf7653b516485cb8542734518d","src/mount/linux.rs":"6e5d61788dedf1ca4416c6c6a3a9c6c747f9352c26d863f4a1d4142e288584d6","src/mount/mod.rs":"ba9f60eb831224ab73bdd87e00e15d13b9ce9efb70b18bf8f3fe60406d522b3e","src/mqueue.rs":"ed0a189036b2437b5f7f7f1312fa545540b06ca72171b451d8bce42cc3627534","src/net/if_.rs":"b32a8a1f952de60d95e549779a5c673fd72aa665e86bfdfc8ec6badf3016b9b1","src/net/mod.rs":"577f70170e53d4a6de1abb70bf8f1031ec3e65c0e63ef5fcf05c907125e7ac17","src/poll.rs":"2fc1d144fb40db51811c6357b520ab7993529702d8f0d8060c903118ff4f7259","src/pty.rs":"27b4f76c23acf02542674017067fee74cdcac907338458700a1aa4d6f6a62e27","src/sched.rs":"403aa5ebed81910263d42a94717612b737550bf053227b7d90f1c8949188d919","src/sys/aio.rs":"ae091de8540c97da374a39e7d154c1b3ce50f41e6fc20a45c6b06eb838e74366","src/sys/epoll.rs":"28e22debf474d1b047e8044a00b354c25dab2fa125960f9f2f14cc34289fd5c9","src/sys/event.rs":"5961981ae5f66a6cf860ba456d0bfe541ab7437f9a909158b1b7a307e940b727","src/sys/eventfd.rs":"c8db8f5874726fdad289ad5e2603a7d71a1ae5a899dcde3a35d3edff8b498b7e","src/sys/inotify.rs":"5b4da774313afa9c28c3f92f9d07dce9bf4c8d044fd6a16f19480e79a19e808b","src/sys/ioctl/bsd.rs":"bbd02e30b0a78c1cb22777d9b00cfcbba9c68505cffc06118ac68474cf6fea39","src/sys/ioctl/linux.rs":"31ae1f393bde07a928ac2de02f51810ea41a75ca3682bef57bfdeb09a926b173","src/sys/ioctl/mod.rs":"80e683efac7d1e2bd88680f028370f7c778e6a5097cae7845566bc8f43f4ff4f","src/sys/memfd.rs":"f58d7fbe67c4b994832d72f5fbd59c136c8f1ae88ea8b0bc1c099db2d847ee6c","src/sys/mman.rs":"17df1bc34ba92bdd6bad1e11e4ef139998117f6c468c8f560421858f3cc899a5","src/sys/mod.rs":"baabf649f758ad4acce849ec1795dd4e4f9c6539e677bad5fa777300a4871dcb","src/sys/personality.rs":"8fbd8b522b8be4591a4cf25cba023884d3ad39b26666708d43eb79b81bf1c203","src/sys/pthread.rs":"258cdf7ff0b61a4afa6d228109e4cb4fb88d859bb8dfe6c959d95130fb010906","src/sys/ptrace/bsd.rs":"4c590d8f023ff52f396f8b6f2150c08e5c9486d3088d9c173db33a70d616b800","src/sys/ptrace/linux.rs":"c82db3fb18aa97755f9ccb440a957cd46d664968a94045830c5d74d2d53bc19f","src/sys/ptrace/mod.rs":"3b5e4cc9cf447e989f40c73cb1951a4705322852009023c5a3d7e39ec1e9c39b","src/sys/quota.rs":"02e698a25f0986fb43aa88689f3d3d8b9edc6ae48496ad02f7214fccaa493e00","src/sys/reboot.rs":"eacdf57694a6629fb05787e16450446102a62818274495f2ad4e445807d09221","src/sys/resource.rs":"d498d0c00fd30e35e1269a8902cb812014d813f63ec95364f8f59f1912ba5657","src/sys/select.rs":"65c39b129d3cc85b8ca026ff26dcf80c5639824f43715881c3c1bbb6bf0c8a60","src/sys/sendfile.rs":"7a62099f9771fecff49b9c11210341e3c1a4acf22f8dfb96d395e29421648676","src/sys/signal.rs":"c3e13a2edea54d190a4b051f62efc97953c00b5051a9fda0e39e3bc732a31939","src/sys/signalfd.rs":"583524434fd37143be3db37fa6f6cbd339f7946416f05b58a95e246947e5cc9d","src/sys/socket/addr.rs":"569b9f532211963851470ad31ccb3b4ce7a53ba7e509bfce02f62df41ada8863","src/sys/socket/mod.rs":"bd8e3f84041e8dda0f57ca949b93bdb953d37496e0b5ed0820cf39bd7a059376","src/sys/socket/sockopt.rs":"7770027dc55f64b9ff08e5113886bf09e7eb35ec655d8ebe3e0727a7453020de","src/sys/stat.rs":"337dea8d55d6177dc85b3235b40b8a3e81af7f4a6e2806a0b2f730bec5424350","src/sys/statfs.rs":"17103659a85279bac046c69cb3b22bf2c11c2492cffb0edfa4c3b233d161a2f2","src/sys/statvfs.rs":"f81e3900ef90d62e7eceaf1b6ff8dcfd965466714c033eb4717687f692171f48","src/sys/sysinfo.rs":"b4519b1ca091c9dbe94d2a6fd6304944bf3df5626973d2c6884022559706f0d9","src/sys/termios.rs":"7923f9846a8122096b6b1cd240d3618b876ce500a751ac434954d172e2e85745","src/sys/time.rs":"9026033b60a5ccc95b70424aef043c8c748722e2ea8c7c86366ecd4585b651a0","src/sys/timer.rs":"8c10f0e7cfac857ad00460be30bc68b957909cc9296e70718d3b5d4a0babafde","src/sys/timerfd.rs":"ef7c48aefdcfac13316eeddbef5da04cf12e9f574b8d9f43402c02b6b8db86b3","src/sys/uio.rs":"8958600c3137ef1ca4ad24ebe5542e15375fa5d3759373b5b865147b16d611a4","src/sys/utsname.rs":"0cdda0cc111caaa0e4ebe2d4588bdc825d878e5bcb7a9136073b15f87a20e11f","src/sys/wait.rs":"cc70d2d9b880ff6c48577a479c209af6127067bc013a90ee22538e4dfad7d2b4","src/time.rs":"d4e0872361a57810837f5bd790cbca3a2b9db1ac4694a3c52d1564ad3532d3be","src/ucontext.rs":"b8f2e04757a9c2bc38c3b1e259d3a013da8a730fe9bfbe5487637395681b43d3","src/unistd.rs":"e19be456124731c5b93aef92ed72a7c4c9092e28db0649814ba3fcc1f0d620fa","test/common/mod.rs":"1d7e28e3635754664cd056f3a1079232ff5c118df619e1d0551a9972eb0b3cd6","test/sys/mod.rs":"87b2891d83067ff21f72b8ff7fde3019dc45b6877282ac278b6da151de45c7a7","test/sys/test_aio.rs":"28396c1774ac17e59bf72d2dbc2407ab11eb2e98ce0c0de12659579c1f7cd4b2","test/sys/test_aio_drop.rs":"614070155fa16a979b7341d001639c5ce24a1d6f632c3abce45a5a6d49c4039b","test/sys/test_epoll.rs":"ffe95e36c79e37426ef8e8ca3b137b7f35ea0333ce666a20a4b7878db17680e9","test/sys/test_inotify.rs":"a141b9a995892547b51ceeb6761a70a6b86d37e8f38d13ea2c497b81b4b0f49f","test/sys/test_ioctl.rs":"00ccc5afb665e533a0a4b6d6a6be438bcaea19fce335390feef4e91d17b3036c","test/sys/test_mman.rs":"2b4161964c9204b74659028b0f89a88f4e3bcc9886137a3039737cd91d2698cb","test/sys/test_pthread.rs":"ace36a2f5587f1874854281b4fd84e4e4d892a1e3c5cc38ced57975739522ad6","test/sys/test_ptrace.rs":"0385eebc8b1b8c72f655b745769decd9143ad83018198375982da0896310456b","test/sys/test_select.rs":"54cea1c34ad28d5770a613c1c3cbc3b1064b22037ec2b9d3fcd422d3be9e60a7","test/sys/test_signal.rs":"acc9941227bd3e2afad323613c2b8c83902ed0486d3745fd72704f395924f1e4","test/sys/test_signalfd.rs":"0e1060143e2612c490bc3d0168d0bbb042ef55e3f1d91d2578b9e42e4310a14d","test/sys/test_socket.rs":"727b7658e4bed13d3e41653b33eeb1c0d848d4ddc9ceddb35a59fd86d88d9ac7","test/sys/test_sockopt.rs":"4465f22f718442f3f7b502e052dad02b93cebfa3b71fa55ff4f25fb02534acab","test/sys/test_stat.rs":"6630a28217fd708bb84cd4f7e7101836b74f2420f9888923fdab664ccc331c1d","test/sys/test_sysinfo.rs":"ffd49bc96375914a2c4a4a59730cae8072f85771e2c4a80d3403df38d967e272","test/sys/test_termios.rs":"e5bcef10c84bd7583d600d5601835bcb3cfc88781cb283ab0185bbef5faf4327","test/sys/test_timerfd.rs":"cfed3abf58118611d08f6985251a7739cff67108e11214222a1d2394a3a026ce","test/sys/test_uio.rs":"32656bd0a5699e4d019aa928edf104637937179782914a82d50d37226e84c421","test/sys/test_wait.rs":"6fd59fffeeb09ff620c359baefd062ba777598982b6cb001ccc07b6bc7605493","test/test.rs":"11f40b0718ddd1a150cb9e703d56d0b2a9462306505a2245ddf273a2011f48b5","test/test_clearenv.rs":"45ca548035b3c20ec87314715feaba2be973709a635d85b8cde46fd1d9f1ecd4","test/test_dir.rs":"ae3c11c58cb06da6557aa2a839c6653c54cd7724283fffe9df5a5d3feabdd89a","test/test_fcntl.rs":"6958f71f013937dde7ea24ac87e2ad39fa318fb094f143e18b6a47356f65558c","test/test_kmod/hello_mod/Makefile":"0219f7bce0603f97d997fb377ca071966c90333ecc665e78a54dfeb97a9c811b","test/test_kmod/hello_mod/hello.c":"bcac6b19c5bd807e1f3878c15e426acc85785a8ade9840c3bb4d068635c9188c","test/test_kmod/mod.rs":"b4ae25841c2f06f32de9f1acd8230eeccd7095721302ebe78ad454e4e4f9c783","test/test_mount.rs":"6dd242b6e23c9c39e1a75612bbea62573898818ab374c3c032c2cdb97033554d","test/test_mq.rs":"136071f24131aac0e65d5f29ac18e3806641dfae1164813f5570c0e3a6f70553","test/test_net.rs":"f2912327ebb2a3d37e6cff02a5ac3106cf889cc5c74404db4ef0034059ba26f1","test/test_nix_path.rs":"01ba4719c80b6fe911b091a7c05124b64eeece964e09c058ef8f9805daca546b","test/test_nmount.rs":"d6c112547bb80968170b5497cda4b6cbf69dabec6f51d494bd52298995ceff18","test/test_poll.rs":"3e0b8f0397ba080785c61a3bfc3d637bc87f324bc4e52b5f1bf3ca0d32dbc9fe","test/test_pty.rs":"b26238a0783746cb31880e11eebc1913149be999ce75fbc2d6677bdd1e2731b2","test/test_ptymaster_drop.rs":"ae63c815f5028ddc67d194e86559483018ab1816316bdb917f40cee9364fd8a5","test/test_resource.rs":"40aef790ab745cec31a4b333d2ca406b462aa9bdf4a6d3756371e498b8d51e9a","test/test_sched.rs":"c4579bd376fab8816e63b07fa9ace31dc08e63ebb7c855a2c450698090d1d1e8","test/test_sendfile.rs":"f1042dd5d59e869ea10a1ac7b80ed7f11f8a716e7992fad40e63ed114438e0d8","test/test_stat.rs":"c407ca47a5258750076d041afad2f6add4c3563be36628bde1c5b314f5d0765d","test/test_time.rs":"f7a21b1e279e60e84909d5dadda97ded66d3326b131fe317badf9af0a1b50335","test/test_timer.rs":"3ae20d364f075d2811f3ff94eda9886682cc21d8807656007d2464fe36d1e361","test/test_unistd.rs":"20a00be4fbe26302ea5fe50ce25b99265dc763db138663d6aa1d7ac729a1d292"},"package":"598beaf3cc6fdd9a5dfb1630c2800c7acd31df7aaf0f565796fba2b53ca1af1b"} +\ No newline at end of file diff --git a/vendor/nix/src/sys/ioctl/linux.rs b/vendor/nix/src/sys/ioctl/linux.rs -index 68ebaba..e24a1fc 100644 +index 0c0a209..669d517 100644 --- a/vendor/nix/src/sys/ioctl/linux.rs +++ b/vendor/nix/src/sys/ioctl/linux.rs -@@ -34,7 +34,8 @@ mod consts { - target_arch = "s390x", - target_arch = "x86_64", - target_arch = "aarch64", -- target_arch = "riscv64"))] -+ target_arch = "riscv64", -+ target_arch = "loongarch64"))] +@@ -42,7 +42,8 @@ mod consts { + target_arch = "x86_64", + target_arch = "aarch64", + target_arch = "riscv32", +- target_arch = "riscv64" ++ target_arch = "riscv64", ++ target_arch = "loongarch64" + ))] mod consts { #[doc(hidden)] - pub const NONE: u8 = 0; diff --git a/vendor/prost-build/.cargo-checksum.json b/vendor/prost-build/.cargo-checksum.json -index 8ec5939..929057a 100644 +index 4b03f84..144ace9 100644 --- a/vendor/prost-build/.cargo-checksum.json +++ b/vendor/prost-build/.cargo-checksum.json @@ -1 +1 @@ --{"files":{"Cargo.toml":"520efe6811357bda5521ddf64e5093cdbf2e185c97ffc4a70c5c7d33c272e39c","README.md":"094d454ce347d8fbd4c70e6f79f082e7b6dfa4c9dbb381e5639037b88462c5d1","build.rs":"dcb015749ac7e222dc227982f2889519e328c4f6ccf48c09bc369c4216151af9","src/ast.rs":"c577e41ee140d8d2414cda49bf9b098d821a0a34f16cda7be45f2cec72f8edd5","src/code_generator.rs":"f957be408e3e795c5c59bf41af0ea742797569ca0e2c4fbbd4680d405e2ce4fe","src/extern_paths.rs":"a634f7ee45ae6e1d6d12ff3e9956f5244bdd4f7c5ff7bca6895b5dbb905bbc33","src/ident.rs":"bf6d6294f4ab6626632ba1e0f96b7acdc080cbb0b345619a0f07a9e6bcd3c0ae","src/lib.rs":"03cb4e8cb1188ee327595126884d8c778bbc22acca10f445f84ab89431810faf","src/message_graph.rs":"a21dbdc600e928fd9cbf8cbfbb90c685d12d0cf49d7972495d445e459a91f1fc","src/smoke_test.proto":"05068c3db3f1df2d5737eaaec730e42e3e58eb1d533df630fcb3dc138c7d8c9b","third-party/protobuf/LICENSE":"af67c58de2e18677a0b8cb5fffbe2232aabb8eb2930e8cd684769cef3d74a262","third-party/protobuf/README.md":"678126b0e9bc281ccff096d37726167e54ed8a53b8970b525104ed888ad54b7d","third-party/protobuf/include/google/protobuf/any.proto":"fbf886b5d2f6ac6872acfd61b2ab60f0abe1ecd8f359ed2e2b1276295ec5529a","third-party/protobuf/include/google/protobuf/api.proto":"dc01037a072410e5f7cd08c52fb6415acd6707b59ace2dfb4df878a6e016f9b8","third-party/protobuf/include/google/protobuf/compiler/plugin.proto":"63881dd80d7ddc345d5cc4dd495f6fc0a73fc475cedfc79c78c284ad0b3e8618","third-party/protobuf/include/google/protobuf/descriptor.proto":"7b98a2ab76635880b9fb9c830ea5feeeb43fd902e2532e779efd51e179b61c35","third-party/protobuf/include/google/protobuf/duration.proto":"933001db4a42dba2b99b4c6663b83c8ae0965765a5cbb6ca5da7bbc587741388","third-party/protobuf/include/google/protobuf/empty.proto":"b18e0cd44e0d054202c1403c48327180f3995d08ead2a6d4d012c0551a7a3563","third-party/protobuf/include/google/protobuf/field_mask.proto":"355146e9d480db65632f28a6fe59f6d9649a197c06e1a7b9198f113dcd773925","third-party/protobuf/include/google/protobuf/source_context.proto":"64ac204d47270547bde952a1c7a202d0af0c955292a21f513ef269f6f8a0c78d","third-party/protobuf/include/google/protobuf/struct.proto":"82b23cc319988977fd61eca7b6ad8f17269b36522ca24a06dde374005fa74353","third-party/protobuf/include/google/protobuf/timestamp.proto":"ea8f706782105b6e8150400a4d61895caad81bd6f3c8566f82d46b843bea21d2","third-party/protobuf/include/google/protobuf/type.proto":"e007d8d8763d564ea4724712cc737c60573a411c46572167c0236ec621d21de1","third-party/protobuf/include/google/protobuf/wrappers.proto":"0d0c7cf568359354d6fec5ddb63d80716807625cb13d3a69f5144742257eb1f9","third-party/protobuf/protoc-linux-aarch_64":"0213b5560ac69c9fe1401e073648213ffb73fbffa920e82c2b652708c0b50f88","third-party/protobuf/protoc-linux-x86_32":"bb189ba95422f9e3b85bb8270661ec4cfe70640891cb223acfbf6a90511ff95b","third-party/protobuf/protoc-linux-x86_64":"6ae3cdb31dc68d257f63ce8109b10b944c507ce7dfd493a66fc357e38062cd47","third-party/protobuf/protoc-osx-x86_64":"fd289988a18c461bc9e5c314c55d6a363ebede51a0e854a3b2d32da918a891eb","third-party/protobuf/protoc-win32.exe":"5b7121b3f1cd57efc2396b12605a3c4095770445c9637e0aab0d92a8a10c2482"},"package":"eb788126ea840817128183f8f603dce02cb7aea25c2a0b764359d8e20010702e"} +-{"files":{"Cargo.toml":"292d28cae9c27fbfee068022b42aeffb6bd43471a695e49fd04f46f750dc354e","README.md":"094d454ce347d8fbd4c70e6f79f082e7b6dfa4c9dbb381e5639037b88462c5d1","build.rs":"258c0ac4eebb4f154df1b11eaf30a449fc03470ea4d50004daf387abcc136e00","src/ast.rs":"e3498c490687f59ae05c5bfe4d2df3d340c2dd85844e97e95b02110c584066d6","src/code_generator.rs":"7c5d3efc21e40c67fb38bc5332ffcc75bbb9b8a5b24155f1c1c9b061fe1b1b9e","src/extern_paths.rs":"758195438a66262e21e35987d245c8ec0c0bfa16da6aaab7f02fdc2442bea1ed","src/goodbye.proto":"ef20704f5ddf4979ba1825ae6847393e94b72fd52a2d2d9b95ab4ffc5d32c746","src/hello.proto":"4eeeeb58af30bb7522fbd4560009cf89540f5f314e0db49e1f9dd8f4de284064","src/ident.rs":"0fbee3f69ccf36104ae146957acdba2c83c5b96707193f10cad9c21e952ee257","src/lib.rs":"cfebbde4c6b2781831e563ba25d46085bd8565f29372aee0d99cc73484d9c911","src/message_graph.rs":"a690f15ce9f0b32c23332fdca767efd88099b0a000062e9adea80c53da800dc2","src/path.rs":"49a9664528c0f2132e5d609fd853f335485a372ed2d9c92cecbc9acedaaa78c0","src/smoke_test.proto":"05068c3db3f1df2d5737eaaec730e42e3e58eb1d533df630fcb3dc138c7d8c9b","src/types.proto":"35886d15c8659cb06f2b04d7795efc7b6b7377b4305adba4b15ec41a24bef146","third-party/protobuf/LICENSE":"6e5e117324afd944dcf67f36cf329843bc1a92229a8cd9bb573d7a83130fea7d","third-party/protobuf/include/google/protobuf/any.proto":"d7c79a05a5c7fae89f0aff26d112e0b60f082fc7fc424e8910be99c86b656260","third-party/protobuf/include/google/protobuf/api.proto":"4d050ed6172b20717022f081e26ddaaa9e534c58fc7b4cf1e88bde62ebed3c9b","third-party/protobuf/include/google/protobuf/compiler/plugin.proto":"cd2173be546c551d04a9d713821c0e00a82e83f8bc79ad585dc97e555571047f","third-party/protobuf/include/google/protobuf/descriptor.proto":"39ee456754055d52a3c8789dfcea8b2e2ea52db6b5836971853002da5d3605cc","third-party/protobuf/include/google/protobuf/duration.proto":"099047097e8fe73657b49ef67af914a7a686ac6154f9d872882708b5eb3db04c","third-party/protobuf/include/google/protobuf/empty.proto":"23b75ded84bd2ee81f0098850ffaa0d5e1a6d881a9e1a760f730989e90534ec3","third-party/protobuf/include/google/protobuf/field_mask.proto":"ed78e81d3f16618964b65692a02d229da6591bbec6eafc2ee4f052eaccf25b8a","third-party/protobuf/include/google/protobuf/source_context.proto":"28377609fb1df35293d637112cb574879465a987d943cd5e6c8feb8845438793","third-party/protobuf/include/google/protobuf/struct.proto":"7accb70d741132475ef30ac125dfef95835239c792b83ff453a5e132e235a68d","third-party/protobuf/include/google/protobuf/timestamp.proto":"9489462cbd4eff7c013d10de596be38da1087c7824ea34357669bc21bf5c0800","third-party/protobuf/include/google/protobuf/type.proto":"18e4e0335dd6a5cd0d52530d818496c954ad95a69b304f1c8103d7b2ca2d509a","third-party/protobuf/include/google/protobuf/wrappers.proto":"020c88776e814647da13c1cd5675031a3ffd35b016e64f721c5e066d375d4f43","third-party/protobuf/protoc-linux-aarch_64":"5392f0e58ad06e089462d93304dfe82337acbbefb87a0749a7dc2ed32af04af7","third-party/protobuf/protoc-linux-x86_32":"0615a703faa6c234063ab285a2119c69122ca7e92e69b26287fdb00bc6474832","third-party/protobuf/protoc-linux-x86_64":"151dfe76345298b055000c31376f925222ef3426d6b7892b8156421fdd3fd3c4","third-party/protobuf/protoc-osx-x86_64":"e7dff9c38bf0cbcf43f055b8269ea939d6b298f611de16481ba7d3e2eec0bc2f","third-party/protobuf/protoc-win32.exe":"62e803f7433799af63acf605f7fe19108d22d0c73e82a475b27d3ff0cfbf1990","third-party/update-bundled-protobuf.sh":"c65d6d8608f1dccc9f3c17cca0f07564baa48c9337fc57592591eb6c8477222a"},"package":"355f634b43cdd80724ee7848f95770e7e70eefa6dcf14fea676216573b8fd603"} \ No newline at end of file -+{"files":{"Cargo.toml":"520efe6811357bda5521ddf64e5093cdbf2e185c97ffc4a70c5c7d33c272e39c","README.md":"094d454ce347d8fbd4c70e6f79f082e7b6dfa4c9dbb381e5639037b88462c5d1","build.rs":"99d7f313f32a08ba1070ba28bd6e0b9cb52ccd63ee01490e319800d3a7ac7d63","src/ast.rs":"c577e41ee140d8d2414cda49bf9b098d821a0a34f16cda7be45f2cec72f8edd5","src/code_generator.rs":"f957be408e3e795c5c59bf41af0ea742797569ca0e2c4fbbd4680d405e2ce4fe","src/extern_paths.rs":"a634f7ee45ae6e1d6d12ff3e9956f5244bdd4f7c5ff7bca6895b5dbb905bbc33","src/ident.rs":"bf6d6294f4ab6626632ba1e0f96b7acdc080cbb0b345619a0f07a9e6bcd3c0ae","src/lib.rs":"03cb4e8cb1188ee327595126884d8c778bbc22acca10f445f84ab89431810faf","src/message_graph.rs":"a21dbdc600e928fd9cbf8cbfbb90c685d12d0cf49d7972495d445e459a91f1fc","src/smoke_test.proto":"05068c3db3f1df2d5737eaaec730e42e3e58eb1d533df630fcb3dc138c7d8c9b","third-party/protobuf/LICENSE":"af67c58de2e18677a0b8cb5fffbe2232aabb8eb2930e8cd684769cef3d74a262","third-party/protobuf/README.md":"678126b0e9bc281ccff096d37726167e54ed8a53b8970b525104ed888ad54b7d","third-party/protobuf/include/google/protobuf/any.proto":"fbf886b5d2f6ac6872acfd61b2ab60f0abe1ecd8f359ed2e2b1276295ec5529a","third-party/protobuf/include/google/protobuf/api.proto":"dc01037a072410e5f7cd08c52fb6415acd6707b59ace2dfb4df878a6e016f9b8","third-party/protobuf/include/google/protobuf/compiler/plugin.proto":"63881dd80d7ddc345d5cc4dd495f6fc0a73fc475cedfc79c78c284ad0b3e8618","third-party/protobuf/include/google/protobuf/descriptor.proto":"7b98a2ab76635880b9fb9c830ea5feeeb43fd902e2532e779efd51e179b61c35","third-party/protobuf/include/google/protobuf/duration.proto":"933001db4a42dba2b99b4c6663b83c8ae0965765a5cbb6ca5da7bbc587741388","third-party/protobuf/include/google/protobuf/empty.proto":"b18e0cd44e0d054202c1403c48327180f3995d08ead2a6d4d012c0551a7a3563","third-party/protobuf/include/google/protobuf/field_mask.proto":"355146e9d480db65632f28a6fe59f6d9649a197c06e1a7b9198f113dcd773925","third-party/protobuf/include/google/protobuf/source_context.proto":"64ac204d47270547bde952a1c7a202d0af0c955292a21f513ef269f6f8a0c78d","third-party/protobuf/include/google/protobuf/struct.proto":"82b23cc319988977fd61eca7b6ad8f17269b36522ca24a06dde374005fa74353","third-party/protobuf/include/google/protobuf/timestamp.proto":"ea8f706782105b6e8150400a4d61895caad81bd6f3c8566f82d46b843bea21d2","third-party/protobuf/include/google/protobuf/type.proto":"e007d8d8763d564ea4724712cc737c60573a411c46572167c0236ec621d21de1","third-party/protobuf/include/google/protobuf/wrappers.proto":"0d0c7cf568359354d6fec5ddb63d80716807625cb13d3a69f5144742257eb1f9","third-party/protobuf/protoc-linux-aarch_64":"0213b5560ac69c9fe1401e073648213ffb73fbffa920e82c2b652708c0b50f88","third-party/protobuf/protoc-linux-x86_32":"bb189ba95422f9e3b85bb8270661ec4cfe70640891cb223acfbf6a90511ff95b","third-party/protobuf/protoc-linux-x86_64":"6ae3cdb31dc68d257f63ce8109b10b944c507ce7dfd493a66fc357e38062cd47","third-party/protobuf/protoc-osx-x86_64":"fd289988a18c461bc9e5c314c55d6a363ebede51a0e854a3b2d32da918a891eb","third-party/protobuf/protoc-win32.exe":"5b7121b3f1cd57efc2396b12605a3c4095770445c9637e0aab0d92a8a10c2482"},"package":"eb788126ea840817128183f8f603dce02cb7aea25c2a0b764359d8e20010702e"} ++{"files":{"Cargo.toml":"292d28cae9c27fbfee068022b42aeffb6bd43471a695e49fd04f46f750dc354e","README.md":"094d454ce347d8fbd4c70e6f79f082e7b6dfa4c9dbb381e5639037b88462c5d1","build.rs":"02e56b43a540360c35678ab3138d13da8883c9e432c1a27855b05073369b724b","src/ast.rs":"e3498c490687f59ae05c5bfe4d2df3d340c2dd85844e97e95b02110c584066d6","src/code_generator.rs":"7c5d3efc21e40c67fb38bc5332ffcc75bbb9b8a5b24155f1c1c9b061fe1b1b9e","src/extern_paths.rs":"758195438a66262e21e35987d245c8ec0c0bfa16da6aaab7f02fdc2442bea1ed","src/goodbye.proto":"ef20704f5ddf4979ba1825ae6847393e94b72fd52a2d2d9b95ab4ffc5d32c746","src/hello.proto":"4eeeeb58af30bb7522fbd4560009cf89540f5f314e0db49e1f9dd8f4de284064","src/ident.rs":"0fbee3f69ccf36104ae146957acdba2c83c5b96707193f10cad9c21e952ee257","src/lib.rs":"cfebbde4c6b2781831e563ba25d46085bd8565f29372aee0d99cc73484d9c911","src/message_graph.rs":"a690f15ce9f0b32c23332fdca767efd88099b0a000062e9adea80c53da800dc2","src/path.rs":"49a9664528c0f2132e5d609fd853f335485a372ed2d9c92cecbc9acedaaa78c0","src/smoke_test.proto":"05068c3db3f1df2d5737eaaec730e42e3e58eb1d533df630fcb3dc138c7d8c9b","src/types.proto":"35886d15c8659cb06f2b04d7795efc7b6b7377b4305adba4b15ec41a24bef146","third-party/protobuf/LICENSE":"6e5e117324afd944dcf67f36cf329843bc1a92229a8cd9bb573d7a83130fea7d","third-party/protobuf/include/google/protobuf/any.proto":"d7c79a05a5c7fae89f0aff26d112e0b60f082fc7fc424e8910be99c86b656260","third-party/protobuf/include/google/protobuf/api.proto":"4d050ed6172b20717022f081e26ddaaa9e534c58fc7b4cf1e88bde62ebed3c9b","third-party/protobuf/include/google/protobuf/compiler/plugin.proto":"cd2173be546c551d04a9d713821c0e00a82e83f8bc79ad585dc97e555571047f","third-party/protobuf/include/google/protobuf/descriptor.proto":"39ee456754055d52a3c8789dfcea8b2e2ea52db6b5836971853002da5d3605cc","third-party/protobuf/include/google/protobuf/duration.proto":"099047097e8fe73657b49ef67af914a7a686ac6154f9d872882708b5eb3db04c","third-party/protobuf/include/google/protobuf/empty.proto":"23b75ded84bd2ee81f0098850ffaa0d5e1a6d881a9e1a760f730989e90534ec3","third-party/protobuf/include/google/protobuf/field_mask.proto":"ed78e81d3f16618964b65692a02d229da6591bbec6eafc2ee4f052eaccf25b8a","third-party/protobuf/include/google/protobuf/source_context.proto":"28377609fb1df35293d637112cb574879465a987d943cd5e6c8feb8845438793","third-party/protobuf/include/google/protobuf/struct.proto":"7accb70d741132475ef30ac125dfef95835239c792b83ff453a5e132e235a68d","third-party/protobuf/include/google/protobuf/timestamp.proto":"9489462cbd4eff7c013d10de596be38da1087c7824ea34357669bc21bf5c0800","third-party/protobuf/include/google/protobuf/type.proto":"18e4e0335dd6a5cd0d52530d818496c954ad95a69b304f1c8103d7b2ca2d509a","third-party/protobuf/include/google/protobuf/wrappers.proto":"020c88776e814647da13c1cd5675031a3ffd35b016e64f721c5e066d375d4f43","third-party/protobuf/protoc-linux-aarch_64":"5392f0e58ad06e089462d93304dfe82337acbbefb87a0749a7dc2ed32af04af7","third-party/protobuf/protoc-linux-x86_32":"0615a703faa6c234063ab285a2119c69122ca7e92e69b26287fdb00bc6474832","third-party/protobuf/protoc-linux-x86_64":"151dfe76345298b055000c31376f925222ef3426d6b7892b8156421fdd3fd3c4","third-party/protobuf/protoc-osx-x86_64":"e7dff9c38bf0cbcf43f055b8269ea939d6b298f611de16481ba7d3e2eec0bc2f","third-party/protobuf/protoc-win32.exe":"62e803f7433799af63acf605f7fe19108d22d0c73e82a475b27d3ff0cfbf1990","third-party/update-bundled-protobuf.sh":"c65d6d8608f1dccc9f3c17cca0f07564baa48c9337fc57592591eb6c8477222a"},"package":"355f634b43cdd80724ee7848f95770e7e70eefa6dcf14fea676216573b8fd603"} diff --git a/vendor/prost-build/build.rs b/vendor/prost-build/build.rs -index 6f3b0bf..0fbaccc 100644 +index 0902d3e..39167e2 100644 --- a/vendor/prost-build/build.rs +++ b/vendor/prost-build/build.rs -@@ -48,6 +48,7 @@ fn bundled_protoc() -> Option { - ("linux", "x86") => "protoc-linux-x86_32", - ("linux", "x86_64") => "protoc-linux-x86_64", - ("linux", "aarch64") => "protoc-linux-aarch_64", +@@ -55,6 +55,7 @@ fn bundled_protoc() -> Option { + ("linux", "aarch64") if is_interpreter("/lib/ld-linux-aarch64.so.1") => { + "protoc-linux-aarch_64" + } + ("linux", "loongarch64") => "protoc-linux-loongarch64", ("macos", "x86_64") => "protoc-osx-x86_64", + ("macos", "aarch64") => "protoc-osx-x86_64", // will be translated to aarch64 by Rosetta ("windows", _) => "protoc-win32.exe", - _ => return None, -- -2.43.0 +2.45.0 diff --git a/0002-add-riscv-support.patch b/0002-add-riscv-support.patch deleted file mode 100644 index fa1a70e..0000000 --- a/0002-add-riscv-support.patch +++ /dev/null @@ -1,24 +0,0 @@ -Based on nix v0.17.0(10e69dbc99) and v0.18.0(c5824ded78). - -diff --git a/vendor/nix/src/sys/ioctl/linux.rs b/src/sys/ioctl/linux.rs -index 9cdac72..68ebaba 100644 ---- a/vendor/nix/src/sys/ioctl/linux.rs -+++ b/vendor/nix/src/sys/ioctl/linux.rs -@@ -33,7 +33,8 @@ mod consts { - target_arch = "arm", - target_arch = "s390x", - target_arch = "x86_64", -- target_arch = "aarch64"))] -+ target_arch = "aarch64", -+ target_arch = "riscv64"))] - mod consts { - #[doc(hidden)] - pub const NONE: u8 = 0; -diff --git a/vendor/nix/.cargo-checksum.json b/vendor/nix/.cargo-checksum.json -index f44268d..f6d4447 100644 ---- a/vendor/nix/.cargo-checksum.json -+++ b/vendor/nix/.cargo-checksum.json -@@ -1 +1 @@ --{"files":{"CHANGELOG.md":"47ccde565d3bccf9947ae7192ebdef76cc06d22e27969287e420ccaacab3e936","CONTRIBUTING.md":"a9101e3d1487170d691d5f062ff49a433c167582ac8984dd41a744be92652f74","CONVENTIONS.md":"df0d4fe9fe65af0bfa4723dc7b641d5130087259799e6b404ad63884f79031cb","Cargo.toml":"10bb1283ca1dc67defbd1579a89bfffd6b4037dac93bcd63f0d719c5698b009d","LICENSE":"66e3ee1fa7f909ad3c612d556f2a0cdabcd809ad6e66f3b0605015ac64841b70","README.md":"a19b713af6c2516fbb47448d2220c83d83343db222e399937a9fc8f0881030a9","build.rs":"14c9c678c33f5894509da47f77d6a326b14aecb4190ce87a24cce98687ca63b2","src/dir.rs":"df41cf42ce92d284f70f0e7ff3ba171715f98eeba06284207e9fdb5ecf62f40b","src/errno.rs":"27bc724fd57ca9d614613e2023346fc7ac6eca4b0f6a24ed85c2e57ff221cc40","src/errno_dragonfly.c":"a857e47b114acb85fddcb252a610ab5734d225c26b7bedd7c35d7789d46c8526","src/fcntl.rs":"f491c98ee9aa1af6e02e11cd423abae21bd68dc3c4b847492a5aeff667bd4b44","src/features.rs":"22ff626ff8287a07dd55bcfc63c9f518c19c56144e15f9b6f9e3bbdcda51c2a8","src/ifaddrs.rs":"aff966a2b8eb46db2d9898157446607112bbf57d946d5dcd209aee967a230e41","src/kmod.rs":"4d8a695d3d761f351a39d654303a1bd168e74295b7d142b918737e355b24f34d","src/lib.rs":"d0a582b2185886f02419c2acd6fca0ebb6408ae5272227b72c55fa1e5ed658a2","src/macros.rs":"bf93a5a1869033e2ce2668269d8af0f40bf213c2fc5c279c9074e1eff389fa84","src/mount.rs":"cdf5db8409017483132db9d7493b5d6cc96df5560d0fa5ad8f385aff72db10ca","src/mqueue.rs":"e94e858814f66272b31a3669e9e19284f8131a92f9e5206bdd5971bb975b44d7","src/net/if_.rs":"f7e02076fcf3cadf3fdf141884c9bd2c468a7047ba60bc490f0057df802b53ce","src/net/mod.rs":"577f70170e53d4a6de1abb70bf8f1031ec3e65c0e63ef5fcf05c907125e7ac17","src/poll.rs":"e31ed102ee621a5e03d2893be3b22c3b2d7102f856a2f8979bab4438e6181b22","src/pty.rs":"9f2a92de983f3b9a76fe8d350e28b078056fe5d4cc3480d1684f54cd79bfd47a","src/sched.rs":"6651f0ea2f8792bca44e7228abdbea44536710f42de62ce043166df46cd349ab","src/sys/aio.rs":"e7d16a5711d90fff83dc25ab4b42d12d904aa9f2f75d3fd2f43e580db3f4dd64","src/sys/epoll.rs":"f0b539e0645569657f2142db91a38c94ebe1925f44852d64c61c818758dbbf0b","src/sys/event.rs":"88798385aed11be86da09b03f8ad2cd369a289ece926e89181b01ef32c77b863","src/sys/eventfd.rs":"08008cf3dc64c2216847c02c0dd8d7189cf08edbaafe35ba2c57c053fde09ef4","src/sys/inotify.rs":"687c8417d737939aa93f805d6003afc4f84f50828b1bd9429ef5d00bef0e0955","src/sys/ioctl/bsd.rs":"56ca6ecf5f7cfb566f4f3ba589fcc778f747a517dd45e13780981922e6215344","src/sys/ioctl/linux.rs":"6cfbdff4dbfa1a3782acdedebe89ffa9f000fdfc4ab68cb46f52890ebc1c6f2d","src/sys/ioctl/mod.rs":"20bc3cf1fcbbc7c31e4d507baa4e576a793ea42fb33618d2e7afeda730c4324f","src/sys/memfd.rs":"11cd93c867fdbdbc9588cecb94268691de42b2ef2a38fe33525be7c7f60c85d5","src/sys/mman.rs":"f77d28611a7ff3bf62784a3c4f26d7d79969395b1d9bbc6ff15e734f52dc404f","src/sys/mod.rs":"f39a08c72e37638c7cecfb9c087e0a41e2b69409aa545b0ef7bbd59c0a063ee2","src/sys/pthread.rs":"cfa9ccd6f3b86c0c3fe012773c9c82a7813b298c2f20f8ab629781db627ce56b","src/sys/ptrace/bsd.rs":"279f5b3a1534b1f6a04a95b85eea6db7bc60250772df29e41810c4bc8cf815da","src/sys/ptrace/linux.rs":"254a613058b79801df987bdca336f8f60b606d4f923c69c85fe86ad05e271540","src/sys/ptrace/mod.rs":"671a6ccac955e75d5998f7e53ffc45ed4c7b6522a0f24a0937d60141f692dd39","src/sys/quota.rs":"754b90390e103e479cf009f1db5756fef547472893aaec078f55211c081a9e47","src/sys/reboot.rs":"fde9da27c2928f7026231430fa14fec2058df4e49a0aeda2a237a60524f11241","src/sys/select.rs":"152fef5e5add14c5e4522d0cfa22aa339feefd2914d6196be83a98f9a6f3d2a2","src/sys/sendfile.rs":"91aabfb801dcb1048a9f4f62d1d35d248ee806debca6c28414d0b0e1bcc6ae30","src/sys/signal.rs":"8c0c30875733743b29e4a6be23f7ba641d2f752f9e4cf8d3faba4a30f3ca6e61","src/sys/signalfd.rs":"fe90180bd099183e95130197f6288391ee1c76eaea0b601c9f3bfc530b2e073d","src/sys/socket/addr.rs":"f539ac91a88afcdbab3388e4841271b7ac9e5e1dbffe9399e64abbe96ab0b529","src/sys/socket/mod.rs":"d292c77c7642cf1fd643f0f10116e55e635e2d124e3add74751214325fe1c8e5","src/sys/socket/sockopt.rs":"069b90408386b00d155c6bcb7b60555297c05526c720468771f1bf9052661165","src/sys/stat.rs":"78c31f661fe652fd1b1b863f40b1118c42ddc6d8a850858ca6c14ae7a9ed5a01","src/sys/statfs.rs":"cc4100541a467f6728a7e208bcb2792c5c5230f1dac4a4d635bcb9a2a0afd09f","src/sys/statvfs.rs":"e10e7ae608c3a09a26aa6497a3b95a3c22efd7b1d8dac4a56760a7cb5e19eea0","src/sys/sysinfo.rs":"759ad12061d517753425d1a9b732d915fa4e77575949b684bc56a6d85164c3ca","src/sys/termios.rs":"dd359d248464d3eac991dad9ec49de4b25198fc0054f7363d9277b02cf955997","src/sys/time.rs":"5d3466c895b09e49454f866cec39b94d1a0ea91c0111d6412c77925183860849","src/sys/uio.rs":"60a974275ff8c485ea183bdd6f7e25894e6f2360a5bfb25442391a825a3b9b8c","src/sys/utsname.rs":"9509a092c837d1700f9f4ac30e4568e5b9b63ad8925a56cd8ad7add05d0ac452","src/sys/wait.rs":"a4cc7ac1a2d942c8b03dfadb1c6086eac89992919831a815f1d78e187edf0d0b","src/ucontext.rs":"ebf57ba74caaf073e3483d9cca479938b916941aacd2022db0d1c6fed4e9c841","src/unistd.rs":"be5bbbce2ea784db0f860dfaa4a2d1331596aeb3ab49d62083dffe22d34f23d4","test/sys/mod.rs":"e0821cbc289ad952f17229609c7de4282cca1e44cd13e1a7494a6378ecbc12f8","test/sys/test_aio.rs":"c9844cfd4259f1c84f4da2f9f32bba22f03ff71d7bea49da79e1b437b1ea3ead","test/sys/test_aio_drop.rs":"30dd1d238269d00381fa50f6d3cb2b13794b7cceb9f6455f3878fcbffa9aa62d","test/sys/test_epoll.rs":"35093d0cb1096a934dfc4f6efc737eadc4bdc2e2134d2a879061374a51b10c97","test/sys/test_inotify.rs":"a4f804bcf414b6635d9863c8534769a609009c451c3476cc839cdc30c439b3b1","test/sys/test_ioctl.rs":"5ae688bd9ec9ee25126459dfaf665d6bbd57568551db6492c27a415d1eb7eb15","test/sys/test_lio_listio_resubmit.rs":"203a583313542593148f375b087ae30620222a745680173fa98fc448d1e5ae7f","test/sys/test_pthread.rs":"3890e5ecbf2082e0d05d102cc9cec6e76ede3c15f250d104e3483b1c1c3400b1","test/sys/test_ptrace.rs":"9d7c0ba12d8957522ad274b915aa0b771c9c61981c74ad203dfc09510143ec23","test/sys/test_select.rs":"bdb20211fc6ec1e3f186337eac51e08757acb6901d307d67c71bf9011f0d54bd","test/sys/test_signal.rs":"2a208a9a458696f0e0e295bba641912c0711a50a931616ca9df60891c80a989b","test/sys/test_signalfd.rs":"9e75274113d23e65447b97ed7b6d4779c17930717db58d3a626a6b40ffd9e0f5","test/sys/test_socket.rs":"f62784f4f184880cdfd992da16284fe941381bbea56bbf9e5583365f731c2da6","test/sys/test_sockopt.rs":"b3d386c8279f86bf9439c772317bafcdba5630fa806c8319e87ddac0ccfa3a03","test/sys/test_sysinfo.rs":"1e1bea9130fe38ccb07cd0ad7334c7be1e45efc33f7656a5973f8cad7126f225","test/sys/test_termios.rs":"fa4be3ade859b527bf33408f85a6f57b127917cf5f2afb662d09f6019d07913a","test/sys/test_uio.rs":"259ce81677b453c3c9ad7271ef70fb41155d049a5c7c89e62f73ef3b57783705","test/sys/test_wait.rs":"832ebc04ad236d38f1b3b08305a136b2974532d318f4a38078ec98565e6e2415","test/test.rs":"8506471d3b19506d48a8e4b2d2b337fb10e2e75df12929e8f25f30cad2a5eb2e","test/test_dir.rs":"5d137a62f11d1a4993b4bb35dccc38a4c4416b7da374887f2335a9895b4fdee4","test/test_fcntl.rs":"b7a0504d019081783221851da608176c96ae5fd6036b33eee81e99f1a2b74fd6","test/test_kmod/hello_mod/Makefile":"0219f7bce0603f97d997fb377ca071966c90333ecc665e78a54dfeb97a9c811b","test/test_kmod/hello_mod/hello.c":"bcac6b19c5bd807e1f3878c15e426acc85785a8ade9840c3bb4d068635c9188c","test/test_kmod/mod.rs":"f4754f028402a8ba788c87686288424cd3784e77c7eb5d96682ef491b1dd5262","test/test_mount.rs":"78ddc657f5098360c764fffa3a7d844503e4b6b65b44bfd42d9aa9045b415cb6","test/test_mq.rs":"ee653fade4d769576702fa54440660d353ed7ab1284aa5a321f73fa1f6fedf93","test/test_net.rs":"ec6d580b87292519d514b0236bdd5abdd576fcf4835cfe49ed1ddb47c5f1aea3","test/test_nix_path.rs":"e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855","test/test_poll.rs":"46c71ee988fe1b85561ea0530d099750be8c1b8f95ab6e845c8a9f46f16f060c","test/test_pty.rs":"f6beeaa2d1ac30dfda9432f07413a4ab682f4d107904cb1d3d13a673a1b75dce","test/test_ptymaster_drop.rs":"5cfbbb79551c205ab510c2d4ef497bf937ceac9151fbe2f2e543d6515e406990","test/test_sched.rs":"f8ad92eb554164b0f92428f716db99040186d741cc6e1976f7930f099652f70c","test/test_sendfile.rs":"e0cbabbd34052ccaa03d6555d5631686aa076728f6378ee90f7ecec68f891144","test/test_stat.rs":"457af188428f64bf6c5744e152d92d2ee3d956d9892f75453666b98d6a8ee07d","test/test_unistd.rs":"694093e9e5b2c1d90d7513e34ba751221964aa3c8d861c9da8cf16481dff4cff"},"package":"dd0eaf8df8bab402257e0a5c17a254e4cc1f72a93588a1ddfb5d356c801aa7cb"} -\ No newline at end of file -+{"files":{"CHANGELOG.md":"47ccde565d3bccf9947ae7192ebdef76cc06d22e27969287e420ccaacab3e936","CONTRIBUTING.md":"a9101e3d1487170d691d5f062ff49a433c167582ac8984dd41a744be92652f74","CONVENTIONS.md":"df0d4fe9fe65af0bfa4723dc7b641d5130087259799e6b404ad63884f79031cb","Cargo.toml":"10bb1283ca1dc67defbd1579a89bfffd6b4037dac93bcd63f0d719c5698b009d","LICENSE":"66e3ee1fa7f909ad3c612d556f2a0cdabcd809ad6e66f3b0605015ac64841b70","README.md":"a19b713af6c2516fbb47448d2220c83d83343db222e399937a9fc8f0881030a9","build.rs":"14c9c678c33f5894509da47f77d6a326b14aecb4190ce87a24cce98687ca63b2","src/dir.rs":"df41cf42ce92d284f70f0e7ff3ba171715f98eeba06284207e9fdb5ecf62f40b","src/errno.rs":"27bc724fd57ca9d614613e2023346fc7ac6eca4b0f6a24ed85c2e57ff221cc40","src/errno_dragonfly.c":"a857e47b114acb85fddcb252a610ab5734d225c26b7bedd7c35d7789d46c8526","src/fcntl.rs":"f491c98ee9aa1af6e02e11cd423abae21bd68dc3c4b847492a5aeff667bd4b44","src/features.rs":"22ff626ff8287a07dd55bcfc63c9f518c19c56144e15f9b6f9e3bbdcda51c2a8","src/ifaddrs.rs":"aff966a2b8eb46db2d9898157446607112bbf57d946d5dcd209aee967a230e41","src/kmod.rs":"4d8a695d3d761f351a39d654303a1bd168e74295b7d142b918737e355b24f34d","src/lib.rs":"d0a582b2185886f02419c2acd6fca0ebb6408ae5272227b72c55fa1e5ed658a2","src/macros.rs":"bf93a5a1869033e2ce2668269d8af0f40bf213c2fc5c279c9074e1eff389fa84","src/mount.rs":"cdf5db8409017483132db9d7493b5d6cc96df5560d0fa5ad8f385aff72db10ca","src/mqueue.rs":"e94e858814f66272b31a3669e9e19284f8131a92f9e5206bdd5971bb975b44d7","src/net/if_.rs":"f7e02076fcf3cadf3fdf141884c9bd2c468a7047ba60bc490f0057df802b53ce","src/net/mod.rs":"577f70170e53d4a6de1abb70bf8f1031ec3e65c0e63ef5fcf05c907125e7ac17","src/poll.rs":"e31ed102ee621a5e03d2893be3b22c3b2d7102f856a2f8979bab4438e6181b22","src/pty.rs":"9f2a92de983f3b9a76fe8d350e28b078056fe5d4cc3480d1684f54cd79bfd47a","src/sched.rs":"6651f0ea2f8792bca44e7228abdbea44536710f42de62ce043166df46cd349ab","src/sys/aio.rs":"e7d16a5711d90fff83dc25ab4b42d12d904aa9f2f75d3fd2f43e580db3f4dd64","src/sys/epoll.rs":"f0b539e0645569657f2142db91a38c94ebe1925f44852d64c61c818758dbbf0b","src/sys/event.rs":"88798385aed11be86da09b03f8ad2cd369a289ece926e89181b01ef32c77b863","src/sys/eventfd.rs":"08008cf3dc64c2216847c02c0dd8d7189cf08edbaafe35ba2c57c053fde09ef4","src/sys/inotify.rs":"687c8417d737939aa93f805d6003afc4f84f50828b1bd9429ef5d00bef0e0955","src/sys/ioctl/bsd.rs":"56ca6ecf5f7cfb566f4f3ba589fcc778f747a517dd45e13780981922e6215344","src/sys/ioctl/linux.rs":"642b25d3997518815dea454fa976e9067ad5fe4ed75622e7540e3f0d0c7d320a","src/sys/ioctl/mod.rs":"20bc3cf1fcbbc7c31e4d507baa4e576a793ea42fb33618d2e7afeda730c4324f","src/sys/memfd.rs":"11cd93c867fdbdbc9588cecb94268691de42b2ef2a38fe33525be7c7f60c85d5","src/sys/mman.rs":"f77d28611a7ff3bf62784a3c4f26d7d79969395b1d9bbc6ff15e734f52dc404f","src/sys/mod.rs":"f39a08c72e37638c7cecfb9c087e0a41e2b69409aa545b0ef7bbd59c0a063ee2","src/sys/pthread.rs":"cfa9ccd6f3b86c0c3fe012773c9c82a7813b298c2f20f8ab629781db627ce56b","src/sys/ptrace/bsd.rs":"279f5b3a1534b1f6a04a95b85eea6db7bc60250772df29e41810c4bc8cf815da","src/sys/ptrace/linux.rs":"254a613058b79801df987bdca336f8f60b606d4f923c69c85fe86ad05e271540","src/sys/ptrace/mod.rs":"671a6ccac955e75d5998f7e53ffc45ed4c7b6522a0f24a0937d60141f692dd39","src/sys/quota.rs":"754b90390e103e479cf009f1db5756fef547472893aaec078f55211c081a9e47","src/sys/reboot.rs":"fde9da27c2928f7026231430fa14fec2058df4e49a0aeda2a237a60524f11241","src/sys/select.rs":"152fef5e5add14c5e4522d0cfa22aa339feefd2914d6196be83a98f9a6f3d2a2","src/sys/sendfile.rs":"91aabfb801dcb1048a9f4f62d1d35d248ee806debca6c28414d0b0e1bcc6ae30","src/sys/signal.rs":"8c0c30875733743b29e4a6be23f7ba641d2f752f9e4cf8d3faba4a30f3ca6e61","src/sys/signalfd.rs":"fe90180bd099183e95130197f6288391ee1c76eaea0b601c9f3bfc530b2e073d","src/sys/socket/addr.rs":"f539ac91a88afcdbab3388e4841271b7ac9e5e1dbffe9399e64abbe96ab0b529","src/sys/socket/mod.rs":"d292c77c7642cf1fd643f0f10116e55e635e2d124e3add74751214325fe1c8e5","src/sys/socket/sockopt.rs":"069b90408386b00d155c6bcb7b60555297c05526c720468771f1bf9052661165","src/sys/stat.rs":"78c31f661fe652fd1b1b863f40b1118c42ddc6d8a850858ca6c14ae7a9ed5a01","src/sys/statfs.rs":"cc4100541a467f6728a7e208bcb2792c5c5230f1dac4a4d635bcb9a2a0afd09f","src/sys/statvfs.rs":"e10e7ae608c3a09a26aa6497a3b95a3c22efd7b1d8dac4a56760a7cb5e19eea0","src/sys/sysinfo.rs":"759ad12061d517753425d1a9b732d915fa4e77575949b684bc56a6d85164c3ca","src/sys/termios.rs":"dd359d248464d3eac991dad9ec49de4b25198fc0054f7363d9277b02cf955997","src/sys/time.rs":"5d3466c895b09e49454f866cec39b94d1a0ea91c0111d6412c77925183860849","src/sys/uio.rs":"60a974275ff8c485ea183bdd6f7e25894e6f2360a5bfb25442391a825a3b9b8c","src/sys/utsname.rs":"9509a092c837d1700f9f4ac30e4568e5b9b63ad8925a56cd8ad7add05d0ac452","src/sys/wait.rs":"a4cc7ac1a2d942c8b03dfadb1c6086eac89992919831a815f1d78e187edf0d0b","src/ucontext.rs":"ebf57ba74caaf073e3483d9cca479938b916941aacd2022db0d1c6fed4e9c841","src/unistd.rs":"be5bbbce2ea784db0f860dfaa4a2d1331596aeb3ab49d62083dffe22d34f23d4","test/sys/mod.rs":"e0821cbc289ad952f17229609c7de4282cca1e44cd13e1a7494a6378ecbc12f8","test/sys/test_aio.rs":"c9844cfd4259f1c84f4da2f9f32bba22f03ff71d7bea49da79e1b437b1ea3ead","test/sys/test_aio_drop.rs":"30dd1d238269d00381fa50f6d3cb2b13794b7cceb9f6455f3878fcbffa9aa62d","test/sys/test_epoll.rs":"35093d0cb1096a934dfc4f6efc737eadc4bdc2e2134d2a879061374a51b10c97","test/sys/test_inotify.rs":"a4f804bcf414b6635d9863c8534769a609009c451c3476cc839cdc30c439b3b1","test/sys/test_ioctl.rs":"5ae688bd9ec9ee25126459dfaf665d6bbd57568551db6492c27a415d1eb7eb15","test/sys/test_lio_listio_resubmit.rs":"203a583313542593148f375b087ae30620222a745680173fa98fc448d1e5ae7f","test/sys/test_pthread.rs":"3890e5ecbf2082e0d05d102cc9cec6e76ede3c15f250d104e3483b1c1c3400b1","test/sys/test_ptrace.rs":"9d7c0ba12d8957522ad274b915aa0b771c9c61981c74ad203dfc09510143ec23","test/sys/test_select.rs":"bdb20211fc6ec1e3f186337eac51e08757acb6901d307d67c71bf9011f0d54bd","test/sys/test_signal.rs":"2a208a9a458696f0e0e295bba641912c0711a50a931616ca9df60891c80a989b","test/sys/test_signalfd.rs":"9e75274113d23e65447b97ed7b6d4779c17930717db58d3a626a6b40ffd9e0f5","test/sys/test_socket.rs":"f62784f4f184880cdfd992da16284fe941381bbea56bbf9e5583365f731c2da6","test/sys/test_sockopt.rs":"b3d386c8279f86bf9439c772317bafcdba5630fa806c8319e87ddac0ccfa3a03","test/sys/test_sysinfo.rs":"1e1bea9130fe38ccb07cd0ad7334c7be1e45efc33f7656a5973f8cad7126f225","test/sys/test_termios.rs":"fa4be3ade859b527bf33408f85a6f57b127917cf5f2afb662d09f6019d07913a","test/sys/test_uio.rs":"259ce81677b453c3c9ad7271ef70fb41155d049a5c7c89e62f73ef3b57783705","test/sys/test_wait.rs":"832ebc04ad236d38f1b3b08305a136b2974532d318f4a38078ec98565e6e2415","test/test.rs":"8506471d3b19506d48a8e4b2d2b337fb10e2e75df12929e8f25f30cad2a5eb2e","test/test_dir.rs":"5d137a62f11d1a4993b4bb35dccc38a4c4416b7da374887f2335a9895b4fdee4","test/test_fcntl.rs":"b7a0504d019081783221851da608176c96ae5fd6036b33eee81e99f1a2b74fd6","test/test_kmod/hello_mod/Makefile":"0219f7bce0603f97d997fb377ca071966c90333ecc665e78a54dfeb97a9c811b","test/test_kmod/hello_mod/hello.c":"bcac6b19c5bd807e1f3878c15e426acc85785a8ade9840c3bb4d068635c9188c","test/test_kmod/mod.rs":"f4754f028402a8ba788c87686288424cd3784e77c7eb5d96682ef491b1dd5262","test/test_mount.rs":"78ddc657f5098360c764fffa3a7d844503e4b6b65b44bfd42d9aa9045b415cb6","test/test_mq.rs":"ee653fade4d769576702fa54440660d353ed7ab1284aa5a321f73fa1f6fedf93","test/test_net.rs":"ec6d580b87292519d514b0236bdd5abdd576fcf4835cfe49ed1ddb47c5f1aea3","test/test_nix_path.rs":"e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855","test/test_poll.rs":"46c71ee988fe1b85561ea0530d099750be8c1b8f95ab6e845c8a9f46f16f060c","test/test_pty.rs":"f6beeaa2d1ac30dfda9432f07413a4ab682f4d107904cb1d3d13a673a1b75dce","test/test_ptymaster_drop.rs":"5cfbbb79551c205ab510c2d4ef497bf937ceac9151fbe2f2e543d6515e406990","test/test_sched.rs":"f8ad92eb554164b0f92428f716db99040186d741cc6e1976f7930f099652f70c","test/test_sendfile.rs":"e0cbabbd34052ccaa03d6555d5631686aa076728f6378ee90f7ecec68f891144","test/test_stat.rs":"457af188428f64bf6c5744e152d92d2ee3d956d9892f75453666b98d6a8ee07d","test/test_unistd.rs":"694093e9e5b2c1d90d7513e34ba751221964aa3c8d861c9da8cf16481dff4cff"},"package":"dd0eaf8df8bab402257e0a5c17a254e4cc1f72a93588a1ddfb5d356c801aa7cb"} diff --git a/0004-simplify-Store-api-remove-unnecessary-validation.patch b/0002-simplify-Store-api-remove-unnecessary-validation.patch similarity index 100% rename from 0004-simplify-Store-api-remove-unnecessary-validation.patch rename to 0002-simplify-Store-api-remove-unnecessary-validation.patch diff --git a/0005-Check-if-a-path-is-abstract-before-connection.patch b/0003-Check-if-a-path-is-abstract-before-connection.patch similarity index 100% rename from 0005-Check-if-a-path-is-abstract-before-connection.patch rename to 0003-Check-if-a-path-is-abstract-before-connection.patch diff --git a/0006-Add-vsock-support.patch b/0004-Add-vsock-support.patch similarity index 100% rename from 0006-Add-vsock-support.patch rename to 0004-Add-vsock-support.patch diff --git a/0005-sandbox-sandbox-api-update.patch b/0005-sandbox-sandbox-api-update.patch new file mode 100644 index 0000000..1aee6b0 --- /dev/null +++ b/0005-sandbox-sandbox-api-update.patch @@ -0,0 +1,28 @@ +From 0faa4dfeb2158e14fd458a4d3836db6be7ab0214 Mon Sep 17 00:00:00 2001 +From: jackey_1024 +Date: Mon, 21 Oct 2024 16:51:02 +0800 +Subject: [PATCH] sandbox:sandbox api update + +Signed-off-by: jackey_1024 +--- + src/client/client.rs | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/src/client/client.rs b/src/client/client.rs +index 2151e23..fe1b1c2 100644 +--- a/src/client/client.rs ++++ b/src/client/client.rs +@@ -118,8 +118,8 @@ fn connect_to_unix_socket(abs: bool, address: &str) -> Result { + } + + pub fn new_conn(container_id: &String, addr: &String) -> Result<()> { +- let fd = if addr.starts_with("vsock://") { +- let address = addr.strip_prefix("vsock://").unwrap(); ++ let fd = if addr.starts_with("ttrpc+vsock://") { ++ let address = addr.strip_prefix("ttrpc+vsock://").unwrap(); + connect_to_vsock(address)? + } else { + let address = if addr.starts_with("unix://") { +-- +2.45.0 + diff --git a/0006-add-adapter-for-runc-sandboxer.patch b/0006-add-adapter-for-runc-sandboxer.patch new file mode 100644 index 0000000..dfd08b0 --- /dev/null +++ b/0006-add-adapter-for-runc-sandboxer.patch @@ -0,0 +1,28 @@ +From 8b393e10d52876aef1c2c4ac0878eab6e1962f48 Mon Sep 17 00:00:00 2001 +From: zhongtao +Date: Thu, 19 Dec 2024 15:11:16 +0800 +Subject: [PATCH] add adapter for runc sandboxer + +Signed-off-by: zhongtao +--- + src/client/client.rs | 4 ++++ + 1 file changed, 4 insertions(+) + +diff --git a/src/client/client.rs b/src/client/client.rs +index fe1b1c2..7323197 100644 +--- a/src/client/client.rs ++++ b/src/client/client.rs +@@ -121,6 +121,10 @@ pub fn new_conn(container_id: &String, addr: &String) -> Result<()> { + let fd = if addr.starts_with("ttrpc+vsock://") { + let address = addr.strip_prefix("ttrpc+vsock://").unwrap(); + connect_to_vsock(address)? ++ } else if addr.starts_with("ttrpc+unix://") { ++ let address = addr.strip_prefix("ttrpc+unix://").unwrap(); ++ let path = Path::new(&MAIN_SEPARATOR.to_string()).join(address); ++ connect_to_unix_socket(!addr.starts_with("ttrpc+unix://"), &path.to_string_lossy())? + } else { + let address = if addr.starts_with("unix://") { + addr.strip_prefix("unix://").unwrap() +-- +2.45.0 + diff --git a/0007-update-dependent-protobuf-and-ttrpc-version.patch b/0007-update-dependent-protobuf-and-ttrpc-version.patch new file mode 100644 index 0000000..a7e8309 --- /dev/null +++ b/0007-update-dependent-protobuf-and-ttrpc-version.patch @@ -0,0 +1,1207 @@ +From d69f0d8e1e37c58e27caec5576cfe91a6c2dc16c Mon Sep 17 00:00:00 2001 +From: vegbir +Date: Thu, 16 Jan 2025 02:12:14 +0000 +Subject: [PATCH] update dependent protobuf and ttrpc version + +--- + Cargo.lock | 542 +++++++++++++++++++++++++++++-------------- + Cargo.toml | 10 +- + build.rs | 4 + + src/client/client.rs | 135 ++++++----- + 4 files changed, 453 insertions(+), 238 deletions(-) + +diff --git a/Cargo.lock b/Cargo.lock +index 3cc2a33..75400c2 100644 +--- a/Cargo.lock ++++ b/Cargo.lock +@@ -1,19 +1,19 @@ + # This file is automatically @generated by Cargo. + # It is not intended for manual editing. + [[package]] +-name = "addr2line" +-version = "0.15.2" ++name = "aho-corasick" ++version = "1.1.3" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "e7a2e47a1fbe209ee101dd6d61285226744c6c8d3c21c8dc878ba6cb9f467f3a" ++checksum = "8e60d3430d3a69478ad0993f19238d2df97c507009a52b3c10addcd7f6bcb916" + dependencies = [ +- "gimli", ++ "memchr", + ] + + [[package]] +-name = "adler" +-version = "1.0.2" ++name = "anyhow" ++version = "1.0.93" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "f26201604c87b1e01bd3d98f8d5d9a8fcbb815e8cedb41ffccbeb4bf593a35fe" ++checksum = "4c95c10ba0b00a02636238b814946408b1322d5ac4760326e6fb8ec956d85775" + + [[package]] + name = "autocfg" +@@ -21,21 +21,6 @@ version = "1.0.1" + source = "registry+https://github.com/rust-lang/crates.io-index" + checksum = "cdb031dd78e28731d87d56cc8ffef4a8f36ca26c38fe2de700543e627f8a464a" + +-[[package]] +-name = "backtrace" +-version = "0.3.60" +-source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "b7815ea54e4d821e791162e078acbebfd6d8c8939cd559c9335dceb1c8ca7282" +-dependencies = [ +- "addr2line", +- "cc", +- "cfg-if 1.0.0", +- "libc", +- "miniz_oxide", +- "object", +- "rustc-demangle", +-] +- + [[package]] + name = "bitflags" + version = "1.2.1" +@@ -44,9 +29,9 @@ checksum = "cf1de2fe8c75bc145a2f577add951f8134889b4795d47466a54a5c846d691693" + + [[package]] + name = "byteorder" +-version = "1.4.3" ++version = "1.5.0" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "14c189c53d098945499cdfa7ecc63567cf3886b3332b312a5b4585d8d3a6a610" ++checksum = "1fd0f2584146f6f2ef48085050886acf353beff7305ebd1ae69500e27c67f64b" + + [[package]] + name = "bytes" +@@ -58,11 +43,20 @@ dependencies = [ + "iovec", + ] + ++[[package]] ++name = "bytes" ++version = "1.8.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "9ac0150caa2ae65ca5bd83f25c7de183dea78d4d366469f148435e2acfbad0da" ++ + [[package]] + name = "cc" +-version = "1.0.68" ++version = "1.2.1" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "4a72c244c1ff497a746a7e1fb3d14bd08420ecda70c8f25c7112f2781652d787" ++checksum = "fd9de9f2205d5ef3fd67e685b0df337994ddd4495e2a28d185500d0e1edfea47" ++dependencies = [ ++ "shlex", ++] + + [[package]] + name = "cfg-if" +@@ -82,15 +76,71 @@ version = "0.7.8" + source = "registry+https://github.com/rust-lang/crates.io-index" + checksum = "475bd7aa7680b4ed8f6bb59745e882bcbaeb39326532bb79ffb1716480d9a274" + ++[[package]] ++name = "crossbeam" ++version = "0.8.4" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "1137cd7e7fc0fb5d3c5a8678be38ec56e819125d8d7907411fe24ccb943faca8" ++dependencies = [ ++ "crossbeam-channel", ++ "crossbeam-deque", ++ "crossbeam-epoch", ++ "crossbeam-queue", ++ "crossbeam-utils", ++] ++ ++[[package]] ++name = "crossbeam-channel" ++version = "0.5.13" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "33480d6946193aa8033910124896ca395333cae7e2d1113d1fef6c3272217df2" ++dependencies = [ ++ "crossbeam-utils", ++] ++ ++[[package]] ++name = "crossbeam-deque" ++version = "0.8.5" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "613f8cc01fe9cf1a3eb3d7f488fd2fa8388403e97039e2f73692932e291a770d" ++dependencies = [ ++ "crossbeam-epoch", ++ "crossbeam-utils", ++] ++ ++[[package]] ++name = "crossbeam-epoch" ++version = "0.9.18" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "5b82ac4a3c2ca9c3460964f020e1402edd5753411d7737aa39c3714ad1b5420e" ++dependencies = [ ++ "crossbeam-utils", ++] ++ ++[[package]] ++name = "crossbeam-queue" ++version = "0.3.11" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "df0346b5d5e76ac2fe4e327c5fd1118d6be7c51dfb18f9b7922923f287471e35" ++dependencies = [ ++ "crossbeam-utils", ++] ++ ++[[package]] ++name = "crossbeam-utils" ++version = "0.8.20" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "22ec99545bb0ed0ea7bb9b8e1e9122ea386ff8a48c0922e43f36d45ab09e0e80" ++ + [[package]] + name = "derive-new" + version = "0.5.9" + source = "registry+https://github.com/rust-lang/crates.io-index" + checksum = "3418329ca0ad70234b9735dc4ceed10af4df60eff9c8e7b06cb5e520d92c3535" + dependencies = [ +- "proc-macro2 1.0.27", +- "quote 1.0.9", +- "syn 1.0.73", ++ "proc-macro2", ++ "quote", ++ "syn", + ] + + [[package]] +@@ -100,19 +150,16 @@ source = "registry+https://github.com/rust-lang/crates.io-index" + checksum = "e78d4f1cc4ae33bbfc157ed5d5a5ef3bc29227303d595861deb238fcec4e9457" + + [[package]] +-name = "failure" +-version = "0.1.8" ++name = "equivalent" ++version = "1.0.1" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "d32e9bd16cc02eae7db7ef620b392808b89f6a5e16bb3497d159c6b92a0f4f86" +-dependencies = [ +- "backtrace", +-] ++checksum = "5443807d6dff69373d433ab9ef5378ad8df50ca6298caf15de6e52e24aaf54d5" + + [[package]] + name = "fixedbitset" +-version = "0.1.9" ++version = "0.2.0" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "86d4de0081402f5e88cdac65c8dcdcc73118c1a7a465e2a05f0da05843a8ea33" ++checksum = "37ab347416e802de484e4d03c7316c48f1ecb56574dfd4a46a80f173ce1de04d" + + [[package]] + name = "getrandom" +@@ -126,10 +173,16 @@ dependencies = [ + ] + + [[package]] +-name = "gimli" +-version = "0.24.0" ++name = "hashbrown" ++version = "0.12.3" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "8a9ee70c43aaf417c914396645a0fa852624801b24ebb7ae78fe8272889ac888" ++ ++[[package]] ++name = "hashbrown" ++version = "0.15.2" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "0e4075386626662786ddb0ec9081e7c7eeb1ba31951f447ca780ef9f5d568189" ++checksum = "bf151400ff0baff5465007dd2f3e717f3fe502074ca563069ce3a6629d07b289" + + [[package]] + name = "heck" +@@ -140,6 +193,26 @@ dependencies = [ + "unicode-segmentation", + ] + ++[[package]] ++name = "indexmap" ++version = "1.9.3" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "bd070e393353796e801d209ad339e89596eb4c8d430d18ede6a1cced8fafbd99" ++dependencies = [ ++ "autocfg", ++ "hashbrown 0.12.3", ++] ++ ++[[package]] ++name = "indexmap" ++version = "2.6.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "707907fe3c25f5424cce2cb7e1cbcafee6bdbe735ca90ef77c29e84591e5b9da" ++dependencies = [ ++ "equivalent", ++ "hashbrown 0.15.2", ++] ++ + [[package]] + name = "iovec" + version = "0.1.4" +@@ -151,31 +224,33 @@ dependencies = [ + + [[package]] + name = "itertools" +-version = "0.8.2" ++version = "0.10.5" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "f56a2d0bc861f9165be4eb3442afd3c236d8a98afd426f65d92324ae1091a484" ++checksum = "b0fd2260e829bddf4cb6ea802289de2f86d6a7a690192fbe91b3f46e0f2c8473" + dependencies = [ + "either", + ] + + [[package]] + name = "lazy_static" +-version = "1.4.0" ++version = "1.5.0" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646" ++checksum = "bbd2bcb4c963f2ddae06a2efc7e9f3591312473c50c6685e1f298068316e66fe" + + [[package]] + name = "lib-shim-v2" + version = "0.1.0" + dependencies = [ + "byteorder", +- "bytes", ++ "bytes 0.4.12", + "cmd_lib", + "lazy_static", + "libc", + "log", +- "nix", +- "protobuf", ++ "nix 0.16.1", ++ "protobuf 2.28.0", ++ "protobuf 3.7.1", ++ "protobuf-codegen 3.7.1", + "protoc-rust", + "ttrpc", + "ttrpc-codegen", +@@ -183,40 +258,36 @@ dependencies = [ + + [[package]] + name = "libc" +-version = "0.2.97" ++version = "0.2.165" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "12b8adadd720df158f4d70dfe7ccc6adb0472d7c55ca83445f6a5ab3e36f8fb6" ++checksum = "fcb4d3d38eab6c5239a362fa8bae48c03baf980a6e7079f063942d563ef3533e" + + [[package]] + name = "log" +-version = "0.4.14" ++version = "0.4.22" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "51b9bbe6c47d51fc3e1a9b945965946b4c44142ab8792c50835a980d362c2710" +-dependencies = [ +- "cfg-if 1.0.0", +-] ++checksum = "a7a70ba024b9dc04c27ea2f0c0548feb474ec5c54bba33a7f72f873a39d07b24" + + [[package]] + name = "memchr" +-version = "2.4.0" ++version = "2.7.4" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "b16bd47d9e329435e309c58469fe0791c2d0d1ba96ec0954152a5ae2b04387dc" ++checksum = "78ca9ab1a0babb1e7d5695e3530886289c18cf2f87ec19a575a0abdce112e3a3" + + [[package]] +-name = "miniz_oxide" +-version = "0.4.4" ++name = "memoffset" ++version = "0.7.1" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "a92518e98c078586bc6c934028adcca4c92a53d6a958196de835170a01d84e4b" ++checksum = "5de893c32cde5f383baa4c04c5d6dbdd735cfd4a794b0debdb2bb1b421da5ff4" + dependencies = [ +- "adler", + "autocfg", + ] + + [[package]] + name = "multimap" +-version = "0.4.0" ++version = "0.8.3" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "2eb04b9f127583ed176e163fb9ec6f3e793b87e21deedd5734a69386a18a0151" ++checksum = "e5ce46fe64a9d73be07dcbe690a38ce1b293be448fd8ce1e6c1b8062c9f72c6a" + + [[package]] + name = "nix" +@@ -232,65 +303,72 @@ dependencies = [ + ] + + [[package]] +-name = "object" +-version = "0.25.3" ++name = "nix" ++version = "0.26.4" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "a38f2be3697a57b4060074ff41b44c16870d916ad7877c17696e063257482bc7" ++checksum = "598beaf3cc6fdd9a5dfb1630c2800c7acd31df7aaf0f565796fba2b53ca1af1b" + dependencies = [ +- "memchr", ++ "bitflags", ++ "cfg-if 1.0.0", ++ "libc", ++ "memoffset", ++ "pin-utils", + ] + ++[[package]] ++name = "once_cell" ++version = "1.20.2" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "1261fe7e33c73b354eab43b1273a57c8f967d0391e80353e51f764ac02cf6775" ++ + [[package]] + name = "petgraph" +-version = "0.4.13" ++version = "0.5.1" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "9c3659d1ee90221741f65dd128d9998311b0e40c5d3c23a62445938214abce4f" ++checksum = "467d164a6de56270bd7c4d070df81d07beace25012d5103ced4e9ff08d6afdb7" + dependencies = [ + "fixedbitset", ++ "indexmap 1.9.3", + ] + + [[package]] +-name = "ppv-lite86" +-version = "0.2.10" ++name = "pin-utils" ++version = "0.1.0" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "ac74c624d6b2d21f425f752262f42188365d7b8ff1aff74c82e45136510a4857" ++checksum = "8b870d8c151b6f2fb93e84a13146138f05d02ed11c7e7c54f8826aaaf7c9f184" + + [[package]] +-name = "proc-macro2" +-version = "0.4.30" ++name = "ppv-lite86" ++version = "0.2.10" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "cf3d2011ab5c909338f7887f4fc896d35932e29146c12c8d01da6b22a80ba759" +-dependencies = [ +- "unicode-xid 0.1.0", +-] ++checksum = "ac74c624d6b2d21f425f752262f42188365d7b8ff1aff74c82e45136510a4857" + + [[package]] + name = "proc-macro2" +-version = "1.0.27" ++version = "1.0.92" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "f0d8caf72986c1a598726adc988bb5984792ef84f5ee5aa50209145ee8077038" ++checksum = "37d3544b3f2748c54e147655edb5025752e2303145b5aefb3c3ea2c78b973bb0" + dependencies = [ +- "unicode-xid 0.2.2", ++ "unicode-ident", + ] + + [[package]] + name = "prost" +-version = "0.5.0" ++version = "0.8.0" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "96d14b1c185652833d24aaad41c5832b0be5616a590227c1fbff57c616754b23" ++checksum = "de5e2533f59d08fcf364fd374ebda0692a70bd6d7e66ef97f306f45c6c5d8020" + dependencies = [ +- "byteorder", +- "bytes", ++ "bytes 1.8.0", + "prost-derive", + ] + + [[package]] + name = "prost-build" +-version = "0.5.0" ++version = "0.8.0" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "eb788126ea840817128183f8f603dce02cb7aea25c2a0b764359d8e20010702e" ++checksum = "355f634b43cdd80724ee7848f95770e7e70eefa6dcf14fea676216573b8fd603" + dependencies = [ +- "bytes", ++ "bytes 1.8.0", + "heck", + "itertools", + "log", +@@ -299,95 +377,127 @@ dependencies = [ + "prost", + "prost-types", + "tempfile", +- "which 2.0.1", ++ "which", + ] + + [[package]] + name = "prost-derive" +-version = "0.5.0" ++version = "0.8.0" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "5e7dc378b94ac374644181a2247cebf59a6ec1c88b49ac77f3a94b86b79d0e11" ++checksum = "600d2f334aa05acb02a755e217ef1ab6dea4d51b58b7846588b747edec04efba" + dependencies = [ +- "failure", ++ "anyhow", + "itertools", +- "proc-macro2 0.4.30", +- "quote 0.6.13", +- "syn 0.15.44", ++ "proc-macro2", ++ "quote", ++ "syn", + ] + + [[package]] + name = "prost-types" +-version = "0.5.0" ++version = "0.8.0" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "1de482a366941c8d56d19b650fac09ca08508f2a696119ee7513ad590c8bac6f" ++checksum = "603bbd6394701d13f3f25aada59c7de9d35a6a5887cfc156181234a44002771b" + dependencies = [ +- "bytes", ++ "bytes 1.8.0", + "prost", + ] + + [[package]] + name = "protobuf" +-version = "2.24.1" ++version = "2.28.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "106dd99e98437432fed6519dedecfade6a06a73bb7b2a1e019fdd2bee5778d94" ++ ++[[package]] ++name = "protobuf" ++version = "3.7.1" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "db50e77ae196458ccd3dc58a31ea1a90b0698ab1b7928d89f644c25d72070267" ++checksum = "a3a7c64d9bf75b1b8d981124c14c179074e8caa7dfe7b6a12e6222ddcd0c8f72" ++dependencies = [ ++ "once_cell", ++ "protobuf-support", ++ "thiserror", ++] + + [[package]] + name = "protobuf-codegen" +-version = "2.24.1" ++version = "2.28.0" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "09321cef9bee9ddd36884f97b7f7cc92a586cdc74205c4b3aeba65b5fc9c6f90" ++checksum = "033460afb75cf755fcfc16dfaed20b86468082a2ea24e05ac35ab4a099a017d6" + dependencies = [ +- "protobuf", ++ "protobuf 2.28.0", + ] + + [[package]] +-name = "protobuf-codegen-pure" +-version = "2.24.1" ++name = "protobuf-codegen" ++version = "3.7.1" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "1afb68a6d768571da3db86ce55f0f62966e0fc25eaf96acd070ea548a91b0d23" ++checksum = "e26b833f144769a30e04b1db0146b2aaa53fd2fd83acf10a6b5f996606c18144" + dependencies = [ +- "protobuf", +- "protobuf-codegen", ++ "anyhow", ++ "once_cell", ++ "protobuf 3.7.1", ++ "protobuf-parse", ++ "regex", ++ "tempfile", ++ "thiserror", + ] + + [[package]] +-name = "protoc" +-version = "2.24.1" ++name = "protobuf-parse" ++version = "3.7.1" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "c367feabb5f78ca3b2ec25e2c4a5f4f0826017d7fb634f52961afd1a6613d1fb" ++checksum = "322330e133eab455718444b4e033ebfac7c6528972c784fcde28d2cc783c6257" + dependencies = [ ++ "anyhow", ++ "indexmap 2.6.0", + "log", +- "which 4.1.0", ++ "protobuf 3.7.1", ++ "protobuf-support", ++ "tempfile", ++ "thiserror", ++ "which", + ] + + [[package]] +-name = "protoc-rust" +-version = "2.24.1" ++name = "protobuf-support" ++version = "3.7.1" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "7bb2c1038f8014a2e42fdffec03ffc03f574a8bf66b0ac32f1b6941681eb1317" ++checksum = "b088fd20b938a875ea00843b6faf48579462630015c3788d397ad6a786663252" + dependencies = [ +- "protobuf", +- "protobuf-codegen", +- "protoc", +- "tempfile", ++ "thiserror", + ] + + [[package]] +-name = "quote" +-version = "0.6.13" ++name = "protoc" ++version = "2.28.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "a0218039c514f9e14a5060742ecd50427f8ac4f85a6dc58f2ddb806e318c55ee" ++dependencies = [ ++ "log", ++ "which", ++] ++ ++[[package]] ++name = "protoc-rust" ++version = "2.28.0" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "6ce23b6b870e8f94f81fb0a363d65d86675884b34a09043c81e5562f11c1f8e1" ++checksum = "22f8a182bb17c485f20bdc4274a8c39000a61024cfe461c799b50fec77267838" + dependencies = [ +- "proc-macro2 0.4.30", ++ "protobuf 2.28.0", ++ "protobuf-codegen 2.28.0", ++ "protoc", ++ "tempfile", + ] + + [[package]] + name = "quote" +-version = "1.0.9" ++version = "1.0.37" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "c3d0b9745dc2debf507c8422de05d7226cc1f0644216dfdfead988f9b1ab32a7" ++checksum = "b5b9d34b8991d19d98081b46eacdd8eb58c6f2b201139f7c5f643cc155a633af" + dependencies = [ +- "proc-macro2 1.0.27", ++ "proc-macro2", + ] + + [[package]] +@@ -440,40 +550,58 @@ dependencies = [ + ] + + [[package]] +-name = "remove_dir_all" +-version = "0.5.3" ++name = "regex" ++version = "1.11.1" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "3acd125665422973a33ac9d3dd2df85edad0f4ae9b00dafb1a05e43a9f5ef8e7" ++checksum = "b544ef1b4eac5dc2db33ea63606ae9ffcfac26c1416a2806ae0bf5f56b201191" + dependencies = [ +- "winapi", ++ "aho-corasick", ++ "memchr", ++ "regex-automata", ++ "regex-syntax", + ] + + [[package]] +-name = "rustc-demangle" +-version = "0.1.20" ++name = "regex-automata" ++version = "0.4.9" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "dead70b0b5e03e9c814bcb6b01e03e68f7c57a80aa48c72ec92152ab3e818d49" ++checksum = "809e8dc61f6de73b46c85f4c96486310fe304c434cfa43669d7b40f711150908" ++dependencies = [ ++ "aho-corasick", ++ "memchr", ++ "regex-syntax", ++] + + [[package]] +-name = "syn" +-version = "0.15.44" ++name = "regex-syntax" ++version = "0.8.5" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "9ca4b3b69a77cbe1ffc9e198781b7acb0c7365a883670e8f1c1bc66fba79a5c5" ++checksum = "2b15c43186be67a4fd63bee50d0303afffcef381492ebe2c5d87f324e1b8815c" ++ ++[[package]] ++name = "remove_dir_all" ++version = "0.5.3" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "3acd125665422973a33ac9d3dd2df85edad0f4ae9b00dafb1a05e43a9f5ef8e7" + dependencies = [ +- "proc-macro2 0.4.30", +- "quote 0.6.13", +- "unicode-xid 0.1.0", ++ "winapi", + ] + ++[[package]] ++name = "shlex" ++version = "1.3.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "0fda2ff0d084019ba4d7c6f371c95d8fd75ce3524c3cb8fb653a3023f6323e64" ++ + [[package]] + name = "syn" + version = "1.0.73" + source = "registry+https://github.com/rust-lang/crates.io-index" + checksum = "f71489ff30030d2ae598524f61326b902466f72a0fb1a8564c001cc63425bcc7" + dependencies = [ +- "proc-macro2 1.0.27", +- "quote 1.0.9", +- "unicode-xid 0.2.2", ++ "proc-macro2", ++ "quote", ++ "unicode-xid", + ] + + [[package]] +@@ -492,77 +620,79 @@ dependencies = [ + + [[package]] + name = "thiserror" +-version = "1.0.25" ++version = "1.0.39" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "fa6f76457f59514c7eeb4e59d891395fab0b2fd1d40723ae737d64153392e9c6" ++checksum = "a5ab016db510546d856297882807df8da66a16fb8c4101cb8b30054b0d5b2d9c" + dependencies = [ + "thiserror-impl", + ] + + [[package]] + name = "thiserror-impl" +-version = "1.0.25" ++version = "1.0.39" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "8a36768c0fbf1bb15eca10defa29526bda730a2376c2ab4393ccfa16fb1a318d" ++checksum = "5420d42e90af0c38c3290abcca25b9b3bdf379fc9f55c528f53a269d9c9a267e" + dependencies = [ +- "proc-macro2 1.0.27", +- "quote 1.0.9", +- "syn 1.0.73", ++ "proc-macro2", ++ "quote", ++ "syn", + ] + + [[package]] + name = "ttrpc" +-version = "0.4.15" ++version = "0.8.2" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "cba1bb15a916136c7fbd9af517f873e250552d558c2b7d8ad8a1ba4361f88fb5" ++checksum = "e376927d4422245ae3e0a0d7df0e805f99652536999b5c671144de9fe4120d8c" + dependencies = [ + "byteorder", ++ "crossbeam", + "libc", + "log", +- "nix", +- "protobuf", +- "protobuf-codegen-pure", ++ "nix 0.26.4", ++ "protobuf 3.7.1", ++ "protobuf-codegen 3.7.1", + "thiserror", ++ "windows-sys", + ] + + [[package]] + name = "ttrpc-codegen" +-version = "0.1.2" ++version = "0.4.2" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "12e8844d7a8351fa833bea811f826401bec020b233e60a7c0a8f313f764ce5a5" ++checksum = "94d7f7631d7a9ebed715a47cd4cb6072cbc7ae1d4ec01598971bbec0024340c2" + dependencies = [ +- "protobuf", +- "protobuf-codegen", +- "protobuf-codegen-pure", ++ "protobuf 2.28.0", ++ "protobuf-codegen 3.7.1", ++ "protobuf-support", + "ttrpc-compiler", + ] + + [[package]] + name = "ttrpc-compiler" +-version = "0.3.2" ++version = "0.6.3" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "d290e64bdb994926d102f2983cc6550ece0778c8430253dc2de4e71cbf5285d9" ++checksum = "04c4c51f20209ae3ec2579b947b54cf52685825238002bc2e5af8e1e075d4813" + dependencies = [ + "derive-new", + "prost", + "prost-build", + "prost-types", +- "protobuf", +- "protobuf-codegen", ++ "protobuf 2.28.0", ++ "protobuf-codegen 2.28.0", + "tempfile", + ] + + [[package]] +-name = "unicode-segmentation" +-version = "1.7.1" ++name = "unicode-ident" ++version = "1.0.14" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "bb0d2e7be6ae3a5fa87eed5fb451aff96f2573d2694942e40543ae0bbe19c796" ++checksum = "adb9e6ca4f869e1180728b7950e35922a7fc6397f7b641499e8f3ef06e50dc83" + + [[package]] +-name = "unicode-xid" +-version = "0.1.0" ++name = "unicode-segmentation" ++version = "1.7.1" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "fc72304796d0818e357ead4e000d19c9c174ab23dc11093ac919054d20a6a7fc" ++checksum = "bb0d2e7be6ae3a5fa87eed5fb451aff96f2573d2694942e40543ae0bbe19c796" + + [[package]] + name = "unicode-xid" +@@ -582,16 +712,6 @@ version = "0.10.2+wasi-snapshot-preview1" + source = "registry+https://github.com/rust-lang/crates.io-index" + checksum = "fd6fbd9a79829dd1ad0cc20627bf1ed606756a7f77edff7b66b7064f9cb327c6" + +-[[package]] +-name = "which" +-version = "2.0.1" +-source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "b57acb10231b9493c8472b20cb57317d0679a49e0bdbee44b3b803a6473af164" +-dependencies = [ +- "failure", +- "libc", +-] +- + [[package]] + name = "which" + version = "4.1.0" +@@ -623,3 +743,69 @@ name = "winapi-x86_64-pc-windows-gnu" + version = "0.4.0" + source = "registry+https://github.com/rust-lang/crates.io-index" + checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f" ++ ++[[package]] ++name = "windows-sys" ++version = "0.48.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "677d2418bec65e3338edb076e806bc1ec15693c5d0104683f2efe857f61056a9" ++dependencies = [ ++ "windows-targets", ++] ++ ++[[package]] ++name = "windows-targets" ++version = "0.48.5" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "9a2fa6e2155d7247be68c096456083145c183cbbbc2764150dda45a87197940c" ++dependencies = [ ++ "windows_aarch64_gnullvm", ++ "windows_aarch64_msvc", ++ "windows_i686_gnu", ++ "windows_i686_msvc", ++ "windows_x86_64_gnu", ++ "windows_x86_64_gnullvm", ++ "windows_x86_64_msvc", ++] ++ ++[[package]] ++name = "windows_aarch64_gnullvm" ++version = "0.48.5" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "2b38e32f0abccf9987a4e3079dfb67dcd799fb61361e53e2882c3cbaf0d905d8" ++ ++[[package]] ++name = "windows_aarch64_msvc" ++version = "0.48.5" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "dc35310971f3b2dbbf3f0690a219f40e2d9afcf64f9ab7cc1be722937c26b4bc" ++ ++[[package]] ++name = "windows_i686_gnu" ++version = "0.48.5" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "a75915e7def60c94dcef72200b9a8e58e5091744960da64ec734a6c6e9b3743e" ++ ++[[package]] ++name = "windows_i686_msvc" ++version = "0.48.5" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "8f55c233f70c4b27f66c523580f78f1004e8b5a8b659e05a4eb49d4166cca406" ++ ++[[package]] ++name = "windows_x86_64_gnu" ++version = "0.48.5" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "53d40abd2583d23e4718fddf1ebec84dbff8381c07cae67ff7768bbf19c6718e" ++ ++[[package]] ++name = "windows_x86_64_gnullvm" ++version = "0.48.5" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "0b7b52767868a23d5bab768e390dc5f5c55825b6d30b86c844ff2dc7414044cc" ++ ++[[package]] ++name = "windows_x86_64_msvc" ++version = "0.48.5" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "ed94fce61571a4006852b7389a063ab983c02eb1bb37b47f8272ce92d06d9538" +diff --git a/Cargo.toml b/Cargo.toml +index 30fb4a5..5ce4110 100644 +--- a/Cargo.toml ++++ b/Cargo.toml +@@ -10,20 +10,22 @@ license = "Mulan PSL v2" + # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html + + [dependencies] +-protobuf = "2.8.0" ++protobuf = "3.1.0" + bytes = "0.4.11" + libc = "0.2.71" + byteorder = "1.3.2" + log = "0.4.8" + nix = "0.16.1" +-ttrpc = "0.4.2" ++ttrpc = "0.8.2" + lazy_static = "1.4.0" + + + [build-dependencies] +-protoc-rust = "2.8.0" ++protoc-rust = "2.28.0" ++protobuf = "2.28.0" ++protobuf-codegen = "3.2.0" + cmd_lib = "0.7.8" +-ttrpc-codegen = "0.1.2" ++ttrpc-codegen = "0.4.2" + + [lib] + name = "shim_v2" +diff --git a/build.rs b/build.rs +index dda0ccb..9f5cf4a 100644 +--- a/build.rs ++++ b/build.rs +@@ -1,6 +1,9 @@ + use ttrpc_codegen::Codegen; ++use ttrpc_codegen::ProtobufCustomize; + + fn main() { ++ let protobuf_customized = ProtobufCustomize::default().gen_mod_rs(false); ++ + Codegen::new() + .out_dir("src/protocols") + .inputs(&[ +@@ -14,6 +17,7 @@ fn main() { + ]) + .include("src/protocols/protos") + .rust_protobuf() ++ .rust_protobuf_customize(protobuf_customized.clone()) + .run() + .expect("Codegen failed"); + } +diff --git a/src/client/client.rs b/src/client/client.rs +index 2151e23..4967668 100644 +--- a/src/client/client.rs ++++ b/src/client/client.rs +@@ -20,13 +20,13 @@ use std::os::unix::io::RawFd; + use std::path::Path; + use std::path::MAIN_SEPARATOR; + use std::sync::Mutex; +-use ttrpc::client::Client; ++use ttrpc::Client; ++use ttrpc::context; + + #[derive(Clone)] + pub struct Store { + conn: Client, + container_id: String, +- timeout: i64, + } + + #[derive(Debug)] +@@ -131,12 +131,12 @@ pub fn new_conn(container_id: &String, addr: &String) -> Result<()> { + connect_to_unix_socket(!addr.starts_with("unix://"), &path.to_string_lossy())? + }; + ++ let client = ttrpc::Client::new(fd).map_err(|e| Error::Other(format!("failed to create ttrpc client: {:?}", e)))?; + TTRPC_CLIENTS.lock().unwrap().insert( + container_id.clone(), + Store { +- conn: Client::new(fd), ++ conn: client, + container_id: container_id.clone(), +- timeout: 0, + }, + ); + +@@ -186,15 +186,17 @@ impl Store { + let client = protocols::shim_ttrpc::TaskClient::new(self.conn.clone()); + + let mut req = protocols::shim::CreateTaskRequest::new(); +- req.set_id(self.container_id.clone()); +- req.set_bundle(bundle.clone()); +- req.set_terminal(terminal); +- req.set_stdin(stdin.clone()); +- req.set_stdout(stdout.clone()); +- req.set_stderr(stderr.clone()); ++ req.id = self.container_id.clone(); ++ req.bundle = bundle.clone(); ++ req.terminal = terminal; ++ req.stdin = stdin.clone(); ++ req.stdout = stdout.clone(); ++ req.stderr = stderr.clone(); ++ ++ let ctx = context::with_timeout(0); + + let resp = client +- .create(&req, self.timeout) ++ .create(ctx, &req) + .map_err(shim_error!(e, "ttrpc call create failed"))?; + + Ok(resp.pid as i32) +@@ -205,11 +207,13 @@ impl Store { + let client = protocols::shim_ttrpc::TaskClient::new(self.conn.clone()); + + let mut req = protocols::shim::StartRequest::new(); +- req.set_id(self.container_id.clone()); +- req.set_exec_id(exec_id.clone()); ++ req.id = self.container_id.clone(); ++ req.exec_id = exec_id.clone(); ++ ++ let ctx = context::with_timeout(0); + + let resp = client +- .start(&req, self.timeout) ++ .start(ctx, &req) + .map_err(shim_error!(e, "ttrpc call start failed"))?; + + Ok(resp.pid as i32) +@@ -225,12 +229,14 @@ impl Store { + let client = protocols::shim_ttrpc::TaskClient::new(self.conn.clone()); + + let mut req = protocols::shim::KillRequest::new(); +- req.set_id(self.container_id.clone()); +- req.set_signal(signal); +- req.set_all(all); ++ req.id = self.container_id.clone(); ++ req.signal = signal; ++ req.all = all; ++ ++ let ctx = context::with_timeout(0); + + client +- .kill(&req, self.timeout) ++ .kill(ctx, &req) + .map_err(shim_error!(e, "ttrpc call kill failed"))?; + + Ok(()) +@@ -241,11 +247,13 @@ impl Store { + let client = protocols::shim_ttrpc::TaskClient::new(self.conn.clone()); + + let mut req = protocols::shim::DeleteRequest::new(); +- req.set_id(self.container_id.clone()); +- req.set_exec_id(exec_id.clone()); ++ req.id = self.container_id.clone(); ++ req.exec_id = exec_id.clone(); ++ ++ let ctx = context::with_timeout(0); + + let resp = client +- .delete(&req, self.timeout) ++ .delete(ctx, &req) + .map_err(shim_error!(e, "ttrpc call delete failed"))?; + + Ok(DeleteResponse { +@@ -259,10 +267,12 @@ impl Store { + let client = protocols::shim_ttrpc::TaskClient::new(self.conn.clone()); + + let mut req = protocols::shim::ShutdownRequest::new(); +- req.set_id(self.container_id.clone()); ++ req.id = self.container_id.clone(); ++ ++ let ctx = context::with_timeout(0); + + client +- .shutdown(&req, self.timeout) ++ .shutdown(ctx, &req) + .map_err(shim_error!(e, "ttrpc call shutdown failed"))?; + + Ok(()) +@@ -283,22 +293,24 @@ impl Store { + let client = protocols::shim_ttrpc::TaskClient::new(self.conn.clone()); + + let mut req = protocols::shim::ExecProcessRequest::new(); +- req.set_id(self.container_id.clone()); +- req.set_exec_id(exec_id.clone()); +- req.set_terminal(terminal); +- req.set_stdin(stdin.clone()); +- req.set_stdout(stdout.clone()); +- req.set_stderr(stderr.clone()); +- let mut exec_spec: ::protobuf::well_known_types::Any = +- ::protobuf::well_known_types::Any::new(); +- exec_spec.set_value(std::vec::Vec::from(spec)); +- exec_spec.set_type_url(String::from( ++ req.id = self.container_id.clone(); ++ req.exec_id = exec_id.clone(); ++ req.terminal = terminal; ++ req.stdin = stdin.clone(); ++ req.stdout = stdout.clone(); ++ req.stderr = stderr.clone(); ++ let mut exec_spec: ::protobuf::well_known_types::any::Any = ++ ::protobuf::well_known_types::any::Any::new(); ++ exec_spec.value = std::vec::Vec::from(spec); ++ exec_spec.type_url = String::from( + "types.containerd.io/opencontainers/runtime-spec/1/Process", +- )); +- req.set_spec(exec_spec); ++ ); ++ req.spec = protobuf::MessageField::some(exec_spec); ++ ++ let ctx = context::with_timeout(0); + + client +- .exec(&req, self.timeout) ++ .exec(ctx, &req) + .map_err(shim_error!(e, "ttrpc call exec failed"))?; + + Ok(()) +@@ -314,13 +326,15 @@ impl Store { + let client = protocols::shim_ttrpc::TaskClient::new(self.conn.clone()); + + let mut req = protocols::shim::ResizePtyRequest::new(); +- req.set_id(self.container_id.clone()); +- req.set_exec_id(exec_id.clone()); +- req.set_height(height); +- req.set_width(width); ++ req.id = self.container_id.clone(); ++ req.exec_id = exec_id.clone(); ++ req.height = height; ++ req.width = width; ++ ++ let ctx = context::with_timeout(0); + + client +- .resize_pty(&req, self.timeout) ++ .resize_pty(ctx, &req) + .map_err(shim_error!(e, "ttrpc call resize_pty failed"))?; + + Ok(()) +@@ -331,10 +345,12 @@ impl Store { + let client = protocols::shim_ttrpc::TaskClient::new(self.conn.clone()); + + let mut req = protocols::shim::PauseRequest::new(); +- req.set_id(self.container_id.clone()); ++ req.id = self.container_id.clone(); ++ ++ let ctx = context::with_timeout(0); + + client +- .pause(&req, self.timeout) ++ .pause(ctx, &req) + .map_err(shim_error!(e, "ttrpc call pause failed"))?; + + Ok(()) +@@ -345,10 +361,12 @@ impl Store { + let client = protocols::shim_ttrpc::TaskClient::new(self.conn.clone()); + + let mut req = protocols::shim::ResumeRequest::new(); +- req.set_id(self.container_id.clone()); ++ req.id = self.container_id.clone(); ++ ++ let ctx = context::with_timeout(0); + + client +- .resume(&req, self.timeout) ++ .resume(ctx, &req) + .map_err(shim_error!(e, "ttrpc call resume failed"))?; + + Ok(()) +@@ -359,16 +377,18 @@ impl Store { + let client = protocols::shim_ttrpc::TaskClient::new(self.conn.clone()); + + let mut req = protocols::shim::StateRequest::new(); +- req.set_id(self.container_id.clone()); ++ req.id = self.container_id.clone(); ++ ++ let ctx = context::with_timeout(0); + + let resp = client +- .state(&req, self.timeout) ++ .state(ctx, &req) + .map_err(shim_error!(e, "ttrpc call state failed"))?; + + Ok(State { + id: self.container_id.clone(), + pid: resp.pid, +- status: match resp.status { ++ status: match resp.status.enum_value_or_default() { + shim_v2_status::CREATED => Status::CreatedStatus, + shim_v2_status::RUNNING => Status::RunningStatus, + shim_v2_status::STOPPED => Status::StoppedStatus, +@@ -390,12 +410,13 @@ impl Store { + let mut req = protocols::shim::PidsRequest::new(); + req.id = self.container_id.clone(); + ++ let ctx = context::with_timeout(0); ++ + let resp = c +- .pids(&req, self.timeout) ++ .pids(ctx, &req) + .map_err(shim_error!(e, "call pids failed"))?; +- let process = &resp.get_processes()[0]; +- +- Ok(process.pid as i32) ++ ++ Ok(resp.processes[0].pid as i32) + } + + pub fn wait(&self, exec_id: &String) -> Result { +@@ -403,13 +424,15 @@ impl Store { + let client = protocols::shim_ttrpc::TaskClient::new(self.conn.clone()); + + let mut req = protocols::shim::WaitRequest::new(); +- req.set_id(self.container_id.clone()); +- req.set_exec_id(exec_id.clone()); ++ req.id = self.container_id.clone(); ++ req.exec_id = exec_id.clone(); ++ ++ let ctx = context::with_timeout(0); + + let resp = client +- .wait(&req, self.timeout) ++ .wait(ctx, &req) + .map_err(shim_error!(e, "ttrpc call wait failed"))?; + + Ok(resp.exit_status as i32) + } +-} ++} +\ No newline at end of file +-- +2.45.0 + diff --git a/0008-support-stats-cmd.patch b/0008-support-stats-cmd.patch new file mode 100644 index 0000000..c634f59 --- /dev/null +++ b/0008-support-stats-cmd.patch @@ -0,0 +1,383 @@ +From 2de35a3762ae9372cb4834211fdda9324bc215bb Mon Sep 17 00:00:00 2001 +From: kamizjw +Date: Wed, 15 Jan 2025 15:27:30 +0800 +Subject: [PATCH] lib-shim-v2:support stats cmd + +--- + build.rs | 1 + + shim_v2.h | 27 +++ + src/client/client.rs | 22 +++ + src/lib.rs | 73 +++++++- + src/protocols/mod.rs | 1 + + .../containerd/cgroup/stats/v1/metrics.proto | 158 ++++++++++++++++++ + 6 files changed, 281 insertions(+), 1 deletion(-) + create mode 100644 src/protocols/protos/github.com/containerd/cgroup/stats/v1/metrics.proto + +diff --git a/build.rs b/build.rs +index dda0ccb..f572bc9 100644 +--- a/build.rs ++++ b/build.rs +@@ -11,6 +11,7 @@ fn main() { + "src/protocols/protos/google/protobuf/timestamp.proto", + "src/protocols/protos/github.com/containerd/containerd/api/types/mount.proto", + "src/protocols/protos/github.com/containerd/containerd/api/types/task/task.proto", ++ "src/protocols/protos/github.com/containerd/cgroup/stats/v1/metrics.proto", + ]) + .include("src/protocols/protos") + .rust_protobuf() +diff --git a/shim_v2.h b/shim_v2.h +index 6a719f2..c19a809 100644 +--- a/shim_v2.h ++++ b/shim_v2.h +@@ -41,6 +41,32 @@ struct State { + unsigned int exit_status; + }; + ++struct Stats { ++ uint64_t pids_current; ++ /* CPU usage */ ++ uint64_t cpu_use_nanos; ++ uint64_t cpu_system_use; ++ /* BlkIO usage */ ++ uint64_t blkio_read; ++ uint64_t blkio_write; ++ /* Memory usage */ ++ uint64_t mem_used; ++ uint64_t mem_limit; ++ uint64_t rss_bytes; ++ uint64_t page_faults; ++ uint64_t major_page_faults; ++ /* Kernel Memory usage */ ++ uint64_t kmem_used; ++ uint64_t kmem_limit; ++ /* Cache usage */ ++ uint64_t cache; ++ uint64_t cache_total; ++ uint64_t inactive_file_total; ++ /* Swap usage*/ ++ uint64_t swap_used; ++ uint64_t swap_limit; ++}; ++ + int shim_v2_new(const char *container_id, const char *addr); + int shim_v2_close(const char *container_id); + +@@ -59,6 +85,7 @@ int shim_v2_pause(const char *container_id); + int shim_v2_resume(const char *container_id); + + int shim_v2_state(const char *container_id, const struct State *state); ++int shim_v2_stats(const char *container_id, const struct Stats *stats); + int shim_v2_pids(const char *container_id, int *pid); + + int shim_v2_wait(const char *container_id, const char *exec_id, int *exit_status); +diff --git a/src/client/client.rs b/src/client/client.rs +index 2151e23..40de955 100644 +--- a/src/client/client.rs ++++ b/src/client/client.rs +@@ -11,7 +11,11 @@ + // See the Mulan PSL v2 for more details. + + use super::error::{Error, Result}; ++use crate::protocols::metrics::Metrics; + use crate::protocols; ++use protobuf::{ ++ CodedInputStream,Message, ++}; + use lazy_static::lazy_static; + use nix::sys::socket::*; + use protocols::task::Status as shim_v2_status; +@@ -384,6 +388,24 @@ impl Store { + }) + } + ++ pub fn stats(&self) -> Result { ++ let client = protocols::shim_ttrpc::TaskClient::new(self.conn.clone()); ++ ++ let mut req = protocols::shim::StatsRequest::new(); ++ req.id= self.container_id.clone(); ++ let ctx = context::with_timeout(0); ++ ++ let resp = client ++ .stats(ctx, &req) ++ .map_err(shim_error!(e, "ttrpc call stats failed"))?; ++ let mut m = Metrics::new(); ++ if let Some(any) = resp.stats.as_ref() { ++ let mut input = CodedInputStream::from_bytes(any.value.as_ref()); ++ m.merge_from(&mut input).unwrap(); ++ } ++ Ok(m) ++ } ++ + pub fn pids(&self) -> Result { + let c = protocols::shim_ttrpc::TaskClient::new(self.conn.clone()); + +diff --git a/src/lib.rs b/src/lib.rs +index b46d800..7c77187 100644 +--- a/src/lib.rs ++++ b/src/lib.rs +@@ -22,7 +22,8 @@ use client::client::State as client_state; + use client::client::Status as client_status; + use client::client::{del_conn, get_conn, new_conn}; + use std::ffi::{CStr, CString}; +-use std::os::raw::{c_char, c_int, c_uint}; ++use std::os::raw::{c_char, c_int, c_uint, c_ulonglong}; ++use protocols::metrics::Metrics; + + fn to_string(x: *const c_char) -> String { + unsafe { +@@ -371,6 +372,76 @@ pub extern "C" fn shim_v2_state(container_id: *const c_char, state: &mut State) + }) + } + ++#[repr(C)] ++pub struct Stats { ++ pids_current: c_ulonglong, ++ /* CPU usage */ ++ cpu_use_nanos: c_ulonglong, ++ cpu_system_use: c_ulonglong, ++ /* BlkIO usage */ ++ blkio_read: c_ulonglong, ++ blkio_write: c_ulonglong, ++ /* Memory usage */ ++ mem_used: c_ulonglong, ++ mem_limit: c_ulonglong, ++ rss_bytes: c_ulonglong, ++ page_faults: c_ulonglong, ++ major_page_faults: c_ulonglong, ++ /* Kernel Memory usage */ ++ kmem_used: c_ulonglong, ++ kmem_limit: c_ulonglong, ++ /* Cache usage */ ++ cache: c_ulonglong, ++ cache_total: c_ulonglong, ++ inactive_file_total: c_ulonglong, ++ /* Swap usage*/ ++ swap_used: c_ulonglong, ++ swap_limit: c_ulonglong, ++} ++ ++impl Stats { ++ fn copy(&mut self, in_obj: Metrics) { ++ self.pids_current = in_obj.pids.current; ++ self.cpu_use_nanos = in_obj.cpu.usage.total; ++ self.cpu_system_use = in_obj.cpu.usage.kernel; ++ self.mem_used = in_obj.memory.usage.usage; ++ self.mem_limit = in_obj.memory.usage.limit; ++ self.rss_bytes = in_obj.memory.rss; ++ self.page_faults = in_obj.memory.pg_fault; ++ self.major_page_faults = in_obj.memory.pg_maj_fault; ++ self.kmem_used = in_obj.memory.kernel.usage; ++ self.kmem_limit = in_obj.memory.kernel.limit; ++ self.inactive_file_total = in_obj.memory.total_inactive_file; ++ self.swap_limit = in_obj.memory.swap.limit; ++ self.swap_used = in_obj.memory.swap.usage; ++ for ele in in_obj.blkio.io_service_bytes_recursive.iter() { ++ if ele.op == "read" { ++ self.blkio_read += ele.value; ++ } else { ++ self.blkio_write += ele.value; ++ } ++ } ++ } ++} ++ ++#[no_mangle] ++pub extern "C" fn shim_v2_stats(container_id: *const c_char, stats: &mut Stats) -> c_int { ++ let r_container_id = to_string(container_id); ++ println!("lib-shim-v2::stats::{}::", r_container_id); ++ get_conn(&r_container_id) ++ .and_then(|client| { ++ client.stats().map(|metrics| { ++ println!("lib-shim-v2::metrics data::{:?}", metrics); ++ stats.copy(metrics); ++ 0 ++ }) ++ }) ++ .unwrap_or_else(|e| { ++ println!("lib-shim-v2::stats::{}:: failed, {}.", r_container_id, e); ++ -1 ++ }) ++} ++ + #[no_mangle] + pub extern "C" fn shim_v2_pids(container_id: *const c_char, pid: &mut c_int) -> c_int { + let r_container_id = to_string(container_id); +diff --git a/src/protocols/mod.rs b/src/protocols/mod.rs +index cc5794e..dfe4f42 100644 +--- a/src/protocols/mod.rs ++++ b/src/protocols/mod.rs +@@ -13,6 +13,7 @@ + pub mod any; + pub mod empty; + pub mod gogo; ++pub mod metrics; + pub mod mount; + pub mod shim; + pub mod shim_ttrpc; +diff --git a/src/protocols/protos/github.com/containerd/cgroup/stats/v1/metrics.proto b/src/protocols/protos/github.com/containerd/cgroup/stats/v1/metrics.proto +new file mode 100644 +index 0000000..b3f6cc3 +--- /dev/null ++++ b/src/protocols/protos/github.com/containerd/cgroup/stats/v1/metrics.proto +@@ -0,0 +1,158 @@ ++syntax = "proto3"; ++ ++package io.containerd.cgroups.v1; ++ ++import "gogoproto/gogo.proto"; ++ ++message Metrics { ++ repeated HugetlbStat hugetlb = 1; ++ PidsStat pids = 2; ++ CPUStat cpu = 3 [(gogoproto.customname) = "CPU"]; ++ MemoryStat memory = 4; ++ BlkIOStat blkio = 5; ++ RdmaStat rdma = 6; ++ repeated NetworkStat network = 7; ++ CgroupStats cgroup_stats = 8; ++ MemoryOomControl memory_oom_control = 9; ++} ++ ++message HugetlbStat { ++ uint64 usage = 1; ++ uint64 max = 2; ++ uint64 failcnt = 3; ++ string pagesize = 4; ++} ++ ++message PidsStat { ++ uint64 current = 1; ++ uint64 limit = 2; ++} ++ ++message CPUStat { ++ CPUUsage usage = 1; ++ Throttle throttling = 2; ++} ++ ++message CPUUsage { ++ // values in nanoseconds ++ uint64 total = 1; ++ uint64 kernel = 2; ++ uint64 user = 3; ++ repeated uint64 per_cpu = 4 [(gogoproto.customname) = "PerCPU"]; ++ ++} ++ ++message Throttle { ++ uint64 periods = 1; ++ uint64 throttled_periods = 2; ++ uint64 throttled_time = 3; ++} ++ ++message MemoryStat { ++ uint64 cache = 1; ++ uint64 rss = 2 [(gogoproto.customname) = "RSS"]; ++ uint64 rss_huge = 3 [(gogoproto.customname) = "RSSHuge"]; ++ uint64 mapped_file = 4; ++ uint64 dirty = 5; ++ uint64 writeback = 6; ++ uint64 pg_pg_in = 7; ++ uint64 pg_pg_out = 8; ++ uint64 pg_fault = 9; ++ uint64 pg_maj_fault = 10; ++ uint64 inactive_anon = 11; ++ uint64 active_anon = 12; ++ uint64 inactive_file = 13; ++ uint64 active_file = 14; ++ uint64 unevictable = 15; ++ uint64 hierarchical_memory_limit = 16; ++ uint64 hierarchical_swap_limit = 17; ++ uint64 total_cache = 18; ++ uint64 total_rss = 19 [(gogoproto.customname) = "TotalRSS"]; ++ uint64 total_rss_huge = 20 [(gogoproto.customname) = "TotalRSSHuge"]; ++ uint64 total_mapped_file = 21; ++ uint64 total_dirty = 22; ++ uint64 total_writeback = 23; ++ uint64 total_pg_pg_in = 24; ++ uint64 total_pg_pg_out = 25; ++ uint64 total_pg_fault = 26; ++ uint64 total_pg_maj_fault = 27; ++ uint64 total_inactive_anon = 28; ++ uint64 total_active_anon = 29; ++ uint64 total_inactive_file = 30; ++ uint64 total_active_file = 31; ++ uint64 total_unevictable = 32; ++ MemoryEntry usage = 33; ++ MemoryEntry swap = 34; ++ MemoryEntry kernel = 35; ++ MemoryEntry kernel_tcp = 36 [(gogoproto.customname) = "KernelTCP"]; ++ ++} ++ ++message MemoryEntry { ++ uint64 limit = 1; ++ uint64 usage = 2; ++ uint64 max = 3; ++ uint64 failcnt = 4; ++} ++ ++message MemoryOomControl { ++ uint64 oom_kill_disable = 1; ++ uint64 under_oom = 2; ++ uint64 oom_kill = 3; ++} ++ ++message BlkIOStat { ++ repeated BlkIOEntry io_service_bytes_recursive = 1; ++ repeated BlkIOEntry io_serviced_recursive = 2; ++ repeated BlkIOEntry io_queued_recursive = 3; ++ repeated BlkIOEntry io_service_time_recursive = 4; ++ repeated BlkIOEntry io_wait_time_recursive = 5; ++ repeated BlkIOEntry io_merged_recursive = 6; ++ repeated BlkIOEntry io_time_recursive = 7; ++ repeated BlkIOEntry sectors_recursive = 8; ++} ++ ++message BlkIOEntry { ++ string op = 1; ++ string device = 2; ++ uint64 major = 3; ++ uint64 minor = 4; ++ uint64 value = 5; ++} ++ ++message RdmaStat { ++ repeated RdmaEntry current = 1; ++ repeated RdmaEntry limit = 2; ++} ++ ++message RdmaEntry { ++ string device = 1; ++ uint32 hca_handles = 2; ++ uint32 hca_objects = 3; ++} ++ ++message NetworkStat { ++ string name = 1; ++ uint64 rx_bytes = 2; ++ uint64 rx_packets = 3; ++ uint64 rx_errors = 4; ++ uint64 rx_dropped = 5; ++ uint64 tx_bytes = 6; ++ uint64 tx_packets = 7; ++ uint64 tx_errors = 8; ++ uint64 tx_dropped = 9; ++} ++ ++// CgroupStats exports per-cgroup statistics. ++message CgroupStats { ++ // number of tasks sleeping ++ uint64 nr_sleeping = 1; ++ // number of tasks running ++ uint64 nr_running = 2; ++ // number of tasks in stopped state ++ uint64 nr_stopped = 3; ++ // number of tasks in uninterruptible state ++ uint64 nr_uninterruptible = 4; ++ // number of tasks waiting on IO ++ uint64 nr_io_wait = 5; ++} +-- +2.43.0 + diff --git a/lib-shim-v2-0.0.1.tar.gz b/lib-shim-v2-0.0.1.tar.gz index a3facda..8c241e6 100644 Binary files a/lib-shim-v2-0.0.1.tar.gz and b/lib-shim-v2-0.0.1.tar.gz differ diff --git a/lib-shim-v2.spec b/lib-shim-v2.spec index 047715a..df2e881 100644 --- a/lib-shim-v2.spec +++ b/lib-shim-v2.spec @@ -7,7 +7,7 @@ Name: lib-shim-v2 Version: 0.0.1 -Release: 9 +Release: 10 URL: https://gitee.com/openeuler/lib-shim-v2 Source: %{name}-%{version}.tar.gz Source1: libc.tar.gz @@ -17,11 +17,14 @@ License: Mulan PSL v2 ExclusiveArch: x86_64 aarch64 loongarch64 riscv64 -Patch01: 0002-add-riscv-support.patch -Patch02: 0004-simplify-Store-api-remove-unnecessary-validation.patch -Patch03: 0005-Check-if-a-path-is-abstract-before-connection.patch -Patch04: 0006-Add-vsock-support.patch -Patch05: 0001-lib-shim-v2-add-support-for-loongarch64.patch +Patch01: 0001-lib-shim-v2-add-support-for-loongarch64.patch +Patch02: 0002-simplify-Store-api-remove-unnecessary-validation.patch +Patch03: 0003-Check-if-a-path-is-abstract-before-connection.patch +Patch04: 0004-Add-vsock-support.patch +Patch05: 0005-sandbox-sandbox-api-update.patch +Patch06: 0006-add-adapter-for-runc-sandboxer.patch +Patch07: 0007-update-dependent-protobuf-and-ttrpc-version.patch +Patch08: 0008-support-stats-cmd.patch BuildRequires: rust BuildRequires: cargo @@ -73,6 +76,12 @@ install -m 0755 target/release/libshim_v2.so ${RPM_BUILD_ROOT}/%{_libdir}/libshi %{_includedir}/shim_v2.h %changelog +* Wed Jan 15 2025 kamizjw - 0.0.1-10 +- Type:NA +- ID:NA +- SUG:NA +- DESC: sync some patches + * Thu Apr 18 2024 Pengda Dou - 0.0.1-9 - Resolve loongarch64 patch addition error - add support for loongarch64