update to 0.17.3;

delete -Sgit from %autosetup, and delete BuildRequires git
This commit is contained in:
zou_lin77 2021-07-31 10:01:34 +08:00
parent d419ba329a
commit aa6976df81
4 changed files with 11 additions and 43 deletions

Binary file not shown.

BIN
aide-0.17.3.tar.gz Normal file

Binary file not shown.

View File

@ -1,37 +0,0 @@
diff -Nur aide-0.16/include/md.h aide-0.16.new/include/md.h
--- aide-0.16/include/md.h 2016-07-25 22:56:55.000000000 +0200
+++ aide-0.16.new/include/md.h 2018-11-21 14:07:01.347479021 +0100
@@ -48,7 +48,7 @@
#define HASH_GCRYPT_COUNT GCRY_MD_CRC32
#ifndef WITH_MHASH
#define HASH_USE_GCRYPT (DB_MD5|DB_SHA1|DB_RMD160|DB_TIGER|DB_CRC32|\
- DB_HAVAL|DB_CRC32|DB_SHA256|DB_SHA512)
+ DB_CRC32B|DB_SHA256|DB_SHA512)
#endif
#endif
diff -Nur aide-0.16/src/md.c aide-0.16.new/src/md.c
--- aide-0.16/src/md.c 2016-07-25 22:56:55.000000000 +0200
+++ aide-0.16.new/src/md.c 2018-11-21 14:06:05.602295496 +0100
@@ -55,10 +55,12 @@
r=DB_TIGER;
break;
}
+/* until libgcrypt-1.8.4 not implemented yet, see doc/gcrypt.info-1
case GCRY_MD_HAVAL: {
r=DB_HAVAL;
break;
}
+*/
case GCRY_MD_SHA256: {
r=DB_SHA256;
break;
@@ -219,7 +221,7 @@
if(gcry_md_enable(md->mdh,i)==GPG_ERR_NO_ERROR){
md->calc_attr|=h;
} else {
- error(0,"gcry_md_enable %i failed",i);
+ error(0,"gcry_md_enable %i failed, see /usr/include/gcrypt.h enum gcry_md_algos",i);
md->todo_attr&=~h;
}
}

View File

@ -1,5 +1,5 @@
Name: aide Name: aide
Version: 0.16.2 Version: 0.17.3
Release: 1 Release: 1
Summary: Advanced Intrusion Detection Environment Summary: Advanced Intrusion Detection Environment
License: GPLv2+ License: GPLv2+
@ -9,9 +9,7 @@ Source1: aide.conf
Source2: aide.logrotate Source2: aide.logrotate
BuildRequires: gcc make bison flex pcre-devel libgpg-error-devel libgcrypt-devel zlib-devel libcurl-devel 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 BuildRequires: libacl-devel libselinux-devel libattr-devel e2fsprogs-devel audit-libs-devel
Patch0: aide-define_hash_use_gcrypt.patch
%description %description
AIDE (Advanced Intrusion Detection Environment, [eyd]) is a file and directory integrity checker. AIDE (Advanced Intrusion Detection Environment, [eyd]) is a file and directory integrity checker.
@ -21,7 +19,7 @@ Once this database is initialized it can be used to verify the integrity of the
%package_help %package_help
%prep %prep
%autosetup -n %{name}-%{version} -p1 -Sgit %autosetup -n %{name}-%{version} -p1
%build %build
%configure --disable-static --with-config_file=%{_sysconfdir}/aide.conf --with-gcrypt --with-zlib \ %configure --disable-static --with-config_file=%{_sysconfdir}/aide.conf --with-gcrypt --with-zlib \
@ -55,10 +53,17 @@ mkdir -p -m0700 %{buildroot}%{_localstatedir}/lib/aide
%files help %files help
%defattr(-,root,root) %defattr(-,root,root)
%doc NEWS README doc/manual.html %doc NEWS README
%{_mandir}/*/* %{_mandir}/*/*
%changelog %changelog
* Sat Jul 31 2021 zoulin <zoulin13@huawei.com> - 0.17.3-1
- Type:enhancement
- ID:NA
- SUG:NA
- DESC: update to 0.17.3;
delete -Sgit from %autosetup, and delete BuildRequires git
* Wed Jul 29 2020 wangchen <wangchen137@huawei.com> - 0.16.2-1 * Wed Jul 29 2020 wangchen <wangchen137@huawei.com> - 0.16.2-1
- Type:enhancement - Type:enhancement
- ID:NA - ID:NA