Fix parsing of lowercase group names
This commit is contained in:
parent
c2fae6847a
commit
93de180b77
@ -2,7 +2,7 @@
|
|||||||
|
|
||||||
Name: aide
|
Name: aide
|
||||||
Version: 0.18.6
|
Version: 0.18.6
|
||||||
Release: 2
|
Release: 3
|
||||||
Summary: Advanced Intrusion Detection Environment
|
Summary: Advanced Intrusion Detection Environment
|
||||||
License: GPLv2+
|
License: GPLv2+
|
||||||
URL: https://sourceforge.net/projects/aide
|
URL: https://sourceforge.net/projects/aide
|
||||||
@ -22,6 +22,7 @@ Requires: libgcrypt-sm3
|
|||||||
|
|
||||||
Patch0: Add-sm3-algorithm-for-aide.patch
|
Patch0: Add-sm3-algorithm-for-aide.patch
|
||||||
Patch1: backport-Fix-condition-for-error-message-of-failing-to-open-g.patch
|
Patch1: backport-Fix-condition-for-error-message-of-failing-to-open-g.patch
|
||||||
|
Patch2: backport-Fix-parsing-of-lowercase-group-names.patch
|
||||||
|
|
||||||
%description
|
%description
|
||||||
AIDE (Advanced Intrusion Detection Environment, [eyd]) is a file and directory integrity checker.
|
AIDE (Advanced Intrusion Detection Environment, [eyd]) is a file and directory integrity checker.
|
||||||
@ -74,6 +75,12 @@ make check
|
|||||||
%{_mandir}/*/*
|
%{_mandir}/*/*
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Wed Sep 4 2024 yixiangzhike <yixiangzhike007@163.com> - 0.18.6-3
|
||||||
|
- Type: bugfix
|
||||||
|
- ID: NA
|
||||||
|
- SUG: NA
|
||||||
|
- DESC: backport upstream patch to fix parsing of lowercase group names
|
||||||
|
|
||||||
* Thu Jul 4 2024 yixiangzhike <yixiangzhike007@163.com> - 0.18.6-2
|
* Thu Jul 4 2024 yixiangzhike <yixiangzhike007@163.com> - 0.18.6-2
|
||||||
- Type: bugfix
|
- Type: bugfix
|
||||||
- ID: NA
|
- ID: NA
|
||||||
|
|||||||
47
backport-Fix-parsing-of-lowercase-group-names.patch
Normal file
47
backport-Fix-parsing-of-lowercase-group-names.patch
Normal file
@ -0,0 +1,47 @@
|
|||||||
|
From 9ed0843765f0f97f6d3f989995a492da20b8c410 Mon Sep 17 00:00:00 2001
|
||||||
|
From: Hannes von Haugwitz <hannes@vonhaugwitz.com>
|
||||||
|
Date: Tue, 3 Sep 2024 19:41:19 +0200
|
||||||
|
Subject: [PATCH] Fix parsing of lowercase group names
|
||||||
|
|
||||||
|
* closes: #176
|
||||||
|
---
|
||||||
|
ChangeLog | 3 +++
|
||||||
|
src/conf_lex.l | 4 +---
|
||||||
|
2 files changed, 4 insertions(+), 3 deletions(-)
|
||||||
|
|
||||||
|
diff --git a/ChangeLog b/ChangeLog
|
||||||
|
index 3505168..df764e9 100644
|
||||||
|
--- a/ChangeLog
|
||||||
|
+++ b/ChangeLog
|
||||||
|
@@ -1,3 +1,6 @@
|
||||||
|
+2024-09-03 Hannes von Haugwitz <hannes@vonhaugwitz.com>
|
||||||
|
+ * Fix parsing of lowercase group names (closes: #176)
|
||||||
|
+
|
||||||
|
2023-08-01 Hannes von Haugwitz <hannes@vonhaugwitz.com>
|
||||||
|
* Release aide 0.18.6
|
||||||
|
|
||||||
|
diff --git a/src/conf_lex.l b/src/conf_lex.l
|
||||||
|
index 4186101..0cf8c71 100644
|
||||||
|
--- a/src/conf_lex.l
|
||||||
|
+++ b/src/conf_lex.l
|
||||||
|
@@ -5,8 +5,6 @@ G [a-zA-Z0-9]
|
||||||
|
V [a-zA-Z_]+[a-zA-Z0-9_]*
|
||||||
|
E [\ ]*"="[\ ]*
|
||||||
|
|
||||||
|
-O [a-z_]
|
||||||
|
-
|
||||||
|
%{
|
||||||
|
|
||||||
|
#define YYDEBUG 1
|
||||||
|
@@ -460,7 +458,7 @@ LOG_LEVEL lex_log_level = LOG_LEVEL_DEBUG;
|
||||||
|
return (CONFIGOPTION);
|
||||||
|
}
|
||||||
|
|
||||||
|
-<CONFIG>({O})+ {
|
||||||
|
+<CONFIG>[a-z]+(_[a-z]+)+ {
|
||||||
|
log_msg(LOG_LEVEL_ERROR,"%s:%d: unknown config option: '%s' (line: '%s')", conf_filename, conf_linenumber, conftext, conf_linebuf);
|
||||||
|
exit(INVALID_CONFIGURELINE_ERROR);
|
||||||
|
}
|
||||||
|
--
|
||||||
|
2.33.0
|
||||||
|
|
||||||
Loading…
x
Reference in New Issue
Block a user