public inbox for git-commits@fedoraproject.org
help / color / mirror / Atom feed
From: Byoungchan Lee <byoungchan.lee@gmx.com>
To: git-commits@fedoraproject.org
Subject: [rpms/7zip] f44: Handle /bin/7z when locating the libexec plugin
Date: Mon, 15 Jun 2026 16:33:37 GMT	[thread overview]
Message-ID: <178154121760.1.1090882678168232366.rpms-7zip-6bfdf817e90b@fedoraproject.org> (raw)

            A new commit has been pushed.

            Repo   : rpms/7zip
            Branch : f44
            Commit : 6bfdf817e90beb47fde04e709d7eb37c27e39c0b
            Author : Byoungchan Lee <byoungchan.lee@gmx.com>
            Date   : 2026-05-17T15:57:31+09:00
            Stats  : +4/-2 in 1 file(s)
            URL    : https://src.fedoraproject.org/rpms/7zip/c/6bfdf817e90beb47fde04e709d7eb37c27e39c0b?branch=f44

            Log:
            Handle /bin/7z when locating the libexec plugin

Fedora installs the 7zip codec plugin under /usr/libexec/7zip and
patches 7z to load it from there. The patch handled /usr/bin, but not
/bin.

On merged-/usr systems, /bin/7z and /usr/bin/7z are the same file, but
7z derives its module directory from argv[0]. Invoking it as /bin/7z
therefore tried to load /bin/7z.so and could fail with:

  ERROR:
  Unsupported archive type

Treat /bin as an installed frontend path too, so it uses the same
/usr/libexec/7zip plugin directory as /usr/bin.

---
diff --git a/7zip-find-so-in-libexec.diff b/7zip-find-so-in-libexec.diff
index bcb6845..1e8fd71 100644
--- a/7zip-find-so-in-libexec.diff
+++ b/7zip-find-so-in-libexec.diff
@@ -2,13 +2,15 @@ diff --git a/CPP/7zip/UI/Common/ArchiveCommandLine.cpp b/CPP/7zip/UI/Common/Arch
 index 7fe18fb..4b79e2d 100644
 --- a/CPP/7zip/UI/Common/ArchiveCommandLine.cpp
 +++ b/CPP/7zip/UI/Common/ArchiveCommandLine.cpp
-@@ -1780,8 +1780,8 @@ FString GetModuleDirPrefix()
+@@ -1780,8 +1780,10 @@ FString GetModuleDirPrefix()
    FString s;
  
    s = fas2fs(g_ModuleDirPrefix);
 -  if (s.IsEmpty())
 -    s = FTEXT(".") FSTRING_PATH_SEPARATOR;
-+  if (s.IsEmpty() || s.IsPrefixedBy("__Z7_PREFIX__/bin"))
++  if (s.IsEmpty() ||
++      s.IsPrefixedBy("__Z7_PREFIX__/bin/") ||
++      s.IsPrefixedBy("/bin/"))
 +    s = FTEXT("__Z7_PREFIX__/libexec/7zip") FSTRING_PATH_SEPARATOR;
    return s;
    /*

                 reply	other threads:[~2026-06-15 16:33 UTC|newest]

Thread overview: [no followups] expand[flat|nested]  mbox.gz  Atom feed

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=178154121760.1.1090882678168232366.rpms-7zip-6bfdf817e90b@fedoraproject.org \
    --to=byoungchan.lee@gmx.com \
    --cc=git-commits@fedoraproject.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox