From 97d32d40110f551d7491299e3cf7a939d62860f89b9313c0202cdd568137fb50 Mon Sep 17 00:00:00 2001
From: Wolfgang Rosenauer <wolfgang@rosenauer.org>
Date: Fri, 3 Jan 2020 17:53:06 +0000
Subject: [PATCH] Accepting request 760634 from
 home:AndreasStieger:branches:mozilla:Factory

- enigmail 2.1.5:
  * Security issue: unsigned MIME parts displayed as signed boo#1159973
  * Ensure that upgrading GnuPG 2.0.x to 2.2.x upgrade converts keyring format
  * Make Enigmail Compatible with Protected-Headers spec, draft 2

OBS-URL: https://build.opensuse.org/request/show/760634
OBS-URL: https://build.opensuse.org/package/show/mozilla:Factory/enigmail?expand=0&rev=78
---
 enigmail-2.1.4.tar.gz     |  3 ---
 enigmail-2.1.4.tar.gz.asc | 16 ----------------
 enigmail-2.1.5.tar.gz     |  3 +++
 enigmail-2.1.5.tar.gz.asc | 16 ++++++++++++++++
 enigmail.changes          |  8 ++++++++
 enigmail.spec             |  6 +++---
 6 files changed, 30 insertions(+), 22 deletions(-)
 delete mode 100644 enigmail-2.1.4.tar.gz
 delete mode 100644 enigmail-2.1.4.tar.gz.asc
 create mode 100644 enigmail-2.1.5.tar.gz
 create mode 100644 enigmail-2.1.5.tar.gz.asc

