From 32c1a89afc47df58c2f72e9ddbc94bfdcfc2638e Mon Sep 17 00:00:00 2001
From: Jan Schneider <jan@horde.org>
Date: Fri, 16 Jan 2015 16:44:53 +0100
Subject: [PATCH] [jan] Make dependency on File_ASN1 optional.

Conflicts:
	imp/docs/CHANGES
	imp/package.xml
---
 imp/docs/CHANGES              | 1 +
 imp/lib/Mime/Viewer/Smime.php | 4 ++++
 imp/package.xml               | 9 +++++----
 3 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/imp/docs/CHANGES b/imp/docs/CHANGES
index 5bd1ff4f234..8125df2b473 100644
--- a/imp/docs/CHANGES
+++ b/imp/docs/CHANGES
@@ -56,6 +56,7 @@ v7.0.0-git
 v6.2.6
 ------
 
+[jan] Make dependency on File_ASN1 optional.
 [mms] Fix double listing of mailboxes in certain instances when subscriptions
       are active and unsubscribed mailboxes are shown.
 
diff --git a/imp/lib/Mime/Viewer/Smime.php b/imp/lib/Mime/Viewer/Smime.php
index d34d499480e..cb0a7b2eae4 100644
--- a/imp/lib/Mime/Viewer/Smime.php
+++ b/imp/lib/Mime/Viewer/Smime.php
@@ -427,6 +427,10 @@ protected function _getSmimeType(Horde_Mime_Part $part)
             return strtolower($type);
         }
 
+        if (!class_exists('File_ASN1')) {
+            return null;
+        }
+
         $asn1 = new File_ASN1();
         $decoded = $asn1->decodeBER($part->getContents());
 
diff --git a/imp/package.xml b/imp/package.xml
index 1566c30c78b..8f14fb69ff6 100644
--- a/imp/package.xml
+++ b/imp/package.xml
@@ -1452,10 +1452,6 @@
     <max>3.0.0alpha1</max>
     <exclude>3.0.0alpha1</exclude>
    </package>
-   <package>
-    <name>File_ASN1</name>
-    <channel>phpseclib.sourceforge.net</channel>
-   </package>
    <extension>
     <name>dom</name>
    </extension>
@@ -1491,6 +1487,10 @@
     <max>2.0.0alpha1</max>
     <exclude>2.0.0alpha1</exclude>
    </package>
+   <package>
+    <name>File_ASN1</name>
+    <channel>phpseclib.sourceforge.net</channel>
+   </package>
    <extension>
     <name>openssl</name>
    </extension>
@@ -3732,6 +3732,7 @@
    <date>2015-01-14</date>
    <license uri="http://www.horde.org/licenses/gpl">GPL-2.0</license>
    <notes>
+* [jan] Make dependency on File_ASN1 optional.
 * [mms] Fix double listing of mailboxes in certain instances when subscriptions are active and unsubscribed mailboxes are shown.
    </notes>
   </release>