[pkgsrc/trunk]: pkgsrc/sysutils/mc Update to 4.6.1pre2, fixing a number of vu...

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/7388d23c12bd
branches:  trunk
changeset: 487500:7388d23c12bd
user:      wiz <wiz%pkgsrc.org@localhost>
date:      Sat Jan 15 21:14:27 2005 +0000

description:
Update to 4.6.1pre2, fixing a number of vulnerabilities.
Joined work in pkgsrc-wip by Pavel Arnost, myself, and Roland Illig.

Version 4.6.1-pre2.

Release candidate for 4.6.1.

- Security.
        - Fixed CAN-2004-0226 (buffer overflows).
        - Fixed CAN-2004-0231 (unsafe temporary file and directory creation).
        - Fixed CAN-2004-0232 (format string vulnerablities).
        - cons.saver does not need to be setuid-root on Linux.
        - Hiding of FTP passwords.

- Portability.
        - PC port has been removed.
        - Support for SCO UNIX has been removed.
        - Improve support for QNX Neutrino.

- Core functionality.
        - Use 8bit input as default.
        - Better support for '@' in FTP usernames.
        - Better large file support (int -> off_t)
        - Add gnome, rxvt and xterm-new terminals (keyword copy for mc.lib).
        - Make the find dialog more responsive while scanning through large
          files.
        - Add implementation to cons.handler for FreeBSD 4.x and 5.x.
        - Screen saving is now supported on FreeBSD console.
        - Hide temporary commands from history.
        - Add --with-glib12 option to configure to force using glib 1.2.x.
        - Add --disable-background option to disable background support.
        - Background support now uses pipes instead of UNIX sockets.
        - libX11 is loaded dynamically using gmodule if possible.
        - User is warned if one mc is run from another.
        - In red dialog boxes draw the hotkey characters with a color
          different than the one used to paint the dialog.

- Screen libraries.
        - Add many boundary check into internal slang library.
        - Internal slang upgrade to 1.4.9.
        - Increased maximum screen size to 512 x 512.
        - Add support for qansi-m terminals.

- Editor.
        - Fix bugs for mcedit compiled with ncurses.
        - New status string format in mcedit.
        - Support for large syntax files.
        - Temporarily disable safe save and backups on remote VFS because it
          doesn't work.
        - Enable user menu in mcedit.
        - Add syntax file for the ASP.NET technology.
        - Add syntax file for the Eiffel programming language.
        - Add syntax file for the Ruby programming language.
        - Add syntax file for the C# programming language.
        - Upgrade php.syntax file.
        - Improve sql.syntax file.
        - Improve perl.syntax.
        - Improve diff.syntax.
        - Improve makefile.syntax.

- VFS.
        - Full audit of quoting of parameters in vfs scripts (CAN-2004-0494).
        - Fixed CAN-2003-1023 (stack overflow in vfs_s_resolve_symlink).
        - Various fixes in tar.c.
        - VFS supports iso9660 images.

- Translations.
        - New translations: Mongolian, Serbian and Lithuanian.
        - Updated translations: Ukrainian, Italian, Hungarian.

Version 4.6.0.

- Core functionality.
        - Fixed infinite loop under xterm if xterm is forcedly closed.

- Portability.
        - ncurses can be found even if it's renamed to curses (OpenBSD).
        - Warning fixes for 64-bit systems.


Version 4.6.0-pre3.

Another release candidate for 4.6.0.

- Core functionality.
        - ".." is no longer shown in the root directory.
        - Fixed segmentation fault when processing truncated
          section header in the corrupted initialization file.

- Screen libraries.
        - Fixed incorrect processing of AltGr on Linux console
          introduced in -pre2.

- Documentation.
        - Fixed a bug in man2hlp that could randomly prevent correct
          generation of the help files.
        - Added manual page for mcview.


Version 4.6.0-pre2.

Release candidate for 4.6.0.

- Security.
        - mc now creates its own temporary directory /tmp/mc-$USER.
          If it fails or permissions are wrong, the user is warned.

- Portability.
        - mc now complies with the Filesystem Hierarchy Standard and
          uses @prefix@/share/mc for the data files.
        - Support for glib 2.0.x has been added.
        - glib 1.2 is now properly detected on FreeBSD.

- Core functionality.
        - Fixed segmentation fault when displaying messages from
          background operations.
        - When using support for setting the last working directory of
          mc in the parent shell, "mc" is now an alias in all shells,
          not a function.  The "-P" option needs an argument now.
        - Alt-O sets the same directory on the other panel.
        - Current directory is shown in the xterm window title.

- Screen libraries.
        - Screen library is now selected by the option --with-screen.
        - X11 support is enabled by default, use --without-x to disable.
        - The keycode now contains information about all screen
          modifiers.  This allows to implement more shortcuts, but this
          work has just begun.
        - Included S-Lang library has been updated to version 1.4.5.
        - Mouse wheel is supported in the internal editor and viewer in
          xterm compatible terminals that implement wheel events.

- Editor.
        - Internal editor now saves the cursor position in the file.
        - New syntax rules - RPM specfile, m4.
        - Editor shows control characters in the caret notation.

- VFS.
        - Most extfs scripts have been reviewed and improved.
        - Fixed viewing and editing files on mcfs.
        - Support for termnet and HSC firewall has been removed.

- Documentation.
        - Polish manual has been added.

Version 4.6.0-pre1.

- Security release.  Massive code cleanup.  Most improvements didn't
  need any significant amount of the new code.

- Security.
        - Fixes for remotely exploitable buffer overflows in VFS.

- Ports and editions.
        - GNOME edition has been removed.
        - OS/2 port has been removed.
        - MAD (Memory Allocation Debugger) has been removed.

- Core functionality.
        - Large file support enabled by default.
        - Shift-F5 and Shift-F6 copy and rename like F5 and F6, but
          suggest the selected filename as the destination.
        - File search with contents doesn't use external egrep.
        - Directories with many files are now reloaded much faster.
        - Subshell works under Cygwin.

- Screen libraries.
        - Improved support for ncurses.
        - Dropped support for the old Curses library.
        - Colors are enabled on all capable terminals when using S-Lang.
        - Syntax highlighting now works with ncurses.

- Editor.
        - Editor files are now stored in ~/.mc/cedit instead of ~/.cedit
          to avoid collision with Cooledit.
        - New syntax rules - PHP, Tcl, SQL, DOS batch file.
        - Editor supports word completion.

- VFS.
        - Local temporary file is used for uploading via ftpfs/fish only
          if file is uploaded to the same ftp/fish server.
        - mcfs support is disabled by default.
        - Samba configuration and codepage files locations can be
          configured.
        - .netrc support in ftpfs is enabled by default.
        - Viewing zip files could corrupt them.

- Documentation.
        - Added manuals in Spanish, Italian and Russian.
        - Help files are not distributed, but generated during the
          build from the manual pages.

- Translations.
        - Belarussian translation has been added.


Version 4.5.55

- Mostly bugfixes and portability fixes.  Making things work as they
  were meant to work.

- Text edition improvements.
        - Ctrl-O supported in the viewer and editor.
        - Better terminal support.  Should not need "Learn Keys" on rxvt
          and xterm in most cases.

- GNOME edition improvements.
        - Find dialog rewritten.
        - Editor and viewer ask whether to save modified file when
          closed from window manager.

- Editor.
        - New syntax rules - S-Lang, PO files, Octave.
        - Alt-B goes to matching bracket.

- Portability improvements.
        - Should compile out-of-box on Cygwin and QNX Neutrino.
        - Can be compiled by BSD make.
        - Subshell and VFS code are safer and more portable.

- Experimental features (disabled by default).
        - Charset conversion support.
        - Large (64-bit) file support on 32-bit systems.

diffstat:

 sysutils/mc/DESCR            |   10 +-
 sysutils/mc/Makefile         |  137 +++++++++++++++++++++-----------
 sysutils/mc/PLIST            |  183 +++++++++++++++++++++++-------------------
 sysutils/mc/distinfo         |   18 +---
 sysutils/mc/patches/patch-aa |   65 ---------------
 sysutils/mc/patches/patch-ab |   33 ++-----
 sysutils/mc/patches/patch-ac |   21 ----
 sysutils/mc/patches/patch-ad |   24 -----
 sysutils/mc/patches/patch-ae |   23 -----
 sysutils/mc/patches/patch-af |   31 -------
 sysutils/mc/patches/patch-ag |   13 ---
 sysutils/mc/patches/patch-ah |   13 ---
 sysutils/mc/patches/patch-ai |   13 ---
 sysutils/mc/patches/patch-aj |   16 ---
 sysutils/mc/patches/patch-ak |   16 ---
 15 files changed, 211 insertions(+), 405 deletions(-)

diffs (truncated from 719 to 300 lines):

diff -r 1dec193d00ca -r 7388d23c12bd sysutils/mc/DESCR
--- a/sysutils/mc/DESCR Sat Jan 15 17:04:22 2005 +0000
+++ b/sysutils/mc/DESCR Sat Jan 15 21:14:27 2005 +0000
@@ -1,4 +1,6 @@
-Midnight Commander is a visual shell much like a file manager, only with way
-more features.  It is text mode, but also includes mouse support if you are
-running GPM.  Its coolest feature is the ability to ftp, view tar, zip
-files, and poke into RPMs for specific files.
+GNU Midnight Commander is a user-friendly yet powerful file manager
+and visual shell, useful to novice and guru alike. It provides a
+clear, user-friendly, and somewhat protected interface to a Unix
+system while making many frequent file operations more efficient and
+preserving the full power of the command prompt. You will wonder how
+you could ever live without it.
diff -r 1dec193d00ca -r 7388d23c12bd sysutils/mc/Makefile
--- a/sysutils/mc/Makefile      Sat Jan 15 17:04:22 2005 +0000
+++ b/sysutils/mc/Makefile      Sat Jan 15 21:14:27 2005 +0000
@@ -1,58 +1,101 @@
-# $NetBSD: Makefile,v 1.46 2004/12/20 15:58:27 wiz Exp $
-# FreeBSD Id: Makefile,v 1.16 1997/11/30 19:37:48 vanilla Exp
-#
-
-DISTNAME=              mc-4.5.51
-PKGREVISION=           5
-CATEGORIES=            sysutils
-MASTER_SITES+=         ${MASTER_SITE_GNOME:=stable/sources/mc/}
-
-MAINTAINER=            tech-pkg%NetBSD.org@localhost
-HOMEPAGE=              http://www.ibiblio.org/mc/
-COMMENT=               Midnight Commander, a free Norton Commander Clone
-
-BUILD_USES_MSGFMT=     YES
-
-CONFLICTS+=            gmc-[0-9]*
-
-USE_BUILDLINK3=                YES
-USE_PKGLOCALEDIR=      YES
-USE_GNU_TOOLS+=                make
+# $NetBSD: Makefile,v 1.47 2005/01/15 21:14:27 wiz Exp $
 
-GNU_CONFIGURE=         YES
-CONFIGURE_ARGS+=       --without-included-gettext
-CONFIGURE_ARGS+=       --with-netrc --with-included-slang
-CONFIGURE_ARGS+=       --with-samba
-CONFIGURE_ARGS+=       --without-gnome
-CONFIGURE_ARGS+=       --without-tk
-CONFIGURE_ARGS+=       --without-tm-x-support
-CONFIGURE_ARGS+=       --without-x
+DISTNAME=      mc-4.6.1-pre2b
+PKGNAME=       mc-4.6.1rc2
+CATEGORIES=    sysutils
+MASTER_SITES=  http://pavelsh.pp.ru/mc/
+#MASTER_SITES= http://www.ibiblio.org/pub/Linux/utils/file/managers/mc/ \
+#              ${MASTER_SITE_SUNSITE:=utils/file/managers/mc/}
 
