diff options
author | wennmach <wennmach> | 2005-03-26 16:50:59 +0000 |
---|---|---|
committer | wennmach <wennmach> | 2005-03-26 16:50:59 +0000 |
commit | 72d66fae7313755c88eaa718f24ddde46960c1ba (patch) | |
tree | 5015379b23d7fff9babab3e5cd39437166dfec53 /net | |
parent | 482d6cc0b379e53f3531a0cf00d69fb24d2d9045 (diff) | |
download | pkgsrc-72d66fae7313755c88eaa718f24ddde46960c1ba.tar.gz |
Feedback of patches from Love <lha>.
Bump PKGREVISION.
Diffstat (limited to 'net')
-rw-r--r-- | net/arla/Makefile | 4 | ||||
-rw-r--r-- | net/arla/distinfo | 8 | ||||
-rw-r--r-- | net/arla/patches/patch-be | 6 | ||||
-rw-r--r-- | net/arla/patches/patch-bj | 26 | ||||
-rw-r--r-- | net/arla/patches/patch-bk | 31 |
5 files changed, 44 insertions, 31 deletions
diff --git a/net/arla/Makefile b/net/arla/Makefile index 9921bc38704..a30ab8ca4e7 100644 --- a/net/arla/Makefile +++ b/net/arla/Makefile @@ -1,7 +1,7 @@ -# $NetBSD: Makefile,v 1.42 2005/03/25 17:40:25 wennmach Exp $ +# $NetBSD: Makefile,v 1.43 2005/03/26 16:50:59 wennmach Exp $ DISTNAME= arla-0.38 -PKGREVISION= 1 +PKGREVISION= 2 CATEGORIES= net security MASTER_SITES= ftp://ftp.stacken.kth.se/pub/arla/ diff --git a/net/arla/distinfo b/net/arla/distinfo index 5fd925dbc70..922f213923a 100644 --- a/net/arla/distinfo +++ b/net/arla/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.14 2005/03/25 17:40:25 wennmach Exp $ +$NetBSD: distinfo,v 1.15 2005/03/26 16:50:59 wennmach Exp $ SHA1 (arla-0.38.tar.gz) = f0e46d4ebf37c137c7a4ba98f6bdc66e7617fd0f RMD160 (arla-0.38.tar.gz) = 9af0c70f6233ab7aa8d6eddfd30583b788a8aaa1 @@ -33,10 +33,10 @@ SHA1 (patch-ba) = 831df6c18039bab2160faca2a601e0a575d23507 SHA1 (patch-bb) = 94cc830efcd70dbd1bddded7955b06373f56ea3c SHA1 (patch-bc) = 61374abb7d0a60bf1dfcef78e88a5eae9d3bc1dd SHA1 (patch-bd) = 8f7028ef8dad43cb7689efae8e0bdc759938a019 -SHA1 (patch-be) = 21c32c1ced42fab706c9744637bc9a0275f5625a +SHA1 (patch-be) = 0084f721cef2663428be37fab3d921d9fb17a60b SHA1 (patch-bf) = a85c5cceb564366bb553d5d9edaa7dfb12dfd184 SHA1 (patch-bg) = 2fcb2460e063145c699cfc9dcb6fadf996778383 SHA1 (patch-bh) = 5789f72078c906ec1bd160783e04cd6b21a5c16f SHA1 (patch-bi) = 2e8201964c64b128025a752ee7354f0cc8305b1b -SHA1 (patch-bj) = a3492740bd57855ef3c2fdd88399ff1e18a73813 -SHA1 (patch-bk) = 2187430d4afcf7dc9a29b5b7a4cc7da4f7ab4078 +SHA1 (patch-bj) = 7d0f6bf02d4f635f5862363581930e43ed3811a8 +SHA1 (patch-bk) = 78720a513c6fea420cb91b6fa3e515467347441a diff --git a/net/arla/patches/patch-be b/net/arla/patches/patch-be index 0a3b83072f4..b0ec1c05875 100644 --- a/net/arla/patches/patch-be +++ b/net/arla/patches/patch-be @@ -1,6 +1,6 @@ -$NetBSD: patch-be,v 1.4 2005/03/25 17:40:25 wennmach Exp $ +$NetBSD: patch-be,v 1.5 2005/03/26 16:50:59 wennmach Exp $ -Shut up gcc. +From Love. --- lib/ko/gensysname.c.orig 2005-03-22 14:43:34.000000000 +0100 +++ lib/ko/gensysname.c 2005-03-22 14:47:20.000000000 +0100 @@ -9,7 +9,7 @@ Shut up gcc. usage(void) { - arg_printusage(args, NULL, "[sysname]", 0); -+ arg_printusage(args, 0, "[sysname]", 0); ++ arg_printusage(args, sizeof(args)/sizeof(args[0]), "[sysname]", NULL); exit(1); } diff --git a/net/arla/patches/patch-bj b/net/arla/patches/patch-bj index 25498c69a58..635b3aa3e0f 100644 --- a/net/arla/patches/patch-bj +++ b/net/arla/patches/patch-bj @@ -1,23 +1,23 @@ -$NetBSD: patch-bj,v 1.4 2005/03/25 17:40:25 wennmach Exp $ +$NetBSD: patch-bj,v 1.5 2005/03/26 16:50:59 wennmach Exp $ -Fix gcc warnings on NetBSD-2.0/amd64. -NB: it seems 'size' is used inconsistently. +From Love. Still cast "size" to (unsigned long long) to avoid a +compiler warning on amd64. --- tools/release-tools/tar-rootify.c.orig 2005-03-23 11:07:28.000000000 +0100 +++ tools/release-tools/tar-rootify.c 2005-03-23 11:23:11.000000000 +0100 -@@ -79,7 +79,7 @@ - int bufsz = 512; - int i, skip = 0, rec = 0; - struct posix_header *p; -- uint64_t size; -+ uint64_t size = 0; - unsigned long cksum, hcksum; - int verbose = 0; +@@ -108,6 +108,7 @@ + if (i < 148 || 155 < i) + cksum += (u_long)(buf[i] & 0xff); -@@ -118,7 +118,7 @@ ++ size = estrntoll(p->size, 12, 8); + if (verbose) { + fprintf(stderr, "rec #%d\n", rec); + fprintf(stderr, "name = %.*s\n", (int)sizeof(p->name), p->name); +@@ -117,8 +118,7 @@ + fprintf(stderr, "gname = %.*s\n", (int)sizeof(p->gname), p->gname); fprintf(stderr, "type = %c\n", p->typeflag); fprintf(stderr, "size = %.*s\n", (int)sizeof(p->size), p->size); - size = estrntoll(p->size, 12, 8); +- size = estrntoll(p->size, 12, 8); - fprintf(stderr, "size = %llo\n", size); + fprintf(stderr, "size = %llo\n", (unsigned long long)size); } diff --git a/net/arla/patches/patch-bk b/net/arla/patches/patch-bk index 32049de2192..9cf6fc80b43 100644 --- a/net/arla/patches/patch-bk +++ b/net/arla/patches/patch-bk @@ -1,21 +1,34 @@ -$NetBSD: patch-bk,v 1.4 2005/03/25 17:40:25 wennmach Exp $ +$NetBSD: patch-bk,v 1.5 2005/03/26 16:50:59 wennmach Exp $ -Fix LP64 issue. -Fix gcc warning. +From Love. --- appl/vos/vos_dump.c.orig 2005-03-23 12:41:00.000000000 +0100 +++ appl/vos/vos_dump.c 2005-03-23 12:53:50.000000000 +0100 -@@ -98,11 +98,11 @@ - if (isdigit(volume[0])) { +@@ -95,14 +95,24 @@ + goto out; + } + +- if (isdigit(volume[0])) { ++ if (isdigit((unsigned char)volume[0])) { char *end; - vol_id = strtoul(volume, &end, 10); +- vol_id = strtoul(volume, &end, 10); - if (vol_id != ULONG_MAX && *end == '\0') -+ if (vol_id != UINT_MAX && *end == '\0') ++ long v; ++ v = strtoul(volume, &end, 10); ++ if (v != ULONG_MAX && *end == '\0') have_volid = 1; ++ vol_id = v; } if (!have_volid) { - int type = volname_canonicalize(volume); -+ int type = volname_canonicalize((char *)volume); ++ char *v = strdup(volume); ++ int type; ++ ++ if (v == NULL) { ++ fprintf(stderr, "dump_volume: out of memory\n"); ++ goto out; ++ } ++ type = volname_canonicalize(v); ++ free(v); vol_id = the_vlentry.volumeId[type]; } - |