Update to 0.7.2.

PR:		46148
Submitted by:	maintainer

9 files changed, 57 insertions, 101 deletions

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.