Received: from localhost (localhost [127.0.0.1]) by mail.netbsd.org (Postfix) with ESMTP id 886B984CFD for ; Sun, 10 Dec 2023 17:09:37 +0000 (UTC) X-Virus-Scanned: amavisd-new at netbsd.org Received: from mail.netbsd.org ([IPv6:::1]) by localhost (mail.netbsd.org [IPv6:::1]) (amavisd-new, port 10025) with ESMTP id DeMTs0ty_KiO for ; Sun, 10 Dec 2023 17:09:36 +0000 (UTC) Received: from cvs.NetBSD.org (ivanova.netbsd.org [199.233.217.197]) by mail.netbsd.org (Postfix) with ESMTP id 4D5E284CE2 for ; Sun, 10 Dec 2023 17:09:36 +0000 (UTC) Received: by cvs.NetBSD.org (Postfix, from userid 500) id 445D8FA42; Sun, 10 Dec 2023 17:09:36 +0000 (UTC) Content-Transfer-Encoding: 7bit Content-Type: multipart/mixed; boundary="_----------=_170222817668560" MIME-Version: 1.0 Date: Sun, 10 Dec 2023 17:09:36 +0000 From: "Benny Siegert" Subject: CVS commit: [pkgsrc-2023Q3] pkgsrc/editors/vim-share To: pkgsrc-changes@NetBSD.org Approved: commit_and_comment Reply-To: bsiegert@netbsd.org X-Mailer: log_accum Message-Id: <20231210170936.445D8FA42@cvs.NetBSD.org> This is a multi-part message in MIME format. --_----------=_170222817668560 Content-Disposition: inline Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII" Module Name: pkgsrc Committed By: bsiegert Date: Sun Dec 10 17:09:36 UTC 2023 Modified Files: pkgsrc/editors/vim-share [pkgsrc-2023Q3]: Makefile.common PLIST distinfo options.mk version.mk pkgsrc/editors/vim-share/patches [pkgsrc-2023Q3]: patch-feature.h Removed Files: pkgsrc/editors/vim-share/patches [pkgsrc-2023Q3]: patch-auto_configure patch-configure patch-link.sh Log Message: Pullup ticket #6824 - requested by morr editors/vim-share: security fix Revisions pulled up: - editors/vim-gtk2/Makefile 1.112 - editors/vim-gtk3/Makefile 1.34 - editors/vim-share/Makefile.common 1.168 - editors/vim-share/PLIST 1.66-1.67 - editors/vim-share/distinfo 1.204-1.206 - editors/vim-share/options.mk 1.11 - editors/vim-share/patches/patch-auto_configure deleted - editors/vim-share/patches/patch-configure deleted - editors/vim-share/patches/patch-feature.h 1.6 - editors/vim-share/patches/patch-link.sh deleted - editors/vim-share/version.mk 1.143-1.145 --- Module Name: pkgsrc Committed By: wiz Date: Thu Nov 16 09:54:10 UTC 2023 Modified Files: pkgsrc/editors/vim-gtk2: Makefile pkgsrc/editors/vim-gtk3: Makefile pkgsrc/editors/vim-share: Makefile.common PLIST distinfo options.mk version.mk pkgsrc/editors/vim-share/patches: patch-feature.h Removed Files: pkgsrc/editors/vim-share/patches: patch-auto_configure patch-configure patch-link.sh Log Message: vim*: update to latest patchlevel About 200 bugfixes. --- Module Name: pkgsrc Committed By: wiz Date: Fri Nov 17 09:32:54 UTC 2023 Modified Files: pkgsrc/editors/vim-share: distinfo version.mk Log Message: vim*: update to patchlevel 2112 for security fixes --- Module Name: pkgsrc Committed By: morr Date: Thu Nov 23 19:10:01 UTC 2023 Modified Files: pkgsrc/editors/vim-share: PLIST distinfo version.mk Log Message: Update to patchlevel 2122 for security fixes. To generate a diff of this commit: cvs rdiff -u -r1.167 -r1.167.2.1 pkgsrc/editors/vim-share/Makefile.common cvs rdiff -u -r1.65 -r1.65.2.1 pkgsrc/editors/vim-share/PLIST cvs rdiff -u -r1.203 -r1.203.2.1 pkgsrc/editors/vim-share/distinfo cvs rdiff -u -r1.10 -r1.10.4.1 pkgsrc/editors/vim-share/options.mk cvs rdiff -u -r1.142 -r1.142.2.1 pkgsrc/editors/vim-share/version.mk cvs rdiff -u -r1.9 -r0 pkgsrc/editors/vim-share/patches/patch-auto_configure cvs rdiff -u -r1.4 -r0 pkgsrc/editors/vim-share/patches/patch-configure cvs rdiff -u -r1.5 -r1.5.16.1 \ pkgsrc/editors/vim-share/patches/patch-feature.h cvs rdiff -u -r1.1 -r0 pkgsrc/editors/vim-share/patches/patch-link.sh Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. --_----------=_170222817668560 Content-Disposition: inline Content-Length: 9943 Content-Transfer-Encoding: binary Content-Type: text/x-diff; charset=us-ascii Modified files: Index: pkgsrc/editors/vim-share/Makefile.common diff -u pkgsrc/editors/vim-share/Makefile.common:1.167 pkgsrc/editors/vim-share/Makefile.common:1.167.2.1 --- pkgsrc/editors/vim-share/Makefile.common:1.167 Sat Sep 16 12:43:14 2023 +++ pkgsrc/editors/vim-share/Makefile.common Sun Dec 10 17:09:35 2023 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.common,v 1.167 2023/09/16 12:43:14 rhialto Exp $ +# $NetBSD: Makefile.common,v 1.167.2.1 2023/12/10 17:09:35 bsiegert Exp $ # used by editors/vim/Makefile # used by editors/vim-gtk2/Makefile # used by editors/vim-gtk3/Makefile @@ -24,7 +24,8 @@ LICENSE= vim-license OR gnu-gpl-v2 WRKSRC= ${WRKDIR}/${DISTNAME}/src GNU_CONFIGURE= yes -USE_LANGUAGES+= c99 +USE_LANGUAGES+= c +USE_CC_FEATURES+= c99 # http://www.netbsd.org/cgi-bin/query-pr-single.pl?number=38710 CHECK_INTERPRETER_SKIP= share/vim/${VIM_SUBDIR}/tools/vim132 Index: pkgsrc/editors/vim-share/PLIST diff -u pkgsrc/editors/vim-share/PLIST:1.65 pkgsrc/editors/vim-share/PLIST:1.65.2.1 --- pkgsrc/editors/vim-share/PLIST:1.65 Sat Sep 16 12:21:18 2023 +++ pkgsrc/editors/vim-share/PLIST Sun Dec 10 17:09:35 2023 @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.65 2023/09/16 12:21:18 rhialto Exp $ +@comment $NetBSD: PLIST,v 1.65.2.1 2023/12/10 17:09:35 bsiegert Exp $ bin/xxd man/man1/evim.1 man/man1/vim.1 @@ -20,6 +20,8 @@ share/vim/${VIM_SUBDIR}/autoload/decada. share/vim/${VIM_SUBDIR}/autoload/dist/ft.vim share/vim/${VIM_SUBDIR}/autoload/dist/man.vim share/vim/${VIM_SUBDIR}/autoload/dist/script.vim +share/vim/${VIM_SUBDIR}/autoload/dist/vim.vim +share/vim/${VIM_SUBDIR}/autoload/dist/vim9.vim share/vim/${VIM_SUBDIR}/autoload/dist/vimindent.vim share/vim/${VIM_SUBDIR}/autoload/freebasic.vim share/vim/${VIM_SUBDIR}/autoload/getscript.vim @@ -413,6 +415,7 @@ share/vim/${VIM_SUBDIR}/ftplugin/cucumbe share/vim/${VIM_SUBDIR}/ftplugin/cvsrc.vim share/vim/${VIM_SUBDIR}/ftplugin/debchangelog.vim share/vim/${VIM_SUBDIR}/ftplugin/debcontrol.vim +share/vim/${VIM_SUBDIR}/ftplugin/debsources.vim share/vim/${VIM_SUBDIR}/ftplugin/denyhosts.vim share/vim/${VIM_SUBDIR}/ftplugin/desktop.vim share/vim/${VIM_SUBDIR}/ftplugin/dictconf.vim @@ -485,11 +488,13 @@ share/vim/${VIM_SUBDIR}/ftplugin/javascr share/vim/${VIM_SUBDIR}/ftplugin/javascriptreact.vim share/vim/${VIM_SUBDIR}/ftplugin/jproperties.vim share/vim/${VIM_SUBDIR}/ftplugin/json.vim +share/vim/${VIM_SUBDIR}/ftplugin/json5.vim share/vim/${VIM_SUBDIR}/ftplugin/jsonc.vim share/vim/${VIM_SUBDIR}/ftplugin/jsonnet.vim share/vim/${VIM_SUBDIR}/ftplugin/jsp.vim share/vim/${VIM_SUBDIR}/ftplugin/julia.vim share/vim/${VIM_SUBDIR}/ftplugin/kconfig.vim +share/vim/${VIM_SUBDIR}/ftplugin/kotlin.vim share/vim/${VIM_SUBDIR}/ftplugin/kwt.vim share/vim/${VIM_SUBDIR}/ftplugin/ld.vim share/vim/${VIM_SUBDIR}/ftplugin/less.vim @@ -540,6 +545,7 @@ share/vim/${VIM_SUBDIR}/ftplugin/nix.vim share/vim/${VIM_SUBDIR}/ftplugin/nroff.vim share/vim/${VIM_SUBDIR}/ftplugin/nsis.vim share/vim/${VIM_SUBDIR}/ftplugin/objc.vim +share/vim/${VIM_SUBDIR}/ftplugin/objdump.vim share/vim/${VIM_SUBDIR}/ftplugin/obse.vim share/vim/${VIM_SUBDIR}/ftplugin/ocaml.vim share/vim/${VIM_SUBDIR}/ftplugin/occam.vim @@ -647,9 +653,10 @@ share/vim/${VIM_SUBDIR}/ftplugin/vhdl.vi share/vim/${VIM_SUBDIR}/ftplugin/vim.vim share/vim/${VIM_SUBDIR}/ftplugin/vroom.vim share/vim/${VIM_SUBDIR}/ftplugin/vue.vim -share/vim/${VIM_SUBDIR}/ftplugin/wast.vim +share/vim/${VIM_SUBDIR}/ftplugin/wat.vim share/vim/${VIM_SUBDIR}/ftplugin/wget.vim share/vim/${VIM_SUBDIR}/ftplugin/wget2.vim +share/vim/${VIM_SUBDIR}/ftplugin/xcompose.vim share/vim/${VIM_SUBDIR}/ftplugin/xdefaults.vim share/vim/${VIM_SUBDIR}/ftplugin/xf86conf.vim share/vim/${VIM_SUBDIR}/ftplugin/xhtml.vim @@ -739,6 +746,7 @@ share/vim/${VIM_SUBDIR}/indent/json.vim share/vim/${VIM_SUBDIR}/indent/jsonc.vim share/vim/${VIM_SUBDIR}/indent/jsp.vim share/vim/${VIM_SUBDIR}/indent/julia.vim +share/vim/${VIM_SUBDIR}/indent/kotlin.vim share/vim/${VIM_SUBDIR}/indent/krl.vim share/vim/${VIM_SUBDIR}/indent/ld.vim share/vim/${VIM_SUBDIR}/indent/less.vim @@ -815,7 +823,7 @@ share/vim/${VIM_SUBDIR}/indent/vhdl.vim share/vim/${VIM_SUBDIR}/indent/vim.vim share/vim/${VIM_SUBDIR}/indent/vroom.vim share/vim/${VIM_SUBDIR}/indent/vue.vim -share/vim/${VIM_SUBDIR}/indent/wast.vim +share/vim/${VIM_SUBDIR}/indent/wat.vim share/vim/${VIM_SUBDIR}/indent/xf86conf.vim share/vim/${VIM_SUBDIR}/indent/xhtml.vim share/vim/${VIM_SUBDIR}/indent/xinetd.vim @@ -1067,6 +1075,7 @@ share/vim/${VIM_SUBDIR}/syntax/dart.vim share/vim/${VIM_SUBDIR}/syntax/datascript.vim share/vim/${VIM_SUBDIR}/syntax/dcd.vim share/vim/${VIM_SUBDIR}/syntax/dcl.vim +share/vim/${VIM_SUBDIR}/syntax/deb822sources.vim share/vim/${VIM_SUBDIR}/syntax/debchangelog.vim share/vim/${VIM_SUBDIR}/syntax/debcontrol.vim share/vim/${VIM_SUBDIR}/syntax/debcopyright.vim @@ -1228,12 +1237,14 @@ share/vim/${VIM_SUBDIR}/syntax/jgraph.vi share/vim/${VIM_SUBDIR}/syntax/jovial.vim share/vim/${VIM_SUBDIR}/syntax/jproperties.vim share/vim/${VIM_SUBDIR}/syntax/json.vim +share/vim/${VIM_SUBDIR}/syntax/json5.vim share/vim/${VIM_SUBDIR}/syntax/jsonc.vim share/vim/${VIM_SUBDIR}/syntax/jsp.vim share/vim/${VIM_SUBDIR}/syntax/julia.vim share/vim/${VIM_SUBDIR}/syntax/kconfig.vim share/vim/${VIM_SUBDIR}/syntax/kivy.vim share/vim/${VIM_SUBDIR}/syntax/kix.vim +share/vim/${VIM_SUBDIR}/syntax/kotlin.vim share/vim/${VIM_SUBDIR}/syntax/krl.vim share/vim/${VIM_SUBDIR}/syntax/kscript.vim share/vim/${VIM_SUBDIR}/syntax/kwt.vim @@ -1469,6 +1480,7 @@ share/vim/${VIM_SUBDIR}/syntax/shared/co share/vim/${VIM_SUBDIR}/syntax/shared/context-data-interfaces.vim share/vim/${VIM_SUBDIR}/syntax/shared/context-data-metafun.vim share/vim/${VIM_SUBDIR}/syntax/shared/context-data-tex.vim +share/vim/${VIM_SUBDIR}/syntax/shared/debversions.vim share/vim/${VIM_SUBDIR}/syntax/shared/hgcommitDiff.vim share/vim/${VIM_SUBDIR}/syntax/shared/typescriptcommon.vim share/vim/${VIM_SUBDIR}/syntax/sicad.vim @@ -1606,7 +1618,7 @@ share/vim/${VIM_SUBDIR}/syntax/vrml.vim share/vim/${VIM_SUBDIR}/syntax/vroom.vim share/vim/${VIM_SUBDIR}/syntax/vsejcl.vim share/vim/${VIM_SUBDIR}/syntax/vue.vim -share/vim/${VIM_SUBDIR}/syntax/wast.vim +share/vim/${VIM_SUBDIR}/syntax/wat.vim share/vim/${VIM_SUBDIR}/syntax/wdiff.vim share/vim/${VIM_SUBDIR}/syntax/wdl.vim share/vim/${VIM_SUBDIR}/syntax/web.vim @@ -1620,6 +1632,7 @@ share/vim/${VIM_SUBDIR}/syntax/wsh.vim share/vim/${VIM_SUBDIR}/syntax/wsml.vim share/vim/${VIM_SUBDIR}/syntax/wvdial.vim share/vim/${VIM_SUBDIR}/syntax/xbl.vim +share/vim/${VIM_SUBDIR}/syntax/xcompose.vim share/vim/${VIM_SUBDIR}/syntax/xdefaults.vim share/vim/${VIM_SUBDIR}/syntax/xf86conf.vim share/vim/${VIM_SUBDIR}/syntax/xhtml.vim Index: pkgsrc/editors/vim-share/distinfo diff -u pkgsrc/editors/vim-share/distinfo:1.203 pkgsrc/editors/vim-share/distinfo:1.203.2.1 --- pkgsrc/editors/vim-share/distinfo:1.203 Sat Sep 16 12:21:18 2023 +++ pkgsrc/editors/vim-share/distinfo Sun Dec 10 17:09:35 2023 @@ -1,10 +1,7 @@ -$NetBSD: distinfo,v 1.203 2023/09/16 12:21:18 rhialto Exp $ +$NetBSD: distinfo,v 1.203.2.1 2023/12/10 17:09:35 bsiegert Exp $ -BLAKE2s (vim-9.0.1900.tar.gz) = 376d549a8a326cedb0b35225543eb018593c0f7fa0f13d3cbf6c0c27e6b957c9 -SHA512 (vim-9.0.1900.tar.gz) = 2d54fabc6eeddb9f13b6f4ed09e1bfcbc9e6c5d3f605be8461d20c39570136c543a648f981dd4b59e3ae751a36d8d30c09eee80cf6e51a6f77e39ac356e4637e -Size (vim-9.0.1900.tar.gz) = 17280754 bytes +BLAKE2s (vim-9.0.2122.tar.gz) = e67314db2a22acc08f371e2be696a50d2691aab7c1bb9feec75d5af9f1fd3a52 +SHA512 (vim-9.0.2122.tar.gz) = bc173f459edde1b10b3ae8653b3ab059fbafc06b67d52d6e46f90729d783b50bd9691610f29db68cfeeb318ff1aba2bb107ac05de2cca4ea37945aa7f094b8c8 +Size (vim-9.0.2122.tar.gz) = 17367484 bytes SHA1 (patch-Makefile) = fc8903a5625e3bc6a915cd68136cb18b5cdf42eb -SHA1 (patch-auto_configure) = 80cf9bf3806bb4a71fc8d194186e9ef649fc7a8a -SHA1 (patch-configure) = 1550889af449f536e8a0da15ad41d02f4a5cde6a -SHA1 (patch-feature.h) = a6cd7ae6267cb7e28d2a174226ccebb94b49dc16 -SHA1 (patch-link.sh) = 24db881cea873330a8a3bf672f6135d0835651fd +SHA1 (patch-feature.h) = e7d3385dc09e0ed7d45577344e9988264c0de4dd Index: pkgsrc/editors/vim-share/options.mk diff -u pkgsrc/editors/vim-share/options.mk:1.10 pkgsrc/editors/vim-share/options.mk:1.10.4.1 --- pkgsrc/editors/vim-share/options.mk:1.10 Wed Mar 29 09:34:10 2023 +++ pkgsrc/editors/vim-share/options.mk Sun Dec 10 17:09:35 2023 @@ -1,7 +1,7 @@ -# $NetBSD: options.mk,v 1.10 2023/03/29 09:34:10 wiz Exp $ +# $NetBSD: options.mk,v 1.10.4.1 2023/12/10 17:09:35 bsiegert Exp $ -PKG_SUPPORTED_OPTIONS+= ruby python perl lua luajit PKG_OPTIONS_VAR= PKG_OPTIONS.vim +PKG_SUPPORTED_OPTIONS+= ruby python perl lua luajit .include "../../mk/bsd.options.mk" Index: pkgsrc/editors/vim-share/version.mk diff -u pkgsrc/editors/vim-share/version.mk:1.142 pkgsrc/editors/vim-share/version.mk:1.142.2.1 --- pkgsrc/editors/vim-share/version.mk:1.142 Sat Sep 16 12:21:18 2023 +++ pkgsrc/editors/vim-share/version.mk Sun Dec 10 17:09:35 2023 @@ -1,7 +1,7 @@ -# $NetBSD: version.mk,v 1.142 2023/09/16 12:21:18 rhialto Exp $ +# $NetBSD: version.mk,v 1.142.2.1 2023/12/10 17:09:35 bsiegert Exp $ VIM_VERSION= 9.0 -VIM_PATCHLEVEL= 1900 +VIM_PATCHLEVEL= 2122 # Changelog: see http://ftp.vim.org/pub/vim/patches/9.0/ VIM_SUBDIR= vim90 Index: pkgsrc/editors/vim-share/patches/patch-feature.h diff -u pkgsrc/editors/vim-share/patches/patch-feature.h:1.5 pkgsrc/editors/vim-share/patches/patch-feature.h:1.5.16.1 --- pkgsrc/editors/vim-share/patches/patch-feature.h:1.5 Wed Dec 1 21:36:59 2021 +++ pkgsrc/editors/vim-share/patches/patch-feature.h Sun Dec 10 17:09:36 2023 @@ -1,4 +1,6 @@ -$NetBSD: patch-feature.h,v 1.5 2021/12/01 21:36:59 wiz Exp $ +$NetBSD: patch-feature.h,v 1.5.16.1 2023/12/10 17:09:36 bsiegert Exp $ + +Use pkgsrc configuration directory. --- src/feature.h.orig 2019-12-03 21:59:23.000000000 +0000 +++ src/feature.h --_----------=_170222817668560--