Accepting request 373560 from Base:System
1 OBS-URL: https://build.opensuse.org/request/show/373560 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/mc?expand=0&rev=66
This commit is contained in:
commit
adaecf5139
@ -2,7 +2,7 @@ Index: src/vfs/ftpfs/ftpfs.c
|
|||||||
===================================================================
|
===================================================================
|
||||||
--- src/vfs/ftpfs/ftpfs.c.orig
|
--- src/vfs/ftpfs/ftpfs.c.orig
|
||||||
+++ src/vfs/ftpfs/ftpfs.c
|
+++ src/vfs/ftpfs/ftpfs.c
|
||||||
@@ -1987,7 +1987,7 @@ ftpfs_chmod (struct vfs_class *me, const
|
@@ -2019,7 +2019,7 @@ ftpfs_chmod (struct vfs_class *me, const
|
||||||
|
|
||||||
g_snprintf (buf, sizeof (buf), "SITE CHMOD %4.4o /%%s", (int) (mode & 07777));
|
g_snprintf (buf, sizeof (buf), "SITE CHMOD %4.4o /%%s", (int) (mode & 07777));
|
||||||
|
|
||||||
|
@ -1,2 +0,0 @@
|
|||||||
f74e3da70410975cdeb27ee9a66d1dd812250b6d3ede364bca728dd5a48e5471 mc-4.8.15.tar.bz2
|
|
||||||
cf4e8f5dfe419830d56ca7e5f2495898e37ebcd05da1e47ff7041446c87fba16 mc-4.8.15.tar.xz
|
|
@ -1,3 +0,0 @@
|
|||||||
version https://git-lfs.github.com/spec/v1
|
|
||||||
oid sha256:cf4e8f5dfe419830d56ca7e5f2495898e37ebcd05da1e47ff7041446c87fba16
|
|
||||||
size 2304812
|
|
2
mc-4.8.16.sha256
Normal file
2
mc-4.8.16.sha256
Normal file
@ -0,0 +1,2 @@
|
|||||||
|
c37ea495df93f6d375a3ce59cdcf0f3a3690338526205347b03a316daebdaaf8 mc-4.8.16.tar.bz2
|
||||||
|
bbbcbe3097d3160f865d24aa38ff122f1c59752b5ef153ca4ade5ac0f82b7020 mc-4.8.16.tar.xz
|
3
mc-4.8.16.tar.xz
Normal file
3
mc-4.8.16.tar.xz
Normal file
@ -0,0 +1,3 @@
|
|||||||
|
version https://git-lfs.github.com/spec/v1
|
||||||
|
oid sha256:bbbcbe3097d3160f865d24aa38ff122f1c59752b5ef153ca4ade5ac0f82b7020
|
||||||
|
size 2387724
|
@ -1,6 +1,6 @@
|
|||||||
--- lib/util.c.orig 2014-09-05 20:50:09.000000000 +0200
|
--- lib/util.c.orig 2014-09-05 20:50:09.000000000 +0200
|
||||||
+++ lib/util.c 2014-09-05 20:51:02.000000000 +0200
|
+++ lib/util.c 2014-09-05 20:51:02.000000000 +0200
|
||||||
@@ -748,6 +748,8 @@ strip_ctrl_codes (char *s)
|
@@ -752,6 +752,8 @@ strip_ctrl_codes (char *s)
|
||||||
while (*(++r) != '\0' && strchr ("0123456789;:?", *r) != NULL)
|
while (*(++r) != '\0' && strchr ("0123456789;:?", *r) != NULL)
|
||||||
;
|
;
|
||||||
}
|
}
|
||||||
|
@ -1,6 +1,6 @@
|
|||||||
--- misc/mc.ext.in.orig 2012-12-11 01:04:32.000000000 +0400
|
--- misc/mc.ext.in.orig 2012-12-11 01:04:32.000000000 +0400
|
||||||
+++ misc/mc.ext.in 2013-03-10 10:59:02.741159661 +0400
|
+++ misc/mc.ext.in 2013-03-10 10:59:02.741159661 +0400
|
||||||
@@ -433,16 +433,19 @@
|
@@ -467,16 +467,19 @@
|
||||||
### Sound files ###
|
### Sound files ###
|
||||||
|
|
||||||
regex/i/\.(wav|snd|voc|au|smp|aiff|snd|m4a|ape|aac|wv)$
|
regex/i/\.(wav|snd|voc|au|smp|aiff|snd|m4a|ape|aac|wv)$
|
||||||
@ -21,7 +21,7 @@
|
|||||||
View=%view{ascii} @EXTHELPERSDIR@/sound.sh view mp3
|
View=%view{ascii} @EXTHELPERSDIR@/sound.sh view mp3
|
||||||
|
|
||||||
regex/i/\.og[gax]$
|
regex/i/\.og[gax]$
|
||||||
@@ -450,15 +453,22 @@
|
@@ -484,15 +484,22 @@
|
||||||
View=%view{ascii} @EXTHELPERSDIR@/sound.sh view ogg
|
View=%view{ascii} @EXTHELPERSDIR@/sound.sh view ogg
|
||||||
|
|
||||||
regex/i/\.(spx|flac)$
|
regex/i/\.(spx|flac)$
|
||||||
|
@ -1,72 +1,72 @@
|
|||||||
diff -ru1 misc/ext.d.orig/archive.sh misc/ext.d/archive.sh
|
diff -ru1 misc/ext.d.orig/archive.sh misc/ext.d/archive.sh
|
||||||
--- misc/ext.d.orig/archive.sh 2012-12-27 12:13:20.000000000 +0400
|
--- misc/ext.d.orig/archive.sh 2012-12-27 12:13:20.000000000 +0400
|
||||||
+++ misc/ext.d/archive.sh 2013-03-10 09:01:31.154705008 +0400
|
+++ misc/ext.d/archive.sh 2013-03-10 09:01:31.154705008 +0400
|
||||||
@@ -145,3 +145,3 @@
|
@@ -173,3 +173,3 @@
|
||||||
open)
|
open)
|
||||||
- ("${MC_XDG_OPEN}" "${MC_EXT_FILENAME}" >/dev/null 2>&1 &) || \
|
- ("${MC_XDG_OPEN}" "${MC_EXT_FILENAME}" >/dev/null 2>&1) || \
|
||||||
+ [ -n "$DISPLAY" ] && ("${MC_XDG_OPEN}" "${MC_EXT_FILENAME}" >/dev/null 2>&1 &) || \
|
+ test -n "$DISPLAY" && ("${MC_XDG_OPEN}" "${MC_EXT_FILENAME}" >/dev/null 2>&1) || \
|
||||||
do_open_action "${filetype}" "${pager}"
|
do_open_action "${filetype}" "${pager}"
|
||||||
diff -ru1 misc/ext.d.orig/doc.sh.in misc/ext.d/doc.sh.in
|
diff -ru1 misc/ext.d.orig/doc.sh.in misc/ext.d/doc.sh.in
|
||||||
--- misc/ext.d.orig/doc.sh.in 2012-12-27 12:13:20.000000000 +0400
|
--- misc/ext.d.orig/doc.sh.in 2012-12-27 12:13:20.000000000 +0400
|
||||||
+++ misc/ext.d/doc.sh.in 2013-03-10 09:01:48.230710602 +0400
|
+++ misc/ext.d/doc.sh.in 2013-03-10 09:01:48.230710602 +0400
|
||||||
@@ -189,3 +189,3 @@
|
@@ -190,3 +190,3 @@
|
||||||
open)
|
open)
|
||||||
- ("${MC_XDG_OPEN}" "${MC_EXT_FILENAME}" >/dev/null 2>&1 &) || \
|
- ("${MC_XDG_OPEN}" "${MC_EXT_FILENAME}" >/dev/null 2>&1) || \
|
||||||
+ [ -n "$DISPLAY" ] && ("${MC_XDG_OPEN}" "${MC_EXT_FILENAME}" >/dev/null 2>&1 &) || \
|
+ test -n "$DISPLAY" && ("${MC_XDG_OPEN}" "${MC_EXT_FILENAME}" >/dev/null 2>&1) || \
|
||||||
do_open_action "${filetype}"
|
do_open_action "${filetype}"
|
||||||
diff -ru1 misc/ext.d.orig/image.sh misc/ext.d/image.sh
|
diff -ru1 misc/ext.d.orig/image.sh misc/ext.d/image.sh
|
||||||
--- misc/ext.d.orig/image.sh 2012-12-27 12:13:20.000000000 +0400
|
--- misc/ext.d.orig/image.sh 2012-12-27 12:13:20.000000000 +0400
|
||||||
+++ misc/ext.d/image.sh 2013-03-10 09:02:00.086714848 +0400
|
+++ misc/ext.d/image.sh 2013-03-10 09:02:00.086714848 +0400
|
||||||
@@ -56,3 +56,3 @@
|
@@ -57,3 +57,3 @@
|
||||||
open)
|
open)
|
||||||
- ("${MC_XDG_OPEN}" "${MC_EXT_FILENAME}" >/dev/null 2>&1 &) || \
|
- ("${MC_XDG_OPEN}" "${MC_EXT_FILENAME}" >/dev/null 2>&1) || \
|
||||||
+ [ -n "$DISPLAY" ] && ("${MC_XDG_OPEN}" "${MC_EXT_FILENAME}" >/dev/null 2>&1 &) || \
|
+ test -n "$DISPLAY" && ("${MC_XDG_OPEN}" "${MC_EXT_FILENAME}" >/dev/null 2>&1) || \
|
||||||
do_open_action "${filetype}"
|
do_open_action "${filetype}"
|
||||||
diff -ru1 misc/ext.d.orig/misc.sh.in misc/ext.d/misc.sh.in
|
diff -ru1 misc/ext.d.orig/misc.sh.in misc/ext.d/misc.sh.in
|
||||||
--- misc/ext.d.orig/misc.sh.in 2012-12-27 12:13:20.000000000 +0400
|
--- misc/ext.d.orig/misc.sh.in 2012-12-27 12:13:20.000000000 +0400
|
||||||
+++ misc/ext.d/misc.sh.in 2013-03-10 09:02:13.470718625 +0400
|
+++ misc/ext.d/misc.sh.in 2013-03-10 09:02:13.470718625 +0400
|
||||||
@@ -90,3 +90,3 @@
|
@@ -96,3 +96,3 @@
|
||||||
open)
|
open)
|
||||||
- ("${MC_XDG_OPEN}" "${MC_EXT_FILENAME}" >/dev/null 2>&1 &) || \
|
- ("${MC_XDG_OPEN}" "${MC_EXT_FILENAME}" >/dev/null 2>&1) || \
|
||||||
+ [ -n "$DISPLAY" ] && ("${MC_XDG_OPEN}" "${MC_EXT_FILENAME}" >/dev/null 2>&1 &) || \
|
+ test -n "$DISPLAY" && ("${MC_XDG_OPEN}" "${MC_EXT_FILENAME}" >/dev/null 2>&1) || \
|
||||||
do_open_action "${filetype}"
|
do_open_action "${filetype}"
|
||||||
diff -ru1 misc/ext.d.orig/package.sh misc/ext.d/package.sh
|
diff -ru1 misc/ext.d.orig/package.sh misc/ext.d/package.sh
|
||||||
--- misc/ext.d.orig/package.sh 2012-12-27 12:13:20.000000000 +0400
|
--- misc/ext.d.orig/package.sh 2012-12-27 12:13:20.000000000 +0400
|
||||||
+++ misc/ext.d/package.sh 2013-03-10 09:02:23.630723087 +0400
|
+++ misc/ext.d/package.sh 2013-03-10 09:02:23.630723087 +0400
|
||||||
@@ -53,3 +53,3 @@
|
@@ -53,3 +53,3 @@
|
||||||
open)
|
open)
|
||||||
- ("${MC_XDG_OPEN}" "${MC_EXT_FILENAME}" >/dev/null 2>&1 &) || \
|
- ("${MC_XDG_OPEN}" "${MC_EXT_FILENAME}" >/dev/null 2>&1) || \
|
||||||
+ [ -n "$DISPLAY" ] && ("${MC_XDG_OPEN}" "${MC_EXT_FILENAME}" >/dev/null 2>&1 &) || \
|
+ test -n "$DISPLAY" && ("${MC_XDG_OPEN}" "${MC_EXT_FILENAME}" >/dev/null 2>&1) || \
|
||||||
do_open_action "${filetype}"
|
do_open_action "${filetype}"
|
||||||
diff -ru1 misc/ext.d.orig/sound.sh misc/ext.d/sound.sh
|
diff -ru1 misc/ext.d.orig/sound.sh misc/ext.d/sound.sh
|
||||||
--- misc/ext.d.orig/sound.sh 2012-12-27 12:13:20.000000000 +0400
|
--- misc/ext.d.orig/sound.sh 2012-12-27 12:13:20.000000000 +0400
|
||||||
+++ misc/ext.d/sound.sh 2013-03-10 09:02:31.222725342 +0400
|
+++ misc/ext.d/sound.sh 2013-03-10 09:02:31.222725342 +0400
|
||||||
@@ -86,3 +86,3 @@
|
@@ -105,3 +105,3 @@
|
||||||
open)
|
open)
|
||||||
- ("${MC_XDG_OPEN}" "${MC_EXT_FILENAME}" >/dev/null 2>&1 &) || \
|
- ("${MC_XDG_OPEN}" "${MC_EXT_FILENAME}" >/dev/null 2>&1) || \
|
||||||
+ [ -n "$DISPLAY" ] && ("${MC_XDG_OPEN}" "${MC_EXT_FILENAME}" >/dev/null 2>&1 &) || \
|
+ test -n "$DISPLAY" && ("${MC_XDG_OPEN}" "${MC_EXT_FILENAME}" >/dev/null 2>&1) || \
|
||||||
do_open_action "${filetype}"
|
do_open_action "${filetype}"
|
||||||
diff -ru1 misc/ext.d.orig/text.sh.in misc/ext.d/text.sh.in
|
diff -ru1 misc/ext.d.orig/text.sh.in misc/ext.d/text.sh.in
|
||||||
--- misc/ext.d.orig/text.sh.in 2012-12-27 12:13:20.000000000 +0400
|
--- misc/ext.d.orig/text.sh.in 2012-12-27 12:13:20.000000000 +0400
|
||||||
+++ misc/ext.d/text.sh.in 2013-03-10 09:02:39.018727707 +0400
|
+++ misc/ext.d/text.sh.in 2013-03-10 09:02:39.018727707 +0400
|
||||||
@@ -135,3 +135,3 @@
|
@@ -143,3 +143,3 @@
|
||||||
open)
|
open)
|
||||||
- ("${MC_XDG_OPEN}" "${MC_EXT_FILENAME}" >/dev/null 2>&1 &) || \
|
- ("${MC_XDG_OPEN}" "${MC_EXT_FILENAME}" >/dev/null 2>&1) || \
|
||||||
+ [ -n "$DISPLAY" ] && ("${MC_XDG_OPEN}" "${MC_EXT_FILENAME}" >/dev/null 2>&1 &) || \
|
+ test -n "$DISPLAY" && ("${MC_XDG_OPEN}" "${MC_EXT_FILENAME}" >/dev/null 2>&1) || \
|
||||||
do_open_action "${filetype}" "${pager}"
|
do_open_action "${filetype}" "${pager}"
|
||||||
diff -ru1 misc/ext.d.orig/video.sh misc/ext.d/video.sh
|
diff -ru1 misc/ext.d.orig/video.sh misc/ext.d/video.sh
|
||||||
--- misc/ext.d.orig/video.sh 2012-12-27 12:13:20.000000000 +0400
|
--- misc/ext.d.orig/video.sh 2012-12-27 12:13:20.000000000 +0400
|
||||||
+++ misc/ext.d/video.sh 2013-03-10 09:02:48.414731630 +0400
|
+++ misc/ext.d/video.sh 2013-03-10 09:02:48.414731630 +0400
|
||||||
@@ -45,3 +45,3 @@
|
@@ -62,3 +62,3 @@
|
||||||
open)
|
open)
|
||||||
- ("${MC_XDG_OPEN}" "${MC_EXT_FILENAME}" >/dev/null 2>&1 &) || \
|
- ("${MC_XDG_OPEN}" "${MC_EXT_FILENAME}" >/dev/null 2>&1) || \
|
||||||
+ [ -n "$DISPLAY" ] && ("${MC_XDG_OPEN}" "${MC_EXT_FILENAME}" >/dev/null 2>&1 &) || \
|
+ test -n "$DISPLAY" && ("${MC_XDG_OPEN}" "${MC_EXT_FILENAME}" >/dev/null 2>&1) || \
|
||||||
do_open_action "${filetype}"
|
do_open_action "${filetype}"
|
||||||
diff -ru1 misc/ext.d.orig/web.sh.in misc/ext.d/web.sh.in
|
diff -ru1 misc/ext.d.orig/web.sh.in misc/ext.d/web.sh.in
|
||||||
--- misc/ext.d.orig/web.sh.in 2012-12-27 12:13:20.000000000 +0400
|
--- misc/ext.d.orig/web.sh.in 2012-12-27 12:13:20.000000000 +0400
|
||||||
+++ misc/ext.d/web.sh.in 2013-03-10 09:02:56.670734093 +0400
|
+++ misc/ext.d/web.sh.in 2013-03-10 09:02:56.670734093 +0400
|
||||||
@@ -48,3 +48,3 @@
|
@@ -48,3 +48,3 @@
|
||||||
open)
|
open)
|
||||||
- ("${MC_XDG_OPEN}" "${MC_EXT_FILENAME}" >/dev/null 2>&1 &) || \
|
- ("${MC_XDG_OPEN}" "${MC_EXT_FILENAME}" >/dev/null 2>&1) || \
|
||||||
+ [ -n "$DISPLAY" ] && ("${MC_XDG_OPEN}" "${MC_EXT_FILENAME}" >/dev/null 2>&1 &) || \
|
+ test -n "$DISPLAY" && ("${MC_XDG_OPEN}" "${MC_EXT_FILENAME}" >/dev/null 2>&1) || \
|
||||||
do_open_action "${filetype}"
|
do_open_action "${filetype}"
|
||||||
|
@ -2,7 +2,7 @@ Index: lib/tty/key.c
|
|||||||
===================================================================
|
===================================================================
|
||||||
--- lib/tty/key.c.orig 2010-07-05 21:12:51.000000000 +0200
|
--- lib/tty/key.c.orig 2010-07-05 21:12:51.000000000 +0200
|
||||||
+++ lib/tty/key.c 2010-07-07 11:35:25.871011522 +0200
|
+++ lib/tty/key.c 2010-07-07 11:35:25.871011522 +0200
|
||||||
@@ -273,6 +273,11 @@ static key_define_t xterm_key_defines[]
|
@@ -300,6 +300,11 @@ static key_define_t xterm_key_defines[]
|
||||||
{KEY_F (9), ESC_STR "[20~", MCKEY_NOACTION},
|
{KEY_F (9), ESC_STR "[20~", MCKEY_NOACTION},
|
||||||
{KEY_F (10), ESC_STR "[21~", MCKEY_NOACTION},
|
{KEY_F (10), ESC_STR "[21~", MCKEY_NOACTION},
|
||||||
|
|
||||||
|
@ -18,7 +18,7 @@ Index: m4.include/mc-with-screen-ncurses.m4
|
|||||||
fi
|
fi
|
||||||
|
|
||||||
saved_CPPFLAGS="$CPPFLAGS"
|
saved_CPPFLAGS="$CPPFLAGS"
|
||||||
@@ -30,9 +37,6 @@ AC_DEFUN([MC_CHECK_NCURSES_BY_PATH], [
|
@@ -32,9 +39,6 @@ AC_DEFUN([MC_CHECK_NCURSES_BY_PATH], [
|
||||||
if test x"$ac_ncurses_inc_path" = x; then
|
if test x"$ac_ncurses_inc_path" = x; then
|
||||||
ac_ncurses_inc_path="-I/usr/include"
|
ac_ncurses_inc_path="-I/usr/include"
|
||||||
fi
|
fi
|
||||||
|
@ -8,7 +8,7 @@ Index: mc-4.8.11/lib/tty/key.c
|
|||||||
===================================================================
|
===================================================================
|
||||||
--- mc-4.8.11.orig/lib/tty/key.c 2014-01-01 19:47:50.000000000 +0000
|
--- mc-4.8.11.orig/lib/tty/key.c 2014-01-01 19:47:50.000000000 +0000
|
||||||
+++ mc-4.8.11/lib/tty/key.c 2014-01-01 19:47:50.000000000 +0000
|
+++ mc-4.8.11/lib/tty/key.c 2014-01-01 19:47:50.000000000 +0000
|
||||||
@@ -1027,10 +1027,13 @@ correct_key_code (int code)
|
@@ -1029,10 +1029,13 @@ correct_key_code (int code)
|
||||||
mod = KEY_M_SHIFT;
|
mod = KEY_M_SHIFT;
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -23,7 +23,7 @@ Index: mc-4.8.11/lib/tty/key.c
|
|||||||
/*
|
/*
|
||||||
* We are not interested if Ctrl was pressed when entering control
|
* We are not interested if Ctrl was pressed when entering control
|
||||||
* characters, so assume that it was. When checking for such keys,
|
* characters, so assume that it was. When checking for such keys,
|
||||||
@@ -1116,6 +1119,16 @@ correct_key_code (int code)
|
@@ -1118,6 +1121,16 @@ correct_key_code (int code)
|
||||||
mod &= ~KEY_M_SHIFT;
|
mod &= ~KEY_M_SHIFT;
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -40,7 +40,7 @@ Index: mc-4.8.11/lib/tty/key.c
|
|||||||
if (!mc_global.tty.alternate_plus_minus)
|
if (!mc_global.tty.alternate_plus_minus)
|
||||||
switch (c)
|
switch (c)
|
||||||
{
|
{
|
||||||
@@ -1919,7 +1932,7 @@ get_key_code (int no_delay)
|
@@ -1923,7 +1936,7 @@ get_key_code (int no_delay)
|
||||||
{
|
{
|
||||||
/* Convert escape-digits to F-keys */
|
/* Convert escape-digits to F-keys */
|
||||||
if (g_ascii_isdigit (c))
|
if (g_ascii_isdigit (c))
|
||||||
|
@ -1,7 +1,7 @@
|
|||||||
diff -ru mc-4.8.10.orig/src/vfs/smbfs/helpers/lib/util.c mc-4.8.10/src/vfs/smbfs/helpers/lib/util.c
|
diff -ru mc-4.8.10.orig/src/vfs/smbfs/helpers/lib/util.c mc-4.8.10/src/vfs/smbfs/helpers/lib/util.c
|
||||||
--- mc-4.8.10.orig/src/vfs/smbfs/helpers/lib/util.c 2013-06-25 23:29:14.000000000 +0200
|
--- mc-4.8.10.orig/src/vfs/smbfs/helpers/lib/util.c 2013-06-25 23:29:14.000000000 +0200
|
||||||
+++ mc-4.8.10/src/vfs/smbfs/helpers/lib/util.c 2013-09-27 12:04:27.306008996 +0200
|
+++ mc-4.8.10/src/vfs/smbfs/helpers/lib/util.c 2013-09-27 12:04:27.306008996 +0200
|
||||||
@@ -1841,11 +1841,13 @@
|
@@ -1842,11 +1842,13 @@
|
||||||
/* Ensure null termination. */
|
/* Ensure null termination. */
|
||||||
hostname[sizeof (hostname) - 1] = '\0';
|
hostname[sizeof (hostname) - 1] = '\0';
|
||||||
|
|
||||||
@ -20,7 +20,7 @@ diff -ru mc-4.8.10.orig/src/vfs/smbfs/helpers/lib/util.c mc-4.8.10/src/vfs/smbfs
|
|||||||
}
|
}
|
||||||
|
|
||||||
if (my_name)
|
if (my_name)
|
||||||
@@ -2474,6 +2476,9 @@
|
@@ -2475,6 +2477,9 @@
|
||||||
return (ret);
|
return (ret);
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -30,7 +30,7 @@ diff -ru mc-4.8.10.orig/src/vfs/smbfs/helpers/lib/util.c mc-4.8.10/src/vfs/smbfs
|
|||||||
/* try with all lowercase */
|
/* try with all lowercase */
|
||||||
strlower (name2);
|
strlower (name2);
|
||||||
ret = sys_gethostbyname (name2);
|
ret = sys_gethostbyname (name2);
|
||||||
@@ -2491,6 +2496,7 @@
|
@@ -2492,6 +2497,7 @@
|
||||||
free (name2);
|
free (name2);
|
||||||
return (ret);
|
return (ret);
|
||||||
}
|
}
|
||||||
|
@ -1,7 +1,7 @@
|
|||||||
diff -rup mc-4.8.11.orig/src/filemanager/file.c mc-4.8.11/src/filemanager/file.c
|
diff -rup mc-4.8.11.orig/src/filemanager/file.c mc-4.8.11/src/filemanager/file.c
|
||||||
--- mc-4.8.11.orig/src/filemanager/file.c 2013-11-29 19:27:07.000000000 +0100
|
--- mc-4.8.11.orig/src/filemanager/file.c 2013-11-29 19:27:07.000000000 +0100
|
||||||
+++ mc-4.8.11/src/filemanager/file.c 2014-01-14 00:09:30.540439661 +0100
|
+++ mc-4.8.11/src/filemanager/file.c 2014-01-14 00:09:30.540439661 +0100
|
||||||
@@ -1914,6 +1914,8 @@ copy_file_file (FileOpTotalContext * tct
|
@@ -1923,6 +1923,8 @@ copy_file_file (FileOpTotalContext * tct
|
||||||
continue;
|
continue;
|
||||||
if (temp_status == FILE_ABORT)
|
if (temp_status == FILE_ABORT)
|
||||||
return_status = temp_status;
|
return_status = temp_status;
|
||||||
@ -10,7 +10,7 @@ diff -rup mc-4.8.11.orig/src/filemanager/file.c mc-4.8.11/src/filemanager/file.c
|
|||||||
if (temp_status == FILE_SKIPALL)
|
if (temp_status == FILE_SKIPALL)
|
||||||
ctx->skip_all = TRUE;
|
ctx->skip_all = TRUE;
|
||||||
break;
|
break;
|
||||||
@@ -1924,6 +1926,8 @@ copy_file_file (FileOpTotalContext * tct
|
@@ -1933,6 +1933,8 @@ copy_file_file (FileOpTotalContext * tct
|
||||||
temp_status = file_error (_("Cannot close target file \"%s\"\n%s"), dst_path);
|
temp_status = file_error (_("Cannot close target file \"%s\"\n%s"), dst_path);
|
||||||
if (temp_status == FILE_RETRY)
|
if (temp_status == FILE_RETRY)
|
||||||
continue;
|
continue;
|
||||||
@ -19,7 +19,7 @@ diff -rup mc-4.8.11.orig/src/filemanager/file.c mc-4.8.11/src/filemanager/file.c
|
|||||||
if (temp_status == FILE_SKIPALL)
|
if (temp_status == FILE_SKIPALL)
|
||||||
ctx->skip_all = TRUE;
|
ctx->skip_all = TRUE;
|
||||||
return_status = temp_status;
|
return_status = temp_status;
|
||||||
@@ -1957,10 +1961,10 @@ copy_file_file (FileOpTotalContext * tct
|
@@ -1959,10 +1959,10 @@ copy_file_file (FileOpTotalContext * tct
|
||||||
if (temp_status == FILE_SKIPALL)
|
if (temp_status == FILE_SKIPALL)
|
||||||
{
|
{
|
||||||
ctx->skip_all = TRUE;
|
ctx->skip_all = TRUE;
|
||||||
@ -32,7 +32,7 @@ diff -rup mc-4.8.11.orig/src/filemanager/file.c mc-4.8.11/src/filemanager/file.c
|
|||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -1977,10 +1981,10 @@ copy_file_file (FileOpTotalContext * tct
|
@@ -1979,10 +1979,10 @@ copy_file_file (FileOpTotalContext * tct
|
||||||
if (temp_status == FILE_SKIPALL)
|
if (temp_status == FILE_SKIPALL)
|
||||||
{
|
{
|
||||||
ctx->skip_all = TRUE;
|
ctx->skip_all = TRUE;
|
||||||
|
64
mc.changes
64
mc.changes
@ -1,3 +1,67 @@
|
|||||||
|
-------------------------------------------------------------------
|
||||||
|
Mon Mar 14 03:27:15 UTC 2016 - dnh@opensuse.org
|
||||||
|
|
||||||
|
- Update to 4.8.16:
|
||||||
|
|
||||||
|
Core
|
||||||
|
|
||||||
|
Support for ash + bugfixes for bash, fish (#2742)
|
||||||
|
Find file: empty file name matches any file name (#3593)
|
||||||
|
Find file: empty value of "Content" is used instead of "Search for content" checkbox to disable search for content (#3594)
|
||||||
|
Listbox: don't wraparound on mouse scroll (#3554)
|
||||||
|
Internals:
|
||||||
|
Listbox: various fixups (#3569: #3562, #3563, #3565, #3161)
|
||||||
|
Split MSG_ACTION into MSG_ACTION and MSG_NOTIFY (#3566)
|
||||||
|
|
||||||
|
VFS
|
||||||
|
|
||||||
|
Support lzip compression format (#2673, #1541)
|
||||||
|
Support lz4 compression format (#3523)
|
||||||
|
patchfs: support xz compression (#3443)
|
||||||
|
Update uc1541 version (#3527)
|
||||||
|
Add mc.ext patterns for initramfs / initrd (#3115)
|
||||||
|
|
||||||
|
Editor
|
||||||
|
|
||||||
|
Add golang syntax (MidnightCommander?/mc#84)
|
||||||
|
Update Puppet syntax (MidnightCommander?/mc#86)
|
||||||
|
|
||||||
|
Misc
|
||||||
|
|
||||||
|
Code cleanup (#3555, #3547, #3587)
|
||||||
|
Better subshell documentation (#3556)
|
||||||
|
Fixes to the English man pages by Denys Vlasenko
|
||||||
|
|
||||||
|
Fixes
|
||||||
|
|
||||||
|
Insufficient quoting in mc.menu (#2947)
|
||||||
|
Broken ./configure --without-internal-edit (#3601)
|
||||||
|
Memory leaks (#3547, #3561, #3567, #3572)
|
||||||
|
No preallocation if appending during file copy (#3577)
|
||||||
|
Cannot set mini-format for "brief" listing type (#3588)
|
||||||
|
Info panel: incorrect inode information in some cases (#3214)
|
||||||
|
Info panel: wrong device name with symbolic link (#3412)
|
||||||
|
Info panel: buffer overflow (#3582)
|
||||||
|
Regression: match filename, not full path in mc.ext (#3578)
|
||||||
|
Broken case insensitive search in non-unicode locale (#3491)
|
||||||
|
Error message prefixed with no sense "0:" (#3269)
|
||||||
|
mcedit: buffer overflow (#3579)
|
||||||
|
mcedit: "Lower case selection" command in User Menu (#3586)
|
||||||
|
mcedit: close on ctrl-g (#3557)
|
||||||
|
mcview: "Not found" result isn't reported in some cases (#3543)
|
||||||
|
VFS: isofs doesn't show .dotfiles (#3537)
|
||||||
|
VFS: isofs: cannot copy file from iso when Joliet without RockRidge? is used (#2851)
|
||||||
|
VFS: extfs/unzip: enter into zip file fails with "inconsistent extfs archive" (#3433)
|
||||||
|
VFS: SFTP: various bugs (#3581)
|
||||||
|
VFS: FISH: provide major/minor info for block/char devices (#3599)
|
||||||
|
Bashism in gitfs+ extfs helper (#3379)
|
||||||
|
Non-portable invocation of man (#3509)
|
||||||
|
mc-wrapper leaves MC_USER set (#3550)
|
||||||
|
Broken silent opening of files in background (#3574)
|
||||||
|
Run identify on JPEGs even if exif is not installed (#3568)
|
||||||
|
|
||||||
|
- rebased a bunch of patches
|
||||||
|
|
||||||
-------------------------------------------------------------------
|
-------------------------------------------------------------------
|
||||||
Mon Nov 9 12:14:47 UTC 2015 - astieger@suse.com
|
Mon Nov 9 12:14:47 UTC 2015 - astieger@suse.com
|
||||||
|
|
||||||
|
4
mc.spec
4
mc.spec
@ -1,7 +1,7 @@
|
|||||||
#
|
#
|
||||||
# spec file for package mc
|
# spec file for package mc
|
||||||
#
|
#
|
||||||
# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany.
|
# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany.
|
||||||
#
|
#
|
||||||
# All modifications and additions to the file contributed by third parties
|
# All modifications and additions to the file contributed by third parties
|
||||||
# remain the property of their copyright owners, unless otherwise agreed
|
# remain the property of their copyright owners, unless otherwise agreed
|
||||||
@ -21,7 +21,7 @@ Summary: Midnight Commander
|
|||||||
License: GPL-3.0+
|
License: GPL-3.0+
|
||||||
Group: Productivity/File utilities
|
Group: Productivity/File utilities
|
||||||
Url: http://midnight-commander.org/
|
Url: http://midnight-commander.org/
|
||||||
Version: 4.8.15
|
Version: 4.8.16
|
||||||
Release: 0
|
Release: 0
|
||||||
|
|
||||||
#Git-Clone: git://github.com/MidnightCommander/mc
|
#Git-Clone: git://github.com/MidnightCommander/mc
|
||||||
|
Loading…
x
Reference in New Issue
Block a user