-# Don't pick up readline if it's installed in the build environment.
-#
-CONFIGURE_ENV+=                ac_cv_header_history_h=no
-CONFIGURE_ENV+=                ac_cv_header_readline_h=no
-CONFIGURE_ENV+=                ac_cv_header_readline_history_h=no
-CONFIGURE_ENV+=                ac_cv_header_readline_readline_h=no
-
-CONFIGURE_ENV+=                LOCALBASE=${LOCALBASE:Q}
-CONFIGURE_ENV+=                PKGLOCALEDIR=${PKGLOCALEDIR:Q}
-
-LIBS+=                 -lm -ltermcap           # -lslang
-CPPFLAGS+=             -Dunix
+MAINTAINER=    pavel.arnost%clnet.cz@localhost
+HOMEPAGE=      http://www.ibiblio.org/mc/
+COMMENT=       User-friendly file manager and visual shell
 
 .include "../../mk/bsd.prefs.mk"
 
-.if ${OPSYS} == "SunOS"
-CFLAGS+= -DSunOS
+USE_BUILDLINK3=                YES
+GNU_CONFIGURE=         YES
+USE_GNU_TOOLS+=                make
+USE_PKGLOCALEDIR=      YES
+
+.if ${OPSYS} == "Linux"
+PLIST_SRC+=    ${PKGDIR}/PLIST.cons.saver
 .endif
 
-# Remove unwanted directories in a non-GNOME installation.
-#
+# remove dir if no extensions were installed there
 post-install:
-       ${RMDIR} -p ${PREFIX}/share/idl 2>/dev/null || ${TRUE}
-       ${RMDIR} -p ${PREFIX}/share/pixmaps/mc 2>/dev/null || ${TRUE}
+       @${RMDIR} ${PREFIX}/lib/mc 2>/dev/null || ${TRUE}
+
+# we need working e2fsprogs and gpm packages first
+CONFIGURE_ARGS+=       --without-ext2undel
+CONFIGURE_ARGS+=       --without-gpm-mouse
+
+MC_FEATURES=           edit charset largefile samba subshell vfs x11
+MC_DISABLE_FEATURES=   x11 samba
+
+MC_SCREEN_LIBRARY= slang
+
+.for feature in ${MC_FEATURES}
+
+__feature:=${feature}
+
+.      if empty(MC_DISABLE_FEATURES:M${feature})
+
+.              if ${__feature} == edit
+CONFIGURE_ARGS+=       --with-edit
+PLIST_SRC+=            ${PKGDIR}/PLIST.mcedit
+.              elif ${__feature} == charset
+CONFIGURE_ARGS+=       --enable-charset
+.include "../../converters/libiconv/buildlink3.mk"
+PLIST_SRC+=            ${PKGDIR}/PLIST.charset
+.              elif ${__feature} == largefile
+CONFIGURE_ARGS+=       --enable-largefile
+.              elif ${__feature} == samba
+CONFIGURE_ARGS+=       --with-samba
+.              elif ${__feature} == subshell
+CONFIGURE_ARGS+=       --with-subshell
+.              elif ${__feature} == vfs
+CONFIGURE_ARGS+=       --with-vfs
+PLIST_SRC+=            ${PKGDIR}/PLIST.vfs
+.              elif ${__feature} == x11
+USE_X11=               YES
+CONFIGURE_ARGS+=       --with-x
+.              endif
 
+.      else
+
+.              if ${__feature} == edit
+CONFIGURE_ARGS+=       --without-edit
+.              elif ${__feature} == charset
+CONFIGURE_ARGS+=       --disable-charset
+.              elif ${__feature} == largefile
+CONFIGURE_ARGS+=       --disable-largefile
+.              elif ${__feature} == samba
+CONFIGURE_ARGS+=       --without-samba
+.              elif ${__feature} == subshell
+CONFIGURE_ARGS+=       --without-subshell
+.              elif ${__feature} == vfs
+CONFIGURE_ARGS+=       --without-vfs
+.              elif ${__feature} == x11
+CONFIGURE_ARGS+=       --without-x
+.              endif
+
+.      endif
+
+.endfor
+
+PLIST_SRC+=    ${PKGDIR}/PLIST
+
+.if ${MC_SCREEN_LIBRARY} == "slang"
+CONFIGURE_ARGS+=       --with-screen=slang
+.include "../../devel/libslang/buildlink3.mk"
+.elif ${MC_SCREEN_LIBRARY} == "ncurses"
+CONFIGURE_ARGS+=       --with-screen=ncurses
+.include "../../devel/ncurses/buildlink3.mk"
+.else
+CONFIGURE_ARGS+=       --with-screen=mcslang
+.endif
+
+.include "../../devel/glib2/buildlink3.mk"
 .include "../../devel/gettext-lib/buildlink3.mk"
