Module Name:    src
Committed By:   manu
Date:           Mon May  9 08:51:18 UTC 2011

Modified Files:
        src/distrib/sets/lists/base: ad.mips64eb ad.mips64el md.amd64
            md.sparc64 mi shl.mi
        src/distrib/sets/lists/comp: ad.mips64eb ad.mips64el md.amd64
            md.sparc64 mi shl.mi
        src/distrib/sets/lists/man: mi
        src/doc: CHANGES
        src/lib: Makefile
        src/lib/libperfuse: Makefile
        src/usr.sbin: Makefile
        src/usr.sbin/perfused: Makefile msg.c

Log Message:
Enable the build of perfused and libperfuse


To generate a diff of this commit:
cvs rdiff -u -r1.46 -r1.47 src/distrib/sets/lists/base/ad.mips64eb
cvs rdiff -u -r1.44 -r1.45 src/distrib/sets/lists/base/ad.mips64el
cvs rdiff -u -r1.119 -r1.120 src/distrib/sets/lists/base/md.amd64
cvs rdiff -u -r1.112 -r1.113 src/distrib/sets/lists/base/md.sparc64
cvs rdiff -u -r1.936 -r1.937 src/distrib/sets/lists/base/mi
cvs rdiff -u -r1.581 -r1.582 src/distrib/sets/lists/base/shl.mi
cvs rdiff -u -r1.29 -r1.30 src/distrib/sets/lists/comp/ad.mips64eb \
    src/distrib/sets/lists/comp/ad.mips64el
cvs rdiff -u -r1.111 -r1.112 src/distrib/sets/lists/comp/md.amd64
cvs rdiff -u -r1.94 -r1.95 src/distrib/sets/lists/comp/md.sparc64
cvs rdiff -u -r1.1620 -r1.1621 src/distrib/sets/lists/comp/mi
cvs rdiff -u -r1.168 -r1.169 src/distrib/sets/lists/comp/shl.mi
cvs rdiff -u -r1.1314 -r1.1315 src/distrib/sets/lists/man/mi
cvs rdiff -u -r1.1544 -r1.1545 src/doc/CHANGES
cvs rdiff -u -r1.166 -r1.167 src/lib/Makefile
cvs rdiff -u -r1.2 -r1.3 src/lib/libperfuse/Makefile
cvs rdiff -u -r1.255 -r1.256 src/usr.sbin/Makefile
cvs rdiff -u -r1.1 -r1.2 src/usr.sbin/perfused/Makefile
cvs rdiff -u -r1.11 -r1.12 src/usr.sbin/perfused/msg.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/distrib/sets/lists/base/ad.mips64eb
diff -u src/distrib/sets/lists/base/ad.mips64eb:1.46 src/distrib/sets/lists/base/ad.mips64eb:1.47
--- src/distrib/sets/lists/base/ad.mips64eb:1.46	Sun Apr 17 09:01:57 2011
+++ src/distrib/sets/lists/base/ad.mips64eb	Mon May  9 08:51:08 2011
@@ -1,4 +1,4 @@
-# $NetBSD: ad.mips64eb,v 1.46 2011/04/17 09:01:57 mrg Exp $
+# $NetBSD: ad.mips64eb,v 1.47 2011/05/09 08:51:08 manu Exp $
 ./libexec/ld.elf_so-64				base-compat-shlib	compat,pic
 ./libexec/ld.elf_so-o32				base-sysutil-bin	compat,pic
 ./usr/lib/64					base-compat-lib
@@ -179,6 +179,8 @@
 ./usr/lib/64/libpcap.so.4.0			base-compat-shlib	compat,pic
 ./usr/lib/64/libpci.so.2			base-compat-shlib	compat,pic
 ./usr/lib/64/libpci.so.2.0			base-compat-shlib	compat,pic
+./usr/lib/64/libperfuse.so.0			base-compat-shlib	compat,pic,perfuse
+./usr/lib/64/libperfuse.so.0.0			base-compat-shlib	compat,pic,perfuse
 ./usr/lib/64/libposix.so.0			base-compat-shlib	compat,pic
 ./usr/lib/64/libposix.so.0.1			base-compat-shlib	compat,pic
 ./usr/lib/64/libprop.so.1			base-compat-shlib	compat,pic
@@ -454,6 +456,8 @@
 ./usr/lib/o32/libpcap.so.4.0			base-compat-shlib	compat,pic
 ./usr/lib/o32/libpci.so.2			base-compat-shlib	compat,pic
 ./usr/lib/o32/libpci.so.2.0			base-compat-shlib	compat,pic
+./usr/lib/o32/libperfuse.so.0			base-compat-shlib	compat,pic,perfuse
+./usr/lib/o32/libperfuse.so.0.0			base-compat-shlib	compat,pic,perfuse
 ./usr/lib/o32/libposix.so.0			base-compat-shlib	compat,pic
 ./usr/lib/o32/libposix.so.0.1			base-compat-shlib	compat,pic
 ./usr/lib/o32/libprop.so.1			base-compat-shlib	compat,pic

Index: src/distrib/sets/lists/base/ad.mips64el
diff -u src/distrib/sets/lists/base/ad.mips64el:1.44 src/distrib/sets/lists/base/ad.mips64el:1.45
--- src/distrib/sets/lists/base/ad.mips64el:1.44	Sun Apr 17 09:01:57 2011
+++ src/distrib/sets/lists/base/ad.mips64el	Mon May  9 08:51:08 2011
@@ -1,4 +1,4 @@
-# $NetBSD: ad.mips64el,v 1.44 2011/04/17 09:01:57 mrg Exp $
+# $NetBSD: ad.mips64el,v 1.45 2011/05/09 08:51:08 manu Exp $
 ./libexec/ld.elf_so-64				base-compat-shlib	compat,pic
 ./libexec/ld.elf_so-o32				base-sysutil-bin	compat,pic
 ./usr/lib/64					base-compat-lib
