1 files changed, 154 insertions, 140 deletions

diff --git a/security/sfs/pkg-plist b/security/sfs/pkg-plist
index e054bbaf0a7f..b847febd30c0 100644
--- a/security/sfs/pkg-plist
+++ b/security/sfs/pkg-plist
@@ -3,7 +3,9 @@ bin/newaid
 bin/rex
 bin/rpcc
 bin/sfsagent
+bin/sfsdeclog
 bin/sfskey
+bin/sfsproac
 bin/ssu
 @unexec if [ -f %D/etc/rc.d/sfscd.sh ]; then cmp -s %D/etc/rc.d/sfscd.sh.sample %D/etc/rc.d/sfscd.sh && rm -f %D/etc/rc.d/sfscd.sh || echo "${PKG_PREFIX}/etc/rc.d/sfscd.sh is different than distribution sample, leaving for manual cleanup." | fmt; fi
 etc/rc.d/sfscd.sh.sample
@@ -11,161 +13,173 @@ etc/rc.d/sfscd.sh.sample
 etc/rc.d/sfssd.sh.sample
 etc/sfs/sfsrwsd_config.sample
 include/sfs
-include/sfs-0.6/aclnt.h
-include/sfs-0.6/aes.h
-include/sfs-0.6/afsnode.h
-include/sfs-0.6/agentconn.h
-include/sfs-0.6/agentmisc.h
-include/sfs-0.6/aiod.h
-include/sfs-0.6/aiod_prot.h
-include/sfs-0.6/aios.h
-include/sfs-0.6/amisc.h
-include/sfs-0.6/arc4.h
-include/sfs-0.6/arena.h
-include/sfs-0.6/arpc.h
-include/sfs-0.6/array.h
-include/sfs-0.6/asrv.h
-include/sfs-0.6/async.h
-include/sfs-0.6/autoconf.h
-include/sfs-0.6/axprt.h
-include/sfs-0.6/axprt_crypt.h
-include/sfs-0.6/backoff.h
-include/sfs-0.6/bbuddy.h
-include/sfs-0.6/bench.h
-include/sfs-0.6/bigint.h
-include/sfs-0.6/bitvec.h
-include/sfs-0.6/blowfish.h
-include/sfs-0.6/callback.h
-include/sfs-0.6/cbuf.h
-include/sfs-0.6/crypt.h
-include/sfs-0.6/crypt_prot.h
-include/sfs-0.6/crypt_prot.x
-include/sfs-0.6/crypthash.h
-include/sfs-0.6/dns.h
-include/sfs-0.6/dnsparse.h
-include/sfs-0.6/err.h
-include/sfs-0.6/esign.h
-include/sfs-0.6/fdlim.h
-include/sfs-0.6/getfh3.h
-include/sfs-0.6/hashcash.h
-include/sfs-0.6/ihash.h
-include/sfs-0.6/init.h
-include/sfs-0.6/itree.h
-include/sfs-0.6/keyfunc.h
-include/sfs-0.6/list.h
-include/sfs-0.6/modalg.h
-include/sfs-0.6/mount_prot.h
-include/sfs-0.6/mount_prot.x
-include/sfs-0.6/msb.h
-include/sfs-0.6/nfs3_ext.x
-include/sfs-0.6/nfs3_nonnul.h
-include/sfs-0.6/nfs3_prot.h
-include/sfs-0.6/nfs3_prot.x
-include/sfs-0.6/nfs3close_prot.h
-include/sfs-0.6/nfs3close_prot.x
-include/sfs-0.6/nfs3exp_prot.h
-include/sfs-0.6/nfs3exp_prot.x
-include/sfs-0.6/nfs_prot.h
-include/sfs-0.6/nfs_prot.x
-include/sfs-0.6/nfsmounter.h
-include/sfs-0.6/nfsmounter.x
-include/sfs-0.6/nfsserv.h
-include/sfs-0.6/nfstrans.h
-include/sfs-0.6/opnew.h
-include/sfs-0.6/parseopt.h
-include/sfs-0.6/password.h
-include/sfs-0.6/pcre.h
-include/sfs-0.6/pmap_prot.h
-include/sfs-0.6/pmap_prot.x
-include/sfs-0.6/prime.h
-include/sfs-0.6/prng.h
-include/sfs-0.6/qhash.h
-include/sfs-0.6/rabin.h
-include/sfs-0.6/refcnt.h
-include/sfs-0.6/rex.h
-include/sfs-0.6/rex_prot.h
-include/sfs-0.6/rex_prot.x
-include/sfs-0.6/rpctypes.h
-include/sfs-0.6/rwfd.h
-include/sfs-0.6/rxx.h
-include/sfs-0.6/seqno.h
-include/sfs-0.6/serial.h
-include/sfs-0.6/sfs-internal.h
-include/sfs-0.6/sfs_prot.h
-include/sfs-0.6/sfs_prot.x
-include/sfs-0.6/sfsagent.h
-include/sfs-0.6/sfsagent.x
-include/sfs-0.6/sfsauth_prot.h
-include/sfs-0.6/sfsauth_prot.x
-include/sfs-0.6/sfscd_prot.h
-include/sfs-0.6/sfscd_prot.x
-include/sfs-0.6/sfsclient.h
-include/sfs-0.6/sfsconnect.h
-include/sfs-0.6/sfskeymisc.h
-include/sfs-0.6/sfsmisc.h
-include/sfs-0.6/sfsro_prot.h
-include/sfs-0.6/sfsro_prot.x
-include/sfs-0.6/sfsserv.h
-include/sfs-0.6/sfstty.h
-include/sfs-0.6/sha1.h
-include/sfs-0.6/srp.h
-include/sfs-0.6/stllike.h
-include/sfs-0.6/str.h
-include/sfs-0.6/suio++.h
-include/sfs-0.6/sysconf.h
-include/sfs-0.6/tiger.h
-include/sfs-0.6/union.h
-include/sfs-0.6/uvfstrans.h
-include/sfs-0.6/vatmpl.h
-include/sfs-0.6/vec.h
-include/sfs-0.6/wmstr.h
-include/sfs-0.6/xdr_suio.h
-include/sfs-0.6/xdrmisc.h
-include/sfs-0.6/xhinfo.h
 include/sfs.h
