From 6e0d46fa8d9eef766afa9064eac4f9c2b27ded39 Mon Sep 17 00:00:00 2001 From: yixiangzhike Date: Thu, 4 Jul 2024 10:04:43 +0800 Subject: [PATCH] Backport upstream patch to fix error condition checking (cherry picked from commit c25f64e15a0a06987fae4e69670b54265c3423e8) --- aide.spec | 9 ++++++- ...r-error-message-of-failing-to-open-g.patch | 27 +++++++++++++++++++ 2 files changed, 35 insertions(+), 1 deletion(-) create mode 100644 backport-Fix-condition-for-error-message-of-failing-to-open-g.patch diff --git a/aide.spec b/aide.spec index 84a5f3f..2191f40 100644 --- a/aide.spec +++ b/aide.spec @@ -2,7 +2,7 @@ Name: aide Version: 0.18.6 -Release: 1 +Release: 2 Summary: Advanced Intrusion Detection Environment License: GPLv2+ URL: https://sourceforge.net/projects/aide @@ -21,6 +21,7 @@ BuildRequires: check-devel Requires: libgcrypt-sm3 Patch0: Add-sm3-algorithm-for-aide.patch +Patch1: backport-Fix-condition-for-error-message-of-failing-to-open-g.patch %description AIDE (Advanced Intrusion Detection Environment, [eyd]) is a file and directory integrity checker. @@ -73,6 +74,12 @@ make check %{_mandir}/*/* %changelog +* Thu Jul 4 2024 yixiangzhike - 0.18.6-2 +- Type: bugfix +- ID: NA +- SUG: NA +- DESC: backport upstream patch to fix error condition checking + * Fri Dec 15 2023 Paul Thomas - 0.18.6-1 - Type: enhancement - ID: NA diff --git a/backport-Fix-condition-for-error-message-of-failing-to-open-g.patch b/backport-Fix-condition-for-error-message-of-failing-to-open-g.patch new file mode 100644 index 0000000..d7093f1 --- /dev/null +++ b/backport-Fix-condition-for-error-message-of-failing-to-open-g.patch @@ -0,0 +1,27 @@ +From 87bd10564bb2497d9e6f03f12f4dd246fbcb1443 Mon Sep 17 00:00:00 2001 +From: Mingjie Shen +Date: Tue, 14 Nov 2023 16:00:05 -0500 +Subject: [PATCH] Fix condition for error message of failing to open gzipped + files + +gzfh should be checked, instead of fh. +--- + src/be.c | 2 +- + 2 files changed, 1 insertions(+), 1 deletion(-) + +diff --git a/src/be.c b/src/be.c +index 39592cd..9ddaa48 100644 +--- a/src/be.c ++++ b/src/be.c +@@ -160,7 +160,7 @@ void* be_init(bool readonly, url_t* u, bool iszipped, bool append, int linenumbe + #ifdef WITH_ZLIB + if(iszipped && !readonly){ + gzFile gzfh = gzdopen(a,"w"); +- if(fh==NULL){ ++ if(gzfh==NULL){ + log_msg(LOG_LEVEL_ERROR,"couldn't reopen file descriptor %li",a); + } + return gzfh; +-- +2.33.0 + -- Gitee