Mon Dec 15 11:35:42 2014 UTC ()
(pkgsrc)
  - Add two patches, to avoid
   error: incompatible types when assigning to type '__off_t' from type 'fpos_t'
   fp_->_offset = u.f;
  - Remove one patch patch-af, which had a comment, not necessary for now
    " also look in *.mk files as makefiles.  bump pkg revision."
(upstream)
  - Update 4.2 to 4.6
    ----------------------
* Noteworthy changes in release 4.6 (2012-02-03) [stable]

** Bug fixes
  - lid -L no longer mishandles open-ended ranges like "..2" and "2.."
  - lid's -d, -o and -x options now work properly

* Noteworthy changes in release 4.5 (2010-06-17) [stable]
* Noteworthy changes in release 4.4 (2009-10-30) [beta]
                        ------------
** New features
  mkid and xtokid accept a new option --files0-from=FILE, to make them
  process only the files named in FILE.  FILE must contain a list of
  NUL-terminated file names.

** Bug fixes
  mkid and xtokid now accept language specific options via the command line.

* Noteworthy changes in release 4.3.92 (2008-10-18) [beta]
                        --------------
** Bug fixes

  fid: avoid a buffer overrun
  handle failed allocation, e.g., by strdup
  avoid potential realloc overflow
  mkid: avoid an infloop on some .el files
  all programs: detect write error on stdout

** Miscellaneous improvements

  revamp code and infrastructure, bringing it closer to coreutils' standards
  add automatically-generated man pages
  mkid recognize more suffixes: .ac, .mk, .bz2, .lzma.
  idutils is now licensed under the General Public License version 3
    or later (GPLv3+).


(mef)
diff -r1.1.1.1 -r1.2 pkgsrc/devel/idutils/DESCR
diff -r1.1.1.1 -r1.2 pkgsrc/devel/idutils/PLIST
diff -r1.9 -r1.10 pkgsrc/devel/idutils/Makefile
diff -r1.6 -r1.7 pkgsrc/devel/idutils/distinfo
diff -r1.1.1.1 -r1.2 pkgsrc/devel/idutils/patches/patch-aa
diff -r1.1.1.1 -r1.2 pkgsrc/devel/idutils/patches/patch-ab
diff -r1.1.1.1 -r1.2 pkgsrc/devel/idutils/patches/patch-ac
diff -r1.1.1.1 -r1.2 pkgsrc/devel/idutils/patches/patch-ad
diff -r1.1 -r1.2 pkgsrc/devel/idutils/patches/patch-ae
diff -r1.1 -r1.2 pkgsrc/devel/idutils/patches/patch-al
diff -r1.1 -r0 pkgsrc/devel/idutils/patches/patch-af
diff -r1.2 -r1.3 pkgsrc/devel/idutils/patches/patch-ai
diff -r1.3 -r1.4 pkgsrc/devel/idutils/patches/patch-aj
diff -r1.3 -r1.4 pkgsrc/devel/idutils/patches/patch-ak
diff -r0 -r1.1 pkgsrc/devel/idutils/patches/patch-lib_fflush_c
diff -r0 -r1.1 pkgsrc/devel/idutils/patches/patch-lib_fseeko_c
cvs diff -r1.1.1.1 -r1.2 pkgsrc/devel/idutils/DESCR (expand / switch to unified diff)

--- pkgsrc/devel/idutils/DESCR 2006/08/05 19:53:26 1.1.1.1
+++ pkgsrc/devel/idutils/DESCR 2014/12/15 11:35:42 1.2
@@ -1,16 +1,13 @@ @@ -1,16 +1,13 @@
1`mkid' is a simple, fast, high-capacity, language-independent 1`mkid' is a simple, fast, high-capacity, language-independent
2identifier database tool. Actually, the term `identifier' is too 2identifier database tool. Actually, the term `identifier' is too
3limiting--`mkid' stores tokens, be they program identifiers of any 3limiting--`mkid' stores tokens, be they program identifiers of any
4form, literal numbers, or words of human-readable text. Database 4form, literal numbers, or words of human-readable text. Database
5queries can be issued from the command-line, or from within emacs, 5queries can be issued from the command-line, or from within emacs,
6serving as an augmented tags facility. 6serving as an augmented tags facility.
7 7
8`mkid' was originally written by Greg McGary <gkm@gnu.ai.mit.edu> 8`mkid' was originally written by Greg McGary <gkm@gnu.ai.mit.edu>
9and posted to comp.sources.unix in September 1987. It was then 9and posted to comp.sources.unix in September 1987. It was then
10maintained and enhanced by a loose knit group of programmers on the 10maintained and enhanced by a loose knit group of programmers on the
11Internet led by Tom Horsley <Tom.Horsley@mail.hcsc.com>. Tom released 11Internet led by Tom Horsley <Tom.Horsley@mail.hcsc.com>. Tom released
12`mkid2' on comp.sources.unix in March, 1991. Since then, Greg McGary 12`mkid2' on comp.sources.unix in March, 1991. Since then, Greg McGary
13has resumed maintenance and is releasing an improved version 3 under GPL. 13has resumed maintenance and is releasing an improved version 3 under GPL.
14 
15Version 3 is an interim release. Version 4 will follow in the coming 
16months and include a cscope clone plus other improvements. 
cvs diff -r1.1.1.1 -r1.2 pkgsrc/devel/idutils/PLIST (expand / switch to unified diff)

--- pkgsrc/devel/idutils/PLIST 2006/08/05 19:53:26 1.1.1.1
+++ pkgsrc/devel/idutils/PLIST 2014/12/15 11:35:42 1.2
@@ -1,17 +1,40 @@ @@ -1,17 +1,40 @@
1@comment $NetBSD: PLIST,v 1.1.1.1 2006/08/05 19:53:26 wiz Exp $ 1@comment $NetBSD: PLIST,v 1.2 2014/12/15 11:35:42 mef Exp $
2bin/aid 2bin/aid
3bin/defid 3bin/defid
4bin/eid 4bin/eid
5bin/fid 5bin/fid
6bin/fnid 6bin/fnid
7bin/gid 7bin/gid
8bin/lid 8bin/lid
9bin/mkid 9bin/mkid
10bin/xtokid 10bin/xtokid
11info/idutils.info 11info/idutils.info
 12lib/charset.alias
 13man/man1/aid.1
 14man/man1/defid.1
 15man/man1/eid.1
 16man/man1/fid.1
 17man/man1/fnid.1
 18man/man1/gid.1
 19man/man1/lid.1
 20man/man1/mkid.1
 21man/man1/xtokid.1
