From b3c008d868eaa6ccadcbd0577d3d5eed3002218558e2c0f86f67d7a988c72379 Mon Sep 17 00:00:00 2001
From: Andreas Stieger <andreas.stieger@gmx.de>
Date: Sun, 25 Feb 2018 12:21:00 +0000
Subject: [PATCH 1/2] Accepting request 579922 from security:privacy

GnuPG 2.2.5

OBS-URL: https://build.opensuse.org/request/show/579922
OBS-URL: https://build.opensuse.org/package/show/Base:System/gpg2?expand=0&rev=187
---
 gnupg-2.2.4.tar.bz2     |   3 ---
 gnupg-2.2.4.tar.bz2.sig | Bin 620 -> 0 bytes
 gnupg-2.2.5.tar.bz2     |   3 +++
 gnupg-2.2.5.tar.bz2.sig | Bin 0 -> 620 bytes
 gpg2.changes            |  24 ++++++++++++++++++++++++
 gpg2.spec               |   6 +++---
 6 files changed, 30 insertions(+), 6 deletions(-)
 delete mode 100644 gnupg-2.2.4.tar.bz2
 delete mode 100644 gnupg-2.2.4.tar.bz2.sig
 create mode 100644 gnupg-2.2.5.tar.bz2
 create mode 100644 gnupg-2.2.5.tar.bz2.sig

diff --git a/gnupg-2.2.4.tar.bz2 b/gnupg-2.2.4.tar.bz2
deleted file mode 100644
index e9631b7..0000000
--- a/gnupg-2.2.4.tar.bz2
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:401a3e64780fdfa6d7670de0880aa5c9d589b3db7a7098979d7606cec546f2ec
-size 6571487
diff --git a/gnupg-2.2.4.tar.bz2.sig b/gnupg-2.2.4.tar.bz2.sig
deleted file mode 100644
index d7aacb9ba25a1414a3ad15c4d1f23b05be3899505a044583dbd901730fe277b4..0000000000000000000000000000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 620
zcmV-y0+aoT0W$;u0SEvc79j-KX(1!T23_i24?49Zn>o@?CF8aQ0$MsKX8;Nb5G0#9
z(oZGhwsoZk{xL>mLlnW~*D%&fF42<R@b|0oMRpj*U{amWDvK<6xJ}DZy1Q?n32RY>
zm<yvY;<STxRLYb1D%7*F-0;`KS0%`MeyuG|Eh5?_t}|nurD!CRFkVw!9jv<*Y&w%|
z;0o-?X_0aEu^fI%P6+A(7#*75<F{VFDn@4zGnxnxMTP}LMDgWW#Wn4)gbqg(hjcPn
z7XS974Gw$;pp(Y-73>^Pgd}0n7a0`L^PkIy`mv|&4NvKiE~$<af=HHU?waX>FH{rS
z=e$aOxtGf~tA$Z!E;67c)Uk07Z#KUVxFr&vtT-g~Bayz2EGuog0E58$E!Cdk<T8yK
z9XIqx*@*!&1ONdD038+~1OpzzQ*Kxdj-rOC@*r`riZi`G1_c6IIxsH)3JDM(aj=Rr
zy*~z(HV6JNNjVsQm!m{J5t+){x(s%iTi^0sj~MqJ5gNDdZQ14Au^`Co_wCp867r(1
zTy0L;m5=SCbyG!Tn#zFgaTS8rli9OMmENQeHwt#3z33t5kr+kIhYQdJioQxUCp4y|
zQJfprS?eEqk|M*1X~kBtkcl_J7su6;&!BL?%+U<Dq*re{1vd4fQGq4GMQJS?t3q=%
zrbj=_;u8M!qW?Kp03NDa^$67J->mqaiAi1hwcAJz&w$4cYGrq)lq`T;b8#FNU*;qD
z>v!GY#5i;_k>+$vn@^XcNa~4FNy13XE#5q+Z93*93S$Jh`ryb3DjZ@#ce79vfZq?|
G`wrTtXC5;E

diff --git a/gnupg-2.2.5.tar.bz2 b/gnupg-2.2.5.tar.bz2
new file mode 100644
index 0000000..ccb4d41
--- /dev/null
+++ b/gnupg-2.2.5.tar.bz2
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:3fa189a32d4fb62147874eb1389047c267d9ba088f57ab521cb0df46f08aef57
+size 6584756
diff --git a/gnupg-2.2.5.tar.bz2.sig b/gnupg-2.2.5.tar.bz2.sig
new file mode 100644
index 0000000000000000000000000000000000000000000000000000000000000000..9c1f226edd63d4eef5c5f6c4a7d9f0178c11d7cbdf32a473aadbaa8803df0754
GIT binary patch
literal 620
zcmV-y0+aoT0W$;u0SEvc79j-KX(1!T23_i24?49Zn>o@?CF8aQ0$PsS5C94Z5G0#9
z(oZGhwwccd|5G{ha*jA4g1utYjiK6<g}ja*ua?KK&IH-+(yuvq{h<&8Gi%vPV^`Jz
zW!&G52E9xM4}ccQ=%3CZx#<XHW;@kaaWCzw<{dA(<E71#c5x|-NZG5UOZX54l>r5o
zl;UO$&E~~Pti|Vvg%$~|=IFKTgMXxuiWigk)+tBv@e8@0?`4rKNXFYKUAF8tEbKLg
zrt3#4^`1I#^YzfICdJqf$F><%pL2uaI`DbTSmZ+R!D-$X_E8bt5`Z1X06G{`Cfwfv
ztII>sI^qA3?R<aaWeGN1Z{)q^kt-)+gS&P9Y_zoBCK!=?Z&Dq$`axX)5uyvZp)xqa
znj4fVCW!$v1ONdD038+~1OpzzQ*Kxdj-rOC@*r`riZi`G1_c6Ik5VWA3JDM(aj=Rr
zy*~!%a|i&*eD+`8pRp3np(D>&W~yXveN30;FNB+}`|5S_aca-LVZ(K|KIl4@T9=1Q
zOk|+2Wy^xn_tn=FPYI9?B?|Ii0JKp*R=4K!A2OQzg|O<_bgTkhLWC|3IFQ51pmC>h
zU9-yo!lOmoKg~ET9OgrS{`?E!^u$jq>CZ7qt*GI>Lc>((!ZhZwu3?F*xAHM0VKml)
zjkf=#QZqi(R0BpIzwm|SPx}Exd4WsS4O`rm>8j?I+v=RMS6MwY+!**eiEMRsK%w;5
zm-YZA>5tOdFkLhbI5bR3z{7B-kOc8tV8wj>kw5fP<CYEngK_OQF*uyj(xeU8G=Z-%
G)WSD^TP;rj

literal 0
HcmV?d00001

diff --git a/gpg2.changes b/gpg2.changes
index bab380b..b5e4a48 100644
--- a/gpg2.changes
+++ b/gpg2.changes
@@ -1,3 +1,27 @@
+-------------------------------------------------------------------
+Sun Feb 25 12:14:54 UTC 2018 - astieger@suse.com
+
+- GnuPG 2.2.5:
+  * gpg: Allow the use of the "cv25519" and "ed25519" short names
+    in addition to the canonical curve names in --batch --gen-key
+  * gpg: Make sure to print all secret keys with option --list-only
+    and --decrypt
+  * gpg: Fix the use of future-default with --quick-add-key for
+    signing keys
+  * gpg: Select a secret key by checking availability under
+    gpg-agent
+  * gpg: Fix reversed prompt texts for --only-sign-text-ids
+  * gpg,gpgsm: Fix detection of bogus keybox blobs on 32 bit
+    systems
+  * gpgsm: Fix regression since 2.1 in --export-secret-key-raw
+    which got $d mod (q-1)$ wrong
+  * scd: Support the KDF Data Object of the OpenPGP card 3.3
+  * scd: Fix a regression in the internal CCID driver for certain
+    card readers
+  * dirmngr: Improve returned error description on failure of DNS
+    resolving
+  * wks: Implement command --install-key for gpg-wks-server.
+
 -------------------------------------------------------------------
 Thu Dec 21 09:44:03 UTC 2017 - astieger@suse.com
 
diff --git a/gpg2.spec b/gpg2.spec
index 32628fe..4184037 100644
--- a/gpg2.spec
+++ b/gpg2.spec
@@ -1,7 +1,7 @@
 #
 # spec file for package gpg2
 #
-# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany.
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -17,7 +17,7 @@
 
 
 Name:           gpg2
-Version:        2.2.4
+Version:        2.2.5
 Release:        0
 Summary:        File encryption, decryption, signature creation and verification utility
 License:        GPL-3.0+
@@ -36,7 +36,7 @@ Patch9:         gnupg-detect_FIPS_mode.patch
 Patch11:        gnupg-add_legacy_FIPS_mode_option.patch
 BuildRequires:  expect
 BuildRequires:  fdupes
-BuildRequires:  libassuan-devel >= 2.4.3
+BuildRequires:  libassuan-devel >= 2.5.0
 BuildRequires:  libgcrypt-devel >= 1.7.0
 BuildRequires:  libgpg-error-devel >= 1.24
 BuildRequires:  libksba-devel >= 1.3.4

From 66dd7fdb56b4006c8df37a5d623caee20114893f6125ed6db2119b11230e6b0d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Chv=C3=A1tal?= <tchvatal@suse.com>
Date: Mon, 26 Feb 2018 09:33:35 +0000
Subject: [PATCH 2/2] Accepting request 580089 from home:favogt:licensetag

Use %license (boo#1082318). Please forward to SLE, if possible

OBS-URL: https://build.opensuse.org/request/show/580089
OBS-URL: https://build.opensuse.org/package/show/Base:System/gpg2?expand=0&rev=188
---
 gpg2.changes | 5 +++++
 gpg2.spec    | 4 ++--
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/gpg2.changes b/gpg2.changes
index b5e4a48..c9cab4b 100644
--- a/gpg2.changes
+++ b/gpg2.changes
@@ -22,6 +22,11 @@ Sun Feb 25 12:14:54 UTC 2018 - astieger@suse.com
     resolving
   * wks: Implement command --install-key for gpg-wks-server.
 
+-------------------------------------------------------------------
+Thu Feb 22 15:10:33 UTC 2018 - fvogt@suse.com
+
+- Use %license (boo#1082318)
+
 -------------------------------------------------------------------
 Thu Dec 21 09:44:03 UTC 2017 - astieger@suse.com
 
diff --git a/gpg2.spec b/gpg2.spec
index 4184037..3147026 100644
--- a/gpg2.spec
+++ b/gpg2.spec
@@ -125,8 +125,6 @@ ln -sf gpg2.1 %{buildroot}%{_mandir}/man1/gpg.1
 ln -sf gpgv2.1 %{buildroot}%{_mandir}/man1/gpgv.1
 # fix rpmlint invalid-lc-messages-dir:
 rm -rf %{buildroot}/%{_datadir}/locale/en@{bold,}quot
-# additional files to documentation directory
-install -m 644 AUTHORS COPYING* ChangeLog NEWS THANKS TODO doc/FAQ %{buildroot}/%{_docdir}/%{name}
 # install scdaemon to %{_bindir} (bnc#863645)
 mv %{buildroot}%{_libdir}/scdaemon %{buildroot}%{_bindir}
 mv %{buildroot}%{_libdir}/dirmngr_ldap %{buildroot}%{_bindir}
@@ -154,6 +152,8 @@ install -m 755 tools/gpg-zip %{buildroot}/%{_bindir}
 %files
 %{_infodir}/gnupg*
 %{_mandir}/*/*%{ext_man}
+%license COPYING*
+%doc AUTHORS ChangeLog NEWS THANKS TODO doc/FAQ
 %doc %{_docdir}/%{name}
 %{_bindir}/*
 %{_libdir}/[^d]*