From 740fd300fcdd52771b8df9ff6c729610e3647640fcea56f0bbe09eade8541091 Mon Sep 17 00:00:00 2001
From: Andreas Stieger <andreas.stieger@gmx.de>
Date: Mon, 15 May 2017 20:55:07 +0000
Subject: [PATCH] Accepting request 495113 from security:privacy

GnuPG 2.1.21

OBS-URL: https://build.opensuse.org/request/show/495113
OBS-URL: https://build.opensuse.org/package/show/Base:System/gpg2?expand=0&rev=171
---
 gnupg-2.1.19-stronger-defaults.patch |  26 --------------------------
 gnupg-2.1.20.tar.bz2                 |   3 ---
 gnupg-2.1.20.tar.bz2.sig             | Bin 620 -> 0 bytes
 gnupg-2.1.21.tar.bz2                 |   3 +++
 gnupg-2.1.21.tar.bz2.sig             | Bin 0 -> 310 bytes
 gpg2.changes                         |  16 ++++++++++++++++
 gpg2.spec                            |   4 +---
 7 files changed, 20 insertions(+), 32 deletions(-)
 delete mode 100644 gnupg-2.1.19-stronger-defaults.patch
 delete mode 100644 gnupg-2.1.20.tar.bz2
 delete mode 100644 gnupg-2.1.20.tar.bz2.sig
 create mode 100644 gnupg-2.1.21.tar.bz2
 create mode 100644 gnupg-2.1.21.tar.bz2.sig

