tetromino 15/05/25 22:35:57
Added: shared-mime-info-1.4-iso-2.patch
shared-mime-info-1.4-iso-1.patch
Log:
Add upstream patches to fix ISO image detection (bug #548676, thanks to
i.Dark_Templar). Add epatch_user.
(Portage version: 2.2.20/cvs/Linux x86_64, signed Manifest commit with key
0x18E5B6F2D8D5EC8D)
Revision Changes Path
1.1
x11-misc/shared-mime-info/files/shared-mime-info-1.4-iso-2.patch
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-misc/shared-mime-info/files/shared-mime-info-1.4-iso-2.patch?rev=1.1&view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-misc/shared-mime-info/files/shared-mime-info-1.4-iso-2.patch?rev=1.1&content-type=text/plain
Index: shared-mime-info-1.4-iso-2.patch
===================================================================
>From 824cff3da0f17812715795f0e64a47f7331a338b Mon Sep 17 00:00:00 2001
From: Bastien Nocera <[email protected]>
Date: Wed, 18 Feb 2015 10:37:36 +0100
Subject: [PATCH] Bump priority for ISO images glob matching
To work-around file managers that cannot use magic to differentiate
mime-types.
https://bugs.freedesktop.org/show_bug.cgi?id=80877
---
freedesktop.org.xml.in | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/freedesktop.org.xml.in b/freedesktop.org.xml.in
index 64f34b9..59e399c 100644
--- a/freedesktop.org.xml.in
+++ b/freedesktop.org.xml.in
@@ -1515,7 +1515,7 @@ command to generate the output files.
<sub-class-of type="application/x-raw-disk-image"/>
<alias type="application/x-iso9660-image"/>
<!-- No magic, see https://bugs.freedesktop.org/show_bug.cgi?id=10049 -->
- <glob pattern="*.iso"/>
+ <glob pattern="*.iso" weight="80"/>
<glob pattern="*.iso9660"/>
</mime-type>
<mime-type type="application/x-cdrdao-toc">
--
2.4.1
1.1
x11-misc/shared-mime-info/files/shared-mime-info-1.4-iso-1.patch
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-misc/shared-mime-info/files/shared-mime-info-1.4-iso-1.patch?rev=1.1&view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-misc/shared-mime-info/files/shared-mime-info-1.4-iso-1.patch?rev=1.1&content-type=text/plain
Index: shared-mime-info-1.4-iso-1.patch
===================================================================
>From 0e93784410db711eef67fa2a56b0ec4bc4b5e08d Mon Sep 17 00:00:00 2001
From: Bastien Nocera <[email protected]>
Date: Sun, 15 Feb 2015 18:43:49 +0100
Subject: [PATCH] Add a note about ISO image magic
And the fact that we cannot implement it here.
---
HACKING | 3 +++
freedesktop.org.xml.in | 1 +
2 files changed, 4 insertions(+)
diff --git a/HACKING b/HACKING
index 260025b..370fb68 100644
--- a/HACKING
+++ b/HACKING
@@ -10,6 +10,9 @@ A few ground rules for people interested in adding new
mime-types.
* Mime-types/file formats proprietary to one application should only
be added to a private .xml file and be bundled with the application
itself
+* Magic offset must be as small as possible. For example, the worst case
+ scenario for ISO images is 32k inside the file. This is too big for a sniff
+ buffer, especially on remote locations. Avoid those.
* No commits should be done that break the test suite, or the test suite
test in question should be amended, and reason for the changes clearly
documented in the commit message
diff --git a/freedesktop.org.xml.in b/freedesktop.org.xml.in
index 7321d40..093c260 100644
--- a/freedesktop.org.xml.in
+++ b/freedesktop.org.xml.in
@@ -1514,6 +1514,7 @@ command to generate the output files.
<_comment>raw CD image</_comment>
<sub-class-of type="application/x-raw-disk-image"/>
<alias type="application/x-iso9660-image"/>
+ <!-- No magic, see https://bugs.freedesktop.org/show_bug.cgi?id=10049 -->
<glob pattern="*.iso"/>
<glob pattern="*.iso9660"/>
</mime-type>
--
2.4.1
