Fix const violation. Fix delete on array. Request kernel types on

NetBSD. Bump revision. Don't fix cheese-style memory leaks.

4 files changed, 40 insertions, 13 deletions

diff --git a/filesystems/fuse-loggedfs/Makefile b/filesystems/fuse-loggedfs/Makefile
index cbd36fbe1fa..0e6d14454d1 100644
--- a/filesystems/fuse-loggedfs/Makefile
+++ b/filesystems/fuse-loggedfs/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.6 2012/10/03 16:08:32 asau Exp $
+# $NetBSD: Makefile,v 1.7 2016/03/01 20:16:17 joerg Exp $
 #
 
 DISTNAME=	loggedfs-0.4
 PKGNAME=	fuse-${DISTNAME}
-PKGREVISION=	2
+PKGREVISION=	3
 CATEGORIES=	filesystems
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=loggedfs/}
 EXTRACT_SUFX=	.tar.bz2
@@ -12,6 +12,8 @@ MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	${MASTER_SITE_SOURCEFORGE:=loggedfs/}
 COMMENT=	FUSE file system which logs all operations
 
+CPPFLAGS.NetBSD+=	-D_KERNTYPES
+
 .if exists(/usr/include/sys/statvfs.h)
 CPPFLAGS+=	-DHAVE_SYS_STATVFS_H
 .endif
diff --git a/filesystems/fuse-loggedfs/distinfo b/filesystems/fuse-loggedfs/distinfo
index 4902cdab7c2..c273b8cf9f1 100644
--- a/filesystems/fuse-loggedfs/distinfo
+++ b/filesystems/fuse-loggedfs/distinfo
@@ -1,8 +1,9 @@
-$NetBSD: distinfo,v 1.3 2015/11/03 00:15:01 agc Exp $
+$NetBSD: distinfo,v 1.4 2016/03/01 20:16:17 joerg Exp $
 
 SHA1 (loggedfs-0.4.tar.bz2) = a20eae4c035e5eeaec066d5b5d14b42dac2b2189
 RMD160 (loggedfs-0.4.tar.bz2) = e2ad904e70fec7c9a188f2bc5d6528adfcb104f2
 SHA512 (loggedfs-0.4.tar.bz2) = 146d9a8aed71870cba0fe7463e43ac07056f83e8227437aca79fdaee18a535ff50c8ec4be8c11528a12f4fb3249d81af01e1fad3cd3bdfde245e29feae23d7c5
 Size (loggedfs-0.4.tar.bz2) = 14851 bytes
-SHA1 (patch-aa) = 58eeb1ac9db64605e96fa8bc63de2f1f5c398b0c
+SHA1 (patch-aa) = 8d9b6b4ad40e0d8c9c8693746d6fc888002eb4c5
 SHA1 (patch-ab) = d2075babb5997b8b64ec94fce79903a6d0ae55bc
+SHA1 (patch-src_Config.cpp) = b49e9a8cbb76259e708cfb5bdd3980fecb6bebd7
diff --git a/filesystems/fuse-loggedfs/patches/patch-aa b/filesystems/fuse-loggedfs/patches/patch-aa
index b4b334f7395..dc899f85cfc 100644
--- a/filesystems/fuse-loggedfs/patches/patch-aa
+++ b/filesystems/fuse-loggedfs/patches/patch-aa
@@ -1,7 +1,7 @@
-$NetBSD: patch-aa,v 1.1.1.1 2007/06/11 20:13:27 agc Exp $
+$NetBSD: patch-aa,v 1.2 2016/03/01 20:16:17 joerg Exp $
 
---- src/loggedfs.cpp	2007/02/21 21:49:53	1.1
-+++ src/loggedfs.cpp	2007/02/21 21:51:15
+--- src/loggedfs.cpp.orig	2007-01-23 21:05:11.000000000 +0000
++++ src/loggedfs.cpp
 @@ -30,7 +30,11 @@
  #include <fcntl.h>
  #include <dirent.h>
