update aide to 0.16.2

Add-missing-include-in-src-db.c.patch

@@ -1,28 +0,0 @@
-From c6e47606cb485457afd06d74c7f372011184fa73 Mon Sep 17 00:00:00 2001
-From: Ilya Tumaykin <itumaykin@gmail.com>
-Date: Tue, 23 May 2017 17:24:29 +0300
-Subject: [PATCH 05/20] Add missing include in src/db.c
-
-url_fclose() function used in this file is defined in fopen.h.
----
- src/db.c | 4 ++++
- 1 file changed, 4 insertions(+)
-
-diff --git a/src/db.c b/src/db.c
-index dd133d4..858240d 100644
---- a/src/db.c
-+++ b/src/db.c
-@@ -28,6 +28,10 @@
- #include "db_disk.h"
- #include "md.h"
- 
-+#ifdef WITH_CURL
-+#include "fopen.h"
-+#endif
-+
- #ifdef WITH_PSQL
- #include "db_sql.h"
- #endif
--- 
-2.19.1
-

Fix-root_prefix-option.patch

@@ -1,46 +0,0 @@
-From 11a2c9828cc5d182a0a3090af4ee7687eb997f57 Mon Sep 17 00:00:00 2001
-From: Hannes von Haugwitz <hannes@vonhaugwitz.com>
-Date: Sat, 18 Nov 2017 09:00:27 +0100
-Subject: [PATCH 02/20] Fix root_prefix option
-
----
- ChangeLog     | 3 +++
- src/db_disk.c | 4 ++--
- 2 files changed, 5 insertions(+), 2 deletions(-)
-
-diff --git a/ChangeLog b/ChangeLog
-index 14a3c72..43f84a1 100644
---- a/ChangeLog
-+++ b/ChangeLog
-@@ -1,3 +1,6 @@
-+2017-11-18 Hannes von Haugwitz <hannes@vonhaugwitz.com>
-+	* Fix root_prefix option
-+
- 2017-10-29 Hannes von Haugwitz <hannes@vonhaugwitz.com>
- 	* Fix short form of --limit parameter
- 
-diff --git a/src/db_disk.c b/src/db_disk.c
-index 47e3e3e..36748e7 100644
---- a/src/db_disk.c
-+++ b/src/db_disk.c
-@@ -203,7 +203,7 @@ db_line *db_readline_disk ()
- 		fullname=malloc((conf->root_prefix_length+2)*sizeof(char));
- 		strncpy(fullname, conf->root_prefix, conf->root_prefix_length+1);
- 		strncat (fullname, "/", 1);
--		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);
-@@ -249,7 +249,7 @@ recursion:
- 		   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;
- 		}
--- 
-2.19.1
-

Fix-short-form-of-limit-parameter.patch