12share/emacs/site-lisp/idutils.el 22share/emacs/site-lisp/idutils.el
13share/id-lang.map 23share/id-lang.map
 24share/locale/da/LC_MESSAGES/idutils.mo
14share/locale/de/LC_MESSAGES/idutils.mo 25share/locale/de/LC_MESSAGES/idutils.mo
 26share/locale/fi/LC_MESSAGES/idutils.mo
15share/locale/fr/LC_MESSAGES/idutils.mo 27share/locale/fr/LC_MESSAGES/idutils.mo
 28share/locale/ga/LC_MESSAGES/idutils.mo
 29share/locale/hu/LC_MESSAGES/idutils.mo
 30share/locale/id/LC_MESSAGES/idutils.mo
 31share/locale/it/LC_MESSAGES/idutils.mo
16share/locale/nl/LC_MESSAGES/idutils.mo 32share/locale/nl/LC_MESSAGES/idutils.mo
17share/locale/pl/LC_MESSAGES/idutils.mo 33share/locale/pl/LC_MESSAGES/idutils.mo
 34share/locale/pt_BR/LC_MESSAGES/idutils.mo
 35share/locale/ro/LC_MESSAGES/idutils.mo
 36share/locale/ru/LC_MESSAGES/idutils.mo
 37share/locale/sv/LC_MESSAGES/idutils.mo
 38share/locale/tr/LC_MESSAGES/idutils.mo
 39share/locale/vi/LC_MESSAGES/idutils.mo
 40share/locale/zh_CN/LC_MESSAGES/idutils.mo
cvs diff -r1.9 -r1.10 pkgsrc/devel/idutils/Makefile (expand / switch to unified diff)

--- pkgsrc/devel/idutils/Makefile 2012/10/31 11:17:06 1.9
+++ pkgsrc/devel/idutils/Makefile 2014/12/15 11:35:42 1.10
@@ -1,23 +1,24 @@ @@ -1,23 +1,24 @@
1# $NetBSD: Makefile,v 1.9 2012/10/31 11:17:06 asau Exp $ 1# $NetBSD: Makefile,v 1.10 2014/12/15 11:35:42 mef Exp $
2 2
3DISTNAME= idutils-4.2 3DISTNAME= idutils-4.6
4PKGREVISION= 3 
5CATEGORIES= devel 4CATEGORIES= devel
6MASTER_SITES= ${MASTER_SITE_GNU:=idutils/} 5MASTER_SITES= ${MASTER_SITE_GNU:=idutils/}
 6EXTRACT_SUFX= .tar.xz
7 7
8MAINTAINER= pkgsrc-users@NetBSD.org 8MAINTAINER= pkgsrc-users@NetBSD.org
9HOMEPAGE= http://www.gnu.org/software/idutils/idutils.html 9HOMEPAGE= http://www.gnu.org/software/idutils/idutils.html
10COMMENT= Classic Berkeley gid/lid tools for looking up variables in code 10COMMENT= Classic Berkeley gid/lid tools for looking up variables in code
 11LICENSE= gnu-gpl-v3
11 12
12CONFLICTS= sh-utils>=2.0nb2 coreutils-[0-9]* 13CONFLICTS= sh-utils>=2.0nb2 coreutils-[0-9]*
13 14
14USE_PKGLOCALEDIR= yes 15USE_PKGLOCALEDIR= yes
15USE_TOOLS+= msgfmt 16USE_TOOLS+= msgfmt
16 17
17GNU_CONFIGURE= yes 18GNU_CONFIGURE= yes
18CONFIGURE_ENV+= ac_cv_prog_EMACS=no 19CONFIGURE_ENV+= ac_cv_prog_EMACS=no
19INFO_FILES= YES 20INFO_FILES= YES
20MAKE_ENV+= BSD_SETENV=${SETENV:Q} 21MAKE_ENV+= BSD_SETENV=${SETENV:Q}
21 22
22# Don't byte-compile the .el file. 23# Don't byte-compile the .el file.
23MAKE_FLAGS+= elc_SCRIPTS= 24MAKE_FLAGS+= elc_SCRIPTS=
cvs diff -r1.6 -r1.7 pkgsrc/devel/idutils/distinfo (expand / switch to unified diff)

