[pkg-horde] Bug#860573: unblock: php-horde-imp/6.2.17-2

[Mathieu Parent]

Package: release.debian.org
Severity: normal
User: release.debian.org at packages.debian.org
Usertags: unblock

Please unblock package php-horde-imp

This is to fix "sending email after attch_body_check hook fails" (#859048).

Debdiff is attached.

unblock php-horde-imp/6.2.17-2

-- System Information:
Debian Release: 9.0
  APT prefers testing-debug
  APT policy: (500, 'testing-debug'), (500, 'testing')
Architecture: amd64 (x86_64)
Foreign Architectures: i386

Kernel: Linux 4.9.0-2-amd64 (SMP w/2 CPU cores)
Locale: LANG=fr_FR.utf8, LC_CTYPE=fr_FR.utf8 (charmap=UTF-8)
Shell: /bin/sh linked to /usr/bin/dash
Init: systemd (via /run/systemd/system)
-------------- next part --------------
diff -Nru php-horde-imp-6.2.17/debian/changelog php-horde-imp-6.2.17/debian/changelog
--- php-horde-imp-6.2.17/debian/changelog	2016-12-18 22:21:45.000000000 +0100
+++ php-horde-imp-6.2.17/debian/changelog	2017-04-18 21:59:43.000000000 +0200
@@ -1,3 +1,9 @@
+php-horde-imp (6.2.17-2) unstable; urgency=medium
+
+  * Fix sending email after attch_body_check hook fails (Closes: #859048)
+
+ -- Mathieu Parent <sathieu at debian.org>  Tue, 18 Apr 2017 21:59:43 +0200
+
 php-horde-imp (6.2.17-1) unstable; urgency=medium
 
   * New upstream version 6.2.17
diff -Nru php-horde-imp-6.2.17/debian/patches/0001-Bug-14610-Fix-sending-email-after-attch_body_check-h.patch php-horde-imp-6.2.17/debian/patches/0001-Bug-14610-Fix-sending-email-after-attch_body_check-h.patch
--- php-horde-imp-6.2.17/debian/patches/0001-Bug-14610-Fix-sending-email-after-attch_body_check-h.patch	1970-01-01 01:00:00.000000000 +0100
+++ php-horde-imp-6.2.17/debian/patches/0001-Bug-14610-Fix-sending-email-after-attch_body_check-h.patch	2017-04-18 21:59:43.000000000 +0200
@@ -0,0 +1,30 @@
+From 9333bcbcdf64176e824858dfe2004f801b549f19 Mon Sep 17 00:00:00 2001
+From: Michael J Rubinsky <mrubinsk at horde.org>
+Date: Thu, 13 Apr 2017 15:32:35 -0400
+Subject: [PATCH] Bug: 14610 Fix sending email after attch_body_check hook
+ fails.
+
+Need to add the compose object to the queue if we catch this
+exception since the SmartMobile view does not get the cacheid when
+the compose page is "loaded" since it's not (re)generated on each
+compose action.
+---
+ imp/lib/Ajax/Application/Handler/Common.php | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/imp-6.2.17/lib/Ajax/Application/Handler/Common.php b/imp-6.2.17/lib/Ajax/Application/Handler/Common.php
+index 83df6c9af2..f853be959a 100644
+--- a/imp-6.2.17/lib/Ajax/Application/Handler/Common.php
++++ b/imp-6.2.17/lib/Ajax/Application/Handler/Common.php
+@@ -578,7 +578,7 @@ class IMP_Ajax_Application_Handler_Common extends Horde_Core_Ajax_Application_Ha
+             return $result;
+         } catch (IMP_Compose_Exception $e) {
+             $result->success = 0;
+-
++            $this->_base->queue->compose($imp_compose);
+             if (is_null($e->tied_identity)) {
+                 $notify_level = 'horde.error';
+             } else {
+-- 
+2.11.0
+
diff -Nru php-horde-imp-6.2.17/debian/patches/series php-horde-imp-6.2.17/debian/patches/series
--- php-horde-imp-6.2.17/debian/patches/series	1970-01-01 01:00:00.000000000 +0100
+++ php-horde-imp-6.2.17/debian/patches/series	2017-04-18 21:59:43.000000000 +0200
@@ -0,0 +1 @@
+0001-Bug-14610-Fix-sending-email-after-attch_body_check-h.patch