diff --git a/enigmail-2.1.4.tar.gz b/enigmail-2.1.4.tar.gz
deleted file mode 100644
index 5152aea..0000000
--- a/enigmail-2.1.4.tar.gz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:3f77957c5d0b9c144c0bf4a058d5c52cbe37f11eb4320ad2ce6e3d2e8ff81c84
-size 2835488
diff --git a/enigmail-2.1.4.tar.gz.asc b/enigmail-2.1.4.tar.gz.asc
deleted file mode 100644
index 46267d0..0000000
--- a/enigmail-2.1.4.tar.gz.asc
+++ /dev/null
@@ -1,16 +0,0 @@
------BEGIN PGP SIGNATURE-----
-
-iQIzBAABCAAdFiEET5+J9VBawdGiYGMc2xGHud1faTsFAl3ydkIACgkQ2xGHud1f
-aTvdLBAAudN0o+Ir+Qxs4bZ349wLrGfkxSPPJLr+0WkBXTSiCL0kJOAu9r0geTX8
-zecLuAuXWFy8DhxSYSfpRu0awhiP/5oqk76mszkMTNYN1m4CM7gDJ0tNxPM1Vx+K
-so79Uv/2NsdIvZqDHccEpcpbK6tpMcFapNG4G5Sej2Zp++cRZh30QZG5GAv6BzI1
-IMziQA0eVu5g+OH5ii6zSkd4LL9BRBo3sr9WTdAi8RTSE6cQZLu9RCkt48wnkN7n
-vqaax37PYjE/+qLMubupCBnToP8agCmJeEY9byXD3KB7M1dLPXAWlW27lKEtaJi5
-7X0b+JTlUpxLa8xd9l2SUgqOC8XqGdBw04mgqZjilPuYWYmvSxmRjn9hHrFrnayM
-8GMUW6702zCD1s0TsPma4cRPbx6C/b34AWLdVYeqekJocKAsu8usYvt/8kMCu+0h
-1vI6lsXiOStbNpHSaIBs0JcUXpzoHOknslYVV3jNAuBOooWf+di7rFNtzj1WGj09
-Oc9Q5UXYIZpf551pzGg8x2CfH8bpWoMCNSpJdP+SedZ2nUx1qKsDk53SV94TB2wt
-JIZVEmAcn6ZMvQML66DfoUoM0jNT1/4iAfmgI3Da5C1GpEQVdOF8LMl2n9G73iRB
-eqK8uN3EnJemCnXkZobd4y5XCVjAeTjxFYqIWTC7HoD21ART8+s=
-=h6+e
------END PGP SIGNATURE-----
diff --git a/enigmail-2.1.5.tar.gz b/enigmail-2.1.5.tar.gz
new file mode 100644
index 0000000..7c45a48
--- /dev/null
+++ b/enigmail-2.1.5.tar.gz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:77f02fcc289d7fdb19328d1ec5d3b23f6df815ab2b72b69b653ac6d83deccf3b
+size 2838286
diff --git a/enigmail-2.1.5.tar.gz.asc b/enigmail-2.1.5.tar.gz.asc
new file mode 100644
index 0000000..c28986f
--- /dev/null
+++ b/enigmail-2.1.5.tar.gz.asc
@@ -0,0 +1,16 @@
+-----BEGIN PGP SIGNATURE-----
+
+iQIzBAABCAAdFiEET5+J9VBawdGiYGMc2xGHud1faTsFAl4LaW8ACgkQ2xGHud1f
+aTt5JA/9EuegwPzdEME0QWa0nLHV5pGNLEyDq54EiqeiYbKERRS6g/0gDU2wIZ30
+trk6lCOqchgBdQIyAC1HXKMjnBwrahe28BCojteKLqNr19W7ZoFw9dbBQ1npOQGg
+PfnlQjhpV5eBmUJK9yrRY0J+113df+CCbgv+LgKXNiOoq/phVdxR70nf7tniuABy
+EtpfrE+P8iDVt9m9lKcDaNdtEHGQSqK7GlYrY5+CD4Re5u/6qc6OTcsAPuvqRH/u
+mIANCEWrJSyWAcQpC8lcNOF+cb2I4ah4QhaP/oQ6BG3QQ6NCew4OvN6KERvElkM+
+slU58djGhJA3rcItkea0bB8YnUoVgO8G8EGkSdNntNmC3OfNMj7+jGYdAliQWoXb
+cgQpKnYGa4WGhMN1bIqv4PN4HyTbmE/wUouof8HFsFrooKFxy9NPfL/0mIWoCz1c
+D1k6AR2OJf2qZpl5RrEjSSTtIH58VkecwPUmx5U+3a930TnWxiN0RDYvAlL0GGeg
+hwSyJ384NZb2bTOx/Tm1LHBDnv+QA55YcGVns+Ckl9gYjX8b3quW+zKhuIfxbPKU
+KJxX/M8R/ipBe3n9TdAQWgqVfK0LHHD8zoGIXjYUQTuJ42RGShjwiX+XccGZ6eKA
+KMkEDGQEgaUjJqJA6dzUuKRDYQZLD9tCbbqGlUfHmHYDzaTCPU8=
+=IpGt
+-----END PGP SIGNATURE-----
diff --git a/enigmail.changes b/enigmail.changes
index 91bf845..5f60ef9 100644
--- a/enigmail.changes
+++ b/enigmail.changes
@@ -1,3 +1,11 @@
+-------------------------------------------------------------------
+Fri Jan  3 11:46:40 UTC 2020 - Andreas Stieger <andreas.stieger@gmx.de>
+
+- enigmail 2.1.5:
+  * Security issue: unsigned MIME parts displayed as signed boo#1159973
+  * Ensure that upgrading GnuPG 2.0.x to 2.2.x upgrade converts keyring format
+  * Make Enigmail Compatible with Protected-Headers spec, draft 2
+
 -------------------------------------------------------------------
 Sun Dec 15 11:42:00 UTC 2019 - Andreas Stieger <andreas.stieger@gmx.de>
 
diff --git a/enigmail.spec b/enigmail.spec
index 4173634..51d0bb9 100644
--- a/enigmail.spec
+++ b/enigmail.spec
@@ -1,7 +1,7 @@
 #
 # spec file for package enigmail
 #
-# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2020 SUSE LINUX GmbH, Nuernberg, Germany.
 # Copyright (c) 2014 Wolfgang Rosenauer <wr@rosenauer.org>
 #
 # All modifications and additions to the file contributed by third parties
@@ -18,7 +18,7 @@
 
 
 Name:           enigmail
-Version:        2.1.4
+Version:        2.1.5
 Release:        0
 Summary:        OpenPGP addon for Mozilla Thunderbird
 License:        MPL-2.0
@@ -44,7 +44,7 @@ This package contains the Enigmail OpenPGP Addon for Mozilla Thunderbird.
 
 %build
 %configure
-make %{?_smp_mflags}
+make # %{?_smp_mflags}
 
 %install
 # Thunderbird location