@@ -179,6 +179,8 @@
 ./usr/lib/64/libpcap.so.4.0			base-compat-shlib	compat,pic
 ./usr/lib/64/libpci.so.2			base-compat-shlib	compat,pic
 ./usr/lib/64/libpci.so.2.0			base-compat-shlib	compat,pic
+./usr/lib/64/libperfuse.so.0			base-compat-shlib	compat,pic,perfuse
+./usr/lib/64/libperfuse.so.0.0			base-compat-shlib	compat,pic,perfuse
 ./usr/lib/64/libposix.so.0			base-compat-shlib	compat,pic
 ./usr/lib/64/libposix.so.0.1			base-compat-shlib	compat,pic
 ./usr/lib/64/libprop.so.1			base-compat-shlib	compat,pic
@@ -454,6 +456,8 @@
 ./usr/lib/o32/libpcap.so.4.0			base-compat-shlib	compat,pic
 ./usr/lib/o32/libpci.so.2			base-compat-shlib	compat,pic
 ./usr/lib/o32/libpci.so.2.0			base-compat-shlib	compat,pic
+./usr/lib/o32/libperfuse.so.0			base-compat-shlib	compat,pic,perfuse
+./usr/lib/o32/libperfuse.so.0.0			base-compat-shlib	compat,pic,perfuse
 ./usr/lib/o32/libposix.so.0			base-compat-shlib	compat,pic
 ./usr/lib/o32/libposix.so.0.1			base-compat-shlib	compat,pic
 ./usr/lib/o32/libprop.so.1			base-compat-shlib	compat,pic

Index: src/distrib/sets/lists/base/md.amd64
diff -u src/distrib/sets/lists/base/md.amd64:1.119 src/distrib/sets/lists/base/md.amd64:1.120
--- src/distrib/sets/lists/base/md.amd64:1.119	Fri Apr 15 18:05:42 2011
+++ src/distrib/sets/lists/base/md.amd64	Mon May  9 08:51:08 2011
@@ -1,4 +1,4 @@
-# $NetBSD: md.amd64,v 1.119 2011/04/15 18:05:42 elric Exp $
+# $NetBSD: md.amd64,v 1.120 2011/05/09 08:51:08 manu Exp $
 ./dev/lms0					base-obsolete		obsolete
 ./dev/mms0					base-obsolete		obsolete
 ./libexec/ld.elf_so-i386			base-sys-shlib		compat,pic
@@ -183,6 +183,9 @@
 ./usr/lib/i386/libpcap.so.4.0			base-compat-shlib	compat,pic
 ./usr/lib/i386/libpci.so.2			base-compat-shlib	compat,pic
 ./usr/lib/i386/libpci.so.2.0			base-compat-shlib	compat,pic
+./usr/lib/i386/libperfuse.so			base-compat-shlib       compat,pic,perfuse
+./usr/lib/i386/libperfuse.so.0			base-compat-shlib       compat,pic,perfuse
+./usr/lib/i386/libperfuse.so.0.0		base-compat-shlib       compat,pic,perfuse
 ./usr/lib/i386/libposix.so.0			base-compat-shlib	compat,pic
 ./usr/lib/i386/libposix.so.0.1			base-compat-shlib	compat,pic
 ./usr/lib/i386/libprop.so.1			base-compat-shlib	compat,pic

Index: src/distrib/sets/lists/base/md.sparc64
diff -u src/distrib/sets/lists/base/md.sparc64:1.112 src/distrib/sets/lists/base/md.sparc64:1.113
--- src/distrib/sets/lists/base/md.sparc64:1.112	Sun Apr 17 09:01:57 2011
+++ src/distrib/sets/lists/base/md.sparc64	Mon May  9 08:51:08 2011
@@ -1,4 +1,4 @@
-# $NetBSD: md.sparc64,v 1.112 2011/04/17 09:01:57 mrg Exp $
+# $NetBSD: md.sparc64,v 1.113 2011/05/09 08:51:08 manu Exp $
 ./libexec/ld.elf_so-sparc			base-sysutil-bin	compat,pic
 ./sbin/edlabel					base-sysutil-root	obsolete
 ./usr/bin/fdformat				base-util-bin
@@ -179,6 +179,9 @@
 ./usr/lib/sparc/libpcap.so.4.0			base-compat-shlib	compat,pic
 ./usr/lib/sparc/libpci.so.2			base-compat-shlib	compat,pic
 ./usr/lib/sparc/libpci.so.2.0			base-compat-shlib	compat,pic
+./usr/lib/sparc/libperfuse.so			base-compat-shlib       compat,pic,perfuse		
+./usr/lib/sparc/libperfuse.so.0			base-compat-shlib       compat,pic,perfuse
+./usr/lib/sparc/libperfuse.so.0.0		base-compat-shlib       compat,pic,perfuse
 ./usr/lib/sparc/libposix.so.0			base-compat-shlib	compat,pic
 ./usr/lib/sparc/libposix.so.0.1			base-compat-shlib	compat,pic
 ./usr/lib/sparc/libprop.so.1			base-compat-shlib	compat,pic

Index: src/distrib/sets/lists/base/mi
diff -u src/distrib/sets/lists/base/mi:1.936 src/distrib/sets/lists/base/mi:1.937
--- src/distrib/sets/lists/base/mi:1.936	Wed Apr 27 20:06:46 2011
+++ src/distrib/sets/lists/base/mi	Mon May  9 08:51:08 2011
@@ -1,4 +1,4 @@
-# $NetBSD: mi,v 1.936 2011/04/27 20:06:46 mbalmer Exp $
+# $NetBSD: mi,v 1.937 2011/05/09 08:51:08 manu Exp $
 #
 # Note:	Don't delete entries from here - mark them as "obsolete" instead,
 #	unless otherwise stated below.
@@ -1307,6 +1307,7 @@
 ./usr/sbin/pac					base-sysutil-bin
 ./usr/sbin/paxctl				base-sysutil-bin
 ./usr/sbin/pcictl				base-sysutil-bin
+./usr/sbin/perfused				base-perfuse-bin	perfuse
 ./usr/sbin/pfspamdb				base-obsolete		obsolete
 ./usr/sbin/pim6dd				base-obsolete		obsolete
 ./usr/sbin/pim6sd				base-obsolete		obsolete

Index: src/distrib/sets/lists/base/shl.mi
diff -u src/distrib/sets/lists/base/shl.mi:1.581 src/distrib/sets/lists/base/shl.mi:1.582
--- src/distrib/sets/lists/base/shl.mi:1.581	Fri Apr 15 18:05:43 2011
+++ src/distrib/sets/lists/base/shl.mi	Mon May  9 08:51:08 2011
@@ -1,4 +1,4 @@
-# $NetBSD: shl.mi,v 1.581 2011/04/15 18:05:43 elric Exp $
+# $NetBSD: shl.mi,v 1.582 2011/05/09 08:51:08 manu Exp $
 #
 # Note:	Don't delete entries from here - mark them as "obsolete" instead,
 #	unless otherwise stated below.
@@ -342,6 +342,9 @@
 ./usr/lib/libossaudio.so			base-sys-shlib
 ./usr/lib/libossaudio.so.1			base-sys-shlib
 ./usr/lib/libossaudio.so.1.0			base-sys-shlib
+./usr/lib/libperfuse.so				base-perfuse-shlib	perfuse
+./usr/lib/libperfuse.so.0			base-perfuse-shlib	perfuse
+./usr/lib/libperfuse.so.0.0			base-perfuse-shlib	perfuse
 ./usr/lib/libp2k.so				base-puffs-shlib
 ./usr/lib/libp2k.so.2				base-puffs-shlib
 ./usr/lib/libp2k.so.2.0				base-puffs-shlib

Index: src/distrib/sets/lists/comp/ad.mips64eb
diff -u src/distrib/sets/lists/comp/ad.mips64eb:1.29 src/distrib/sets/lists/comp/ad.mips64eb:1.30
--- src/distrib/sets/lists/comp/ad.mips64eb:1.29	Thu Apr 21 09:45:55 2011
+++ src/distrib/sets/lists/comp/ad.mips64eb	Mon May  9 08:51:08 2011
@@ -1,4 +1,4 @@
-# $NetBSD: ad.mips64eb,v 1.29 2011/04/21 09:45:55 haad Exp $
+# $NetBSD: ad.mips64eb,v 1.30 2011/05/09 08:51:08 manu Exp $
 ./usr/bin/elf2aout				comp-obsolete		obsolete
 ./usr/bin/elf2ecoff				comp-sysutil-bin
 ./usr/include/mips				comp-c-include
@@ -449,6 +449,11 @@
 ./usr/lib/64/libpci.so				base-sys-shlib		compat,pic
 ./usr/lib/64/libpci_p.a				comp-c-proflib		compat,profile
 ./usr/lib/64/libpci_pic.a			comp-c-piclib		compat,pic
+./usr/lib/64/libperfuse.a			comp-c-lib		compat,perfuse
+./usr/lib/64/libperfuse.so			base-sys-shlib		compat,pic,perfuse
+./usr/lib/64/libperfuse_g.a			comp-c-proflib		compat,debuglib,perfuse
+./usr/lib/64/libperfuse_p.a			comp-c-proflib		compat,profile,perfuse
+./usr/lib/64/libperfuse_pic.a			comp-c-piclib		compat,pic,perfuse
 ./usr/lib/64/libposix.a				comp-c-lib		compat
 ./usr/lib/64/libposix.so			base-sys-shlib		compat,pic
 ./usr/lib/64/libposix_p.a			comp-c-proflib		compat,profile
@@ -998,6 +1003,11 @@
 ./usr/lib/o32/libpci.so				base-sys-shlib		compat,pic
 ./usr/lib/o32/libpci_p.a			comp-c-proflib		compat,profile
 ./usr/lib/o32/libpci_pic.a			comp-c-piclib		compat,pic
+./usr/lib/o32/libperfuse.a			comp-c-lib		compat,perfuse
+./usr/lib/o32/libperfuse.so			base-sys-shlib		compat,pic,perfuse
+./usr/lib/o32/libperfuse_g.a			comp-c-proflib		compat,debuglib,perfuse
+./usr/lib/o32/libperfuse_p.a			comp-c-proflib		compat,profile,perfuse
+./usr/lib/o32/libperfuse_pic.a			comp-c-piclib		compat,pic,perfuse
 ./usr/lib/o32/libposix.a			comp-c-lib		compat
 ./usr/lib/o32/libposix.so			base-sys-shlib		compat,pic
 ./usr/lib/o32/libposix_p.a			comp-c-proflib		compat,profile
@@ -1261,6 +1271,7 @@
 ./usr/libdata/debug/usr/lib/64/libpam.so.3.0.debug		comp-sys-debug	pam,debug,compat
 ./usr/libdata/debug/usr/lib/64/libpcap.so.4.0.debug	comp-net-debug	debug,compat
 ./usr/libdata/debug/usr/lib/64/libpci.so.2.0.debug		comp-sys-debug	debug,compat
+./usr/libdata/debug/usr/lib/64/libperfuse.so.0.0.debug	comp-compat-shlib	compat,pic,debug,perfuse
 ./usr/libdata/debug/usr/lib/64/libposix.so.0.1.debug	comp-sys-debug	debug,compat
 ./usr/libdata/debug/usr/lib/64/libprop.so.1.1.debug	comp-sys-debug	debug,compat
 ./usr/libdata/debug/usr/lib/64/libpthread.so.1.0.debug	comp-sys-debug	debug,compat
