[Pkg-mc-commits] r222 - in branch/cdbs/debian: . patches patches/bugs patches/debian
Patrick Winnertz
winnie at alioth.debian.org
Wed Aug 5 14:54:13 UTC 2009
Author: winnie
Date: 2009-08-05 14:54:13 +0000 (Wed, 05 Aug 2009)
New Revision: 222
Added:
branch/cdbs/debian/mc.install.linux
branch/cdbs/debian/patches/bugs/1392_regression_in_tar_support.patch
branch/cdbs/debian/patches/bugs/1404_ctrl-c_kills_mc.patch
branch/cdbs/debian/patches/bugs/1415_hotlist_buffer_cleanup.patch
branch/cdbs/debian/patches/bugs/1453_fix_crash_on_f14.patch
branch/cdbs/debian/patches/bugs/1456_fix_mcedit_regex_replace_segfault.patch
branch/cdbs/debian/patches/debian/03_use_awk.patch
Modified:
branch/cdbs/debian/changelog
branch/cdbs/debian/patches/series
branch/cdbs/debian/rules
Log:
Several bugs fixed
Modified: branch/cdbs/debian/changelog
===================================================================
--- branch/cdbs/debian/changelog 2009-08-04 16:21:55 UTC (rev 221)
+++ branch/cdbs/debian/changelog 2009-08-05 14:54:13 UTC (rev 222)
@@ -5,8 +5,16 @@
[ Patrick Winnertz ]
* Install cons.saver only on linux not on kfreeBSD (Closes: #539913)
+ * Added small patch to use awk instead of mawk in the extfs shell scripts (Closes: #499723)
+ * Added patch for fixing hotlist entries (Closes: #539967)
+ * Fixed several upstream known problems
+ - bugs/1392_regression_in_tar_support.patch
+ - bugs/1453_fix_crash_on_f14.patch
+ - bugs/1404_ctrl-c_kills_mc.patch
+ - bugs71456_fix_mcedit_regex_replace_segfault.patch
+ - bugs/1415_hotlist_buffer_cleanup.patch
- -- Patrick Winnertz <winnie at debian.org> Tue, 04 Aug 2009 18:17:02 +0200
+ -- Patrick Winnertz <winnie at debian.org> Wed, 05 Aug 2009 16:47:20 +0200
mc (2:4.7.0-pre1-1) unstable; urgency=low
Added: branch/cdbs/debian/mc.install.linux
===================================================================
--- branch/cdbs/debian/mc.install.linux (rev 0)
+++ branch/cdbs/debian/mc.install.linux 2009-08-05 14:54:13 UTC (rev 222)
@@ -0,0 +1,23 @@
+usr/bin/*
+usr/lib/mc/mc/mc* usr/share/mc/bin
+usr/lib/mc/mc/cons.saver
+etc/mc/mc.* etc/mc
+etc/mc/edit.indent.rc usr/share/mc
+etc/mc/extfs
+etc/mc/edit.spell.rc usr/share/mc
+etc/mc/cedit.menu usr/share/mc
+usr/share/mc/mc.h*
+usr/share/mc/extfs/*
+usr/share/mc/syntax/*
+etc/mc/Syntax
+usr/share/man/es/*
+usr/share/man/ru/*
+usr/share/man/pl/*
+usr/share/man/sr/*
+usr/share/man/it/*
+usr/share/man/hu/*
+usr/share/man/man1/*
+usr/share/locale/*
+usr/share/mc/mc.menu.sr
+./debian/extra/mcedit-debian usr/bin
+./debian/extra/mcview-debian usr/bin
Added: branch/cdbs/debian/patches/bugs/1392_regression_in_tar_support.patch
===================================================================
--- branch/cdbs/debian/patches/bugs/1392_regression_in_tar_support.patch (rev 0)
+++ branch/cdbs/debian/patches/bugs/1392_regression_in_tar_support.patch 2009-08-05 14:54:13 UTC (rev 222)
@@ -0,0 +1,71 @@
+commit ac2edf225e2dfa60804bf92b107fe240fe31e390
+Author: Mikhail S. Pobolovets <styx.mp at gmail.com>
+Date: Wed Jul 15 20:31:56 2009 +0300
+
+ Ticket #1392: regression in .tar support
+
+ Regression was introduced in lzma support
+ (a5ba27872979bc6a15418ec30d6d115e9ba92235)
+
+ All the heuristics stuff has been removed, only
+ LZMA utils 4.32.1 and later formats are supported.
+
+ Signed-off-by: Mikhail S. Pobolovets <styx.mp at gmail.com>
+
+diff --git a/src/util.c b/src/util.c
+index 28ebf45..51f579e 100644
+--- a/src/util.c
++++ b/src/util.c
+@@ -882,28 +882,21 @@ get_compression_type (int fd)
+ }
+ }
+
+- /* LZMA files; both LZMA_Alone and LZMA utils formats. The LZMA_Alone
+- * format is used by the LZMA_Alone tool from LZMA SDK. The LZMA utils
+- * format is the default format of LZMA utils 4.32.1 and later. */
+- if (magic[0] < 0xE1 || (magic[0] == 0xFF && magic[1] == 'L' &&
+- magic[2] == 'Z' && magic[3] == 'M')) {
+- if (mc_read (fd, (char *) magic + 4, 9) == 9) {
+- /* LZMA utils format */
+- if (magic[0] == 0xFF && magic[4] == 'A' && magic[5] == 0x00)
+- return COMPRESSION_LZMA;
+- /* The LZMA_Alone format has no magic bytes, thus we
+- * need to play a wizard. This can give false positives,
+- * thus the detection below should be removed when
+- * the newer LZMA utils format has got popular. */
+- if (magic[0] < 0xE1 && magic[4] < 0x20 &&
+- ((magic[10] == 0x00 && magic[11] == 0x00 &&
+- magic[12] == 0x00) ||
+- (magic[5] == 0xFF && magic[6] == 0xFF &&
+- magic[7] == 0xFF && magic[8] == 0xFF &&
+- magic[9] == 0xFF && magic[10] == 0xFF &&
+- magic[11] == 0xFF && magic[12] == 0xFF)))
+- return COMPRESSION_LZMA;
+- }
++ /* Support for LZMA (only utils format with magic in header).
++ * This is the default format of LZMA utils 4.32.1 and later. */
++
++ if (mc_read(fd, (char *) magic+4, 1) == 1)
++ {
++ /* LZMA utils format */
++ if
++ ( magic[0] == 0xFF
++ && magic[1] == 'L'
++ && magic[2] == 'Z'
++ && magic[3] == 'M'
++ && magic[4] == 'A'
++ && magic[5] == 0x00
++ )
++ return COMPRESSION_LZMA;
+ }
+
+ /* XZ compression magic */
+@@ -916,7 +909,7 @@ get_compression_type (int fd)
+ }
+ }
+
+- return 0;
++ return COMPRESSION_NONE;
+ }
+
+ const char *
Added: branch/cdbs/debian/patches/bugs/1404_ctrl-c_kills_mc.patch
===================================================================
--- branch/cdbs/debian/patches/bugs/1404_ctrl-c_kills_mc.patch (rev 0)
+++ branch/cdbs/debian/patches/bugs/1404_ctrl-c_kills_mc.patch 2009-08-05 14:54:13 UTC (rev 222)
@@ -0,0 +1,81 @@
+commit c6812961cc77ec6e4099f433bd0ba248c55fcf3a
+Author: Andrew Borodin <aborodin at vmail.ru>
+Date: Wed Jul 15 22:31:52 2009 +0400
+
+ Ticket #1404: Ctrl-C kills mc.
+
+ If MC built with --without-subshell option is run with -d option,
+ the Ctrl-C key combination closes MC. Such behaviour was introduced
+ in 66332a4fb1d3b9e7304a477eaa2dc8b5f9eb0e80 commit.
+
+ This commit actually restores the SIGINT signal handling which was
+ before 66332a4fb1d3b9e7304a477eaa2dc8b5f9eb0e80 commit.
+
+ Signed-off-by: Andrew Borodin <aborodin at vmail.ru>
+
+diff --git a/src/main.c b/src/main.c
+index 126f04c..72f3d71 100644
+--- a/src/main.c
++++ b/src/main.c
+@@ -2306,6 +2306,9 @@ main (int argc, char *argv[])
+ #ifdef HAVE_SLANG
+ slang_init ();
+ #endif
++
++ start_interrupt_key ();
++
+ /* NOTE: This call has to be after slang_init. It's the small part from
+ the previous init_key which had to be moved after the call of slang_init */
+ init_key_input_fd ();
+diff --git a/src/tty.c b/src/tty.c
+index ee50840..17edb88 100644
+--- a/src/tty.c
++++ b/src/tty.c
+@@ -70,15 +70,26 @@ sigintr_handler(int signo)
+ /*** public functions **************************************************/
+
+ extern void
++tty_start_interrupt_key(void)
++{
++ struct sigaction act;
++
++ act.sa_handler = sigintr_handler;
++ sigemptyset (&act.sa_mask);
++ act.sa_flags = SA_RESTART;
++ sigaction (SIGINT, &act, NULL);
++}
++
++extern void
+ tty_enable_interrupt_key(void)
+ {
+ struct sigaction act;
+
+- got_interrupt = 0;
+ act.sa_handler = sigintr_handler;
+ sigemptyset (&act.sa_mask);
+ act.sa_flags = 0;
+ sigaction (SIGINT, &act, NULL);
++ got_interrupt = 0;
+ }
+
+ extern void
+diff --git a/src/tty.h b/src/tty.h
+index b9b198d..23ad980 100644
+--- a/src/tty.h
++++ b/src/tty.h
+@@ -40,6 +40,7 @@
+
+ /* {{{ Input }}} */
+
++extern void tty_start_interrupt_key(void);
+ extern void tty_enable_interrupt_key(void);
+ extern void tty_disable_interrupt_key(void);
+ extern gboolean tty_got_interrupt(void);
+@@ -70,6 +71,7 @@ extern char *tty_tgetstr (const char *name);
+
+ /* legacy interface */
+
++#define start_interrupt_key() tty_start_interrupt_key()
+ #define enable_interrupt_key() tty_enable_interrupt_key()
+ #define disable_interrupt_key() tty_disable_interrupt_key()
+ #define got_interrupt() tty_got_interrupt()
Added: branch/cdbs/debian/patches/bugs/1415_hotlist_buffer_cleanup.patch
===================================================================
--- branch/cdbs/debian/patches/bugs/1415_hotlist_buffer_cleanup.patch (rev 0)
+++ branch/cdbs/debian/patches/bugs/1415_hotlist_buffer_cleanup.patch 2009-08-05 14:54:13 UTC (rev 222)
@@ -0,0 +1,24 @@
+commit 05b590d2251638b937d092084e533920f447248b
+Author: Mikhail S. Pobolovets <styx.mp at gmail.com>
+Date: Sat Aug 1 09:49:09 2009 +0300
+
+ Ticket #1415: Directory hotlist incorrect drawing fix
+
+ src/hotlist.c: buffer clean up has been added
+ original author: E.L.K.
+
+ Signed-off-by: Mikhail S. Pobolovets <styx.mp at gmail.com>
+
+diff --git a/src/hotlist.c b/src/hotlist.c
+index dd8dd04..9cd9774 100644
+--- a/src/hotlist.c
++++ b/src/hotlist.c
+@@ -228,6 +228,8 @@ static void fill_listbox (void)
+ switch (current->type) {
+ case HL_TYPE_GROUP:
+ {
++ /* buff clean up */
++ g_string_truncate(buff, 0);
+ g_string_append(buff,"->");
+ g_string_append(buff,current->label);
+ if (hotlist_state.moving)
Added: branch/cdbs/debian/patches/bugs/1453_fix_crash_on_f14.patch
===================================================================
--- branch/cdbs/debian/patches/bugs/1453_fix_crash_on_f14.patch (rev 0)
+++ branch/cdbs/debian/patches/bugs/1453_fix_crash_on_f14.patch 2009-08-05 14:54:13 UTC (rev 222)
@@ -0,0 +1,33 @@
+commit 3b1070fb3d29569b56932aca2268874c56e0d9fc
+Author: Ilia Maslakov <il.smind at gmail.com>
+Date: Mon Aug 3 15:37:55 2009 +0000
+
+ Ticket #1453 (crash mc on create new file in external editor (S-F4))
+
+ fix: crash mc when path is null on create new file in external editor
+
+diff --git a/vfs/vfs.c b/vfs/vfs.c
+index d624347..d6f7bfc 100644
+--- a/vfs/vfs.c
++++ b/vfs/vfs.c
+@@ -496,7 +496,7 @@ char *
+ vfs_translate_path_n (const char *path)
+ {
+ char *result;
+-
++
+ result = vfs_translate_path (path);
+ return (result != NULL) ? g_strdup (result) : NULL;
+ }
+@@ -506,7 +506,10 @@ vfs_canon_and_translate (const char *path)
+ {
+ char *canon;
+ char *result;
+- canon = vfs_canon (path);
++ if (path == NULL)
++ canon = g_strdup ("");
++ else
++ canon = vfs_canon (path);
+ result = vfs_translate_path_n (canon);
+ g_free (canon);
+ return result;
Added: branch/cdbs/debian/patches/bugs/1456_fix_mcedit_regex_replace_segfault.patch
===================================================================
--- branch/cdbs/debian/patches/bugs/1456_fix_mcedit_regex_replace_segfault.patch (rev 0)
+++ branch/cdbs/debian/patches/bugs/1456_fix_mcedit_regex_replace_segfault.patch 2009-08-05 14:54:13 UTC (rev 222)
@@ -0,0 +1,22 @@
+commit 42a8c4fc0b496592d3e0970bd9230d22737f4a11
+Author: Ilia Maslakov <il.smind at gmail.com>
+Date: Mon Aug 3 20:14:40 2009 +0000
+
+ Ticket #1456 (Segfault with replace action)
+
+ fix: segfault if 'replace to' is empty and search type is 'Regular expression'
+
+diff --git a/src/search/search.c b/src/search/search.c
+index 96ec61e..8d8f620 100644
+--- a/src/search/search.c
++++ b/src/search/search.c
+@@ -305,6 +305,9 @@ mc_search_prepare_replace_str (mc_search_t * mc_search, GString * replace_str)
+ if (mc_search == NULL)
+ return g_string_new_len (replace_str->str, replace_str->len);
+
++ if (replace_str == NULL || replace_str->str == NULL || replace_str->len == 0)
++ return g_string_new ("");
++
+ switch (mc_search->search_type) {
+ case MC_SEARCH_T_REGEX:
+ ret = mc_search_regex_prepare_replace_str (mc_search, replace_str);
Added: branch/cdbs/debian/patches/debian/03_use_awk.patch
===================================================================
--- branch/cdbs/debian/patches/debian/03_use_awk.patch (rev 0)
+++ branch/cdbs/debian/patches/debian/03_use_awk.patch 2009-08-05 14:54:13 UTC (rev 222)
@@ -0,0 +1,11 @@
+--- a/configure 2009-08-04 20:22:13.000000000 +0200
++++ b/configure 2009-08-04 20:22:29.000000000 +0200
+@@ -2544,7 +2544,7 @@
+ */*) mkdir_p="\$(top_builddir)/$mkdir_p" ;;
+ esac
+
+-for ac_prog in gawk mawk nawk awk
++for ac_prog in awk gawk mawk nawk
+ do
+ # Extract the first word of "$ac_prog", so it can be a program name with args.
+ set dummy $ac_prog; ac_word=$2
Modified: branch/cdbs/debian/patches/series
===================================================================
--- branch/cdbs/debian/patches/series 2009-08-04 16:21:55 UTC (rev 221)
+++ branch/cdbs/debian/patches/series 2009-08-05 14:54:13 UTC (rev 222)
@@ -1,4 +1,5 @@
debian/02_use_correct_smb_conf_path.patch
+debian/03_use_awk.patch
debian/05_disable_internal_editor.patch
syntax/05_html-syntax.patch
syntax/06_strace_syntax.patch
@@ -9,6 +10,11 @@
vfs/09_choose_correct_urar.patch
bugs/01_bashism.patch
bugs/02_uzip_broken_528239.patch
+bugs/1392_regression_in_tar_support.patch
+bugs/1453_fix_crash_on_f14.patch
+bugs/1404_ctrl-c_kills_mc.patch
+bugs/1456_fix_mcedit_regex_replace_segfault.patch
+bugs/1415_hotlist_buffer_cleanup.patch
man/10_FSSTND_hu_man.patch
man/11_FSSTND_it_man.patch
man/12_FSSTND_man.patch
Modified: branch/cdbs/debian/rules
===================================================================
--- branch/cdbs/debian/rules 2009-08-04 16:21:55 UTC (rev 221)
+++ branch/cdbs/debian/rules 2009-08-05 14:54:13 UTC (rev 222)
@@ -6,7 +6,7 @@
DEB_DH_STRIP_ARGS := --dbg-package=mc-dbg
DEB_CONFIGURE_EXTRA_FLAGS := --with-glib2 --without-ext2undel --enable-charset --without-samba --with-screen=slang
-
+AWK := awk
#improve build time on i386 and amd64 multi CPU.
DEB_BUILD_ARCH ?= $(shell dpkg-architecture -qDEB_BUILD_ARCH)
ifneq (,$(filter $(DEB_BUILD_ARCH),i386 amd64))
More information about the Pkg-mc-commits
mailing list