Fix Makefile, supply dbhmackey, drop db_lex.c from patch

aide/aide.patch

@@ -1,6 +1,10 @@
-diff -X aide.exclude -u -r aide-0.9/config.h.in aide-0.9m/config.h.in
+Only in aide-0.9x: Makefile
+Only in aide-0.9x: aide.spec
+Only in aide-0.9x: autom4te.cache
+Only in aide-0.9x: config.h
+diff -r -u aide-0.9/config.h.in aide-0.9x/config.h.in
 --- aide-0.9/config.h.in	Tue Jun  4 10:31:20 2002
-+++ aide-0.9m/config.h.in	Mon Oct 21 15:31:02 2002
++++ aide-0.9x/config.h.in	Mon Oct 21 15:31:02 2002
 @@ -129,6 +129,9 @@
  /* Define if you have the stricmp function.  */
  #undef HAVE_STRICMP
@@ -11,9 +15,11 @@ diff -X aide.exclude -u -r aide-0.9/config.h.in aide-0.9m/config.h.in
  /* Define if you have the ustat function.  */
  #undef HAVE_USTAT
  
-diff -X aide.exclude -u -r aide-0.9/configure aide-0.9m/configure
+Only in aide-0.9x: config.log
+Only in aide-0.9x: config.status
+diff -r -u aide-0.9/configure aide-0.9x/configure
 --- aide-0.9/configure	Tue Jun  4 10:31:27 2002
-+++ aide-0.9m/configure	Mon Oct 21 16:30:25 2002
++++ aide-0.9x/configure	Fri Nov 15 09:11:34 2002
 @@ -1,83 +1,310 @@
  #! /bin/sh
 -
@@ -10247,9 +10253,9 @@ diff -X aide.exclude -u -r aide-0.9/configure aide-0.9m/configure
 +fi
  
  
-diff -X aide.exclude -u -r aide-0.9/configure.in aide-0.9m/configure.in
+diff -r -u aide-0.9/configure.in aide-0.9x/configure.in
 --- aide-0.9/configure.in	Fri May 31 14:47:07 2002
-+++ aide-0.9m/configure.in	Mon Oct 21 16:30:12 2002
++++ aide-0.9x/configure.in	Fri Nov 15 09:11:24 2002
 @@ -184,7 +184,7 @@
  AC_CHECK_SIZEOF(unsigned long, 4)
  