@@ -1467,6 +1478,7 @@
 ./usr/libdata/debug/usr/lib/o32/libpam.so.3.0.debug		comp-sys-debug	pam,debug,compat
 ./usr/libdata/debug/usr/lib/o32/libpcap.so.4.0.debug	comp-net-debug	debug,compat
 ./usr/libdata/debug/usr/lib/o32/libpci.so.2.0.debug		comp-sys-debug	debug,compat
+./usr/libdata/debug/usr/lib/o32/libperfuse.so.0.0.debug	comp-compat-shlib	compat,pic,debug,perfuse
 ./usr/libdata/debug/usr/lib/o32/libposix.so.0.1.debug	comp-sys-debug	debug,compat
 ./usr/libdata/debug/usr/lib/o32/libprop.so.1.1.debug	comp-sys-debug	debug,compat
 ./usr/libdata/debug/usr/lib/o32/libpthread.so.1.0.debug	comp-sys-debug	debug,compat
Index: src/distrib/sets/lists/comp/ad.mips64el
diff -u src/distrib/sets/lists/comp/ad.mips64el:1.29 src/distrib/sets/lists/comp/ad.mips64el:1.30
--- src/distrib/sets/lists/comp/ad.mips64el:1.29	Thu Apr 21 09:45:55 2011
+++ src/distrib/sets/lists/comp/ad.mips64el	Mon May  9 08:51:08 2011
@@ -1,4 +1,4 @@
-# $NetBSD: ad.mips64el,v 1.29 2011/04/21 09:45:55 haad Exp $
+# $NetBSD: ad.mips64el,v 1.30 2011/05/09 08:51:08 manu Exp $
 ./usr/bin/elf2aout				comp-obsolete		obsolete
 ./usr/bin/elf2ecoff				comp-sysutil-bin
 ./usr/include/mips				comp-c-include
@@ -449,6 +449,11 @@
 ./usr/lib/64/libpci.so				base-sys-shlib		compat,pic
 ./usr/lib/64/libpci_p.a				comp-c-proflib		compat,profile
 ./usr/lib/64/libpci_pic.a			comp-c-piclib		compat,pic
+./usr/lib/64/libperfuse.a			comp-c-lib		compat,perfuse
+./usr/lib/64/libperfuse.so			base-sys-shlib		compat,pic,perfuse
+./usr/lib/64/libperfuse_g.a			comp-c-proflib		compat,debuglib,perfuse
+./usr/lib/64/libperfuse_p.a			comp-c-proflib		compat,profile,perfuse
+./usr/lib/64/libperfuse_pic.a			comp-c-piclib		compat,pic,perfuse
 ./usr/lib/64/libposix.a				comp-c-lib		compat
 ./usr/lib/64/libposix.so			base-sys-shlib		compat,pic
 ./usr/lib/64/libposix_p.a			comp-c-proflib		compat,profile
@@ -998,6 +1003,11 @@
 ./usr/lib/o32/libpci.so				base-sys-shlib		compat,pic
 ./usr/lib/o32/libpci_p.a			comp-c-proflib		compat,profile
 ./usr/lib/o32/libpci_pic.a			comp-c-piclib		compat,pic
+./usr/lib/o32/libperfuse.a			comp-c-lib		compat,perfuse
+./usr/lib/o32/libperfuse.so			base-sys-shlib		compat,pic,perfuse
+./usr/lib/o32/libperfuse_g.a			comp-c-proflib		compat,debuglib,perfuse
+./usr/lib/o32/libperfuse_p.a			comp-c-proflib		compat,profile,perfuse
+./usr/lib/o32/libperfuse_pic.a			comp-c-piclib		compat,pic,perfuse
 ./usr/lib/o32/libposix.a			comp-c-lib		compat
 ./usr/lib/o32/libposix.so			base-sys-shlib		compat,pic
 ./usr/lib/o32/libposix_p.a			comp-c-proflib		compat,profile
@@ -1261,6 +1271,7 @@
 ./usr/libdata/debug/usr/lib/64/libpam.so.3.0.debug		comp-sys-debug	pam,debug,compat
 ./usr/libdata/debug/usr/lib/64/libpcap.so.4.0.debug	comp-net-debug	debug,compat
 ./usr/libdata/debug/usr/lib/64/libpci.so.2.0.debug		comp-sys-debug	debug,compat
+./usr/libdata/debug/usr/lib/64/libperfuse.so.0.0.debug	comp-compat-shlib	compat,pic,debug,perfuse
 ./usr/libdata/debug/usr/lib/64/libposix.so.0.1.debug	comp-sys-debug	debug,compat
 ./usr/libdata/debug/usr/lib/64/libprop.so.1.1.debug	comp-sys-debug	debug,compat
 ./usr/libdata/debug/usr/lib/64/libpthread.so.1.0.debug	comp-sys-debug	debug,compat
@@ -1467,6 +1478,7 @@
 ./usr/libdata/debug/usr/lib/o32/libpam.so.3.0.debug		comp-sys-debug	pam,debug,compat
 ./usr/libdata/debug/usr/lib/o32/libpcap.so.4.0.debug	comp-net-debug	debug,compat
 ./usr/libdata/debug/usr/lib/o32/libpci.so.2.0.debug		comp-sys-debug	debug,compat
+./usr/libdata/debug/usr/lib/o32/libperfuse.so.0.0.debug	comp-compat-shlib	compat,pic,debug,perfuse
 ./usr/libdata/debug/usr/lib/o32/libposix.so.0.1.debug	comp-sys-debug	debug,compat
 ./usr/libdata/debug/usr/lib/o32/libprop.so.1.1.debug	comp-sys-debug	debug,compat
 ./usr/libdata/debug/usr/lib/o32/libpthread.so.1.0.debug	comp-sys-debug	debug,compat

