From: chrysos349 <chrysos349@users.noreply.github.com>
To: ml@inbox.vuxu.org
Subject: [PR PATCH] 7zip: fix compatib with 7zip
Date: Thu, 15 Feb 2024 13:49:00 +0100 [thread overview]
Message-ID: <gh-mailinglist-notifications-41a7ca26-5023-4802-975b-f1789d68868e-void-packages-48740@inbox.vuxu.org> (raw)
[-- Attachment #1: Type: text/plain, Size: 644 bytes --]
There is a new pull request by chrysos349 against master on the void-packages repository
https://github.com/chrysos349/void-packages 7zip
https://github.com/void-linux/void-packages/pull/48740
7zip: fix compatib with 7zip
@r-ricci
closes #48737
#### Testing the changes
- I tested the changes in this PR: **briefly**
#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
- aarch64-musl
- armv7l
- armv6l-musl
A patch file from https://github.com/void-linux/void-packages/pull/48740.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-7zip-48740.patch --]
[-- Type: text/x-diff, Size: 2909 bytes --]
From 2897f92d7c95e4098440c67ac9eabdbc3925a242 Mon Sep 17 00:00:00 2001
From: chrysos349 <chrysostom349@gmail.com>
Date: Thu, 15 Feb 2024 15:41:00 +0300
Subject: [PATCH] 7zip: fix compatib with 7zip
---
.../7zip/patches/fix-compatib-with-7zip.patch | 41 +++++++++++++++++++
srcpkgs/7zip/template | 2 +-
2 files changed, 42 insertions(+), 1 deletion(-)
create mode 100644 srcpkgs/7zip/patches/fix-compatib-with-7zip.patch
diff --git a/srcpkgs/7zip/patches/fix-compatib-with-7zip.patch b/srcpkgs/7zip/patches/fix-compatib-with-7zip.patch
new file mode 100644
index 0000000000000..48f643bc66951
--- /dev/null
+++ b/srcpkgs/7zip/patches/fix-compatib-with-7zip.patch
@@ -0,0 +1,41 @@
+From: Dario Faggioli <dfaggioli@suse.com>
+Date: Wed Jan 26 04:01:09 AM CET 2022
+Subject: [PATCH] Console: Avoid terminating on failed password check
+
+File-roller (i.e., GNOME's Archive Manager), which was working fine
+with p7zip and p7zip-full, does not work well with 7zip. More specifically,
+it is not possible to open or extract a password protected archive, for
+which also the list of the files in the archive itself has been hidden.
+
+This seems to happen because now GetPassword_HRESULT() does some kind of
+error checking, and depending on the results, cause its calling function
+to return with an error, which in turns terminates the 7zz program in
+a way that file-roller interpretes as a critical error, and everything
+stops.
+
+On the other hand, in p7zip-full, the GetPassword() function wasn't
+doing this. There's still a failure, but one that triggers File-roller
+to ask the password of the archive, and once that is provided everything
+works.
+
+From a CLI perspecvive, nothing changes, and things still work fine and
+in the exact same way, no matter whether or not this patch is applied.
+
+Signed-off-by: Dario Faggioli <dfaggioli@suse.com>
+---
+ OpenCallbackConsole.cpp | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+Index: 7zip/CPP/7zip/UI/Console/OpenCallbackConsole.cpp
+===================================================================
+--- 7zip.orig/CPP/7zip/UI/Console/OpenCallbackConsole.cpp
++++ 7zip/CPP/7zip/UI/Console/OpenCallbackConsole.cpp
+@@ -87,7 +87,7 @@ HRESULT COpenCallbackConsole::Open_Crypt
+ if (!PasswordIsDefined)
+ {
+ ClosePercents();
+- RINOK(GetPassword_HRESULT(_so, Password))
++ GetPassword_HRESULT(_so, Password);
+ PasswordIsDefined = true;
+ }
+ return StringToBstr(Password, password);
diff --git a/srcpkgs/7zip/template b/srcpkgs/7zip/template
index 9f8add8040688..708f6cfe3c28c 100644
--- a/srcpkgs/7zip/template
+++ b/srcpkgs/7zip/template
@@ -1,7 +1,7 @@
# Template file for '7zip'
pkgname=7zip
version=23.01
-revision=1
+revision=2
short_desc="File archiver with a high compression ratio"
maintainer="Roberto Ricci <io@r-ricci.it>"
license="LGPL-2.1-or-later, BSD-3-Clause"
next reply other threads:[~2024-02-15 12:49 UTC|newest]
Thread overview: 18+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-02-15 12:49 chrysos349 [this message]
2024-02-15 12:56 ` [PR PATCH] [Updated] " chrysos349
2024-02-15 13:02 ` 7zip: fix compatib with p7zip chrysos349
2024-02-15 13:12 ` [PR PATCH] [Updated] " chrysos349
2024-02-15 13:27 ` oreo639
2024-02-15 13:28 ` oreo639
2024-02-15 13:29 ` oreo639
2024-02-15 13:34 ` oreo639
2024-02-15 13:41 ` oreo639
2024-02-15 13:41 ` oreo639
2024-02-15 13:42 ` oreo639
2024-02-15 14:32 ` chrysos349
2024-02-15 14:32 ` [PR PATCH] [Closed]: " chrysos349
2024-02-17 8:19 ` oreo639
2024-02-17 8:20 ` oreo639
2024-02-17 8:21 ` oreo639
2024-02-17 8:21 ` oreo639
2024-02-17 8:23 ` oreo639
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=gh-mailinglist-notifications-41a7ca26-5023-4802-975b-f1789d68868e-void-packages-48740@inbox.vuxu.org \
--to=chrysos349@users.noreply.github.com \
--cc=ml@inbox.vuxu.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;
as well as URLs for NNTP newsgroup(s).