@@ -1,37 +0,0 @@
-From 4863aa95d571c95107841aebf97d3d32aa8b3577 Mon Sep 17 00:00:00 2001
-From: Hannes von Haugwitz <hannes@vonhaugwitz.com>
-Date: Sun, 29 Oct 2017 22:16:39 +0100
-Subject: [PATCH 01/20] Fix short form of --limit parameter
-
----
- ChangeLog  | 3 +++
- src/aide.c | 2 +-
- 2 files changed, 4 insertions(+), 1 deletion(-)
-
-diff --git a/ChangeLog b/ChangeLog
-index 263c438..14a3c72 100644
---- a/ChangeLog
-+++ b/ChangeLog
-@@ -1,3 +1,6 @@
-+2017-10-29 Hannes von Haugwitz <hannes@vonhaugwitz.com>
-+	* Fix short form of --limit parameter
-+
- 2016-07-25 Hannes von Haugwitz <hannes@vonhaugwitz.com>
- 	* Release version 0.16
- 
-diff --git a/src/aide.c b/src/aide.c
-index f85c1b4..2971178 100644
---- a/src/aide.c
-+++ b/src/aide.c
-@@ -117,7 +117,7 @@ static int read_param(int argc,char**argv)
-   };
- 
-   while(1){
--    option = getopt_long(argc, argv, "hV::vc:B:A:r:iCuDE", options, &i);
-+    option = getopt_long(argc, argv, "hV::vc:l:B:A:r:iCuDE", options, &i);
-     if(option==-1)
-       break;
-     switch(option)
--- 
-2.19.1
-

Skip-reading-section-data-if-the-section-doesn-t-con.patch

@@ -1,27 +0,0 @@
-From dd98dbd23770b8f8b95dc5a08ad5d5546831076a Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Luk=C3=A1=C5=A1=20Jirkovsk=C3=BD?= <l.jirkovsky@gmail.com>
-Date: Fri, 8 Mar 2019 20:44:51 +0100
-Subject: [PATCH 19/20] Skip reading section data if the section doesn't
- contain any table.
-
-Fixes floating point exception on go files.
----
- src/do_md.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/do_md.c b/src/do_md.c
-index 86fde8d..35c0751 100644
---- a/src/do_md.c
-+++ b/src/do_md.c
-@@ -99,7 +99,7 @@ int is_prelinked(int fd) {
-         while (!bingo && (scn = elf_nextscn(elf, scn)) != NULL) {
-                 (void) gelf_getshdr(scn, &shdr);
- 
--                if (shdr.sh_type != SHT_DYNAMIC)
-+                if (shdr.sh_type != SHT_DYNAMIC || shdr.sh_entsize == 0)
-                         continue;
- 
-                 while (!bingo && (data = elf_getdata (scn, data)) != NULL) {
--- 
-2.19.1
-

aide.spec

@@ -1,22 +1,17 @@
 Name:       aide
-Version:    0.16
+Version:    0.16.2
-Release:    16
+Release:    1
 Summary:    Advanced Intrusion Detection Environment
 License:    GPLv2+
 URL:        http://sourceforge.net/projects/aide
-Source0:    http://sourceforge.net/projects/aide/files/aide/%{version}/%{name}-%{version}.tar.gz
+Source0:    http://github.com/aide/aide/releases/download/v%{version}/%{name}-%{version}.tar.gz
 Source1:    aide.conf
 Source2:    aide.logrotate
 
 BuildRequires:  gcc make bison flex pcre-devel libgpg-error-devel libgcrypt-devel zlib-devel libcurl-devel
 BuildRequires:  libacl-devel libselinux-devel libattr-devel e2fsprogs-devel audit-libs-devel git
 
-Patch6000:  aide-define_hash_use_gcrypt.patch
+Patch0:   aide-define_hash_use_gcrypt.patch
-Patch6001:  Fix-short-form-of-limit-parameter.patch
-Patch6002:  Fix-root_prefix-option.patch
-Patch6003:  Add-missing-include-in-src-db.c.patch
-Patch6004:  src-do_md.c-fix-memory-leak-in-is_prelinked.patch
-Patch6005:  Skip-reading-section-data-if-the-section-doesn-t-con.patch
 
 %description
 AIDE (Advanced Intrusion Detection Environment, [eyd]) is a file and directory integrity checker.
@@ -64,6 +59,12 @@ mkdir -p -m0700 %{buildroot}%{_localstatedir}/lib/aide
 %{_mandir}/*/*
 
 %changelog
+* Wed Jul 29 2020 wangchen <wangchen137@huawei.com> - 0.16.2-1
+- Type:enhancement
+- ID:NA
+- SUG:NA
+- DESC: update to 0.16.2
+
 * Tue Mar 17 2020 openEuler Buildteam <buildteam@openeuler.org> - 0.16-16
 - Type:bugfix
 - ID:NA

src-do_md.c-fix-memory-leak-in-is_prelinked.patch

@@ -1,48 +0,0 @@
-From 242ce0bd6cedbbc989c565364679c57ee9171424 Mon Sep 17 00:00:00 2001
-From: Hannes von Haugwitz <hannes@vonhaugwitz.com>
-Date: Fri, 7 Dec 2018 08:16:08 +0100
-Subject: [PATCH 10/20] src/do_md.c: fix memory leak in is_prelinked
-
-* thanks to Robert Springer for the patch
-* closes #103
----
- ChangeLog   | 4 ++++
- src/do_md.c | 7 +++++--
- 2 files changed, 9 insertions(+), 2 deletions(-)
-
-diff --git a/src/do_md.c b/src/do_md.c
-index bc06e62..86fde8d 100644
---- a/src/do_md.c
-+++ b/src/do_md.c
-@@ -1,7 +1,7 @@
- /* aide, Advanced Intrusion Detection Environment
-  * vi: ts=8 sw=8
-  *
-- * Copyright (C) 1999-2002,2004-2006,2009-2011,2013 Rami Lehti, Pablo
-+ * Copyright (C) 1999-2002,2004-2006,2009-2011,2013,2018 Rami Lehti, Pablo
-  * Virolainen, Mike Markley, Richard van den Berg, Hannes von Haugwitz
-  * $Header$
-  *
-@@ -90,8 +90,10 @@ int is_prelinked(int fd) {
-         if ((elf = elf_begin (fd, ELF_C_READ, NULL)) == NULL
-             || elf_kind(elf) != ELF_K_ELF
-             || gelf_getehdr(elf, &ehdr) == NULL
--            || !(ehdr.e_type == ET_DYN || ehdr.e_type == ET_EXEC))
-+            || !(ehdr.e_type == ET_DYN || ehdr.e_type == ET_EXEC)) {
-+                elf_end(elf);
-                 return 0;
-+        }
- 
-         bingo = 0;
-         while (!bingo && (scn = elf_nextscn(elf, scn)) != NULL) {
-@@ -113,6 +115,7 @@ int is_prelinked(int fd) {
-                         }
-                 }
-         }
-+        elf_end(elf);
- 
-         return bingo;
- }
--- 
-2.19.1
-