14 files changed, 293 insertions, 313 deletions

diff --git a/security/sfs/Makefile b/security/sfs/Makefile
index 5172fa9e9044..23d45d7736db 100644
--- a/security/sfs/Makefile
+++ b/security/sfs/Makefile
@@ -7,27 +7,25 @@
 #
 
 PORTNAME=	sfs
-PORTVERSION=	0.6
-PORTREVISION=	2
+PORTVERSION=	0.7.2
 CATEGORIES=	security net
-MASTER_SITES=	http://www.fs.net/sfs/new-york.lcs.mit.edu:85xq6pznt4mgfvj4mb23x6b8adak55ue/pub/sfswww/dist/
+MASTER_SITES=	http://www.fs.net/sfs/@new-york.lcs.mit.edu,u83s4uk49nt8rmp4uwmt2exvz6d3cavh/pub/sfswww/dist/
 
 MAINTAINER=	handler@grendel.net
 
-.include <bsd.port.pre.mk>
+PLIST_SUB=	SFS_VERSION=${PORTVERSION}
 
 USE_GMAKE=	yes
-USE_OPENSSL=	yes
-USE_BISON=	yes
 
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS+=--with-sfsuser=sfs \
 		--with-sfsgroup=sfs \
 		--with-sfsdir=/var/spool/sfs \
 		--with-etcdir=${PREFIX}/etc/sfs \
-		--with-openssl=${OPENSSLBASE} \
 		--disable-uvfs
 
+.include <bsd.port.pre.mk>
+
 .if ${OSVERSION} > 500000
 LIB_DEPENDS+=	gmp.6:${PORTSDIR}/math/libgmp4
 CONFIGURE_ARGS+=--with-gmp=${PREFIX}
@@ -36,6 +34,8 @@ CONFIGURE_ARGS+=--with-gmp=/usr
 .endif
 
 MAN1=	\
+		dirsearch.1 \
+		newaid.1 \
 		rex.1 \
 		sfsagent.1 \
 		sfskey.1 \
@@ -43,24 +43,33 @@ MAN1=	\
 
 MAN5=	\
 		sfs_config.5 \
-		sfs_users.5 \
-		sfscd_config.5 \
-		sfssd_config.5 \
 		sfs_srp_params.5 \
+		sfs_users.5 \
 		sfsauthd_config.5 \
-		sfsrwsd_config.5
+		sfscd_config.5 \
+		sfsrwsd_config.5 \
+		sfssd_config.5
+
+MAN7=	\
+		sfs.7
 
 MAN8=	\
+		funmount.8 \
 		sfsauthd.8 \
 		sfscd.8 \
 		sfsrwsd.8 \
-		sfssd.8
+		sfssd.8 \
+		vidb.8
 
 post-extract:
 	@${SED} -e "s=%%PREFIX%%=${PREFIX}=g" ${FILESDIR}/sfscd.sh > ${WRKSRC}/sfscd.sh
 	@${SED} -e "s=%%PREFIX%%=${PREFIX}=g" ${FILESDIR}/sfssd.sh > ${WRKSRC}/sfssd.sh
 
+pre-install:
+	PKG_PREFIX=${PREFIX} ${SH} pkg-install ${PKGNAME} PRE-INSTALL
+
 post-install:
+	${INSTALL_SCRIPT} ${WRKSRC}/sfsauthd/upgradedb.pl ${PREFIX}/lib/sfs-${PORTVERSION}/upgradedb.pl
 	${INSTALL_SCRIPT} ${WRKSRC}/sfscd.sh ${PREFIX}/etc/rc.d/sfscd.sh.sample
 	${INSTALL_SCRIPT} ${WRKSRC}/sfssd.sh ${PREFIX}/etc/rc.d/sfssd.sh.sample
 	${MKDIR} ${PREFIX}/etc/sfs
@@ -69,6 +78,7 @@ post-install:
 	${INSTALL_DATA} ${FILESDIR}/share-doc-WELCOME ${PREFIX}/share/doc/sfs/WELCOME
 	${INSTALL_DATA} ${FILESDIR}/share-doc-README ${PREFIX}/share/doc/sfs/README
 	${INSTALL_DATA} ${WRKSRC}/README ${PREFIX}/share/doc/sfs/README.packageblurb
