From 686994ad053b814c5c12079963c6d200f81b1424 Mon Sep 17 00:00:00 2001 From: Tilman Keskinoz Date: Fri, 28 Mar 2003 12:48:17 +0000 Subject: Update to 5.3.20 Mark broken on 4.x, tjr will try to fix this too PR: 50340 Submitted by: tjr --- net/coda5_server/Makefile | 6 +++++- net/coda5_server/distinfo | 2 +- net/coda5_server/files/patch-aa | 36 ------------------------------------ net/coda5_server/files/patch-ab | 39 --------------------------------------- net/coda5_server/files/patch-ac | 20 -------------------- net/coda5_server/files/patch-af | 14 -------------- 6 files changed, 6 insertions(+), 111 deletions(-) delete mode 100644 net/coda5_server/files/patch-aa delete mode 100644 net/coda5_server/files/patch-ab delete mode 100644 net/coda5_server/files/patch-ac delete mode 100644 net/coda5_server/files/patch-af (limited to 'net') diff --git a/net/coda5_server/Makefile b/net/coda5_server/Makefile index 4db0169aa613..db53932915fa 100644 --- a/net/coda5_server/Makefile +++ b/net/coda5_server/Makefile @@ -29,8 +29,12 @@ USE_GMAKE= yes CONFIGURE_ARGS?= --sysconfdir=${PREFIX}/etc/rc.d CODA_SUITE?= server -CODA_VERSION?= 5.3.19 +CODA_VERSION?= 5.3.20 .include +.if ${OSVERSION} < 500000 +BROKEN= "Does not compile on 4.x" +.endif + .include diff --git a/net/coda5_server/distinfo b/net/coda5_server/distinfo index 7ecf95e5ebd4..9e3b767a4c00 100644 --- a/net/coda5_server/distinfo +++ b/net/coda5_server/distinfo @@ -1 +1 @@ -MD5 (coda-5.3.19.tar.gz) = d3e90136f1f560b3ab7bd5550f12574e +MD5 (coda-5.3.20.tar.gz) = 91337387273f1abda9c67d1dd41d1366 diff --git a/net/coda5_server/files/patch-aa b/net/coda5_server/files/patch-aa deleted file mode 100644 index d1d4f2fd4f24..000000000000 --- a/net/coda5_server/files/patch-aa +++ /dev/null @@ -1,36 +0,0 @@ ---- coda-src/update/updatesrv.cc.orig Sun Mar 2 17:55:46 2003 -+++ coda-src/update/updatesrv.cc Sun Mar 2 17:57:50 2003 -@@ -184,6 +184,7 @@ - long portmapid; - struct stat statbuf; - char *miscdir; -+ time_t tim; - - /* process the command line arguments */ - for (i = 1; i < argc; i++) { -@@ -305,7 +306,7 @@ - } - gettimeofday(&tp, &tsp); - LogMsg(0, SrvDebugLevel, stdout, -- "Update Server started %s", ctime(&tp.tv_sec)); -+ "Update Server started %s", ctime(&(tim = tp.tv_sec))); - - CODA_ASSERT(LWP_WaitProcess((char *)&parentPid) == LWP_SUCCESS); - -@@ -455,6 +456,7 @@ - char name[MAXPATHLEN]; /* area to hold the name */ - struct stat buff; /* buffer for stat */ - int len; -+ time_t tim; - - rc = 0; - -@@ -518,7 +520,7 @@ - *CurrentUsecs = tp.tv_usec; - LogMsg(2, SrvDebugLevel, stdout, - "UpdateFetch returns %s newtime is %d at %s", -- ViceErrorMsg((int)rc), *NewTime, ctime(&tp.tv_sec)); -+ ViceErrorMsg((int)rc), *NewTime, ctime(&(tim = tp.tv_sec))); - return(rc); - } - diff --git a/net/coda5_server/files/patch-ab b/net/coda5_server/files/patch-ab deleted file mode 100644 index dcd22ec73159..000000000000 --- a/net/coda5_server/files/patch-ab +++ /dev/null @@ -1,39 +0,0 @@ ---- coda-src/update/updateclnt.cc.orig Sun Mar 2 17:58:32 2003 -+++ coda-src/update/updateclnt.cc Sun Mar 2 17:59:25 2003 -@@ -152,6 +152,7 @@ - int i, rc; - int len; - char errmsg[MAXPATHLEN]; -+ time_t tim; - - *host = '\0'; - -@@ -226,7 +227,7 @@ - gettimeofday(&tp, &tsp); - LogMsg(0, SrvDebugLevel, stdout, - "Update Client pid = %d started at %s", -- getpid(), ctime(&tp.tv_sec)); -+ getpid(), ctime(&(tim = tp.tv_sec))); - - time.tv_sec = waitinterval; - time.tv_usec = 0; -@@ -688,16 +689,17 @@ - { - struct timeval tv; - struct timezone tz; -+ time_t tim; - - if(rename("UpdateLog","UpdateLog.old")) { - LogMsg(0, SrvDebugLevel, stdout, "Rename for UpdateLog failed with a %s\n", ViceErrorMsg(errno)); - } - else { - gettimeofday(&tv, &tz); -- LogMsg(0, SrvDebugLevel, stdout, "Moving UpdateLog to UpdateLog.old at %s", ctime(&tv.tv_sec)); -+ LogMsg(0, SrvDebugLevel, stdout, "Moving UpdateLog to UpdateLog.old at %s", ctime(&(tim = tv.tv_sec))); - freopen("UpdateLog","a+",stdout); - freopen("UpdateLog","a+",stderr); -- LogMsg(0, SrvDebugLevel, stdout, "New UpdateLog started at %s", ctime(&tv.tv_sec)); -+ LogMsg(0, SrvDebugLevel, stdout, "New UpdateLog started at %s", ctime(&(tim = tv.tv_sec))); - } - } - diff --git a/net/coda5_server/files/patch-ac b/net/coda5_server/files/patch-ac deleted file mode 100644 index 407ebbf4e31d..000000000000 --- a/net/coda5_server/files/patch-ac +++ /dev/null @@ -1,20 +0,0 @@ ---- coda-src/venus/fso_cachefile.cc.orig Sun Mar 2 17:32:28 2003 -+++ coda-src/venus/fso_cachefile.cc Sun Mar 2 17:33:30 2003 -@@ -132,7 +132,7 @@ - /* Must be called from within a transaction! Assume caller has done - RVMLIB_REC_OBJECT() */ - --void CacheFile::Create(int newlength = 0) -+void CacheFile::Create(int newlength) - { - LOG(10, ("CacheFile::Create: %s, %d\n", name, newlength)); - -@@ -183,7 +183,7 @@ - return 0; - } - --int CacheFile::Copy(char *destname, ino_t *ino, int recovering = 0) -+int CacheFile::Copy(char *destname, ino_t *ino, int recovering) - { - LOG(10, ("CacheFile::Copy: from %s, %d, %d/%d, to %s\n", - name, inode, validdata, length, destname)); diff --git a/net/coda5_server/files/patch-af b/net/coda5_server/files/patch-af deleted file mode 100644 index fb27bf564134..000000000000 --- a/net/coda5_server/files/patch-af +++ /dev/null @@ -1,14 +0,0 @@ ---- tools/our-install.orig Sun Mar 2 17:18:33 2003 -+++ tools/our-install Sun Mar 2 17:21:13 2003 -@@ -11,8 +11,10 @@ - PATH=/bin:/usr/bin:/sbin:/usr/sbin:/usr/ucb - export PATH - --if [ $SYS = NetBSD -o $SYS = FreeBSD -o $SYS = OpenBSD ] ; then -+if [ $SYS = NetBSD -o $SYS = OpenBSD ] ; then - OWNGRP=root.wheel -+elif [ $SYS = FreeBSD ] ; then -+OWNGRP=root:wheel - else - OWNGRP=root:root - fi -- cgit v1.2.3