summaryrefslogtreecommitdiffstats
path: root/debian/patches
diff options
context:
space:
mode:
Diffstat (limited to 'debian/patches')
-rw-r--r--debian/patches/2987.patch25
-rw-r--r--debian/patches/alt_editor.patch27
-rw-r--r--debian/patches/disable_internal_editor.patch21
-rw-r--r--debian/patches/dummy-zip-password.patch17
-rw-r--r--debian/patches/ext_run-mailcap.patch23
-rw-r--r--debian/patches/ext_use_default_editor.patch18
-rw-r--r--debian/patches/mcedit_auto_indent.patch20
-rw-r--r--debian/patches/mcedit_full_path.patch34
-rw-r--r--debian/patches/mcedit_group_undo.patch19
-rw-r--r--debian/patches/series15
-rw-r--r--debian/patches/use_sensible-editor.patch20
-rw-r--r--debian/patches/uzip_528239.patch25
12 files changed, 264 insertions, 0 deletions
diff --git a/debian/patches/2987.patch b/debian/patches/2987.patch
new file mode 100644
index 0000000..2e35ba0
--- /dev/null
+++ b/debian/patches/2987.patch
@@ -0,0 +1,25 @@
+Last-Update: 2017-06-29
+Forwarded: https://www.midnight-commander.org/ticket/2110#comment:11
+Author: Dmitry Borisyuk" <q1werty@i.com.ua>
+Reviewed-by: Dmitry Smirnov <onlyjob@member.fsf.org>
+Bug-MC: https://www.midnight-commander.org/ticket/2987
+Bug-MC: https://www.midnight-commander.org/ticket/2110
+Bug-Debian: http://bugs.debian.org/703741
+Description: clear unfinished text before 'cd' to avoid accidental execution
+ send C-k C-u to the shell before sending 'cd' command to erase previous
+ unfinished text (C-k is needed for bash if the cursor is in the middle of
+ the line).
+
+--- a/src/subshell/common.c
++++ b/src/subshell/common.c
+@@ -1719,9 +1719,9 @@
+ }
+ }
+ /* The initial space keeps this out of the command history (in bash
+ because we set "HISTCONTROL=ignorespace") */
+- write_all (mc_global.tty.subshell_pty, " cd ", 4);
++ write_all (mc_global.tty.subshell_pty, "\013\025 cd ", 6);
+
+ if (vpath != NULL)
+ {
+ const char *translate;
diff --git a/debian/patches/alt_editor.patch b/debian/patches/alt_editor.patch
new file mode 100644
index 0000000..958a51e
--- /dev/null
+++ b/debian/patches/alt_editor.patch
@@ -0,0 +1,27 @@
+Last-Update: 2012-08-04
+Reviewed-by: Dmitry Smirnov <onlyjob@member.fsf.org>
+Forwarded: yes
+Bug-Debian: http://bugs.debian.org/592208
+Bug-MC: https://www.midnight-commander.org/ticket/2799
+Bug-MC: https://www.midnight-commander.org/ticket/2638
+Author: Yury V. Zaytsev <yury@shurup.com>
+Description: Detect that mc was launched from alternatives symlink
+ This patch in needed to mcedit to start if run as 'editor' symlink
+ from alternatives.
+ .
+ As of 2012-05-01 upstream believe this should be customised per
+ distribution as therefore refused to commit.
+
+--- a/src/args.c
++++ b/src/args.c
+@@ -619,9 +619,9 @@
+ const char *base;
+
+ base = x_basename (argv[0]);
+
+- if (strncmp (base, "mce", 3) == 0 || strcmp (base, "vi") == 0)
++ if (strncmp (base, "mce", 3) == 0 || strcmp (base, "vi") == 0 || strcmp (base, "editor") == 0)
+ {
+ /* mce* or vi is link to mc */
+ mc_global.mc_run_mode = MC_RUN_EDITOR;
+ }
diff --git a/debian/patches/disable_internal_editor.patch b/debian/patches/disable_internal_editor.patch
new file mode 100644
index 0000000..b24cb76
--- /dev/null
+++ b/debian/patches/disable_internal_editor.patch
@@ -0,0 +1,21 @@
+Last-Update: 2017-06-29
+Forwarded: no
+Bug-Debian: http://bugs.debian.org/413258
+Author: Patrick Winnertz <winnie@debian.org>
+Reviewed-by: Dmitry Smirnov <onlyjob@member.fsf.org>
+Updated-by: Denis Briand <debian@denis-briand.fr>
+Description: Disable internal editor by default
+
+--- a/src/setup.c
++++ b/src/setup.c
+@@ -180,9 +180,9 @@
+
+ /* If true use the internal viewer */
+ gboolean use_internal_view = TRUE;
+ /* If set, use the builtin editor */
+-gboolean use_internal_edit = TRUE;
++gboolean use_internal_edit = FALSE;
+
+ #ifdef HAVE_CHARSET
+ /* Numbers of (file I/O) and (input/display) codepages. -1 if not selected */
+ int default_source_codepage = -1;
diff --git a/debian/patches/dummy-zip-password.patch b/debian/patches/dummy-zip-password.patch
new file mode 100644
index 0000000..2f8b528
--- /dev/null
+++ b/debian/patches/dummy-zip-password.patch
@@ -0,0 +1,17 @@
+Last-Update: 2014-12-13
+Forwarded: no
+Author: Dmitry Borisyuk" <q1werty@i.com.ua>
+Bug-Debian: http://bugs.debian.org/772080
+Description: prevent hangs on extraction from encrypted .ZIP archives, suppress password prompt with dummy password.
+
+--- a/src/vfs/extfs/helpers/uzip.in
++++ b/src/vfs/extfs/helpers/uzip.in
+@@ -32,7 +32,7 @@
+ # Command used to delete a file from the archive
+ my $cmd_delete = "$app_zip -d";
+ # Command used to extract a file to standard out
+-my $cmd_extract = "$app_unzip -p";
++my $cmd_extract = "$app_unzip -P '' -p";
+
+ # -rw-r--r-- 2.2 unx 2891 tx 1435 defN 20000330.211927 ./edit.html
+ # (perm) (?) (?) (size) (?) (zippedsize) (method) (yyyy)(mm)(dd).(HH)(MM)(SS) (fname)
diff --git a/debian/patches/ext_run-mailcap.patch b/debian/patches/ext_run-mailcap.patch
new file mode 100644
index 0000000..3cd4963
--- /dev/null
+++ b/debian/patches/ext_run-mailcap.patch
@@ -0,0 +1,23 @@
+Last-Update: 2013-09-08
+Forwarded: no
+Author: Dmitry Smirnov <onlyjob@member.fsf.org>
+Bug-Debian: http://bugs.debian.org/665763
+Bug-Debian: http://bugs.debian.org/544058
+Description: Use mailcap viewer instead of various hardcoded viewers
+ * dvi viewer (do_open_action)
+ * images viewer
+ * .ram|.rm files viewer
+
+--- a/misc/ext.d/doc.sh.in
++++ b/misc/ext.d/doc.sh.in
+@@ -184,9 +184,9 @@
+ fmclient -f "${MC_EXT_FILENAME}"
+ ;;
+ dvi)
+ if [ -n "$DISPLAY" ]; then
+- (xdvi "${MC_EXT_FILENAME}" &)
++ (run-mailcap "${MC_EXT_FILENAME}" &)
+ else
+ dvisvga "${MC_EXT_FILENAME}" || \
+ dvi2tty "${MC_EXT_FILENAME}" | ${PAGER:-more}
+ fi
diff --git a/debian/patches/ext_use_default_editor.patch b/debian/patches/ext_use_default_editor.patch
new file mode 100644
index 0000000..1018b60
--- /dev/null
+++ b/debian/patches/ext_use_default_editor.patch
@@ -0,0 +1,18 @@
+Last-Update: 2013-04-03
+Author: Dmitry Smirnov <onlyjob@member.fsf.org>
+Forwarded: not-needed
+Description: Use default editor instead of vi
+
+--- a/misc/mc.ext.ini.in
++++ b/misc/mc.ext.ini.in
+@@ -1104,9 +1104,9 @@
+ Open=%cd %p/ucpio://
+ View=%view{ascii} @EXTHELPERSDIR@/archive.sh view cpio
+
+ [Include/editor]
+-Open=%var{EDITOR:vi} %f
++Open=%var{EDITOR:editor} %f
+
+ [Include/image]
+ Open=@EXTHELPERSDIR@/image.sh open ALL_FORMATS
+ View=%view{ascii} @EXTHELPERSDIR@/image.sh view ALL_FORMATS
diff --git a/debian/patches/mcedit_auto_indent.patch b/debian/patches/mcedit_auto_indent.patch
new file mode 100644
index 0000000..4bee6e6
--- /dev/null
+++ b/debian/patches/mcedit_auto_indent.patch
@@ -0,0 +1,20 @@
+Last-Update: 2017-06-29
+Forwarded: no
+Bug-Debian: http://bugs.debian.org/570502
+Author: Dmitry Smirnov <onlyjob@member.fsf.org>
+Updated-by: Denis Briand <debian@denis-briand.fr>
+Description: disable "Return does autoindent" by default (mcedit)
+
+--- a/src/editor/edit.c
++++ b/src/editor/edit.c
+@@ -81,9 +81,9 @@
+ int option_word_wrap_line_length = DEFAULT_WRAP_LINE_LENGTH;
+ gboolean option_typewriter_wrap = FALSE;
+ gboolean option_auto_para_formatting = FALSE;
+ gboolean option_fill_tabs_with_spaces = FALSE;
+-gboolean option_return_does_auto_indent = TRUE;
++gboolean option_return_does_auto_indent = FALSE;
+ gboolean option_backspace_through_tabs = FALSE;
+ gboolean option_fake_half_tabs = TRUE;
+ int option_save_mode = EDIT_QUICK_SAVE;
+ gboolean option_save_position = TRUE;
diff --git a/debian/patches/mcedit_full_path.patch b/debian/patches/mcedit_full_path.patch
new file mode 100644
index 0000000..4223d76
--- /dev/null
+++ b/debian/patches/mcedit_full_path.patch
@@ -0,0 +1,34 @@
+ast-Update: 2017-06-29
+Forwarded: not-needed
+Bug-Debian: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=764226
+Bug-Upstream: http://www.midnight-commander.org/ticket/3285
+Author: Dmitry Smirnov <onlyjob@member.fsf.org>
+Updated-by: Denis Briand <debian@denis-briand.fr>
+Description: 'mcedit' status line to show full path to file, like in 'mcview'.
+
+--- a/doc/man/mcedit.1.in
++++ b/doc/man/mcedit.1.in
+@@ -604,9 +604,9 @@
+ will be untouched. Default value is
+ "\fB-\fR\fB+\fR\fB*\fR\fB\\\fR\fB,\fR\fB.\fR\fB;\fR\fB:\fR\fB&\fR\fB>\fR".
+ .TP
+ .I editor_state_full_filename
+-Show full path name in the status line. If disabled (default), only base name of the
++Show full path name in the status line. If disabled, only base name of the
+ file is shown.
+ .SH MISCELLANEOUS
+ The editor also displays non\-us characters (160+). When editing
+ binary files, you should set
+--- a/src/editor/edit.c
++++ b/src/editor/edit.c
+@@ -92,9 +92,9 @@
+ gboolean option_cursor_beyond_eol = FALSE;
+ gboolean option_line_state = FALSE;
+ int option_line_state_width = 0;
+ gboolean option_cursor_after_inserted_block = FALSE;
+-gboolean option_state_full_filename = FALSE;
++gboolean option_state_full_filename = TRUE;
+
+ gboolean enable_show_tabs_tws = TRUE;
+ gboolean option_check_nl_at_eof = FALSE;
+ gboolean option_group_undo = FALSE;
diff --git a/debian/patches/mcedit_group_undo.patch b/debian/patches/mcedit_group_undo.patch
new file mode 100644
index 0000000..a9f429d
--- /dev/null
+++ b/debian/patches/mcedit_group_undo.patch
@@ -0,0 +1,19 @@
+Last-Update: 2017-06-29
+Forwarded: not-needed
+Author: Dmitry Smirnov <onlyjob@member.fsf.org>
+Updated-by: Denis Briand <debian@denis-briand.fr>
+Description: enable "Group undo" by default (mcedit)
+
+--- a/src/editor/edit.c
++++ b/src/editor/edit.c
+@@ -96,9 +96,9 @@
+ gboolean option_state_full_filename = TRUE;
+
+ gboolean enable_show_tabs_tws = TRUE;
+ gboolean option_check_nl_at_eof = FALSE;
+-gboolean option_group_undo = FALSE;
++gboolean option_group_undo = TRUE;
+ gboolean show_right_margin = FALSE;
+
+ char *option_backup_ext = NULL;
+ char *option_filesize_threshold = NULL;
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..f3ca3ea
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1,15 @@
+## UPSTREAM / FORWARDED:
+2987.patch
+
+## DEBIAN FIXES AND ENHANCEMENTS:
+dummy-zip-password.patch
+alt_editor.patch
+use_sensible-editor.patch
+
+## OVERRIDE DEFAULTS:
+disable_internal_editor.patch
+mcedit_auto_indent.patch
+mcedit_full_path.patch
+mcedit_group_undo.patch
+ext_run-mailcap.patch
+ext_use_default_editor.patch
diff --git a/debian/patches/use_sensible-editor.patch b/debian/patches/use_sensible-editor.patch
new file mode 100644
index 0000000..7d2f251
--- /dev/null
+++ b/debian/patches/use_sensible-editor.patch
@@ -0,0 +1,20 @@
+Last-Update: 2015-03-23
+Forwarded: not-needed
+Bug-Debian: http://bugs.debian.org/549202
+Author: Denis Briand <denis@narcan.fr>
+Author: Yury V. Zaytsev <yury@shurup.com>
+Description: Use sensible-editor to edit files
+
+--- a/lib/global.h
++++ b/lib/global.h
+@@ -123,9 +123,9 @@
+ #define IS_PATH_SEP(c) ((c) == PATH_SEP)
+ #define PATH_ENV_SEP ':'
+ #define TMPDIR_DEFAULT "/tmp"
+ #define SCRIPT_SUFFIX ""
+-#define get_default_editor() "vi"
++#define get_default_editor() "sensible-editor"
+ #define OS_SORT_CASE_SENSITIVE_DEFAULT TRUE
+ #define UTF8_CHAR_LEN 6
+
+ /* struct stat members */
diff --git a/debian/patches/uzip_528239.patch b/debian/patches/uzip_528239.patch
new file mode 100644
index 0000000..fec9e68
--- /dev/null
+++ b/debian/patches/uzip_528239.patch
@@ -0,0 +1,25 @@
+Last-Update: 2012-02-28
+Reviewed-by: Dmitry Smirnov <onlyjob@member.fsf.org>
+Forwarded: not-needed
+Bug-Debian: http://bugs.debian.org/528239
+Bug-Debian: http://bugs.debian.org/661467
+Author: Johannes Stezenbach <js@sig21.net>
+Author: Yury V. Zaytsev <yury@shurup.com>
+Description: Fix "fail to display zip file contents" after unzip update
+ This patch is quite important. mc set HAVE_ZIPINFO at build time
+ if 'unzip' package is available. If not, HAVE_ZIPINFO would be mistakenly
+ set to zero which will break run-time zip browsing.
+ This patch is to make sure the right value is used.
+ If this patch do not apply make sure 'unzip' is present in Build-Deps.
+
+--- a/src/vfs/extfs/helpers/uzip.in
++++ b/src/vfs/extfs/helpers/uzip.in
+@@ -19,7 +19,7 @@ my $app_zip = "@ZIP@";
+ # Location of the unzip program
+ my $app_unzip = "@UNZIP@";
+ # Set this to 1 if zipinfo (unzip -Z) is to be used (recommended), otherwise 0.
+-my $op_has_zipinfo = @HAVE_ZIPINFO@;
++my $op_has_zipinfo = 1;
+
+ # Command used to list archives (zipinfo mode)
+ my $cmd_list_zi = "$app_unzip -Z -l -T";
generated by cgit v1.2.3 (git 2.39.1) at 2024-11-21 21:11:23 +0000