pkgsrc-Changes-HG archive

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

[pkgsrc/pkgsrc-2004Q4]: pkgsrc/editors Pullup ticket 212 - requested by Adria...



details:   https://anonhg.NetBSD.org/pkgsrc/rev/6c521d0607ea
branches:  pkgsrc-2004Q4
changeset: 485808:6c521d0607ea
user:      salo <salo%pkgsrc.org@localhost>
date:      Sat Jan 08 16:22:48 2005 +0000

description:
Pullup ticket 212 - requested by Adrian Portelli
security fix for vim

        Module Name:    pkgsrc
        Committed By:   cjs
        Date:           Wed Jan  5 11:03:44 UTC 2005

        Modified Files:
                pkgsrc/editors/vim: Makefile
                pkgsrc/editors/vim-share: Makefile.common

        Log Message:
        Move --enable-multibyte from vim/Makefile to
        vim-share/Makefile.common, since it should be not just the command
        line version of vim but all versions (e.g., gtk) that use this.
---
        Module Name:    pkgsrc
        Committed By:   adrianp
        Date:           Thu Jan  6 20:38:06 UTC 2005

        Modified Files:
                pkgsrc/editors/vim-share: Makefile.common distinfo
                pkgsrc/editors/vim: Makefile
                pkgsrc/editors/vim-gtk: Makefile
                pkgsrc/editors/vim-gtk2: Makefile
                pkgsrc/editors/vim-motif: Makefile
                pkgsrc/editors/vim-xaw: Makefile

        Log Message:
        Bump to 6.3.045 for recent security issue

        6.3.001  ":browse split" gives file selection dialog twice
        6.3.002  utf-8 detection in translated help files is wrong
        6.3.003  crash when using console dialog without default choice
        6.3.004  too many hit-enter prompts when searching for long string
        6.3.005  crash when searching with character offset in closed fold
        6.3.006  the current directory is prepended to the ":breakadd" argument
        6.3.007  swap file is not deleted for a "nofile" buffer after ":cd"
        6.3.008  OS/2: can't compile, missing error message
        6.3.009  (after 6.3.006) ":breakadd file" does not match for a symlink
        6.3.010  writing to a named pipe causes an error message for fsync()
        6.3.011  crash when user command completion uses "normal :cmd"
        6.3.012  lalloc(0) error for substitute command with multi-line pattern
        6.3.013  crash when using CTRL-R = in command line uses "normal :cmd"
        6.3.014  default value of 'helplang' is wrong for Chinese and Taiwanese
        6.3.015  the string returned by winrestcmd() may end in garbage
        6.3.016  'define' default had "\s" before #, breaks "[d"
        6.3.017  "9zz" could place the cursor beyond the end of a line
        6.3.018  ":0argadd zero" added the argument after the first one
        6.3.019  crash during startup when compiled for debugging
        6.3.020  "dw" doesn't work right for UTF-8 when 'delcombine' is set
        6.3.021  can't edit file with path separator in trail byte of last char
        6.3.023  when <Space> is remapped abbreviations are not expanded
        6.3.024  missing NUL for strings created with ga_concat()
        6.3.026  setting 'bg' in syncolor.vim may cause endless loop or crash
        6.3.027  VMS: Writing a file may insert extra CR characters
        6.3.028  the BOM marker is written when appending to a file
        6.3.029  crash in syntax highlighting code when inserting a line break
        6.3.030  GTK 2: crash when 'enc' is set to "utf-8" and menus redefined
        6.3.031  pressing Tab when entering a mapping may cause a display error
        6.3.032  with Python 2.3 using threads doesn't work
        6.3.033  mapping ending in two-char command doesn't restart Insert mode
        6.3.034  VMS: crash in RTL when using :help, caused by ? wildcard
        6.3.036  ml_get errors when fold was deleted
        6.3.037  (after 6.3.032) warning for unused variable
        6.3.039  line numbers not updated when inserting a line above window
        6.3.040  window count for a buffer was wrong after error handling
        6.3.042  CTRL-X CTRL-E in Insert mode does not scroll fold correctly
        6.3.043  'hlsearch' highlighting sometimes disappears
        6.3.045  some option values may cause trouble in a modeline