Index: src/distrib/sets/lists/comp/md.amd64
diff -u src/distrib/sets/lists/comp/md.amd64:1.111 src/distrib/sets/lists/comp/md.amd64:1.112
--- src/distrib/sets/lists/comp/md.amd64:1.111	Thu Apr 21 09:45:55 2011
+++ src/distrib/sets/lists/comp/md.amd64	Mon May  9 08:51:08 2011
@@ -1,4 +1,4 @@
-# $NetBSD: md.amd64,v 1.111 2011/04/21 09:45:55 haad Exp $
+# $NetBSD: md.amd64,v 1.112 2011/05/09 08:51:08 manu Exp $
 ./usr/include/amd64				comp-c-include
 ./usr/include/amd64/ansi.h			comp-c-include
 ./usr/include/amd64/aout_machdep.h		comp-c-include
@@ -734,6 +734,11 @@
 ./usr/lib/i386/libpci_g.a			comp-c-proflib		compat,debuglib
 ./usr/lib/i386/libpci_p.a			comp-c-proflib		compat,profile
 ./usr/lib/i386/libpci_pic.a			comp-c-piclib		compat,pic
+./usr/lib/i386/libperfuse.a			comp-c-lib		compat,perfuse
+./usr/lib/i386/libperfuse.so			comp-sys-shlib		compat,pic,perfuse
+./usr/lib/i386/libperfuse_g.a			comp-c-proflib		compat,debuglib,perfuse
+./usr/lib/i386/libperfuse_p.a			comp-c-proflib		compat,profile,perfuse
+./usr/lib/i386/libperfuse_pic.a			comp-c-piclib		compat,pic,perfuse
 ./usr/lib/i386/libposix.a			comp-c-lib		compat
 ./usr/lib/i386/libposix.so			comp-sys-shlib		compat,pic
 ./usr/lib/i386/libposix_g.a			comp-c-proflib		compat,debuglib
@@ -1032,6 +1037,7 @@
 ./usr/libdata/debug/usr/lib/i386/libpam.so.3.0.debug	comp-compat-shlib	compat,pic,pam,debug
 ./usr/libdata/debug/usr/lib/i386/libpcap.so.4.0.debug	comp-compat-shlib	compat,pic,debug
 ./usr/libdata/debug/usr/lib/i386/libpci.so.2.0.debug	comp-compat-shlib	compat,pic,debug
+./usr/libdata/debug/usr/lib/i386/libperfuse.so.0.0.debug	comp-compat-shlib	compat,pic,debug,perfuse
 ./usr/libdata/debug/usr/lib/i386/libposix.so.0.1.debug	comp-compat-shlib	compat,pic,debug
 ./usr/libdata/debug/usr/lib/i386/libprop.so.1.1.debug	comp-compat-shlib	compat,pic,debug
 ./usr/libdata/debug/usr/lib/i386/libpthread.so.1.0.debug	comp-compat-shlib	compat,pic,debug

Index: src/distrib/sets/lists/comp/md.sparc64
diff -u src/distrib/sets/lists/comp/md.sparc64:1.94 src/distrib/sets/lists/comp/md.sparc64:1.95
--- src/distrib/sets/lists/comp/md.sparc64:1.94	Thu Apr 21 09:45:55 2011
+++ src/distrib/sets/lists/comp/md.sparc64	Mon May  9 08:51:08 2011
@@ -1,4 +1,4 @@
-# $NetBSD: md.sparc64,v 1.94 2011/04/21 09:45:55 haad Exp $
+# $NetBSD: md.sparc64,v 1.95 2011/05/09 08:51:08 manu Exp $
 ./usr/include/ieeefp.h				comp-c-include
 ./usr/include/sparc				comp-c-include
 ./usr/include/sparc/_G_config.h			comp-obsolete		obsolete
@@ -521,6 +521,11 @@
 ./usr/lib/sparc/libpci.so			base-sys-shlib		compat,pic
 ./usr/lib/sparc/libpci_p.a			comp-c-proflib		compat,profile
 ./usr/lib/sparc/libpci_pic.a			comp-c-piclib		compat,pic
+./usr/lib/sparc/libperfuse.a			comp-c-lib		compat,perfuse
+./usr/lib/sparc/libperfuse.so			comp-sys-shlib		compat,pic,perfuse
+./usr/lib/sparc/libperfuse_g.a			comp-c-proflib		compat,debuglib,perfuse
+./usr/lib/sparc/libperfuse_p.a			comp-c-proflib		compat,profile,perfuse
+./usr/lib/sparc/libperfuse_pic.a		comp-c-piclib		compat,pic,perfuse
 ./usr/lib/sparc/libposix.a			comp-c-lib		compat
 ./usr/lib/sparc/libposix.so			base-sys-shlib		compat,pic
 ./usr/lib/sparc/libposix_p.a			comp-c-proflib		compat,profile
@@ -778,6 +783,7 @@
 ./usr/libdata/debug/usr/lib/sparc/libpam.so.3.0.debug			comp-compat-shlib	compat,pic,debug
 ./usr/libdata/debug/usr/lib/sparc/libpcap.so.4.0.debug			comp-compat-shlib	compat,pic,debug
 ./usr/libdata/debug/usr/lib/sparc/libpci.so.2.0.debug			comp-compat-shlib	compat,pic,debug
+./usr/libdata/debug/usr/lib/sparc/libpperfuse.so.0.0.debug			comp-compat-shlib	compat,pic,debug,perfuse
 ./usr/libdata/debug/usr/lib/sparc/libposix.so.0.1.debug			comp-compat-shlib	compat,pic,debug
 ./usr/libdata/debug/usr/lib/sparc/libprop.so.1.1.debug			comp-compat-shlib	compat,pic,debug
 ./usr/libdata/debug/usr/lib/sparc/libpthread.so.1.0.debug		comp-compat-shlib	compat,pic,debug

