From 01c27d6fc4cd05a3550ea86d4401d3dde693910a Mon Sep 17 00:00:00 2001 From: Steve Grubb Date: Feb 23 2010 21:09:16 +0000 Subject: - Fix dirent detection on 64bit systems --- diff --git a/aide-0.14-dirent.patch b/aide-0.14-dirent.patch new file mode 100644 index 0000000..8d0cbe2 --- /dev/null +++ b/aide-0.14-dirent.patch @@ -0,0 +1,20 @@ +diff -u aide.orig/configure.in aide/configure.in +--- aide.orig/configure.in 2010-02-23 13:11:24.000000000 -0500 ++++ aide/configure.in 2010-02-23 13:57:57.000000000 -0500 +@@ -568,6 +568,8 @@ + compoptionstring="${compoptionstring}WITH_READDIR\\n"] + ) + ++saved_CFLAGS="$CFLAGS" ++CFLAGS+=" $AIDE_DEFS" + AC_CACHE_CHECK([for LFS ino_t],AIDE_INO_TYPE,[ + AC_TRY_RUN([ + #include +@@ -598,6 +600,7 @@ + AIDE_INO_TYPE=ino_t + AIDE_DIRENT_TYPE=dirent + fi ++CFLAGS="$saved_CFLAGS" + + AC_DEFINE_UNQUOTED(AIDE_LSTAT_FUNC,$AIDE_LSTAT_FUNC,[lstat]) + AC_DEFINE_UNQUOTED(AIDE_STAT_FUNC,$AIDE_STAT_FUNC,[stat]) diff --git a/aide.spec b/aide.spec index 7a74a7f..ddd57df 100644 --- a/aide.spec +++ b/aide.spec @@ -4,7 +4,7 @@ Summary: Intrusion detection environment Name: aide Version: 0.14 -Release: 0.1.rc1%{?dist} +Release: 0.2.rc1%{?dist} URL: http://sourceforge.net/projects/aide License: GPLv2+ Group: Applications/System @@ -12,6 +12,7 @@ Source0: http://download.sourceforge.net/aide/aide-%{version}-rc1.tar.gz Source1: aide.conf Source2: README.quickstart Source3: aide.logrotate +Patch1: aide-0.14-dirent.patch Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot-%(%{__id_u} -n) BuildRequires: mktemp BuildRequires: prelink elfutils-libelf-devel @@ -25,6 +26,7 @@ Buildrequires: audit-libs-devel >= 1.2.8-2 %if "%{?_with_curl}x" != "x" Buildrequires: curl-devel %endif +BuildRequires: autoconf automake %description AIDE (Advanced Intrusion Detection Environment) is a file integrity @@ -33,6 +35,8 @@ checker and intrusion detection program. %prep %setup -q -n aide-0.14-rc1 +%patch1 -p1 +autoreconf %build %configure --with-config_file=%{_sysconfdir}/aide.conf \ @@ -78,6 +82,9 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Tue Feb 23 2010 Steve Grubb - 0.14-0.2.rc1 +- Fix dirent detection on 64bit systems + * Mon Feb 22 2010 Steve Grubb - 0.14-0.1.rc1 - New upstream release