From fb7584ea2befb71069d00365f2f2d0d4a8e6fb97f21821bc4ea6eb39bf09c5d1 Mon Sep 17 00:00:00 2001
From: Andreas Stieger <andreas.stieger@gmx.de>
Date: Mon, 30 Jun 2014 19:09:15 +0000
Subject: [PATCH 1/2] Accepting request 238995 from
 home:AndreasStieger:branches:Base:System

GnuPG 2.0.25

OBS-URL: https://build.opensuse.org/request/show/238995
OBS-URL: https://build.opensuse.org/package/show/Base:System/gpg2?expand=0&rev=75
---
 gnupg-2.0.24.tar.bz2     |   3 ---
 gnupg-2.0.24.tar.bz2.sig | Bin 287 -> 0 bytes
 gnupg-2.0.25.tar.bz2     |   3 +++
 gnupg-2.0.25.tar.bz2.sig | Bin 0 -> 287 bytes
 gpg2.changes             |  12 ++++++++++++
 gpg2.spec                |   2 +-
 6 files changed, 16 insertions(+), 4 deletions(-)
 delete mode 100644 gnupg-2.0.24.tar.bz2
 delete mode 100644 gnupg-2.0.24.tar.bz2.sig
 create mode 100644 gnupg-2.0.25.tar.bz2
 create mode 100644 gnupg-2.0.25.tar.bz2.sig

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

literal 287
zcmV+)0pR|L0UQJX0SEvF1p-s4fFb}22@oWkInqxh<F@s22mg4&ctU#cP2+FlV%dgF
zg`q(_uaGo!m+2{Ml{E2PC=CZ+_ckPq@69Ldbi_3W_e>D^da03rh{GbBhSP-1>o^#3
zC|-QQ+woB#oSK3LDVMNrzINGS>pk$H_??uOcXsO<IQigO1WUd*E>n_?SZVSzxN~ai
zcYhn1f!l^$%ahRlLMCB#Uz3qcpW6Q>NntkO&c_(Wqn45qCA}|f&QSDhffH-&1WW56
zrCPy*+z9K+j~k6=LjD++sSEi&^js}QHokrPa_188w7di(iDuz`^AGL;ZQ6HpX!B}_
lx*4mGiJ7lAmoi%4X8#_=x1?nEWR>itIYrFqa(!W+XlC10jQRio

