Attachment 87741 Details for Bug 70539 – patch v1

[patch] patch v1

0001-Do-not-recognize-all-.asc-files-as-application-pgp-e.patch (text/plain), 2.39 KB, created by Jérémy Bobbio on 2013-10-16 16:30:22 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Jérémy Bobbio

Created: 2013-10-16 16:30:22 UTC

Size: 2.39 KB

patch

obsolete

>From 3b87b1e383dde7cf5620d12892210152aa82e836 Mon Sep 17 00:00:00 2001
>From: =?UTF-8?q?J=C3=A9r=C3=A9my=20Bobbio?= <lunar@debian.org>
>Date: Wed, 16 Oct 2013 11:12:28 +0200
>Subject: [PATCH] Do not recognize all .asc files as application/pgp-encrypted
>
>The change introduced in 2c3438c had the unfortunate effect of having all .asc
>be identified as application/pgp-encrypted. As this should only happen when
>we can identify armor headers, we now give a lower weight than text/plain to
>the *.asc glob for OpenPGP MIME types.
>---
> freedesktop.org.xml.in |    6 +++---
> tests/list             |    3 ++-
> 2 files changed, 5 insertions(+), 4 deletions(-)
>
>diff --git a/freedesktop.org.xml.in b/freedesktop.org.xml.in
>index 2ba7f72..fee07a9 100644
>--- a/freedesktop.org.xml.in
>+++ b/freedesktop.org.xml.in
>@@ -238,7 +238,7 @@ command to generate the output files.
>     </magic>
>     <glob pattern="*.pgp"/>
>     <glob pattern="*.gpg"/>
>-    <glob pattern="*.asc"/>
>+    <glob pattern="*.asc" weight="10"/>
>     <alias type="application/pgp"/>
>   </mime-type>
>   <mime-type type="application/pgp-keys">
>@@ -257,7 +257,7 @@ command to generate the output files.
>     </magic>
>     <glob pattern="*.skr"/>
>     <glob pattern="*.pkr"/>
>-    <glob pattern="*.asc"/>
>+    <glob pattern="*.asc" weight="10"/>
>     <glob pattern="*.pgp"/>
>     <glob pattern="*.gpg"/>
>   </mime-type>
>@@ -268,7 +268,7 @@ command to generate the output files.
>     <magic priority="50">
>       <match type="string" value="-----BEGIN PGP SIGNATURE-----" offset="0"/>
>     </magic>
>-    <glob pattern="*.asc"/>
>+    <glob pattern="*.asc" weight="10"/>
>     <glob pattern="*.sig"/>
>     <glob pattern="*.pgp"/>
>     <glob pattern="*.gpg"/>
>diff --git a/tests/list b/tests/list
>index 9f15364..6b34e7b 100644
>--- a/tests/list
>+++ b/tests/list
>@@ -444,9 +444,10 @@ nrl.trig application/x-trig oxo
> # Copied from http://git.savannah.gnu.org/cgit/gnash.git/plain/testsuite/samples/subshapes.swf
> subshapes.swf application/vnd.adobe.flash.movie
> 
>-COPYING-encrypted.asc application/pgp-encrypted ooo
>+COPYING-encrypted.asc application/pgp-encrypted xoo
> # clear text signatures should not have the same mime type as detached signatures
> COPYING-clearsign.asc application/pgp-signature xxx
>+COPYING-clearsign.asc application/pgp-keys xxx
> COPYING.asc application/pgp-signature xoo
> test-public-key.asc application/pgp-keys xoo
> test-secret-key.skr application/pgp-keys ooo
>-- 
>1.7.10.4
>

Actions: View | Splinter Review

Attachments on bug 70539: 87741 | 115788

Use of freedesktop.org services, including Bugzilla, is subject to our Code of Conduct. How we collect and use information is described in our Privacy Policy.