Version 0.14.2

    * Report correct file type in "Detailed information
      about changes" section
    * Bug fixes

Version 0.14.1
    * Added aide-attributes.sh contrib script
    * Bug fixes

Version 0.14
        * Renewed autoconf mechanism
        * Resolved licensing conflicts
        * New feature to summarize changes
        * Added prelink support
        * Many bugfixes

5 files changed, 61 insertions, 15 deletions

diff --git a/security/aide/Makefile b/security/aide/Makefile
index 9f2873cbb8a..ab5e2920b43 100644
--- a/security/aide/Makefile
+++ b/security/aide/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.30 2010/03/14 13:30:02 pettai Exp $
+# $NetBSD: Makefile,v 1.31 2010/08/30 22:30:27 pettai Exp $
 #
 
-DISTNAME=	aide-0.13.1
+DISTNAME=	aide-0.14.2
 CATEGORIES=	security
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=aide/}
 
diff --git a/security/aide/distinfo b/security/aide/distinfo
index 4e6bc7a5196..83ad9c7beba 100644
--- a/security/aide/distinfo
+++ b/security/aide/distinfo
@@ -1,6 +1,8 @@
-$NetBSD: distinfo,v 1.8 2010/03/14 13:27:10 pettai Exp $
+$NetBSD: distinfo,v 1.9 2010/08/30 22:30:27 pettai Exp $
 
-SHA1 (aide-0.13.1.tar.gz) = 0112ee0a974020b99f09d1f2a9fb05433a7b9681
-RMD160 (aide-0.13.1.tar.gz) = 802ac5bd817032bf3a696db7f547bef322b2487a
-Size (aide-0.13.1.tar.gz) = 285400 bytes
-SHA1 (patch-ab) = 5319904e24a26e67b5a7a8767fca29c34b5a0116
+SHA1 (aide-0.14.2.tar.gz) = 4ef8c0c14d5900d9ea17e6eb156c12a18954a95b
+RMD160 (aide-0.14.2.tar.gz) = f1d17bcbd56b542bbea08f6268e28cac3d86c2c1
+Size (aide-0.14.2.tar.gz) = 418098 bytes
+SHA1 (patch-ab) = d010f24ffefbf9fa72e5eb5bc7560a8d6c1dc7e8
+SHA1 (patch-ae) = 87c234f8d316117cf766134ca69d6f753c59dd91
+SHA1 (patch-af) = 70ac8a100e9d601b7ffcaa9d716742d1d947aca7
diff --git a/security/aide/patches/patch-ab b/security/aide/patches/patch-ab
index b9d2964920d..32519e2f4ac 100644
--- a/security/aide/patches/patch-ab
+++ b/security/aide/patches/patch-ab
@@ -1,8 +1,8 @@
-$NetBSD: patch-ab,v 1.2 2010/03/14 13:27:10 pettai Exp $
+$NetBSD: patch-ab,v 1.3 2010/08/30 22:30:27 pettai Exp $
 
---- configure.orig	2006-12-15 13:56:19.000000000 +0100
-+++ configure	2010-01-25 22:50:46.000000000 +0100
-@@ -3489,10 +3489,6 @@
+--- configure.orig	2010-06-05 22:39:12.000000000 +0200
++++ configure	2010-08-31 00:17:06.000000000 +0200
+@@ -4221,10 +4221,6 @@
  done
  test -n "$YACC" || YACC="yacc"
  
@@ -13,7 +13,7 @@ $NetBSD: patch-ab,v 1.2 2010/03/14 13:27:10 pettai Exp $
  
  
  for ac_prog in flex lex
-@@ -3699,10 +3695,6 @@
+@@ -4384,10 +4380,6 @@
  rm -f conftest.l $LEX_OUTPUT_ROOT.c
  
  fi
@@ -21,6 +21,6 @@ $NetBSD: patch-ab,v 1.2 2010/03/14 13:27:10 pettai Exp $
 -        echo "AIDE requires GNU flex"
 -        exit 5
 -fi
- 
- # Extract the first word of "pkg-config", so it can be a program name with args.
- set dummy pkg-config; ac_word=$2
+ for ac_prog in ld
+ do
+   # Extract the first word of "$ac_prog", so it can be a program name with args.
diff --git a/security/aide/patches/patch-ae b/security/aide/patches/patch-ae
new file mode 100644
index 00000000000..48904b87711
--- /dev/null
+++ b/security/aide/patches/patch-ae
@@ -0,0 +1,13 @@
+$NetBSD: patch-ae,v 1.1 2010/08/30 22:30:27 pettai Exp $
+
+--- contrib/gpg2_check.sh.orig	2010-08-31 00:22:49.000000000 +0200
++++ contrib/gpg2_check.sh	2010-08-31 00:23:06.000000000 +0200
+@@ -17,7 +17,7 @@
+ 		echo ""
+ 	        gpg --verify aide.db.sig
+ 		echo ""
+-		if [ "$?" == "1" ]; then
++		if [ "$?" = "1" ]; then
+ 		    echo "************************************************************"
+ 		    echo "GPG signature FAILED!  Your database has been tampered with!"
+ 		    echo "************************************************************"
diff --git a/security/aide/patches/patch-af b/security/aide/patches/patch-af
new file mode 100644
index 00000000000..a420384cbaa
--- /dev/null
+++ b/security/aide/patches/patch-af
@@ -0,0 +1,31 @@
+$NetBSD: patch-af,v 1.1 2010/08/30 22:30:27 pettai Exp $
+
+--- contrib/gpg2_update.sh.orig	2010-08-31 00:25:16.000000000 +0200
++++ contrib/gpg2_update.sh	2010-08-31 00:26:27.000000000 +0200
+@@ -22,10 +22,10 @@
+ # copy the old database
+ if [ -f aide.db ]; then
+     newfile="aide-`hostname`-`date +%Y%m%d-%H%M%S`.db"
+-    if [ "${usegpg}" == 1 -a -f aide.db.sig ]; then
++    if [ "${usegpg}" = 1 -a -f aide.db.sig ]; then
+         # do an integrity check
+ 	gpg --verify aide.db.sig
+-	if [ "$?" == "1" ]; then
++	if [ "$?" = "1" ]; then
+ 	    echo "************************************************************"
+ 	    echo "GPG signature FAILED!  Your database has been tampered with!"
+ 	    echo "************************************************************"
+@@ -34,11 +34,11 @@
+     fi
+     cp -av aide.db ${newfile} 
+     /usr/sbin/aide --update -B "database=file:/var/lib/aide/${newfile}" 
+-    if [ "${usegpg}" == "1" ]; then
++    if [ "${usegpg}" = "1" ]; then
+ 	# create the signature file
+ 	[[ -f aide.db.sig ]] && rm -f aide.db.sig
+         gpg --detach-sign aide.db
+-	if [ "$?" == "1" ]; then
++	if [ "$?" = "1" ]; then
+ 	    echo "FATAL:  Error occurred when creating the signature file!"
+ 	    exit 1
+ 	fi