Date: Fri, 30 Jun 2017 16:52:44 +0000 (UTC) From: Edward Tomasz Napierala <trasz@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r444771 - in head/net: coda6_client coda6_server coda6_server/files Message-ID: <201706301652.v5UGqiEV012782@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: trasz Date: Fri Jun 30 16:52:44 2017 New Revision: 444771 URL: https://svnweb.freebsd.org/changeset/ports/444771 Log: Fix coda6_client and coda6_server after ino64 changes. Added: head/net/coda6_server/files/patch-coda-src_kerndep_coda.h (contents, props changed) Modified: head/net/coda6_client/Makefile head/net/coda6_server/Makefile head/net/coda6_server/files/patch-coda-src-venus-hdb.cc head/net/coda6_server/files/patch-coda-src-venus-user.cc head/net/coda6_server/files/patch-coda-src-venus-worker.cc head/net/coda6_server/files/patch-coda-src_venus_vol__cml.cc head/net/coda6_server/files/patch-configure head/net/coda6_server/files/patch-lib-src-base-coda_getaddrinfo.c Modified: head/net/coda6_client/Makefile ============================================================================== --- head/net/coda6_client/Makefile Fri Jun 30 16:42:47 2017 (r444770) +++ head/net/coda6_client/Makefile Fri Jun 30 16:52:44 2017 (r444771) @@ -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 Modified: head/net/coda6_server/Makefile ============================================================================== --- head/net/coda6_server/Makefile Fri Jun 30 16:42:47 2017 (r444770) +++ head/net/coda6_server/Makefile Fri Jun 30 16:52:44 2017 (r444771) @@ -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/ \ Modified: head/net/coda6_server/files/patch-coda-src-venus-hdb.cc ============================================================================== --- head/net/coda6_server/files/patch-coda-src-venus-hdb.cc Fri Jun 30 16:42:47 2017 (r444770) +++ head/net/coda6_server/files/patch-coda-src-venus-hdb.cc Fri Jun 30 16:52:44 2017 (r444771) @@ -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> Modified: head/net/coda6_server/files/patch-coda-src-venus-user.cc ============================================================================== --- head/net/coda6_server/files/patch-coda-src-venus-user.cc Fri Jun 30 16:42:47 2017 (r444770) +++ head/net/coda6_server/files/patch-coda-src-venus-user.cc Fri Jun 30 16:52:44 2017 (r444771) @@ -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) { Modified: head/net/coda6_server/files/patch-coda-src-venus-worker.cc ============================================================================== --- head/net/coda6_server/files/patch-coda-src-venus-worker.cc Fri Jun 30 16:42:47 2017 (r444770) +++ head/net/coda6_server/files/patch-coda-src-venus-worker.cc Fri Jun 30 16:52:44 2017 (r444771) @@ -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"); Added: head/net/coda6_server/files/patch-coda-src_kerndep_coda.h ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/net/coda6_server/files/patch-coda-src_kerndep_coda.h Fri Jun 30 16:52:44 2017 (r444771) @@ -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)) Modified: head/net/coda6_server/files/patch-coda-src_venus_vol__cml.cc ============================================================================== --- head/net/coda6_server/files/patch-coda-src_venus_vol__cml.cc Fri Jun 30 16:42:47 2017 (r444770) +++ head/net/coda6_server/files/patch-coda-src_venus_vol__cml.cc Fri Jun 30 16:52:44 2017 (r444771) @@ -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; Modified: head/net/coda6_server/files/patch-configure ============================================================================== --- head/net/coda6_server/files/patch-configure Fri Jun 30 16:42:47 2017 (r444770) +++ head/net/coda6_server/files/patch-configure Fri Jun 30 16:52:44 2017 (r444771) @@ -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 - Modified: head/net/coda6_server/files/patch-lib-src-base-coda_getaddrinfo.c ============================================================================== --- head/net/coda6_server/files/patch-lib-src-base-coda_getaddrinfo.c Fri Jun 30 16:42:47 2017 (r444770) +++ head/net/coda6_server/files/patch-lib-src-base-coda_getaddrinfo.c Fri Jun 30 16:52:44 2017 (r444771) @@ -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>
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201706301652.v5UGqiEV012782>