From 70ec27367d1a2f3fff4b6ce5fcf132c125fd1845 Mon Sep 17 00:00:00 2001
From: Peridot Bot <rockyautomation@rockylinux.org>
Date: Wed, 6 Nov 2024 01:13:45 +0000
Subject: [PATCH] import aide-0.16-102.el9
---
.aide.checksum | 1 +
.aide.metadata | 2 +-
SOURCES/aide-db-problem.patch | 11 +++++++++++
SOURCES/rootPrefix.patch | 21 +++++++++++++++++++++
SPECS/aide.spec | 12 ++++++++++--
5 files changed, 44 insertions(+), 3 deletions(-)
create mode 100644 .aide.checksum
create mode 100644 SOURCES/aide-db-problem.patch
create mode 100644 SOURCES/rootPrefix.patch
diff --git a/.aide.checksum b/.aide.checksum
new file mode 100644
index 0000000..c917e48
--- /dev/null
+++ b/.aide.checksum
@@ -0,0 +1 @@
+210727660ec5ec522e949785910c5b59d54e1c9acde83d49dd3983c8a387402e
diff --git a/.aide.metadata b/.aide.metadata
index a8e59ce..3f3a375 100644
--- a/.aide.metadata
+++ b/.aide.metadata
@@ -1 +1 @@
-b97f65bb12701a42baa2cce45b41ed6367a70734 SOURCES/aide-0.16.tar.gz
+a81c53a131c4fd130b169b3a26ac35386a2f6e1e014f12807524cc273ed97345 SOURCES/aide-0.16.tar.gz
diff --git a/SOURCES/aide-db-problem.patch b/SOURCES/aide-db-problem.patch
new file mode 100644
index 0000000..1994284
--- /dev/null
+++ b/SOURCES/aide-db-problem.patch
@@ -0,0 +1,11 @@
+diff -up aide-0.16/src/commandconf.c.rhcase03736158 aide-0.16/src/commandconf.c
+--- aide-0.16/src/commandconf.c.rhcase03736158 2024-03-01 11:06:35.305712992 +0100
++++ aide-0.16/src/commandconf.c 2024-03-01 11:08:07.726499878 +0100
+@@ -306,6 +306,7 @@ int db_input_wrapper(char* buf, int max_
+ retval=0;
+ buf[0]='\0';
+ }else {
++ buf[0]='\0';
+ if((retval=gzread(*db_gzp,buf,max_size))<0){
+ error(0,_("gzread() failed: gzerr=%s!\n"),gzerror(*db_gzp,&err));
+ retval=0;
diff --git a/SOURCES/rootPrefix.patch b/SOURCES/rootPrefix.patch
new file mode 100644
index 0000000..30a6e9d
--- /dev/null
+++ b/SOURCES/rootPrefix.patch
@@ -0,0 +1,21 @@
+diff -Naur aide-0.16.orig/src/db_disk.c aide-0.16/src/db_disk.c
+--- aide-0.16.orig/src/db_disk.c 2024-03-11 16:45:06.594013966 -0400
++++ aide-0.16/src/db_disk.c 2024-03-11 16:45:06.584013966 -0400
+@@ -209,7 +209,7 @@
+ fullname=malloc((conf->root_prefix_length+2)*sizeof(char));
+ strcpy(fullname, conf->root_prefix);
+ strcat (fullname, "/");
+- if (!get_file_status(&fullname[conf->root_prefix_length], &fs)) {
++ if (!get_file_status(fullname, &fs)) {
+ add = check_rxtree (&fullname[conf->root_prefix_length], conf->tree, &attr, fs.st_mode);
+ error (240, "%s match=%d, tree=%p, attr=%llu\n", &fullname[conf->root_prefix_length], add,
+ conf->tree, attr);
+@@ -255,7 +255,7 @@
+ If not call, db_readline_disk again...
+ */
+
+- if (get_file_status(&fullname[conf->root_prefix_length], &fs)) {
++ if (get_file_status(fullname, &fs)) {
+ free (fullname);
+ goto recursion;
+ }
diff --git a/SPECS/aide.spec b/SPECS/aide.spec
index 7bdd197..898eb56 100644
--- a/SPECS/aide.spec
+++ b/SPECS/aide.spec
@@ -1,7 +1,7 @@
Summary: Intrusion detection environment
Name: aide
Version: 0.16
-Release: 100%{?dist}
+Release: 102%{?dist}
URL: http://sourceforge.net/projects/aide
License: GPLv2+
@@ -38,8 +38,9 @@ Patch6: coverity.patch
Patch7: aide-0.16-crash-elf.patch
Patch8: aide-configure.patch
Patch9: aide-static-analysis.patch
-
Patch10: aide-0.16-CVE-2021-45417.patch
+Patch11: aide-db-problem.patch
+Patch12: rootPrefix.patch
%description
AIDE (Advanced Intrusion Detection Environment) is a file integrity
@@ -86,6 +87,13 @@ mkdir -p -m0700 %{buildroot}%{_localstatedir}/lib/aide
%dir %attr(0700,root,root) %{_localstatedir}/log/aide
%changelog
+* Fri May 17 2024 Radovan Sroka <rsroka@redhat.com> - 0.16-102
+RHEL 9.5.0 ERRATUM
+- aide fails with "Not enough parameters in db:15384. Trying to continue." unexpectedly
+Resolves: RHEL-27606
+- AIDE fails when using root_prefix option
+Resolves: RHEL-28882
+
* Mon Jan 24 2022 Radovan Sroka <rsroka@redhat.com> - 0.16-100
- backport fix for CVE-2021-45417
Resolves: rhbz#2041950
--
GitLab