Rebase to stable v0.16

- specfile cleanup
- make doc readable
  resolves: #1421355
- make aide binary runable for any user
  resolves: #1421351
This commit is contained in:
Radovan Sroka 2017-04-04 14:28:53 +02:00
parent 8f06c75334
commit f9ac10a71e
3 changed files with 27 additions and 27 deletions

1
.gitignore vendored
View File

@ -12,3 +12,4 @@ aide-0.14.tar.gz.asc
/aide-0.15.1.tar.gz.asc /aide-0.15.1.tar.gz.asc
/aide-0.16b1.tar.gz /aide-0.16b1.tar.gz
/aide-0.16rc1.tar.gz /aide-0.16rc1.tar.gz
/aide-0.16.tar.gz

View File

@ -1,35 +1,32 @@
# segfaults
%{!?_with_curl: %{!?_without_curl: %global _without_curl --without-curl}}
Summary: Intrusion detection environment Summary: Intrusion detection environment
Name: aide Name: aide
Version: 0.16 Version: 0.16
Release: 0.3.rc1%{?dist} Release: 1%{?dist}
URL: http://sourceforge.net/projects/%{name} URL: http://sourceforge.net/projects/%{name}
License: GPLv2+ License: GPLv2+
Group: Applications/System 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 Source1: aide.conf
Source2: README.quickstart Source2: README.quickstart
Source3: aide.logrotate 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: mktemp
BuildRequires: elfutils-libelf-devel BuildRequires: elfutils-libelf-devel
%if 0%{?rhel} == 0
Buildrequires: mhash-devel
%endif
Buildrequires: zlib-devel libgcrypt-devel Buildrequires: zlib-devel libgcrypt-devel
Buildrequires: flex bison Buildrequires: flex bison
Buildrequires: libattr-devel e2fsprogs-devel Buildrequires: libattr-devel e2fsprogs-devel
Buildrequires: libacl-devel libselinux-devel Buildrequires: libacl-devel libselinux-devel
Buildrequires: audit-libs-devel >= 1.2.8-2 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 %description
AIDE (Advanced Intrusion Detection Environment) is a file integrity AIDE (Advanced Intrusion Detection Environment) is a file integrity
@ -37,7 +34,7 @@ checker and intrusion detection program.
%prep %prep
%setup -q -n %{name}-%{version}rc1 %setup -q
%patch1 -p1 -b .man %patch1 -p1 -b .man
%patch2 -p1 -b .fipsfix %patch2 -p1 -b .fipsfix
@ -46,16 +43,13 @@ checker and intrusion detection program.
%configure --with-config_file=%{_sysconfdir}/aide.conf \ %configure --with-config_file=%{_sysconfdir}/aide.conf \
--with-zlib \ --with-zlib \
--disable-static \ --disable-static \
%if 0%{?rhel} == 0
--with-mhash \
%endif
%{?_with_curl} %{?_without_curl} \
--with-posix-acl \ --with-posix-acl \
--with-selinux \ --with-selinux \
--with-xattr \ --with-xattr \
--with-e2fsattrs \ --with-e2fsattrs \
--with-audit --with-audit
make make
@ -70,15 +64,11 @@ install -p %{SOURCE2} README.quickstart
mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/logrotate.d mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/logrotate.d
install -c -m 644 %{SOURCE3} $RPM_BUILD_ROOT%{_sysconfdir}/logrotate.d/aide install -c -m 644 %{SOURCE3} $RPM_BUILD_ROOT%{_sysconfdir}/logrotate.d/aide
%clean
rm -rf $RPM_BUILD_ROOT
%files %files
%defattr(0644,root,root,0755)
%doc AUTHORS COPYING ChangeLog NEWS README doc/manual.html contrib/ %doc AUTHORS COPYING ChangeLog NEWS README doc/manual.html contrib/
%doc README.quickstart %doc README.quickstart
%attr(0700,root,root) %{_sbindir}/aide %attr(0755,root,root) %{_sbindir}/aide
%{_mandir}/man1/* %{_mandir}/man1/*
%{_mandir}/man5/* %{_mandir}/man5/*
%config(noreplace) %attr(0600,root,root) %{_sysconfdir}/aide.conf %config(noreplace) %attr(0600,root,root) %{_sysconfdir}/aide.conf
@ -88,6 +78,15 @@ rm -rf $RPM_BUILD_ROOT
%changelog %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 * 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 - Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild

View File

@ -1 +1 @@
54d9eb03c91c187b0735b9838a4f1047 aide-0.16rc1.tar.gz SHA512 (aide-0.16.tar.gz) = 29ad97756e3e2fb21dc332ed03b494a1c73e621266f8622ec80bdba23092a38ee975b97f3cff2330e4c16e64e2f672259eea9291ca706a4009e7399b4e14e6a7