rpms/aide/F-13 aide-0.14-dirent.patch, NONE, 1.1 aide.spec, 1.37, 1.38 sources, 1.10, 1.11 aide-0.12-dedosify.patch, 1.1, NONE aide-0.13.1-contextsize.patch, 1.1, NONE aide-0.13.1-libgrypt-init.patch, 1.2, NONE aide-0.13.1-manuals.patch, 1.1, NONE aide-0.13.1-prelink2.patch, 1.1, NONE

[Steve Grubb]

Author: sgrubb

Update of /cvs/pkgs/rpms/aide/F-13
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv378

Modified Files:
	aide.spec sources 
Added Files:
	aide-0.14-dirent.patch 
Removed Files:
	aide-0.12-dedosify.patch aide-0.13.1-contextsize.patch 
	aide-0.13.1-libgrypt-init.patch aide-0.13.1-manuals.patch 
	aide-0.13.1-prelink2.patch 
Log Message:
* Tue Feb 23 2010 Steve Grubb <sgrubb at redhat.com> - 0.14-0.2.rc1
- Fix dirent detection on 64bit systems


aide-0.14-dirent.patch:
 configure.in |    3 +++
 1 file changed, 3 insertions(+)

--- NEW FILE aide-0.14-dirent.patch ---
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 <unistd.h>
@@ -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])


Index: aide.spec
===================================================================
RCS file: /cvs/pkgs/rpms/aide/F-13/aide.spec,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -p -r1.37 -r1.38
--- aide.spec	11 Dec 2009 20:20:45 -0000	1.37
+++ aide.spec	23 Feb 2010 21:18:52 -0000	1.38
@@ -1,27 +1,21 @@
-%{?_with_static: %define nostatic %nil }
-%{!?_with_static: %define nostatic --disable-static }
-
 # segfaults
-%{!?_with_curl: %{!?_without_curl: %define _without_curl --without-curl}}
+%{!?_with_curl: %{!?_without_curl: %global _without_curl --without-curl}}
 
 Summary: Intrusion detection environment
 Name: aide
-Version: 0.13.1
-Release: 15%{?dist}
+Version: 0.14
+Release: 0.2.rc1%{?dist}
 URL: http://sourceforge.net/projects/aide
 License: GPLv2+
 Group: Applications/System
-Source0: http://download.sourceforge.net/aide/aide-%{version}.tar.gz
+Source0: http://download.sourceforge.net/aide/aide-%{version}-rc1.tar.gz
 Source1: aide.conf
 Source2: README.quickstart
-Patch1: aide-0.13.1-contextsize.patch
-Patch2: aide-0.12-dedosify.patch
-Patch3: aide-0.13.1-manuals.patch
-Patch4: aide-0.13.1-prelink2.patch
-Patch5: aide-0.13.1-libgrypt-init.patch
+Source3: aide.logrotate
+Patch1: aide-0.14-dirent.patch
 Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot-%(%{__id_u} -n)
 BuildRequires: mktemp 
-BuildRequires: prelink autoconf automake elfutils-libelf-devel
+BuildRequires: prelink elfutils-libelf-devel
 %if 0%{?rhel} == 0
 Buildrequires: mhash-devel
 %endif
@@ -32,8 +26,7 @@ Buildrequires: audit-libs-devel >= 1.2.8
 %if "%{?_with_curl}x" != "x"
 Buildrequires: curl-devel
 %endif
-#Buildrequires: postgresql-devel libgcrypt-devel
-#(needs --with-psql and -lgcrypt in src/Makefile.in)
+BuildRequires: autoconf automake
 
 %description
 AIDE (Advanced Intrusion Detection Environment) is a file integrity
@@ -41,12 +34,8 @@ checker and intrusion detection program.
 
 
 %prep
-%setup -q
-%patch1 -p1 -b .contextsize
-%patch2 -p1
-%patch3 -p1 -b .manpages
-%patch4 -p1 -b .prelink
-%patch5 -p1 -b .libgcrypt
+%setup -q -n aide-0.14-rc1
+%patch1 -p1
 autoreconf
 
 %build
@@ -66,13 +55,14 @@ make
 
 %install
 rm -rf $RPM_BUILD_ROOT
-%makeinstall bindir=$RPM_BUILD_ROOT%{_sbindir}
+make DESTDIR=$RPM_BUILD_ROOT bindir=%{_sbindir} install
 mkdir -p $RPM_BUILD_ROOT%{_localstatedir}/log/aide
 mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}
 install -p %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}
 mkdir -p -m0700 $RPM_BUILD_ROOT%{_localstatedir}/lib/aide
 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
@@ -86,11 +76,21 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man1/*
 %{_mandir}/man5/*
 %config(noreplace) %attr(0600,root,root) %{_sysconfdir}/aide.conf
+%config(noreplace) %{_sysconfdir}/logrotate.d/aide
 %dir %attr(0700,root,root) %{_localstatedir}/lib/aide
 %dir %attr(0700,root,root) %{_localstatedir}/log/aide
 
 
 %changelog
+* Tue Feb 23 2010 Steve Grubb <sgrubb at redhat.com> - 0.14-0.2.rc1
+- Fix dirent detection on 64bit systems
+
+* Mon Feb 22 2010 Steve Grubb <sgrubb at redhat.com> - 0.14-0.1.rc1
+- New upstream release
+
+* Fri Feb 19 2010 Steve Grubb <sgrubb at redhat.com> - 0.13.1-16
+- Add logrotate script and spec file cleanups
+
 * Fri Dec 11 2009 Steve Grubb <sgrubb at redhat.com> - 0.13.1-15
 - Get rid of .dedosify files
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/aide/F-13/sources,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- sources	5 Jan 2007 22:19:33 -0000	1.10
+++ sources	23 Feb 2010 21:18:52 -0000	1.11
@@ -1,2 +1,2 @@
-eb724c089677d634a02d015ef943522c  aide-0.13.1.tar.gz.asc
-27978cc6bca4f0fbf3f6f5a1b330661c  aide-0.13.1.tar.gz
+5af59a71e77df0f9b444d8e56a044abd  aide-0.14-rc1.tar.gz.asc
+e13d4ef4fbd6558c5026306cba556803  aide-0.14-rc1.tar.gz


--- aide-0.12-dedosify.patch DELETED ---


--- aide-0.13.1-contextsize.patch DELETED ---


--- aide-0.13.1-libgrypt-init.patch DELETED ---


--- aide-0.13.1-manuals.patch DELETED ---


--- aide-0.13.1-prelink2.patch DELETED ---