From f9ac10a71e1ed6853e367bc06878d091517fa4c8 Mon Sep 17 00:00:00 2001
From: Radovan Sroka <rsroka@redhat.com>
Date: Tue, 4 Apr 2017 14:28:53 +0200
Subject: [PATCH] Rebase to stable v0.16

- specfile cleanup
- make doc readable
  resolves: #1421355
- make aide binary runable for any user
  resolves: #1421351
---
 .gitignore |  1 +
 aide.spec  | 51 +++++++++++++++++++++++++--------------------------
 sources    |  2 +-
 3 files changed, 27 insertions(+), 27 deletions(-)

diff --git a/.gitignore b/.gitignore
index b3a27d8..945a894 100644
--- a/.gitignore
+++ b/.gitignore
@@ -12,3 +12,4 @@ aide-0.14.tar.gz.asc
 /aide-0.15.1.tar.gz.asc
 /aide-0.16b1.tar.gz
 /aide-0.16rc1.tar.gz
+/aide-0.16.tar.gz
diff --git a/aide.spec b/aide.spec
index 9b858d7..174d818 100644
--- a/aide.spec
+++ b/aide.spec
@@ -1,35 +1,32 @@
-# segfaults
-%{!?_with_curl: %{!?_without_curl: %global _without_curl --without-curl}}
-
 Summary: Intrusion detection environment
 Name: aide
 Version: 0.16
-Release: 0.3.rc1%{?dist}
+Release: 1%{?dist}
 URL: http://sourceforge.net/projects/%{name}
 License: GPLv2+
 Group: Applications/System
-Source0: https://sourceforge.net/projects/%{name}/files/devel/%{version}rc1/%{name}-%{version}rc1.tar.gz
+
+
+Source0: https://sourceforge.net/projects/%{name}/files/devel/%{version}rc1/%{name}-%{version}.tar.gz
 Source1: aide.conf
 Source2: README.quickstart
 Source3: aide.logrotate
-# Customize the database file location in the man page.
-Patch1: aide-0.16rc1-man.patch
-# fix aide in FIPS mode
-Patch2: aide-0.16b1-fipsfix.patch
-Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot-%(%{__id_u} -n)
+
+
 BuildRequires: mktemp 
 BuildRequires: elfutils-libelf-devel
-%if 0%{?rhel} == 0
-Buildrequires: mhash-devel
-%endif
 Buildrequires: zlib-devel libgcrypt-devel
 Buildrequires: flex bison
 Buildrequires: libattr-devel e2fsprogs-devel
 Buildrequires: libacl-devel libselinux-devel
 Buildrequires: audit-libs-devel >= 1.2.8-2
-%if "%{?_with_curl}x" != "x"
-Buildrequires: curl-devel
-%endif
+
+
+# Customize the database file location in the man page.
+Patch1: aide-0.16rc1-man.patch
+# fix aide in FIPS mode
+Patch2: aide-0.16b1-fipsfix.patch
+
 
 %description
 AIDE (Advanced Intrusion Detection Environment) is a file integrity
@@ -37,7 +34,7 @@ checker and intrusion detection program.
 
 
 %prep
-%setup -q -n %{name}-%{version}rc1
+%setup -q
 %patch1 -p1 -b .man
 %patch2 -p1 -b .fipsfix
 
@@ -46,16 +43,13 @@ checker and intrusion detection program.
 %configure --with-config_file=%{_sysconfdir}/aide.conf \
            --with-zlib \
            --disable-static \
-%if 0%{?rhel} == 0
-           --with-mhash \
-%endif
-           %{?_with_curl} %{?_without_curl} \
            --with-posix-acl \
            --with-selinux \
            --with-xattr \
            --with-e2fsattrs \
            --with-audit
 
+
 make
 
 
@@ -70,15 +64,11 @@ install -p %{SOURCE2} README.quickstart
 mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/logrotate.d
 install -c -m 644 %{SOURCE3} $RPM_BUILD_ROOT%{_sysconfdir}/logrotate.d/aide
 
-%clean
-rm -rf $RPM_BUILD_ROOT
-
 
 %files
-%defattr(0644,root,root,0755)
 %doc AUTHORS COPYING ChangeLog NEWS README doc/manual.html contrib/
 %doc README.quickstart
-%attr(0700,root,root) %{_sbindir}/aide
+%attr(0755,root,root) %{_sbindir}/aide
 %{_mandir}/man1/*
 %{_mandir}/man5/*
 %config(noreplace) %attr(0600,root,root) %{_sysconfdir}/aide.conf
@@ -88,6 +78,15 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Tue Apr 04 2017 Radovan Sroka <rsroka@redhat.com> - 0.16-1
+- rebase to stable v0.16
+- specfile cleanup
+- make doc readable 
+  resolves: #1421355
+- make aide binary runable for any user
+  resolves: #1421351
+
+
 * Fri Feb 10 2017 Fedora Release Engineering <releng@fedoraproject.org> - 0.16-0.3.rc1
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild
 
diff --git a/sources b/sources
index 332fee6..abe8169 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-54d9eb03c91c187b0735b9838a4f1047  aide-0.16rc1.tar.gz
+SHA512 (aide-0.16.tar.gz) = 29ad97756e3e2fb21dc332ed03b494a1c73e621266f8622ec80bdba23092a38ee975b97f3cff2330e4c16e64e2f672259eea9291ca706a4009e7399b4e14e6a7