Update to version 4.6.1;
from Bernd Ahlers <b.ahlers@ba-net.org>
This commit is contained in:
robert
parent
65419753a3
commit
ec5f83335b
@ -1,9 +1,8 @@
|
||||
# $OpenBSD: Makefile,v 1.23 2005/02/17 21:59:11 robert Exp $
|
||||
# $OpenBSD: Makefile,v 1.24 2005/07/31 13:51:50 robert Exp $
|
||||
|
||||
COMMENT= "free Norton Commander clone with many useful features"
|
||||
|
||||
DISTNAME= mc-4.6.1-pre1
|
||||
PKGNAME= ${DISTNAME:S,-pre1,pre1,}p0
|
||||
DISTNAME= mc-4.6.1
|
||||
CATEGORIES= misc
|
||||
|
||||
HOMEPAGE= http://www.ibiblio.org/mc/
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
MD5 (mc-4.6.1-pre1.tar.gz) = 8c66f5eeb623b20791b3a13bbe6f8c1b
|
||||
RMD160 (mc-4.6.1-pre1.tar.gz) = cb574f3460fe6a2d559ffab1dce9b8f46f64edf5
|
||||
SHA1 (mc-4.6.1-pre1.tar.gz) = 01a45ff102c5f204108e20e968567b78ef9ab6a2
|
||||
SIZE (mc-4.6.1-pre1.tar.gz) = 3885123
|
||||
MD5 (mc-4.6.1.tar.gz) = 18b20db6e40480a53bac2870c56fc3c4
|
||||
RMD160 (mc-4.6.1.tar.gz) = d565ee95a8916d73fad5e0defeb9f2f57e50962b
|
||||
SHA1 (mc-4.6.1.tar.gz) = 92be0802143245e0fb7e3847d70da614cad7d5fb
|
||||
SIZE (mc-4.6.1.tar.gz) = 3928370
|
||||
|
||||
@ -1,12 +0,0 @@
|
||||
$OpenBSD: patch-src_cons_handler_c,v 1.1 2004/04/11 00:40:59 naddy Exp $
|
||||
--- src/cons.handler.c.orig 2003-06-18 06:47:18.000000000 +0200
|
||||
+++ src/cons.handler.c 2004-04-11 02:36:03.000000000 +0200
|
||||
@@ -145,7 +145,7 @@ handle_console_linux (unsigned char acti
|
||||
if (tty_name) {
|
||||
/* Exec the console save/restore handler */
|
||||
mc_conssaver = concat_dir_and_file (LIBDIR, "cons.saver");
|
||||
- execl (mc_conssaver, "cons.saver", tty_name, NULL);
|
||||
+ execl (mc_conssaver, "cons.saver", tty_name, (char *)NULL);
|
||||
}
|
||||
/* Console is not a tty or execl() failed */
|
||||
console_flag = 0;
|
||||
@ -1,24 +0,0 @@
|
||||
$OpenBSD: patch-src_subshell_c,v 1.1 2004/04/11 00:40:59 naddy Exp $
|
||||
--- src/subshell.c.orig 2003-10-26 07:46:02.000000000 +0100
|
||||
+++ src/subshell.c 2004-04-11 02:36:03.000000000 +0200
|
||||
@@ -265,17 +265,17 @@ static void init_subshell_child (const c
|
||||
switch (subshell_type)
|
||||
{
|
||||
case BASH:
|
||||
- execl (shell, "bash", "-rcfile", init_file, NULL);
|
||||
+ execl (shell, "bash", "-rcfile", init_file, (char *)NULL);
|
||||
break;
|
||||
|
||||
case TCSH:
|
||||
- execl (shell, "tcsh", NULL);
|
||||
+ execl (shell, "tcsh", (char *)NULL);
|
||||
break;
|
||||
|
||||
case ZSH:
|
||||
/* Use -g to exclude cmds beginning with space from history
|
||||
* and -Z to use the line editor on non-interactive term */
|
||||
- execl (shell, "zsh", "-Z", "-g", NULL);
|
||||
+ execl (shell, "zsh", "-Z", "-g", (char *)NULL);
|
||||
|
||||
break;
|
||||
}
|
||||
@ -1,24 +0,0 @@
|
||||
$OpenBSD: patch-src_utilunix_c,v 1.2 2005/02/17 21:59:11 robert Exp $
|
||||
--- src/utilunix.c.orig Fri Nov 28 16:23:19 2003
|
||||
+++ src/utilunix.c Thu Feb 17 22:28:40 2005
|
||||
@@ -234,9 +234,9 @@
|
||||
signal (SIGCHLD, SIG_DFL);
|
||||
|
||||
if (flags & EXECUTE_AS_SHELL)
|
||||
- execl (shell, shell, "-c", command, NULL);
|
||||
+ execl (shell, shell, "-c", command, (char *)NULL);
|
||||
else
|
||||
- execlp (shell, shell, command, NULL);
|
||||
+ execlp (shell, shell, command, (char *)NULL);
|
||||
|
||||
_exit (127); /* Exec error */
|
||||
} else {
|
||||
@@ -429,7 +429,7 @@
|
||||
close (2);
|
||||
dup (old_error);
|
||||
close (old_error);
|
||||
- len = read (error_pipe[0], msg, MAX_PIPE_SIZE);
|
||||
+ len = read (error_pipe[0], msg, MAX_PIPE_SIZE - 1);
|
||||
|
||||
if (len >= 0)
|
||||
msg[len] = 0;
|
||||
@ -1,21 +0,0 @@
|
||||
$OpenBSD: patch-vfs_extfs_c,v 1.1 2005/02/17 21:59:11 robert Exp $
|
||||
--- vfs/extfs.c.orig Thu Feb 17 22:31:24 2005
|
||||
+++ vfs/extfs.c Thu Feb 17 22:32:43 2005
|
||||
@@ -1281,14 +1281,13 @@
|
||||
g_free (mc_extfsini);
|
||||
return 0;
|
||||
}
|
||||
- if (*key == '#')
|
||||
+ if (*key == '#' || *key == '\n')
|
||||
continue;
|
||||
|
||||
if ((c = strchr (key, '\n'))){
|
||||
- *c = 0;
|
||||
+ *c-- = 0;
|
||||
+ } else { /* Last line without newline or strlen (key) > 255 */
|
||||
c = &key [strlen (key) - 1];
|
||||
- } else {
|
||||
- c = key;
|
||||
}
|
||||
extfs_need_archive [extfs_no] = !(*c == ':');
|
||||
if (*c == ':')
|
||||
@ -1,12 +0,0 @@
|
||||
$OpenBSD: patch-vfs_fish_c,v 1.1 2005/02/17 21:59:11 robert Exp $
|
||||
--- vfs/fish.c.orig Thu Feb 17 22:26:51 2005
|
||||
+++ vfs/fish.c Thu Feb 17 22:27:24 2005
|
||||
@@ -232,7 +232,7 @@
|
||||
print_vfs_message (_("fish: Waiting for initial line..."));
|
||||
if (!vfs_s_get_line (me, SUP.sockr, answer, sizeof (answer), ':'))
|
||||
ERRNOR (E_PROTO, -1);
|
||||
- print_vfs_message (answer);
|
||||
+ print_vfs_message ("%s", answer);
|
||||
if (strstr (answer, "assword")) {
|
||||
|
||||
/* Currently, this does not work. ssh reads passwords from
|
||||
@ -1,28 +0,0 @@
|
||||
$OpenBSD: patch-vfs_sfs_c,v 1.1 2005/02/17 21:59:11 robert Exp $
|
||||
--- vfs/sfs.c.orig Thu Feb 17 22:29:12 2005
|
||||
+++ vfs/sfs.c Thu Feb 17 22:31:11 2005
|
||||
@@ -343,13 +343,14 @@
|
||||
}
|
||||
|
||||
if (!semi){
|
||||
+invalid_line:
|
||||
fprintf (stderr, _("Warning: Invalid line in %s:\n%s\n"),
|
||||
"sfs.ini", key);
|
||||
continue;
|
||||
}
|
||||
|
||||
c = semi + 1;
|
||||
- while ((*c != ' ') && (*c != '\t')) {
|
||||
+ while (*c && (*c != ' ') && (*c != '\t')) {
|
||||
switch (*c) {
|
||||
case '1': flags |= F_1; break;
|
||||
case '2': flags |= F_2; break;
|
||||
@@ -360,6 +361,8 @@
|
||||
}
|
||||
c++;
|
||||
}
|
||||
+ if (!*c)
|
||||
+ goto invalid_line;
|
||||
c++;
|
||||
*(semi+1) = 0;
|
||||
if ((semi = strchr (c, '\n')))
|
||||
@ -1,4 +1,4 @@
|
||||
@comment $OpenBSD: PLIST,v 1.5 2004/09/15 17:54:16 espie Exp $
|
||||
@comment $OpenBSD: PLIST,v 1.6 2005/07/31 13:51:50 robert Exp $
|
||||
bin/mc
|
||||
bin/mcedit
|
||||
bin/mcmfmt
|
||||
@ -141,18 +141,23 @@ share/mc/mc.menu.sr
|
||||
share/mc/syntax/
|
||||
share/mc/syntax/Syntax
|
||||
share/mc/syntax/ada95.syntax
|
||||
share/mc/syntax/aspx.syntax
|
||||
share/mc/syntax/assembler.syntax
|
||||
share/mc/syntax/c.syntax
|
||||
share/mc/syntax/changelog.syntax
|
||||
share/mc/syntax/cs.syntax
|
||||
share/mc/syntax/diff.syntax
|
||||
share/mc/syntax/dos.syntax
|
||||
share/mc/syntax/eiffel.syntax
|
||||
share/mc/syntax/fortran.syntax
|
||||
share/mc/syntax/html.syntax
|
||||
share/mc/syntax/idl.syntax
|
||||
share/mc/syntax/java.syntax
|
||||
share/mc/syntax/js.syntax
|
||||
share/mc/syntax/latex.syntax
|
||||
share/mc/syntax/lisp.syntax
|
||||
share/mc/syntax/lsm.syntax
|
||||
share/mc/syntax/lua.syntax
|
||||
share/mc/syntax/m4.syntax
|
||||
share/mc/syntax/mail.syntax
|
||||
share/mc/syntax/makefile.syntax
|
||||
@ -163,6 +168,7 @@ share/mc/syntax/pascal.syntax
|
||||
share/mc/syntax/perl.syntax
|
||||
share/mc/syntax/php.syntax
|
||||
share/mc/syntax/po.syntax
|
||||
share/mc/syntax/povray.syntax
|
||||
share/mc/syntax/python.syntax
|
||||
share/mc/syntax/ruby.syntax
|
||||
share/mc/syntax/sh.syntax
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user