* [gentoo-commits] repo/gentoo:master commit in: app-arch/patool/files/
@ 2024-02-17 14:35 David Seifert
0 siblings, 0 replies; 2+ messages in thread
From: David Seifert @ 2024-02-17 14:35 UTC (permalink / raw
To: gentoo-commits
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 <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")
-
^ permalink raw reply related [flat|nested] 2+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: app-arch/patool/files/
@ 2025-03-11 18:56 Maciej Barć
0 siblings, 0 replies; 2+ messages in thread
From: Maciej Barć @ 2025-03-11 18:56 UTC (permalink / raw
To: gentoo-commits
commit: 3434934908c20a5fa2e203f24cdb35c1eb54b77b
Author: Michael Mair-Keimberger <mmk <AT> levelnine <DOT> at>
AuthorDate: Tue Mar 11 07:01:16 2025 +0000
Commit: Maciej Barć <xgqt <AT> gentoo <DOT> org>
CommitDate: Tue Mar 11 18:55:57 2025 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=34349349
app-arch/patool: remove unused patch(es)
Signed-off-by: Michael Mair-Keimberger <mmk <AT> levelnine.at>
Signed-off-by: Maciej Barć <xgqt <AT> gentoo.org>
.../files/patool-3.1.0-fix-file-5.46-compat.patch | 189 ---------------------
1 file changed, 189 deletions(-)
diff --git a/app-arch/patool/files/patool-3.1.0-fix-file-5.46-compat.patch b/app-arch/patool/files/patool-3.1.0-fix-file-5.46-compat.patch
deleted file mode 100644
index 6d9aeec17639..000000000000
--- a/app-arch/patool/files/patool-3.1.0-fix-file-5.46-compat.patch
+++ /dev/null
@@ -1,189 +0,0 @@
-https://github.com/wummel/patool/pull/173
-
-Used the above PR but removed changes that aren't 100% required.
-
-From d10324eac4429ff3d7d38ad24a19210699229e07 Mon Sep 17 00:00:00 2001
-From: Alfred Wingate <parona@protonmail.com>
-Date: Wed, 11 Dec 2024 06:34:36 +0200
-Subject: [PATCH 1/4] Use application/gzip as the preferred mimetype for gzip
-
-Signed-off-by: Alfred Wingate <parona@protonmail.com>
---- a/patoolib/__init__.py
-+++ b/patoolib/__init__.py
-@@ -127,7 +127,6 @@
- 'application/x-cpio': 'cpio',
- 'application/x-debian-package': 'deb',
- 'application/x-dms': 'dms',
-- 'application/x-gzip': 'gzip',
- 'application/x-iso9660-image': 'iso',
- 'application/x-lz4': 'lz4',
- 'application/x-lzop': 'lzop',
---- a/patoolib/mime.py
-+++ b/patoolib/mime.py
-@@ -135,9 +135,11 @@ def guess_mime(filename: str) -> tuple[str | None, str | None]:
- Mime2Encoding: dict[str, str] = dict(
- [(_val, _key) for _key, _val in Encoding2Mime.items()]
- )
--# libmagic before version 5.14 identified .gz files as application/x-gzip
--Mime2Encoding['application/x-gzip'] = 'gzip'
-
-+LegacyMimeType: dict[str, str] = {
-+ # libmagic before version 5.14 identified .gz files as application/x-gzip
-+ 'application/x-gzip': "application/gzip",
-+}
-
- def guess_mime_mimedb(filename: str) -> tuple[str | None, str | None]:
- """Guess MIME type from given filename.
-@@ -192,6 +194,10 @@ def guess_mime_file(filename: str) -> tuple[str | None, str | None]:
- except (OSError, subprocess.CalledProcessError) as err:
- log_warning(f"error executing {cmd}: {err}")
- mime2 = None
-+
-+ if mime2 in LegacyMimeType:
-+ mime2 = LegacyMimeType[mime2]
-+
- # Some file(1) implementations return an empty or unknown mime type
- # when the uncompressor program is not installed, other
- # implementation return the original file type.
-@@ -227,6 +233,10 @@ def guess_mime_file_mime(
- except OSError as err:
- # ignore errors, as file(1) is only a fallback
- log_warning(f"error executing {cmd}: {err}")
-+
-+ if mime in LegacyMimeType:
-+ mime = LegacyMimeType[mime]
-+
- if mime not in ArchiveMimetypes:
- mime, encoding = None, None
- return mime, encoding
-@@ -253,7 +263,7 @@ def get_file_mime_encoding(parts: Sequence[str]) -> str | None:
- "cpio archive": "application/x-cpio",
- "ASCII cpio archive": "application/x-cpio",
- "Debian binary package": "application/x-debian-package",
-- "gzip compressed data": "application/x-gzip",
-+ "gzip compressed data": "application/gzip",
- "LZMA compressed data": "application/x-lzma",
- "LRZIP compressed data": "application/x-lrzip",
- "lzop compressed data": "application/x-lzop",
---- a/tests/test_mime.py
-+++ b/tests/test_mime.py
-@@ -81,8 +81,8 @@ def test_mime_file(self):
- self.mime_test_file("t.cpio.foo", "application/x-cpio")
- self.mime_test_file("t.deb", "application/x-debian-package")
- self.mime_test_file("t.deb.foo", "application/x-debian-package")
-- self.mime_test_file("t.txt.gz", ("application/gzip", "application/x-gzip"))
-- self.mime_test_file("t.txt.gz.foo", ("application/gzip", "application/x-gzip"))
-+ self.mime_test_file("t.txt.gz", "application/gzip")
-+ self.mime_test_file("t.txt.gz.foo", "application/gzip")
- self.mime_test_file("t.jar", "application/zip")
- self.mime_test_file("t.jar.foo", "application/zip")
- self.mime_test_file("t.txt.lzma", "application/x-lzma")
-
-From e7501d1c7805696ff5b2ecc779f7a56ab2425c3f Mon Sep 17 00:00:00 2001
-From: Alfred Wingate <parona@protonmail.com>
-Date: Wed, 11 Dec 2024 06:37:54 +0200
-Subject: [PATCH 2/4] Change rar mime type to application/vnd.rar
-
-https://github.com/file/file/commit/d46a1f3dbbf58eb510c1779b8bdcc59d5ee24ab9
-https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=1068700
-
-Signed-off-by: Alfred Wingate <parona@protonmail.com>
---- a/patoolib/__init__.py
-+++ b/patoolib/__init__.py
-@@ -136,7 +136,6 @@
- 'application/x-lrzip': 'lrzip',
- 'application/x-lzh': 'lzh',
- 'application/x-ms-wim': 'wim',
-- 'application/x-rar': 'rar',
- 'application/x-redhat-package-manager': 'rpm',
- 'application/x-rpm': 'rpm',
- 'application/x-rzip': 'rzip',
-@@ -147,6 +146,7 @@
- 'application/x-xz': 'xz',
- 'application/x-zip-compressed': 'zip',
- 'application/x-zoo': 'zoo',
-+ 'application/vnd.rar': 'rar',
- 'application/zip': 'zip',
- 'application/zpaq': 'zpaq',
- "application/zstd": "zstd",
---- a/patoolib/mime.py
-+++ b/patoolib/mime.py
-@@ -54,8 +54,8 @@ def add_mimedb_data(mimedb: mimetypes.MimeTypes) -> None:
- add_mimetype(mimedb, 'application/x-lzma', '.lzma')
- add_mimetype(mimedb, 'application/x-xz', '.xz')
- add_mimetype(mimedb, 'application/java-archive', '.jar')
-- add_mimetype(mimedb, 'application/x-rar', '.rar')
-- add_mimetype(mimedb, 'application/x-rar', '.cbr')
-+ add_mimetype(mimedb, 'application/vnd.rar', '.rar')
-+ add_mimetype(mimedb, 'application/vnd.rar', '.cbr')
- add_mimetype(mimedb, 'application/x-7z-compressed', '.7z')
- add_mimetype(mimedb, 'application/x-7z-compressed', '.cb7')
- add_mimetype(mimedb, 'application/x-cab', '.cab')
-@@ -139,8 +139,11 @@ def guess_mime(filename: str) -> tuple[str | None, str | None]:
- LegacyMimeType: dict[str, str] = {
- # libmagic before version 5.14 identified .gz files as application/x-gzip
- 'application/x-gzip': "application/gzip",
-+ # libmagic before version 5.46 identified .rar files as application/x-rar
-+ 'application/x-rar': "application/vnd.rar",
- }
-
-+
- def guess_mime_mimedb(filename: str) -> tuple[str | None, str | None]:
- """Guess MIME type from given filename.
- @return: tuple (mime, encoding)
-@@ -268,7 +271,7 @@ def get_file_mime_encoding(parts: Sequence[str]) -> str | None:
- "LRZIP compressed data": "application/x-lrzip",
- "lzop compressed data": "application/x-lzop",
- "Microsoft Cabinet archive data": "application/vnd.ms-cab-compressed",
-- "RAR archive data": "application/x-rar",
-+ "RAR archive data": "application/vnd.rar",
- "RPM ": "application/x-redhat-package-manager",
- "POSIX tar archive": "application/x-tar",
- "xz compressed data": "application/x-xz",
---- a/tests/test_mime.py
-+++ b/tests/test_mime.py
-@@ -91,10 +91,10 @@ def test_mime_file(self):
- self.mime_test_file("t.txt.lz.foo", "application/x-lzip")
- self.mime_test_file("t.txt.lzo", "application/x-lzop")
- self.mime_test_file("t.txt.lzo.foo", "application/x-lzop")
-- self.mime_test_file("t.rar", "application/x-rar")
-- self.mime_test_file("t.rar.foo", "application/x-rar")
-- self.mime_test_file("t.cbr", "application/x-rar")
-- self.mime_test_file("t.cbr.foo", "application/x-rar")
-+ self.mime_test_file("t.rar", "application/vnd.rar")
-+ self.mime_test_file("t.rar.foo", "application/vnd.rar")
-+ self.mime_test_file("t.cbr", "application/vnd.rar")
-+ self.mime_test_file("t.cbr.foo", "application/vnd.rar")
- self.mime_test_file("t.rpm", "application/x-rpm")
- self.mime_test_file("t.rpm.foo", "application/x-rpm")
- self.mime_test_file("t.tar", "application/x-tar")
-@@ -197,8 +197,8 @@ def test_nested_gzip(self):
- """Test mime detection of archives with double compression"""
- # We won't extract this with rar, as it doesn't support archives wrapped in gzip
- # compression, but we will recognize the archive as a gzip-wrapped rar-file
-- self.mime_test_file("t.rar.gz", "application/x-rar", "gzip")
-- self.mime_test_file("t.rar.gz.foo", "application/x-rar", "gzip")
-+ self.mime_test_file("t.rar.gz", "application/vnd.rar", "gzip")
-+ self.mime_test_file("t.rar.gz.foo", "application/vnd.rar", "gzip")
-
- @needs_program('file')
- @needs_program('gzip')
-@@ -237,7 +237,7 @@ def test_mime_mimedb(self):
- self.mime_test_mimedb("t .bz2", "application/x-bzip2")
- self.mime_test_mimedb("t .bz3", "application/x-bzip3")
- self.mime_test_mimedb("t.cab", "application/x-cab")
-- self.mime_test_mimedb("t.cbr", ("application/rar", "application/x-rar"))
-+ self.mime_test_mimedb("t.cbr", ("application/rar", "application/vnd.rar"))
- self.mime_test_mimedb("t.cpio", "application/x-cpio")
- self.mime_test_mimedb("t.deb", "application/x-debian-package")
- self.mime_test_mimedb("t.gz", "application/gzip")
-@@ -247,7 +247,7 @@ def test_mime_mimedb(self):
- self.mime_test_mimedb("t.txt.lz", "application/x-lzip")
- self.mime_test_mimedb("t.txt.lz4", "application/x-lz4")
- self.mime_test_mimedb("t.lzo", "application/x-lzop")
-- self.mime_test_mimedb("t.rar", ("application/rar", "application/x-rar"))
-+ self.mime_test_mimedb("t.rar", ("application/rar", "application/vnd.rar"))
- self.mime_test_mimedb(
- "t.rpm", ("application/x-redhat-package-manager", "application/x-rpm")
- )
-
^ permalink raw reply related [flat|nested] 2+ messages in thread
end of thread, other threads:[~2025-03-11 18:56 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2024-02-17 14:35 [gentoo-commits] repo/gentoo:master commit in: app-arch/patool/files/ David Seifert
-- strict thread matches above, loose matches on Subject: below --
2025-03-11 18:56 Maciej Barć
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox