commit: 8abca04cd66a413d8426ebc2ba94525f675d0413 Author: Michael Mair-Keimberger <mmk <AT> levelnine <DOT> at> AuthorDate: Sat Feb 17 14:35:09 2024 +0000 Commit: David Seifert <soap <AT> gentoo <DOT> org> CommitDate: Sat Feb 17 14:35:09 2024 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8abca04c
app-arch/patool: remove unused patch(es) Signed-off-by: Michael Mair-Keimberger <mmk <AT> levelnine.at> Signed-off-by: David Seifert <soap <AT> gentoo.org> ...atool-1.12_p20230424-disable-file-sandbox.patch | 28 -------------------- ...p20230424-map-vnd.android.package-archive.patch | 30 ---------------------- 2 files changed, 58 deletions(-) diff --git a/app-arch/patool/files/patool-1.12_p20230424-disable-file-sandbox.patch b/app-arch/patool/files/patool-1.12_p20230424-disable-file-sandbox.patch deleted file mode 100644 index daf48adef41a..000000000000 --- a/app-arch/patool/files/patool-1.12_p20230424-disable-file-sandbox.patch +++ /dev/null @@ -1,28 +0,0 @@ -https://github.com/wummel/patool/pull/131 -https://github.com/wummel/patool/issues/75 - -From abe06b7d8fbcd177d44f8eb8e3ac195badc70d25 Mon Sep 17 00:00:00 2001 -From: Alfred Wingate <par...@protonmail.com> -Date: Thu, 7 Sep 2023 01:12:26 +0300 -Subject: [PATCH] Disable sandbox for file(1) to allow correct output for - compressed tar's - -* Otherwise file(1) will refuse with - "Fork-is-required-to-uncompress--but-disabled" - -Closes: https://github.com/wummel/patool/issues/75 -Signed-off-by: Alfred Wingate <par...@protonmail.com> ---- a/patoolib/util.py -+++ b/patoolib/util.py -@@ -240,7 +240,7 @@ def guess_mime_file (filename): - encoding = None - if mime in Mime2Encoding: - # try to look inside compressed archives -- cmd = [file_prog, "--brief", "--mime", "--uncompress", filename] -+ cmd = [file_prog, "--brief", "--mime", "--uncompress", "--no-sandbox", filename] - try: - outparts = backtick(cmd).strip().split(";") - mime2 = outparts[0].split(" ", 1)[0] --- -2.42.0 - diff --git a/app-arch/patool/files/patool-1.12_p20230424-map-vnd.android.package-archive.patch b/app-arch/patool/files/patool-1.12_p20230424-map-vnd.android.package-archive.patch deleted file mode 100644 index a525ff2d0e46..000000000000 --- a/app-arch/patool/files/patool-1.12_p20230424-map-vnd.android.package-archive.patch +++ /dev/null @@ -1,30 +0,0 @@ -https://github.com/wummel/patool/pull/130 - -From e8a1eea1d273b278a1b6f5029d2e21cb18bc9ffd Mon Sep 17 00:00:00 2001 -From: Theodore Ni <3806110+t...@users.noreply.github.com> -Date: Sat, 26 Aug 2023 23:42:15 -0700 -Subject: [PATCH] Map application/vnd.android.package-archive to zip - -This was added to file 5.45 in https://github.com/file/file/commit/b29519e7dc572d85f757314d3bfc7461ceb7709c -and the test .apk file is sometimes detected with that mime type. ---- a/patoolib/__init__.py -+++ b/patoolib/__init__.py -@@ -84,6 +84,7 @@ - 'application/x-xz': 'xz', - 'application/x-zip-compressed': 'zip', - 'application/x-zoo': 'zoo', -+ 'application/vnd.android.package-archive': 'zip', - 'application/zip': 'zip', - 'application/zpaq': 'zpaq', - "application/zstd": "zstd", ---- a/tests/test_mime.py -+++ b/tests/test_mime.py -@@ -137,7 +137,7 @@ def test_mime_file (self): - self.mime_test_file("t.chm.foo", "application/x-chm") - self.mime_test_file("t.iso", "application/x-iso9660-image") - self.mime_test_file("t.epub", "application/zip") -- self.mime_test_file("t.apk", ("application/zip", "application/java-archive", "application/jar")) -+ self.mime_test_file("t.apk", ("application/zip", "application/java-archive", "application/jar", "application/vnd.android.package-archive")) - self.mime_test_file("t.zpaq", "application/zpaq") - self.mime_test_file("t.zpaq.foo", "application/zpaq") -
