-fix build problem on -current due to changed "struct stat",

 reported by Gary Duzan in PR pkg/22274
-being here, uodate to 5.3.20
 changes:
 - Updated for current autoconf/gcc build environment.
 - Repair tries to continue even when not all replicas can be mounted.
 - I _think_ this code fixes the problem where venus dies when it is
   restarted after a local-global conflict and required reinitialization.
 - Added 'masquerade_port' option to venus.conf to force venus to use a
   fixed port when 'masquerade=1'. Simplifies life for strict firewall
   administrators.
 - Improved Kerberos intergration.
 - Fixed the problem where servers would crash when more than 30000 files
   were created in a single volume.

5 files changed, 60 insertions, 42 deletions

diff --git a/net/coda5_server/Makefile.common b/net/coda5_server/Makefile.common
index 051f43bd3ba..fbe44a9e359 100644
--- a/net/coda5_server/Makefile.common
+++ b/net/coda5_server/Makefile.common
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile.common,v 1.2 2002/09/10 11:02:17 jlam Exp $
+# $NetBSD: Makefile.common,v 1.3 2003/08/22 13:17:51 drochner Exp $
 
 DISTNAME?=		coda-${DIST_VERS}
-DIST_VERS?=		5.3.19
+DIST_VERS?=		5.3.20
 CATEGORIES?=		net
 MASTER_SITES?=		ftp://ftp.coda.cs.cmu.edu/pub/coda/src/		\
 			ftp://ftp.coda.cs.cmu.edu/pub/coda/doc/
diff --git a/net/coda5_server/distinfo b/net/coda5_server/distinfo
index 90c195647b1..2d06b91a77d 100644
--- a/net/coda5_server/distinfo
+++ b/net/coda5_server/distinfo
@@ -1,11 +1,12 @@
-$NetBSD: distinfo,v 1.5 2002/06/20 19:28:35 jlam Exp $
+$NetBSD: distinfo,v 1.6 2003/08/22 13:17:51 drochner Exp $
 
-SHA1 (coda-5.3.19.tar.gz) = 2cfa0b04e0590ec9e7f23420a0b7de4f9acfa504
-Size (coda-5.3.19.tar.gz) = 1342652 bytes
+SHA1 (coda-5.3.20.tar.gz) = 295672b04c9f7d79c0ac94f4c900012be4b4e98a
+Size (coda-5.3.20.tar.gz) = 1407831 bytes
 SHA1 (coda-doc-5.2.0-1.tgz) = f54c2d1b454a5d97f50f8c9b30c012d770384c2f
 Size (coda-doc-5.2.0-1.tgz) = 1604755 bytes
-SHA1 (patch-aa) = deac7bc8b153654e1c36adf119085a7dc9171f55
+SHA1 (patch-aa) = 6349c54a1508dc86a8e541db5b6aac310c305dac
 SHA1 (patch-ab) = 25fa067a244ea185f3b24efd3a5762737658e5db
 SHA1 (patch-ac) = f21f883512c4b149d92401d7ec525aa57218761e
 SHA1 (patch-ad) = 21c374be911aeece2a9702ed4abb748c5e92384a
-SHA1 (patch-ae) = da991ef825170e33d746f98834ca1dd2ec009ba0
+SHA1 (patch-ae) = 02731adff7a820d9c66973b8d82b860fa117da39
+SHA1 (patch-af) = 913e40456e30b6b0b465765409009a4486787b09
diff --git a/net/coda5_server/patches/patch-aa b/net/coda5_server/patches/patch-aa
index 86b32c175d5..7c64dc4b0e3 100644
--- a/net/coda5_server/patches/patch-aa
+++ b/net/coda5_server/patches/patch-aa
@@ -1,34 +1,29 @@
-$NetBSD: patch-aa,v 1.10 2002/06/20 19:28:35 jlam Exp $
+$NetBSD: patch-aa,v 1.11 2003/08/22 13:17:52 drochner Exp $
 
---- coda-src/auth2/Makefile.in.orig	Fri May 25 07:48:01 2001
-+++ coda-src/auth2/Makefile.in
-@@ -63,12 +63,13 @@
- ifeq ($(SHORTSYS),djgpp)
- EXECUTABLES = $(CLOG)
- else
--EXECUTABLES = $(CLOG) $(AUTH2) initpw $(AU) cpasswd ctokens cunlog tokentool
-+EXECUTABLES = $(CLOG) $(AUTH2) initpw cpasswd ctokens cunlog tokentool
-+EXECUTABLES += venus-$(AU) vice-$(AU)
- CBINS       = $(CLOG) cpasswd ctokens cunlog
+--- coda-src/auth2/Makefile.in.orig	2002-03-14 23:02:17.000000000 +0100
++++ coda-src/auth2/Makefile.in	2003-08-22 14:00:57.000000000 +0200
+@@ -49,9 +49,9 @@
+ LIBAUSEROBJS=auth2.client.o auser.o avenus.o $(AUTHCOMMON)
  