-@dirrm include/sfs-0.6
+include/sfs-%%SFS_VERSION%%/aclnt.h
+include/sfs-%%SFS_VERSION%%/aes.h
+include/sfs-%%SFS_VERSION%%/afsnode.h
+include/sfs-%%SFS_VERSION%%/agentconn.h
+include/sfs-%%SFS_VERSION%%/agentmisc.h
+include/sfs-%%SFS_VERSION%%/aiod.h
+include/sfs-%%SFS_VERSION%%/aiod_prot.h
+include/sfs-%%SFS_VERSION%%/aios.h
+include/sfs-%%SFS_VERSION%%/amisc.h
+include/sfs-%%SFS_VERSION%%/arc4.h
+include/sfs-%%SFS_VERSION%%/arena.h
+include/sfs-%%SFS_VERSION%%/arpc.h
+include/sfs-%%SFS_VERSION%%/array.h
+include/sfs-%%SFS_VERSION%%/asrv.h
+include/sfs-%%SFS_VERSION%%/async.h
+include/sfs-%%SFS_VERSION%%/autoconf.h
+include/sfs-%%SFS_VERSION%%/axprt.h
+include/sfs-%%SFS_VERSION%%/axprt_crypt.h
+include/sfs-%%SFS_VERSION%%/backoff.h
+include/sfs-%%SFS_VERSION%%/bbuddy.h
+include/sfs-%%SFS_VERSION%%/bench.h
+include/sfs-%%SFS_VERSION%%/bigint.h
+include/sfs-%%SFS_VERSION%%/bitvec.h
+include/sfs-%%SFS_VERSION%%/blowfish.h
+include/sfs-%%SFS_VERSION%%/callback.h
+include/sfs-%%SFS_VERSION%%/cbuf.h
+include/sfs-%%SFS_VERSION%%/crypt.h
+include/sfs-%%SFS_VERSION%%/crypt_prot.h
+include/sfs-%%SFS_VERSION%%/crypt_prot.x
+include/sfs-%%SFS_VERSION%%/crypthash.h
+include/sfs-%%SFS_VERSION%%/dns.h
+include/sfs-%%SFS_VERSION%%/dnsparse.h
+include/sfs-%%SFS_VERSION%%/err.h
+include/sfs-%%SFS_VERSION%%/esign.h
+include/sfs-%%SFS_VERSION%%/fdlim.h
+include/sfs-%%SFS_VERSION%%/getfh3.h
+include/sfs-%%SFS_VERSION%%/hashcash.h
+include/sfs-%%SFS_VERSION%%/ihash.h
+include/sfs-%%SFS_VERSION%%/init.h
+include/sfs-%%SFS_VERSION%%/itree.h
+include/sfs-%%SFS_VERSION%%/keyfunc.h
+include/sfs-%%SFS_VERSION%%/list.h
+include/sfs-%%SFS_VERSION%%/modalg.h
+include/sfs-%%SFS_VERSION%%/mount_prot.h
+include/sfs-%%SFS_VERSION%%/mount_prot.x
+include/sfs-%%SFS_VERSION%%/msb.h
+include/sfs-%%SFS_VERSION%%/nfs3_ext.x
+include/sfs-%%SFS_VERSION%%/nfs3_nonnul.h
+include/sfs-%%SFS_VERSION%%/nfs3_prot.h
+include/sfs-%%SFS_VERSION%%/nfs3_prot.x
+include/sfs-%%SFS_VERSION%%/nfs3close_prot.h
+include/sfs-%%SFS_VERSION%%/nfs3close_prot.x
+include/sfs-%%SFS_VERSION%%/nfs3exp_prot.h
+include/sfs-%%SFS_VERSION%%/nfs3exp_prot.x
+include/sfs-%%SFS_VERSION%%/nfs_prot.h
+include/sfs-%%SFS_VERSION%%/nfs_prot.x
+include/sfs-%%SFS_VERSION%%/nfsmounter.h
+include/sfs-%%SFS_VERSION%%/nfsmounter.x
+include/sfs-%%SFS_VERSION%%/nfsserv.h
+include/sfs-%%SFS_VERSION%%/nfstrans.h
+include/sfs-%%SFS_VERSION%%/opnew.h
+include/sfs-%%SFS_VERSION%%/parseopt.h
+include/sfs-%%SFS_VERSION%%/password.h
+include/sfs-%%SFS_VERSION%%/pcre.h
+include/sfs-%%SFS_VERSION%%/pmap_prot.h
+include/sfs-%%SFS_VERSION%%/pmap_prot.x
+include/sfs-%%SFS_VERSION%%/prime.h
+include/sfs-%%SFS_VERSION%%/prng.h
+include/sfs-%%SFS_VERSION%%/qhash.h
+include/sfs-%%SFS_VERSION%%/rabin.h
+include/sfs-%%SFS_VERSION%%/refcnt.h
+include/sfs-%%SFS_VERSION%%/rex.h
+include/sfs-%%SFS_VERSION%%/rex_prot.h
+include/sfs-%%SFS_VERSION%%/rex_prot.x
+include/sfs-%%SFS_VERSION%%/rpctypes.h
+include/sfs-%%SFS_VERSION%%/rwfd.h
+include/sfs-%%SFS_VERSION%%/rxx.h
+include/sfs-%%SFS_VERSION%%/schnorr.h
+include/sfs-%%SFS_VERSION%%/seqno.h
+include/sfs-%%SFS_VERSION%%/serial.h
+include/sfs-%%SFS_VERSION%%/sfs-internal.h
+include/sfs-%%SFS_VERSION%%/sfs_prot.h
+include/sfs-%%SFS_VERSION%%/sfs_prot.x
+include/sfs-%%SFS_VERSION%%/sfsagent.h
+include/sfs-%%SFS_VERSION%%/sfsagent.x
+include/sfs-%%SFS_VERSION%%/sfsauth_prot.h
+include/sfs-%%SFS_VERSION%%/sfsauth_prot.x
+include/sfs-%%SFS_VERSION%%/sfscd_prot.h
+include/sfs-%%SFS_VERSION%%/sfscd_prot.x
+include/sfs-%%SFS_VERSION%%/sfsclient.h
+include/sfs-%%SFS_VERSION%%/sfsconnect.h
+include/sfs-%%SFS_VERSION%%/sfscrypt.h
+include/sfs-%%SFS_VERSION%%/sfsextauth.h
+include/sfs-%%SFS_VERSION%%/sfskeymgr.h
+include/sfs-%%SFS_VERSION%%/sfskeymisc.h
+include/sfs-%%SFS_VERSION%%/sfsmisc.h
+include/sfs-%%SFS_VERSION%%/sfsro_prot.h
+include/sfs-%%SFS_VERSION%%/sfsro_prot.x
+include/sfs-%%SFS_VERSION%%/sfsschnorr.h
+include/sfs-%%SFS_VERSION%%/sfsserv.h
+include/sfs-%%SFS_VERSION%%/sfstty.h
+include/sfs-%%SFS_VERSION%%/sha1.h
+include/sfs-%%SFS_VERSION%%/srp.h
+include/sfs-%%SFS_VERSION%%/stllike.h
+include/sfs-%%SFS_VERSION%%/str.h
+include/sfs-%%SFS_VERSION%%/suio++.h
+include/sfs-%%SFS_VERSION%%/sysconf.h
+include/sfs-%%SFS_VERSION%%/tiger.h
+include/sfs-%%SFS_VERSION%%/union.h
+include/sfs-%%SFS_VERSION%%/uvfstrans.h
+include/sfs-%%SFS_VERSION%%/vatmpl.h
+include/sfs-%%SFS_VERSION%%/vec.h
+include/sfs-%%SFS_VERSION%%/wmstr.h
+include/sfs-%%SFS_VERSION%%/xdr_suio.h
+include/sfs-%%SFS_VERSION%%/xdrmisc.h
+include/sfs-%%SFS_VERSION%%/xhinfo.h
+@dirrm include/sfs-%%SFS_VERSION%%
 @unexec install-info --delete %D/info/sfs.info %D/info/dir
 info/sfs.info
 info/sfs.info-1
 info/sfs.info-2
