From 1ddc32f64d656f78662d0b2e5fd64d68b6e831b3 Mon Sep 17 00:00:00 2001
From: Jakub Zelenka <bukka@php.net>
Date: Sun, 24 Jul 2016 19:16:07 +0100
Subject: [PATCH] Release 1.4.0RC2

---
 package.xml | 26 +++++++++++++++++++++-----
 php_gnupg.h |  2 +-
 2 files changed, 22 insertions(+), 6 deletions(-)

diff --git a/package.xml b/package.xml
index 9dfe03e..bed4db4 100644
--- a/package.xml
+++ b/package.xml
@@ -28,10 +28,10 @@
   <email>sean@siobud.com</email>
   <active>yes</active>
  </lead>
- <date>2016-06-15</date>
+ <date>2016-07-24</date>
  <version>
-  <release>1.4.0RC1</release>
-  <api>1.4.0RC1</api>
+  <release>1.4.0RC2</release>
+  <api>1.4.0RC2</api>
  </version>
  <stability>
   <release>beta</release>
@@ -39,8 +39,7 @@
  </stability>
  <license>BSD, revised</license>
  <notes><![CDATA[
- * Added support for PHP 7
- * Fixed various compilation issues
+ * Fixed ZTS issue with invalid context for a password callback
  ]]></notes>
  <contents>
   <dir name="/">
@@ -53,6 +52,7 @@
    <file name="php_gnupg.h" role="src" />
    <file name="php_gnupg_keylistiterator.h" role="src" />
    <file name="README" role="doc" />
+   <file name="UPGRADING" role="doc" />
    <dir name="phpc">
     <file role="src" name="phpc.h"/>
    </dir>
@@ -98,6 +98,22 @@
  <providesextension>gnupg</providesextension>
  <extsrcrelease />
  <changelog>
+  <release>
+   <version>
+	<release>1.4.0RC1</release>
+	<api>1.4.0RC1</api>
+   </version>
+   <stability>
+	<release>beta</release>
+	<api>beta</api>
+   </stability>
+   <date>2016-06-15</date>
+   <license>BSD, revised</license>
+   <notes><![CDATA[
+   * Added support for PHP 7
+   * Fixed various compilation issues
+   ]]></notes>
+  </release>
   <release>
    <version>
     <release>1.3.6</release>
diff --git a/php_gnupg.h b/php_gnupg.h
index 6459901..b5816d5 100644
--- a/php_gnupg.h
+++ b/php_gnupg.h
@@ -18,7 +18,7 @@
 extern zend_module_entry gnupg_module_entry;
 #define phpext_gnupg_ptr &gnupg_module_entry
 
-#define PHP_GNUPG_VERSION "1.4.0RC1"
+#define PHP_GNUPG_VERSION "1.4.0RC2"
 
 #ifdef PHP_WIN32
 #define PHP_GNUPG_API __declspec(dllexport)