diffstat:

 editors/vim-gtk/Makefile          |   6 +-
 editors/vim-gtk2/Makefile         |   6 +-
 editors/vim-motif/Makefile        |   6 +-
 editors/vim-share/Makefile.common |  18 ++++---
 editors/vim-share/distinfo        |  80 ++++++++++++++++++++++++++++++++++++++-
 editors/vim-xaw/Makefile          |   6 +-
 editors/vim/Makefile              |   7 +--
 7 files changed, 99 insertions(+), 30 deletions(-)

diffs (246 lines):

diff -r a6196c552eae -r 6c521d0607ea editors/vim-gtk/Makefile
--- a/editors/vim-gtk/Makefile  Fri Jan 07 02:31:58 2005 +0000
+++ b/editors/vim-gtk/Makefile  Sat Jan 08 16:22:48 2005 +0000
@@ -1,16 +1,14 @@
-# $NetBSD: Makefile,v 1.43 2004/12/03 15:14:56 wiz Exp $
+# $NetBSD: Makefile,v 1.43.2.1 2005/01/08 16:22:48 salo Exp $
 
 .include               "../vim-share/Makefile.common"
 
 PKGNAME=               vim-gtk-${VIM_VERSION}.${VIM_PATCHLEVEL}
-PKGREVISION=   1
-#PKGREVISION=          1
 
 COMMENT=               Vim editor (vi clone) with X11 GTK+ GUI
 
 DEPENDS+=              vim-share-${VIM_VERSION}.${VIM_PATCHLEVEL}:../vim-share
 CONFLICTS+=            vim-[0-9]* vim-gtk2-[0-9]* vim-motif-[0-9]*
-CONFLICTS+=            vim-xaw-[0-9]*
+CONFLICTS+=            vim-xaw-[0-9]* vim-kde-[0-9]*
 
 USE_X11=               yes
 CONFIGURE_ARGS+=       --enable-gui=gtk
diff -r a6196c552eae -r 6c521d0607ea editors/vim-gtk2/Makefile
--- a/editors/vim-gtk2/Makefile Fri Jan 07 02:31:58 2005 +0000
+++ b/editors/vim-gtk2/Makefile Sat Jan 08 16:22:48 2005 +0000
@@ -1,16 +1,14 @@
-# $NetBSD: Makefile,v 1.10 2004/12/03 15:14:56 wiz Exp $
+# $NetBSD: Makefile,v 1.10.2.1 2005/01/08 16:22:48 salo Exp $
 
 .include               "../vim-share/Makefile.common"
 
 PKGNAME=               vim-gtk2-${VIM_VERSION}.${VIM_PATCHLEVEL}
-PKGREVISION=   1
-#PKGREVISION=          1
 
 COMMENT=               Vim editor (vi clone) with X11 GTK2 GUI
 
 DEPENDS+=              vim-share-${VIM_VERSION}.${VIM_PATCHLEVEL}:../vim-share
 CONFLICTS+=            vim-[0-9]* vim-gtk-[0-9]* vim-motif-[0-9]*
-CONFLICTS+=            vim-xaw-[0-9]*
+CONFLICTS+=            vim-xaw-[0-9]* vim-kde-[0-9]*
 
 USE_X11=               yes
 CONFIGURE_ARGS+=       --enable-gui=gtk2
diff -r a6196c552eae -r 6c521d0607ea editors/vim-motif/Makefile
--- a/editors/vim-motif/Makefile        Fri Jan 07 02:31:58 2005 +0000
+++ b/editors/vim-motif/Makefile        Sat Jan 08 16:22:48 2005 +0000
@@ -1,16 +1,14 @@
-# $NetBSD: Makefile,v 1.9 2004/12/03 15:14:56 wiz Exp $
+# $NetBSD: Makefile,v 1.9.2.1 2005/01/08 16:22:48 salo Exp $
 
 .include               "../vim-share/Makefile.common"
 
 PKGNAME=               vim-motif-${VIM_VERSION}.${VIM_PATCHLEVEL}
-PKGREVISION=   1
-#PKGREVISION=          1
 
 COMMENT=               Vim editor (vi clone) with X11 Motif GUI
 
 DEPENDS+=              vim-share-${VIM_VERSION}.${VIM_PATCHLEVEL}:../vim-share
 CONFLICTS+=            vim-[0-9]* vim-gtk-[0-9]* vim-gtk2-[0-9]*
-CONFLICTS+=            vim-xaw-[0-9]*
+CONFLICTS+=            vim-xaw-[0-9]* vim-kde-[0-9]*
 
 USE_X11=               yes
 CONFIGURE_ARGS+=       --enable-gui=motif