@@ -10339,9 +10345,11 @@ diff -X aide.exclude -u -r aide-0.9/configure.in aide-0.9m/configure.in
    [with_gcrypt=no])
  
  AC_CHECK_LIB(mhash,mhash_get_block_size,
-diff -X aide.exclude -u -r aide-0.9/include/util.h aide-0.9m/include/util.h
+Only in aide-0.9x/doc: Makefile
+Only in aide-0.9x/doc: aide.conf
+diff -r -u aide-0.9/include/util.h aide-0.9x/include/util.h
 --- aide-0.9/include/util.h	Wed May 29 10:04:26 2002
-+++ aide-0.9m/include/util.h	Mon Oct 21 16:31:03 2002
++++ aide-0.9x/include/util.h	Mon Oct 21 16:31:03 2002
 @@ -57,6 +57,8 @@
  
  void init_sighandler(void);
@@ -10351,9 +10359,35 @@ diff -X aide.exclude -u -r aide-0.9/include/util.h aide-0.9m/include/util.h
 +#endif
  
  #endif
-diff -X aide.exclude -u -r aide-0.9/src/conf_yacc.y aide-0.9m/src/conf_yacc.y
+Only in aide-0.9x/po: Makefile
+Only in aide-0.9x/src: Makefile
+diff -r -u aide-0.9/src/Makefile.am aide-0.9x/src/Makefile.am
+--- aide-0.9/src/Makefile.am	Wed Mar  6 14:12:12 2002
++++ aide-0.9x/src/Makefile.am	Fri Nov 15 09:12:05 2002
+@@ -46,7 +46,7 @@
+ 		util.c		\
+ 		aide.c
+ 
+-INCLUDES = -I$(prefix)/include -I$(top_srcdir)/include
++INCLUDES = -I$(top_srcdir)/include -I$(prefix)/include
+ 
+ LDADD = @CRYPTLIB@ @ACLLIB@
+ 
+diff -r -u aide-0.9/src/Makefile.in aide-0.9x/src/Makefile.in
+--- aide-0.9/src/Makefile.in	Tue Jun  4 10:33:26 2002
++++ aide-0.9x/src/Makefile.in	Fri Nov 15 09:01:44 2002
+@@ -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 -I$(prefix)/include
+ 
+ LDADD = @CRYPTLIB@ @ACLLIB@
+ 
+diff -r -u aide-0.9/src/conf_yacc.y aide-0.9x/src/conf_yacc.y
 --- aide-0.9/src/conf_yacc.y	Wed May 29 10:04:27 2002
-+++ aide-0.9m/src/conf_yacc.y	Mon Oct 21 16:15:54 2002
++++ aide-0.9x/src/conf_yacc.y	Mon Oct 21 16:15:54 2002
 @@ -180,7 +180,7 @@
  	    conferror("Error in expression");
  	    YYABORT;
@@ -10419,149 +10453,10 @@ diff -X aide.exclude -u -r aide-0.9/src/conf_yacc.y aide-0.9m/src/conf_yacc.y
  
  %%
  
-diff -X aide.exclude -u -r aide-0.9/src/db_lex.c aide-0.9m/src/db_lex.c
---- aide-0.9/src/db_lex.c	Tue Jun  4 10:32:50 2002
-+++ aide-0.9m/src/db_lex.c	Mon Oct 21 16:31:17 2002
-@@ -412,9 +412,9 @@
- #define YY_MORE_ADJ 0
- #define YY_RESTORE_YY_MORE_OFFSET
- char *yytext;
--#line 1 "/opt/rammer/cvs/tmp/aide2/src/db_lex.l"
-+#line 1 "/u/mlelstv/proj/aide-0.9/src/db_lex.l"
- #define INITIAL 0
--#line 5 "/opt/rammer/cvs/tmp/aide2/src/db_lex.l"
-+#line 5 "/u/mlelstv/proj/aide-0.9/src/db_lex.l"
- 
- /*
- C	[a-zA-Z0-9öäåÖÄÅ\\\*=$%£&/!\^\~;:.,\?\{\}\(\)\[\]\<\>\-\+\*\|\'\`]
-@@ -644,7 +644,7 @@
- 	register char *yy_cp, *yy_bp;
- 	register int yy_act;
- 
--#line 83 "/opt/rammer/cvs/tmp/aide2/src/db_lex.l"
-+#line 83 "/u/mlelstv/proj/aide-0.9/src/db_lex.l"
- 
- 
- #line 651 "db_lex.c"
-@@ -733,28 +733,28 @@
- 
- case 1:
- YY_RULE_SETUP
--#line 85 "/opt/rammer/cvs/tmp/aide2/src/db_lex.l"
-+#line 85 "/u/mlelstv/proj/aide-0.9/src/db_lex.l"
- {
-   return (TGZIPHEADER);
- }
- 	YY_BREAK
- case 2:
- YY_RULE_SETUP
--#line 89 "/opt/rammer/cvs/tmp/aide2/src/db_lex.l"
-+#line 89 "/u/mlelstv/proj/aide-0.9/src/db_lex.l"
- {
-   return (TDBSPEC);
- }
- 	YY_BREAK
- case 3:
- YY_RULE_SETUP
--#line 93 "/opt/rammer/cvs/tmp/aide2/src/db_lex.l"
-+#line 93 "/u/mlelstv/proj/aide-0.9/src/db_lex.l"
- {
-   return (TBEGIN_DB);
- }
- 	YY_BREAK
- case 4:
- YY_RULE_SETUP
--#line 97 "/opt/rammer/cvs/tmp/aide2/src/db_lex.l"
-+#line 97 "/u/mlelstv/proj/aide-0.9/src/db_lex.l"
- {
-   BEGIN MDVALHUNT;
-   return (TEND_DB);
-@@ -762,7 +762,7 @@
- 	YY_BREAK
- case 5:
- YY_RULE_SETUP
--#line 102 "/opt/rammer/cvs/tmp/aide2/src/db_lex.l"
-+#line 102 "/u/mlelstv/proj/aide-0.9/src/db_lex.l"
- {
-   BEGIN 0;
-   return (TSTRING);
-@@ -770,21 +770,21 @@
- 	YY_BREAK
- case 6:
- YY_RULE_SETUP
--#line 107 "/opt/rammer/cvs/tmp/aide2/src/db_lex.l"
-+#line 107 "/u/mlelstv/proj/aide-0.9/src/db_lex.l"
- {
-   return (TUNKNOWN);
- }
- 	YY_BREAK
- case 7:
- YY_RULE_SETUP
--#line 111 "/opt/rammer/cvs/tmp/aide2/src/db_lex.l"
-+#line 111 "/u/mlelstv/proj/aide-0.9/src/db_lex.l"
- {
-   (*db_lineno)++;
- }
- 	YY_BREAK
- case 8:
- YY_RULE_SETUP
--#line 115 "/opt/rammer/cvs/tmp/aide2/src/db_lex.l"
-+#line 115 "/u/mlelstv/proj/aide-0.9/src/db_lex.l"
- {
- 
-  error(230," %s \n",yytext);
-@@ -794,12 +794,12 @@
- 	YY_BREAK
- case 9:
- YY_RULE_SETUP
--#line 122 "/opt/rammer/cvs/tmp/aide2/src/db_lex.l"
-+#line 122 "/u/mlelstv/proj/aide-0.9/src/db_lex.l"
- {}
- 	YY_BREAK
- case 10:
- YY_RULE_SETUP
--#line 124 "/opt/rammer/cvs/tmp/aide2/src/db_lex.l"
-+#line 124 "/u/mlelstv/proj/aide-0.9/src/db_lex.l"
- {
-  (*db_lineno)++;
-  return (TNEWLINE);
-@@ -807,21 +807,21 @@
- 	YY_BREAK
- case 11:
- YY_RULE_SETUP
--#line 129 "/opt/rammer/cvs/tmp/aide2/src/db_lex.l"
-+#line 129 "/u/mlelstv/proj/aide-0.9/src/db_lex.l"
- {
-  return (TERROR);
- }
- 	YY_BREAK
- case YY_STATE_EOF(INITIAL):
- case YY_STATE_EOF(MDVALHUNT):
--#line 133 "/opt/rammer/cvs/tmp/aide2/src/db_lex.l"
-+#line 133 "/u/mlelstv/proj/aide-0.9/src/db_lex.l"
- {
- 	return (TEOF);
- 	}
- 	YY_BREAK
- case 12:
- YY_RULE_SETUP
--#line 138 "/opt/rammer/cvs/tmp/aide2/src/db_lex.l"
-+#line 138 "/u/mlelstv/proj/aide-0.9/src/db_lex.l"
- ECHO;
- 	YY_BREAK
- #line 828 "db_lex.c"
-@@ -1710,7 +1710,7 @@
- 	return 0;
- 	}
- #endif
--#line 138 "/opt/rammer/cvs/tmp/aide2/src/db_lex.l"
-+#line 138 "/u/mlelstv/proj/aide-0.9/src/db_lex.l"
- 
- 
- int dbwrap(){
-diff -X aide.exclude -u -r aide-0.9/src/util.c aide-0.9m/src/util.c
+Only in aide-0.9/src: db_lex.c
+diff -r -u aide-0.9/src/util.c aide-0.9x/src/util.c
 --- aide-0.9/src/util.c	Wed May 29 10:04:27 2002
-+++ aide-0.9m/src/util.c	Mon Oct 21 16:31:15 2002
++++ aide-0.9x/src/util.c	Mon Oct 21 16:31:15 2002
 @@ -356,7 +356,7 @@
    return;
  }
@@ -10579,3 +10474,4 @@ diff -X aide.exclude -u -r aide-0.9/src/util.c aide-0.9m/src/util.c
  
  /* We need these dummy stubs to fool the linker into believing that
     we do not need them at link time */
+Only in aide-0.9x: stamp-h

aide/aide.spec

@@ -33,7 +33,7 @@ Distribution: OpenPKG [EVAL]
 Group:        Security
 License:      GPL
 Version:      0.9
-Release:      20021025
+Release:      20021115
 
 #   list of sources
 Source0:      http://www.cs.tut.fi/~rammer/aide-0.9.tar.gz
@@ -58,7 +58,9 @@ AutoReqProv:  no
     CC="%{l_cc}" \
     CFLAGS="%{l_cflags -O}" \
     ./configure \
-        --prefix=%{l_prefix}
+        --prefix=%{l_prefix} \
+        --with-dbhmactype=sha1 \
+        --with-dbhmackey=T3BlblBLRyBNYWludGFpbmVy
     %{l_make} %{l_mflags -O}
 
 %install