Index: src/distrib/sets/lists/comp/mi
diff -u src/distrib/sets/lists/comp/mi:1.1620 src/distrib/sets/lists/comp/mi:1.1621
--- src/distrib/sets/lists/comp/mi:1.1620	Tue May  3 18:28:44 2011
+++ src/distrib/sets/lists/comp/mi	Mon May  9 08:51:08 2011
@@ -1,4 +1,4 @@
-#	$NetBSD: mi,v 1.1620 2011/05/03 18:28:44 dyoung Exp $
+#	$NetBSD: mi,v 1.1621 2011/05/09 08:51:08 manu Exp $
 #
 # Note: don't delete entries from here - mark them as "obsolete" instead.
 #
@@ -1863,6 +1863,7 @@
 ./usr/include/pcap/pcap.h			comp-c-include
 ./usr/include/pci.h				comp-c-include
 ./usr/include/poll.h				comp-c-include
+./usr/include/perfuse.h				comp-c-include		perfuse
 ./usr/include/prop/plistref.h			comp-c-include
 ./usr/include/prop/prop_array.h			comp-c-include
 ./usr/include/prop/prop_bool.h			comp-c-include
@@ -2632,6 +2633,9 @@
 ./usr/lib/libpci.a				comp-c-lib
 ./usr/lib/libpci_g.a				-unknown-		debuglib
 ./usr/lib/libpci_p.a				comp-c-proflib		profile
+./usr/lib/libperfuse.a				comp-perfuse-lib	perfuse
+./usr/lib/libperfuse_g.a			comp-perfuse-lib	debuglib,perfuse 
+./usr/lib/libperfuse_p.a			comp-perfuse-proflib	profile,perfuse
 ./usr/lib/libposix.a				comp-c-lib
 ./usr/lib/libposix_g.a				-unknown-		debuglib
 ./usr/lib/libposix_p.a				comp-c-proflib		profile
@@ -3808,6 +3812,7 @@
 ./usr/libdata/debug/usr/sbin/pac.debug		comp-sysutil-debug	debug
 ./usr/libdata/debug/usr/sbin/paxctl.debug	comp-sysutil-debug	debug
 ./usr/libdata/debug/usr/sbin/pcictl.debug	comp-sysutil-debug	debug
+./usr/libdata/debug/usr/sbin/perfuse.debug	comp-perfuse-debug	debug,perfuse
 ./usr/libdata/debug/usr/sbin/pkg_add.debug	comp-pkgutil-debug	debug,crypto
 ./usr/libdata/debug/usr/sbin/pkg_admin.debug	comp-pkgutil-debug	debug,crypto
 ./usr/libdata/debug/usr/sbin/pkg_create.debug	comp-pkgutil-debug	debug,crypto
@@ -3994,6 +3999,7 @@
 ./usr/libdata/lint/llib-lp2k.ln			comp-puffs-lintlib	lint
 ./usr/libdata/lint/llib-lpam.ln			comp-c-lintlib		lint,pam
 ./usr/libdata/lint/llib-lpcap.ln		comp-c-lintlib		lint
+./usr/libdata/lint/llib-lperfuse.ln		comp-perfuse-lintlib	lint,perfuse
 ./usr/libdata/lint/llib-lpcc.ln			comp-c-lintlib		lint,pcc
 ./usr/libdata/lint/llib-lpci.ln			comp-c-lintlib		lint
 ./usr/libdata/lint/llib-lposix.ln		comp-c-lintlib		lint
@@ -7697,6 +7703,7 @@
 ./usr/share/man/cat3/pcidev_conf_write.0	comp-c-catman		.cat
 ./usr/share/man/cat3/pclose.0			comp-c-catman		.cat
 ./usr/share/man/cat3/pechochar.0		comp-c-catman		.cat
+./usr/share/man/cat3/libperfuse.0		comp-perfuse-catman	.cat,perfuse
 ./usr/share/man/cat3/perror.0			comp-c-catman		.cat
 ./usr/share/man/cat3/pidfile.0			comp-c-catman		.cat
 ./usr/share/man/cat3/pidlock.0			comp-c-catman		.cat
@@ -13747,6 +13754,7 @@
 ./usr/share/man/html3/pcidev_conf_write.html	comp-c-htmlman		html
 ./usr/share/man/html3/pclose.html		comp-c-htmlman		html
 ./usr/share/man/html3/pechochar.html		comp-c-htmlman		html
+./usr/share/man/html3/libperfuse.html		comp-perfuse-htmlman	html,perfuse
 ./usr/share/man/html3/perror.html		comp-c-htmlman		html
 ./usr/share/man/html3/pidfile.html		comp-c-htmlman		html
 ./usr/share/man/html3/pidlock.html		comp-c-htmlman		html
@@ -19788,6 +19796,7 @@
 ./usr/share/man/man3/pcidev_conf_write.3	comp-c-man		.man
 ./usr/share/man/man3/pclose.3			comp-c-man		.man
 ./usr/share/man/man3/pechochar.3		comp-c-man		.man
+./usr/share/man/man3/libperfuse.3		comp-perfuse-man	.man,perfuse
 ./usr/share/man/man3/perror.3			comp-c-man		.man
 ./usr/share/man/man3/pidfile.3			comp-c-man		.man
 ./usr/share/man/man3/pidlock.3			comp-c-man		.man

Index: src/distrib/sets/lists/comp/shl.mi
diff -u src/distrib/sets/lists/comp/shl.mi:1.168 src/distrib/sets/lists/comp/shl.mi:1.169
--- src/distrib/sets/lists/comp/shl.mi:1.168	Wed Apr 20 18:55:54 2011
+++ src/distrib/sets/lists/comp/shl.mi	Mon May  9 08:51:08 2011
@@ -1,4 +1,4 @@
-# $NetBSD: shl.mi,v 1.168 2011/04/20 18:55:54 haad Exp $
+# $NetBSD: shl.mi,v 1.169 2011/05/09 08:51:08 manu Exp $
 #
 # Note: don't delete entries from here - mark them as "obsolete" instead.
 #