diff -r a6196c552eae -r 6c521d0607ea editors/vim-share/Makefile.common
--- a/editors/vim-share/Makefile.common Fri Jan 07 02:31:58 2005 +0000
+++ b/editors/vim-share/Makefile.common Sat Jan 08 16:22:48 2005 +0000
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile.common,v 1.37 2004/06/21 08:23:48 martti Exp $
+# $NetBSD: Makefile.common,v 1.37.4.1 2005/01/08 16:22:48 salo Exp $
 
 VIM_VERSION=           6.3
-VIM_PATCHLEVEL=                0
+VIM_PATCHLEVEL=                045
 DISTNAME=              vim-${VIM_VERSION}
 CATEGORIES=            editors
 MASTER_SITES=          ftp://ftp.vim.org/pub/editors/vim/unix/ \
@@ -10,12 +10,13 @@
 DIST_SUBDIR=           vim
 EXTRACT_SUFX=          .tar.bz2
 
-##PATCH_SITES+=                ${MASTER_SITES:S/unix/patches/}
-##PATCHFILES!=         jot -s " " -w ${VIM_VERSION}.%03d ${VIM_PATCHLEVEL}
-##SKIP_PATCHES=                
-##.for p in ${SKIP_PATCHES}
-##PATCHFILES:=         ${PATCHFILES:N${VIM_VERSION}.${p}}
-##.endif
+PATCH_SITES=           ftp://ftp.vim.org/pub/editors/vim/patches/${VIM_VERSION}/
+PATCHFILES+=           6.3.001 6.3.002 6.3.003 6.3.004 6.3.005 6.3.006 6.3.007\
+                       6.3.008 6.3.009 6.3.010 6.3.011 6.3.012 6.3.013 6.3.014\
+                       6.3.015 6.3.016 6.3.017 6.3.018 6.3.019 6.3.020 6.3.021\
+                       6.3.023 6.3.024 6.3.026 6.3.027 6.3.028 6.3.029 6.3.030\
+                       6.3.031 6.3.032 6.3.033 6.3.034 6.3.036 6.3.037 6.3.039\
+                       6.3.040 6.3.042 6.3.043 6.3.045
 
 MAINTAINER=            martti%NetBSD.org@localhost
 HOMEPAGE=              http://www.vim.org/
@@ -29,6 +30,7 @@
 # See "configure --help" extra options. These might affect the installed
 # files (and PLIST might not include all files) so use at your own risk!
 CONFIGURE_ARGS+=       ${VIM_EXTRA_OPTS}
+CONFIGURE_ARGS+=       --enable-multibyte
 
 PATCH_ARGS=            -d ${WRKDIR}/vim63 --forward --quiet \
                                -E ${PATCH_STRIP}
diff -r a6196c552eae -r 6c521d0607ea editors/vim-share/distinfo
--- a/editors/vim-share/distinfo        Fri Jan 07 02:31:58 2005 +0000
+++ b/editors/vim-share/distinfo        Sat Jan 08 16:22:48 2005 +0000
@@ -1,7 +1,85 @@
-$NetBSD: distinfo,v 1.28 2004/06/21 08:23:48 martti Exp $
+$NetBSD: distinfo,v 1.28.4.1 2005/01/08 16:22:48 salo Exp $
 
 SHA1 (vim/vim-6.3.tar.bz2) = 76f663277140d314ecfafecb0307e832bdbbaf06
 Size (vim/vim-6.3.tar.bz2) = 3699397 bytes
