diff --git a/0004-fix-snprintf-size-in-ksliprobe.patch b/0004-fix-snprintf-size-in-ksliprobe.patch deleted file mode 100644 index 8811ca5eb60c0ffcb11eb5df7d639b12f6fdd826..0000000000000000000000000000000000000000 --- a/0004-fix-snprintf-size-in-ksliprobe.patch +++ /dev/null @@ -1,28 +0,0 @@ -From 11b80f4f9d30e6b23d44f2c3924974243ef23656 Mon Sep 17 00:00:00 2001 -From: wo_cow -Date: Tue, 30 Aug 2022 09:45:01 +0800 -Subject: [PATCH] fix snprintf size in ksliprobe - ---- - .../src/probes/extends/ebpf.probe/src/ksliprobe/ksliprobe.c | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/gala-gopher/src/probes/extends/ebpf.probe/src/ksliprobe/ksliprobe.c b/gala-gopher/src/probes/extends/ebpf.probe/src/ksliprobe/ksliprobe.c -index 3caa9ed..2d4ce76 100644 ---- a/gala-gopher/src/probes/extends/ebpf.probe/src/ksliprobe/ksliprobe.c -+++ b/gala-gopher/src/probes/extends/ebpf.probe/src/ksliprobe/ksliprobe.c -@@ -167,9 +167,9 @@ static void load_args(int args_fd, struct probe_params* params) - - args.period = NS(params->period); - if (strlen(params->proc_name) > 0) { -- (void)snprintf(args.redis_proc, MAX_PROC_NAME_LEN, "%s", params->proc_name); -+ (void)snprintf(args.redis_proc, MAX_REDIS_PROC_NAME_SIZE, "%s", params->proc_name); - } else { -- (void)snprintf(args.redis_proc, MAX_PROC_NAME_LEN, "%s", DEFAULT_REDIS_PROC_NAME); -+ (void)snprintf(args.redis_proc, MAX_REDIS_PROC_NAME_SIZE, "%s", DEFAULT_REDIS_PROC_NAME); - } - args.redis_proc[MAX_REDIS_PROC_NAME_SIZE - 1] = 0; - --- -2.36.0.windows.1 - diff --git a/A-Ops.spec b/A-Ops.spec index 3bdefb6510bbafc3dd52e3f9135c27e83e41b6c3..b984cdecc51ab3c6f0bf2b863334071950bd7dd3 100644 --- a/A-Ops.spec +++ b/A-Ops.spec @@ -1,6 +1,6 @@ Name: A-Ops Version: v1.2.3 -Release: 4 +Release: 3 Summary: The intelligent ops toolkit for openEuler License: MulanPSL2 URL: https://gitee.com/openeuler/A-Ops @@ -15,7 +15,6 @@ patch0001: 0001-modify-to-adapt-to-oe2209-arm.patch %endif patch0002: 0002-fix-gopher-metadata-report.patch patch0003: 0003-adapt-to-abnormal-event-format-change.patch -patch0004: 0004-fix-snprintf-size-in-ksliprobe.patch # build for web @@ -178,7 +177,6 @@ tools for aops, it's about agent deploy %patch0001 -p1 %patch0002 -p1 %patch0003 -p1 -%patch0004 -p1 cp -rf A-Ops-web-node-modules/node_modules aops-web/ @@ -485,9 +483,6 @@ fi %changelog -* Mon Aug 30 2022 wo_cow - v1.2.3-4 -- bug fix: snprintf size wrong in ksliprobe. - * Mon Aug 29 2022 zhaoyuxing - v1.2.3-3 - bug fix: gala-spider adapt to abnormal event format change.