diff --git a/gnupg-2.0.25.tar.bz2 b/gnupg-2.0.25.tar.bz2
new file mode 100644
index 0000000..8867c49
--- /dev/null
+++ b/gnupg-2.0.25.tar.bz2
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:b3abe97df096cf53d6a422ac922f3c48e688bc892b7ccf669b92f0b7fc6c5823
+size 4301689
diff --git a/gnupg-2.0.25.tar.bz2.sig b/gnupg-2.0.25.tar.bz2.sig
new file mode 100644
index 0000000000000000000000000000000000000000000000000000000000000000..596495fcce315e451e73f02fd25459d4f7523f4a79aced18265b1c049dbfdba5
GIT binary patch
literal 287
zcmV+)0pR|L0UQJX0SEvF1p-sCiKPGv2@oWkInqxh<F+RT2meY)3SU@jQ;cHQx*U@+
zr4+wjWsxB~SW>k(qwwK)cPRUgJuqC=e0PbL=*RgQ4H?JJxx#@4To{x3GAO*w`-^8B
zVe7#NpOGOmSa6h;GmgRy!ea4(r57lVM!u{zc;mth`%JIcB9pAG`G0iVRES~MSFzsS
zg<NK&7Ka3A+OA7H=TUR`zoZH5Y1g!_NB;sdq5<BB8JqBxS8xLMK*3^ZXbxYSt5+;P
z)R;UXw+Svzr<C(ll~|rHybXMeYeiUAa_0w07-oVTwhl;I$~96c%$ATI)9ayviU&9^
lxk06<d7xogq}LwF<DCgdIH{!WC&%;lJCj%{SHVq@*HO0vgZBUc

literal 0
HcmV?d00001

diff --git a/gpg2.changes b/gpg2.changes
index ec29925..0b17403 100644
--- a/gpg2.changes
+++ b/gpg2.changes
@@ -1,3 +1,15 @@
+-------------------------------------------------------------------
+Mon Jun 30 18:52:36 UTC 2014 - andreas.stieger@gmx.de
+
+- update to 2.0.25:
+ * gpg: Fix a regression in 2.0.24 if more than one keyid is given
+   to --recv-keys et al.
+ * gpg: Cap RSA and Elgamal keysize at 4096 bit also for unattended
+   key generation.
+ * gpgsm: Fix a DISPLAY related problem with
+   --export-secret-key-p12.
+ * scdaemon: Support reader Gemalto IDBridge CT30.
+
 -------------------------------------------------------------------
 Tue Jun 24 22:25:12 UTC 2014 - andreas.stieger@gmx.de
 
diff --git a/gpg2.spec b/gpg2.spec
index 72023e3..20c3f12 100644
--- a/gpg2.spec
+++ b/gpg2.spec
@@ -17,7 +17,7 @@
 
 
 Name:           gpg2
-Version:        2.0.24
+Version:        2.0.25
 Release:        0
 BuildRequires:  automake >= 1.10
 BuildRequires:  expect

From b93524f0277a5043ee83bc7b6a8d5a5ae4fb92271535169ca37bf0644b228ea3 Mon Sep 17 00:00:00 2001
From: Andreas Stieger <andreas.stieger@gmx.de>
Date: Tue, 1 Jul 2014 21:33:00 +0000
Subject: [PATCH 2/2] Accepting request 239235 from
 home:AndreasStieger:branches:Base:System

- gnupg-add_legacy_FIPS_mode_option.patch (part of [bnc#856312])
  mentions GCRYCTL_INACTIVATE_FIPS_FLAG, raising the requirement
  for gcrypt from 1.4.0 (from configure) to 1.6.1 where said flag
  was introduced. Require this version to build.

OBS-URL: https://build.opensuse.org/request/show/239235
OBS-URL: https://build.opensuse.org/package/show/Base:System/gpg2?expand=0&rev=76
---
 gpg2.changes | 8 ++++++++
 gpg2.spec    | 4 +++-
 2 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/gpg2.changes b/gpg2.changes
index 0b17403..9542caa 100644
--- a/gpg2.changes
+++ b/gpg2.changes
@@ -1,3 +1,11 @@
+-------------------------------------------------------------------
+Tue Jul  1 21:05:55 UTC 2014 - andreas.stieger@gmx.de
+
+- gnupg-add_legacy_FIPS_mode_option.patch (part of [bnc#856312])
+  mentions GCRYCTL_INACTIVATE_FIPS_FLAG, raising the requirement
+  for gcrypt from 1.4.0 (from configure) to 1.6.1 where said flag
+  was introduced. Require this version to build.
+
 -------------------------------------------------------------------
 Mon Jun 30 18:52:36 UTC 2014 - andreas.stieger@gmx.de
 
diff --git a/gpg2.spec b/gpg2.spec
index 20c3f12..2566a65 100644
--- a/gpg2.spec
+++ b/gpg2.spec
@@ -26,7 +26,9 @@ BuildRequires:  libadns-devel
 BuildRequires:  libassuan-devel >= 2.0.0
 BuildRequires:  libbz2-devel
 BuildRequires:  libcurl-devel >= 7.10
-BuildRequires:  libgcrypt-devel >= 1.4.0
+# patch11 (gnupg-add_legacy_FIPS_mode_option.patch) mentions GCRYCTL_INACTIVATE_FIPS_FLAG
+# raising gcrypt requirement from 1.4.0
+BuildRequires:  libgcrypt-devel >= 1.6.1
 BuildRequires:  libgpg-error-devel >= 1.11
 BuildRequires:  libksba-devel >= 1.0.7
 BuildRequires:  libusb-devel