+SHA1 (vim/6.3.001) = 09a75ac41d4c454092b716ff6838768ef8665e5c
+Size (vim/6.3.001) = 2672 bytes
+SHA1 (vim/6.3.002) = 12f439f886151c85b29ab3db58a2fefc88c32ee4
+Size (vim/6.3.002) = 3913 bytes
+SHA1 (vim/6.3.003) = a65e590e48497aedb989fed46dcbcb149f4c3798
+Size (vim/6.3.003) = 1891 bytes
+SHA1 (vim/6.3.004) = 010b948a80976578332fc16a8296e0f0859078c1
+Size (vim/6.3.004) = 2438 bytes
+SHA1 (vim/6.3.005) = 9aaa3c327e3348c5c17ea32bc3689d43ac5fccaf
+Size (vim/6.3.005) = 2809 bytes
+SHA1 (vim/6.3.006) = 9fe6f70ba7ebfe94509037525cc5588cdf402d1c
+Size (vim/6.3.006) = 1566 bytes
+SHA1 (vim/6.3.007) = 9dac94e8da5aa4ee4170126c0e6b159ec1ec3205
+Size (vim/6.3.007) = 1755 bytes
+SHA1 (vim/6.3.008) = a6b6d109acf38dc6f563d164b5eabd0e00f9e58f
+Size (vim/6.3.008) = 1865 bytes
+SHA1 (vim/6.3.009) = 0f9bc4330cacf5229765c248b83ecc71a1f0e873
+Size (vim/6.3.009) = 3670 bytes
+SHA1 (vim/6.3.010) = 8668bb2c08e1c89dee85faef2d61c64287edc92e
+Size (vim/6.3.010) = 2450 bytes
+SHA1 (vim/6.3.011) = 8ba388268773323f242cdc999658e807a0d03940
+Size (vim/6.3.011) = 1896 bytes
+SHA1 (vim/6.3.012) = cd6033a41b70de956a4113dbd6f29c9eed8893cc
+Size (vim/6.3.012) = 2882 bytes
+SHA1 (vim/6.3.013) = 8a66ee66cbcf67fb95b91e010e5f2bdf06b7dace
+Size (vim/6.3.013) = 11947 bytes
+SHA1 (vim/6.3.014) = 3438ee1ec543852a539f1f16b4d7f8c37d1c32b0
+Size (vim/6.3.014) = 1566 bytes
+SHA1 (vim/6.3.015) = 7e6cff03e6e428a906471f930ba15fd3af5cce02
+Size (vim/6.3.015) = 1207 bytes
+SHA1 (vim/6.3.016) = bbb5ce23e394b07e288ae2aab1c48f4b88cc18a9
+Size (vim/6.3.016) = 1735 bytes
+SHA1 (vim/6.3.017) = eca6d058184e0beb5dca8333c9550cf800127ea2
+Size (vim/6.3.017) = 1364 bytes
+SHA1 (vim/6.3.018) = 477f288aad3b16df988875b8f7a4c998a7ce0cc9
+Size (vim/6.3.018) = 1844 bytes
+SHA1 (vim/6.3.019) = a03681db9f12402bc67d52604912e707c317e12e
+Size (vim/6.3.019) = 1992 bytes
+SHA1 (vim/6.3.020) = 76ac9c7a6a9446e555b9fb768f2e6f84f6aff2d8
+Size (vim/6.3.020) = 1915 bytes
+SHA1 (vim/6.3.021) = b00ed5c710ef3bfb517e2d909e8b331f2baae9fb
+Size (vim/6.3.021) = 2822 bytes
+SHA1 (vim/6.3.023) = 7a85db8fba2ba8cbbe8482b3d811bd58c5aac49f
+Size (vim/6.3.023) = 6419 bytes
+SHA1 (vim/6.3.024) = 761ba6711beb4556ff9d2f7d676b549cf98eafaf
+Size (vim/6.3.024) = 2456 bytes
+SHA1 (vim/6.3.026) = 8b3119de38548b81df1fb2d9d717511eecafeb29
+Size (vim/6.3.026) = 3070 bytes
+SHA1 (vim/6.3.027) = 2ce1df5151b1f84731e599bb7fd8313c264ac733
+Size (vim/6.3.027) = 7500 bytes
+SHA1 (vim/6.3.028) = e80fd139422059f69a59dcf77f01b81a5583a15e
+Size (vim/6.3.028) = 2128 bytes
+SHA1 (vim/6.3.029) = 893c33c802f79830278475a313734b225f02d336
+Size (vim/6.3.029) = 2173 bytes
+SHA1 (vim/6.3.030) = d01dc7d392cef1a6661bc05e4859a915e592679a
+Size (vim/6.3.030) = 4579 bytes
+SHA1 (vim/6.3.031) = 23f492500186564660907078e8a2e5c5c4fab3c1
+Size (vim/6.3.031) = 1483 bytes
+SHA1 (vim/6.3.032) = c6079719111ac1804383c620e08a0aa5fce8f3e3
+Size (vim/6.3.032) = 2094 bytes
+SHA1 (vim/6.3.033) = cfa3f49b01bf12e48f7281d4f27dacacd1f7bb04
+Size (vim/6.3.033) = 1552 bytes
+SHA1 (vim/6.3.034) = 05482ed58f6a6b5ee062de585152f1ea00825ed6
+Size (vim/6.3.034) = 1618 bytes
+SHA1 (vim/6.3.036) = 443822a03fc7313e97459a2142a4078103f03b91
+Size (vim/6.3.036) = 1770 bytes
+SHA1 (vim/6.3.037) = b8dba3125202799bf56d5c6e71382e2c4987ee33
+Size (vim/6.3.037) = 2889 bytes
+SHA1 (vim/6.3.039) = 21b8d58ad5e2f6d5ad16e7cd421c6614997c0762
+Size (vim/6.3.039) = 2749 bytes
+SHA1 (vim/6.3.040) = bafa7413ad7af8d8a9cdbfd06a12faf5278ad4e4
+Size (vim/6.3.040) = 18020 bytes
+SHA1 (vim/6.3.042) = 54f7e15ce39b7fcc5408fd11cb406e567fc03be7
+Size (vim/6.3.042) = 1760 bytes
+SHA1 (vim/6.3.043) = 0f158d92782f1b11e6be3b8664c8dd2cff7a0efd
+Size (vim/6.3.043) = 8053 bytes
+SHA1 (vim/6.3.045) = 6354d0a0353055052d4e53c53b2c79e8964cd37a
+Size (vim/6.3.045) = 12283 bytes
 SHA1 (patch-aa) = 226983cd130c91de83f46baa38d18b243bd029c8
 SHA1 (patch-ad) = 305b3f9cd2837482362c0176b8e2025ffb0eb254
 SHA1 (patch-zb) = 3966ea9713cbf5d26072592443080c1884f48e75
