Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

mc: update to 4.8.31. #48669

Merged
merged 1 commit into from Feb 14, 2024
Merged

mc: update to 4.8.31. #48669

merged 1 commit into from Feb 14, 2024

Conversation

0x5c
Copy link
Contributor

@0x5c 0x5c commented Feb 12, 2024

Removed the mksh patch since it was purely adding a feature that isn't related to void, hasn't been accepted by upstream (yet?), and that the correctness of which is unclear. I also don't use mksh and have no way to ensure the patch is still good or remains good in the future. See: https://midnight-commander.org/ticket/3748

Testing the changes

  • I tested the changes in this PR: YES

Removed the mksh patch since it was purely adding a feature that isn't
related to void, hasn't been accepted by upstream (yet?), and that the
correctness of which is unclear. I also don't use mksh and have no way
to ensure the patch is still good or remains good in the future.
See: https://midnight-commander.org/ticket/3748
@chrysos349
Copy link
Contributor

  1. add python_version=3 to the template, and remove extfs-python3.patch

  2. xbps is a zstd-compressed data, not xz. i know somehow it works even with the current patch, but you might as well modify xbps.patch .

--- a/misc/mc.ext.ini.in
+++ b/misc/mc.ext.ini.in
@@ -254,9 +254,9 @@
 Open=%cd %p/utar://
 View=%view{ascii} @EXTHELPERSDIR@/archive.sh view tar.xz
 
-# .tar.zst, .tzst
+# .tar.zst, .tzst, .xbps
 [tar.zst]
-Regex=\\.t(ar\\.zst|zst)$
+Regex=\\.(t(ar\\.zst|zst)|xbps)$
 Open=%cd %p/utar://
 View=%view{ascii} @EXTHELPERSDIR@/archive.sh view tar.zst

@0x5c
Copy link
Contributor Author

0x5c commented Feb 12, 2024

xbps is a zstd-compressed data, not xz. i know somehow it works even with the current patch, but you might as well modify xbps.patch

xbps packages files are compressed using one of many formats supported by xbps, of which zstd is only a recent addition; there are no correct place for that entry

add python_version=3 to the template, and remove extfs-python3.patch

It was already there, it works, and I'm not modifying that PR just for that
Additionally, the conversion happens regardless without `python_version=3, and the s3+ extfs is not currently possible to run on void without messing with the interpreter in the first place; we dont ship the older python3-boto

-Regex=\.t(ar\.xz|xz)$
+Regex=\.(t(ar\.xz|xz)|xbps)$
-Regex=\\.t(ar\\.xz|xz)$
+Regex=\\.(t(ar\\.xz|xz)|xbps)$
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

.xbps is .tar.zst nowaday.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

As stated above, there are no correct places for it, it could be anywhere
This mechanism does autodetection of compression, and seemingly can't even be forced to read an archive differently than what the autodetection picks.

@classabbyamp classabbyamp merged commit 9c58265 into void-linux:master Feb 14, 2024
8 checks passed
@0x5c 0x5c deleted the update/mc branch February 14, 2024 23:39
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

4 participants