Bug#935392: buster-pu: package sogo/4.0.7-1+deb10u1

[Jordi Mallach <jordi@debian.org>]

Package: release.debian.org
Severity: normal
Tags: buster
User: release.debian.org@packages.debian.org
Usertags: pu

Hi,

I'm requesting permission to upload sogo to stable-pu, to fix a high impact
usability bug when dealing with S/MIME signed emails.

Debdiff follows.

Thanks!
Jordi


diff -Nru sogo-4.0.7/debian/changelog sogo-4.0.7/debian/changelog
--- sogo-4.0.7/debian/changelog	2019-02-28 01:43:48.000000000 +0100
+++ sogo-4.0.7/debian/changelog	2019-08-01 14:19:34.000000000 +0200
@@ -1,3 +1,12 @@
+sogo (4.0.7-1+deb10u1) buster; urgency=medium
+
+  * Omit signedViewer altogether when not using openssl.
+    Thanks Hanno Stock <hanno.stock@indurad.com> for the patch.
+    (Closes: #889994)
+  * Set debian-branch to buster in gbp.conf.
+
+ -- Jordi Mallach <jordi@debian.org>  Thu, 01 Aug 2019 14:19:34 +0200
+
 sogo (4.0.7-1) unstable; urgency=medium
 
   * New upstream release.
diff -Nru sogo-4.0.7/debian/gbp.conf sogo-4.0.7/debian/gbp.conf
--- sogo-4.0.7/debian/gbp.conf	2019-01-10 09:44:25.000000000 +0100
+++ sogo-4.0.7/debian/gbp.conf	2019-08-01 14:18:41.000000000 +0200
@@ -1,5 +1,5 @@
 [DEFAULT]
 pristine-tar = True
-debian-branch = debian
+debian-branch = buster
 upstream-branch=upstream
 upstream-vcs-tag = SOGo-%(version)s
diff -Nru sogo-4.0.7/debian/patches/0009-Omit-signedViewer-altogether-when-not-using-openssl.patch sogo-4.0.7/debian/patches/0009-Omit-signedViewer-altogether-when-not-using-openssl.patch
--- sogo-4.0.7/debian/patches/0009-Omit-signedViewer-altogether-when-not-using-openssl.patch	1970-01-01 01:00:00.000000000 +0100
+++ sogo-4.0.7/debian/patches/0009-Omit-signedViewer-altogether-when-not-using-openssl.patch	2019-08-01 14:17:24.000000000 +0200
@@ -0,0 +1,25 @@
+From: Hanno Stock <hanno.stock@indurad.com>
+Date: Tue, 30 Jul 2019 16:32:59 +0200
+Subject: Omit signedViewer altogether when not using openssl
+
+---
+ UI/MailPartViewers/UIxMailRenderingContext.m | 4 ++++
+ 1 file changed, 4 insertions(+)
+
+diff --git a/UI/MailPartViewers/UIxMailRenderingContext.m b/UI/MailPartViewers/UIxMailRenderingContext.m
+index e2cf011..2086d96 100644
+--- a/UI/MailPartViewers/UIxMailRenderingContext.m
++++ b/UI/MailPartViewers/UIxMailRenderingContext.m
+@@ -192,7 +192,11 @@ static BOOL showNamedTextAttachmentsInline = NO;
+ 	  || [st isEqualToString: @"appledouble"])
+ 	return [self mixedViewer];
+       else if ([st isEqualToString: @"signed"])
++#ifdef HAVE_OPENSSL
+ 	return [self signedViewer];
++#else
++	return [self mixedViewer];
++#endif
+       else if ([st isEqualToString: @"alternative"])
+ 	return [self alternativeViewer];
+     
+
\ No hi ha cap caràcter de salt de línia al final del fitxer
diff -Nru sogo-4.0.7/debian/patches/series sogo-4.0.7/debian/patches/series
--- sogo-4.0.7/debian/patches/series	2019-02-26 13:24:47.000000000 +0100
+++ sogo-4.0.7/debian/patches/series	2019-08-01 14:17:24.000000000 +0200
@@ -5,3 +5,4 @@
 disable_test_rendering.patch
 0007-Do-not-use-OpenSSL-when-we-are-configured-to-use-Gnu.patch
 0008-Unset-MAKEFLAGS-and-MFLAGS-in-configure.patch
+0009-Omit-signedViewer-altogether-when-not-using-openssl.patch

-- System Information:
Debian Release: bullseye/sid
  APT prefers unstable-debug
  APT policy: (500, 'unstable-debug'), (500, 'unstable'), (1, 'experimental')
Architecture: amd64 (x86_64)
Foreign Architectures: i386

Kernel: Linux 5.2.0-2-amd64 (SMP w/4 CPU cores)
Kernel taint flags: TAINT_OOT_MODULE, TAINT_UNSIGNED_MODULE
Locale: LANG=ca_ES.UTF-8, LC_CTYPE=ca_ES.UTF-8 (charmap=UTF-8), LANGUAGE=ca_ES:ca (charmap=UTF-8)
Shell: /bin/sh linked to /bin/dash
Init: systemd (via /run/systemd/system)
LSM: AppArmor: enabled