From 1f9083fa051c38a4bbbcbd3341b79933f0dc8e09 Mon Sep 17 00:00:00 2001
From: Radovan Sroka <rsroka@redhat.com>
Date: Wed, 21 Jun 2023 13:38:09 +0200
Subject: [PATCH] Rebase to 1.18.4

- aide-0.18.4 is available
Resolves: rhbz#1910486
- Please port your pcre dependency to pcre2. Pcre has been deprecated
Resolves: rhbz#2128267

Signed-off-by: Radovan Sroka <rsroka@redhat.com>
---
 .gitignore |  1 +
 aide.spec  | 36 +++++++++++++++++++++---------------
 sources    |  2 +-
 3 files changed, 23 insertions(+), 16 deletions(-)

diff --git a/.gitignore b/.gitignore
index 945a894..581f621 100644
--- a/.gitignore
+++ b/.gitignore
@@ -13,3 +13,4 @@ aide-0.14.tar.gz.asc
 /aide-0.16b1.tar.gz
 /aide-0.16rc1.tar.gz
 /aide-0.16.tar.gz
+/aide-0.18.4.tar.gz
diff --git a/aide.spec b/aide.spec
index 5a99e90..36e2445 100644
--- a/aide.spec
+++ b/aide.spec
@@ -1,7 +1,7 @@
 Summary:        Intrusion detection environment
 Name:           aide
-Version:        0.16
-Release:        23%{?dist}
+Version:        0.18.4
+Release:        1%{?dist}
 URL:            http://sourceforge.net/projects/aide
 License:        GPL-2.0-or-later
 
@@ -14,7 +14,7 @@ Source3:        aide.logrotate
 BuildRequires:  gcc
 BuildRequires:  make
 BuildRequires:  bison flex
-BuildRequires:  pcre-devel
+BuildRequires:  pcre2-devel
 BuildRequires:  libgpg-error-devel libgcrypt-devel
 BuildRequires:  zlib-devel
 BuildRequires:  libcurl-devel
@@ -26,19 +26,19 @@ BuildRequires:  audit-libs-devel
 BuildRequires:  autoconf automake libtool
 
 # Customize the database file location in the man page.
-Patch1: aide-0.16rc1-man.patch
+#Patch1: aide-0.16rc1-man.patch
 # fix aide in FIPS mode
-Patch2: aide-0.16b1-fipsfix.patch
+#Patch2: aide-0.16b1-fipsfix.patch
 # Bug 1674637 - aide: FTBFS in Fedora rawhide/f30
-Patch3: aide-0.16-Use-LDADD-for-adding-curl-library-to-the-linker-comm.patch
+#Patch3: aide-0.16-Use-LDADD-for-adding-curl-library-to-the-linker-comm.patch
 
-Patch4: aide-0.15-syslog-format.patch
-Patch5: aide-0.16-crypto-disable-haval-and-others.patch
-Patch6: coverity.patch
-Patch7: aide-0.16-crash-elf.patch
-Patch8: aide-configure-c99-1.patch
-Patch9: aide-configure-c99-2.patch
-Patch10: aide-configure-c99-3.patch
+#Patch4: aide-0.15-syslog-format.patch
+#Patch5: aide-0.16-crypto-disable-haval-and-others.patch
+#Patch6: coverity.patch
+#Patch7: aide-0.16-crash-elf.patch
+#Patch8: aide-configure-c99-1.patch
+#Patch9: aide-configure-c99-2.patch
+#Patch10: aide-configure-c99-3.patch
 
 %description
 AIDE (Advanced Intrusion Detection Environment) is a file integrity
@@ -49,7 +49,7 @@ checker and intrusion detection program.
 cp -a %{S:2} .
 
 %build
-autoreconf -ivf
+#autoreconf -ivf
 %configure  \
   --disable-static \
   --with-config_file=%{_sysconfdir}/aide.conf \
@@ -72,7 +72,7 @@ mkdir -p -m0700 %{buildroot}%{_localstatedir}/lib/aide
 
 %files
 %license COPYING
-%doc AUTHORS ChangeLog NEWS README doc/manual.html contrib/
+%doc AUTHORS ChangeLog NEWS README contrib/
 %doc README.quickstart
 %{_sbindir}/aide
 %{_mandir}/man1/*.1*
@@ -83,6 +83,12 @@ mkdir -p -m0700 %{buildroot}%{_localstatedir}/lib/aide
 %dir %attr(0700,root,root) %{_localstatedir}/log/aide
 
 %changelog
+* Wed Jun 21 2023 Radovan Sroka <rsroka@redhat.com> - 0.18.4-1
+- aide-0.18.4 is available
+Resolves: rhbz#1910486
+- Please port your pcre dependency to pcre2. Pcre has been deprecated
+Resolves: rhbz#2128267
+
 * Tue Jun 13 2023 Radovan Sroka <rsroka@redhat.com> - 0.16-23
 - migrated to SPDX license
 
diff --git a/sources b/sources
index abe8169..e0a437c 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (aide-0.16.tar.gz) = 29ad97756e3e2fb21dc332ed03b494a1c73e621266f8622ec80bdba23092a38ee975b97f3cff2330e4c16e64e2f672259eea9291ca706a4009e7399b4e14e6a7
+SHA512 (aide-0.18.4.tar.gz) = 31a17fc97ed9bda5dc4a492bcee699442cee1ea3829b1b06cf91ef9234a8b033677c281979902cbc6a8db0269c7f00499897940df07beff14cbb88b8fe6390f5