diff options
| author | christos <christos@pkgsrc.org> | 2006-09-17 01:25:18 +0000 |
|---|---|---|
| committer | christos <christos@pkgsrc.org> | 2006-09-17 01:25:18 +0000 |
| commit | 536bd1c22f420debf7b71208f40f14b5197becc1 (patch) | |
| tree | 6bca453521936ee4673160eae28cf1814b7bde27 /devel | |
| parent | f38f1b650f722d1663626e5fe3dea5ac7ddad3d6 (diff) | |
| download | pkgsrc-536bd1c22f420debf7b71208f40f14b5197becc1.tar.gz | |
fix a bogus sizeof (from uwe)
Diffstat (limited to 'devel')
| -rw-r--r-- | devel/idutils/Makefile | 3 | ||||
| -rw-r--r-- | devel/idutils/distinfo | 4 | ||||
| -rw-r--r-- | devel/idutils/patches/patch-aj | 21 |
3 files changed, 16 insertions, 12 deletions
diff --git a/devel/idutils/Makefile b/devel/idutils/Makefile index 0b25a11f8e0..f060c3b7ca3 100644 --- a/devel/idutils/Makefile +++ b/devel/idutils/Makefile @@ -1,6 +1,7 @@ -# $NetBSD: Makefile,v 1.2 2006/08/06 23:10:30 wiz Exp $ +# $NetBSD: Makefile,v 1.3 2006/09/17 01:25:18 christos Exp $ DISTNAME= idutils-4.2 +PKREVISION= 1 CATEGORIES= devel MASTER_SITES= ${MASTER_SITE_GNU:=idutils/} diff --git a/devel/idutils/distinfo b/devel/idutils/distinfo index 5d09049832c..e40952f2380 100644 --- a/devel/idutils/distinfo +++ b/devel/idutils/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.3 2006/08/06 23:10:30 wiz Exp $ +$NetBSD: distinfo,v 1.4 2006/09/17 01:25:18 christos Exp $ SHA1 (idutils-4.2.tar.gz) = 306f6e296768d494d771777647c04c8ceed66c1f RMD160 (idutils-4.2.tar.gz) = cddc6ac3d26f8a836a4d8c5d7111b4439095abe8 @@ -9,5 +9,5 @@ SHA1 (patch-ac) = 714cc320a02235c7d49b0ea37be60cff36f6a07b SHA1 (patch-ad) = 05f6be0337f599736627d5bf372529e36ca22246 SHA1 (patch-ae) = b0a11f8172bede23e4f22f5ace819117f8f6a26d SHA1 (patch-ai) = ee67a03e074820db342ffa6ec26c1440641b702e -SHA1 (patch-aj) = e5dc6feb7895e868a742d66e9eb05c0f74c81c3e +SHA1 (patch-aj) = fba2812551631733c5faea8d2d0468ff2ea3d734 SHA1 (patch-ak) = 91a781f4908b34ab172268e74ae77e93fd0e2ab4 diff --git a/devel/idutils/patches/patch-aj b/devel/idutils/patches/patch-aj index 18a06320e71..c76185b2637 100644 --- a/devel/idutils/patches/patch-aj +++ b/devel/idutils/patches/patch-aj @@ -1,7 +1,7 @@ -$NetBSD: patch-aj,v 1.2 2006/08/06 23:10:30 wiz Exp $ +$NetBSD: patch-aj,v 1.3 2006/09/17 01:25:18 christos Exp $ ---- src/lid.c.orig 2006-07-22 02:43:25.000000000 +0000 -+++ src/lid.c +--- src/lid.c.orig 2006-07-21 22:43:25.000000000 -0400 ++++ src/lid.c 2006-09-16 21:23:15.000000000 -0400 @@ -31,7 +31,6 @@ #include <dirname.h> #include <unistd.h> @@ -10,7 +10,7 @@ $NetBSD: patch-aj,v 1.2 2006/08/06 23:10:30 wiz Exp $ #include <regex.h> #include <xalloc.h> #include <pathmax.h> -@@ -538,10 +537,11 @@ report_filenames (char const *name, stru +@@ -538,10 +537,11 @@ void report_grep (char const *name, struct file_link **flinkv) { @@ -24,9 +24,12 @@ $NetBSD: patch-aj,v 1.2 2006/08/06 23:10:30 wiz Exp $ if (key_style == ks_pattern) { -@@ -575,6 +575,15 @@ report_grep (char const *name, struct fi +@@ -573,8 +573,17 @@ + continue; + } - while (fgets (line + 1, sizeof (line) - 1, source_FILE)) +- while (fgets (line + 1, sizeof (line) - 1, source_FILE)) ++ while (fgets (line + 1, line_len - 1, source_FILE)) { + size_t len; + while ((len = strlen(line)) == line_len - 1 && @@ -40,7 +43,7 @@ $NetBSD: patch-aj,v 1.2 2006/08/06 23:10:30 wiz Exp $ line_number++; if (pattern) { -@@ -589,6 +598,7 @@ report_grep (char const *name, struct fi +@@ -589,6 +598,7 @@ } fclose (source_FILE); } @@ -48,7 +51,7 @@ $NetBSD: patch-aj,v 1.2 2006/08/06 23:10:30 wiz Exp $ } static char ** -@@ -800,7 +810,7 @@ search_flinkv (struct file_link **flinkv +@@ -800,7 +810,7 @@ { char pattern[BUFSIZ]; unsigned int count; @@ -57,7 +60,7 @@ $NetBSD: patch-aj,v 1.2 2006/08/06 23:10:30 wiz Exp $ char *eol; if (fgets (pattern, sizeof (pattern), stdin) == 0) -@@ -1368,7 +1378,7 @@ word_match (char const *name_0, char con +@@ -1368,7 +1378,7 @@ continue; } /* march down both strings as long as we match */ |