mc:

* bump version to [https://www.midnight-commander.org/wiki/NEWS-4.8.14 4.8.14] git-svn-id: file:///var/svn/freetz/trunk@13054 149334a1-2f27-0410-a3b9-fc62619ac1e6
olistudent · Mar 29, 2015 · 58decba · 58decba
1 parent afce060
commit 58decba
Show file tree

Hide file tree

Showing 5 changed files with 15 additions and 14 deletions.
diff --git a/CHANGELOG b/CHANGELOG
@@ -114,7 +114,7 @@ Latest changes:
     * lighttpd 1.4.35
     * lsof 4.87
     * ltrace 0.7.91-git
-    * mc 4.8.13
+    * mc 4.8.14
     * minidlna 1.1.4
     * mpc 1.0.2
     * mpfr 3.1.2-p11

diff --git a/make/mc/Config.in b/make/mc/Config.in
@@ -1,5 +1,5 @@
 config FREETZ_PACKAGE_MC
-	bool "Midnight Commander (mc) 4.8.13 (binary only)"
+	bool "Midnight Commander (mc) 4.8.14 (binary only)"
 	select FREETZ_SHARE_terminfo
 	select FREETZ_LIB_libiconv if FREETZ_TARGET_UCLIBC_0_9_28
 	select FREETZ_LIB_libglib_2

diff --git a/make/mc/mc.mk b/make/mc/mc.mk
@@ -1,6 +1,6 @@
-$(call PKG_INIT_BIN, 4.8.13)
+$(call PKG_INIT_BIN, 4.8.14)
 $(PKG)_SOURCE:=$(pkg)-$($(PKG)_VERSION).tar.xz
-$(PKG)_SOURCE_MD5:=d967caa12765eb86e52a6a63ca202500
+$(PKG)_SOURCE_MD5:=fbdaddb9edcf8925dcf3231331a8720b
 $(PKG)_SITE:=ftp://ftp.midnight-commander.org/pub/midnightcommander
 
 $(PKG)_BINARY:=$($(PKG)_DIR)/src/mc

diff --git a/make/mc/patches/010-rpath.patch b/make/mc/patches/010-rpath.patch
@@ -1,6 +1,6 @@
 --- configure
 +++ configure
-@@ -22287,8 +22287,8 @@
+@@ -22380,8 +22380,8 @@
    shlibext="$acl_cv_shlibext"
    hardcode_libdir_flag_spec="$acl_cv_hardcode_libdir_flag_spec"
    hardcode_libdir_separator="$acl_cv_hardcode_libdir_separator"

diff --git a/make/mc/patches/040-ash_as_subshell.patch b/make/mc/patches/040-ash_as_subshell.patch
@@ -1,6 +1,6 @@
 --- lib/global.h
 +++ lib/global.h
-@@ -248,6 +248,7 @@
+@@ -251,6 +251,7 @@
 
          /* The user's shell */
          char *shell;
@@ -10,7 +10,7 @@
          /* It is used by function view_other_cmd() */
 --- lib/global.c
 +++ lib/global.c
-@@ -95,6 +95,7 @@
+@@ -97,6 +97,7 @@
  #endif /* !ENABLE_SUBSHELL */
 
          .shell = NULL,
@@ -20,23 +20,23 @@
          .disable_x11 = FALSE,
 --- src/main.c
 +++ src/main.c
-@@ -84,6 +84,7 @@
+@@ -85,6 +85,7 @@
  /*** file scope type declarations ****************************************************************/
 
  /*** file scope variables ************************************************************************/
 +char rp_shell[PATH_MAX];
 
  /*** file scope functions ************************************************************************/
  /* --------------------------------------------------------------------------------------------- */
-@@ -128,6 +129,7 @@
+@@ -129,6 +130,7 @@
      shell_env = getenv ("SHELL");
      if ((shell_env == NULL) || (shell_env[0] == '\0'))
      {
 +        /* 2nd choice: user login shell */
          struct passwd *pwd;
 
          pwd = getpwuid (geteuid ());
-@@ -135,13 +137,37 @@
+@@ -136,13 +138,37 @@
              mc_global.tty.shell = g_strdup (pwd->pw_shell);
      }
      else
@@ -212,7 +212,7 @@
          {
              perror (__FILE__ ": couldn't create pipe");
              mc_global.tty.use_subshell = FALSE;
-@@ -872,33 +908,113 @@
+@@ -872,34 +908,113 @@
          init_subshell_child (pty_name);
      }
 
@@ -228,8 +228,9 @@
      {
      case BASH:
          g_snprintf (precmd, sizeof (precmd),
--                    " PROMPT_COMMAND='pwd>&%d;kill -STOP $$'\n", subshell_pipe[WRITE]);
-+            " PROMPT_COMMAND='pwd>&%d; kill -STOP $$'; "
+-                    " PROMPT_COMMAND=${PROMPT_COMMAND:+$PROMPT_COMMAND; }'pwd>&%d;kill -STOP $$'\n",
+-                    subshell_pipe[WRITE]);
++            " PROMPT_COMMAND=${PROMPT_COMMAND:+$PROMPT_COMMAND; }'pwd>&%d;kill -STOP $$'; "
 +            "PS1='\\u@\\h:\\w\\$ '\n",
 +            subshell_pipe[WRITE]);
 +        break;
@@ -336,7 +337,7 @@
          break;
 
      }
-@@ -1105,6 +1221,13 @@
+@@ -1106,6 +1221,13 @@
          quote_cmd_start = "(printf \"%b\" '";
          quote_cmd_end = "')";
      }