diff options
| author | dholland <dholland@pkgsrc.org> | 2012-07-22 03:20:03 +0000 |
|---|---|---|
| committer | dholland <dholland@pkgsrc.org> | 2012-07-22 03:20:03 +0000 |
| commit | e1b3569377f232f0f9344897f24056c55d4beeca (patch) | |
| tree | da10cc8f71dc2cc035b6e362cdcf2d1dd47ada8e | |
| parent | c6b784c42cad75d83f56b963c568c5c1957455c7 (diff) | |
| download | pkgsrc-e1b3569377f232f0f9344897f24056c55d4beeca.tar.gz | |
Improve previous patch: blindly setting MAXNAMLEN to 255 is dangerous,
as it is e.g. 511 on NetBSD. Instead, get it from NAME_MAX, which is
POSIX. PKGREVISION -> 3 as a precaution.
| -rw-r--r-- | net/coda/Makefile | 4 | ||||
| -rw-r--r-- | net/coda/distinfo | 4 | ||||
| -rw-r--r-- | net/coda/patches/patch-coda-src_resolution_rename.cc | 22 |
3 files changed, 22 insertions, 8 deletions
diff --git a/net/coda/Makefile b/net/coda/Makefile index c4903fb6e2a..e89149865f5 100644 --- a/net/coda/Makefile +++ b/net/coda/Makefile @@ -1,8 +1,8 @@ -# $NetBSD: Makefile,v 1.12 2012/03/15 11:53:35 obache Exp $ +# $NetBSD: Makefile,v 1.13 2012/07/22 03:20:03 dholland Exp $ # DISTNAME= coda-6.9.5 -PKGEREVISION= 2 +PKGEREVISION= 3 CATEGORIES= net MASTER_SITES= http://www.coda.cs.cmu.edu/pub/coda/src/ diff --git a/net/coda/distinfo b/net/coda/distinfo index 97ca35b216e..301ba8ab4c9 100644 --- a/net/coda/distinfo +++ b/net/coda/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.8 2012/07/15 17:39:17 marino Exp $ +$NetBSD: distinfo,v 1.9 2012/07/22 03:20:03 dholland Exp $ SHA1 (coda-6.9.5.tar.gz) = 248af27c506f5c3be4c4e53f821c9c904580fe60 RMD160 (coda-6.9.5.tar.gz) = 9ef0643aacc7d1352ef253af00d4c7e6ad9e1f78 @@ -7,6 +7,6 @@ SHA1 (patch-ac) = 1084fe8c5dc26500bb13fdb492d1613e1e112f6e SHA1 (patch-ad) = adfee7c5d7de913ee3b898a13bf7acfeac52b765 SHA1 (patch-coda-src_dir_dirbody.c) = 3e3524a4a03ce359956ae00d9b24d1aa3292c752 SHA1 (patch-coda-src_kerndep_pioctl.h) = d6e477b14e76492de0a800d07d83dad06aac1aa3 -SHA1 (patch-coda-src_resolution_rename.cc) = c2de0d308470965decf3159278340d9a3f066a02 +SHA1 (patch-coda-src_resolution_rename.cc) = 63895308b981a5fceeb8142db750ba7e3c2b7142 SHA1 (patch-coda-src_venus_venusrecov.cc) = 25e1e10aed36569aa7c336876c98bda648e4b7e2 SHA1 (patch-config.h.in) = 38e4118aa34c4f415b5fd4d8b7867af2d716ea83 diff --git a/net/coda/patches/patch-coda-src_resolution_rename.cc b/net/coda/patches/patch-coda-src_resolution_rename.cc index 5a1175f7f2b..32b96fc4e1a 100644 --- a/net/coda/patches/patch-coda-src_resolution_rename.cc +++ b/net/coda/patches/patch-coda-src_resolution_rename.cc @@ -1,13 +1,27 @@ -$NetBSD: patch-coda-src_resolution_rename.cc,v 1.1 2012/07/15 17:39:17 marino Exp $ +$NetBSD: patch-coda-src_resolution_rename.cc,v 1.2 2012/07/22 03:20:03 dholland Exp $ ---- coda-src/resolution/rename.cc.orig 2012-07-15 02:02:52.000000000 +0000 +Make sure MAXNAMLEN is defined by filling in from NAME_MAX, which is +standard. (It isn't clear why this expects MAXNAMLEN to be defined +without including sys/param.h, or on what platforms it built +succesfully that way. It maybe should be using CODA_MAXNAMLEN instead; +I can't tell for sure.) + +--- coda-src/resolution/rename.cc.orig 2006-09-19 17:35:48.000000000 +0000 +++ coda-src/resolution/rename.cc -@@ -51,6 +51,10 @@ extern "C" { +@@ -21,6 +21,7 @@ extern "C" { + #endif + + #include <stdio.h> ++#include <limits.h> + #include <rpc2/rpc2.h> + #ifndef __CYGWIN32__ + #include <dirent.h> +@@ -51,6 +52,10 @@ extern "C" { #include "rsle.h" #include "resstats.h" +#ifndef MAXNAMLEN -+#define MAXNAMLEN 255 ++#define MAXNAMLEN NAME_MAX +#endif + static void AddToIncList(dlist *, dlist *, Volume *, ViceFid *, int =0); |