diff --git a/aide-0.13.1-as-needed.patch b/aide-0.13.1-as-needed.patch new file mode 100644 index 0000000..aa65885 --- /dev/null +++ b/aide-0.13.1-as-needed.patch @@ -0,0 +1,16 @@ +Index: src/Makefile.am +=================================================================== +--- src/Makefile.am.orig 2006-10-27 23:10:38.000000000 +0200 ++++ src/Makefile.am 2009-06-17 19:36:11.000000000 +0200 +@@ -50,9 +50,9 @@ aide_SOURCES = \ + + INCLUDES = -I$(top_srcdir)/include + +-LDADD = -lm @CRYPTLIB@ @ACLLIB@ @SELINUXLIB@ @AUDITLIB@ @ATTRLIB@ ++aide_LDADD = -lm @LDFLAGS@ @CRYPTLIB@ @ACLLIB@ @SELINUXLIB@ @AUDITLIB@ @ATTRLIB@ + +-AM_LDFLAGS = @LDFLAGS@ @LD_STATIC_FLAG@ ++AM_LDFLAGS = @LD_STATIC_FLAG@ + + AM_CFLAGS = @CFLAGS@ @MAINTAINER_MODE_TRUE@ -Wall -g + diff --git a/aide-0.13.1.tar.bz2 b/aide-0.13.1.tar.bz2 new file mode 100644 index 0000000..3f6bb68 --- /dev/null +++ b/aide-0.13.1.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:8b5ffce51d5570eb58f16b8eed86ce4a35614b1fffedc6c1f55f05c44df8e852 +size 238775 diff --git a/aide-0.15-as-needed.patch b/aide-0.15-as-needed.patch deleted file mode 100644 index 8e2ea20..0000000 --- a/aide-0.15-as-needed.patch +++ /dev/null @@ -1,13 +0,0 @@ -Index: aide-0.15/src/Makefile.am -=================================================================== ---- aide-0.15.orig/src/Makefile.am -+++ aide-0.15/src/Makefile.am -@@ -25,7 +25,7 @@ AM_YFLAGS= -d - #AM_LFLAGS= -d - LEX_OUTPUT_ROOT = lex.yy - --LDADD = -lm @CRYPTLIB@ @ACLLIB@ @SELINUXLIB@ @AUDITLIB@ @ATTRLIB@ @E2FSATTRSLIB@ @ELFLIB@ -+LDADD = -lm @LDFLAGS@ @CRYPTLIB@ @ACLLIB@ @SELINUXLIB@ @AUDITLIB@ @ATTRLIB@ @E2FSATTRSLIB@ @ELFLIB@ - AM_CFLAGS = @AIDE_DEFS@ -W -Wall -g - - CLEANFILES = conf_yacc.h conf_yacc.c conf_lex.c db_lex.c *~ diff --git a/aide-0.15.tar.bz2 b/aide-0.15.tar.bz2 deleted file mode 100644 index e9e1089..0000000 --- a/aide-0.15.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:1fa81079ae23cf6538947c5544f194f4960c060b3f70039b31d9d960b8746ca4 -size 341195 diff --git a/aide-version-fix.patch b/aide-version-fix.patch new file mode 100644 index 0000000..e8a829a --- /dev/null +++ b/aide-version-fix.patch @@ -0,0 +1,11 @@ +--- configure.in ++++ configure.in +@@ -573,7 +573,7 @@ + ) + # LDFLAGS=$save_LDFLAGS + AC_DEFINE(WITH_CURL,1,[use curl]) +- compoptionstring="${compoptionstring}WITH_CURL\\n"], ++ compoptionstring="${compoptionstring}WITH_CURL\\n" + fi + + AC_ARG_WITH([gnu-regexp], diff --git a/aide.changes b/aide.changes index 36e1b02..f60d536 100644 --- a/aide.changes +++ b/aide.changes @@ -1,9 +1,3 @@ -------------------------------------------------------------------- -Tue Aug 10 17:12:56 CEST 2010 - meissner@suse.de - -- updated to 0.15 - - lots of fixes and some new stuff - ------------------------------------------------------------------- Fri Apr 30 00:40:34 CEST 2010 - ro@suse.de diff --git a/aide.spec b/aide.spec index 005e71e..569047a 100644 --- a/aide.spec +++ b/aide.spec @@ -22,7 +22,7 @@ Name: aide BuildRequires: bison flex libacl-devel libattr-devel mhash-devel pkg-config zlib-devel BuildRequires: curl-devel libselinux-devel %define prefix /usr -Version: 0.15 +Version: 0.13.1 Release: 52 Summary: Advanced Intrusion Detection Environment License: GPLv2+ @@ -30,7 +30,8 @@ Group: Productivity/Security Source0: http://www.cs.tut.fi/~rammer/aide-%{version}.tar.bz2 Source1: aide.conf Source2: aide-cron_daily.sh -Patch1: aide-0.15-as-needed.patch +Patch: aide-version-fix.patch +Patch1: aide-0.13.1-as-needed.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build Url: http://sourceforge.net/projects/aide/ @@ -45,7 +46,8 @@ Authors: %prep %setup -q -%patch1 -p1 +%patch +%patch1 %build autoreconf -fiv