[PR PATCH] file-roller: fix for inconsistencies between p7zip and 7zip

[PR PATCH] file-roller: fix for inconsistencies between p7zip and 7zip

[oreo639]

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

There is a new pull request by oreo639 against master on the void-packages repository

https://github.com/oreo639/void-packages file-roller
https://github.com/void-linux/void-packages/pull/47978

file-roller: fix for inconsistencies between p7zip and 7zip
<!-- Uncomment relevant sections and delete options which are not applicable -->

#### Testing the changes
- I tested the changes in this PR: **YES**

This fixes so that 'follow symlinks' works when enabled, and does not follow symlinks when the option is disabled.
Currently it follows symlinks when the option is disabled and errors when the option is enabled.

<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->

<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!--
#### 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/47978.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-file-roller-47978.patch --]
[-- Type: text/x-diff, Size: 2165 bytes --]

From e294ae04f0b721674e678586f280e6da3d8cbb0a Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Fri, 29 Dec 2023 07:23:29 -0800
Subject: [PATCH] file-roller: fix for inconsistencies between p7zip and 7zip

---
 .../patches/fix-symlink-handling-7zip.patch   | 22 +++++++++++++++++++
 srcpkgs/file-roller/template                  |  2 +-
 2 files changed, 23 insertions(+), 1 deletion(-)
 create mode 100644 srcpkgs/file-roller/patches/fix-symlink-handling-7zip.patch

