From 6fed991892af58b74618e20bea719d795e70f6d2 Mon Sep 17 00:00:00 2001 From: penny Date: Wed, 25 Dec 2024 09:31:29 +0800 Subject: [PATCH 1/4] Add Patch --- aide-verbose.patch | 34 ++++++++++++++++++++++++++++++++++ 1 file changed, 34 insertions(+) create mode 100644 aide-verbose.patch diff --git a/aide-verbose.patch b/aide-verbose.patch new file mode 100644 index 0000000..c87ff90 --- /dev/null +++ b/aide-verbose.patch @@ -0,0 +1,34 @@ +diff -up ./src/conf_eval.c.fix ./src/conf_eval.c +--- ./src/conf_eval.c.fix 2023-12-22 12:12:22.961141634 +0100 ++++ ./src/conf_eval.c 2023-12-22 14:09:21.217786675 +0100 +@@ -166,6 +166,7 @@ static DB_ATTR_TYPE eval_attribute_expre + + static void set_database_attr_option(DB_ATTR_TYPE attr, int linenumber, char *filename, char* linebuf) { + char *str; ++ long num; + + DB_ATTR_TYPE hashes = get_hashes(true); + if (attr&(~hashes)) { +@@ -298,8 +299,20 @@ static void eval_config_statement(config + LOG_CONFIG_FORMAT_LINE(LOG_LEVEL_CONFIG, "set 'config_version' option to '%s'", str) + break; + case VERBOSE_OPTION: +- log_msg(LOG_LEVEL_ERROR, "%s:%d: 'verbose' option is no longer supported, use 'log_level' and 'report_level' options instead (see man aide.conf for details) (line: '%s')", conf_filename, conf_linenumber, conf_linebuf); +- exit(INVALID_CONFIGURELINE_ERROR); ++ log_msg(LOG_LEVEL_CONFIG, "%s:%d: 'verbose' option is deprecated, use 'log_level' and 'report_level' options instead (see man aide.conf for details) (line: '%s')", conf_filename, conf_linenumber, conf_linebuf); ++ str = eval_string_expression(statement.e, linenumber, filename, linebuf); ++ num = strtol(str, NULL, 10); ++ ++ if (num < 0 && num > 255) { ++ LOG_CONFIG_FORMAT_LINE(LOG_LEVEL_ERROR, "invalid verbose level: '%s'", str); ++ exit(INVALID_CONFIGURELINE_ERROR); ++ } ++ ++ if (num >= 10) { ++ set_log_level(LOG_LEVEL_DEBUG); ++ } ++ ++ free(str); + break; + case LIMIT_CMDLINE_OPTION: + /* command-line options are ignored here */ -- Gitee From 58d3d8481de53794e1de2801cc15a8389c7f2aae Mon Sep 17 00:00:00 2001 From: penny Date: Wed, 25 Dec 2024 09:49:01 +0800 Subject: [PATCH 2/4] fix spec --- aide.spec | 1 + 1 file changed, 1 insertion(+) diff --git a/aide.spec b/aide.spec index aff774d..a784dfb 100644 --- a/aide.spec +++ b/aide.spec @@ -22,6 +22,7 @@ Requires: libgcrypt-sm3 Patch0: Add-sm3-algorithm-for-aide.patch Patch1: backport-Fix-parsing-of-lowercase-group-names.patch +Patch2: aide-verbose.patch %description AIDE (Advanced Intrusion Detection Environment, [eyd]) is a file and directory integrity checker. -- Gitee From d214ec655656bc75dd1c86abbc6db4c34dc6ba81 Mon Sep 17 00:00:00 2001 From: penny Date: Wed, 25 Dec 2024 10:03:28 +0800 Subject: [PATCH 3/4] revise release and changelog --- aide.spec | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/aide.spec b/aide.spec index a784dfb..318be0b 100644 --- a/aide.spec +++ b/aide.spec @@ -2,7 +2,7 @@ Name: aide Version: 0.18.8 -Release: 1 +Release: 2 Summary: Advanced Intrusion Detection Environment License: GPLv2+ URL: https://sourceforge.net/projects/aide @@ -75,6 +75,12 @@ make check %{_mandir}/*/* %changelog +* Wed Dec 25 2024 pengjian - 0.18.8-2 +- Type: enhancement +- ID: NA +- SUG: NA +- DESC: add aide-verbose.patch + * Tue Oct 15 2024 yixiangzhike - 0.18.8-1 - Type: enhancement - ID: NA -- Gitee From cb45d8462d4f189fb4f6908c5a8c70755fa4cde8 Mon Sep 17 00:00:00 2001 From: penny Date: Wed, 25 Dec 2024 10:49:35 +0800 Subject: [PATCH 4/4] fix patch --- aide-verbose.patch | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) diff --git a/aide-verbose.patch b/aide-verbose.patch index c87ff90..53e5ca4 100644 --- a/aide-verbose.patch +++ b/aide-verbose.patch @@ -1,14 +1,6 @@ diff -up ./src/conf_eval.c.fix ./src/conf_eval.c --- ./src/conf_eval.c.fix 2023-12-22 12:12:22.961141634 +0100 +++ ./src/conf_eval.c 2023-12-22 14:09:21.217786675 +0100 -@@ -166,6 +166,7 @@ static DB_ATTR_TYPE eval_attribute_expre - - static void set_database_attr_option(DB_ATTR_TYPE attr, int linenumber, char *filename, char* linebuf) { - char *str; -+ long num; - - DB_ATTR_TYPE hashes = get_hashes(true); - if (attr&(~hashes)) { @@ -298,8 +299,20 @@ static void eval_config_statement(config LOG_CONFIG_FORMAT_LINE(LOG_LEVEL_CONFIG, "set 'config_version' option to '%s'", str) break; @@ -16,10 +8,12 @@ diff -up ./src/conf_eval.c.fix ./src/conf_eval.c - log_msg(LOG_LEVEL_ERROR, "%s:%d: 'verbose' option is no longer supported, use 'log_level' and 'report_level' options instead (see man aide.conf for details) (line: '%s')", conf_filename, conf_linenumber, conf_linebuf); - exit(INVALID_CONFIGURELINE_ERROR); + log_msg(LOG_LEVEL_CONFIG, "%s:%d: 'verbose' option is deprecated, use 'log_level' and 'report_level' options instead (see man aide.conf for details) (line: '%s')", conf_filename, conf_linenumber, conf_linebuf); ++ char *str; ++ long num; + str = eval_string_expression(statement.e, linenumber, filename, linebuf); + num = strtol(str, NULL, 10); + -+ if (num < 0 && num > 255) { ++ if (num < 0 || num > 255) { + LOG_CONFIG_FORMAT_LINE(LOG_LEVEL_ERROR, "invalid verbose level: '%s'", str); + exit(INVALID_CONFIGURELINE_ERROR); + } -- Gitee