Date: Sat, 20 Nov 2004 14:44:57 +0100 From: Radim Kolar <hsn@netmag.cz> To: FreeBSD-gnats-submit@FreeBSD.org Cc: hsn@netmag.cz Subject: ports/74259: UPDATE: coda6 server to 6.0.7 Message-ID: <E1CVVXt-0004z8-DI@sanatana.dharma> Resent-Message-ID: <200411221720.iAMHKXTw031413@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 74259 >Category: ports >Synopsis: UPDATE: coda6 server to 6.0.7 >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: update >Submitter-Id: current-users >Arrival-Date: Mon Nov 22 17:20:33 GMT 2004 >Closed-Date: >Last-Modified: >Originator: Radim Kolar >Release: FreeBSD 5.3-STABLE i386 >Organization: >Environment: System: FreeBSD sanatana.dharma 5.3-STABLE FreeBSD 5.3-STABLE #1: Tue Nov 16 16:18:06 CET 2004 root@sanatana.dharma:/usr/obj/usr/src/sys/UP i386 >Description: New coda server stuff. Tested for about a week. >How-To-Repeat: new patches: patch-configure patch-hostname patch-pioctl.h patch-srv.cc removed patches: patch-coda-src-venus-comm.cc patch-coda-src-venus-fso.h None of my new patches was sent to the Coda developers. Feel free to forward them. >Fix: diff -Naur /usr/ports/net/coda6_server/Makefile coda6_server/Makefile --- /usr/ports/net/coda6_server/Makefile Fri Aug 20 21:50:41 2004 +++ coda6_server/Makefile Wed Nov 17 17:56:38 2004 @@ -14,10 +14,9 @@ MAINTAINER?= tim@robbins.dropbear.id.au COMMENT= Server programs for a replicated high-performance network file system -LIB_DEPENDS= gdbm.3:${PORTSDIR}/databases/gdbm \ - lwp.2:${PORTSDIR}/devel/lwp \ +LIB_DEPENDS= lwp.2:${PORTSDIR}/devel/lwp \ rpc2.6:${PORTSDIR}/devel/rpc2 \ - rvm.2:${PORTSDIR}/devel/rvm + rvm.3:${PORTSDIR}/devel/rvm CONFLICTS= coda-server-5.* @@ -26,10 +25,19 @@ GNU_CONFIGURE= yes USE_GMAKE= yes -CONFIGURE_ARGS?= --sysconfdir=${PREFIX}/etc/rc.d CODA_SUITE?= server -CODA_VERSION?= 6.0.6 +CODA_VERSION?= 6.0.7 + +.if ${CODA_SUITE} == server +MAN5= vicetab.5 passwd.coda.5 +MAN8= pdbtool.8 auth2.8 initpw.8 norton.8 +.else +MAN1= clog.1 cpasswd.1 ctokens.1 cunlog.1 \ + repair.1 cfs.1 cmon.1 coda_replay.1 \ + hoard.1 spy.1 +MAN8= au.8 venus.8 +.endif .include <bsd.port.pre.mk> diff -Naur /usr/ports/net/coda6_server/distinfo coda6_server/distinfo --- /usr/ports/net/coda6_server/distinfo Fri Aug 20 21:50:41 2004 +++ coda6_server/distinfo Mon Nov 15 22:00:39 2004 @@ -1,2 +1,2 @@ -MD5 (coda-6.0.6.tar.gz) = 1feb4b431b72f725b568cc57a759714f -SIZE (coda-6.0.6.tar.gz) = 1497287 +MD5 (coda-6.0.7.tar.gz) = 0f22c4f1743d7c6bc9d1c103e193905b +SIZE (coda-6.0.7.tar.gz) = 1536304 diff -Naur /usr/ports/net/coda6_server/files/patch-coda-src-venus-comm.cc coda6_server/files/patch-coda-src-venus-comm.cc --- /usr/ports/net/coda6_server/files/patch-coda-src-venus-comm.cc Tue Aug 10 19:06:15 2004 +++ coda6_server/files/patch-coda-src-venus-comm.cc Thu Jan 1 01:00:00 1970 @@ -1,11 +0,0 @@ ---- coda-src/venus/comm.cc.orig Fri Aug 6 23:01:08 2004 -+++ coda-src/venus/comm.cc Fri Aug 6 23:02:04 2004 -@@ -173,7 +173,7 @@ - sei.AckPoint = sftp_ackpoint; - sei.PacketSize = sftp_packetsize; - sei.EnforceQuota = 1; -- sei.Port.Tag = (enum PortTag)0; -+ sei.Port.Tag = (PortTag)0; - SFTP_Activate(&sei); - - /* RPC2 initialization. */ diff -Naur /usr/ports/net/coda6_server/files/patch-coda-src-venus-fso.h coda6_server/files/patch-coda-src-venus-fso.h --- /usr/ports/net/coda6_server/files/patch-coda-src-venus-fso.h Tue Aug 10 19:06:15 2004 +++ coda6_server/files/patch-coda-src-venus-fso.h Thu Jan 1 01:00:00 1970 @@ -1,32 +0,0 @@ ---- coda-src/venus/fso.h.orig Fri Aug 6 22:52:18 2004 -+++ coda-src/venus/fso.h Fri Aug 6 22:54:34 2004 -@@ -539,7 +539,7 @@ - void DetachHdbBindings(); - void DetachHdbBinding(binding *, int =0); - int PredetermineFetchState(int, int); -- void SetFetchAllowed(enum HoardFetchState new_state) -+ void SetFetchAllowed(HoardFetchState new_state) - { FetchAllowed = new_state; } - int IsFetchAllowed() - { if (FetchAllowed == HF_Fetch) -@@ -547,7 +547,7 @@ - else - return 0; - } -- void SetAskingAllowed(enum HoardAskState new_state) -+ void SetAskingAllowed(HoardAskState new_state) - { AskingAllowed = new_state; } - int IsAskingAllowed() - { if (AskingAllowed == HA_Ask) -@@ -820,9 +820,8 @@ - #define CFSOP_PRELUDE(str, comp, fid)\ - {\ - char buf[256];\ -- strcpy(buf, (comp));\ -- if (buf[0] == '\0')\ -- sprintf(buf, "%s", FID_(&(fid)));\ -+ if (comp) strcpy(buf, (comp));\ -+ else sprintf(buf, "%s", FID_(&(fid)));\ - MarinerLog((str), buf);\ - } - #define CFSOP_POSTLUDE(str)\ diff -Naur /usr/ports/net/coda6_server/files/patch-configure coda6_server/files/patch-configure --- /usr/ports/net/coda6_server/files/patch-configure Thu Jan 1 01:00:00 1970 +++ coda6_server/files/patch-configure Tue Nov 16 23:58:25 2004 @@ -0,0 +1,25 @@ +--- configure.orig Wed Oct 20 20:43:56 2004 ++++ configure Tue Nov 16 23:58:20 2004 +@@ -3059,13 +3059,6 @@ + initsuffix='../etc' + ;; + +- */coda* ) +- # If '/coda*' is already in the prefix, we don't need to add +- # a coda subdirectory to the sysconfdir. +- sysconfdir=${prefix}/etc +- initsuffix='etc' +- ;; +- + * ) + # Otherwise append '/coda' so that we don't throw our configuration + # files all over the place. +@@ -3074,7 +3067,7 @@ + else + sysconfdir=${ac_default_prefix}/etc/coda + fi +- initsuffix='etc' ++ initsuffix='etc/rc.d' + ;; + esac + echo "$as_me:$LINENO: result: ${sysconfdir}" >&5 diff -Naur /usr/ports/net/coda6_server/files/patch-hostname coda6_server/files/patch-hostname --- /usr/ports/net/coda6_server/files/patch-hostname Thu Jan 1 01:00:00 1970 +++ coda6_server/files/patch-hostname Wed Nov 17 11:01:27 2004 @@ -0,0 +1,33 @@ +--- coda-src/scripts/vice-setup.in.orig Tue Oct 5 18:36:16 2004 ++++ coda-src/scripts/vice-setup.in Wed Nov 17 00:40:31 2004 +@@ -318,7 +318,7 @@ + # + # ${vicedir}/hostname + # +-hn=`hostname -f` ++hn=`hostname` + echo $hn > ${vicedir}/hostname + + # +--- coda-src/scripts/vice-setup-scm.orig Tue Oct 5 18:36:16 2004 ++++ coda-src/scripts/vice-setup-scm Wed Nov 17 00:40:12 2004 +@@ -53,7 +53,7 @@ + # making hostname + # + +-hn=`hostname -f` ++hn=`hostname` + cd ${vicedir}/db + + if [ $numservers -eq 1 ]; then +--- coda-src/scripts/vice-setup-srvdir.orig Sat Sep 4 08:03:32 2004 ++++ coda-src/scripts/vice-setup-srvdir Wed Nov 17 11:00:10 2004 +@@ -32,7 +32,7 @@ + numservers=1 + . "`codaconfedit server.conf`" + +-hn=`hostname -f` ++hn=`hostname` + + n=1 + while [ $n -le $numservers ]; do diff -Naur /usr/ports/net/coda6_server/files/patch-pioctl.h coda6_server/files/patch-pioctl.h --- /usr/ports/net/coda6_server/files/patch-pioctl.h Thu Jan 1 01:00:00 1970 +++ coda6_server/files/patch-pioctl.h Tue Nov 16 22:27:29 2004 @@ -0,0 +1,11 @@ +--- coda-src/kerndep/pioctl.h.orig Thu Aug 26 17:23:04 2004 ++++ coda-src/kerndep/pioctl.h Tue Nov 16 22:04:33 2004 +@@ -104,7 +104,7 @@ + /* unpacking macros */ + #ifndef _IOC_NR + +-#if defined(__CYGWIN32__) || defined(__NetBSD__) ++#if defined(__CYGWIN32__) || defined(__NetBSD__) || defined(__FreeBSD__) + #define _IOC_TYPEMASK 0xff + #define _IOC_TYPESHIFT 8 + #define _IOC_NRMASK 0xff diff -Naur /usr/ports/net/coda6_server/files/patch-srv.cc coda6_server/files/patch-srv.cc --- /usr/ports/net/coda6_server/files/patch-srv.cc Thu Jan 1 01:00:00 1970 +++ coda6_server/files/patch-srv.cc Tue Nov 16 22:20:35 2004 @@ -0,0 +1,20 @@ +--- coda-src/vice/srv.cc.orig Fri Sep 3 16:22:14 2004 ++++ coda-src/vice/srv.cc Tue Nov 16 22:19:04 2004 +@@ -1204,6 +1204,7 @@ + void SwapLog() + { + struct timeval tp; ++ time_t start; + + /* Need to chdir() again, since salvage may have put me elsewhere */ + if(chdir(vice_file("srv"))) { +@@ -1216,7 +1217,8 @@ + + /* Print out time/date, since date info has "scrolled off" */ + TM_GetTimeOfDay(&tp, 0); +- SLog(0, "Coda Vice, version " PACKAGE_VERSION "\tlog started at %s", ctime(&tp.tv_sec)); ++ start=tp.tv_sec; ++ SLog(0, "Coda Vice, version " PACKAGE_VERSION "\tlog started at %s", ctime(&start)); + } + + static void FileMsg() diff -Naur /usr/ports/net/coda6_server/pkg-plist coda6_server/pkg-plist --- /usr/ports/net/coda6_server/pkg-plist Fri Aug 20 21:50:41 2004 +++ coda6_server/pkg-plist Wed Nov 17 00:03:20 2004 @@ -1,17 +1,15 @@ -bin/norton -bin/norton-reinit -bin/reinit bin/getvolinfo +bin/reinit bin/rpc2ping bin/rvmsizer bin/smon2 etc/coda/server.conf.ex @dirrm etc/coda -sbin/au sbin/auth2 sbin/backup sbin/backup.sh sbin/bldvldb.sh +sbin/codadump2tar sbin/codaconfedit sbin/coda-server-logrotate sbin/coda-setup-ports @@ -21,6 +19,8 @@ sbin/initpw sbin/inoder sbin/merge +sbin/norton +sbin/norton-reinit sbin/parserecdump sbin/partial-reinit.sh sbin/pdbtool >Release-Note: >Audit-Trail: >Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?E1CVVXt-0004z8-DI>