-.include "../../devel/glib/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff -r 1dec193d00ca -r 7388d23c12bd sysutils/mc/PLIST
--- a/sysutils/mc/PLIST Sat Jan 15 17:04:22 2005 +0000
+++ b/sysutils/mc/PLIST Sat Jan 15 21:14:27 2005 +0000
@@ -1,110 +1,129 @@
-@comment $NetBSD: PLIST,v 1.1 2001/10/31 22:53:27 zuntum Exp $
+@comment $NetBSD: PLIST,v 1.2 2005/01/15 21:14:27 wiz Exp $
 bin/mc
-bin/mcedit
 bin/mcmfmt
-bin/mcserv
-etc/mc.global
-lib/mc/FAQ
-lib/mc/bin/mc.csh
-lib/mc/bin/mc.sh
-lib/mc/bin/mcfn_install
-lib/mc/desktop-scripts/README.desktop
-lib/mc/desktop-scripts/startup.links
-lib/mc/edit.indent.rc
-lib/mc/extfs/README
-lib/mc/extfs/a
-lib/mc/extfs/deb
-lib/mc/extfs/extfs.ini
-lib/mc/extfs/ftplist
-lib/mc/extfs/hp48
-lib/mc/extfs/lslR
-lib/mc/extfs/mailfs
-lib/mc/extfs/patchfs
-lib/mc/extfs/rpm
-lib/mc/extfs/rpms
-lib/mc/extfs/sfs.ini
-lib/mc/extfs/trpm
-lib/mc/extfs/uar
-lib/mc/extfs/uarj
-lib/mc/extfs/ucpio
-lib/mc/extfs/uha
-lib/mc/extfs/ulha
-lib/mc/extfs/unarj.diff
-lib/mc/extfs/urar
-lib/mc/extfs/uzip
-lib/mc/extfs/uzoo
-lib/mc/mc-gnome.ext
-lib/mc/mc.csh
-lib/mc/mc.ext
-lib/mc/mc.hint
-lib/mc/mc.hint.cs
-lib/mc/mc.hint.es
-lib/mc/mc.hint.ru
-lib/mc/mc.hlp
-lib/mc/mc.lib
-lib/mc/mc.menu
-lib/mc/mc.sh
-lib/mc/syntax/ada95.syntax
-lib/mc/syntax/c.syntax
-lib/mc/syntax/changelog.syntax
-lib/mc/syntax/diff.syntax
-lib/mc/syntax/fortran.syntax
-lib/mc/syntax/html.syntax
-lib/mc/syntax/java.syntax
-lib/mc/syntax/latex.syntax
-lib/mc/syntax/lsm.syntax
-lib/mc/syntax/mail.syntax
-lib/mc/syntax/makefile.syntax
-lib/mc/syntax/ml.syntax
-lib/mc/syntax/nroff.syntax
-lib/mc/syntax/pascal.syntax
-lib/mc/syntax/perl.syntax
-lib/mc/syntax/python.syntax
-lib/mc/syntax/sh.syntax
-lib/mc/syntax/smalltalk.syntax
-lib/mc/syntax/swig.syntax
-lib/mc/syntax/texinfo.syntax
-lib/mc/syntax/unknown.syntax
-lib/mc/term/README.xterm
-lib/mc/term/ansi.ti
-lib/mc/term/linux.ti
-lib/mc/term/vt100.ti
-lib/mc/term/xterm.ad
-lib/mc/term/xterm.tcap
-lib/mc/term/xterm.ti
+bin/mcview
+man/es/man1/mc.1
+man/hu/man1/mc.1
+man/it/man1/mc.1
 man/man1/mc.1
 man/man1/mcedit.1
