From ce044e5f2319c2f556af4442e3c4627c772b6db8 Mon Sep 17 00:00:00 2001
From: Tomas Mraz <tmraz@fedoraproject.org>
Date: Tue, 5 Aug 2014 16:40:22 +0200
Subject: [PATCH] new upstream release fixing a minor regression introduced by
 the previous one

---
 .gitignore                          |  2 ++
 gnupg-2.0.18-protect-tool-env.patch | 28 ----------------------------
 gnupg2.spec                         |  7 ++++---
 sources                             |  4 ++--
 4 files changed, 8 insertions(+), 33 deletions(-)
 delete mode 100644 gnupg-2.0.18-protect-tool-env.patch

diff --git a/.gitignore b/.gitignore
index af656d2..5fd63dc 100644
--- a/.gitignore
+++ b/.gitignore
@@ -14,3 +14,5 @@ gnupg-2.0.16.tar.bz2.sig
 /gnupg-2.0.22.tar.bz2.sig
 /gnupg-2.0.24.tar.bz2
 /gnupg-2.0.24.tar.bz2.sig
+/gnupg-2.0.25.tar.bz2
+/gnupg-2.0.25.tar.bz2.sig
diff --git a/gnupg-2.0.18-protect-tool-env.patch b/gnupg-2.0.18-protect-tool-env.patch
deleted file mode 100644
index e0c6c48..0000000
--- a/gnupg-2.0.18-protect-tool-env.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-diff -u -r gnupg-2.0.18.orig/agent/protect-tool.c gnupg-2.0.18/agent/protect-tool.c
---- gnupg-2.0.18.orig/agent/protect-tool.c	2011-07-22 14:00:44.000000000 +0200
-+++ gnupg-2.0.18/agent/protect-tool.c	2012-04-10 22:42:17.397613438 +0200
-@@ -102,6 +102,7 @@
- static int opt_status_msg;
- static const char *opt_p12_charset;
- static const char *opt_agent_program; 
-+static session_env_t opt_session_env;
- 
- static char *get_passphrase (int promptno);
- static void release_passphrase (char *pw);
-@@ -1040,6 +1041,7 @@
- 
-   opt_homedir = default_homedir ();
- 
-+  opt_session_env = session_env_new ();
- 
-   pargs.argc = &argc;
-   pargs.argv = &argv;
-@@ -1091,7 +1093,7 @@
-                                 opt.verbose,
-                                 opt_homedir,
-                                 opt_agent_program,
--                                NULL, NULL, NULL);
-+                                NULL, NULL, opt_session_env);
- 
-   if (opt_prompt)
-     opt_prompt = percent_plus_unescape (opt_prompt, 0);
diff --git a/gnupg2.spec b/gnupg2.spec
index a5b9590..544d248 100644
--- a/gnupg2.spec
+++ b/gnupg2.spec
@@ -1,6 +1,6 @@
 Summary: Utility for secure communication and data storage
 Name:    gnupg2
-Version: 2.0.24
+Version: 2.0.25
 Release: 1%{?dist}
 
 License: GPLv3+
@@ -11,7 +11,6 @@ Source1: ftp://ftp.gnupg.org/gcrypt/%{?pre:alpha/}gnupg/gnupg-%{version}%{?pre}.
 #Source0: gnupg2-20090809svn.tar.bz2
 Patch1:  gnupg-2.0.20-insttools.patch
 Patch3:  gnupg-2.0.20-secmem.patch
-Patch4:  gnupg-2.0.18-protect-tool-env.patch
 Patch5:  gnupg-2.0.20-ocsp-keyusage.patch
 Patch6:  gnupg-2.0.19-fips-algo.patch
 
@@ -77,7 +76,6 @@ to the base GnuPG package
 %patch1 -p1 -b .insttools
 %endif
 %patch3 -p1 -b .secmem
-%patch4 -p1 -b .ptool-env
 %patch5 -p1 -b .keyusage
 %patch6 -p1 -b .fips
 
@@ -193,6 +191,9 @@ fi
 
 
 %changelog
+* Tue Aug  5 2014 Tomáš Mráz <tmraz@redhat.com> - 2.0.25-1
+- new upstream release fixing a minor regression introduced by the previous one
+
 * Wed Jun 25 2014 Tomáš Mráz <tmraz@redhat.com> - 2.0.24-1
 - new upstream release fixing CVE-2014-4617
 
diff --git a/sources b/sources
index 7e213eb..d20ccff 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-94cd984321b44ab622aa50f93ee66671  gnupg-2.0.24.tar.bz2
-e8361c1a319a8e7583243b31af2edb15  gnupg-2.0.24.tar.bz2.sig
+048d8de797125f1d8e6cf3bdff9e2d12  gnupg-2.0.25.tar.bz2
+d474ba42cba833734c6196b7e6f5d853  gnupg-2.0.25.tar.bz2.sig