pkgsrc-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[pkgsrc/trunk]: pkgsrc/devel/idutils (pkgsrc)



details:   https://anonhg.NetBSD.org/pkgsrc/rev/c0ca4bf52b29
branches:  trunk
changeset: 643375:c0ca4bf52b29
user:      mef <mef%pkgsrc.org@localhost>
date:      Mon Dec 15 11:35:42 2014 +0000

description:
(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+).

diffstat:

 devel/idutils/DESCR                      |    3 -
 devel/idutils/Makefile                   |    7 +-
 devel/idutils/PLIST                      |   25 ++++-
 devel/idutils/distinfo                   |   29 +++--
 devel/idutils/patches/patch-aa           |    4 +-
 devel/idutils/patches/patch-ab           |   18 +-
 devel/idutils/patches/patch-ac           |   12 +-
 devel/idutils/patches/patch-ad           |   59 ++++++++++-
 devel/idutils/patches/patch-ae           |   12 +-
 devel/idutils/patches/patch-af           |   14 --
 devel/idutils/patches/patch-ai           |   10 +-
 devel/idutils/patches/patch-aj           |   20 ++--
 devel/idutils/patches/patch-ak           |   35 ++----
 devel/idutils/patches/patch-al           |  153 +-----------------------------
 devel/idutils/patches/patch-lib_fflush_c |   17 +++
 devel/idutils/patches/patch-lib_fseeko_c |   17 +++
 16 files changed, 187 insertions(+), 248 deletions(-)

diffs (truncated from 639 to 300 lines):