+	${INSTALL_DATA} ${WRKSRC}/README.0.7-upgrade ${PREFIX}/share/doc/sfs/README.0.7-upgrade
 	PKG_PREFIX=${PREFIX} ${SH} pkg-install ${PKGNAME} POST-INSTALL
 
 .include <bsd.port.post.mk>
diff --git a/security/sfs/distinfo b/security/sfs/distinfo
index fac07dc65541..e8fdfce793de 100644
--- a/security/sfs/distinfo
+++ b/security/sfs/distinfo
@@ -1 +1 @@
-MD5 (sfs-0.6.tar.gz) = 0965e874ba18568655e1a7a3f273dc19
+MD5 (sfs-0.7.2.tar.gz) = 1fb559f144c4d367ef01e93beb1dea1e
diff --git a/security/sfs/files/patch-README.0.7-upgrade b/security/sfs/files/patch-README.0.7-upgrade
new file mode 100644
index 000000000000..cc2d91063407
--- /dev/null
+++ b/security/sfs/files/patch-README.0.7-upgrade
@@ -0,0 +1,15 @@
+--- README.0.7-upgrade.orig	Fri Dec  6 01:24:44 2002
++++ README.0.7-upgrade	Fri Dec  6 01:25:41 2002
+@@ -15,10 +15,10 @@
+ 	-------------------
+        	    Run:
+ 
+-		perl sfsauthd/upgradedb.pl
++		perl /usr/local/lib/sfs/upgradedb.pl
+ 
+ 	    By default, the script will operate on the sfs_users
+-	    file in /etc/sfs.  You can alternatively specify files
++	    file in /usr/local/etc/sfs. You can alternatively specify files
+ 	    to upgrade on the command line, or try the -a flag to
+ 	    upgrade all sfs_users files found with the locate utility.
+ 	    If you do not explicitly specify files to upgrade, the
diff --git a/security/sfs/files/patch-async_malloc.C b/security/sfs/files/patch-async_malloc.C
deleted file mode 100644
index e3322c7feffc..000000000000
--- a/security/sfs/files/patch-async_malloc.C
+++ /dev/null
@@ -1,18 +0,0 @@
---- async/malloc.C.orig	Thu Jul 11 21:33:30 2002
-+++ async/malloc.C	Thu Jul 11 21:32:22 2002
-@@ -136,13 +136,13 @@
- 
- 
- void
--operator delete (void *ptr)
-+operator delete (void *ptr) throw ()
- {
-   xfree (ptr);
- }
- 
- void
--operator delete[] (void *ptr)
-+operator delete[] (void *ptr) throw ()
- {
-   xfree (ptr);
- }
diff --git a/security/sfs/files/patch-parse.yy b/security/sfs/files/patch-parse.yy
deleted file mode 100644
index d0ee9e57ca86..000000000000
--- a/security/sfs/files/patch-parse.yy
+++ /dev/null
@@ -1,61 +0,0 @@
---- rpcc/parse.yy.orig	Sat Jan 27 03:43:23 2001
-+++ rpcc/parse.yy	Sun Dec  1 23:45:34 2002
-@@ -1,4 +1,4 @@
--/* $Id: parse.yy,v 1.10 1999/05/14 00:16:01 dm Exp $ */
-+/* $Id: parse.yy,v 1.11 2002/10/23 21:02:33 dm Exp $ */
- 
- /*
-  *
-@@ -23,6 +23,7 @@
- 
- %{
- #include "rpcc.h"
-+#define YYSTYPE YYSTYPE
- 
- static int proc_compare (const void *, const void *);
- static int vers_compare (const void *, const void *);
-@@ -97,6 +98,7 @@
- 	  s->sconst->id = $2;
- 	  s->sconst->val = $4;
- 	}
-+	;
- 
- def_enum: T_ENUM newid '{'
- 	{
-@@ -129,6 +131,7 @@
- 	  s->sunion->tagid = $6;
- 	}
- 	union_taglist '}' ';'
-+	;
- 
- def_program: T_PROGRAM newid '{'
- 	{
-@@ -143,6 +146,7 @@
- 	  qsort (s->sprogram->vers.base (), s->sprogram->vers.size (),
- 		 sizeof (rpc_vers), vers_compare);
- 	}
-+	;
- 
- version_list: version_decl | version_list version_decl
- 	;
-@@ -224,15 +228,19 @@
- 
- struct_decl: declaration
- 	{ symlist.back ().sstruct->decls.push_back ($1); }
-+	;
- 
- enum_taglist: enum_tag {}
- 	| enum_taglist ',' enum_tag {}
-+	;
- 
- enum_tag: enum_cnstag
- 	{ symlist.back ().senum->tags.push_back ($1); }
-+	;
- 
- enum_cnstag: newid '=' value { $$.id = $1; $$.val = $3; }
--	| newid { $$.id = $1; };
-+	| newid { $$.id = $1; }
-+	;
- 
- declaration: type T_ID ';'
- 	 { $$.id = $2; $$.type = $1; $$.qual = rpc_decl::SCALAR; }
diff --git a/security/sfs/files/patch-scan.ll b/security/sfs/files/patch-scan.ll
deleted file mode 100644
index cc6529267ea8..000000000000
--- a/security/sfs/files/patch-scan.ll
+++ /dev/null
@@ -1,17 +0,0 @@
---- rpcc/scan.ll.orig	Sat Jan 27 03:43:23 2001
-+++ rpcc/scan.ll	Sun Dec  1 23:45:45 2002
-@@ -1,5 +1,5 @@
- /* -*-fundamental-*- */
--/* $Id: scan.ll,v 1.7 1999/11/03 15:43:14 dm Exp $ */
-+/* $Id: scan.ll,v 1.8 2002/10/23 21:02:33 dm Exp $ */
- 
- /*
-  *
-@@ -23,6 +23,7 @@
-  */
- 
- %{
-+#define YYSTYPE YYSTYPE
- #include "rpcc.h"
- #include "parse.h"
- 
diff --git a/security/sfs/files/patch-sfsauthd_config b/security/sfs/files/patch-sfsauthd_config
new file mode 100644
index 000000000000..dad9c7f82a9b
--- /dev/null
+++ b/security/sfs/files/patch-sfsauthd_config
@@ -0,0 +1,11 @@
+--- etc/sfsauthd_config.in.orig	Sun Dec  8 17:45:00 2002
++++ etc/sfsauthd_config.in	Sun Dec  8 17:45:15 2002
+@@ -56,7 +56,7 @@
+ ###  Specify a file to log server signature endorsements. This file will
+ ###  provide users with audit information if the client half of their private
+ ###  Schnorr key is compromised.
+-#LogFile /var/sfs/sign_log
++LogFile /var/spool/sfs/sign_log
+ 
+ ###  Specify a certification path to return to the client during an 
+ ###  "sfskey login"; this list of directories will become the arguments
diff --git a/security/sfs/files/patch-sfsdeclog.C b/security/sfs/files/patch-sfsdeclog.C
new file mode 100644
index 000000000000..69688696e2e4
--- /dev/null
+++ b/security/sfs/files/patch-sfsdeclog.C
@@ -0,0 +1,11 @@
+--- sfsauthd/sfsdeclog.C.orig	Wed Jan  1 17:52:31 2003
++++ sfsauthd/sfsdeclog.C	Wed Jan  1 17:52:51 2003
+@@ -43,7 +43,7 @@
+ }
+ 
+ void
+-writewait (int fd)
++writewait (unsigned int fd)
+ {
+   fd_set fds;
+   assert (fd < FD_SETSIZE);
diff --git a/security/sfs/files/patch-upgradedb.pl b/security/sfs/files/patch-upgradedb.pl
new file mode 100644
index 000000000000..ce4825be11ec
--- /dev/null
+++ b/security/sfs/files/patch-upgradedb.pl
@@ -0,0 +1,11 @@
+--- sfsauthd/upgradedb.pl.orig	Fri Dec  6 01:26:18 2002
++++ sfsauthd/upgradedb.pl	Fri Dec  6 01:26:36 2002
+@@ -16,7 +16,7 @@
+ use vars qw [ $LOCATE $SFS_USERS @SFS_CONF_DIRS %FIELDS ];
+ $LOCATE = "locate";
+ $SFS_USERS = "sfs_users";
+-@SFS_CONF_DIRS = qw [ /etc/sfs ];
++@SFS_CONF_DIRS = qw [ /usr/local/etc/sfs ];
+ %FIELDS = ( user => 0, pubkey => 1, privs => 2, srpinfo => 3, privkey => 4); 
+ 
+ 
diff --git a/security/sfs/files/share-doc-README b/security/sfs/files/share-doc-README
index 0feff27b0f75..38ed370b0436 100644
--- a/security/sfs/files/share-doc-README
+++ b/security/sfs/files/share-doc-README
@@ -61,7 +61,7 @@ nfs_client_enable="YES"
 4) Reboot. You should now have a working SFS client, which you can test
    via the following command:
 