diff -r a6196c552eae -r 6c521d0607ea editors/vim-xaw/Makefile
--- a/editors/vim-xaw/Makefile  Fri Jan 07 02:31:58 2005 +0000
+++ b/editors/vim-xaw/Makefile  Sat Jan 08 16:22:48 2005 +0000
@@ -1,16 +1,14 @@
-# $NetBSD: Makefile,v 1.32 2004/12/03 15:14:56 wiz Exp $
+# $NetBSD: Makefile,v 1.32.2.1 2005/01/08 16:22:48 salo Exp $
 
 .include               "../vim-share/Makefile.common"
 
 PKGNAME=               vim-xaw-${VIM_VERSION}.${VIM_PATCHLEVEL}
-PKGREVISION=   1
-#PKGREVISION=          1
 
 COMMENT=               Vim editor (vi clone) with X11 Athena GUI
 
 DEPENDS+=              vim-share-${VIM_VERSION}.${VIM_PATCHLEVEL}:../vim-share
 CONFLICTS+=            vim-[0-9]* vim-gtk-[0-9]* vim-gtk2-[0-9]*
-CONFLICTS+=            vim-motif-[0-9]*
+CONFLICTS+=            vim-motif-[0-9]* vim-kde-[0-9]*
 
 USE_X11=               yes
 CONFIGURE_ARGS+=       --enable-gui=athena
diff -r a6196c552eae -r 6c521d0607ea editors/vim/Makefile
--- a/editors/vim/Makefile      Fri Jan 07 02:31:58 2005 +0000
+++ b/editors/vim/Makefile      Sat Jan 08 16:22:48 2005 +0000
@@ -1,21 +1,18 @@
-# $NetBSD: Makefile,v 1.55 2004/12/03 15:14:56 wiz Exp $
+# $NetBSD: Makefile,v 1.55.2.1 2005/01/08 16:22:48 salo Exp $
 
 .include               "../vim-share/Makefile.common"
 
 PKGNAME=               vim-${VIM_VERSION}.${VIM_PATCHLEVEL}
-PKGREVISION=   1
-#PKGREVISION=          1
 
 COMMENT=               Vim editor (vi clone) without GUI
 
 DEPENDS+=              vim-share-${VIM_VERSION}.${VIM_PATCHLEVEL}:../vim-share
 
 CONFLICTS+=            vim-gtk-[0-9]* vim-gtk2-[0-9]* vim-motif-[0-9]*
-CONFLICTS+=            vim-xaw-[0-9]*
+CONFLICTS+=            vim-xaw-[0-9]* vim-kde-[0-9]*
 
 CONFIGURE_ARGS+=       --enable-gui=no --without-x
 CONFIGURE_ARGS+=       --with-tlib=ncurses
-CONFIGURE_ARGS+=       --enable-multibyte
 
 BUILD_TARGET=          vim
 INSTALL_TARGET=                installvimbin



Home | Main Index | Thread Index | Old Index