* acinclude.m4: Fix "make distcheck".

* NEWS: Update.
2004-12-13 17:56:27 +00:00 · 2004-12-13 17:56:27 +00:00 · 7e75c2d423
--- a/8
+++ b/8
@ -1,3 +1,11 @@
+2004-12-13  Pavel S. Shirshov  <me@pavelsh.pp.ru>
+
+        * acinclude.m4: Fix "make distcheck".
+
+2004-12-12  Pavel S. Shirshov  <me@pavelsh.pp.ru>
+
+        * NEWS: Update.
+
 2004-12-10  Pavel S. Shirshov  <me@pavelsh.pp.ru>

 	* autogen.sh: Comment workaround for Automake 1.5. It's not working
--- a/71
+++ b/71
@ -1,15 +1,66 @@
-After version 4.6.0.
+Version 4.6.1-pre2.

-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.
-Screen saving is now supported on FreeBSD console.
-Support for SCO UNIX has been removed.
-User is warned if one mc is run from another.
-VFS supports iso9660 images.
-New translations: Mongolian, Serbian and Lithuanian.
+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.
+
+- 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.
--- a/acinclude.m4
+++ b/acinclude.m4
@ -684,17 +684,14 @@ dnl If not, and $1 is "strict", exit, otherwise fall back to mcslang.
 dnl
 AC_DEFUN([MC_WITH_SLANG], [
    with_screen=slang
-    ac_save_MCLIBS="$MCLIBS"

    dnl Check the header
-    if test x$with_screen = xslang; then
-	slang_h_found=
-	AC_CHECK_HEADERS([slang.h slang/slang.h],
-			 [slang_h_found=yes; break])
+    slang_h_found=
+    AC_CHECK_HEADERS([slang.h slang/slang.h],
+		     [slang_h_found=yes; break])

-	if test -z "$slang_h_found"; then
-	    with_screen=mcslang
-	fi
+    if test -z "$slang_h_found"; then
+	with_screen=mcslang
    fi

    dnl Check if the installed S-Lang library uses termcap
@ -705,31 +702,30 @@ AC_DEFUN([MC_WITH_SLANG], [
 		  [Define to use S-Lang library installed on the system])
 	ac_save_LIBS="$LIBS"
 	LIBS="$LIBS -lslang"
-	AC_TRY_LINK([ 
-	#ifdef HAVE_SLANG_SLANG_H
-	#include <slang/slang.h>
-	#else
-	#include <slang.h>
-	#endif],
-	[SLtt_get_terminfo();
-	SLtt_tgetflag("");], 
-	[LIBS="$ac_save_LIBS"],
-	[LIBS="$ac_save_LIBS"; MC_USE_TERMCAP
-	 ac_save_MCLIBS="$MCLIBS"])
-        _MC_WITH_XSLANG
-    fi
+	AC_TRY_LINK([
+		     #ifdef HAVE_SLANG_SLANG_H
+		     #include <slang/slang.h>
+		     #else
+		     #include <slang.h>
+		     #endif
+		    ],
+		    [SLtt_get_terminfo(); SLtt_tgetflag("");],
+		    [LIBS="$ac_save_LIBS"],
+		    [LIBS="$ac_save_LIBS"; MC_USE_TERMCAP])

-    if test x$with_screen = xslang; then
-	AC_CHECK_LIB([slang], [SLang_init_tty], [MCLIBS="$MCLIBS -lslang"],
-		     [with_screen=mcslang], ["$MCLIBS"])
-    fi
-
-    dnl Unless external S-Lang was requested, reject S-Lang with UTF-8 hacks
-    m4_if([$1], strict, ,
-	  [AC_CHECK_LIB([slang], [SLsmg_write_nwchars],
-			[AC_MSG_WARN([Rejecting S-Lang with UTF-8 support, \
+	dnl Unless external S-Lang was requested, reject S-Lang with UTF-8 hacks
+	m4_if([$1], strict, ,
+	      [AC_CHECK_LIB([slang], [SLsmg_write_nwchars],
+	    		    [AC_MSG_WARN([Rejecting S-Lang with UTF-8 support, \
 it doesn't work well])
-			with_screen=mcslang])])
+	      with_screen=mcslang])])
+
+	dnl Check the library
+	if test x$with_screen = xslang; then
+	    AC_CHECK_LIB([slang], [SLang_init_tty], [MCLIBS="$MCLIBS -lslang"],
+			 [with_screen=mcslang], ["$MCLIBS"])
+	fi
+    fi

    m4_if([$1], strict,
 	[if test $with_screen != slang; then
@ -738,9 +734,7 @@ it doesn't work well])
 	[MC_WITH_MCSLANG]
    )

-    if test x$with_screen != xslang; then
-	MCLIBS="$ac_save_MCLIBS"
-    fi
+    _MC_WITH_XSLANG
 ])