From 0f06d55fa03c94d69aa4c42227e247098e7d220e Mon Sep 17 00:00:00 2001
From: Michael Schwendt <mschwendt@fedoraproject.org>
Date: Feb 25 2006 21:45:31 +0000
Subject: auto-import aide-0.11-1 on branch devel from aide-0.11-1.src.rpm


---

diff --git a/.cvsignore b/.cvsignore
index 7bf041d..1b607a0 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1 @@
-aide-0.10.tar.gz
+aide-0.11.tar.gz
diff --git a/aide-0.11-no-static.patch b/aide-0.11-no-static.patch
new file mode 100644
index 0000000..83b49eb
--- /dev/null
+++ b/aide-0.11-no-static.patch
@@ -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
diff --git a/aide-useless-includes.patch b/aide-useless-includes.patch
deleted file mode 100644
index 0a2bd11..0000000
--- a/aide-useless-includes.patch
+++ /dev/null
@@ -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@
- 
diff --git a/aide.spec b/aide.spec
index 86cba96..dd8c7de 100644
--- a/aide.spec
+++ b/aide.spec
@@ -1,22 +1,22 @@
+%{?_with_static: %define nostatic 0}
+%{!?_with_static: %define nostatic 1}
+
 Summary: Intrusion detection environment
 Name: aide
-Version: 0.10
-Release: 2
-
+Version: 0.11
+Release: 1
 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
-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
@@ -24,15 +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
@@ -54,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
@@ -63,18 +60,22 @@ 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 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>
 - rebuilt
 
diff --git a/sources b/sources
index 56b6dec..b3534b0 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-39eb7d21064cac7b409c45d038b86cd8  aide-0.10.tar.gz
+9a44e5386b0355ef57c60f627ff4d085  aide-0.11.tar.gz