+info/sfs.info-3
 @exec install-info %D/info/sfs.info %D/info/dir
 lib/libsfs.a
 lib/sfs
-lib/sfs-0.6/aiod
-lib/sfs-0.6/connect
-lib/sfs-0.6/libarpc.a
-lib/sfs-0.6/libarpc.la
-lib/sfs-0.6/libasync.a
-lib/sfs-0.6/libasync.la
-lib/sfs-0.6/libsfscrypt.a
-lib/sfs-0.6/libsfscrypt.la
-lib/sfs-0.6/libsfsmisc.a
-lib/sfs-0.6/libsfsmisc.la
-lib/sfs-0.6/libsvc.a
-lib/sfs-0.6/libsvc.la
-lib/sfs-0.6/listen
-lib/sfs-0.6/mallock.o
-lib/sfs-0.6/moduled
-lib/sfs-0.6/newaid
-lib/sfs-0.6/nfsmounter
-lib/sfs-0.6/pathinfo
-lib/sfs-0.6/proxy
-lib/sfs-0.6/ptyd
-lib/sfs-0.6/rexd
-lib/sfs-0.6/sfsauthd
-lib/sfs-0.6/sfsrwcd
-lib/sfs-0.6/sfsrwsd
-lib/sfs-0.6/suidconnect
-lib/sfs-0.6/ttyd
-lib/sfs-0.6/xfer
-@dirrm lib/sfs-0.6
+lib/sfs-%%SFS_VERSION%%/aiod
+lib/sfs-%%SFS_VERSION%%/connect
+lib/sfs-%%SFS_VERSION%%/libarpc.a
+lib/sfs-%%SFS_VERSION%%/libarpc.la
+lib/sfs-%%SFS_VERSION%%/libasync.a
+lib/sfs-%%SFS_VERSION%%/libasync.la
+lib/sfs-%%SFS_VERSION%%/libsfscrypt.a
+lib/sfs-%%SFS_VERSION%%/libsfscrypt.la
+lib/sfs-%%SFS_VERSION%%/libsfsmisc.a
+lib/sfs-%%SFS_VERSION%%/libsfsmisc.la
+lib/sfs-%%SFS_VERSION%%/libsvc.a
+lib/sfs-%%SFS_VERSION%%/libsvc.la
+lib/sfs-%%SFS_VERSION%%/listen
+lib/sfs-%%SFS_VERSION%%/mallock.o
+lib/sfs-%%SFS_VERSION%%/moduled
+lib/sfs-%%SFS_VERSION%%/newaid
+lib/sfs-%%SFS_VERSION%%/nfsmounter
+lib/sfs-%%SFS_VERSION%%/pathinfo
+lib/sfs-%%SFS_VERSION%%/proxy
+lib/sfs-%%SFS_VERSION%%/ptyd
+lib/sfs-%%SFS_VERSION%%/rexd
+lib/sfs-%%SFS_VERSION%%/sfsauthd
+lib/sfs-%%SFS_VERSION%%/sfsrwcd
+lib/sfs-%%SFS_VERSION%%/sfsrwsd
+lib/sfs-%%SFS_VERSION%%/upgradedb.pl
+@group sfs
+lib/sfs-%%SFS_VERSION%%/suidconnect
+@group
+lib/sfs-%%SFS_VERSION%%/ttyd
+lib/sfs-%%SFS_VERSION%%/xfer
+@dirrm lib/sfs-%%SFS_VERSION%%
 sbin/funmount
 sbin/sfscd
 sbin/sfssd
+sbin/vidb
 share/doc/sfs/WELCOME
 share/doc/sfs/README
 share/doc/sfs/README.packageblurb
+share/doc/sfs/README.0.7-upgrade
 @dirrm share/doc/sfs
+share/sfs/agentrc
 share/sfs/sfs_config
 share/sfs/sfs_srp_parms
 share/sfs/sfsauthd_config