@@ -88,6 +88,7 @@
 ./usr/lib/libpcap_pic.a				comp-c-piclib
 ./usr/lib/libpcc_pic.a				comp-c-piclib		pcc
 ./usr/lib/libpci_pic.a				comp-c-piclib
+./usr/lib/libperfuse_pic.a			comp-perfuse-piclib	perfuse
 ./usr/lib/libposix_pic.a			comp-c-piclib
 ./usr/lib/libprop_pic.a				comp-c-piclib
 ./usr/lib/libpthread_dbg_pic.a			comp-c-piclib
@@ -299,6 +300,7 @@
 ./usr/libdata/debug/usr/lib/libpam.so.3.0.debug		comp-sys-debug	pam,debug
 ./usr/libdata/debug/usr/lib/libpcap.so.4.0.debug	comp-net-debug	debug
 ./usr/libdata/debug/usr/lib/libpci.so.2.0.debug		comp-sys-debug	debug
+./usr/libdata/debug/usr/lib/libperfuse.so.0.0.debug	comp-perfuse-debug	debug,perfuse
 ./usr/libdata/debug/usr/lib/libposix.so.0.1.debug	comp-sys-debug	debug
 ./usr/libdata/debug/usr/lib/libprop.so.1.1.debug	comp-sys-debug	debug
 ./usr/libdata/debug/usr/lib/libpthread.so.1.0.debug	comp-sys-debug	debug

Index: src/distrib/sets/lists/man/mi
diff -u src/distrib/sets/lists/man/mi:1.1314 src/distrib/sets/lists/man/mi:1.1315
--- src/distrib/sets/lists/man/mi:1.1314	Tue May  3 16:12:23 2011
+++ src/distrib/sets/lists/man/mi	Mon May  9 08:51:09 2011
@@ -1,4 +1,4 @@
-# $NetBSD: mi,v 1.1314 2011/05/03 16:12:23 jruoho Exp $
+# $NetBSD: mi,v 1.1315 2011/05/09 08:51:09 manu Exp $
 #
 # Note: don't delete entries from here - mark them as "obsolete" instead.
 #
@@ -2566,6 +2566,7 @@
 ./usr/share/man/cat8/pcnfsd.0			man-nfsserver-catman	.cat
 ./usr/share/man/cat8/pdisk.0			man-sysutil-catman	.cat
 ./usr/share/man/cat8/peace.0			man-obsolete		obsolete
+./usr/share/man/cat8/perfused.0			man-perfuse-catman	.cat,perfuse
 ./usr/share/man/cat8/pfctl.0			man-pf-catman		pf,.cat
 ./usr/share/man/cat8/pflogd.0			man-pf-catman		pf,.cat
 ./usr/share/man/cat8/pfs.0				man-pf-catman		pf,.cat
@@ -5120,6 +5121,7 @@
 ./usr/share/man/html8/pcnfsd.html		man-nfsserver-htmlman	html
 ./usr/share/man/html8/pdisk.html		man-sysutil-htmlman	html
 ./usr/share/man/html8/peace.html		man-obsolete		obsolete
+./usr/share/man/html8/perfused.html		man-perfuse-htmlman	html,perfuse
 ./usr/share/man/html8/pfctl.html		man-pf-htmlman		pf,html
 ./usr/share/man/html8/pflogd.html		man-pf-htmlman		pf,html
 ./usr/share/man/html8/pfs.html			man-pf-htmlman		pf,html
@@ -7911,6 +7913,7 @@
 ./usr/share/man/man8/pcnfsd.8			man-nfsserver-man	.man
 ./usr/share/man/man8/pdisk.8			man-sysutil-man		.man
 ./usr/share/man/man8/peace.8			man-obsolete		obsolete
+./usr/share/man/man8/perfused.8			man-perfuse-man		.man,perfuse
 ./usr/share/man/man8/pfctl.8			man-pf-man		pf,.man
 ./usr/share/man/man8/pflogd.8			man-pf-man		pf,.man
 ./usr/share/man/man8/pfs.8				man-pf-man		pf,.man

Index: src/doc/CHANGES
diff -u src/doc/CHANGES:1.1544 src/doc/CHANGES:1.1545
--- src/doc/CHANGES:1.1544	Mon May  2 21:00:46 2011
+++ src/doc/CHANGES	Mon May  9 08:51:18 2011
@@ -1,4 +1,4 @@
-# LIST OF CHANGES FROM LAST RELEASE:			<$Revision: 1.1544 $>
+# LIST OF CHANGES FROM LAST RELEASE:			<$Revision: 1.1545 $>
 #
 #
 # [Note: This file does not mention every change made to the NetBSD source tree.
@@ -1003,3 +1003,6 @@
 		[jym 20110429]
 	powerpc: Converted PowerPC to use PCU to manage FPU/AltiVec/SPE.
 		[matt 20110502]
+	perfuse: Add the PUFFS RElay to FUSE library, which bridges the kernel
+		 level API for FUSE filesystems with native PUFFS. 
+		 [manu 20110509]

Index: src/lib/Makefile
diff -u src/lib/Makefile:1.166 src/lib/Makefile:1.167
--- src/lib/Makefile:1.166	Fri Apr 15 18:05:44 2011
+++ src/lib/Makefile	Mon May  9 08:51:18 2011
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.166 2011/04/15 18:05:44 elric Exp $
+#	$NetBSD: Makefile,v 1.167 2011/05/09 08:51:18 manu Exp $
 #	from: @(#)Makefile	5.25.1.1 (Berkeley) 5/7/91
 
 .include <bsd.own.mk>
@@ -79,6 +79,7 @@
 SUBDIR+=	libedit		# depends on libterminfo
 SUBDIR+=	libquota	# depends on libprop and librpcsvc
 SUBDIR+=	librefuse	# depends on libpuffs
+SUBDIR+=	libperfuse	# depends on libpuffs
 SUBDIR+=	librumpuser	# depends on libpthread
 
 .if (${MKNPF} != "no")

