From ccf09f118ddb54cd120805ff5e89d0e244a34289bb5ff9155c1bcdaafbf0ef28 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?V=C3=ADt=C4=9Bzslav=20=C4=8C=C3=AD=C5=BEek?=
 <vcizek@suse.com>
Date: Tue, 20 Aug 2013 12:21:25 +0000
Subject: [PATCH] Accepting request 195623 from
 home:AndreasStieger:branches:Base:System

update to 2.0.21

OBS-URL: https://build.opensuse.org/request/show/195623
OBS-URL: https://build.opensuse.org/package/show/Base:System/gpg2?expand=0&rev=61
---
 gnupg-2.0.20.tar.bz2         |   3 ---
 gnupg-2.0.20.tar.bz2.sig     | Bin 287 -> 0 bytes
 gnupg-2.0.21.tar.bz2         |   3 +++
 gnupg-2.0.21.tar.bz2.sig     | Bin 0 -> 287 bytes
 gnupg-2.0.9-langinfo.patch   |  14 +++++++++-----
 gnupg-broken-curl-test.patch |  18 ------------------
 gpg2.changes                 |  15 +++++++++++++++
 gpg2.spec                    |   8 +++-----
 8 files changed, 30 insertions(+), 31 deletions(-)
 delete mode 100644 gnupg-2.0.20.tar.bz2
 delete mode 100644 gnupg-2.0.20.tar.bz2.sig
 create mode 100644 gnupg-2.0.21.tar.bz2
 create mode 100644 gnupg-2.0.21.tar.bz2.sig
 delete mode 100644 gnupg-broken-curl-test.patch

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

