[PR PATCH] 7zip: fix compatib with 7zip

[PR PATCH] 7zip: fix compatib with 7zip

[chrysos349]

[-- 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"

Re: [PR PATCH] [Updated] 7zip: fix compatib with 7zip

[chrysos349]

[-- Attachment #1: Type: text/plain, Size: 649 bytes --]

There is an updated 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: 2914 bytes --]

From 97f44133479de6b5e5394056ee8e9d66cd7b7340 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 p7zip

---
 .../patches/fix-compatib-with-p7zip.patch     | 41 +++++++++++++++++++
 srcpkgs/7zip/template                         |  2 +-
 2 files changed, 42 insertions(+), 1 deletion(-)
 create mode 100644 srcpkgs/7zip/patches/fix-compatib-with-p7zip.patch

diff --git a/srcpkgs/7zip/patches/fix-compatib-with-p7zip.patch b/srcpkgs/7zip/patches/fix-compatib-with-p7zip.patch
new file mode 100644
index 0000000000000..48f643bc66951
--- /dev/null
+++ b/srcpkgs/7zip/patches/fix-compatib-with-p7zip.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"

Re: 7zip: fix compatib with p7zip

[chrysos349]

[-- Attachment #1: Type: text/plain, Size: 210 bytes --]

New comment by chrysos349 on void-packages repository

https://github.com/void-linux/void-packages/pull/48740#issuecomment-1946056379

Comment:
there was a transaction failure. that's why linting check failed.

Re: [PR PATCH] [Updated] 7zip: fix compatib with p7zip

[chrysos349]

[-- Attachment #1: Type: text/plain, Size: 650 bytes --]

There is an updated 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 p7zip
@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: 2918 bytes --]

From 9ca178fd4204484b6125ddea907288c96c712529 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 p7zip

---
 .../patches/fix-compatib-with-p7zip.patch     | 41 +++++++++++++++++++
 srcpkgs/7zip/template                         |  2 +-
 2 files changed, 42 insertions(+), 1 deletion(-)
 create mode 100644 srcpkgs/7zip/patches/fix-compatib-with-p7zip.patch

diff --git a/srcpkgs/7zip/patches/fix-compatib-with-p7zip.patch b/srcpkgs/7zip/patches/fix-compatib-with-p7zip.patch
new file mode 100644
index 00000000000000..48f643bc66951b
--- /dev/null
+++ b/srcpkgs/7zip/patches/fix-compatib-with-p7zip.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 9f8add80406889..708f6cfe3c28cc 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"

Re: 7zip: fix compatib with p7zip

[oreo639]

[-- Attachment #1: Type: text/plain, Size: 374 bytes --]

New comment by oreo639 on void-packages repository

https://github.com/void-linux/void-packages/pull/48740#issuecomment-1946095679

Comment:
Based on the code this results in file-roller returning `E_OUTOFMEMORY`, which is wrong.
This appears to have been fixed upstream in file-roller:
https://github.com/GNOME/file-roller/commit/844f6fbbef2a616f4bf1eb877710f55bced71d62

Re: 7zip: fix compatib with p7zip

[oreo639]

[-- Attachment #1: Type: text/plain, Size: 391 bytes --]

New comment by oreo639 on void-packages repository

https://github.com/void-linux/void-packages/pull/48740#issuecomment-1946095679

Comment:
Based on the code this results in file-roller returning `E_OUTOFMEMORY`, which is incorrect in this case.
This appears to have been fixed upstream in file-roller:
https://github.com/GNOME/file-roller/commit/844f6fbbef2a616f4bf1eb877710f55bced71d62

Re: 7zip: fix compatib with p7zip

[oreo639]

[-- Attachment #1: Type: text/plain, Size: 380 bytes --]

New comment by oreo639 on void-packages repository

https://github.com/void-linux/void-packages/pull/48740#issuecomment-1946095679

Comment:
Based on the code this results in file-roller returning `E_OUTOFMEMORY`, which is not correct.
This appears to have been fixed upstream in file-roller:
https://github.com/GNOME/file-roller/commit/844f6fbbef2a616f4bf1eb877710f55bced71d62

Re: 7zip: fix compatib with p7zip

[oreo639]

[-- Attachment #1: Type: text/plain, Size: 387 bytes --]

New comment by oreo639 on void-packages repository

https://github.com/void-linux/void-packages/pull/48740#issuecomment-1946095679

Comment:
Based on the code this results in file-roller returning `E_OUTOFMEMORY`, which is not correct.
The issue appears to have been fixed upstream in file-roller:
https://github.com/GNOME/file-roller/commit/844f6fbbef2a616f4bf1eb877710f55bced71d62

Re: 7zip: fix compatib with p7zip

[oreo639]

[-- Attachment #1: Type: text/plain, Size: 452 bytes --]

New comment by oreo639 on void-packages repository

https://github.com/void-linux/void-packages/pull/48740#issuecomment-1946095679

Comment:
Based on the code this results in file-roller returning `E_OUTOFMEMORY`, which is not consistent with p7zip (not is 7zip and p7zip meant to be 1-1 compatible).
The issue appears to have been fixed upstream in file-roller:
https://github.com/GNOME/file-roller/commit/844f6fbbef2a616f4bf1eb877710f55bced71d62

Re: 7zip: fix compatib with p7zip

[oreo639]

[-- Attachment #1: Type: text/plain, Size: 452 bytes --]

New comment by oreo639 on void-packages repository

https://github.com/void-linux/void-packages/pull/48740#issuecomment-1946095679

Comment:
Based on the code this results in file-roller returning `E_OUTOFMEMORY`, which is not consistent with p7zip (nor is 7zip and p7zip meant to be 1-1 compatible).
The issue appears to have been fixed upstream in file-roller:
https://github.com/GNOME/file-roller/commit/844f6fbbef2a616f4bf1eb877710f55bced71d62

Re: 7zip: fix compatib with p7zip

[oreo639]

[-- Attachment #1: Type: text/plain, Size: 454 bytes --]

New comment by oreo639 on void-packages repository

https://github.com/void-linux/void-packages/pull/48740#issuecomment-1946095679

Comment:
Based on the code this results in file-roller returning `E_OUTOFMEMORY`, which is not consistent with p7zip (nor is 7zip trying to be 1-1 compatible with p7zip).
The issue appears to have been fixed upstream in file-roller:
https://github.com/GNOME/file-roller/commit/844f6fbbef2a616f4bf1eb877710f55bced71d62

Re: 7zip: fix compatib with p7zip

[chrysos349]

[-- Attachment #1: Type: text/plain, Size: 240 bytes --]

New comment by chrysos349 on void-packages repository

https://github.com/void-linux/void-packages/pull/48740#issuecomment-1946216261

Comment:
This worked for me, but fixing in `file-roller` seems is cleaner.

Here you go then - #48743 

Re: [PR PATCH] [Closed]: 7zip: fix compatib with p7zip

[chrysos349]

[-- Attachment #1: Type: text/plain, Size: 491 bytes --]

There's a closed pull request on the void-packages repository

7zip: fix compatib with p7zip
https://github.com/void-linux/void-packages/pull/48740

Description:
@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

Re: 7zip: fix compatib with p7zip

[oreo639]

[-- Attachment #1: Type: text/plain, Size: 447 bytes --]

New comment by oreo639 on void-packages repository

https://github.com/void-linux/void-packages/pull/48740#issuecomment-1946095679

Comment:
Based on the code this results in 7zip returning `E_OUTOFMEMORY`, which is not consistent with p7zip (nor is 7zip trying to be 1-1 compatible with p7zip).
The issue appears to have been fixed upstream in file-roller:
https://github.com/GNOME/file-roller/commit/844f6fbbef2a616f4bf1eb877710f55bced71d62

Re: 7zip: fix compatib with p7zip

[oreo639]

[-- Attachment #1: Type: text/plain, Size: 230 bytes --]

New comment by oreo639 on void-packages repository

https://github.com/void-linux/void-packages/pull/48740#issuecomment-1949897351

Comment:
> This worked for me

Sorry, I mixed up my words, I meant to say 7zip not file-roller.

Re: 7zip: fix compatib with p7zip

[oreo639]

[-- Attachment #1: Type: text/plain, Size: 223 bytes --]

New comment by oreo639 on void-packages repository

https://github.com/void-linux/void-packages/pull/48740#issuecomment-1949897351

Comment:
> This worked for me

Sorry, I mixed up my words, I meant 7zip not file-roller.

Re: 7zip: fix compatib with p7zip

[oreo639]

[-- Attachment #1: Type: text/plain, Size: 223 bytes --]

New comment by oreo639 on void-packages repository

https://github.com/void-linux/void-packages/pull/48740#issuecomment-1949897351

Comment:
> This worked for me

Sorry, I mixed up my words. I meant 7zip not file-roller.

Re: 7zip: fix compatib with p7zip

[oreo639]

[-- Attachment #1: Type: text/plain, Size: 241 bytes --]

New comment by oreo639 on void-packages repository

https://github.com/void-linux/void-packages/pull/48740#issuecomment-1949897351

Comment:
> This worked for me

Sorry, I mixed up my words. I meant the 7zip return value, not file-roller.