--- pkgsrc/devel/idutils/distinfo 2011/04/17 01:44:57 1.6
+++ pkgsrc/devel/idutils/distinfo 2014/12/15 11:35:42 1.7
@@ -1,15 +1,16 @@ @@ -1,15 +1,16 @@
1$NetBSD: distinfo,v 1.6 2011/04/17 01:44:57 mrg Exp $ 1$NetBSD: distinfo,v 1.7 2014/12/15 11:35:42 mef Exp $
2 2
3SHA1 (idutils-4.2.tar.gz) = 306f6e296768d494d771777647c04c8ceed66c1f 3SHA1 (idutils-4.6.tar.xz) = cb977ce3e4b2bacda85797e9048986e1c1765148
4RMD160 (idutils-4.2.tar.gz) = cddc6ac3d26f8a836a4d8c5d7111b4439095abe8 4RMD160 (idutils-4.6.tar.xz) = 9b136e5bedf04183a631c1c7642c7982deb5016d
5Size (idutils-4.2.tar.gz) = 706193 bytes 5Size (idutils-4.6.tar.xz) = 1001496 bytes
6SHA1 (patch-aa) = f957a2af9470e41c1b423b9c753456e68a46405c 6SHA1 (patch-aa) = fb666517045bb53e13e0a7b434e649161719a65b
7SHA1 (patch-ab) = 96a1ec3d8c49da9538342450df41c7cd17c0d21c 7SHA1 (patch-ab) = 20b870fe0f7a7b9d1105e12ff14b9370deb1acc9
8SHA1 (patch-ac) = 714cc320a02235c7d49b0ea37be60cff36f6a07b 8SHA1 (patch-ac) = 05b38bed7f2a471b3696d553fc2750b5f0812f7d
9SHA1 (patch-ad) = 05f6be0337f599736627d5bf372529e36ca22246 9SHA1 (patch-ad) = 12326348db69cb0a991a37568d3765cac7b15456
10SHA1 (patch-ae) = b0a11f8172bede23e4f22f5ace819117f8f6a26d 10SHA1 (patch-ae) = a026e1658e209ee927054296f423fe3536412b45
11SHA1 (patch-af) = 1ead55183dbbb3b317084c9b2789fbb52972a484 11SHA1 (patch-ai) = 5e64a7c67075a3d308b6e66252559afa20d02639
12SHA1 (patch-ai) = ee67a03e074820db342ffa6ec26c1440641b702e 12SHA1 (patch-aj) = 8381724be238e518a86377b3226cf05e99b83f1d
13SHA1 (patch-aj) = fba2812551631733c5faea8d2d0468ff2ea3d734 13SHA1 (patch-ak) = c2b3573a5386e77fc6bc1d5a4e89ccd1af830630
14SHA1 (patch-ak) = 91a781f4908b34ab172268e74ae77e93fd0e2ab4 14SHA1 (patch-al) = 163e06074da62edbcacd459788cfea3528e94e30
15SHA1 (patch-al) = f0d2c84ae7f7becf6ccc3d47b956b0540ea92a88 15SHA1 (patch-lib_fflush_c) = 41e1dcfc0982148d1a2c7cceb6aa117c1ded774a
 16SHA1 (patch-lib_fseeko_c) = 35ac50c58f8d6339d37ff72a0e2b58f0233a7cc0
cvs diff -r1.1.1.1 -r1.2 pkgsrc/devel/idutils/patches/patch-aa (expand / switch to unified diff)

--- pkgsrc/devel/idutils/patches/patch-aa 2006/08/05 19:53:26 1.1.1.1
+++ pkgsrc/devel/idutils/patches/patch-aa 2014/12/15 11:35:42 1.2
@@ -1,14 +1,16 @@ @@ -1,14 +1,16 @@
1$NetBSD: patch-aa,v 1.1.1.1 2006/08/05 19:53:26 wiz Exp $ 1$NetBSD: patch-aa,v 1.2 2014/12/15 11:35:42 mef Exp $
 2
 3To avoid using alloca.h
2 4
3--- libidu/fnprint.c.orig 2005-12-27 00:21:33.000000000 -0500 5--- libidu/fnprint.c.orig 2005-12-27 00:21:33.000000000 -0500
4+++ libidu/fnprint.c 2006-08-03 12:58:44.026747335 -0400 6+++ libidu/fnprint.c 2006-08-03 12:58:44.026747335 -0400
5@@ -19,7 +19,6 @@ 7@@ -19,7 +19,6 @@
6 #include <config.h> 8 #include <config.h>
7 #include <stdio.h> 9 #include <stdio.h>
8 #include <stdlib.h> 10 #include <stdlib.h>
9-#include <alloca.h> 11-#include <alloca.h>
10 #include <unistd.h> 12 #include <unistd.h>
11 #include <string.h> 13 #include <string.h>
12 #include <pathmax.h> 14 #include <pathmax.h>
13@@ -82,7 +81,7 @@ 15@@ -82,7 +81,7 @@
14 struct file_link const *arg; 16 struct file_link const *arg;
cvs diff -r1.1.1.1 -r1.2 pkgsrc/devel/idutils/patches/patch-ab (expand / switch to unified diff)

--- pkgsrc/devel/idutils/patches/patch-ab 2006/08/05 19:53:26 1.1.1.1
+++ pkgsrc/devel/idutils/patches/patch-ab 2014/12/15 11:35:42 1.2
@@ -1,13 +1,13 @@ @@ -1,13 +1,13 @@
1$NetBSD: patch-ab,v 1.1.1.1 2006/08/05 19:53:26 wiz Exp $ 1$NetBSD: patch-ab,v 1.2 2014/12/15 11:35:42 mef Exp $
2 2
3--- libidu/idfile.h.orig 2005-11-01 04:18:33.000000000 -0500 3--- libidu/idfile.h.orig 2012-01-31 21:22:05.000000000 +0900
4+++ libidu/idfile.h 2006-08-03 13:00:35.159831999 -0400 4+++ libidu/idfile.h 2014-11-20 22:57:11.000000000 +0900
5@@ -147,7 +147,7 @@ 5@@ -145,7 +145,7 @@ extern struct hash_table dev_ino_table;
6  6
7 #define token_string(buf) (buf) 7 #define token_string(buf) (buf)
8 extern unsigned int token_flags (char const *buf); 8 extern unsigned int token_flags (char const *buf) _GL_ATTRIBUTE_PURE;
9-extern unsigned short token_count (char const *buf); 9-extern unsigned short token_count (char const *buf) _GL_ATTRIBUTE_PURE;
10+extern unsigned int token_count (char const *buf); 10+extern unsigned int token_count (char const *buf) _GL_ATTRIBUTE_PURE;
11 extern unsigned char const *token_hits_addr (char const *buf); 11 extern unsigned char const *token_hits_addr (char const *buf)
 12 _GL_ATTRIBUTE_PURE;
12  13
13 #define MAYBE_RETURN_PREFIX_MATCH(arg, str, val) do { \ 
cvs diff -r1.1.1.1 -r1.2 pkgsrc/devel/idutils/patches/patch-ac (expand / switch to unified diff)