Index: src/lib/libperfuse/Makefile
diff -u src/lib/libperfuse/Makefile:1.2 src/lib/libperfuse/Makefile:1.3
--- src/lib/libperfuse/Makefile:1.2	Tue May  3 13:14:09 2011
+++ src/lib/libperfuse/Makefile	Mon May  9 08:51:18 2011
@@ -1,17 +1,19 @@
+# $NetBSD: Makefile,v 1.3 2011/05/09 08:51:18 manu Exp $
+
 LIB=            perfuse
 LIBDPLIBS+=     puffs	${.CURDIR}/../libpuffs
 
-
+.ifdef DEBUG
 PERFUSE_OPT_DEBUG_FLAGS=   -g -DPERFUSE_DEBUG
+.endif
 
 CFLAGS+=        ${PERFUSE_OPT_DEBUG_FLAGS}
 CPPFLAGS+=	-I${.CURDIR} 
 CPPFLAGS+=	-I${NETBSDSRCDIR}/lib/libpuffs 
-CPPFLAGS+=	-I${NETBSDSRCDIR}/sys -I${ARCHDIR} 
 SRCS=           perfuse.c ops.c subr.c debug.c
 MAN=		libperfuse.3
 WARNS=          4
 INCS=           perfuse.h
-INCSDIR=        /usr/include
+INCSDIR=	/usr/include
 
 .include <bsd.lib.mk>

Index: src/usr.sbin/Makefile
diff -u src/usr.sbin/Makefile:1.255 src/usr.sbin/Makefile:1.256
--- src/usr.sbin/Makefile:1.255	Fri Apr 15 18:05:46 2011
+++ src/usr.sbin/Makefile	Mon May  9 08:51:18 2011
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.255 2011/04/15 18:05:46 elric Exp $
+#	$NetBSD: Makefile,v 1.256 2011/05/09 08:51:18 manu Exp $
 #	from: @(#)Makefile	5.20 (Berkeley) 6/12/93
 
 .include <bsd.own.mk>
@@ -14,7 +14,7 @@
 	kgmon lastlogin ldpd link lmcconfig lockstat lpr mailwrapper makefs \
 	map-mbone mdconfig memswitch mlxctl mmcformat mopd mountd moused \
 	mrinfo mrouted mscdlabel mtrace \
-	mtree ndbootd ndiscvt netgroup_mkdb nfsd ofctl paxctl pcictl \
+	mtree ndbootd ndiscvt netgroup_mkdb nfsd ofctl paxctl pcictl perfused \
 	pppd psrset pstat pwd_mkdb postinstall powerd puffs quot quotacheck \
 	quotactl quotaon rarpd rbootd rdate \
 	repquota rmt rpc.bootparamd rpc.lockd rpc.pcnfsd \

Index: src/usr.sbin/perfused/Makefile
diff -u src/usr.sbin/perfused/Makefile:1.1 src/usr.sbin/perfused/Makefile:1.2
--- src/usr.sbin/perfused/Makefile:1.1	Wed Aug 25 07:18:01 2010
+++ src/usr.sbin/perfused/Makefile	Mon May  9 08:51:18 2011
@@ -1,13 +1,17 @@
+# $NetBSD: Makefile,v 1.2 2011/05/09 08:51:18 manu Exp $
+
 PROG=            perfused
 
+.ifdef DEBUG
 PERFUSE_OPT_DEBUG_FLAGS=   -g -DPERFUSE_DEBUG
+.endif
 
-CFLAGS=        ${PERFUSE_OPT_DEBUG_FLAGS}
+CFLAGS+=        ${PERFUSE_OPT_DEBUG_FLAGS}
 SRCS=           perfused.c msg.c debug.c
 MAN=		perfused.8
 WARNS=          4
 
-LDADD+= -lperfuse -lpuffs #-L/usr/pkg/lib -lefence
+LDADD+= -lperfuse -lpuffs
 DPADD+= ${LIBPUFFS}
 
 .include <bsd.prog.mk>

Index: src/usr.sbin/perfused/msg.c
diff -u src/usr.sbin/perfused/msg.c:1.11 src/usr.sbin/perfused/msg.c:1.12
--- src/usr.sbin/perfused/msg.c:1.11	Fri May  6 13:45:35 2011
+++ src/usr.sbin/perfused/msg.c	Mon May  9 08:51:18 2011
@@ -1,4 +1,4 @@
-/*  $NetBSD: msg.c,v 1.11 2011/05/06 13:45:35 manu Exp $ */
+/*  $NetBSD: msg.c,v 1.12 2011/05/09 08:51:18 manu Exp $ */
 
 /*-
  *  Copyright (c) 2010 Emmanuel Dreyfus. All rights reserved.
@@ -617,11 +617,11 @@
 	size_t len;
 
 	len = sizeof(*fih);
-	PUFFS_FRAMEBUF_GETWINDOW(pb1, 0, (void **)&fih, &len);
+	PUFFS_FRAMEBUF_GETWINDOW(pb1, 0, (void **)(void *)&fih, &len);
 	unique_in = fih->unique;
 
 	len = sizeof(*foh);
-	PUFFS_FRAMEBUF_GETWINDOW(pb2, 0, (void **)&foh, &len);
+	PUFFS_FRAMEBUF_GETWINDOW(pb2, 0, (void **)(void *)&foh, &len);
 	unique_out = foh->unique;
 
 	return unique_in != unique_out;
@@ -637,7 +637,7 @@
 	size_t len;
 
 	len = sizeof(*foh);
-	PUFFS_FRAMEBUF_GETWINDOW(pb, 0, (void **)&foh, &len);
+	PUFFS_FRAMEBUF_GETWINDOW(pb, 0, (void **)(void *)&foh, &len);
 
 	DWARNX("Unexpected frame: unique = %"PRId64", error = %d", 
 	       foh->unique, foh->error);

Reply via email to