diff options
| -rw-r--r-- | net/coda6_client/Makefile | 2 | ||||
| -rw-r--r-- | net/coda6_server/Makefile | 2 | ||||
| -rw-r--r-- | net/coda6_server/files/patch-coda-src-venus-hdb.cc | 4 | ||||
| -rw-r--r-- | net/coda6_server/files/patch-coda-src-venus-user.cc | 6 | ||||
| -rw-r--r-- | net/coda6_server/files/patch-coda-src-venus-worker.cc | 6 | ||||
| -rw-r--r-- | net/coda6_server/files/patch-coda-src_kerndep_coda.h | 32 | ||||
| -rw-r--r-- | net/coda6_server/files/patch-coda-src_venus_vol__cml.cc | 2 | ||||
| -rw-r--r-- | net/coda6_server/files/patch-configure | 7 | ||||
| -rw-r--r-- | net/coda6_server/files/patch-lib-src-base-coda_getaddrinfo.c | 6 |
9 files changed, 49 insertions, 18 deletions
diff --git a/net/coda6_client/Makefile b/net/coda6_client/Makefile index c3ac4f78b348..3b1723a0163e 100644 --- a/net/coda6_client/Makefile +++ b/net/coda6_client/Makefile @@ -1,7 +1,7 @@ # Created by: Tim Robbins <tim@robbins.dropbear.id.au> # $FreeBSD$ -PORTREVISION= 3 +PORTREVISION= 4 COMMENT= Client programs for a replicated high-performance network file system diff --git a/net/coda6_server/Makefile b/net/coda6_server/Makefile index c7c8b0c14369..a4d119d3f51d 100644 --- a/net/coda6_server/Makefile +++ b/net/coda6_server/Makefile @@ -3,7 +3,7 @@ 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/ \ diff --git a/net/coda6_server/files/patch-coda-src-venus-hdb.cc b/net/coda6_server/files/patch-coda-src-venus-hdb.cc index 38f8bb0220ff..d2733a30e194 100644 --- a/net/coda6_server/files/patch-coda-src-venus-hdb.cc +++ b/net/coda6_server/files/patch-coda-src-venus-hdb.cc @@ -1,6 +1,6 @@ ---- 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 <stdlib.h> #include <pwd.h> #include <fcntl.h> diff --git a/net/coda6_server/files/patch-coda-src-venus-user.cc b/net/coda6_server/files/patch-coda-src-venus-user.cc index a2be8ffee14c..43aa13c9e667 100644 --- a/net/coda6_server/files/patch-coda-src-venus-user.cc +++ b/net/coda6_server/files/patch-coda-src-venus-user.cc @@ -1,6 +1,6 @@ ---- 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 <netinet/in.h> #include <errno.h> #include <struct.h> @@ -8,7 +8,7 @@ #include <pwd.h> #include <rpc2/rpc2.h> -@@ -167,7 +166,7 @@ +@@ -167,7 +166,7 @@ int AuthorizedUser(uid_t thisUser) int ConsoleUser(uid_t user) { diff --git a/net/coda6_server/files/patch-coda-src-venus-worker.cc b/net/coda6_server/files/patch-coda-src-venus-worker.cc index 8be333ec471a..90372459a815 100644 --- a/net/coda6_server/files/patch-coda-src-venus-worker.cc +++ b/net/coda6_server/files/patch-coda-src-venus-worker.cc @@ -1,6 +1,6 @@ ---- 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"); diff --git a/net/coda6_server/files/patch-coda-src_kerndep_coda.h b/net/coda6_server/files/patch-coda-src_kerndep_coda.h new file mode 100644 index 000000000000..f7873b14d3ce --- /dev/null +++ b/net/coda6_server/files/patch-coda-src_kerndep_coda.h @@ -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 <sys/param.h> ++#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)) diff --git a/net/coda6_server/files/patch-coda-src_venus_vol__cml.cc b/net/coda6_server/files/patch-coda-src_venus_vol__cml.cc index 1ffb5b89683e..9755accb64cc 100644 --- a/net/coda6_server/files/patch-coda-src_venus_vol__cml.cc +++ b/net/coda6_server/files/patch-coda-src_venus_vol__cml.cc @@ -1,6 +1,6 @@ --- 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; diff --git a/net/coda6_server/files/patch-configure b/net/coda6_server/files/patch-configure index 8007c4b090c2..34cb1047cb6e 100644 --- a/net/coda6_server/files/patch-configure +++ b/net/coda6_server/files/patch-configure @@ -1,6 +1,6 @@ --- 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 @@ -10,13 +10,12 @@ { 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 - diff --git a/net/coda6_server/files/patch-lib-src-base-coda_getaddrinfo.c b/net/coda6_server/files/patch-lib-src-base-coda_getaddrinfo.c index 0c2451c0712a..32b8c4b9f50c 100644 --- a/net/coda6_server/files/patch-lib-src-base-coda_getaddrinfo.c +++ b/net/coda6_server/files/patch-lib-src-base-coda_getaddrinfo.c @@ -1,6 +1,6 @@ ---- 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 <sys/types.h> |