diff --git a/srcpkgs/file-roller/patches/fix-symlink-handling-7zip.patch b/srcpkgs/file-roller/patches/fix-symlink-handling-7zip.patch
new file mode 100644
index 0000000000000..6fb0baeb9ff0d
--- /dev/null
+++ b/srcpkgs/file-roller/patches/fix-symlink-handling-7zip.patch
@@ -0,0 +1,22 @@
+file-roller assumes p7zip and assumes that 'follow_links' is disabled by default.
+This is true in p7zip but not 7zip. 7zip does not have a -l flag, and instead provides,
+the -snl and -snh flags for disabling 'follow_links'.
+
+This fixes compressing 7z files with 'follow_links' enabled and compressing files with
+broken symlinks with 'follow_links' disabled.
+--- a/src/fr-command-7z.c.orig
++++ b/src/fr-command-7z.c
+@@ -325,8 +325,11 @@ fr_command_7z_add (FrCommand  *command,
+ 	fr_process_add_arg (command->process, "-bd");
+ 	fr_process_add_arg (command->process, "-bb1");
+ 	fr_process_add_arg (command->process, "-y");
+-	if (follow_links)
+-		fr_process_add_arg (command->process, "-l");
++	if (! follow_links)
++        {
++		fr_process_add_arg (command->process, "-snh");
++		fr_process_add_arg (command->process, "-snl");
++        }
+ 	add_password_arg (command, archive->password, FALSE);
+ 	if ((archive->password != NULL)
+ 	    && (*archive->password != 0)
diff --git a/srcpkgs/file-roller/template b/srcpkgs/file-roller/template
index 826a05a773a0a..75430bcb40702 100644
--- a/srcpkgs/file-roller/template
+++ b/srcpkgs/file-roller/template
@@ -1,7 +1,7 @@
 # Template file for 'file-roller'
 pkgname=file-roller
 version=43.0
-revision=1
+revision=2
 build_style=meson
 hostmakedepends="gettext glib-devel itstool pkg-config desktop-file-utils
  gtk-update-icon-cache"

Re: [PR PATCH] [Updated] file-roller: fix for inconsistencies between p7zip and 7zip

[oreo639]

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

There is an updated pull request by oreo639 against master on the void-packages repository

https://github.com/oreo639/void-packages file-roller
https://github.com/void-linux/void-packages/pull/47978

file-roller: fix for inconsistencies between p7zip and 7zip
<!-- Uncomment relevant sections and delete options which are not applicable -->

#### Testing the changes
- I tested the changes in this PR: **YES**

p7zip and 7zip use different flags for link handling options, which causes errors in file-roller which assumes 7z is p7zip.

This fixes so that 'follow symlinks' works when enabled, and does not follow symlinks when the option is disabled.
Currently it follows symlinks when the option is disabled and errors when the option is enabled.

<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->

<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!--
#### 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/47978.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-file-roller-47978.patch --]
[-- Type: text/x-diff, Size: 2247 bytes --]

From b7638613c2760a1d893831d86feb1532ce20f545 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Fri, 29 Dec 2023 07:23:29 -0800
Subject: [PATCH] file-roller: fix for inconsistencies between p7zip and 7zip

---
 .../patches/fix-symlink-handling-7zip.patch   | 24 +++++++++++++++++++
 srcpkgs/file-roller/template                  |  2 +-
 2 files changed, 25 insertions(+), 1 deletion(-)
 create mode 100644 srcpkgs/file-roller/patches/fix-symlink-handling-7zip.patch

diff --git a/srcpkgs/file-roller/patches/fix-symlink-handling-7zip.patch b/srcpkgs/file-roller/patches/fix-symlink-handling-7zip.patch
new file mode 100644
index 0000000000000..d77864bd9f1f4
--- /dev/null
+++ b/srcpkgs/file-roller/patches/fix-symlink-handling-7zip.patch
@@ -0,0 +1,24 @@
+Based on: https://gitlab.gnome.org/GNOME/file-roller/-/issues/148#note_1382009
+
+file-roller assumes p7zip and assumes that 'follow_links' is disabled by default.
+This is true in p7zip but not 7zip. 7zip does not have a -l flag, and instead provides,
+the -snl and -snh flags for disabling 'follow_links'.
+
+This fixes compressing 7z files with 'follow_links' enabled and compressing files with
+broken symlinks with 'follow_links' disabled.
+--- a/src/fr-command-7z.c.orig
++++ b/src/fr-command-7z.c
+@@ -325,8 +325,11 @@ fr_command_7z_add (FrCommand  *command,
+ 	fr_process_add_arg (command->process, "-bd");
+ 	fr_process_add_arg (command->process, "-bb1");
+ 	fr_process_add_arg (command->process, "-y");
+-	if (follow_links)
+-		fr_process_add_arg (command->process, "-l");
++	if (! follow_links)
++        {
++		fr_process_add_arg (command->process, "-snh");
++		fr_process_add_arg (command->process, "-snl");
++        }
+ 	add_password_arg (command, archive->password, FALSE);
+ 	if ((archive->password != NULL)
+ 	    && (*archive->password != 0)
diff --git a/srcpkgs/file-roller/template b/srcpkgs/file-roller/template
index 826a05a773a0a..75430bcb40702 100644
--- a/srcpkgs/file-roller/template
+++ b/srcpkgs/file-roller/template
@@ -1,7 +1,7 @@
 # Template file for 'file-roller'
 pkgname=file-roller
 version=43.0
-revision=1
+revision=2
 build_style=meson
 hostmakedepends="gettext glib-devel itstool pkg-config desktop-file-utils
  gtk-update-icon-cache"

Re: [PR PATCH] [Updated] file-roller: fix for inconsistencies between p7zip and 7zip

[oreo639]

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

There is an updated pull request by oreo639 against master on the void-packages repository

https://github.com/oreo639/void-packages file-roller
https://github.com/void-linux/void-packages/pull/47978

file-roller: fix for inconsistencies between p7zip and 7zip
<!-- Uncomment relevant sections and delete options which are not applicable -->

#### Testing the changes
- I tested the changes in this PR: **YES**

p7zip and 7zip use different flags for link handling options, which causes errors in file-roller which assumes 7z is p7zip.

This fixes so that 'follow symlinks' works when enabled, and does not follow symlinks when the option is disabled.
Currently it follows symlinks when the option is disabled and errors when the option is enabled.

<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->

<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!--
#### 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/47978.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-file-roller-47978.patch --]
[-- Type: text/x-diff, Size: 2233 bytes --]

From 1ed50a6031af1861b65e7b5fa9cf54d05c835758 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Fri, 29 Dec 2023 07:23:29 -0800
Subject: [PATCH] file-roller: fix for inconsistencies between p7zip and 7zip

---
 .../patches/fix-symlink-handling-7zip.patch   | 24 +++++++++++++++++++
 srcpkgs/file-roller/template                  |  2 +-
 2 files changed, 25 insertions(+), 1 deletion(-)
 create mode 100644 srcpkgs/file-roller/patches/fix-symlink-handling-7zip.patch

diff --git a/srcpkgs/file-roller/patches/fix-symlink-handling-7zip.patch b/srcpkgs/file-roller/patches/fix-symlink-handling-7zip.patch
new file mode 100644
index 0000000000000..74f2b1b660aed
--- /dev/null
+++ b/srcpkgs/file-roller/patches/fix-symlink-handling-7zip.patch
@@ -0,0 +1,24 @@
+Based on: https://gitlab.gnome.org/GNOME/file-roller/-/issues/148#note_1382009
+
+file-roller assumes p7zip and assumes that 'follow_links' is disabled by default.
+This is true in p7zip but not 7zip. 7zip does not have a -l flag, and instead provides,
+the -snl and -snh flags for disabling 'follow_links'.
+
+This fixes compressing 7z files with 'follow_links' enabled and compressing files with
+broken symlinks with 'follow_links' disabled.
+--- a/src/fr-command-7z.c.orig
++++ b/src/fr-command-7z.c
+@@ -325,8 +325,11 @@ fr_command_7z_add (FrCommand  *command,
+ 	fr_process_add_arg (command->process, "-bd");
+ 	fr_process_add_arg (command->process, "-bb1");
+ 	fr_process_add_arg (command->process, "-y");
+-	if (follow_links)
+-		fr_process_add_arg (command->process, "-l");
++	if (! follow_links)
++	{
++		fr_process_add_arg (command->process, "-snh");
++		fr_process_add_arg (command->process, "-snl");
++	}
+ 	add_password_arg (command, archive->password, FALSE);
+ 	if ((archive->password != NULL)
+ 	    && (*archive->password != 0)
diff --git a/srcpkgs/file-roller/template b/srcpkgs/file-roller/template
index 826a05a773a0a..75430bcb40702 100644
--- a/srcpkgs/file-roller/template
+++ b/srcpkgs/file-roller/template
@@ -1,7 +1,7 @@
 # Template file for 'file-roller'
 pkgname=file-roller
 version=43.0
-revision=1
+revision=2
 build_style=meson
 hostmakedepends="gettext glib-devel itstool pkg-config desktop-file-utils
  gtk-update-icon-cache"

Re: [PR PATCH] [Merged]: file-roller: fix for inconsistencies between p7zip and 7zip

[classabbyamp]

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

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

file-roller: fix for inconsistencies between p7zip and 7zip
https://github.com/void-linux/void-packages/pull/47978

Description:
<!-- Uncomment relevant sections and delete options which are not applicable -->

#### Testing the changes
- I tested the changes in this PR: **YES**

p7zip and 7zip use different flags for link handling options, which causes errors in file-roller which assumes 7z is p7zip.

This fixes so that 'follow symlinks' works when enabled, and does not follow symlinks when the option is disabled.
Currently it follows symlinks when the option is disabled and errors when the option is enabled.

<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->

<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!--
#### 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
-->