From f46310c7ed0864bc2d2ac3c440b302ed0ba802ad Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=A9r=C3=A9my=20Bobbio?= <lunar@debian.org>
Date: Wed, 25 Sep 2013 09:54:21 +0200
Subject: [PATCH] Do not recognize OpenPGP clear text signatures as
 application/pgp-signature

RFC 3156 do not define the application/pgp-signature MIME type as
covering clear text signatures. We should not recognize clear text
signatures armor header as such.
---
 freedesktop.org.xml.in |    1 -
 tests/list             |    3 ++-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/freedesktop.org.xml.in b/freedesktop.org.xml.in
index 0ddf422..4a688f6 100644
--- a/freedesktop.org.xml.in
+++ b/freedesktop.org.xml.in
@@ -266,7 +266,6 @@ command to generate the output files.
     <sub-class-of type="text/plain"/>
     <generic-icon name="text-x-generic"/>
     <magic priority="50">
-      <match type="string" value="-----BEGIN PGP SIGNED MESSAGE-----" offset="0"/>
       <match type="string" value="-----BEGIN PGP SIGNATURE-----" offset="0"/>
     </magic>
     <glob pattern="*.asc"/>
diff --git a/tests/list b/tests/list
index df522ca..8f759bb 100644
--- a/tests/list
+++ b/tests/list
@@ -438,7 +438,8 @@ nrl.trig application/x-trig oxo
 subshapes.swf application/vnd.adobe.flash.movie
 
 COPYING-encrypted.asc application/pgp-encrypted ooo
-COPYING-clearsign.asc application/pgp-signature xoo
+# clear text signatures should not have the same mime type as detached signatures
+COPYING-clearsign.asc application/pgp-signature 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