Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package mc for openSUSE:Factory checked in at 2024-11-02 16:11:37 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/mc (Old) and /work/SRC/openSUSE:Factory/.mc.new.2020 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "mc" Sat Nov 2 16:11:37 2024 rev:93 rq:1220049 version:4.8.32 Changes: -------- --- /work/SRC/openSUSE:Factory/mc/mc.changes 2024-09-18 15:27:02.497237386 +0200 +++ /work/SRC/openSUSE:Factory/.mc.new.2020/mc.changes 2024-11-02 16:11:39.698965120 +0100 @@ -1,0 +2,5 @@ +Mon Sep 23 20:12:03 UTC 2024 - Adam Mizerski <[email protected]> + +- Added patch 4575-fix-wrapper.patch - fixes boo#1203617 + +------------------------------------------------------------------- New: ---- 4575-fix-wrapper.patch BETA DEBUG BEGIN: New: - Added patch 4575-fix-wrapper.patch - fixes boo#1203617 BETA DEBUG END: ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ mc.spec ++++++ --- /var/tmp/diff_new_pack.L35ZAc/_old 2024-11-02 16:11:40.543000159 +0100 +++ /var/tmp/diff_new_pack.L35ZAc/_new 2024-11-02 16:11:40.547000325 +0100 @@ -32,6 +32,9 @@ Source7: mc.fish Patch0: mc-fix_lib_search_path.patch Patch12: mc-wrapper.patch +# PATCH-FIX-UPSTREAM 4575-fix-wrapper.patch https://midnight-commander.org/ticket/4575 -- fix mc-wrapper (already merged for next release) +# + https://github.com/MidnightCommander/mc/commit/d081bc68aa6ad3ded515ea490118b0a38a1ec204 +Patch13: 4575-fix-wrapper.patch Patch16: mc-esc-seq.patch Patch20: mc-f-keys.patch Patch21: mc-extfs-helpers-deb.patch ++++++ 4575-fix-wrapper.patch ++++++ >From e2d96fa802abebf888dcc2cc938cfd06abca8eb0 Mon Sep 17 00:00:00 2001 From: "Yury V. Zaytsev" <[email protected]> Date: Sun, 1 Sep 2024 12:01:37 +0200 Subject: [PATCH] Ticket #4575: adjust mc-wrapper to fit changes in #4535. Signed-off-by: Yury V. Zaytsev <[email protected]> --- contrib/mc-wrapper.csh.in | 13 ++++++------- contrib/mc-wrapper.sh.in | 13 +++++++++---- 2 files changed, 15 insertions(+), 11 deletions(-) diff --git a/contrib/mc-wrapper.csh.in b/contrib/mc-wrapper.csh.in index 1eca8e7b71..1b00491bc4 100644 --- a/contrib/mc-wrapper.csh.in +++ b/contrib/mc-wrapper.csh.in @@ -1,9 +1,9 @@ -set MC_USER=`whoami` - -if ($?TMPDIR) then - setenv MC_PWD_FILE $TMPDIR/mc-$MC_USER/mc.pwd.$$ +if ($?MC_TMPDIR) then + setenv MC_PWD_FILE "`mktemp '$MC_TMPDIR/mc.pwd.XXXXXX'`" +else if ($?TMPDIR) then + setenv MC_PWD_FILE "`mktemp '$TMPDIR/mc.pwd.XXXXXX'`" else - setenv MC_PWD_FILE /tmp/mc-$MC_USER/mc.pwd.$$ + setenv MC_PWD_FILE "`mktemp '/tmp/mc.pwd.XXXXXX'`" endif @bindir@/mc -P "$MC_PWD_FILE" $* @@ -11,11 +11,10 @@ endif if (-r "$MC_PWD_FILE") then setenv MC_PWD "`cat '$MC_PWD_FILE'`" if ("$MC_PWD" != "$cwd" && -d "$MC_PWD") then - cd "$MC_PWD" + cd "$MC_PWD" || true endif unsetenv MC_PWD endif rm -f "$MC_PWD_FILE" unsetenv MC_PWD_FILE -unsetenv MC_USER diff --git a/contrib/mc-wrapper.sh.in b/contrib/mc-wrapper.sh.in index 3905be4800..3d929b3485 100644 --- a/contrib/mc-wrapper.sh.in +++ b/contrib/mc-wrapper.sh.in @@ -1,15 +1,20 @@ -MC_USER=`whoami` -MC_PWD_FILE="${TMPDIR-/tmp}/mc-$MC_USER/mc.pwd.$$" +if test -n "$MC_TMPDIR"; then + MC_PWD_FILE="`mktemp "${MC_TMPDIR}/mc.pwd.XXXXXX"`" +elif test -n "$TMPDIR"; then + MC_PWD_FILE="`mktemp "${TMPDIR}/mc.pwd.XXXXXX"`" +else + MC_PWD_FILE="`mktemp "/tmp/mc.pwd.XXXXXX"`" +fi + @bindir@/mc -P "$MC_PWD_FILE" "$@" if test -r "$MC_PWD_FILE"; then MC_PWD="`cat "$MC_PWD_FILE"`" if test -n "$MC_PWD" && test "$MC_PWD" != "$PWD" && test -d "$MC_PWD"; then - cd "$MC_PWD" + cd "$MC_PWD" || true fi unset MC_PWD fi rm -f "$MC_PWD_FILE" unset MC_PWD_FILE -unset MC_USER >From d081bc68aa6ad3ded515ea490118b0a38a1ec204 Mon Sep 17 00:00:00 2001 From: "Yury V. Zaytsev" <[email protected]> Date: Mon, 2 Sep 2024 16:51:17 +0200 Subject: [PATCH] main: remove `O_EXCL` for wd-file since creation is now managed by wrapper Signed-off-by: Yury V. Zaytsev <[email protected]> --- src/main.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/main.c b/src/main.c index 803cec146e..02a49ba20e 100644 --- a/src/main.c +++ b/src/main.c @@ -509,8 +509,7 @@ main (int argc, char *argv[]) { int last_wd_fd; - last_wd_fd = open (mc_args__last_wd_file, O_WRONLY | O_CREAT | O_TRUNC | O_EXCL, - S_IRUSR | S_IWUSR); + last_wd_fd = open (mc_args__last_wd_file, O_WRONLY | O_CREAT | O_TRUNC, S_IRUSR | S_IWUSR); if (last_wd_fd != -1) { ssize_t ret1;
