Attachment 31182 Details for Bug 22859 – Updated patch against current git

[patch] Updated patch against current git

0003-Add-application-x-java-keystore-and-application-x-ja.patch (text/plain), 2.61 KB, created by Ville Skyttä on 2009-11-13 12:20:13 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Ville Skyttä

Created: 2009-11-13 12:20:13 UTC

Size: 2.61 KB

patch

obsolete

>From f2d8973ffdee37e4408bfbe2562aa77cac5cb1c0 Mon Sep 17 00:00:00 2001
>From: =?utf-8?q?Ville=20Skytt=C3=A4?= <ville.skytta@iki.fi>
>Date: Fri, 13 Nov 2009 22:12:51 +0200
>Subject: [PATCH 3/5] Add application/x-java-keystore and application/x-java-jce-keystore.
>
>---
> freedesktop.org.xml.in |   18 ++++++++++++++++++
> tests/list             |    2 ++
> tests/test.jceks       |  Bin 0 -> 32 bytes
> tests/test.jks         |  Bin 0 -> 32 bytes
> 4 files changed, 20 insertions(+), 0 deletions(-)
> create mode 100644 tests/test.jceks
> create mode 100644 tests/test.jks
>
>diff --git a/freedesktop.org.xml.in b/freedesktop.org.xml.in
>index 160b46b..7ffb888 100644
>--- a/freedesktop.org.xml.in
>+++ b/freedesktop.org.xml.in
>@@ -1757,6 +1757,24 @@ command to generate the output files.
>       <match type="string" value="&lt;jnlp" offset="0:256"/>
>     </magic>
>   </mime-type>
>+  <mime-type type="application/x-java-keystore">
>+    <_comment>Java keystore</_comment>
>+    <magic priority="50">
>+      <match type="host32" value="0xfeedfeed" offset="0"/>
>+    </magic>
>+    <glob pattern="*.jks"/>
>+    <glob pattern="*.ks"/>
>+    <glob pattern="cacerts"/>
>+  </mime-type>
>+  <mime-type type="application/x-java-jce-keystore">
>+    <_comment>Java JCE keystore</_comment>
>+    <acronym>JCE</acronym>
>+    <expanded-acronym>Java Cryptography Extension</expanded-acronym>
>+    <magic priority="50">
>+      <match type="host32" value="0xcececece" offset="0"/>
>+    </magic>
>+    <glob pattern="*.jceks"/>
>+  </mime-type>
>   <mime-type type="application/x-java-pack200">
>     <_comment>Pack200 Java archive</_comment>
>     <generic-icon name="package-x-generic"/>
>diff --git a/tests/list b/tests/list
>index 31f2ea7..52cea85 100644
>--- a/tests/list
>+++ b/tests/list
>@@ -235,6 +235,8 @@ bluerect.mdi image/vnd.ms-modi
> Stallman_Richard_-_The_GNU_Manifesto.fb2 application/x-fictionbook+xml
> test.p7b application/x-pkcs7-certificates ox
> test.pkipath application/pkix-pkipath ox
>+test.jks application/x-java-keystore
>+test.jceks application/x-java-jce-keystore
> test.sav application/x-spss-sav
> test.por application/x-spss-por
> core application/x-core ox
>diff --git a/tests/test.jceks b/tests/test.jceks
>new file mode 100644
>index 0000000000000000000000000000000000000000..272cc6d00e1589d0844e1cb76f221dc08a823c85
>GIT binary patch
>literal 32
>ncmX?i?%X*B1_mY|W_apiEysL%Uh%G_KR6?$pERk|>^K4d!;uW~
>
>literal 0
>HcmV?d00001
>
>diff --git a/tests/test.jks b/tests/test.jks
>new file mode 100644
>index 0000000000000000000000000000000000000000..4fc536b71cebe6e5c3d1676b29098ffd7955212e
>GIT binary patch
>literal 32
>ncmezO_TO6u1_mY|W(eQ6M?GngY{CCe5_cmr80G&tS!DtM+vW`n
>
>literal 0
>HcmV?d00001
>
>-- 
>1.6.2.5
>

Actions: View | Splinter Review

Attachments on bug 22859: 27856 | 27857 | 27858 | 31182

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.