-man/man8/mcserv.8
+man/man1/mcview.1
+man/pl/man1/mc.1
+man/ru/man1/mc.1
+man/sr/man1/mc.1
+${PKGLOCALEDIR}/locale/az/LC_MESSAGES/mc.mo
+${PKGLOCALEDIR}/locale/be/LC_MESSAGES/mc.mo
+${PKGLOCALEDIR}/locale/bg/LC_MESSAGES/mc.mo
 ${PKGLOCALEDIR}/locale/ca/LC_MESSAGES/mc.mo
 ${PKGLOCALEDIR}/locale/cs/LC_MESSAGES/mc.mo
 ${PKGLOCALEDIR}/locale/da/LC_MESSAGES/mc.mo
 ${PKGLOCALEDIR}/locale/de/LC_MESSAGES/mc.mo
 ${PKGLOCALEDIR}/locale/el/LC_MESSAGES/mc.mo
 ${PKGLOCALEDIR}/locale/es/LC_MESSAGES/mc.mo
-${PKGLOCALEDIR}/locale/es_ES/LC_MESSAGES/mc.mo
+${PKGLOCALEDIR}/locale/eu/LC_MESSAGES/mc.mo
 ${PKGLOCALEDIR}/locale/fi/LC_MESSAGES/mc.mo
 ${PKGLOCALEDIR}/locale/fr/LC_MESSAGES/mc.mo
 ${PKGLOCALEDIR}/locale/hu/LC_MESSAGES/mc.mo
 ${PKGLOCALEDIR}/locale/it/LC_MESSAGES/mc.mo
 ${PKGLOCALEDIR}/locale/ja/LC_MESSAGES/mc.mo
 ${PKGLOCALEDIR}/locale/ko/LC_MESSAGES/mc.mo
+${PKGLOCALEDIR}/locale/lt/LC_MESSAGES/mc.mo
+${PKGLOCALEDIR}/locale/lv/LC_MESSAGES/mc.mo
+${PKGLOCALEDIR}/locale/mn/LC_MESSAGES/mc.mo
 ${PKGLOCALEDIR}/locale/nl/LC_MESSAGES/mc.mo
 ${PKGLOCALEDIR}/locale/no/LC_MESSAGES/mc.mo
 ${PKGLOCALEDIR}/locale/pl/LC_MESSAGES/mc.mo
+${PKGLOCALEDIR}/locale/pt/LC_MESSAGES/mc.mo
 ${PKGLOCALEDIR}/locale/pt_BR/LC_MESSAGES/mc.mo
 ${PKGLOCALEDIR}/locale/ro/LC_MESSAGES/mc.mo
 ${PKGLOCALEDIR}/locale/ru/LC_MESSAGES/mc.mo
 ${PKGLOCALEDIR}/locale/sk/LC_MESSAGES/mc.mo
 ${PKGLOCALEDIR}/locale/sl/LC_MESSAGES/mc.mo
+${PKGLOCALEDIR}/locale/sr/LC_MESSAGES/mc.mo
 ${PKGLOCALEDIR}/locale/sv/LC_MESSAGES/mc.mo
+${PKGLOCALEDIR}/locale/ta/LC_MESSAGES/mc.mo
 ${PKGLOCALEDIR}/locale/tr/LC_MESSAGES/mc.mo
 ${PKGLOCALEDIR}/locale/uk/LC_MESSAGES/mc.mo
 ${PKGLOCALEDIR}/locale/wa/LC_MESSAGES/mc.mo
-${PKGLOCALEDIR}/locale/zh_CN.GB2312/LC_MESSAGES/mc.mo
-${PKGLOCALEDIR}/locale/zh_TW.Big5/LC_MESSAGES/mc.mo
-@dirrm lib/mc/term
-@dirrm lib/mc/syntax
-@dirrm lib/mc/extfs
-@dirrm lib/mc/desktop-scripts
-@dirrm lib/mc/bin
-@dirrm lib/mc
+${PKGLOCALEDIR}/locale/zh_CN/LC_MESSAGES/mc.mo