auto-import aide-0.11-2 on branch devel from aide-0.11-2.src.rpm

This commit is contained in:
Michael Schwendt 2006-09-11 09:11:31 +00:00
parent 3af9dce65e
commit defbe1130b
6 changed files with 49 additions and 67 deletions

View File

@ -1 +1 @@
aide-0.10.tar.gz
aide-0.11.tar.gz

View File

@ -1,32 +0,0 @@
diff -Nur aide-0.10-orig/configure aide-0.10/configure
--- aide-0.10-orig/configure 2003-11-28 16:14:08.000000000 +0100
+++ aide-0.10/configure 2006-03-02 12:30:37.000000000 +0100
@@ -1720,8 +1720,8 @@
esac
fi
-CFLAGS="$CFLAGS $LD_STATIC_FLAG"
-CPPFLAGS="$CPPFLAGS $LD_STATIC_FLAG"
+#CFLAGS="$CFLAGS $LD_STATIC_FLAG"
+#CPPFLAGS="$CPPFLAGS $LD_STATIC_FLAG"
@@ -3022,7 +3022,7 @@
done
save_LDFLAGS=$LDFLAGS
- LDFLAGS="$LDFLAGS $LD_STATIC_FLAG"
+ #LDFLAGS="$LDFLAGS $LD_STATIC_FLAG"
echo $ac_n "checking for gzdopen in -lz""... $ac_c" 1>&6
echo "configure:3028: checking for gzdopen in -lz" >&5
ac_lib_var=`echo z'_'gzdopen | sed 'y%./+-%__p_%'`
@@ -3798,7 +3798,7 @@
s%@MAINTAINER_MODE_TRUE@%$MAINTAINER_MODE_TRUE%g
s%@MAINTAINER_MODE_FALSE@%$MAINTAINER_MODE_FALSE%g
s%@MAINT@%$MAINT%g
-s%@LD_STATIC_FLAG@%$LD_STATIC_FLAG%g
+s%@LD_STATIC_FLAG@%%g
s%@AIDE_USE_LOCALE@%$AIDE_USE_LOCALE%g
s%@ACLLIB@%$ACLLIB%g
s%@CRYPTLIB@%$CRYPTLIB%g

32
aide-0.11-no-static.patch Normal file
View File

@ -0,0 +1,32 @@
diff -Nur aide-0.11-orig/configure aide-0.11/configure
--- aide-0.11-orig/configure 2006-02-18 13:49:06.000000000 +0100
+++ aide-0.11/configure 2006-02-19 21:05:57.000000000 +0100
@@ -3485,8 +3485,8 @@
esac
fi
-CFLAGS="$CFLAGS $LD_STATIC_FLAG"
-CPPFLAGS="$CPPFLAGS $LD_STATIC_FLAG"
+#CFLAGS="$CFLAGS $LD_STATIC_FLAG"
+#CPPFLAGS="$CPPFLAGS $LD_STATIC_FLAG"
@@ -8638,7 +8638,7 @@
done
save_LDFLAGS=$LDFLAGS
- LDFLAGS="$LDFLAGS $LD_STATIC_FLAG"
+ #LDFLAGS="$LDFLAGS $LD_STATIC_FLAG"
echo "$as_me:$LINENO: checking for gzdopen in -lz" >&5
echo $ECHO_N "checking for gzdopen in -lz... $ECHO_C" >&6
@@ -10424,7 +10424,7 @@
s,@MAINTAINER_MODE_TRUE@,$MAINTAINER_MODE_TRUE,;t t
s,@MAINTAINER_MODE_FALSE@,$MAINTAINER_MODE_FALSE,;t t
s,@MAINT@,$MAINT,;t t
-s,@LD_STATIC_FLAG@,$LD_STATIC_FLAG,;t t
+s,@LD_STATIC_FLAG@,,;t t
s,@CPP@,$CPP,;t t
s,@EGREP@,$EGREP,;t t
s,@AIDE_USE_LOCALE@,$AIDE_USE_LOCALE,;t t

View File

@ -1,11 +0,0 @@
--- aide-0.9/src/Makefile.in.orig 2002-06-06 11:08:32.000000000 +0200
+++ aide-0.9/src/Makefile.in 2002-06-06 11:08:48.000000000 +0200
@@ -98,7 +98,7 @@
aide_SOURCES = conf_yacc.y conf_lex.l getopt.c getopt1.c gnu_regex.c error.c md.c db.c commandconf.c db_file.c db_disk.c db_lex.l db_sql.c gen_list.c list.c do_md.c base64.c symboltable.c compare_db.c be.c util.c aide.c
-INCLUDES = -I$(prefix)/include -I$(top_srcdir)/include
+INCLUDES = -I$(top_srcdir)/include
LDADD = @CRYPTLIB@ @ACLLIB@