--CSBINS      = $(AU)
-+CSBINS      = venus-$(AU)
+ CBINS       = clog cpasswd ctokens cunlog
+-CSBINS      = au
++CSBINS      = venus-au
  SBINS       = 
--SSBINS      = $(AU) $(AUTH2) initpw
-+SSBINS      = vice-$(AU) $(AUTH2) initpw
- endif
+-SSBINS      = au auth2 initpw
++SSBINS      = vice-au auth2 initpw
+ EXECUTABLES = $(CBINS) $(CSBINS) $(SBINS) $(SSBINS) tokentool
  
- CFLAGS := -Wall $(CFLAGS)
-@@ -96,6 +97,12 @@
+ #
+@@ -84,6 +84,12 @@
+ au: au.o libauser.a $(DEPLIBS)
+ 	${CC} $(LDFLAGS) $^ ${LIBKRBS} ${LIBS} -o $@
  
- $(AU): au.o libauser.a $(DEPLIBS)
- 	$(CC) $(LDFLAGS) au.o libauser.a $(LIBKRBS) $(LIBS) -o $(AU)
++venus-au: au.o libauser.a $(DEPLIBS)
++	${CC} $(LDFLAGS) $^ ${LIBKRBS} ${LIBS} -o venus-au
 +
-+venus-$(AU): au.o libauser.a $(DEPLIBS)
-+	$(CC) $(LDFLAGS) au.o libauser.a $(LIBKRBS) $(LIBS) -o venus-$(AU)
++vice-au: au.o libauser.a $(DEPLIBS)
++	${CC} $(LDFLAGS) $^ ${LIBKRBS} ${LIBS} -o vice-au
 +
-+vice-$(AU): au.o libauser.a $(DEPLIBS)
-+	$(CC) $(LDFLAGS) au.o libauser.a $(LIBKRBS) $(LIBS) -o vice-$(AU)
+ clog: clog.o tokenfile.o libauser.a ${DEPLIBS}
+ 	${CC} $(LDFLAGS) $^ ${LIBKRBS} ${LIBS} -o $@
  
- $(CLOG): clog.o tokenfile.o libauser.a ${DEPLIBS}
- 	${CC} $(LDFLAGS) clog.o tokenfile.o libauser.a $(LIBKRBS) ${LIBS} -o $(CLOG)
diff --git a/net/coda5_server/patches/patch-ae b/net/coda5_server/patches/patch-ae
index af526207c3a..e676ef2ebae 100644
--- a/net/coda5_server/patches/patch-ae
+++ b/net/coda5_server/patches/patch-ae
@@ -1,22 +1,22 @@
-$NetBSD: patch-ae,v 1.3 2002/06/20 19:28:36 jlam Exp $
+$NetBSD: patch-ae,v 1.4 2003/08/22 13:17:52 drochner Exp $
 
---- configure.orig	Tue Mar 12 15:25:53 2002
-+++ configure
-@@ -1246,6 +1246,7 @@
+--- configure.orig	2002-12-13 22:13:14.000000000 +0100
++++ configure	2003-08-22 14:03:55.000000000 +0200
+@@ -2886,6 +2886,7 @@
      fi
  
- echo $ac_n "checking configuration file location""... $ac_c" 1>&6
+ echo "$as_me:$LINENO: checking configuration file location" >&5
 +if false; then
- echo "configure:1250: checking configuration file location" >&5
+ echo $ECHO_N "checking configuration file location... $ECHO_C" >&6
  case ${prefix} in
      /usr )
-@@ -1272,6 +1273,9 @@
+@@ -2912,6 +2913,9 @@
  	initsuffix='etc'
  	;;
  esac
 +else
 +	initsuffix=etc
 +fi
- echo "$ac_t""${sysconfdir}" 1>&6
- 
+ echo "$as_me:$LINENO: result: ${sysconfdir}" >&5
+ echo "${ECHO_T}${sysconfdir}" >&6
  
diff --git a/net/coda5_server/patches/patch-af b/net/coda5_server/patches/patch-af
new file mode 100644
index 00000000000..35f300e5631
--- /dev/null
+++ b/net/coda5_server/patches/patch-af
@@ -0,0 +1,22 @@
+$NetBSD: patch-af,v 1.1 2003/08/22 13:17:52 drochner Exp $
+
+--- coda-src/venus/vproc.cc.orig	2003-08-22 14:10:41.000000000 +0200
++++ coda-src/venus/vproc.cc	2003-08-22 14:18:53.000000000 +0200
+@@ -764,7 +764,7 @@
+     vap->va_flags = 0; /* must be 0 not IGNORE for BSD */
+ }
+ 
+-
++#if 0
+ void VattrToStat(struct coda_vattr *vap, struct stat *sp) {
+     sp->st_mode = vap->va_mode;
+     sp->st_nlink = vap->va_nlink;
+@@ -788,7 +788,7 @@
+     sp->st_qspare[1] = 0;
+ #endif /* __BSD44__ */
+ }
+-
++#endif
+ 
+ void VPROC_printvattr(struct coda_vattr *vap)
+ {