Builds and installs on Solaris. The changes:

o various explicit #includes
o sources use {u_,u}int*_t in equal share, so just build with -D
o providing Solaris' MAXHOSTNAMELEN with -D avoids patching half a dozen files
o misc. build fixes

Use pkgsrc CONF_FILES framework
Make pkglint happy

TODO: Test on Solaris, SMF config files for venus and server


(hauke)

$NetBSD: patch-coda-src_kerndep_coda.h,v 1.1 2015/01/27 15:21:52 hauke Exp $

SunOS defines int*_t, but not u_int*_t.
    
--- ./coda-src/kerndep/coda.h.orig	2007-08-01 18:32:36.000000000 +0000
+++ ./coda-src/kerndep/coda.h
@@ -112,11 +112,14 @@ typedef unsigned long long u_quad_t;
 #endif
 
 /* Solaris Definitions */
-#if defined(sun)
+#if defined(__sun) && defined(__SVR4)
 #include <sys/types.h>
 #include <sys/time.h>
+typedef unsigned char	    u_int8_t;
+typedef unsigned short	   u_int16_t;
+typedef unsigned int	   u_int32_t;
 typedef unsigned long long u_quad_t;
-#undef __BIT_TYPES_DEFINED__
+#define __BIT_TYPES_DEFINED__
 #endif
 
 /* Mac OS X / Darwin */

$NetBSD: patch-coda-src_librepair_repio.cc,v 1.1 2015/01/27 15:21:52 hauke Exp $

SunOS has ERR #defined somewhere, rename goto label

