fix merge conflict

hust-open-atom-club · Apr 6, 2024 · aa60708 · aa60708
2 parents 6701da1 + fddd976
commit aa60708
Show file tree

Hide file tree

Showing 56 changed files with 69 additions and 66 deletions.
diff --git a/pages/src/components/Card.tsx b/pages/src/components/Card.tsx
@@ -3,20 +3,21 @@ import { slugifyStr } from "@utils/slugify";
 import type { CollectionEntry } from "astro:content";
 
 export interface Props {
+  id?: string;
   href?: string;
   frontmatter: CollectionEntry<"posts">["data"];
   secHeading?: boolean;
   body?: string;
 }
 
-export default function Card({ href, frontmatter, secHeading = true, body }: Props) {
+export default function Card({ id, href, frontmatter, secHeading = true, body }: Props) {
   const {
     title,
     status,
   } = frontmatter;
 
   const headerProps = {
-    style: { viewTransitionName: slugifyStr(title) },
+    style: { viewTransitionName: slugifyStr(id || title) },
     className: "text-lg font-medium decoration-dashed hover:underline",
   };
 

diff --git a/pages/src/layouts/PostDetails.astro b/pages/src/layouts/PostDetails.astro
@@ -13,6 +13,8 @@ export interface Props {
 
 const { post } = Astro.props;
 
+const { id } = post;
+
 const { title, author, collected_date, collector, translated_date, translator, link, proofreader, proofread_date, publisher, published_date } = post.data;
 
 const { Content } = await post.render();
@@ -51,7 +53,7 @@ const layoutProps = {
     </button>
   </div>
   <main id="main-content">
-    <h1 transition:name={slugifyStr(title)} class="post-title">{title}</h1>
+    <h1 transition:name={slugifyStr(id || title)} class="post-title">{title}</h1>
     <!-- <Datetime -->
     <!--   pubDatetime={pubDatetime} -->
     <!--   modDatetime={modDatetime} -->

diff --git a/pages/src/layouts/Posts.astro b/pages/src/layouts/Posts.astro
@@ -45,8 +45,8 @@ function getStyle(tabStatus: string) {
     </nav>
     <ul>
       {
-        paginatedPosts.map(({ data, slug, body }) => (
-          <Card href={`/posts/${slug}/`} frontmatter={data} body={body} />
+        paginatedPosts.map(({ id, data, slug, body }) => (
+          <Card id={id} href={`/posts/${slug}/`} frontmatter={data} body={body} />
         ))
       }
     </ul>

diff --git a/sources/syzkaller/adding_new_os_support.md b/sources/syzkaller/adding_new_os_support.md
@@ -2,7 +2,7 @@
 status: collected
 title: "Adding new OS support"
 author: Syzkaller Community
-collector: chengziqiu
+collector: jxlpzqc
 collected_date: 20240314
 link: https://github.com/google/syzkaller/blob/master/docs/adding_new_os_support.md
 ---

diff --git a/sources/syzkaller/akaros/README.md b/sources/syzkaller/akaros/README.md
@@ -2,7 +2,7 @@
 status: collected
 title: "Akaros support"
 author: Syzkaller Community
-collector: chengziqiu
+collector: jxlpzqc
 collected_date: 20240314
 link: https://github.com/google/syzkaller/blob/master/docs/akaros/README.md
 ---

diff --git a/sources/syzkaller/akaros/found_bugs.md b/sources/syzkaller/akaros/found_bugs.md
@@ -2,7 +2,7 @@
 status: translated
 title: "Found bugs"
 author: Syzkaller Community
-collector: chengziqiu
+collector: jxlpzqc
 collected_date: 20240314
 translator: shandianchengzi
 translated_date: 20240317

diff --git a/sources/syzkaller/ci.md b/sources/syzkaller/ci.md
@@ -2,7 +2,7 @@
 status: collected
 title: "Continuous integration fuzzing"
 author: Syzkaller Community
-collector: chengziqiu
+collector: jxlpzqc
 collected_date: 20240314
 link: https://github.com/google/syzkaller/blob/master/docs/ci.md
 ---

diff --git a/sources/syzkaller/configuration.md b/sources/syzkaller/configuration.md
@@ -2,7 +2,7 @@
 status: collected
 title: "Configuration"
 author: Syzkaller Community
-collector: chengziqiu
+collector: jxlpzqc
 collected_date: 20240314
 link: https://github.com/google/syzkaller/blob/master/docs/configuration.md
 ---

diff --git a/sources/syzkaller/contributing.md b/sources/syzkaller/contributing.md
@@ -2,7 +2,7 @@
 status: collected
 title: "How to contribute to syzkaller"
 author: Syzkaller Community
-collector: chengziqiu
+collector: jxlpzqc
 collected_date: 20240314
 link: https://github.com/google/syzkaller/blob/master/docs/contributing.md
 ---

diff --git a/sources/syzkaller/darwin/README.md b/sources/syzkaller/darwin/README.md
@@ -2,7 +2,7 @@
 status: collected
 title: "Darwin/XNU"
 author: Syzkaller Community
-collector: chengziqiu
+collector: jxlpzqc
 collected_date: 20240314
 link: https://github.com/google/syzkaller/blob/master/docs/darwin/README.md
 ---

diff --git a/sources/syzkaller/darwin/found_bugs.md b/sources/syzkaller/darwin/found_bugs.md
@@ -2,7 +2,7 @@
 status: translated
 title: "Found bugs"
 author: Syzkaller Community
-collector: chengziqiu
+collector: jxlpzqc
 collected_date: 20240314
 translator: Eliza
 translated_date: 20240331

diff --git a/sources/syzkaller/found_bugs.md b/sources/syzkaller/found_bugs.md
@@ -2,7 +2,7 @@
 status: collected
 title: "Found bugs"
 author: Syzkaller Community
-collector: chengziqiu
+collector: jxlpzqc
 collected_date: 20240314
 link: https://github.com/google/syzkaller/blob/master/docs/found_bugs.md
 ---

diff --git a/sources/syzkaller/freebsd/README.md b/sources/syzkaller/freebsd/README.md
@@ -2,7 +2,7 @@
 status: collected
 title: "FreeBSD"
 author: Syzkaller Community
-collector: chengziqiu
+collector: jxlpzqc
 collected_date: 20240314
 link: https://github.com/google/syzkaller/blob/master/docs/freebsd/README.md
 ---

diff --git a/sources/syzkaller/freebsd/found_bugs.md b/sources/syzkaller/freebsd/found_bugs.md
@@ -2,7 +2,7 @@
 status: collected
 title: "Found Bugs"
 author: Syzkaller Community
-collector: chengziqiu
+collector: jxlpzqc
 collected_date: 20240314
 link: https://github.com/google/syzkaller/blob/master/docs/freebsd/found_bugs.md
 ---

diff --git a/sources/syzkaller/fuchsia/README.md b/sources/syzkaller/fuchsia/README.md
@@ -2,7 +2,7 @@
 status: collected
 title: "Fuchsia support"
 author: Syzkaller Community
-collector: chengziqiu
+collector: jxlpzqc
 collected_date: 20240314
 link: https://github.com/google/syzkaller/blob/master/docs/fuchsia/README.md
 ---

diff --git a/sources/syzkaller/gvisor/README.md b/sources/syzkaller/gvisor/README.md
@@ -2,7 +2,7 @@
 status: collected
 title: "gVisor"
 author: Syzkaller Community
-collector: chengziqiu
+collector: jxlpzqc
 collected_date: 20240314
 link: https://github.com/google/syzkaller/blob/master/docs/gvisor/README.md
 ---

diff --git a/sources/syzkaller/hafnium/README.md b/sources/syzkaller/hafnium/README.md
@@ -2,7 +2,7 @@
 status: collected
 title: "Hafnium"
 author: Syzkaller Community
-collector: chengziqiu
+collector: jxlpzqc
 collected_date: 20240314
 link: https://github.com/google/syzkaller/blob/master/docs/hafnium/README.md
 ---

diff --git a/sources/syzkaller/hub.md b/sources/syzkaller/hub.md
@@ -2,7 +2,7 @@
 status: collected
 title: "Connecting several managers via Hub"
 author: Syzkaller Community
-collector: chengziqiu
+collector: jxlpzqc
 collected_date: 20240314
 link: https://github.com/google/syzkaller/blob/master/docs/hub.md
 ---

diff --git a/sources/syzkaller/linux/external_fuzzing_network.md b/sources/syzkaller/linux/external_fuzzing_network.md
@@ -2,9 +2,9 @@
 status: translated
 title: "External network fuzzing for Linux kernel"
 author: Syzkaller Community
-collector: chengziqiu
+collector: jxlpzqc
 collected_date: 20240314
-translator: squirrel_sch
+translator: squirrelsss
 translated_date: 20240317
 link: https://github.com/google/syzkaller/blob/master/docs/linux/external_fuzzing_network.md
 ---
@@ -79,4 +79,4 @@ r3 = accept$inet6(r0, &(0x7f0000004000)={0x0, 0x0, 0x0, @empty={[0x0, 0x0, 0x0,
 Proto Recv-Q Send-Q Local Address           Foreign Address         State       PID/Program name
 tcp6       0      0 :::20001                :::*                    LISTEN      5527/a.out
 tcp6       0      0 fe80::aa:20001          fe80::bb:20000          ESTABLISHED 5527/a.out
-```
+```
diff --git a/sources/syzkaller/linux/external_fuzzing_usb.md b/sources/syzkaller/linux/external_fuzzing_usb.md
@@ -2,7 +2,7 @@
 status: collected
 title: "Internals"
 author: Syzkaller Community
-collector: chengziqiu
+collector: jxlpzqc
 collected_date: 20240314
 link: https://github.com/google/syzkaller/blob/master/docs/linux/external_fuzzing_usb.md
 ---

diff --git a/sources/syzkaller/linux/external_fuzzing_usbip.md b/sources/syzkaller/linux/external_fuzzing_usbip.md
@@ -2,7 +2,7 @@
 status: collected
 title: "USB/IP Fuzzing for Linux Kernel"
 author: Syzkaller Community
-collector: chengziqiu
+collector: jxlpzqc
 collected_date: 20240314
 link: https://github.com/google/syzkaller/blob/master/docs/linux/external_fuzzing_usbip.md
 ---

diff --git a/sources/syzkaller/linux/found_bugs.md b/sources/syzkaller/linux/found_bugs.md
@@ -2,7 +2,7 @@
 status: collected
 title: "Found bugs"
 author: Syzkaller Community
-collector: chengziqiu
+collector: jxlpzqc
 collected_date: 20240314
 link: https://github.com/google/syzkaller/blob/master/docs/linux/found_bugs.md
 ---

diff --git a/sources/syzkaller/linux/found_bugs_usb.md b/sources/syzkaller/linux/found_bugs_usb.md
@@ -2,7 +2,7 @@
 status: collected
 title: "Found Linux kernel USB bugs"
 author: Syzkaller Community
-collector: chengziqiu
+collector: jxlpzqc
 collected_date: 20240314
 link: https://github.com/google/syzkaller/blob/master/docs/linux/found_bugs_usb.md
 ---

diff --git a/sources/syzkaller/linux/internals.md b/sources/syzkaller/linux/internals.md
@@ -2,9 +2,9 @@
 status: proofread
 title: "Linux-specific syzkaller internals"
 author: Syzkaller Community
-collector: chengziqiu
+collector: jxlpzqc
 collected_date: 20240314
-translator: hust_cmx_18
+translator: Earlystarry
 translated_date: 20240317
 proofreader: mudongliang
 proofread_date: 20240405

diff --git a/sources/syzkaller/linux/reporting_kernel_bugs.md b/sources/syzkaller/linux/reporting_kernel_bugs.md
@@ -2,7 +2,7 @@
 status: translating
 title: "Reporting Linux kernel bugs"
 author: Syzkaller Community
-collector: chengziqiu
+collector: jxlpzqc
 collected_date: 20240314
 translator: Ecila01
 link: https://github.com/google/syzkaller/blob/master/docs/linux/reporting_kernel_bugs.md

diff --git a/sources/syzkaller/linux/setup_linux-host_android-device_arm-kernel.md b/sources/syzkaller/linux/setup_linux-host_android-device_arm-kernel.md
@@ -2,7 +2,7 @@
 status: translating
 title: "Setup: Linux host, Android device, arm32/64 kernel"
 author: Syzkaller Community
-collector: chengziqiu
+collector: jxlpzqc
 collected_date: 20240314
 translator: Athanlaich
 link: https://github.com/google/syzkaller/blob/master/docs/linux/setup_linux-host_android-device_arm-kernel.md

diff --git a/sources/syzkaller/linux/setup_linux-host_isolated.md b/sources/syzkaller/linux/setup_linux-host_isolated.md
@@ -2,9 +2,9 @@
 status: translated
 title: "Setup: Linux isolated host"
 author: Syzkaller Community
-collector: chengziqiu
+collector: jxlpzqc
 collected_date: 20240314
-translater: xiaobor
+translater: xiaobor123
 translate_data: 20240317
 link: https://github.com/google/syzkaller/blob/master/docs/linux/setup_linux-host_isolated.md
 ---
@@ -104,4 +104,4 @@ Host *
 ``` bash
 ./bin/syz-manager -config=my.cfg
 ```
-如果在启动 syz-manager 后遇到问题，请考虑使用 -debug 标志运行它。同时参阅[此页面](/docs/troubleshooting.md)以获取故障排除提示。
+如果在启动 syz-manager 后遇到问题，请考虑使用 -debug 标志运行它。同时参阅[此页面](/docs/troubleshooting.md)以获取故障排除提示。
diff --git a/sources/syzkaller/linux/setup_linux-host_qemu-vm_arm-kernel.md b/sources/syzkaller/linux/setup_linux-host_qemu-vm_arm-kernel.md
@@ -2,7 +2,7 @@
 status: translating
 title: "Setup: Debian host, QEMU vm, arm kernel"
 author: Syzkaller Community
-collector: chengziqiu
+collector: jxlpzqc
 collected_date: 20240314
 translator: apowerfulmei
 link: https://github.com/google/syzkaller/blob/master/docs/linux/setup_linux-host_qemu-vm_arm-kernel.md

diff --git a/sources/syzkaller/linux/setup_linux-host_qemu-vm_arm64-kernel.md b/sources/syzkaller/linux/setup_linux-host_qemu-vm_arm64-kernel.md
@@ -2,7 +2,7 @@
 status: translated
 title: "Setup: Linux host, QEMU vm, arm64 kernel"
 author: Syzkaller Community
-collector: chengziqiu
+collector: jxlpzqc
 collected_date: 20240314
 translator: Gskh3450
 translated_date: 20240317

diff --git a/sources/syzkaller/linux/setup_linux-host_qemu-vm_riscv64-kernel.md b/sources/syzkaller/linux/setup_linux-host_qemu-vm_riscv64-kernel.md
@@ -2,7 +2,7 @@
 status: collected
 title: "Setup: Debian/Ubuntu host, QEMU vm, riscv64 kernel"
 author: Syzkaller Community
-collector: chengziqiu
+collector: jxlpzqc
 collected_date: 20240314
 link: https://github.com/google/syzkaller/blob/master/docs/linux/setup_linux-host_qemu-vm_riscv64-kernel.md
 ---

diff --git a/sources/syzkaller/linux/setup_linux-host_qemu-vm_s390x-kernel.md b/sources/syzkaller/linux/setup_linux-host_qemu-vm_s390x-kernel.md
@@ -2,7 +2,7 @@
 status: translated
 title: "Setup: Debian/Ubuntu/Fedora host, QEMU vm, s390x kernel"
 author: Syzkaller Community
-collector: chengziqiu
+collector: jxlpzqc
 collected_date: 20240314
 translator: xin-zheqi
 translated_date: 20240317

diff --git a/sources/syzkaller/linux/setup_ubuntu-host_odroid-c2-board_arm64-kernel.md b/sources/syzkaller/linux/setup_ubuntu-host_odroid-c2-board_arm64-kernel.md
@@ -2,7 +2,7 @@
 status: collected
 title: "Setup: Ubuntu host, Odroid C2 board, arm64 kernel"
 author: Syzkaller Community
-collector: chengziqiu
+collector: jxlpzqc
 collected_date: 20240314
 link: https://github.com/google/syzkaller/blob/master/docs/linux/setup_ubuntu-host_odroid-c2-board_arm64-kernel.md
 ---

diff --git a/sources/syzkaller/linux/setup_ubuntu-host_qemu-vm_x86-64-kernel.md b/sources/syzkaller/linux/setup_ubuntu-host_qemu-vm_x86-64-kernel.md
@@ -2,7 +2,7 @@
 status: collected
 title: "Setup: Ubuntu host, QEMU vm, x86-64 kernel"
 author: Syzkaller Community
-collector: chengziqiu
+collector: jxlpzqc
 collected_date: 20240314
 link: https://github.com/google/syzkaller/blob/master/docs/linux/setup_ubuntu-host_qemu-vm_x86-64-kernel.md
 ---

diff --git a/sources/syzkaller/linux/setup_ubuntu-host_vmware-vm_x86-64-kernel.md b/sources/syzkaller/linux/setup_ubuntu-host_vmware-vm_x86-64-kernel.md
@@ -2,7 +2,7 @@
 status: collected
 title: "Setup: Ubuntu host, VMware vm, x86-64 kernel"
 author: Syzkaller Community
-collector: chengziqiu
+collector: jxlpzqc
 collected_date: 20240314
 link: https://github.com/google/syzkaller/blob/master/docs/linux/setup_ubuntu-host_vmware-vm_x86-64-kernel.md
 ---

diff --git a/sources/syzkaller/linux/troubleshooting.md b/sources/syzkaller/linux/troubleshooting.md
@@ -2,9 +2,9 @@
 status: proofread
 title: "Troubleshooting"
 author: Syzkaller Community
-collector: chengziqiu
+collector: jxlpzqc
 collected_date: 20240314
-translator: renxiaohust
+translator: Ren Xiao
 translated_date: 20240317
 proofreader: mudongliang
 proofread_date: 20240406
@@ -74,4 +74,4 @@ link: https://github.com/google/syzkaller/blob/master/docs/linux/troubleshooting
 
 也可以查看[此处](https://github.com/google/syzkaller/docs/troubleshooting.md)了解通用的故障排除建议。
 
-如果以上方法都没有帮助，请在[错误追踪器](https://github.com/google/syzkaller/issues)上提交错误，或直接通过 [email protected] 邮件列表询问我们。请在问题中包含您使用的 syzkaller 版本和 `-debug` 标志启用时的 `syz-manager` 输出（如果适用的话）。
+如果以上方法都没有帮助，请在[错误追踪器](https://github.com/google/syzkaller/issues)上提交错误，或直接通过 [email protected] 邮件列表询问我们。请在问题中包含您使用的 syzkaller 版本和 `-debug` 标志启用时的 `syz-manager` 输出（如果适用的话）。
diff --git a/sources/syzkaller/linux/wifi_fuzzing.md b/sources/syzkaller/linux/wifi_fuzzing.md
@@ -2,7 +2,7 @@
 status: collected
 title: "Wifi fuzzing"
 author: Syzkaller Community
-collector: chengziqiu
+collector: jxlpzqc
 collected_date: 20240314
 link: https://github.com/google/syzkaller/blob/master/docs/linux/wifi_fuzzing.md
 ---

diff --git a/sources/syzkaller/maintaining.md b/sources/syzkaller/maintaining.md
@@ -2,7 +2,7 @@
 status: collected
 title: "Maintainer's Guide"
 author: Syzkaller Community
-collector: chengziqiu
+collector: jxlpzqc
 collected_date: 20240314
 link: https://github.com/google/syzkaller/blob/master/docs/maintaining.md
 ---