--- pkgsrc/devel/idutils/patches/patch-ac 2006/08/05 19:53:26 1.1.1.1
+++ pkgsrc/devel/idutils/patches/patch-ac 2014/12/15 11:35:42 1.2
@@ -1,19 +1,19 @@ @@ -1,19 +1,19 @@
1$NetBSD: patch-ac,v 1.1.1.1 2006/08/05 19:53:26 wiz Exp $ 1$NetBSD: patch-ac,v 1.2 2014/12/15 11:35:42 mef Exp $
2 2
3--- libidu/idread.c.orig 2005-12-27 00:23:18.000000000 -0500 3--- libidu/idread.c.orig 2012-01-29 01:54:33.000000000 +0900
4+++ libidu/idread.c 2006-08-03 12:27:38.779542243 -0400 4+++ libidu/idread.c 2014-11-20 22:58:01.000000000 +0900
5@@ -211,12 +211,12 @@ 5@@ -210,12 +210,12 @@ token_flags (char const *buf)
6 #define TOK_COUNT_ADDR(buf) ((unsigned char const *)(TOK_FLAGS_ADDR (buf) + 1)) 6 return *(unsigned char const *)&buf[strlen (buf) + 1];
7 #define TOK_HITS_ADDR(buf) ((unsigned char const *)(TOK_COUNT_ADDR (buf) + 2)) 7 }
8  8
9-unsigned short 9-unsigned short
10+unsigned int 10+unsigned int
11 token_count (char const *buf) 11 token_count (char const *buf)
12 { 12 {
13 unsigned char const *flags = (unsigned char const *)&buf[strlen (buf) + 1]; 13 unsigned char const *flags = (unsigned char const *)&buf[strlen (buf) + 1];
14 unsigned char const *addr = flags + 1; 14 unsigned char const *addr = flags + 1;
15- unsigned short count = *addr; 15- unsigned short count = *addr;
16+ unsigned int count = *addr; 16+ unsigned int count = *addr;
17 if (*flags & TOK_SHORT_COUNT) 17 if (*flags & TOK_SHORT_COUNT)
18 count += (*++addr << 8); 18 count += (*++addr << 8);
19 return count; 19 return count;
cvs diff -r1.1.1.1 -r1.2 pkgsrc/devel/idutils/patches/patch-ad (expand / switch to unified diff)

--- pkgsrc/devel/idutils/patches/patch-ad 2006/08/05 19:53:26 1.1.1.1
+++ pkgsrc/devel/idutils/patches/patch-ad 2014/12/15 11:35:42 1.2
@@ -1,22 +1,67 @@ @@ -1,22 +1,67 @@
1$NetBSD: patch-ad,v 1.1.1.1 2006/08/05 19:53:26 wiz Exp $ 1$NetBSD: patch-ad,v 1.2 2014/12/15 11:35:42 mef Exp $
2 2
3--- libidu/scanners.c.orig 2006-02-15 01:29:03.000000000 -0500 3More file types to support
4+++ libidu/scanners.c 2006-08-03 15:57:57.169635912 -0400 4
5@@ -77,11 +77,16 @@ 5--- libidu/scanners.c.orig 2014-11-20 22:55:49.000000000 +0900
 6+++ libidu/scanners.c 2014-11-20 23:00:17.000000000 +0900
 7@@ -77,11 +77,16 @@ static struct language languages_0[] =
6 { 8 {
7 { "C", parse_args_c, get_token_c, help_me_c }, 9 { "C", parse_args_c, get_token_c, help_me_c },
8 { "C++", parse_args_c, get_token_c, help_me_cpp }, 10 { "C++", parse_args_c, get_token_c, help_me_cpp },
9+ { "cpp", parse_args_c, get_token_c, help_me_cpp }, 11+ { "cpp", parse_args_c, get_token_c, help_me_cpp },
10+ { "cc", parse_args_c, get_token_c, help_me_cpp }, 12+ { "cc", parse_args_c, get_token_c, help_me_cpp },
11 { "Java", parse_args_c, get_token_c, help_me_java }, 13 { "Java", parse_args_c, get_token_c, help_me_java },
12 { "asm", parse_args_asm, get_token_asm, help_me_asm }, 14 { "asm", parse_args_asm, get_token_asm, help_me_asm },
13+ { "S", parse_args_asm, get_token_asm, help_me_asm }, 15+ { "S", parse_args_asm, get_token_asm, help_me_asm },
14+ { "s", parse_args_asm, get_token_asm, help_me_asm }, 16+ { "s", parse_args_asm, get_token_asm, help_me_asm },
15 { "text", parse_args_text, get_token_text, help_me_text }, 17 { "text", parse_args_text, get_token_text, help_me_text },
16 { "perl", parse_args_perl, get_token_perl, help_me_perl }, 18 { "perl", parse_args_perl, get_token_perl, help_me_perl },
17- { "lisp", parse_args_lisp, get_token_lisp, help_me_lisp } 19- { "lisp", parse_args_lisp, get_token_lisp, help_me_lisp }
18+ { "lisp", parse_args_lisp, get_token_lisp, help_me_lisp }, 20+ { "lisp", parse_args_lisp, get_token_lisp, help_me_lisp },
19+ { "make", parse_args_text, get_token_text, help_me_text }, 21+ { "make", parse_args_text, get_token_text, help_me_text }
20 }; 22 };
21 struct language const *languages_N = &languages_0[cardinalityof (languages_0)]; 23 static struct language const *languages_N
22  24 = &languages_0[cardinalityof (languages_0)];
 25@@ -1711,8 +1716,9 @@ get_token_lisp (FILE *in_FILE, void cons
 26 {
 27 while (is_LETTER (c = getc (in_FILE)))
 28 *id++ = c;
 29- if (c != EOF)
 30- ungetc (c, in_FILE);
 31+ if (c == EOF)
 32+ goto out;
 33+ ungetc (c, in_FILE);
 34 *flags = TOK_LITERAL;
 35 obstack_grow0 (&tokens_obstack, scanner_buffer, id - scanner_buffer);
 36 return (struct token *) obstack_finish (&tokens_obstack);
 37@@ -1729,13 +1735,17 @@ get_token_lisp (FILE *in_FILE, void cons
 38 break;
 39 }
 40 } while (c != EOF);
 41+ if (c == EOF)
 42+ goto out;
 43 goto top;
 44 }
 45 else if (c == '@') /* #@LENGTH ...^_ EMACS byte-code comment */
 46 {
 47 do {
 48 c = getc (in_FILE);
 49- } while ( (c != EOF) && (c != '\037'));
 50+ if (c == EOF)
 51+ goto out;
 52+ } while (c != '\037');
 53 goto top;
 54 }
 55 else if (c == '[') /* #[ ... ] EMACS byte-code object */
 56@@ -1787,8 +1797,9 @@ get_token_lisp (FILE *in_FILE, void cons
 57 *id++ = c;
 58 while (is_NUMBER (c = getc (in_FILE)))
 59 *id++ = c;
 60- if (c != EOF)
 61- ungetc (c, in_FILE);
 62+ if (c == EOF)
 63+ goto out;
 64+ ungetc (c, in_FILE);
 65 *flags = TOK_NUMBER | TOK_LITERAL;
 66 obstack_grow0 (&tokens_obstack, scanner_buffer, id - scanner_buffer);
 67 return (struct token *) obstack_finish (&tokens_obstack);
cvs diff -r1.1 -r1.2 pkgsrc/devel/idutils/patches/patch-ae (expand / switch to unified diff)

--- pkgsrc/devel/idutils/patches/patch-ae 2006/08/06 23:10:30 1.1
+++ pkgsrc/devel/idutils/patches/patch-ae 2014/12/15 11:35:42 1.2
@@ -1,21 +1,21 @@ @@ -1,21 +1,21 @@
1$NetBSD: patch-ae,v 1.1 2006/08/06 23:10:30 wiz Exp $ 1$NetBSD: patch-ae,v 1.2 2014/12/15 11:35:42 mef Exp $
2 2
3--- src/fnid.c.orig 2006-04-29 15:52:12.000000000 +0000 3--- src/fnid.c.orig 2012-01-01 18:16:06.000000000 +0900
4+++ src/fnid.c 4+++ src/fnid.c 2014-11-20 23:05:37.000000000 +0900
5@@ -24,7 +24,6 @@ 5@@ -23,7 +23,6 @@
6 #include <errno.h> 6 #include <string.h>
7 #include <stdlib.h> 7 #include <stdlib.h>
8 #include <errno.h> 8 #include <errno.h>
9-#include <alloca.h> 9-#include <alloca.h>
10 #include <xalloc.h> 10 #include <xalloc.h>
11 #include <pathmax.h> 11 #include <pathmax.h>
12 #include <error.h> 12 #include <error.h>
13@@ -167,7 +166,7 @@ main (int argc, char **argv) 13@@ -166,7 +165,7 @@ main (int argc, char **argv)
14 char **patv_0 = xmalloc (sizeof(char *) * (argc * 2)); 14 char **patv_0 = xmalloc (sizeof(char *) * (argc * 2));
15 char **patv_N; 15 char **patv_N;
16 char **patv = patv_0; 16 char **patv = patv_0;
17- char *file_name = alloca (PATH_MAX); 17- char *file_name = alloca (PATH_MAX);
18+ char file_name[PATH_MAX]; 18+ char file_name[PATH_MAX];
19  19
20 for ( ; argc; argc--, argv++) 20 for ( ; argc; argc--, argv++)
21 { 21 {
cvs diff -r1.1 -r1.2 pkgsrc/devel/idutils/patches/patch-al (expand / switch to unified diff)

--- pkgsrc/devel/idutils/patches/patch-al 2010/12/11 23:40:08 1.1
+++ pkgsrc/devel/idutils/patches/patch-al 2014/12/15 11:35:42 1.2
@@ -1,153 +1,12 @@ @@ -1,153 +1,12 @@
1--- libidu/scanners.c.orig 2010-12-11 15:27:10.000000000 -0800 1$NetBSD: patch-al,v 1.2 2014/12/15 11:35:42 mef Exp $
2+++ libidu/scanners.c 2010-12-11 15:26:59.000000000 -0800 2
3@@ -1618,6 +1618,7 @@ 3--- libidu/scanners.c.orig 2014-11-20 23:07:03.000000000 +0900
 4+++ libidu/scanners.c 2014-11-20 23:19:21.000000000 +0900
 5@@ -1628,6 +1628,7 @@ get_token_lisp (FILE *in_FILE, void cons
4 switch (c) 6 switch (c)
5 { 7 {
6 case EOF: 8 case EOF:
7+ out: 9+ out:
8 obstack_free (&tokens_obstack, obstack_finish (&tokens_obstack)); 10 obstack_free (&tokens_obstack, obstack_finish (&tokens_obstack));
9 return 0; 11 return 0;
10  12
11@@ -1634,19 +1635,25 @@ 
12 case ';': /* comment */ 
13 do { 
14 c = getc (in_FILE); 
15- } while ( (c != EOF) && (c != '\n')); 
16+ if (c == EOF) 
17+ goto out; 
18+ } while (c != '\n'); 
19 goto top; 
20  
21 case '"': /* string with or without ansi-C escapes */ 
22 string: 
23 do { 
24 c = getc (in_FILE); 
25+ if (c == EOF) 
26+ goto out; 
27 if (c == '\\') 
28 { 
29 c = getc (in_FILE); 
30+ if (c == EOF) 
31+ goto out; 
32 continue; 
33 } 
34- } while ( (c != EOF) && (c != '"')); 
35+ } while (c != '"'); 
36 goto top; 
37  
38 case '.': 
39@@ -1654,11 +1661,12 @@ 
40 id = scanner_buffer; 
41 *id++ = c; 
42 c = getc (in_FILE); 
43+ if (c == EOF) 
44+ goto out; 
45 if (is_DIGIT (c) || 
46 (scanner_buffer[0] != '.' && (c == '.' || c == 'i' || c == 'I'))) 
47 goto number; 
48- if (c != EOF) 
49- ungetc (c, in_FILE); 
50+ ungetc (c, in_FILE); 
51 goto ident; 
52  
53 case '#': 
54@@ -1667,20 +1675,23 @@ 
55  
56 c = getc (in_FILE); 
57 if (c == EOF) 
58- goto top; 
59+ goto out; 
60 else if (is_RADIX (c)) 
61 goto number; 
62 else if (c == '\\') /* #\... literal Character */ 
63 { 
64 *id++ = c; 
65 c = getc (in_FILE); 
66+ if (c == EOF) 
67+ goto out; 
68 *id++ = c; 
69 if (is_LETTER (c)) 
70 { 
71 while (is_LETTER (c = getc (in_FILE))) 
72 *id++ = c; 
73- if (c != EOF) 
74- ungetc (c, in_FILE); 
75+ if (c == EOF) 
76+ goto out; 
77+ ungetc (c, in_FILE); 
78 } 
79 *flags = TOK_LITERAL; 
80 obstack_grow0 (&tokens_obstack, scanner_buffer, id - scanner_buffer); 
81@@ -1694,8 +1705,9 @@ 
82 { 
83 while (is_LETTER (c = getc (in_FILE))) 
84 *id++ = c; 
85- if (c != EOF) 
86- ungetc (c, in_FILE); 
87+ if (c == EOF) 
88+ goto out; 
89+ ungetc (c, in_FILE); 
90 *flags = TOK_LITERAL; 
91 obstack_grow0 (&tokens_obstack, scanner_buffer, id - scanner_buffer); 
92 return (struct token *) obstack_finish (&tokens_obstack); 
93@@ -1712,13 +1724,17 @@ 
94 break; 
95 } 
96 } while (c != EOF); 
97+ if (c == EOF) 
98+ goto out; 
99 goto top; 
100 } 
101 else if (c == '@') /* #@LENGTH ...^_ EMACS byte-code comment */ 
102 { 
103 do { 
104 c = getc (in_FILE); 
105- } while ( (c != EOF) && (c != '\037')); 
106+ if (c == EOF) 
107+ goto out; 
108+ } while (c != '\037'); 
109 goto top; 
110 } 
111 else if (c == '[') /* #[ ... ] EMACS byte-code object */ 
112@@ -1742,23 +1758,24 @@ 
113 { 
114 while (is_IDENT (c = getc (in_FILE))) 
115 *id++ = c; 
116+ if (c == EOF) 
117+ goto out; 
118 if (c == '[') 
119 { 
120 c = getc (in_FILE); 
121+ if (c == EOF) 
122+ goto out; 
123 if (c == ']') 
124 { 
125 *id++ = '['; 
126 *id++ = ']'; 
127 continue; 
128 } 
129- if (c != EOF) 
130- ungetc (c, in_FILE); 
131- ungetc ('[', in_FILE); 
132+ ungetc (c, in_FILE); 
133 } 
134 break; 
135 } 
136- if (c != EOF) 
137- ungetc (c, in_FILE); 
138+ ungetc (c, in_FILE); 
139 *flags = TOK_NAME | TOK_LITERAL; 
140 obstack_grow0 (&tokens_obstack, scanner_buffer, id - scanner_buffer); 
141 return (struct token *) obstack_finish (&tokens_obstack); 
142@@ -1770,8 +1787,9 @@ 
143 *id++ = c; 
144 while (is_NUMBER (c = getc (in_FILE))) 
145 *id++ = c; 
146- if (c != EOF) 
147- ungetc (c, in_FILE); 
148+ if (c == EOF) 
149+ goto out; 
150+ ungetc (c, in_FILE); 
151 *flags = TOK_NUMBER | TOK_LITERAL; 
152 obstack_grow0 (&tokens_obstack, scanner_buffer, id - scanner_buffer); 
153 return (struct token *) obstack_finish (&tokens_obstack); 
File Deleted: pkgsrc/devel/idutils/patches/Attic/patch-af
cvs diff -r1.2 -r1.3 pkgsrc/devel/idutils/patches/patch-ai (expand / switch to unified diff)

--- pkgsrc/devel/idutils/patches/patch-ai 2006/08/06 23:10:30 1.2
+++ pkgsrc/devel/idutils/patches/patch-ai 2014/12/15 11:35:42 1.3
@@ -1,21 +1,21 @@ @@ -1,21 +1,21 @@
1$NetBSD: patch-ai,v 1.2 2006/08/06 23:10:30 wiz Exp $ 1$NetBSD: patch-ai,v 1.3 2014/12/15 11:35:42 mef Exp $
2 2
3--- src/fid.c.orig 2006-03-05 05:24:21.000000000 -0500 3--- src/fid.c.orig 2012-01-01 18:16:06.000000000 +0900
4+++ src/fid.c 2006-08-03 12:49:29.089070087 -0400 4+++ src/fid.c 2014-11-20 23:08:54.000000000 +0900
5@@ -23,7 +23,6 @@ 5@@ -23,7 +23,6 @@
6 #include <unistd.h> 6 #include <unistd.h>
7 #include <stdlib.h> 7 #include <stdlib.h>
8 #include <errno.h> 8 #include <errno.h>
9-#include <alloca.h> 9-#include <alloca.h>
10 #include <error.h> 10 #include <error.h>
11 #include <pathmax.h> 11 #include <pathmax.h>
12 #include <xalloc.h> 12 #include <xalloc.h>
13@@ -211,7 +210,7 @@ 13@@ -211,7 +210,7 @@ get_file_index (char *file_name)
14 struct file_link **members; 14 struct file_link **members;
15 struct file_link **end = &members_0[idh.idh_files]; 15 struct file_link **end = &members_0[idh.idh_files];
16 struct file_link *fn_flink = 0; 16 struct file_link *fn_flink = 0;
17- char *file_name_buf = alloca (PATH_MAX); 17- char *file_name_buf = alloca (PATH_MAX);
18+ char file_name_buf[PATH_MAX]; 18+ char file_name_buf[PATH_MAX];
19 int has_slash = (strchr (file_name, '/') != 0); 19 int has_slash = (strchr (file_name, '/') != 0);
20 int file_name_length = strlen (file_name); 20 size_t file_name_length = strlen (file_name);
21 int idx = -1; 21 int idx = -1;
cvs diff -r1.3 -r1.4 pkgsrc/devel/idutils/patches/patch-aj (expand / switch to unified diff)

--- pkgsrc/devel/idutils/patches/patch-aj 2006/09/17 01:25:18 1.3
+++ pkgsrc/devel/idutils/patches/patch-aj 2014/12/15 11:35:42 1.4
@@ -1,71 +1,71 @@ @@ -1,71 +1,71 @@
1$NetBSD: patch-aj,v 1.3 2006/09/17 01:25:18 christos Exp $ 1$NetBSD: patch-aj,v 1.4 2014/12/15 11:35:42 mef Exp $
2 2
3--- src/lid.c.orig 2006-07-21 22:43:25.000000000 -0400 3--- src/lid.c.orig 2012-01-31 21:22:05.000000000 +0900
4+++ src/lid.c 2006-09-16 21:23:15.000000000 -0400 4+++ src/lid.c 2014-11-20 23:12:39.000000000 +0900
5@@ -31,7 +31,6 @@ 5@@ -32,7 +32,6 @@
6 #include <dirname.h> 6 #include <dirname.h>
7 #include <unistd.h> 7 #include <unistd.h>
8 #include <termios.h> 8 #include <termios.h>
9-#include <alloca.h> 9-#include <alloca.h>
10 #include <regex.h> 10 #include <regex.h>
11 #include <xalloc.h> 11 #include <xalloc.h>
12 #include <pathmax.h> 12 #include <pathmax.h>
13@@ -538,10 +537,11 @@ 13@@ -562,10 +561,11 @@ report_filenames (char const *name, stru
14 void 14 static void
15 report_grep (char const *name, struct file_link **flinkv) 15 report_grep (char const *name, struct file_link **flinkv)
16 { 16 {
17- char line[1<<020]; 17- char line[1<<020];
18+ char *line = xmalloc(BUFSIZ); 18+ char *line = xmalloc(BUFSIZ);
19+ size_t line_len = BUFSIZ; 19+ size_t line_len = BUFSIZ;
20 char const *pattern = 0; 20 char const *pattern = 0;
21 regex_t compiled; 21 regex_t compiled;
22- char *file_name = alloca (PATH_MAX); 22- char *file_name = alloca (PATH_MAX);
23+ char file_name[PATH_MAX]; 23+ char file_name[PATH_MAX];
24  24
25 if (key_style == ks_pattern) 25 if (key_style == ks_pattern)
26 { 26 {
27@@ -573,8 +573,17 @@ 27@@ -597,8 +597,17 @@ report_grep (char const *name, struct fi
28 continue; 28 continue;
29 } 29 }
30  30
31- while (fgets (line + 1, sizeof (line) - 1, source_FILE)) 31- while (fgets (line + 1, sizeof (line) - 1, source_FILE))
32+ while (fgets (line + 1, line_len - 1, source_FILE)) 32+ while (fgets (line + 1, line_len - 1, source_FILE))
33 { 33 {
34+ size_t len; 34+ size_t len;
35+ while ((len = strlen(line)) == line_len - 1 && 35+ while ((len = strlen(line)) == line_len - 1 &&
36+ line[line_len - 2] != '\n') 36+ line[line_len - 2] != '\n')
37+ { 37+ {
38+ line = xrealloc(line, line_len + BUFSIZ); 38+ line = xrealloc(line, line_len + BUFSIZ);
39+ line_len += BUFSIZ; 39+ line_len += BUFSIZ;
40+ if (fgets(line + len, BUFSIZ, source_FILE) == NULL) 40+ if (fgets(line + len, BUFSIZ, source_FILE) == NULL)
41+ break; 41+ break;
42+ } 42+ }
43 line_number++; 43 line_number++;
44 if (pattern) 44 if (pattern)
45 { 45 {
46@@ -589,6 +598,7 @@ 46@@ -614,6 +623,7 @@ report_grep (char const *name, struct fi
47 } 47 }
48 fclose (source_FILE); 48 fclose (source_FILE);
49 } 49 }
50+ free(line); 50+ free(line);
51 } 51 }
52  52
53 static char ** 53 static char **
54@@ -800,7 +810,7 @@ 54@@ -826,7 +836,7 @@ search_flinkv (struct file_link **flinkv
55 { 55 {
56 char pattern[BUFSIZ]; 56 char pattern[BUFSIZ];
57 unsigned int count; 57 unsigned int count;
58- char *file_name = alloca (PATH_MAX); 58- char *file_name = alloca (PATH_MAX);
59+ char file_name[PATH_MAX]; 59+ char file_name[PATH_MAX];
60 char *eol; 60 char *eol;
61  61
62 if (fgets (pattern, sizeof (pattern), stdin) == 0) 62 if (fgets (pattern, sizeof (pattern), stdin) == 0)
63@@ -1368,7 +1378,7 @@ 63@@ -1305,7 +1315,7 @@ word_match (char const *name_0, char con
64 continue; 64 continue;
65 } 65 }
66 /* march down both strings as long as we match */ 66 /* march down both strings as long as we match */
67- while (*++name == *++line) 67- while (*++name == *++line)
68+ while (*name != '\0' && *++name == *++line) 68+ while (*name != '\0' && *++name == *++line)
69 ; 69 ;
70 /* is this the end of `name', is there a word delimiter ?? */ 70 /* is this the end of `name', is there a word delimiter ?? */
71 if (*name == '\0' && !IS_ALNUM (*line)) 71 if (*name == '\0' && !IS_ALNUM (*line))
cvs diff -r1.3 -r1.4 pkgsrc/devel/idutils/patches/patch-ak (expand / switch to unified diff)

--- pkgsrc/devel/idutils/patches/patch-ak 2006/08/06 23:10:30 1.3
+++ pkgsrc/devel/idutils/patches/patch-ak 2014/12/15 11:35:42 1.4
@@ -1,57 +1,48 @@ @@ -1,57 +1,48 @@
1$NetBSD: patch-ak,v 1.3 2006/08/06 23:10:30 wiz Exp $ 1$NetBSD: patch-ak,v 1.4 2014/12/15 11:35:42 mef Exp $
2 2
3--- src/mkid.c.orig 2006-07-22 03:38:03.000000000 +0000 3--- src/mkid.c.orig 2012-01-31 21:22:05.000000000 +0900
4+++ src/mkid.c 4+++ src/mkid.c 2014-11-20 23:17:41.000000000 +0900
5@@ -28,7 +28,6 @@ 5@@ -28,7 +28,6 @@
6 #include <pathmax.h> 6 #include <sys/stat.h>
7 #include <string.h> 
8 #include <dirname.h> 
9-#include <alloca.h> 
10 #include <limits.h> 7 #include <limits.h>
11 #include <inttostr.h> 
12 #include <xalloc.h> 
13@@ -40,8 +39,6 @@ 
14 #include "scanners.h" 
15 #include "iduglobal.h" 
16  8
17-char* dirname(char* path); 9-#include "alloca.h"
18- 10 #include "argv-iter.h"
19 struct summary 11 #include "closeout.h"
20 { 12 #include "dirname.h"
21 struct token **sum_tokens; 13@@ -484,11 +483,21 @@ assert_writeable (char const *filename)
22@@ -381,11 +378,21 @@ assert_writeable (char const *filename) 
23 { 14 {
24 if (errno == ENOENT) 15 if (errno == ENOENT)
25 { 16 {
26- char *dirname = dir_name (filename); 17- char *dirname = dir_name (filename);
27- if (access (dirname, 06) < 0) 18- if (access (dirname, 06) < 0)
28- error (1, errno, _("can't create `%s' in `%s'"), 19- error (EXIT_FAILURE, errno, _("can't create `%s' in `%s'"),
29- base_name (filename), dirname); 20- base_name (filename), dirname);
30- free(dirname); 21- free(dirname);
31+ char *dir_copy, *dir_name = strrchr (filename, '/'); 22+ char *dir_copy, *dir_name = strrchr (filename, '/');
32+ if (dir_name) 23+ if (dir_name)
33+ { 24+ {
34+ while (*--dir_name == '/') 25+ while (*--dir_name == '/')
35+ continue; 26+ continue;
36+ dir_name++; 27+ dir_name++;
37+ dir_copy = strdup(filename); 28+ dir_copy = strdup(filename);
38+ dir_copy[dir_name - filename] = '\0'; 29+ dir_copy[dir_name - filename] = '\0';
39+ } 30+ }
40+ else 31+ else
41+ dir_copy = strdup("."); 32+ dir_copy = strdup(".");
42+ if (access (dir_copy, 06) < 0) 33+ if (access (dir_copy, 06) < 0)
43+ error (1, errno, _("can't create `%s' in `%s'"), 34+ error (1, errno, _("can't create `%s' in `%s'"),
44+ base_name (filename), dir_copy); 35+ base_name (filename), dir_copy);
45+ free(dir_copy); 36+ free(dir_copy);
46 } 37 }
47 else 38 else
48 error (1, errno, _("can't modify `%s'"), filename); 39 error (EXIT_FAILURE, errno, _("can't modify `%s'"), filename);
49@@ -459,7 +466,7 @@ scan_member_file (struct member_file con 40@@ -562,7 +571,7 @@ scan_member_file (struct member_file con
50 source_FILE = fopen (flink->fl_name, "r"); 41 source_FILE = fopen (flink->fl_name, "r");
51 if (source_FILE) 42 if (source_FILE)
52 { 43 {
53- char *file_name = alloca (PATH_MAX); 44- char *file_name = alloca (PATH_MAX);
54+ char file_name[PATH_MAX]; 45+ char file_name[PATH_MAX];
55 if (statistics_flag) 46 if (statistics_flag)
56 { 47 {
57 if (fstat (fileno (source_FILE), &st) < 0) 48 if (fstat (fileno (source_FILE), &st) < 0)
File Added: pkgsrc/devel/idutils/patches/patch-lib_fflush_c
$NetBSD: patch-lib_fflush_c,v 1.1 2014/12/15 11:35:42 mef Exp $

fflush.c:108:16: error: incompatible types when assigning to type '__off_t' from type 'fpos_t'
   fp_->_offset = u.f;
                ^

--- lib/fflush.c.orig	2012-01-29 01:22:33.000000000 +0900
+++ lib/fflush.c	2014-11-20 23:50:41.000000000 +0900
@@ -105,7 +105,7 @@ update_fpos_cache (FILE *fp, off_t pos)
       off_t o;
     } u;
   u.o = pos;
-  fp_->_offset = u.f;
+  fp_->_offset = u.f._pos;
 # endif
   fp_->_flags |= __SOFF;
 #endif
File Added: pkgsrc/devel/idutils/patches/patch-lib_fseeko_c
$NetBSD: patch-lib_fseeko_c,v 1.1 2014/12/15 11:35:42 mef Exp $

fseeko.c:127:22: error: incompatible types when assigning to type '__off_t' from type 'fpos_t'
         fp_->_offset = u.f;
                      ^

--- lib/fseeko.c~	2012-01-29 01:26:04.000000000 +0900
+++ lib/fseeko.c	2014-11-20 23:51:55.000000000 +0900
@@ -124,7 +124,7 @@ fseeko (FILE *fp, off_t offset, int when
             off_t o;
           } u;
         u.o = pos;
-        fp_->_offset = u.f;
+        fp_->_offset = u.f._pos;
       }
 # endif
       fp_->_flags |= __SOFF;