[pkgsrc/trunk]: pkgsrc/editors/nvi-m17n Update nvi-m17n to 1.79.20040401 appl...

[taca <taca%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/bff9ca1078b5
branches:  trunk
changeset: 497956:bff9ca1078b5
user:      taca <taca%pkgsrc.org@localhost>
date:      Mon Aug 08 14:44:07 2005 +0000

description:
Update nvi-m17n to 1.79.20040401 applying patch from PR pkg/30216
by ISIHARA Takanori.

Brief changes:

2004/4/1
        publish a new diff as "cvs diff" (with old cvs) generated malformed
        diff.
2002/5/22
        support iso-2022-15 character encoding.
2001/10/24
        plug a printf string vulnerability.
2000/4/7
        support automatically recognize iso-2022-jp-3 character encoding.
                common/multibyte.c

diffstat:

 editors/nvi-m17n/Makefile         |  16 ++++++++--------
 editors/nvi-m17n/distinfo         |   9 +++------
 editors/nvi-m17n/patches/patch-ac |  30 ------------------------------
 editors/nvi-m17n/patches/patch-ad |  22 ----------------------
 editors/nvi-m17n/patches/patch-ae |  22 ----------------------
 5 files changed, 11 insertions(+), 88 deletions(-)

diffs (150 lines):

diff -r 0bd9cf33b301 -r bff9ca1078b5 editors/nvi-m17n/Makefile
--- a/editors/nvi-m17n/Makefile Mon Aug 08 14:30:32 2005 +0000
+++ b/editors/nvi-m17n/Makefile Mon Aug 08 14:44:07 2005 +0000
@@ -1,13 +1,13 @@
-# $NetBSD: Makefile,v 1.31 2005/08/04 01:39:08 taca Exp $
+# $NetBSD: Makefile,v 1.32 2005/08/08 14:44:07 taca Exp $
 
 DISTNAME=      nvi-1.79
-PKGNAME=       nvi-m17n-1.79.19991117
-PKGREVISION=   3
+PKGNAME=       nvi-m17n-1.79.20040401
+#PKGREVISION=
 CATEGORIES=    editors
 MASTER_SITES=  ftp://ftp.foretune.co.jp/pub/tools/nvi-m17n/
 
-PATCH_SITES=   ftp://lkbreth.foretune.co.jp/pub/tools/nvi-m17n/
-PATCHFILES=    nvi-1.79.m17n-19991117.diff.gz
+PATCH_SITES=   ftp://ftp.foretune.co.jp/pub/tools/nvi-m17n/
+PATCHFILES=    nvi-1.79.m17n-20040401.diff.gz
 
 MAINTAINER=    itojun%itojun.org@localhost
 COMMENT=       Clone of vi/ex, with multilingual patch
@@ -16,7 +16,7 @@
 
 WRKSRC=                ${WRKDIR}/${DISTNAME}/build
 GNU_CONFIGURE= YES
-PATCH_DIST_ARGS=-d ${WRKSRC}/.. --forward --quiet -E -p1 -f
+PATCH_DIST_ARGS=-d ${WRKSRC}/.. --forward --quiet -E -f
 CONFIGURE_ENV= OPTFLAG='-D_PATH_SYSEXRC=\"${PREFIX}/etc/vi.exrc\"'
 CONFIGURE_ARGS+=--enable-multibyte --program-prefix=n
 
@@ -79,9 +79,9 @@
 .for encoding in ${ENCODING}
        @${INSTALL_SCRIPT} ${WRKDIR}/nvi-${encoding} ${PREFIX}/bin
 .endfor
-       @${CP} ${WRKSRC}/../docs.m17n/README.english \
+       @${CP} ${WRKSRC}/../README.english \
                ${PREFIX}/share/vi/
-       @${CP} ${WRKSRC}/../docs.m17n/README.japanese \
+       @${CP} ${WRKSRC}/../README.japanese \
                ${PREFIX}/share/vi/
 
 .include "../../mk/bsd.pkg.mk"
diff -r 0bd9cf33b301 -r bff9ca1078b5 editors/nvi-m17n/distinfo
--- a/editors/nvi-m17n/distinfo Mon Aug 08 14:30:32 2005 +0000
+++ b/editors/nvi-m17n/distinfo Mon Aug 08 14:44:07 2005 +0000
@@ -1,14 +1,11 @@
-$NetBSD: distinfo,v 1.6 2005/02/23 17:15:12 agc Exp $
+$NetBSD: distinfo,v 1.7 2005/08/08 14:44:07 taca Exp $
 
 SHA1 (nvi-1.79.tar.gz) = 65b49768783372609278ecedd63caa8c1547aa2a
 RMD160 (nvi-1.79.tar.gz) = 1c39d480e0d30a87fc061c3219354b50011a8621
 Size (nvi-1.79.tar.gz) = 1295401 bytes
-SHA1 (nvi-1.79.m17n-19991117.diff.gz) = b242733c5da3c3797be0bd0c1829f7d0cebe451a
-RMD160 (nvi-1.79.m17n-19991117.diff.gz) = 0cdaf4e2a4bd3585d2751037ec377ab0d694e87e
+SHA1 (nvi-1.79.m17n-20040401.diff.gz) = 10fa772dad4368727a7ddc740d85cdfda3062414
+RMD160 (nvi-1.79.m17n-20040401.diff.gz) = 1b1790448d38a4f92f3b2df5f6aa566f1d8efff0
 Size (nvi-1.79.m17n-19991117.diff.gz) = 166609 bytes
 SHA1 (patch-aa) = c246b1533dfbfc93ad9c0a8ea8cff5db157c9ee8
 SHA1 (patch-ab) = f7a382af11f200467ac994d90e108e97c7602b13
-SHA1 (patch-ac) = 738f4b3d51b6b39f2cc4b2cffeb1a1ea412aed89
-SHA1 (patch-ad) = 21b5df4bb13b248f6f1ffe7ca69d91a4eae83561
-SHA1 (patch-ae) = 9e84570d8afdc7c03f71712b9317fcbcc2fa7006
 SHA1 (patch-global) = 118bfdcefba77c37c07b29d0c68fb8bbf02cb10e
diff -r 0bd9cf33b301 -r bff9ca1078b5 editors/nvi-m17n/patches/patch-ac
--- a/editors/nvi-m17n/patches/patch-ac Mon Aug 08 14:30:32 2005 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,30 +0,0 @@
-$NetBSD: patch-ac,v 1.1 2001/10/25 07:46:29 itojun Exp $
-
---- ../ex/ex_cscope.c.orig     Mon Sep 16 04:59:30 1996
-+++ ../ex/ex_cscope.c  Thu Oct 25 16:43:51 2001
-@@ -232,14 +232,14 @@
-        * name regardless so that we can use it as a base for searches.
-        */
-       if (stat(dname, &sb)) {
--              msgq(sp, M_SYSERR, dname);
-+              msgq(sp, M_SYSERR, "%s", dname);
-               return (1);
-       }
-       if (S_ISDIR(sb.st_mode)) {
-               (void)snprintf(path, sizeof(path),
-                   "%s/%s", dname, CSCOPE_DBFILE);
-               if (stat(path, &sb)) {
--                      msgq(sp, M_SYSERR, path);
-+                      msgq(sp, M_SYSERR, "%s", path);
-                       return (1);
-               }
-               dbname = CSCOPE_DBFILE;
-@@ -762,7 +762,7 @@
- 
- io_err:       if (feof(csc->from_fp))
-               errno = EIO;
--      msgq_str(sp, M_SYSERR, "%s", csc->dname);
-+      msgq_str(sp, M_SYSERR, csc->dname, "%s");
-       terminate(sp, csc, 0);
-       return (1);
- }
diff -r 0bd9cf33b301 -r bff9ca1078b5 editors/nvi-m17n/patches/patch-ad
--- a/editors/nvi-m17n/patches/patch-ad Mon Aug 08 14:30:32 2005 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,22 +0,0 @@
-$NetBSD: patch-ad,v 1.1 2001/10/25 07:46:29 itojun Exp $
-
---- ../common/exf.c.orig       Thu Oct 25 16:43:16 2001
-+++ ../common/exf.c    Thu Oct 25 16:43:52 2001
-@@ -887,7 +887,7 @@
-        * Note that this code is harmless if you're using libc 4.6.x.
-        */
-       if (LF_ISSET(FS_APPEND) && lseek(fd, (off_t)0, SEEK_END) < 0) {
--              msgq(sp, M_SYSERR, name);
-+              msgq(sp, M_SYSERR, "%s", name);
-               return (1);
-       }
- #endif
-@@ -1004,7 +1004,7 @@
-                       *--s = '.';
-               }
-       }
--      msgq(sp, M_INFO, s);
-+      msgq(sp, M_INFO, "%s", s);
-       if (nf)
-               FREE_SPACE(sp, p, 0);
-       return (0);
diff -r 0bd9cf33b301 -r bff9ca1078b5 editors/nvi-m17n/patches/patch-ae
--- a/editors/nvi-m17n/patches/patch-ae Mon Aug 08 14:30:32 2005 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,22 +0,0 @@
-$NetBSD: patch-ae,v 1.1 2004/04/03 17:30:56 yamt Exp $
-
---- ../common/options.c.orig   Tue Jul  3 22:53:06 2001
-+++ ../common/options.c        Tue Jul  3 22:48:27 2001
-@@ -1088,7 +1088,7 @@
-       /* Copy the string edit options. */
-       for (cnt = rval = 0; cnt < O_OPTIONCOUNT; ++cnt) {
-               if (optlist[cnt].type != OPT_STR ||
--                  F_ISSET(&optlist[cnt], OPT_GLOBAL))
-+                  F_ISSET(&sp->opts[cnt], OPT_GLOBAL))
-                       continue;
-               /*
-                * If never set, or already failed, NULL out the entries --
-@@ -1131,7 +1131,7 @@
- 
-       for (cnt = 0; cnt < O_OPTIONCOUNT; ++cnt) {
-               if (optlist[cnt].type != OPT_STR ||
--                  F_ISSET(&optlist[cnt], OPT_GLOBAL))
-+                  F_ISSET(&sp->opts[cnt], OPT_GLOBAL))
-                       continue;
-               if (O_STR(sp, cnt) != NULL)
-                       free(O_STR(sp, cnt));