auto-import aide-0.10-3 on branch devel from aide-0.10-3.src.rpm

temporarily revert devel to FE4 aide for flex devel build test
2006-03-02 12:22:25 +00:00 · 2006-03-02 12:22:25 +00:00 · 59aeff87aa
commit 59aeff87aa
parent feaabd5feb
7 changed files with 66 additions and 75 deletions
--- a/.cvsignore
+++ b/.cvsignore
@ -1,2 +1 @@
-aide-0.11.tar.gz
-aide-0.11.tar.gz.asc
+aide-0.10.tar.gz
--- a/aide-0.10-no-static.patch
+++ b/aide-0.10-no-static.patch
@ -0,0 +1,32 @@
+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
--- a/aide-0.11-man-page.patch
+++ b/aide-0.11-man-page.patch
@ -1,20 +0,0 @@
-diff -Nur aide-0.11-orig/doc/aide.1.in aide-0.11/doc/aide.1.in
--- aide-0.11-orig/doc/aide.1.in	2005-07-02 01:10:41.000000000 +0200
-+++ aide-0.11/doc/aide.1.in	2006-02-26 13:48:28.000000000 +0100
-@@ -48,11 +48,13 @@
- Prints out the standard help message.
- .PP
- .SH FILES
-.B @prefix@/etc/aide.conf
-+.B /etc/aide.conf
- Default aide configuration file.
-.B @prefix@/etc/aide.db
-+.PP
-+.B @localstatedir@/lib/aide.db
- Default aide database.
-.B @prefix@/etc/aide.db.new
-+.PP
-+.B @localstatedir@/lib/aide.db.new
- Default aide output database.
- .SH SEE ALSO
- .BR aide.conf (5)
--- a/aide-0.11-no-static.patch
+++ b/aide-0.11-no-static.patch
@ -1,32 +0,0 @@
-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
--- a/aide-useless-includes.patch
+++ b/aide-useless-includes.patch
@ -0,0 +1,11 @@
+--- 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@
+ 
--- a/aide.spec
+++ b/aide.spec
@ -3,21 +3,23 @@

 Summary: Intrusion detection environment
 Name: aide
-Version: 0.11
-Release: 1
+Version: 0.10
+Release: 3
 URL: http://sourceforge.net/projects/aide
 License: GPL
 Group: Applications/System
-Source0: http://download.sourceforge.net/aide/aide-%{version}.tar.gz
+Source: http://download.sourceforge.net/aide/aide-0.10.tar.gz
 Source1: aide.conf
 Source2: README.quickstart
-Patch0: aide-0.11-no-static.patch
-Patch1: aide-0.11-man-page.patch
+Patch0: aide-0.10-no-static.patch
+Patch1: aide-useless-includes.patch
 Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot-%(%{__id_u} -n)
 Buildrequires: mhash-devel zlib-devel
 Buildrequires: flex bison
-#Buildrequires: postgresql-devel libgcrypt-devel
-#(needs --with-psql and -lgcrypt in src/Makefile.in)
+# Red Hat bug #108655, bison requires m4
+Buildrequires: m4
+# Postgresql support doesn't build.
+Buildconflicts: postgresql-devel

 %description
 AIDE (Advanced Intrusion Detection Environment) is a file integrity
@ -25,14 +27,17 @@ checker and intrusion detection program.


 %prep
-%setup -q
+%setup -q -n aide-0.10
 %if 0%{nostatic}
 %patch0 -p1 -b .no-static
 %endif
-%patch1 -p1 -b .man-page
-
+%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
@ -54,7 +59,8 @@ 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
@ -62,23 +68,19 @@ rm -rf $RPM_BUILD_ROOT

 %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
 %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 Feb 26 2006 Michael Schwendt <mschwendt[AT]users.sf.net>
- Fix wrong paths in manual page.
-
-* 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.
+* Thu Mar  2 2006 Michael Schwendt <mschwendt[AT]users.sf.net> - 0.10-3
 - disable static linking.

 * Fri Apr  7 2005 Michael Schwendt <mschwendt[AT]users.sf.net>
--- a/3
+++ b/3
@ -1,2 +1 @@
-9a44e5386b0355ef57c60f627ff4d085  aide-0.11.tar.gz
-866e2aa9f694c0822ddba3a5375c0f7c  aide-0.11.tar.gz.asc
+39eb7d21064cac7b409c45d038b86cd8  aide-0.10.tar.gz