literal 287
zcmV+)0pR|L0UQJX0SEvF1p-lw{(1lk2@oWkInqxh<F-8+2mfKS#QkQ5`_apR2h34-
z&>Awp6~B9b(4}&r0PL-occj|y2qAp=>Fca#kRdixiZw>&R|ju}-R0+{*2Dgk3ZAax
z@fE7{_G3CW3kak~=a&^Tcp%?+J^;L)2U-mZ&!`%Gr(_q)DLB6;A~n!V?(0DYZ2BoT
z#^NjvITY+rs(?T%<on%dA74h7XC%B!g9-Z3LfS(}D0`c}e{(~6KU)fD2sx%HRRE3H
zcYy-iD$)T&M|KUSN?;Q)c%EoZ%>}AGm94qKKDka7YbH5_k6dM=iP+j*q$@~iX6ZSJ
l1Q5_^TnDtzz8sfA%4+x(06?E9L4T4<MDacdJiLv+Lp-YLezE`n

diff --git a/gnupg-2.0.21.tar.bz2 b/gnupg-2.0.21.tar.bz2
new file mode 100644
index 0000000..d5090d0
--- /dev/null
+++ b/gnupg-2.0.21.tar.bz2
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:00df8902c7cef4d2440d36ca2a45985853eb36c34a4163bc995c3578030eeef5
+size 4300604
diff --git a/gnupg-2.0.21.tar.bz2.sig b/gnupg-2.0.21.tar.bz2.sig
new file mode 100644
index 0000000000000000000000000000000000000000000000000000000000000000..4776f67262f29250fd8c2bc821bfdccdeb2bb7b936bad5691424a4824eb7e102
GIT binary patch
literal 287
zcmV+)0pR|L0UQJX0SEvF1p-nM4TS&-2@oWkInqxh<F=Li2mqjY0ma<VRcjlFfEX@k
zX)!nHD+$Ht;;}vDjxIh8iY;$OD*M@U-|W93PeaP%GF|*wC%u;_+_Xd`_09Mgc^+MJ
z{eDU-)GDV8+DQ}NW~?1=(TM{tcq2|JA&Kum_fsEO{Vb(WEjt@NIIWx7bIGi`Eic7O
zI*YJN6j1Y9N^OY*9ulB<jmjttyV2BdjUa`)@wASw6<VzrG=QS|m_fZiTc*k(PQ7Gn
zSmvW#0KyHHRZk;R^2HaogJp<aHRr@JcA_`$Y-|(%O|EHH|BapRXD%?cfVo`%k`m0{
lRpxkt7B`_ty!KLPKCW#qx?Gt~dt6ZI22{t$4<M_Wb%)5cfQ<kE

literal 0
HcmV?d00001

diff --git a/gnupg-2.0.9-langinfo.patch b/gnupg-2.0.9-langinfo.patch
index 4b0cab0..e6463cc 100644
--- a/gnupg-2.0.9-langinfo.patch
+++ b/gnupg-2.0.9-langinfo.patch
@@ -1,11 +1,15 @@
 # fix [bnc#305725] - non latin characters displayed incorrectly by pinentry
-Index: jnlib/utf8conv.c
+---
+# jnlib/utf8conv.c |    1 +
+# 1 file changed, 1 insertion(+)
+#
+Index: gnupg-2.0.21/jnlib/utf8conv.c
 ===================================================================
---- jnlib/utf8conv.c.orig	2008-11-04 15:39:06.000000000 +0100
-+++ jnlib/utf8conv.c	2009-06-18 11:42:36.000000000 +0200
-@@ -203,6 +203,7 @@ set_native_charset (const char *newset)
+--- gnupg-2.0.21.orig/jnlib/utf8conv.c	2013-08-19 09:55:30.000000000 +0100
++++ gnupg-2.0.21/jnlib/utf8conv.c	2013-08-19 18:53:22.000000000 +0100
+@@ -148,6 +148,7 @@ set_native_charset (const char *newset)
  #else /*!HAVE_W32_SYSTEM*/
-       
+ 
  #ifdef HAVE_LANGINFO_CODESET
 +	  setlocale(LC_ALL, "");
        newset = nl_langinfo (CODESET);
diff --git a/gnupg-broken-curl-test.patch b/gnupg-broken-curl-test.patch
deleted file mode 100644
index fa96ee7..0000000
--- a/gnupg-broken-curl-test.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-diff --git a/m4/libcurl.m4 b/m4/libcurl.m4
-index 7d1dbd3..92cf801 100644
---- a/m4/libcurl.m4
-+++ b/m4/libcurl.m4
-@@ -68,13 +68,7 @@ AC_DEFUN([LIBCURL_CHECK_CONFIG],
- 
-      _libcurl_try_link=yes
- 
--     if test -d "$_libcurl_with" ; then
--        LIBCURL_CPPFLAGS="-I$withval/include"
--        _libcurl_ldflags="-L$withval/lib"
--        AC_PATH_PROG([_libcurl_config],["$withval/bin/curl-config"])
--     else
- 	AC_PATH_PROG([_libcurl_config],[curl-config])
--     fi
- 
-      if test x$_libcurl_config != "x" ; then
-         AC_CACHE_CHECK([for the version of libcurl],
diff --git a/gpg2.changes b/gpg2.changes
index 87e1ee7..6272bcd 100644
--- a/gpg2.changes
+++ b/gpg2.changes
@@ -1,3 +1,18 @@
+-------------------------------------------------------------------
+Mon Aug 19 17:59:48 UTC 2013 - andreas.stieger@gmx.de
+
+- update to 2.0.21
+ * gpg-agent: By default the users are now asked via the Pinentry
+   whether they trust an X.509 root key.  To prohibit interactive
+   marking of such keys, the new option --no-allow-mark-trusted may
+   be used.
+ * gpg-agent: The command KEYINFO has options to add info from
+   sshcontrol.
+ * The included ssh agent does now support ECDSA keys.
+- now requires libgpg-error 1.11
+- update gnupg-2.0.9-langinfo.patch for upstream whitespace changes
+- drop gnupg-broken-curl-test.patch, no longer required
+
 -------------------------------------------------------------------
 Mon Jun 17 12:48:24 UTC 2013 - coolo@suse.com
 
diff --git a/gpg2.spec b/gpg2.spec
index 38c3938..12609fb 100644
--- a/gpg2.spec
+++ b/gpg2.spec
@@ -17,7 +17,7 @@
 
 
 Name:           gpg2
-Version:        2.0.20
+Version:        2.0.21
 Release:        0
 BuildRequires:  automake >= 1.10
 BuildRequires:  expect
@@ -27,7 +27,7 @@ BuildRequires:  libassuan-devel >= 2.0.0
 BuildRequires:  libbz2-devel
 BuildRequires:  libcurl-devel >= 7.10
 BuildRequires:  libgcrypt-devel >= 1.4.0
-BuildRequires:  libgpg-error-devel >= 1.7
+BuildRequires:  libgpg-error-devel >= 1.11
 BuildRequires:  libksba-devel >= 1.0.7
 BuildRequires:  libusb-devel
 BuildRequires:  openldap2-devel
@@ -60,7 +60,6 @@ Patch3:         gnupg-2.0.9-RSA_ES.patch
 Patch4:         gnupg-2.0.9-langinfo.patch
 Patch5:         gnupg-2.0.18-files-are-digests.patch
 Patch6:         gnupg-dont-fail-with-seahorse-agent.patch
-Patch7:         gnupg-broken-curl-test.patch
 Patch8:         gnupg-set_umask_before_open_outfile.patch
 Patch9:         gnupg-detect_FIPS_mode.patch
 # PATCH-FIX-OPENSUSE coolo@suse.de -- automake 1.13 already includes $SHELL
@@ -78,10 +77,9 @@ gpg-agent, and a keybox library.
 %patch1 -p1
 %patch2
 %patch3 -p1
-%patch4
+%patch4 -p1
 %patch5 -p1
 %patch6 -p1
-%patch7 -p1
 %patch8 -p1
 %patch9 -p1
 %patch10 -p1