--- ./coda-src/librepair/repio.cc.orig	2007-12-17 17:20:11.000000000 +0000
+++ ./coda-src/librepair/repio.cc
@@ -179,7 +179,7 @@ int repair_getdfile(char *fname, int inf
 
     if (replicaList == NULL) {
       sprintf(errmsg, "repair_getdfile: bad replicaList ptr!");
-      goto ERR;
+      goto Error;
     }
 
     if (fname == NULL) ff = fdopen(infd, "r");
@@ -195,14 +195,14 @@ int repair_getdfile(char *fname, int inf
     fread(&x, sizeof(int), 1, ff);
     if (ferror(ff) || feof(ff)) {
       sprintf(errmsg, "repair_getdfile: replicaCount parsing failed!");
-      goto ERR;
+      goto Error;
     }
     *replicaCount = ntohl(x);
 
     *replicaList = (struct listhdr *) calloc(*replicaCount, sizeof(struct listhdr));
     if (*replicaList == NULL) {
       sprintf(errmsg, "repair_getdfile: replicaList allocation failed!\n\telements= %x\tx= %d\tsizeof(struct listhdr)= %d\n", *replicaCount, x, sizeof(struct listhdr));
-      goto ERR;
+      goto Error;
     }
 
     perror("repair_getdfile: list created");
@@ -211,14 +211,14 @@ int repair_getdfile(char *fname, int inf
 	fread(&x, sizeof(int), 1, ff);
 	if (ferror(ff) || feof(ff)) {
 	  sprintf(errmsg, "repair_getdfile: fread failed!");
-	  goto ERR;
+	  goto Error;
 	}
 	(*replicaList)[i].replicaFid.Volume  = ntohl(x);
 
 	fread(&x, sizeof(int), 1, ff);
 	if (ferror(ff) || feof(ff)) {
 	  sprintf(errmsg, "repair_getdfile: fread failed!");
-	  goto ERR;
+	  goto Error;
 	}
 
 	(*replicaList)[i].repairCount  = ntohl(x);	
@@ -232,7 +232,7 @@ int repair_getdfile(char *fname, int inf
 					 sizeof(struct repair));
 	    if (!r) {
 	      sprintf(errmsg, "repair_getdfile: repair calloc failed!\n\tcount = %d\tsize = %d\n\n", (*replicaList)[i].repairCount, sizeof(struct repair));
-	      goto ERR;
+	      goto Error;
 	    }
 	    (*replicaList)[i].repairList = r;
 	}
@@ -245,7 +245,7 @@ int repair_getdfile(char *fname, int inf
 	    fread(&x, sizeof(int), 1, ff);
 	    if (ferror(ff) || feof(ff)) {
 	      sprintf(errmsg, "repair_getdfile: fread failed!\n");
-	      goto ERR;
+	      goto Error;
 	    }
 	    r[j].opcode = ntohl(x);
 
@@ -253,7 +253,7 @@ int repair_getdfile(char *fname, int inf
 	    fgets(s, MAXNAMELEN, ff);
 	    if (ferror(ff) || feof(ff)) {
 	      sprintf(errmsg, "repair_getdfile: fread failed!\n");
-	      goto ERR;
+	      goto Error;
 	    }
 	    *(s + strlen(s) - 1) = 0;  /* nuke the '\n' left behind by fgets() */
 
@@ -261,7 +261,7 @@ int repair_getdfile(char *fname, int inf
 	    fgets(s, MAXNAMELEN, ff);
 	    if (ferror(ff) || feof(ff)) {
 	      sprintf(errmsg, "repair_getdfile: fread failed!\n");
-	      goto ERR;
+	      goto Error;
 	    }
 	    *(s + strlen(s) - 1) = 0;  /* nuke the '\n' left behind by fgets() */
 
@@ -269,7 +269,7 @@ int repair_getdfile(char *fname, int inf
 		fread(&x, sizeof(int), 1, ff);
 		if (ferror(ff) || feof(ff)) {
 		  sprintf(errmsg, "repair_getdfile: fread failed!\n");
-		  goto ERR;
+		  goto Error;
 		}
 		r[j].parms[k] = ntohl(x);
 	    }
@@ -283,7 +283,7 @@ int repair_getdfile(char *fname, int inf
 
     return(0);
 
- ERR: /* Error exit */
+ Error: /* Error exit */
     perror(errmsg);
     if(fname != NULL)
       fclose(ff);

$NetBSD: patch-coda-src_resolution_rescoord.cc,v 1.1 2015/01/27 15:21:52 hauke Exp $

SunOS does not implicitly include <fcntl.h>.

--- coda-src/resolution/rescoord.cc.orig	2006-11-02 19:46:35.000000000 +0000
+++ coda-src/resolution/rescoord.cc
@@ -32,6 +32,7 @@ extern "C" {
 #include <sys/types.h>
 #include "coda_assert.h"
 #include <stdio.h>
+#include <fcntl.h>  
 #include <struct.h>
 #include <lwp/lwp.h>
 #include <rpc2/rpc2.h>

$NetBSD: patch-coda-src_venus_Makefile.in,v 1.1 2015/01/27 15:21:52 hauke Exp $

Leave it to the CONF_FILES framework to install config files.

--- coda-src/venus/Makefile.in.orig	2010-03-29 19:14:02.000000000 +0000
+++ coda-src/venus/Makefile.in
@@ -294,7 +294,7 @@ top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
 @BUILD_CLIENT_TRUE@dist_man_MANS = venus.8 vutil.8
-@BUILD_CLIENT_TRUE@dist_sysconf_DATA = venus.conf.ex realms
+@BUILD_CLIENT_TRUE@dist_sysconf_DATA = 
 venus_SOURCES = binding.cc binding.h comm.cc comm.h comm_daemon.cc daemon.cc \
     fso.h fso0.cc fso1.cc fso_cachefile.cc fso_cfscalls0.cc fso_cfscalls1.cc \
     fso_cfscalls2.cc fso_daemon.cc fso_dir.cc hdb.cc hdb.h hdb_daemon.cc \

$NetBSD: patch-coda-src_venus_fso_dir.cc,v 1.1 2015/01/27 15:21:52 hauke Exp $

SunOS does not implicitly include <fcntl.h>.

--- ./coda-src/venus/fso_dir.cc.orig	2010-03-23 18:10:43.000000000 +0000
+++ ./coda-src/venus/fso_dir.cc
@@ -35,6 +35,7 @@ extern "C" {
 #include <sys/types.h>
 #include <sys/file.h>
 #include <sys/stat.h>
+#include <fcntl.h>
 #include <errno.h>
 #include "coda_string.h"
 #include <unistd.h>

$NetBSD: patch-coda-src_venus_venus.cc,v 1.1 2015/01/27 15:21:52 hauke Exp $

SunOS does not implicitly include <fcntl.h>.

--- ./coda-src/venus/venus.cc.orig	2009-02-13 20:51:05.000000000 +0000
+++ ./coda-src/venus/venus.cc
@@ -27,6 +27,7 @@ extern "C" {
 #include <sys/file.h>
 #include <sys/types.h>
 #include <sys/stat.h>
+#include <fcntl.h>
 #include <sys/time.h>
 #include <sys/resource.h>
 #include <sys/param.h>

$NetBSD: patch-coda-src_venus_vproc_vfscalls.cc,v 1.1 2015/01/27 15:21:52 hauke Exp $

The .vtype struct field is not declared for SunOS.

--- ./coda-src/venus/vproc_vfscalls.cc.orig	2009-02-13 20:50:21.000000000 +0000
+++ ./coda-src/venus/vproc_vfscalls.cc
@@ -124,7 +124,9 @@ void vproc::vget(struct venus_cnode *vpp
 	worker *w = (worker *)this;
 	union outputArgs *out = (union outputArgs *)w->msg->msg_buf;
 	out->coda_vget.Fid = *VenusToKernelFid(&cfidp->cfid_fid);
+#ifdef CDT_UNKNOWN
 	out->coda_vget.vtype = CDT_UNKNOWN;
+#endif        
 	w->Return(w->msg, sizeof(struct coda_vget_out));
     }
 

$NetBSD: patch-coda-src_venus_worker.cc,v 1.1 2015/01/27 15:21:52 hauke Exp $

Added experimental code to support mounting on NetBSD >= 4.99.24. The
magic value of 256 is taken from coda_vfsops in coda_vfsops.c.

gcc 4.7 on SunOS insists on de-'const'ifying venusRoot.

--- coda-src/venus/worker.cc.orig	2008-10-06 16:52:22.000000000 +0000
+++ coda-src/venus/worker.cc
@@ -403,11 +403,19 @@ void VFSMount()
 	    error = nmount(md, 6, 0);
 	}
 #endif
-			
+
+#if defined(__NetBSD__) && __NetBSD_Version__ >= 499002400   /* 4.99.24 */
+	if (error < 0)
+	    error = mount("coda", venusRoot, 0, (void *)kernDevice, 256);
+	if (error < 0)
+	    error = mount("cfs", venusRoot, 0, (void *)kernDevice, 256);
+#else
 	if (error < 0)
 	    error = mount("coda", venusRoot, 0, kernDevice);
 	if (error < 0)
 	    error = mount("cfs", venusRoot, 0, kernDevice);
+#endif
+
 #if defined(__FreeBSD__) && !defined(__FreeBSD_version)
 #define MOUNT_CFS 19
 	if (error < 0)
@@ -492,7 +500,8 @@ child_done:
 	  mnttab = fopen(MNTTAB, "a+");
 	  if (mnttab != NULL) {
 	    mt.mnt_special = "CODA";
-	    mt.mnt_mountp = venusRoot;
+            /* XXX */
+	    mt.mnt_mountp = (char *)venusRoot;
 	    mt.mnt_fstype = "CODA";
 	    mt.mnt_mntopts = "rw";
 	    mt.mnt_time = tm;

$NetBSD: patch-coda-src_vice_Makefile.in,v 1.1 2015/01/27 15:21:52 hauke Exp $

Leave it to the CONF_FILES framework to install config files.

--- coda-src/vice/Makefile.in.orig	2010-03-29 19:14:02.000000000 +0000
+++ coda-src/vice/Makefile.in
@@ -303,7 +303,7 @@ top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
 @BUILD_SERVER_TRUE@noinst_LTLIBRARIES = libviceerror.la
 @BUILD_SERVER_TRUE@dist_man_MANS = codasrv.8 servers.5
-@BUILD_SERVER_TRUE@dist_sysconf_DATA = server.conf.ex
+@BUILD_SERVER_TRUE@dist_sysconf_DATA = 
 libviceerror_la_SOURCES = ViceErrorMsg.c
 codasrv_SOURCES = srv.cc srvproc.cc srvproc2.cc coppend.cc coppend.h \
 		  codaproc.cc codaproc.h codaproc2.cc clientproc.cc vicecb.cc \

$NetBSD: patch-coda-src_vice_codaproc2.cc,v 1.1 2015/01/27 15:21:52 hauke Exp $

SunOS does not implicitly include <limits.h>.

--- coda-src/vice/codaproc2.cc.orig	2009-07-27 20:43:23.000000000 +0000
+++ coda-src/vice/codaproc2.cc
@@ -35,6 +35,7 @@ extern "C" {
 #endif
 
 #include <sys/types.h>
+#include <limits.h>  
 #include <sys/stat.h>
 #include <sys/time.h>
 #include <sys/file.h>

$NetBSD: patch-coda-src_volutil_vol-ancient.cc,v 1.1 2015/01/27 15:21:52 hauke Exp $

SunOS does not implicitly include <limits.h>.

--- coda-src/volutil/vol-ancient.cc.orig	2006-05-27 16:03:34.000000000 +0000
+++ coda-src/volutil/vol-ancient.cc
@@ -21,6 +21,7 @@ extern "C" {
 #endif
 
 #include <sys/types.h>
+#include <limits.h>
 #include <errno.h>
 
 #include <lwp/lwp.h>

$NetBSD: patch-coda-src_volutil_vol-dump.cc,v 1.1 2015/01/27 15:21:52 hauke Exp $

SunOS does not implicitly include <limits.h>.

--- coda-src/volutil/vol-dump.cc.orig	2008-08-08 19:09:39.000000000 +0000
+++ coda-src/volutil/vol-dump.cc
@@ -50,6 +50,7 @@ extern "C" {
 #include <errno.h>
 #include <sys/stat.h>
 #include <stdio.h>
+#include <limits.h>  
 #include <sys/file.h>
 #include <netinet/in.h>
 

$NetBSD: patch-coda-src_kerndep_pioctl.h,v 1.3 2015/01/27 15:21:52 hauke Exp $

SunOS wants missing _IOC* defines, too.
    
--- coda-src/kerndep/pioctl.h.orig	2006-11-03 15:58:08.000000000 +0000
+++ coda-src/kerndep/pioctl.h
@@ -81,7 +81,7 @@ int pioctl(const char *path, unsigned lo
 /* unpacking macros */
 #ifndef _IOC_NR
 
-#if defined(__NetBSD__) || defined(__FreeBSD__)
+#if defined(__NetBSD__) || defined(__FreeBSD__) || (defined (__sun) && defined(__SVR4))
 #define _IOC_TYPEMASK	0xff
 #define _IOC_TYPESHIFT	8
 #define _IOC_NRMASK	0xff

$NetBSD: patch-coda-src_venus_venusrecov.cc,v 1.3 2015/01/27 15:21:52 hauke Exp $

SunOS does not implicitly include <limits.h>.

--- ./coda-src/venus/venusrecov.cc.orig	2008-10-06 16:52:18.000000000 +0000
+++ ./coda-src/venus/venusrecov.cc
@@ -35,6 +35,7 @@ extern "C" {
 #include <stdio.h>
 #include "coda_string.h"
 #include <sys/param.h>
+#include <limits.h>
 #include <sys/file.h>
 #include <sys/stat.h>
 #include <sys/wait.h>