diff -r 9eac902a3629 -r c0ca4bf52b29 devel/idutils/DESCR
--- a/devel/idutils/DESCR       Mon Dec 15 11:07:09 2014 +0000
+++ b/devel/idutils/DESCR       Mon Dec 15 11:35:42 2014 +0000
@@ -11,6 +11,3 @@
 Internet led by Tom Horsley <Tom.Horsley%mail.hcsc.com@localhost>.  Tom released
 `mkid2' on comp.sources.unix in March, 1991.  Since then, Greg McGary
 has resumed maintenance and is releasing an improved version 3 under GPL.
-
-Version 3 is an interim release.  Version 4 will follow in the coming
-months and include a cscope clone plus other improvements.
diff -r 9eac902a3629 -r c0ca4bf52b29 devel/idutils/Makefile
--- a/devel/idutils/Makefile    Mon Dec 15 11:07:09 2014 +0000
+++ b/devel/idutils/Makefile    Mon Dec 15 11:35:42 2014 +0000
@@ -1,13 +1,14 @@
-# $NetBSD: Makefile,v 1.9 2012/10/31 11:17:06 asau Exp $
+# $NetBSD: Makefile,v 1.10 2014/12/15 11:35:42 mef Exp $
 
-DISTNAME=      idutils-4.2
-PKGREVISION=   3
+DISTNAME=      idutils-4.6
 CATEGORIES=    devel
 MASTER_SITES=  ${MASTER_SITE_GNU:=idutils/}
+EXTRACT_SUFX=  .tar.xz
 
 MAINTAINER=    pkgsrc-users%NetBSD.org@localhost
 HOMEPAGE=      http://www.gnu.org/software/idutils/idutils.html
 COMMENT=       Classic Berkeley gid/lid tools for looking up variables in code
+LICENSE=       gnu-gpl-v3
 
 CONFLICTS=     sh-utils>=2.0nb2 coreutils-[0-9]*
 
diff -r 9eac902a3629 -r c0ca4bf52b29 devel/idutils/PLIST
--- a/devel/idutils/PLIST       Mon Dec 15 11:07:09 2014 +0000
+++ b/devel/idutils/PLIST       Mon Dec 15 11:35:42 2014 +0000
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2006/08/05 19:53:26 wiz Exp $
+@comment $NetBSD: PLIST,v 1.2 2014/12/15 11:35:42 mef Exp $
 bin/aid
 bin/defid
 bin/eid
@@ -9,9 +9,32 @@
 bin/mkid
 bin/xtokid
 info/idutils.info
+lib/charset.alias
+man/man1/aid.1
+man/man1/defid.1
+man/man1/eid.1
+man/man1/fid.1
+man/man1/fnid.1
+man/man1/gid.1
+man/man1/lid.1
+man/man1/mkid.1
+man/man1/xtokid.1
 share/emacs/site-lisp/idutils.el
 share/id-lang.map
+share/locale/da/LC_MESSAGES/idutils.mo
 share/locale/de/LC_MESSAGES/idutils.mo
+share/locale/fi/LC_MESSAGES/idutils.mo
 share/locale/fr/LC_MESSAGES/idutils.mo
+share/locale/ga/LC_MESSAGES/idutils.mo
+share/locale/hu/LC_MESSAGES/idutils.mo
+share/locale/id/LC_MESSAGES/idutils.mo
+share/locale/it/LC_MESSAGES/idutils.mo
 share/locale/nl/LC_MESSAGES/idutils.mo
 share/locale/pl/LC_MESSAGES/idutils.mo
+share/locale/pt_BR/LC_MESSAGES/idutils.mo
+share/locale/ro/LC_MESSAGES/idutils.mo
+share/locale/ru/LC_MESSAGES/idutils.mo
+share/locale/sv/LC_MESSAGES/idutils.mo
+share/locale/tr/LC_MESSAGES/idutils.mo
+share/locale/vi/LC_MESSAGES/idutils.mo
+share/locale/zh_CN/LC_MESSAGES/idutils.mo
diff -r 9eac902a3629 -r c0ca4bf52b29 devel/idutils/distinfo
--- a/devel/idutils/distinfo    Mon Dec 15 11:07:09 2014 +0000
+++ b/devel/idutils/distinfo    Mon Dec 15 11:35:42 2014 +0000
@@ -1,15 +1,16 @@
-$NetBSD: distinfo,v 1.6 2011/04/17 01:44:57 mrg Exp $
+$NetBSD: distinfo,v 1.7 2014/12/15 11:35:42 mef Exp $
 
-SHA1 (idutils-4.2.tar.gz) = 306f6e296768d494d771777647c04c8ceed66c1f
-RMD160 (idutils-4.2.tar.gz) = cddc6ac3d26f8a836a4d8c5d7111b4439095abe8
-Size (idutils-4.2.tar.gz) = 706193 bytes
-SHA1 (patch-aa) = f957a2af9470e41c1b423b9c753456e68a46405c
-SHA1 (patch-ab) = 96a1ec3d8c49da9538342450df41c7cd17c0d21c
-SHA1 (patch-ac) = 714cc320a02235c7d49b0ea37be60cff36f6a07b
-SHA1 (patch-ad) = 05f6be0337f599736627d5bf372529e36ca22246
-SHA1 (patch-ae) = b0a11f8172bede23e4f22f5ace819117f8f6a26d
-SHA1 (patch-af) = 1ead55183dbbb3b317084c9b2789fbb52972a484
-SHA1 (patch-ai) = ee67a03e074820db342ffa6ec26c1440641b702e
-SHA1 (patch-aj) = fba2812551631733c5faea8d2d0468ff2ea3d734
-SHA1 (patch-ak) = 91a781f4908b34ab172268e74ae77e93fd0e2ab4
-SHA1 (patch-al) = f0d2c84ae7f7becf6ccc3d47b956b0540ea92a88
+SHA1 (idutils-4.6.tar.xz) = cb977ce3e4b2bacda85797e9048986e1c1765148
+RMD160 (idutils-4.6.tar.xz) = 9b136e5bedf04183a631c1c7642c7982deb5016d
+Size (idutils-4.6.tar.xz) = 1001496 bytes
+SHA1 (patch-aa) = fb666517045bb53e13e0a7b434e649161719a65b
+SHA1 (patch-ab) = 20b870fe0f7a7b9d1105e12ff14b9370deb1acc9
+SHA1 (patch-ac) = 05b38bed7f2a471b3696d553fc2750b5f0812f7d
+SHA1 (patch-ad) = 12326348db69cb0a991a37568d3765cac7b15456
+SHA1 (patch-ae) = a026e1658e209ee927054296f423fe3536412b45
+SHA1 (patch-ai) = 5e64a7c67075a3d308b6e66252559afa20d02639
+SHA1 (patch-aj) = 8381724be238e518a86377b3226cf05e99b83f1d
+SHA1 (patch-ak) = c2b3573a5386e77fc6bc1d5a4e89ccd1af830630
+SHA1 (patch-al) = 163e06074da62edbcacd459788cfea3528e94e30
+SHA1 (patch-lib_fflush_c) = 41e1dcfc0982148d1a2c7cceb6aa117c1ded774a
+SHA1 (patch-lib_fseeko_c) = 35ac50c58f8d6339d37ff72a0e2b58f0233a7cc0
diff -r 9eac902a3629 -r c0ca4bf52b29 devel/idutils/patches/patch-aa
--- a/devel/idutils/patches/patch-aa    Mon Dec 15 11:07:09 2014 +0000
+++ b/devel/idutils/patches/patch-aa    Mon Dec 15 11:35:42 2014 +0000
@@ -1,4 +1,6 @@
-$NetBSD: patch-aa,v 1.1.1.1 2006/08/05 19:53:26 wiz Exp $
+$NetBSD: patch-aa,v 1.2 2014/12/15 11:35:42 mef Exp $
+
+To avoid using alloca.h
 
 --- libidu/fnprint.c.orig      2005-12-27 00:21:33.000000000 -0500
 +++ libidu/fnprint.c   2006-08-03 12:58:44.026747335 -0400
diff -r 9eac902a3629 -r c0ca4bf52b29 devel/idutils/patches/patch-ab
--- a/devel/idutils/patches/patch-ab    Mon Dec 15 11:07:09 2014 +0000
+++ b/devel/idutils/patches/patch-ab    Mon Dec 15 11:35:42 2014 +0000
@@ -1,13 +1,13 @@
-$NetBSD: patch-ab,v 1.1.1.1 2006/08/05 19:53:26 wiz Exp $
+$NetBSD: patch-ab,v 1.2 2014/12/15 11:35:42 mef Exp $
 
---- libidu/idfile.h.orig       2005-11-01 04:18:33.000000000 -0500
-+++ libidu/idfile.h    2006-08-03 13:00:35.159831999 -0400
-@@ -147,7 +147,7 @@
+--- libidu/idfile.h.orig       2012-01-31 21:22:05.000000000 +0900
++++ libidu/idfile.h    2014-11-20 22:57:11.000000000 +0900
+@@ -145,7 +145,7 @@ extern struct hash_table dev_ino_table;
  
  #define token_string(buf) (buf)
- extern unsigned int token_flags (char const *buf);
--extern unsigned short token_count (char const *buf);
-+extern unsigned int token_count (char const *buf);
- extern unsigned char const *token_hits_addr (char const *buf);
+ extern unsigned int token_flags (char const *buf) _GL_ATTRIBUTE_PURE;
+-extern unsigned short token_count (char const *buf) _GL_ATTRIBUTE_PURE;
++extern unsigned int token_count (char const *buf) _GL_ATTRIBUTE_PURE;
+ extern unsigned char const *token_hits_addr (char const *buf)
+   _GL_ATTRIBUTE_PURE;
  
- #define MAYBE_RETURN_PREFIX_MATCH(arg, str, val) do { \
diff -r 9eac902a3629 -r c0ca4bf52b29 devel/idutils/patches/patch-ac
--- a/devel/idutils/patches/patch-ac    Mon Dec 15 11:07:09 2014 +0000
+++ b/devel/idutils/patches/patch-ac    Mon Dec 15 11:35:42 2014 +0000
@@ -1,10 +1,10 @@
-$NetBSD: patch-ac,v 1.1.1.1 2006/08/05 19:53:26 wiz Exp $
+$NetBSD: patch-ac,v 1.2 2014/12/15 11:35:42 mef Exp $
 
---- libidu/idread.c.orig       2005-12-27 00:23:18.000000000 -0500
-+++ libidu/idread.c    2006-08-03 12:27:38.779542243 -0400
-@@ -211,12 +211,12 @@
- #define TOK_COUNT_ADDR(buf) ((unsigned char const *)(TOK_FLAGS_ADDR (buf) + 1))
- #define TOK_HITS_ADDR(buf) ((unsigned char const *)(TOK_COUNT_ADDR (buf) + 2))
+--- libidu/idread.c.orig       2012-01-29 01:54:33.000000000 +0900
++++ libidu/idread.c    2014-11-20 22:58:01.000000000 +0900
+@@ -210,12 +210,12 @@ token_flags (char const *buf)
+   return *(unsigned char const *)&buf[strlen (buf) + 1];
+ }
  
 -unsigned short
 +unsigned int
diff -r 9eac902a3629 -r c0ca4bf52b29 devel/idutils/patches/patch-ad
--- a/devel/idutils/patches/patch-ad    Mon Dec 15 11:07:09 2014 +0000
+++ b/devel/idutils/patches/patch-ad    Mon Dec 15 11:35:42 2014 +0000
@@ -1,8 +1,10 @@
-$NetBSD: patch-ad,v 1.1.1.1 2006/08/05 19:53:26 wiz Exp $
+$NetBSD: patch-ad,v 1.2 2014/12/15 11:35:42 mef Exp $
+
+More file types to support
 
---- libidu/scanners.c.orig     2006-02-15 01:29:03.000000000 -0500
-+++ libidu/scanners.c  2006-08-03 15:57:57.169635912 -0400
-@@ -77,11 +77,16 @@
+--- libidu/scanners.c.orig     2014-11-20 22:55:49.000000000 +0900
++++ libidu/scanners.c  2014-11-20 23:00:17.000000000 +0900
+@@ -77,11 +77,16 @@ static struct language languages_0[] =
  {
    { "C", parse_args_c, get_token_c, help_me_c },
    { "C++", parse_args_c, get_token_c, help_me_cpp },
@@ -16,7 +18,50 @@
    { "perl", parse_args_perl, get_token_perl, help_me_perl },
 -  { "lisp", parse_args_lisp, get_token_lisp, help_me_lisp }
 +  { "lisp", parse_args_lisp, get_token_lisp, help_me_lisp },
-+  { "make", parse_args_text, get_token_text, help_me_text },
++  { "make", parse_args_text, get_token_text, help_me_text }
  };
- struct language const *languages_N = &languages_0[cardinalityof (languages_0)];
- 
+ static struct language const *languages_N
+   = &languages_0[cardinalityof (languages_0)];
+@@ -1711,8 +1716,9 @@ get_token_lisp (FILE *in_FILE, void cons
+       {
+         while (is_LETTER (c = getc (in_FILE)))
+           *id++ = c;
+-        if (c != EOF)
+-          ungetc (c, in_FILE);
++          if (c == EOF)
++          goto out;
++        ungetc (c, in_FILE);
+         *flags = TOK_LITERAL;
+         obstack_grow0 (&tokens_obstack, scanner_buffer, id - scanner_buffer);
+         return (struct token *) obstack_finish (&tokens_obstack);
+@@ -1729,13 +1735,17 @@ get_token_lisp (FILE *in_FILE, void cons
+                 break;
+             }
+         } while (c != EOF);
++          if (c == EOF)
++          goto out;
+         goto top;
+       }
+       else if (c == '@')      /* #@LENGTH ...^_ EMACS byte-code comment */
+       {
+         do {
+           c = getc (in_FILE);
+-        } while ( (c != EOF) && (c != '\037'));
++            if (c == EOF)
++            goto out;
++        } while (c != '\037');
+         goto top;
+       }
+       else if (c == '[')      /* #[ ... ] EMACS byte-code object */
+@@ -1787,8 +1797,9 @@ get_token_lisp (FILE *in_FILE, void cons
+         *id++ = c;
+         while (is_NUMBER (c = getc (in_FILE)))
+           *id++ = c;
+-        if (c != EOF)
+-          ungetc (c, in_FILE);
++          if (c == EOF)
++          goto out;
++        ungetc (c, in_FILE);
+         *flags = TOK_NUMBER | TOK_LITERAL;
+         obstack_grow0 (&tokens_obstack, scanner_buffer, id - scanner_buffer);
+         return (struct token *) obstack_finish (&tokens_obstack);
diff -r 9eac902a3629 -r c0ca4bf52b29 devel/idutils/patches/patch-ae
--- a/devel/idutils/patches/patch-ae    Mon Dec 15 11:07:09 2014 +0000
+++ b/devel/idutils/patches/patch-ae    Mon Dec 15 11:35:42 2014 +0000
@@ -1,16 +1,16 @@
-$NetBSD: patch-ae,v 1.1 2006/08/06 23:10:30 wiz Exp $
+$NetBSD: patch-ae,v 1.2 2014/12/15 11:35:42 mef Exp $
 
---- src/fnid.c.orig    2006-04-29 15:52:12.000000000 +0000
-+++ src/fnid.c
-@@ -24,7 +24,6 @@
- #include <errno.h>
+--- src/fnid.c.orig    2012-01-01 18:16:06.000000000 +0900
++++ src/fnid.c 2014-11-20 23:05:37.000000000 +0900
+@@ -23,7 +23,6 @@
+ #include <string.h>
  #include <stdlib.h>
  #include <errno.h>
 -#include <alloca.h>
  #include <xalloc.h>
  #include <pathmax.h>
  #include <error.h>
-@@ -167,7 +166,7 @@ main (int argc, char **argv)
+@@ -166,7 +165,7 @@ main (int argc, char **argv)
      char **patv_0 = xmalloc (sizeof(char *) * (argc * 2));
      char **patv_N;
      char **patv = patv_0;
diff -r 9eac902a3629 -r c0ca4bf52b29 devel/idutils/patches/patch-af
--- a/devel/idutils/patches/patch-af    Mon Dec 15 11:07:09 2014 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,14 +0,0 @@
-$NetBSD: patch-af,v 1.1 2011/04/17 01:44:57 mrg Exp $
-
-also in for *.mk files as makefiles.
-
---- libidu/id-lang.map.orig    2006-04-29 08:52:05.000000000 -0700
-+++ libidu/id-lang.map 2011-04-17 02:13:46.000000000 -0700
-@@ -79,6 +79,7 @@
- *.scm                 lisp
- 
- *.am                  make
-+*.mk                  make
- Makefile              make
- Makefile.*            make
- 
diff -r 9eac902a3629 -r c0ca4bf52b29 devel/idutils/patches/patch-ai
--- a/devel/idutils/patches/patch-ai    Mon Dec 15 11:07:09 2014 +0000
+++ b/devel/idutils/patches/patch-ai    Mon Dec 15 11:35:42 2014 +0000
@@ -1,7 +1,7 @@
-$NetBSD: patch-ai,v 1.2 2006/08/06 23:10:30 wiz Exp $
+$NetBSD: patch-ai,v 1.3 2014/12/15 11:35:42 mef Exp $
 
---- src/fid.c.orig     2006-03-05 05:24:21.000000000 -0500
-+++ src/fid.c  2006-08-03 12:49:29.089070087 -0400
+--- src/fid.c.orig     2012-01-01 18:16:06.000000000 +0900
++++ src/fid.c  2014-11-20 23:08:54.000000000 +0900
 @@ -23,7 +23,6 @@
  #include <unistd.h>
  #include <stdlib.h>
@@ -10,12 +10,12 @@
  #include <error.h>
  #include <pathmax.h>
  #include <xalloc.h>
-@@ -211,7 +210,7 @@
+@@ -211,7 +210,7 @@ get_file_index (char *file_name)



Home | Main Index | Thread Index | Old Index