Update 0.7 --> 0.9

The aide database was in /var/adm/aide and is now in /var/db/aide. /var/adm
is a SYSV directory that does not exist on FreeBSD.

5 files changed, 40 insertions, 31 deletions

diff --git a/security/aide/files/aide.conf.freebsd b/security/aide/files/aide.conf.freebsd
index ee4d14b64c37..5cd10fe5a6fe 100644
--- a/security/aide/files/aide.conf.freebsd
+++ b/security/aide/files/aide.conf.freebsd
@@ -72,8 +72,8 @@
 # details.)
 #
 
-database=file:///var/adm/aide/databases/aide.db
-database_out=file:///var/adm/aide/databases/aide.db.new
+database=file:///var/db/aide/databases/aide.db
+database_out=file:///var/db/aide/databases/aide.db.new
 
 
 #  First, root's traditional "home".  Note that FreeBSD's root's home (/root)
diff --git a/security/aide/files/patch-aa b/security/aide/files/patch-aa
deleted file mode 100644
index 4ad347bc404a..000000000000
--- a/security/aide/files/patch-aa
+++ /dev/null
@@ -1,29 +0,0 @@
---- src/db_file.c.orig	Thu Apr 20 05:44:56 2000
-+++ src/db_file.c	Thu Jun  6 16:56:48 2002
-@@ -212,7 +212,7 @@
- 	if((retval=fork())==0){
- 	  /* The child process */
- 	  close(pipefd[0]);
--	  conf->db_gzin=gzdopen(fileno(conf->db_in),"rb");
-+	  conf->db_gzin=gzdopen(fileno((FILE *)conf->db_in),"rb");
- 	  /* WARNING This causes weird problems. Don't do it.
- 	     fclose(conf->db_in);
- 	  */
-@@ -447,7 +447,7 @@
-   }
- 
-   if(tmpstr){
--    retval=fprintf(file,tmpstr);
-+    retval=fprintf(file,"%s",tmpstr);
-     free(tmpstr);
-     return retval;
-   }else {
-@@ -484,7 +484,7 @@
- 
- 
-   tmpstr=encode_base64(ptr,strlen(ptr));
--  retval=fprintf(file,tmpstr);
-+  retval=fprintf(file,"%s",tmpstr);
-   free(tmpstr);
-   free(ptr);
- 
diff --git a/security/aide/files/patch-configure b/security/aide/files/patch-configure
new file mode 100644
index 000000000000..01cc535cc2c2
--- /dev/null
+++ b/security/aide/files/patch-configure
@@ -0,0 +1,11 @@
+--- configure.orig	Tue Jun  4 01:31:27 2002
++++ configure	Fri Jul 12 06:13:48 2002
+@@ -2838,7 +2838,7 @@
+ EOF
+ 
+   cat >> confdefs.h <<EOF
+-#define AIDE_BLKCNT_TYPE blkcnt_t
++#define AIDE_BLKCNT_TYPE int32_t
+ EOF
+ 
+   compoptionstring="${compoptionstring}WITH_LSTAT\\n"
diff --git a/security/aide/files/patch-include::util.h b/security/aide/files/patch-include::util.h
new file mode 100644
index 000000000000..229ce8bbbed6
--- /dev/null
+++ b/security/aide/files/patch-include::util.h
@@ -0,0 +1,9 @@
+--- include/util.h.orig	Wed May 29 01:04:26 2002
++++ include/util.h	Fri Jul 12 06:17:39 2002
+@@ -57,6 +57,4 @@
+ 
+ void init_sighandler(void);
+ 
+-char* strnstr(char* haystack,char* needle,int n);
+-
+ #endif
diff --git a/security/aide/files/patch-src::util.c b/security/aide/files/patch-src::util.c
new file mode 100644
index 000000000000..4a8e6d70efad
--- /dev/null
+++ b/security/aide/files/patch-src::util.c
@@ -0,0 +1,18 @@
+--- src/util.c.orig	Wed May 29 01:04:27 2002
++++ src/util.c	Tue Oct 29 04:03:55 2002
+@@ -357,6 +357,7 @@
+ }
+ 
+ 
++#if 0
+ /* Like strstr but only do search for maximum of n chars.
+    haystack does not have to be NULL terminated
+    needle has to be NULL terminated. NULL in needle is not used in compare.
+@@ -392,6 +393,7 @@
+   /* If we get this far no match was found so we return NULL */
+   return NULL;
+ }
++#endif /* 0 */
+ 
+ /* We need these dummy stubs to fool the linker into believing that
+    we do not need them at link time */