summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--net/coda/Makefile18
-rw-r--r--net/coda/distinfo13
-rw-r--r--net/coda/patches/patch-coda-src_kerndep_coda.h23
-rw-r--r--net/coda/patches/patch-coda-src_kerndep_pioctl.h15
-rw-r--r--net/coda/patches/patch-coda-src_librepair_repio.cc103
-rw-r--r--net/coda/patches/patch-coda-src_resolution_rescoord.cc14
-rw-r--r--net/coda/patches/patch-coda-src_venus_fso_dir.cc14
-rw-r--r--net/coda/patches/patch-coda-src_venus_venus.cc14
-rw-r--r--net/coda/patches/patch-coda-src_venus_venusrecov.cc14
-rw-r--r--net/coda/patches/patch-coda-src_venus_vproc_vfscalls.cc16
-rw-r--r--net/coda/patches/patch-coda-src_vice_codaproc2.cc14
-rw-r--r--net/coda/patches/patch-coda-src_volutil_vol-ancient.cc14
-rw-r--r--net/coda/patches/patch-coda-src_volutil_vol-dump.cc14
13 files changed, 4 insertions, 282 deletions
diff --git a/net/coda/Makefile b/net/coda/Makefile
index 8924155570e..d7b94c0f7c4 100644
--- a/net/coda/Makefile
+++ b/net/coda/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.23 2015/01/27 22:03:16 gdt Exp $
+# $NetBSD: Makefile,v 1.24 2015/01/28 13:11:22 hauke Exp $
#
DISTNAME= coda-6.9.5
-PKGREVISION= 8
+PKGREVISION= 9
CATEGORIES= net
MASTER_SITES= http://www.coda.cs.cmu.edu/pub/coda/src/
@@ -14,16 +14,11 @@ LICENSE= gnu-gpl-v2
# This package requires a coda kernel module, which is only known to
# work on NetBSD and Linux. It is known not to work on DragonFly (has
-# never existed) and FreeBSD (removed).
+# never existed), FreeBSD (removed) and Solaris (outdated).
ONLY_FOR_PLATFORM+= NetBSD-*-* Linux-*-*
-# See http://coda.wikidev.net/Quick_Client_Action for hints on how
-# to configure venus.
-
PKG_SYSCONFSUBDIR= coda
-#SMF_INSTANCES= TODO
-
EGDIR= ${PREFIX}/share/examples/coda
CONF_FILES+= ${EGDIR}/server.conf ${PKG_SYSCONFDIR}/server.conf
CONF_FILES+= ${EGDIR}/venus.conf ${PKG_SYSCONFDIR}/venus.conf
@@ -36,13 +31,6 @@ GNU_CONFIGURE= yes
USE_LANGUAGES= c c++
REPLACE_PERL= coda-src/scripts/tape.pl coda-src/scripts/volmunge
-# Sources use both in equal share
-CFLAGS.SunOS+= -Du_int32_t=uint32_t
-CFLAGS.SunOS+= -Du_int16_t=uint16_t
-CFLAGS.SunOS+= -Du_int8_t=uint8_t
-# Use the value from <netdb.h>
-CFLAGS.SunOS+= -DMAXHOSTNAMELEN=256
-
post-install:
${INSTALL_DATA} ${WRKSRC}/coda-src/vice/server.conf.ex \
${DESTDIR}${EGDIR}/server.conf
diff --git a/net/coda/distinfo b/net/coda/distinfo
index fcd451dbd66..6aaed79a8c4 100644
--- a/net/coda/distinfo
+++ b/net/coda/distinfo
@@ -1,21 +1,10 @@
-$NetBSD: distinfo,v 1.13 2015/01/27 19:50:40 gdt Exp $
+$NetBSD: distinfo,v 1.14 2015/01/28 13:11:22 hauke Exp $
SHA1 (coda-6.9.5.tar.gz) = 248af27c506f5c3be4c4e53f821c9c904580fe60
RMD160 (coda-6.9.5.tar.gz) = 9ef0643aacc7d1352ef253af00d4c7e6ad9e1f78
Size (coda-6.9.5.tar.gz) = 1723098 bytes
SHA1 (patch-ad) = cb0963800d73fdcc00350a07fd840a388e678c33
SHA1 (patch-coda-src_dir_dirbody.c) = 3e3524a4a03ce359956ae00d9b24d1aa3292c752
-SHA1 (patch-coda-src_kerndep_coda.h) = 14af6b7554ce36c55f426ab62630df629c2df6db
-SHA1 (patch-coda-src_kerndep_pioctl.h) = 1eae6d05b461f6e235d8f290ef41c10877f59650
-SHA1 (patch-coda-src_librepair_repio.cc) = 3a79f16fb51bdeb76ccceb095f1409bec4bf098f
-SHA1 (patch-coda-src_resolution_rescoord.cc) = a885ced4a7bcfe38b14a0891d0ce84cc9c53ef19
SHA1 (patch-coda-src_venus_Makefile.in) = ecfb5d2d8bf806dddaf360f2b36d12b871e9f0e2
-SHA1 (patch-coda-src_venus_fso_dir.cc) = 3e02f3bdb02639a82db1be9c138267431d36697c
-SHA1 (patch-coda-src_venus_venus.cc) = 93c115fb8a8b22df3fdb166162410c67820dcb4c
-SHA1 (patch-coda-src_venus_venusrecov.cc) = 089b6c5db50a78b7df9ca5c504628dacb3c550f9
-SHA1 (patch-coda-src_venus_vproc_vfscalls.cc) = da71de1648e09aefdd442c4ab3cb2463aad6d397
SHA1 (patch-coda-src_venus_worker.cc) = 5ba012ae1ef61657c1d9057a7d8198953f677c8b
SHA1 (patch-coda-src_vice_Makefile.in) = 07744dcc45c269ecfe1f4c4feba37e7b7047c00b
-SHA1 (patch-coda-src_vice_codaproc2.cc) = 81dfacf9a0cda4bd8f891fbf0dacf0001a46bd02
-SHA1 (patch-coda-src_volutil_vol-ancient.cc) = e69f3e492aa78cbf5c4dbd34c15424ee7ebd150c
-SHA1 (patch-coda-src_volutil_vol-dump.cc) = 6405a0be3edeb1f1cdb74d705c0fcccae1a8cefc
diff --git a/net/coda/patches/patch-coda-src_kerndep_coda.h b/net/coda/patches/patch-coda-src_kerndep_coda.h
deleted file mode 100644
index 18f39ffa795..00000000000
--- a/net/coda/patches/patch-coda-src_kerndep_coda.h
+++ /dev/null
@@ -1,23 +0,0 @@
-$NetBSD: patch-coda-src_kerndep_coda.h,v 1.1 2015/01/27 15:21:52 hauke Exp $
-
-SunOS defines int*_t, but not u_int*_t.
-
---- ./coda-src/kerndep/coda.h.orig 2007-08-01 18:32:36.000000000 +0000
-+++ ./coda-src/kerndep/coda.h
-@@ -112,11 +112,14 @@ typedef unsigned long long u_quad_t;
- #endif
-
- /* Solaris Definitions */
--#if defined(sun)
-+#if defined(__sun) && defined(__SVR4)
- #include <sys/types.h>
- #include <sys/time.h>
-+typedef unsigned char u_int8_t;
-+typedef unsigned short u_int16_t;
-+typedef unsigned int u_int32_t;
- typedef unsigned long long u_quad_t;
--#undef __BIT_TYPES_DEFINED__
-+#define __BIT_TYPES_DEFINED__
- #endif
-
- /* Mac OS X / Darwin */
diff --git a/net/coda/patches/patch-coda-src_kerndep_pioctl.h b/net/coda/patches/patch-coda-src_kerndep_pioctl.h
deleted file mode 100644
index c3fd5f63cb9..00000000000
--- a/net/coda/patches/patch-coda-src_kerndep_pioctl.h
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: patch-coda-src_kerndep_pioctl.h,v 1.3 2015/01/27 15:21:52 hauke Exp $
-
-SunOS wants missing _IOC* defines, too.
-
---- coda-src/kerndep/pioctl.h.orig 2006-11-03 15:58:08.000000000 +0000
-+++ coda-src/kerndep/pioctl.h
-@@ -81,7 +81,7 @@ int pioctl(const char *path, unsigned lo
- /* unpacking macros */
- #ifndef _IOC_NR
-
--#if defined(__NetBSD__) || defined(__FreeBSD__)
-+#if defined(__NetBSD__) || defined(__FreeBSD__) || (defined (__sun) && defined(__SVR4))
- #define _IOC_TYPEMASK 0xff
- #define _IOC_TYPESHIFT 8
- #define _IOC_NRMASK 0xff
diff --git a/net/coda/patches/patch-coda-src_librepair_repio.cc b/net/coda/patches/patch-coda-src_librepair_repio.cc
deleted file mode 100644
index 6e27d3f545c..00000000000
--- a/net/coda/patches/patch-coda-src_librepair_repio.cc
+++ /dev/null
@@ -1,103 +0,0 @@
-$NetBSD: patch-coda-src_librepair_repio.cc,v 1.1 2015/01/27 15:21:52 hauke Exp $
-
-SunOS has ERR #defined somewhere, rename goto label
-
---- ./coda-src/librepair/repio.cc.orig 2007-12-17 17:20:11.000000000 +0000
-+++ ./coda-src/librepair/repio.cc
-@@ -179,7 +179,7 @@ int repair_getdfile(char *fname, int inf
-
- if (replicaList == NULL) {
- sprintf(errmsg, "repair_getdfile: bad replicaList ptr!");
-- goto ERR;
-+ goto Error;
- }
-
- if (fname == NULL) ff = fdopen(infd, "r");
-@@ -195,14 +195,14 @@ int repair_getdfile(char *fname, int inf
- fread(&x, sizeof(int), 1, ff);
- if (ferror(ff) || feof(ff)) {
- sprintf(errmsg, "repair_getdfile: replicaCount parsing failed!");
-- goto ERR;
-+ goto Error;
- }
- *replicaCount = ntohl(x);
-
- *replicaList = (struct listhdr *) calloc(*replicaCount, sizeof(struct listhdr));
- if (*replicaList == NULL) {
- sprintf(errmsg, "repair_getdfile: replicaList allocation failed!\n\telements= %x\tx= %d\tsizeof(struct listhdr)= %d\n", *replicaCount, x, sizeof(struct listhdr));
-- goto ERR;
-+ goto Error;
- }
-
- perror("repair_getdfile: list created");
-@@ -211,14 +211,14 @@ int repair_getdfile(char *fname, int inf
- fread(&x, sizeof(int), 1, ff);
- if (ferror(ff) || feof(ff)) {
- sprintf(errmsg, "repair_getdfile: fread failed!");
-- goto ERR;
-+ goto Error;
- }
- (*replicaList)[i].replicaFid.Volume = ntohl(x);
-
- fread(&x, sizeof(int), 1, ff);
- if (ferror(ff) || feof(ff)) {
- sprintf(errmsg, "repair_getdfile: fread failed!");
-- goto ERR;
-+ goto Error;
- }
-
- (*replicaList)[i].repairCount = ntohl(x);
-@@ -232,7 +232,7 @@ int repair_getdfile(char *fname, int inf
- sizeof(struct repair));
- if (!r) {
- sprintf(errmsg, "repair_getdfile: repair calloc failed!\n\tcount = %d\tsize = %d\n\n", (*replicaList)[i].repairCount, sizeof(struct repair));
-- goto ERR;
-+ goto Error;
- }
- (*replicaList)[i].repairList = r;
- }
-@@ -245,7 +245,7 @@ int repair_getdfile(char *fname, int inf
- fread(&x, sizeof(int), 1, ff);
- if (ferror(ff) || feof(ff)) {
- sprintf(errmsg, "repair_getdfile: fread failed!\n");
-- goto ERR;
-+ goto Error;
- }
- r[j].opcode = ntohl(x);
-
-@@ -253,7 +253,7 @@ int repair_getdfile(char *fname, int inf
- fgets(s, MAXNAMELEN, ff);
- if (ferror(ff) || feof(ff)) {
- sprintf(errmsg, "repair_getdfile: fread failed!\n");
-- goto ERR;
-+ goto Error;
- }
- *(s + strlen(s) - 1) = 0; /* nuke the '\n' left behind by fgets() */
-
-@@ -261,7 +261,7 @@ int repair_getdfile(char *fname, int inf
- fgets(s, MAXNAMELEN, ff);
- if (ferror(ff) || feof(ff)) {
- sprintf(errmsg, "repair_getdfile: fread failed!\n");
-- goto ERR;
-+ goto Error;
- }
- *(s + strlen(s) - 1) = 0; /* nuke the '\n' left behind by fgets() */
-
-@@ -269,7 +269,7 @@ int repair_getdfile(char *fname, int inf
- fread(&x, sizeof(int), 1, ff);
- if (ferror(ff) || feof(ff)) {
- sprintf(errmsg, "repair_getdfile: fread failed!\n");
-- goto ERR;
-+ goto Error;
- }
- r[j].parms[k] = ntohl(x);
- }
-@@ -283,7 +283,7 @@ int repair_getdfile(char *fname, int inf
-
- return(0);
-
-- ERR: /* Error exit */
-+ Error: /* Error exit */
- perror(errmsg);
- if(fname != NULL)
- fclose(ff);
diff --git a/net/coda/patches/patch-coda-src_resolution_rescoord.cc b/net/coda/patches/patch-coda-src_resolution_rescoord.cc
deleted file mode 100644
index bd72c7ff407..00000000000
--- a/net/coda/patches/patch-coda-src_resolution_rescoord.cc
+++ /dev/null
@@ -1,14 +0,0 @@
-$NetBSD: patch-coda-src_resolution_rescoord.cc,v 1.1 2015/01/27 15:21:52 hauke Exp $
-
-SunOS does not implicitly include <fcntl.h>.
-
---- coda-src/resolution/rescoord.cc.orig 2006-11-02 19:46:35.000000000 +0000
-+++ coda-src/resolution/rescoord.cc
-@@ -32,6 +32,7 @@ extern "C" {
- #include <sys/types.h>
- #include "coda_assert.h"
- #include <stdio.h>
-+#include <fcntl.h>
- #include <struct.h>
- #include <lwp/lwp.h>
- #include <rpc2/rpc2.h>
diff --git a/net/coda/patches/patch-coda-src_venus_fso_dir.cc b/net/coda/patches/patch-coda-src_venus_fso_dir.cc
deleted file mode 100644
index 4b1ec0f9242..00000000000
--- a/net/coda/patches/patch-coda-src_venus_fso_dir.cc
+++ /dev/null
@@ -1,14 +0,0 @@
-$NetBSD: patch-coda-src_venus_fso_dir.cc,v 1.1 2015/01/27 15:21:52 hauke Exp $
-
-SunOS does not implicitly include <fcntl.h>.
-
---- ./coda-src/venus/fso_dir.cc.orig 2010-03-23 18:10:43.000000000 +0000
-+++ ./coda-src/venus/fso_dir.cc
-@@ -35,6 +35,7 @@ extern "C" {
- #include <sys/types.h>
- #include <sys/file.h>
- #include <sys/stat.h>
-+#include <fcntl.h>
- #include <errno.h>
- #include "coda_string.h"
- #include <unistd.h>
diff --git a/net/coda/patches/patch-coda-src_venus_venus.cc b/net/coda/patches/patch-coda-src_venus_venus.cc
deleted file mode 100644
index bac5566ee4a..00000000000
--- a/net/coda/patches/patch-coda-src_venus_venus.cc
+++ /dev/null
@@ -1,14 +0,0 @@
-$NetBSD: patch-coda-src_venus_venus.cc,v 1.1 2015/01/27 15:21:52 hauke Exp $
-
-SunOS does not implicitly include <fcntl.h>.
-
---- ./coda-src/venus/venus.cc.orig 2009-02-13 20:51:05.000000000 +0000
-+++ ./coda-src/venus/venus.cc
-@@ -27,6 +27,7 @@ extern "C" {
- #include <sys/file.h>
- #include <sys/types.h>
- #include <sys/stat.h>
-+#include <fcntl.h>
- #include <sys/time.h>
- #include <sys/resource.h>
- #include <sys/param.h>
diff --git a/net/coda/patches/patch-coda-src_venus_venusrecov.cc b/net/coda/patches/patch-coda-src_venus_venusrecov.cc
deleted file mode 100644
index bdc00aec11c..00000000000
--- a/net/coda/patches/patch-coda-src_venus_venusrecov.cc
+++ /dev/null
@@ -1,14 +0,0 @@
-$NetBSD: patch-coda-src_venus_venusrecov.cc,v 1.3 2015/01/27 15:21:52 hauke Exp $
-
-SunOS does not implicitly include <limits.h>.
-
---- ./coda-src/venus/venusrecov.cc.orig 2008-10-06 16:52:18.000000000 +0000
-+++ ./coda-src/venus/venusrecov.cc
-@@ -35,6 +35,7 @@ extern "C" {
- #include <stdio.h>
- #include "coda_string.h"
- #include <sys/param.h>
-+#include <limits.h>
- #include <sys/file.h>
- #include <sys/stat.h>
- #include <sys/wait.h>
diff --git a/net/coda/patches/patch-coda-src_venus_vproc_vfscalls.cc b/net/coda/patches/patch-coda-src_venus_vproc_vfscalls.cc
deleted file mode 100644
index f8a30074897..00000000000
--- a/net/coda/patches/patch-coda-src_venus_vproc_vfscalls.cc
+++ /dev/null
@@ -1,16 +0,0 @@
-$NetBSD: patch-coda-src_venus_vproc_vfscalls.cc,v 1.1 2015/01/27 15:21:52 hauke Exp $
-
-The .vtype struct field is not declared for SunOS.
-
---- ./coda-src/venus/vproc_vfscalls.cc.orig 2009-02-13 20:50:21.000000000 +0000
-+++ ./coda-src/venus/vproc_vfscalls.cc
-@@ -124,7 +124,9 @@ void vproc::vget(struct venus_cnode *vpp
- worker *w = (worker *)this;
- union outputArgs *out = (union outputArgs *)w->msg->msg_buf;
- out->coda_vget.Fid = *VenusToKernelFid(&cfidp->cfid_fid);
-+#ifdef CDT_UNKNOWN
- out->coda_vget.vtype = CDT_UNKNOWN;
-+#endif
- w->Return(w->msg, sizeof(struct coda_vget_out));
- }
-
diff --git a/net/coda/patches/patch-coda-src_vice_codaproc2.cc b/net/coda/patches/patch-coda-src_vice_codaproc2.cc
deleted file mode 100644
index b85b6108d31..00000000000
--- a/net/coda/patches/patch-coda-src_vice_codaproc2.cc
+++ /dev/null
@@ -1,14 +0,0 @@
-$NetBSD: patch-coda-src_vice_codaproc2.cc,v 1.1 2015/01/27 15:21:52 hauke Exp $
-
-SunOS does not implicitly include <limits.h>.
-
---- coda-src/vice/codaproc2.cc.orig 2009-07-27 20:43:23.000000000 +0000
-+++ coda-src/vice/codaproc2.cc
-@@ -35,6 +35,7 @@ extern "C" {
- #endif
-
- #include <sys/types.h>
-+#include <limits.h>
- #include <sys/stat.h>
- #include <sys/time.h>
- #include <sys/file.h>
diff --git a/net/coda/patches/patch-coda-src_volutil_vol-ancient.cc b/net/coda/patches/patch-coda-src_volutil_vol-ancient.cc
deleted file mode 100644
index be977008886..00000000000
--- a/net/coda/patches/patch-coda-src_volutil_vol-ancient.cc
+++ /dev/null
@@ -1,14 +0,0 @@
-$NetBSD: patch-coda-src_volutil_vol-ancient.cc,v 1.1 2015/01/27 15:21:52 hauke Exp $
-
-SunOS does not implicitly include <limits.h>.
-
---- coda-src/volutil/vol-ancient.cc.orig 2006-05-27 16:03:34.000000000 +0000
-+++ coda-src/volutil/vol-ancient.cc
-@@ -21,6 +21,7 @@ extern "C" {
- #endif
-
- #include <sys/types.h>
-+#include <limits.h>
- #include <errno.h>
-
- #include <lwp/lwp.h>
diff --git a/net/coda/patches/patch-coda-src_volutil_vol-dump.cc b/net/coda/patches/patch-coda-src_volutil_vol-dump.cc
deleted file mode 100644
index f1b204ebfb8..00000000000
--- a/net/coda/patches/patch-coda-src_volutil_vol-dump.cc
+++ /dev/null
@@ -1,14 +0,0 @@
-$NetBSD: patch-coda-src_volutil_vol-dump.cc,v 1.1 2015/01/27 15:21:52 hauke Exp $
-
-SunOS does not implicitly include <limits.h>.
-
---- coda-src/volutil/vol-dump.cc.orig 2008-08-08 19:09:39.000000000 +0000
-+++ coda-src/volutil/vol-dump.cc
-@@ -50,6 +50,7 @@ extern "C" {
- #include <errno.h>
- #include <sys/stat.h>
- #include <stdio.h>
-+#include <limits.h>
- #include <sys/file.h>
- #include <netinet/in.h>
-
generated by cgit v1.2.3 (git 2.39.1) at 2024-12-12 09:12:42 +0000