packages/aide
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

!33 【openEuler-20.03-LTS-SP3】fix display issue and reporting to http/https/ftp

Browse Source 
From: @yixiangzhike 
Reviewed-by: @zhujianwei001 
Signed-off-by: @zhujianwei001
This commit is contained in:
openeuler-ci-bot 2022-06-28 07:50:03 +00:00 committed by Gitee
commit c3cfe600d8
No known key found for this signature in database
GPG Key ID: 173E9B9CA92EEF8F
3 changed files with 66 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
aide-fix-display-issue.patch Normal file
View File

@ -0,0 +1,26 @@
From c10bb049afc4d02bd9bf99bca9f1cdd38af4cc8b Mon Sep 17 00:00:00 2001
From: guiyao <guiyao@huawei.com>
Date: Mon, 27 Jun 2022 17:39:58 +0800
Subject: [PATCH] fix display issue
---
src/compare_db.c | 3 +++
1 file changed, 3 insertions(+)
diff --git a/src/compare_db.c b/src/compare_db.c
index 39b52ed..de7c682 100644
--- a/src/compare_db.c
+++ b/src/compare_db.c
@@ -687,6 +687,9 @@ static void print_report_header() {
} else {
error(0,_("\nNumber of entries:\t%li"), ntotal);
}
+ if(conf->verbose_level<2){
+ error(0,_("\n"));
+ }
}
static void print_report_databases() {
--
1.8.3.1

30
aide-fix-reporting-to-http-https-ftp.patch Normal file
View File

@ -0,0 +1,30 @@
From 8e2c349b3921b47b9e1163a583cfd24141cb5532 Mon Sep 17 00:00:00 2001
From: guiyao <guiyao@huawei.com>
Date: Mon, 27 Jun 2022 17:45:34 +0800
Subject: [PATCH] disable reporting to http https ftp
---
src/error.c | 7 ++++++-
1 file changed, 6 insertions(+), 1 deletion(-)
diff --git a/src/error.c b/src/error.c
index 21533d2..eaac426 100644
--- a/src/error.c
+++ b/src/error.c
@@ -49,7 +49,12 @@ int error_init(url_t* url,int initial)
list* r=NULL;
FILE* fh=NULL;
int sfac;
-
+
+ if (url->type == url_http || url->type==url_https || url->type==url_ftp){
+ error(0,_("This binary has no http/https/ftp support\n"));
+ exit(INVALID_ARGUMENT_ERROR);
+ }
+
if (url->type==url_database) {
conf->report_db++;
return RETOK;
--
1.8.3.1

11
aide.spec
View File

@ -1,6 +1,6 @@
Name: aide
Version: 0.16.2
Release: 3
Release: 4
Summary: Advanced Intrusion Detection Environment
License: GPLv2+
URL: http://sourceforge.net/projects/aide
@ -14,6 +14,8 @@ BuildRequires: libacl-devel libselinux-devel libattr-devel e2fsprogs-devel audi
Patch0: aide-define_hash_use_gcrypt.patch
Patch1: add-sm3-crypt-support.patch
Patch2: backport-CVE-2021-45417-Precalculate-buffer-size-in-base64-functions.patch
Patch3: aide-fix-display-issue.patch
Patch4: aide-fix-reporting-to-http-https-ftp.patch
%description
AIDE (Advanced Intrusion Detection Environment, [eyd]) is a file and directory integrity checker.
@ -61,6 +63,13 @@ mkdir -p -m0700 %{buildroot}%{_localstatedir}/lib/aide
%{_mandir}/*/*
%changelog
* Mon Jun 27 2022 yixiangzhike <yixiangzhike007@163.com> - 0.16.2-4
- Type:bugfix
- ID:NA
- SUG:NA
- DESC: fix display issue
fix reporting to http/https/ftp
* Tue Feb 8 2022 yixiangzhike <yixiangzhike007@163.com> - 0.16.2-3
- Type:CVE
- ID:CVE-2021-45417