Date: Thu, 22 Dec 2016 02:15:31 +0000 (UTC) From: Adam Weinberger <adamw@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r429138 - branches/2016Q4/editors/vim Message-ID: <201612220215.uBM2FViL082095@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: adamw Date: Thu Dec 22 02:15:31 2016 New Revision: 429138 URL: https://svnweb.freebsd.org/changeset/ports/429138 Log: MFH: r423210 r423515 r424023 r424478 r424920 r425397 r425999 r426531 r427169 r427618 r428306 r428789 Update vim to patchlevel 134 (the current patchlevel in head). This addresses a CVE that was fixed in patchlevel 54. Also included in this update are fixes for DfBSD and support for parallel make. Thanks to ohauer for alerting me to this. Security: CVE-2016-1248 More info: http://openwall.com/lists/oss-security/2016/11/22/20 Approved by: ports-secteam (junovitch) Modified: branches/2016Q4/editors/vim/Makefile branches/2016Q4/editors/vim/distinfo Directory Properties: branches/2016Q4/ (props changed) Modified: branches/2016Q4/editors/vim/Makefile ============================================================================== --- branches/2016Q4/editors/vim/Makefile Thu Dec 22 02:11:05 2016 (r429137) +++ branches/2016Q4/editors/vim/Makefile Thu Dec 22 02:15:31 2016 (r429138) @@ -2,12 +2,11 @@ # $FreeBSD$ PORTNAME= vim -PORTVERSION= 8.0.0019 +PORTVERSION= 8.0.0134 DISTVERSIONPREFIX= v -PORTREVISION= 1 -CATEGORIES?= editors +CATEGORIES= editors -MAINTAINER?= adamw@FreeBSD.org +MAINTAINER= adamw@FreeBSD.org COMMENT?= Improved version of the vi editor LICENSE= VIM @@ -36,10 +35,9 @@ LANGBIND_DESC= Optional language bindin ALL_TARGET= # empty MAKE_ARGS+= CC="${CC}" CONF_ARGS="--prefix=${PREFIX} ${CSCOPE_ARG}" STRIP="${STRIP_CMD}" MAKE_ARGS+= VIMRUNTIMEDIR=${PREFIX}/share/vim/${VIM_VER} VIMRCLOC=${ETCDIR} -MAKE_ARGS+= CONF_OPT_MULTIBYTE=--enable-multibyte CONF_TERM_LIB=--with-tlib=termlib +MAKE_ARGS+= CONF_OPT_MULTIBYTE=--enable-multibyte CONF_TERM_LIB=--with-tlib=ncurses REINPLACE_ARGS= -i '' USES= cpe iconv ncurses pkgconfig shebangfix -MAKE_JOBS_UNSAFE= yes PLIST_SUB= VIM_VER=${VIM_VER} PORTDATA= ${VIM_VER} @@ -93,16 +91,16 @@ ATHENA_USE= XORG=ice,sm,x11,xaw,xmu,xpm CONSOLE_MAKE_ARGS= CONF_OPT_GUI="--enable-gui=no --without-x" CONSOLE_PLIST_SUB= GUI="@comment " -GNOME_MAKE_ARGS= CONF_OPT_GUI=--enable-gui=gnome2 X_LIBS="$$(X_LIBS) -lX11 -lXpm -lXt" +GNOME_MAKE_ARGS= CONF_OPT_GUI=--enable-gui=gnome2 GNOME_PLIST_SUB= GUI="" GNOME_IMPLIES= NLS GNOME_USE= GNOME=gdkpixbuf2,libgnomeui XORG=ice,sm,glproto,x11,xpm,xt -GTK2_MAKE_ARGS= CONF_OPT_GUI=--enable-gui=gtk2 X_LIBS="$$(X_LIBS) -lX11 -lXpm -lXt" +GTK2_MAKE_ARGS= CONF_OPT_GUI=--enable-gui=gtk2 GTK2_PLIST_SUB= GUI="" GTK2_USE= GNOME=gdkpixbuf2,gtk20 XORG=ice,sm,x11,xpm,xt -GTK3_MAKE_ARGS= CONF_OPT_GUI=--enable-gui=gtk3 X_LIBS="$$(X_LIBS) -lX11 -lXpm -lXt" +GTK3_MAKE_ARGS= CONF_OPT_GUI=--enable-gui=gtk3 GTK3_PLIST_SUB= GUI="" GTK3_USE= GNOME=cairo,gdkpixbuf2,gtk30 XORG=ice,sm,x11,xpm,xt @@ -111,9 +109,9 @@ MOTIF_PLIST_SUB= GUI="" MOTIF_USES= motif MOTIF_USE= XORG=ice,sm,x11,xmu,xt -X11_MAKE_ARGS= CONF_OPT_GUI="--enable-gui=no --with-x" X_LIBS="$$(X_LIBS) -lX11 -lXt" +X11_MAKE_ARGS= CONF_OPT_GUI="--enable-gui=no --with-x" X11_PLIST_SUB= GUI="@comment " -X11_USE= XORG=x11,xt +X11_USE= XORG=ice,sm,x11,xt # LANGUAGE BINDINGS LUA_MAKE_ARGS= CONF_OPT_LUA=--enable-luainterp=dynamic CONF_OPT_LUA_PREFIX=--with-lua-prefix=${LOCALBASE} @@ -140,6 +138,9 @@ MAKE_ARGS+= CONF_OPT_PYTHON="--enable-py .endif .endif +post-extract: + ${INSTALL_DATA} ${FILESDIR}/vietnamese_viscii.vim ${WRKSRC}/runtime/keymap + post-patch: @${FIND} ${WRKSRC}/ -name 'Makefile' | ${XARGS} ${REINPLACE_CMD} -e 's| $$<| $$>|' @${REINPLACE_CMD} -e '/^install_normal: / s|install-icons|# &|; /cd $$(DEST_BIN); ln -s/d' ${WRKSRC}/src/Makefile @@ -169,15 +170,9 @@ post-configure: @${REINPLACE_CMD} -e 's|#define HAVE_SYSINFO 1|/* #undef HAVE_SYSINFO */|' ${WRKSRC}/src/auto/config.h post-install: - ${MKDIR} ${STAGEDIR}${DATADIR}/${VIM_VER}/lang/ -.for file in evim rview rvim vimdiff - ${LN} -fs vim ${STAGEDIR}${PREFIX}/bin/${file} -.endfor -.if empty(PORT_OPTIONS:MCONSOLE) && empty(PORT_OPTIONS:MX11) -.for file in eview gview gvim gvimdiff rgview rgvim - ${LN} -fs vim ${STAGEDIR}${PREFIX}/bin/${file} +.for F in eview evim gview gvim gvimdiff rgview rgvim rview rvim vimdiff + ${LN} -s vim ${STAGEDIR}${PREFIX}/bin/$F .endfor -.endif post-install-DEFAULT_VIMRC-on: @${MKDIR} ${STAGEDIR}${ETCDIR} @@ -185,11 +180,8 @@ post-install-DEFAULT_VIMRC-on: ${INSTALL_DATA} ${FILESDIR}/vimrc ${STAGEDIR}${ETCDIR}/vimrc.sample post-install-NLS-off: + @${MKDIR} ${STAGEDIR}${DATADIR}/${VIM_VER}/lang @${MKDIR} ${STAGEDIR}${DATADIR}/${VIM_VER}/keymap ${INSTALL_DATA} ${WRKSRC}/runtime/keymap/* ${STAGEDIR}${DATADIR}/${VIM_VER}/keymap - ${INSTALL_DATA} ${FILESDIR}/vietnamese_viscii.vim ${STAGEDIR}${DATADIR}/${VIM_VER}/keymap - -post-install-NLS-on: - ${INSTALL_DATA} ${FILESDIR}/vietnamese_viscii.vim ${STAGEDIR}${DATADIR}/${VIM_VER}/keymap .include <bsd.port.post.mk> Modified: branches/2016Q4/editors/vim/distinfo ============================================================================== --- branches/2016Q4/editors/vim/distinfo Thu Dec 22 02:11:05 2016 (r429137) +++ branches/2016Q4/editors/vim/distinfo Thu Dec 22 02:15:31 2016 (r429138) @@ -1,3 +1,3 @@ -TIMESTAMP = 1475291592 -SHA256 (vim-vim-v8.0.0019_GH0.tar.gz) = f13a76504b2f976228edd7169d592870a6af45614d82ae2a9c312fc17ab3d4ad -SIZE (vim-vim-v8.0.0019_GH0.tar.gz) = 12919003 +TIMESTAMP = 1481996189 +SHA256 (vim-vim-v8.0.0134_GH0.tar.gz) = 1b3e3e7d187eed55cbdb0a1dae6b8f3b885005fbae84222420877d7afa3b2310 +SIZE (vim-vim-v8.0.0134_GH0.tar.gz) = 12949311
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201612220215.uBM2FViL082095>