-$ cat /sfs/sfs.fs.net:eu4cvv6wcnzscer98yn4qjpjnn9iv6pi/CONGRATULATIONS
+$ cat /sfs/@sfs.fs.net,uzwadtctbjb3dg596waiyru8cx5kb4an/CONGRATULATIONS
 You have set up a working SFS client.
 
 *** Setting up an SFS server
@@ -127,10 +127,10 @@ Export /usr/ports /ports
 7) Reboot. You should now have a working SFS server. sfssd will emit a
    message into /var/log/messages like the following:
 
-sfsrwsd: serving <hostname>:<SFS key>
+sfsrwsd: serving /sfs/@<hostname>,<SFS key>
 
    From a DIFFERENT machine with an SFS client already installed
-   and running, attempt to access /sfs/<hostname>:<SFS key>. Note
+   and running, attempt to access /sfs/@<hostname>,<SFS key>. Note
    that the SFS client machine will have to be able to connect to
    TCP port 4 on the SFS server machine. Note also that you must
    test your SFS server from a separate SFS client machine to avoid
@@ -150,7 +150,7 @@ for details.
 *** SFS configuration files:
 
 [ The following section is taken nearly verbatim from
-<URL:http://www.fs.net/sfs/new-york.lcs.mit.edu:85xq6pznt4mgfvj4mb23x6b8adak55ue/pub/sfswww/sfs.html#SFS%20configuration>. ]
+<URL:http://www.fs.net/sfs/@new-york.lcs.mit.edu,u83s4uk49nt8rmp4uwmt2exvz6d3cavh/pub/sfswww/sfs.html#SFS%20configuration>. ]
 
 SFS comprises a number of programs, many of which have configuration
 files. All programs look for configuration files in two directories--first
diff --git a/security/sfs/files/share-doc-WELCOME b/security/sfs/files/share-doc-WELCOME
index dda96686d6bb..4cae8814fa78 100644
--- a/security/sfs/files/share-doc-WELCOME
+++ b/security/sfs/files/share-doc-WELCOME
@@ -1,7 +1,7 @@
 SFS is now installed. To test your installation, try this (as root):
 
 # /usr/local/sbin/sfscd
-# cat /sfs/sfs.fs.net:eu4cvv6wcnzscer98yn4qjpjnn9iv6pi/CONGRATULATIONS
+# cat /sfs/@sfs.fs.net,uzwadtctbjb3dg596waiyru8cx5kb4an/CONGRATULATIONS
 
 If it worked, you will see:
 
@@ -21,3 +21,7 @@ fully before proceeding. Start with the documentation link on
 There are sample startup files for sfscd and sfssd in /usr/local/etc/rc.d,
 under the name sfscd.sh.sample and sfssd.sh.sample respectively.
 These startup files are not enabled by default.
+
+NOTE TO USERS UPGRADING FROM SFS 0.6: You should read the file
+/usr/local/share/doc/sfs/README.0.7.upgrade for important information
+about converting your existing SFS configuration.
diff --git a/security/sfs/pkg-comment b/security/sfs/pkg-comment
index 4215eff0beef..468a919eb75a 100644
--- a/security/sfs/pkg-comment
+++ b/security/sfs/pkg-comment
@@ -1 +1 @@
-Self-Certifying File System: A secure global network file system.
+Self-Certifying File System: A secure global network file system
diff --git a/security/sfs/pkg-install b/security/sfs/pkg-install
index 631e08839f20..55a4cf6bc94a 100644
--- a/security/sfs/pkg-install
+++ b/security/sfs/pkg-install
@@ -4,10 +4,6 @@ if [ -n "${PACKAGE_BUILDING}" ]; then
 	exit 0
 fi
 
-if [ "$2" != "POST-INSTALL" ]; then
-	exit 0
-fi
-
 KEYFILE="$PKG_PREFIX/etc/sfs/sfs_host_key"
 
 USER=sfs
@@ -18,75 +14,79 @@ PW=/usr/sbin/pw
 
 SFSDIR=/var/spool/sfs
 
-echo -n "Checking for group '$GROUP'... "
-
-if ! ${PW} groupshow $GROUP >/dev/null 2>&1; then
-	echo -n "doesn't exist, adding... "
-	if ${PW} groupadd $GROUP -g ${GID}; then
-		echo "success."
+if [ "$2" = "PRE-INSTALL" ]; then
+	echo -n "Checking for group '$GROUP'... "
+
+	if ! ${PW} groupshow $GROUP >/dev/null 2>&1; then
+		echo -n "doesn't exist, adding... "
+		if ${PW} groupadd $GROUP -g ${GID}; then
+			echo "success."
+		else
+			echo "FAILED!"
+			exit 1
+		fi
 	else
-		echo "FAILED!"
-		exit 1
+		echo "exists."
 	fi
-else
-	echo "exists."
-fi
 
-echo -n "Checking for user '$USER'... "
+	echo -n "Checking for user '$USER'... "
 
-if ! ${PW} usershow $USER >/dev/null 2>&1; then
-	echo -n "doesn't exist, adding... "
-	if ${PW} useradd $USER -u ${UID} -c 'Self-Certifying File System' -d /nonexistent -g $GROUP -s /sbin/nologin -h -; then
-		echo "success."
+	if ! ${PW} usershow $USER >/dev/null 2>&1; then
+		echo -n "doesn't exist, adding... "
+		if ${PW} useradd $USER -u ${UID} -c 'Self-Certifying File System' -d /nonexistent -g $GROUP -s /sbin/nologin -h -; then
+			echo "success."
+		else
+			echo "FAILED!"
+			exit 1
+		fi
 	else
-		echo "FAILED!"
-		exit 1
+		echo "exists."
 	fi
-else
-	echo "exists."
 fi
 
-echo -n "Checking for SFS directory ($SFSDIR)... "
+if [ "$2" = "POST-INSTALL" ]; then
+	echo -n "Checking for SFS directory ($SFSDIR)... "
 
-if [ -d "$SFSDIR" ]; then
-	echo "already exists."
-else
-	echo -n "creating... "
-	if mkdir $SFSDIR; then
-		echo "success."
+	if [ -d "$SFSDIR" ]; then
+		echo "already exists."
 	else
-		echo "FAILED!"
+		echo -n "creating... "
+		if mkdir $SFSDIR; then
+			echo "success."
+		else
+			echo "FAILED!"
+			exit 1
+		fi
+	fi
+
+	if ! chmod 750 $SFSDIR; then
+		echo "chmod 750 $SFSDIR FAILED!"
 		exit 1
 	fi
-fi
 
-if ! chmod 750 $SFSDIR; then
-	echo "chmod 750 $SFSDIR FAILED!"
-	exit 1
-fi
+	if ! chown $USER:$GROUP $SFSDIR; then
+		echo "chown $USER:$GROUP $SFSDIR FAILED!"
+		exit 1
+	fi
 
-if ! chown $USER:$GROUP $SFSDIR; then
-	echo "chown $USER:$GROUP $SFSDIR FAILED!"
-	exit 1
-fi
+	echo -n "Checking for SFS host key ($KEYFILE)... "
 
-echo -n "Checking for SFS host key ($KEYFILE)... "
-
-if [ -f "$KEYFILE" ]; then
-	echo "already exists, not generating."
-else
-	echo "doesn't exist, generating."
-	echo "Starting sfscd for entropy services."
-	$PKG_PREFIX/sbin/sfscd
-	echo -n "Sleeping ten seconds to give sfscd time to start up... "
-	sleep 10
-	echo "done."
-	$PKG_PREFIX/bin/sfskey gen -KP -n `uname -n` $KEYFILE
-	echo -n "Key generation done, killing sfscd... "
-	kill -TERM `cat /var/run/sfscd.pid`
-	echo "done."
-fi
+	if [ -f "$KEYFILE" ]; then
+		echo "already exists, not generating."
+	else
+		echo "doesn't exist, generating."
+		echo "Starting sfscd for entropy services."
+		$PKG_PREFIX/sbin/sfscd
+		echo -n "Sleeping ten seconds to give sfscd time to start up... "
+		sleep 10
+		echo "done."
+		$PKG_PREFIX/bin/sfskey gen -KP -l `uname -n` $KEYFILE
+		echo -n "Key generation done, killing sfscd... "
+		kill -TERM `cat /var/run/sfscd.pid`
+		echo "done."
+	fi
 
-cat $PKG_PREFIX/share/doc/sfs/WELCOME
+	cat $PKG_PREFIX/share/doc/sfs/WELCOME
+fi
 
 exit 0
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