Index: head/net/coda6_client/Makefile =================================================================== --- head/net/coda6_client/Makefile (revision 444770) +++ head/net/coda6_client/Makefile (revision 444771) @@ -1,13 +1,13 @@ # Created by: Tim Robbins # $FreeBSD$ -PORTREVISION= 3 +PORTREVISION= 4 COMMENT= Client programs for a replicated high-performance network file system MASTERDIR= ${.CURDIR}/../coda6_server PKGDIR= ${.CURDIR} CODA_SUITE= client .include "${MASTERDIR}/Makefile" Index: head/net/coda6_server/Makefile =================================================================== --- head/net/coda6_server/Makefile (revision 444770) +++ head/net/coda6_server/Makefile (revision 444771) @@ -1,49 +1,49 @@ # Created by: Tim Robbins # $FreeBSD$ PORTNAME= coda PORTVERSION= 6.9.4 -PORTREVISION?= 6 +PORTREVISION?= 7 CATEGORIES= net MASTER_SITES= ftp://ftp.coda.cs.cmu.edu/pub/coda/src/ \ ftp://ftp.planetmirror.com/pub/coda/src/ \ ftp://ftp.nctu.edu.tw/mirror/Coda/src/ \ ftp://ftp.wu-wien.ac.at/pub/systems/coda/src/ PKGNAMESUFFIX= -${CODA_SUITE} MAINTAINER= ports@FreeBSD.org COMMENT= Server programs for a replicated high-performance network file system LIB_DEPENDS= liblwp.so:devel/lwp \ librpc2.so:devel/rpc2 \ librvmlwp.so:devel/rvm USES= pkgconfig gmake shebangfix perl5 readline USE_PERL5= run SHEBANG_FILES= coda-src/scripts/tape.pl \ coda-src/scripts/volinfo.pl \ coda-src/scripts/volsizes.pl \ coda-src/scripts/volmunge GNU_CONFIGURE= yes CONFIGURE_ARGS+= --enable-${CODA_SUITE} CODA_SUITE?= server .if ${CODA_SUITE} == server CONFLICTS= openafs-[0-9]* .endif .include .if ${CODA_SUITE} == client # this needs testing with the new version (6.1.1) #IGNORE= makes a kernel panic on this version of FreeBSD pre-everything:: @${ECHO_CMD} "" @${ECHO_CMD} "WARNING:" @${ECHO_CMD} "This version ${PORTVERSION} of the coda client has not been tested at all under FreeBSD." @${ECHO_CMD} "Previous version 6.0.7 was known to cause a kernel panic." @${ECHO_CMD} "If you make some tests, please send the results to ports@FreeBSD.org" @${ECHO_CMD} "" .endif .include Index: head/net/coda6_server/files/patch-coda-src-venus-hdb.cc =================================================================== --- head/net/coda6_server/files/patch-coda-src-venus-hdb.cc (revision 444770) +++ head/net/coda6_server/files/patch-coda-src-venus-hdb.cc (revision 444771) @@ -1,10 +1,10 @@ ---- coda-src/venus/hdb.cc +--- coda-src/venus/hdb.cc.orig 2008-12-16 15:12:10 UTC +++ coda-src/venus/hdb.cc -@@ -58,7 +58,6 @@ +@@ -58,7 +58,6 @@ extern "C" { #include #include #include -#include #include Index: head/net/coda6_server/files/patch-coda-src-venus-user.cc =================================================================== --- head/net/coda6_server/files/patch-coda-src-venus-user.cc (revision 444770) +++ head/net/coda6_server/files/patch-coda-src-venus-user.cc (revision 444771) @@ -1,19 +1,19 @@ ---- coda-src/venus/user.cc +--- coda-src/venus/user.cc.orig 2007-08-01 18:31:21 UTC +++ coda-src/venus/user.cc -@@ -42,7 +42,6 @@ +@@ -42,7 +42,6 @@ extern "C" { #include #include #include -#include #include #include -@@ -167,7 +166,7 @@ +@@ -167,7 +166,7 @@ int AuthorizedUser(uid_t thisUser) int ConsoleUser(uid_t user) { -#ifdef __CYGWIN32__ +#if 1 return(1); #elif defined(__linux__) Index: head/net/coda6_server/files/patch-coda-src-venus-worker.cc =================================================================== --- head/net/coda6_server/files/patch-coda-src-venus-worker.cc (revision 444770) +++ head/net/coda6_server/files/patch-coda-src-venus-worker.cc (revision 444771) @@ -1,24 +1,24 @@ ---- coda-src/venus/worker.cc.orig 2007-12-18 01:19:57.000000000 +0800 -+++ coda-src/venus/worker.cc 2008-04-18 14:07:24.000000000 +0800 -@@ -397,17 +397,17 @@ +--- coda-src/venus/worker.cc.orig 2008-10-06 16:52:22 UTC ++++ coda-src/venus/worker.cc +@@ -397,17 +397,17 @@ void VFSMount() md[0].iov_base = (char *)"fstype"; md[0].iov_len = sizeof("fstype"); md[1].iov_base = (char *)"coda"; md[1].iov_len = sizeof("coda"); md[2].iov_base = (char *)"fspath"; md[2].iov_len = sizeof("fspath"); - md[3].iov_base = venusRoot; md[3].iov_len = strlen(venusRoot) + 1; + md[3].iov_base = (char *)venusRoot; md[3].iov_len = strlen((char *)venusRoot) + 1; md[4].iov_base = (char *)"from"; md[4].iov_len = sizeof("from"); - md[5].iov_base = kernDevice; md[5].iov_len = strlen(kernDevice) + 1; + md[5].iov_base = (char *)kernDevice; md[5].iov_len = strlen((char *)kernDevice) + 1; error = nmount(md, 6, 0); } #endif if (error < 0) - error = mount("coda", venusRoot, 0, kernDevice); + error = mount("coda", (char *)venusRoot, 0, (char *)kernDevice); if (error < 0) - error = mount("cfs", venusRoot, 0, kernDevice); + error = mount("cfs", (char *)venusRoot, 0, (char *)kernDevice); #if defined(__FreeBSD__) && !defined(__FreeBSD_version) #define MOUNT_CFS 19 if (error < 0) Index: head/net/coda6_server/files/patch-coda-src_kerndep_coda.h =================================================================== --- head/net/coda6_server/files/patch-coda-src_kerndep_coda.h (nonexistent) +++ head/net/coda6_server/files/patch-coda-src_kerndep_coda.h (revision 444771) @@ -0,0 +1,32 @@ +--- coda-src/kerndep/coda.h.orig 2007-08-01 18:32:36 UTC ++++ coda-src/kerndep/coda.h +@@ -184,13 +184,29 @@ struct venus_dirent { + + #ifndef _VENUS_DIRENT_T_ + #define _VENUS_DIRENT_T_ 1 ++#if defined(__FreeBSD__) ++#include ++#endif ++#if defined(__FreeBSD__) && (__FreeBSD_version >= 1200031) + struct venus_dirent { ++ ino_t d_fileno; /* file number of entry */ ++ off_t d_off; /* directory offset of entry */ ++ uint16_t d_reclen; /* length of this record */ ++ uint8_t d_type; /* file type, see below */ ++ uint8_t d_pad0; ++ uint16_t d_namlen; /* length of string in d_name */ ++ uint16_t d_pad1; ++ char d_name[255 + 1]; /* name must be no longer than this */ ++}; ++#else ++struct venus_dirent { + unsigned int d_fileno; /* file number of entry */ + unsigned short d_reclen; /* length of this record */ + unsigned char d_type; /* file type, see below */ + unsigned char d_namlen; /* length of string in d_name */ + char d_name[CODA_MAXNAMLEN + 1];/* name must be no longer than this */ + }; ++#endif + #undef DIRSIZ + #define DIRSIZ(dp) ((sizeof (struct venus_dirent) - (CODA_MAXNAMLEN+1)) + \ + (((dp)->d_namlen+1 + 3) &~ 3)) Property changes on: head/net/coda6_server/files/patch-coda-src_kerndep_coda.h ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/net/coda6_server/files/patch-coda-src_venus_vol__cml.cc =================================================================== --- head/net/coda6_server/files/patch-coda-src_venus_vol__cml.cc (revision 444770) +++ head/net/coda6_server/files/patch-coda-src_venus_vol__cml.cc (revision 444771) @@ -1,12 +1,12 @@ --- coda-src/venus/vol_cml.cc.orig 2008-10-06 16:52:54 UTC +++ coda-src/venus/vol_cml.cc -@@ -3606,7 +3606,8 @@ static int WriteLinks(struct DirEntry *d +@@ -3606,7 +3606,8 @@ static int WriteLinks(struct DirEntry *de, void *arg) { VnodeId vnode; Unique_t vunique; - char *name = de->name, *comp; + char *name = de->name; + const char *comp; size_t prefixlen; char namebuf[CODA_MAXPATHLEN]; struct WriteLinksHook *hook = (struct WriteLinksHook *)arg; Index: head/net/coda6_server/files/patch-configure =================================================================== --- head/net/coda6_server/files/patch-configure (revision 444770) +++ head/net/coda6_server/files/patch-configure (revision 444771) @@ -1,22 +1,21 @@ --- configure.orig 2008-12-19 22:04:04 UTC +++ configure -@@ -20699,18 +20699,12 @@ +@@ -20699,17 +20699,11 @@ echo "${ECHO_T}RedHat" >&6; } initdir='${prefix}'/${initdir}/rc.d/init.d initstyle=sysv -elif test -d ${prefix}/${initdir}/rc.d ; then +else # probably FreeBSD or NetBSD's BSD-style init-scripts. { echo "$as_me:$LINENO: result: BSD style" >&5 echo "${ECHO_T}BSD style" >&6; } initdir='${prefix}'/${initdir}/rc.d - initstyle=bsd +- initstyle=bsd - -else - { echo "$as_me:$LINENO: result: unknown, installing BSD scripts in ${initdir}" >&5 -echo "${ECHO_T}unknown, installing BSD scripts in ${initdir}" >&6; } - initdir='${prefix}'/${initdir} -- initstyle=bsd + initstyle=bsd fi - Index: head/net/coda6_server/files/patch-lib-src-base-coda_getaddrinfo.c =================================================================== --- head/net/coda6_server/files/patch-lib-src-base-coda_getaddrinfo.c (revision 444770) +++ head/net/coda6_server/files/patch-lib-src-base-coda_getaddrinfo.c (revision 444771) @@ -1,13 +1,13 @@ ---- lib-src/base/coda_getaddrinfo.c.orig Mon Aug 16 10:42:57 2004 -+++ lib-src/base/coda_getaddrinfo.c Mon Aug 16 10:46:09 2004 -@@ -37,6 +37,10 @@ +--- lib-src/base/coda_getaddrinfo.c.orig 2007-07-20 21:34:55 UTC ++++ lib-src/base/coda_getaddrinfo.c +@@ -37,6 +37,10 @@ Coda are listed in the file CREDITS. #endif #include +#include +#include +#include +#include #include #include #include