@@ -14,7 +14,7 @@ $NetBSD: patch-aa,v 1.1.1.1 2007/06/11 20:13:27 agc Exp $
  #ifdef HAVE_SETXATTR
  #include <sys/xattr.h>
  #endif
-@@ -85,12 +89,14 @@
+@@ -85,12 +89,14 @@ static bool isAbsolutePath( const char *
  
  static char* getAbsolutePath(const char *path)
  {
@@ -34,7 +34,16 @@ $NetBSD: patch-aa,v 1.1.1.1 2007/06/11 20:13:27 agc Exp $
      return realPath;
  
  }
-@@ -156,7 +162,7 @@
+@@ -121,7 +127,7 @@ static char* getcallername()
+ 
+ static void loggedfs_log(const char* path,const char* action,const int returncode,const char *format,...)
+ {
+-    char *retname;
++    const char *retname;
+     if (returncode >= 0)
+         retname = "SUCCESS";
+     else
+@@ -156,7 +162,7 @@ static int loggedFS_getattr(const char *
  
      char *aPath=getAbsolutePath(path);
      path=getRelativePath(path);
@@ -43,7 +52,7 @@ $NetBSD: patch-aa,v 1.1.1.1 2007/06/11 20:13:27 agc Exp $
      loggedfs_log(aPath,"getattr",res,"getattr %s",aPath);
      if(res == -1)
          return -errno;
-@@ -210,7 +216,7 @@
+@@ -210,7 +216,7 @@ static int loggedFS_readdir(const char *
      path=getRelativePath(path);
  
  
@@ -52,7 +61,7 @@ $NetBSD: patch-aa,v 1.1.1.1 2007/06/11 20:13:27 agc Exp $
      if(dp == NULL) {
          res = -errno;
          loggedfs_log(aPath,"readdir",-1,"readdir %s",aPath);
-@@ -427,7 +433,7 @@
+@@ -427,7 +433,7 @@ static int loggedFS_truncate(const char 
      return 0;
  }
  
@@ -61,7 +70,7 @@ $NetBSD: patch-aa,v 1.1.1.1 2007/06/11 20:13:27 agc Exp $
  static int loggedFS_utime(const char *path, struct utimbuf *buf)
  {
      int res;
-@@ -650,7 +656,11 @@
+@@ -650,7 +656,11 @@ bool processArgs(int argc, char *argv[],
  // logging the ~/.kde/share/config directory, in which hard links for lock
  // files are verified by their inode equivalency.
  
@@ -73,7 +82,7 @@ $NetBSD: patch-aa,v 1.1.1.1 2007/06/11 20:13:27 agc Exp $
  
      while ((res = getopt (argc, argv, "hpfec:l:")) != -1)
      {
-@@ -770,7 +780,7 @@
+@@ -770,7 +780,7 @@ int main(int argc, char *argv[])
      loggedFS_oper.chmod	= loggedFS_chmod;
      loggedFS_oper.chown	= loggedFS_chown;
      loggedFS_oper.truncate	= loggedFS_truncate;
diff --git a/filesystems/fuse-loggedfs/patches/patch-src_Config.cpp b/filesystems/fuse-loggedfs/patches/patch-src_Config.cpp
new file mode 100644
index 00000000000..e1c5e07e9bc
--- /dev/null
+++ b/filesystems/fuse-loggedfs/patches/patch-src_Config.cpp
@@ -0,0 +1,15 @@
+$NetBSD: patch-src_Config.cpp,v 1.1 2016/03/01 20:16:17 joerg Exp $
+
+Inverse of new[] is delete[].
+
+--- src/Config.cpp.orig	2016-03-01 12:34:43.478519419 +0000
++++ src/Config.cpp
+@@ -125,7 +125,7 @@ for (cur_node = a_node; cur_node; cur_no
+ 				includes.push_back(*filter);
+ 				}
+ 			else excludes.push_back(*filter);
+-			delete buffer;
++			delete[] buffer;
+ 			}		
+     		}
+