View File

@ -3,23 +3,20 @@
Summary: Intrusion detection environment
Name: aide
Version: 0.10
Release: 4%{?dist}
Version: 0.11
Release: 2%{?dist}
URL: http://sourceforge.net/projects/aide
License: GPL
Group: Applications/System
Source: http://download.sourceforge.net/aide/aide-0.10.tar.gz
Source0: http://download.sourceforge.net/aide/aide-%{version}.tar.gz
Source1: aide.conf
Source2: README.quickstart
Patch0: aide-0.10-no-static.patch
Patch1: aide-useless-includes.patch
Patch0: aide-0.11-no-static.patch
Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot-%(%{__id_u} -n)
Buildrequires: mhash-devel zlib-devel
Buildrequires: flex bison
# Red Hat bug #108655, bison requires m4
Buildrequires: m4
# Postgresql support doesn't build.
Buildconflicts: postgresql-devel
#Buildrequires: postgresql-devel libgcrypt-devel
#(needs --with-psql and -lgcrypt in src/Makefile.in)
%description
AIDE (Advanced Intrusion Detection Environment) is a file integrity
@ -27,17 +24,13 @@ checker and intrusion detection program.
%prep
%setup -q -n aide-0.10
%setup -q
%if 0%{nostatic}
%patch0 -p1 -b .no-static
%endif
%patch1 -p1
%build
# Apply RPM_OPT_FLAGS.
perl -pi -e 's/^CFLAGS="\$LD_STATIC_FLAG\"//' configure
perl -pi -e 's/^CPPFLAGS="\$LD_STATIC_FLAG\"//' configure
%configure --with-config_file=%{_sysconfdir}/aide.conf \
--with-zlib \
--with-mhash --enable-mhash
@ -59,8 +52,7 @@ install -p %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}
mkdir -p -m0700 $RPM_BUILD_ROOT%{_localstatedir}/lib/aide
install -p %{SOURCE2} README.quickstart
mkdir -p -m0755 $RPM_BUILD_ROOT%{_mandir}/ru/man{1,5}
install -p -m0644 doc/aide.1.ru $RPM_BUILD_ROOT%{_mandir}/ru/man1/aide.1
install -p -m0644 doc/aide.conf.5.ru $RPM_BUILD_ROOT%{_mandir}/ru/man5/aide.conf.5
%clean
rm -rf $RPM_BUILD_ROOT
@ -68,22 +60,23 @@ rm -rf $RPM_BUILD_ROOT
%files
%defattr(0644,root,root,0755)
%doc AUTHORS COPYING ChangeLog NEWS README ./doc/manual.html
%doc AUTHORS COPYING ChangeLog NEWS README doc/manual.html contrib/
%doc README.quickstart
%attr(0700,root,root) %{_sbindir}/aide
%{_mandir}/man1/*
%{_mandir}/man5/*
%lang(ru) %{_mandir}/ru/man1/aide.1*
%lang(ru) %{_mandir}/ru/man5/aide.conf.5*
%config(noreplace) %attr(0600,root,root) %{_sysconfdir}/aide.conf
%dir %attr(0700,root,root) %{_localstatedir}/lib/aide
%changelog
* Sun Sep 03 2006 Michael Schwendt <mschwendt[AT]users.sf.net>
* Mon Sep 11 2006 Michael Schwendt <mschwendt[AT]users.sf.net> - 0.11-2
- rebuilt
* Thu Mar 2 2006 Michael Schwendt <mschwendt[AT]users.sf.net> - 0.10-3
* Sun Feb 19 2006 Michael Schwendt <mschwendt[AT]users.sf.net> - 0.11-1
- Update to 0.11 release.
- useless-includes patch merged upstream.
- old Russian man pages not available anymore.
- disable static linking.
* Fri Apr 7 2005 Michael Schwendt <mschwendt[AT]users.sf.net>

View File

@ -1 +1 @@
39eb7d21064cac7b409c45d038b86cd8 aide-0.10.tar.gz
9a44e5386b0355ef57c60f627ff4d085 aide-0.11.tar.gz