diff --git a/gnupg-2.1.19-stronger-defaults.patch b/gnupg-2.1.19-stronger-defaults.patch
deleted file mode 100644
index 983dabd..0000000
--- a/gnupg-2.1.19-stronger-defaults.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-From: Andreas Stieger <astieger@suse.com>
-Date: Tue, 14 Mar 2017 20:43:20 +0000
-Subject; FATE#323084: Stronger GnuPG defaults
-References: FATE#323084
-Upstream: no
-
-Index: gnupg-2.1.19/g10/options.skel
-===================================================================
---- gnupg-2.1.19.orig/g10/options.skel
-+++ gnupg-2.1.19/g10/options.skel
-@@ -137,3 +137,15 @@
- # Uncomment the following option to get rid of the copyright notice
- 
- #no-greeting
-+
-+# SUSE recommended output options
-+with-fingerprint
-+keyid-format 0xlong
-+no-emit-version
-+
-+# SUSE recommends SHA-2 family of hashes for all  
-+personal-digest-preferences SHA512 SHA384 SHA256 SHA224
-+default-preference-list SHA512 SHA384 SHA256 AES256 AES192 AES CAST5 BZIP2 ZLIB ZIP Uncompressed
-+cert-digest-algo SHA512
-+digest-algo SHA512
-+
diff --git a/gnupg-2.1.20.tar.bz2 b/gnupg-2.1.20.tar.bz2
deleted file mode 100644
index c7c955c..0000000
--- a/gnupg-2.1.20.tar.bz2
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:24cf9a69369be64a9f6f8cc11a1be33ab7780ad77a6a1b93719438f49f69960d
-size 6456128
diff --git a/gnupg-2.1.20.tar.bz2.sig b/gnupg-2.1.20.tar.bz2.sig
deleted file mode 100644
index 4bc8e1445f537f27264f693f57628e158bf6f7d2bbf26b814ab18e907cd136a9..0000000000000000000000000000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 620
zcmV-y0+aoT0W$;u0SEvc79j-KX(1!T23_i24?49Zn>o@?CF8aQ0$Adn3IGZT5G0#9
z(oZGhwvnC)0H1RXVvfvD1I4M68EjK;$fIM3y3Pa+by<*s#)NpL=gL!Tn;fT*XTukd
zkv&Dx0}z)JEF_fARc$S`Th^>O2T<<T8`3u=XSV`OrRABd#CAu6`dN%rQR3z_5Sc^p
z7MalDt@`%6?(Gl@t_5(02G&=y-=C3`6H=)Moiyjfk038eShJ6XHu1r3no*b65bjOY
zxDN}~i5sg%OlzM(J;^a&Q2Ao;`)bz^!79#ysJ6rNY-e?|1Y?fdT*H6ey3K1YcPVen
zSkX9Drl2J5p~OK9)VqWJ>*On~lV-u#veLWqFyU0S@v=BU-?(_%Kot}izZoG?yE+rX
zGJ5`FrilSF1ONdD038+~1OpzzQ*Kxdj-rOC@*r`riZi`G1_c6G<9*No3JDM(aj=Rr
zy*~!0@CW}&$@dt`{v*T2Tby17fLqwl%2)^-arD@s9&s!V$D)^o;{XZMqusCr$(tg2
zgSdbscym+SKdk2abXCPmBaC?JC6kR%lpKMl^RTWJTUpu$AF(1bns}hZ6X4kMAs2&0
zQbOTnKX(Wtk<KdbEk|eH@1GCsV8N8Q>2=Xqt-YY}z%3Rdr7*GyPOK89$y?y35Rz%$
zV^7Z8lFOAO)#d{T*rE3?w`*}K>TdulG@w&dZr)DJ?bY*egXE;-YL)&aiZT-DCLX8K
zZo_zcEn<kYiVytM-0M^w{HMJmbeD$e@51NZKwAbp4$jt<g=DrJ;B+E>r9m(_PGq0e
GCg0b%WGFiT

diff --git a/gnupg-2.1.21.tar.bz2 b/gnupg-2.1.21.tar.bz2
new file mode 100644
index 0000000..dc0cbdc
--- /dev/null
+++ b/gnupg-2.1.21.tar.bz2
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:7aead8a8ba75b69866f583b6c747d91414d523bfdfbe9a8e0fe026b16ba427dd
+size 6472887
diff --git a/gnupg-2.1.21.tar.bz2.sig b/gnupg-2.1.21.tar.bz2.sig
new file mode 100644
index 0000000000000000000000000000000000000000000000000000000000000000..0bbb1e244da57f4d6b288a842bf60598d0b35c95543c91255da4d06fbf94b38f
GIT binary patch
literal 310
zcmV-60m=S}0W$;u0SEvc79j-KX(1!T23_i24?49Zn>o@?CF8aQ0$CZkxBv<X5G0#9
z(oZGhwze|||5Qmk;jhn=u0rh2p~ZG>Aq9>LT2mnd+@Z;zfg<yVX5Mqd6haB^WW6xG
z1F&LolRD|2Eo_c*KR01dN7E8|84bFL;G}!35Ze7LnSO(u9?Y4Mr2F&>-WR^`VT|36
zbBD4d1>H-UPdc3n*oal*N`=Jbq_w(qnpInQ_K|f8gFf4tV~+w%$q-NPG@Nr;8g#=W
zhR6DdJK?=Y4mw><z7259ilPa_(D?8=n?<wmp|>#cA0t|2gtbP;a{iWBtfQU<Eb!RN
zNVU<(LSfS17nDAzGU!iTmkL`O13!2TMHCxP7Fwc%y?~$4(ubV{i^xCSborLA%h!S0
I0!=&z-Uqyp!2kdN

literal 0
HcmV?d00001

diff --git a/gpg2.changes b/gpg2.changes
index 67513e1..0ffc0eb 100644
--- a/gpg2.changes
+++ b/gpg2.changes
@@ -1,3 +1,19 @@
+-------------------------------------------------------------------
+Mon May 15 20:49:25 UTC 2017 - astieger@suse.com
+
+- GnuPG 2.1.21:
+  * gpg,gpgsm: Fix corruption of old style keyring.gpg files,
+    regression in 2.1.20
+  * gpg,dirmngr: Removed the skeleton config file support
+    New installations no longer generate a configuration file.
+    In the absence of a file, SHA-2 family hashes are used.
+    Existing configurations are not touched.   
+    drop gnupg-2.1.19-stronger-defaults.patch FATE#323084 
+  * gpg: Fixed import filter property match bug.
+  * scd: Removed Linux support for Cardman 4040 PCMCIA reader.
+  * scd: Fixed some corner case bugs in resume/suspend handling.
+  * Many minor bug fixes and code cleanup.  
+
 -------------------------------------------------------------------
 Tue Apr  4 14:00:36 UTC 2017 - astieger@suse.com
 
diff --git a/gpg2.spec b/gpg2.spec
index 8af4583..3b2b5e6 100644
--- a/gpg2.spec
+++ b/gpg2.spec
@@ -17,7 +17,7 @@
 
 
 Name:           gpg2
-Version:        2.1.20
+Version:        2.1.21
 Release:        0
 Summary:        File encryption, decryption, signature creation and verification utility
 License:        GPL-3.0+
@@ -34,7 +34,6 @@ Patch6:         gnupg-dont-fail-with-seahorse-agent.patch
 Patch8:         gnupg-set_umask_before_open_outfile.patch
 Patch9:         gnupg-detect_FIPS_mode.patch
 Patch11:        gnupg-add_legacy_FIPS_mode_option.patch
-Patch12:        gnupg-2.1.19-stronger-defaults.patch
 BuildRequires:  expect
 BuildRequires:  fdupes
 BuildRequires:  libassuan-devel >= 2.4.3
@@ -87,7 +86,6 @@ gpg2 provides GPGSM, gpg-agent, and a keybox library.
 %patch8 -p1
 %patch9 -p1
 %patch11 -p1
-%patch12 -p1
 
 %build
 date=$(date -u +%%Y-%%m-%%dT%%H:%%M+0000 -r %{SOURCE99})