gentoo auto-resync : 17:02:2024 - 17:37:38

3 files changed, 0 insertions, 60 deletions

diff --git a/app-arch/patool/Manifest b/app-arch/patool/Manifest
index 8d8be7f3e271..36430c230912 100644
--- a/app-arch/patool/Manifest
+++ b/app-arch/patool/Manifest
@@ -1,5 +1,3 @@
-AUX patool-1.12_p20230424-disable-file-sandbox.patch 1032 BLAKE2B 6c5f0447b1c9d037f78dcfb17d4638a549a170b941aa4724ce7a2d80251e8225c970e7962802cb21a9b23af4338543838dfcceb18c44023a96b41b62c7f9b6cb SHA512 a9919888af4cc71cfd73f0dddfe9958fe33c9f3c3a586fe0fea64ebcb6f9a7267e7d7de07383219daacc5e5a5208c214a26306425cbc77ce8db83d842592224e
-AUX patool-1.12_p20230424-map-vnd.android.package-archive.patch 1451 BLAKE2B 0d3cb6076fc8229c9500b635e8a1c5c105fc254ae190ceabff91f157a9c8cab6c25b25d06e1857ec61fbc5317f7393a18075037a8e003bae3a9e90222558da44 SHA512 cbfafbb76449c1a8f9e2250ba2b0de4397dc327c0173ea4d4b90f34f0a5ed68cadda8e060e8f4da01e7da8e445f569d18f637760fb61e8047f72862e6515f5d3
 DIST patool-1.15.0.tar.gz 1993753 BLAKE2B 18dbbb6d73862778af9774b64f192e20d48f1454c078a2ab0bf9ccf12f3de988b7799c5e6116b1f49fe48b2512968789d363e37aa504d622a72c22a620398f5f SHA512 c7cbcd829a803025a99df67c8d4aca1d803d3bd8e06f2897c65bc0e2475fbd42e273654f978090fe4c2bbcac02e5d1f8e322cb90220e746ac9ef9d0755e0c717
 DIST patool-2.0.0.tar.gz 1987911 BLAKE2B a9c12f8083e82835792445f50e1e72f55e98c505f0019656cd00c1f882a860ae61c7484ea16c7744101b6a983c1934fad12dbb58af2a03e82d0ec4ceb417aa92 SHA512 c81a65fa89ff77ee80ae85fbc6868e5414d5141e47433028546273b3a231ce3240d6b30baae114247bc0ab0b3e4e91c6e127b8734eff9af8721abdae7f464ef5
 DIST patool-2.1.1.tar.gz 1991183 BLAKE2B f33c92c628ffcca349ad897c29cec935730aba7f2e9a5581acedb9b3ecb0bab22046cd16af9f2d2e605bc483c2dc624db01b52dea8459388a8b140b7f357b193 SHA512 3b51fe917da9672dbeae015852680b67e81ec35d609af3e465f0d53afb12c35bee885f4f3db4a135c01521cc70db182b27fc25320d141f96eaf098ba99524f63
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 <parona@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 <parona@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+tjni@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")
-