php-pecl-mongodb: 1.1.1

4 files changed, 59 insertions, 8 deletions

diff --git a/REFLECTION b/REFLECTION
index 434bce5..1f2ced4 100644
--- a/REFLECTION
+++ b/REFLECTION
@@ -1,4 +1,4 @@
-Extension [ <persistent> extension #130 mongodb version 1.1.0 ] {
+Extension [ <persistent> extension #129 mongodb version 1.1.1 ] {
 
   - INI {
     Entry [ mongodb.debug <ALL> ]
@@ -7,7 +7,7 @@ Extension [ <persistent> extension #130 mongodb version 1.1.0 ] {
   }
 
   - Constants [3] {
-    Constant [ string MONGODB_VERSION ] { 1.1.0 }
+    Constant [ string MONGODB_VERSION ] { 1.1.1 }
     Constant [ string MONGODB_STABILITY ] { stable }
     Constant [ string BSON_NAMESPACE ] { MongoDB\BSON }
   }
@@ -1097,7 +1097,7 @@ Extension [ <persistent> extension #130 mongodb version 1.1.0 ] {
       }
     }
 
-    Class [ <internal:mongodb> class MongoDB\Driver\Exception\SSLConnectionException extends MongoDB\Driver\Exception\ConnectionException implements MongoDB\Driver\Exception\Exception ] {
+    Class [ <internal:mongodb> final class MongoDB\Driver\Exception\SSLConnectionException extends MongoDB\Driver\Exception\ConnectionException implements MongoDB\Driver\Exception\Exception ] {
 
       - Constants [0] {
       }
@@ -1282,7 +1282,7 @@ Extension [ <persistent> extension #130 mongodb version 1.1.0 ] {
       }
     }
 
-    Class [ <internal:mongodb> class MongoDB\Driver\Exception\ExecutionTimeoutException extends MongoDB\Driver\Exception\RuntimeException implements MongoDB\Driver\Exception\Exception ] {
+    Class [ <internal:mongodb> final class MongoDB\Driver\Exception\ExecutionTimeoutException extends MongoDB\Driver\Exception\RuntimeException implements MongoDB\Driver\Exception\Exception ] {
 
       - Constants [0] {
       }
@@ -1339,7 +1339,7 @@ Extension [ <persistent> extension #130 mongodb version 1.1.0 ] {
       }
     }
 
-    Class [ <internal:mongodb> class MongoDB\Driver\Exception\ConnectionTimeoutException extends MongoDB\Driver\Exception\ConnectionException implements MongoDB\Driver\Exception\Exception ] {
+    Class [ <internal:mongodb> final class MongoDB\Driver\Exception\ConnectionTimeoutException extends MongoDB\Driver\Exception\ConnectionException implements MongoDB\Driver\Exception\Exception ] {
 
       - Constants [0] {
       }
diff --git a/mongodb-pr185.patch b/mongodb-pr185.patch
new file mode 100644
index 0000000..592b4fe
--- /dev/null
+++ b/mongodb-pr185.patch
@@ -0,0 +1,33 @@
+From c6cc67b5721acf927d712267bebe9d5180e31fc1 Mon Sep 17 00:00:00 2001
+From: Remi Collet <fedora@famillecollet.com>
+Date: Sat, 26 Dec 2015 17:30:16 +0100
+Subject: [PATCH] Fix PHP 7 / 32bits build
+
+---
+ phongo_compat.h | 6 ++++--
+ 1 file changed, 4 insertions(+), 2 deletions(-)
+
+diff --git a/phongo_compat.h b/phongo_compat.h
+index da4aed1..adbf21c 100644
+--- a/phongo_compat.h
++++ b/phongo_compat.h
+@@ -99,7 +99,8 @@
+ 		int tmp_len; \
+ 		mongoc_log(MONGOC_LOG_LEVEL_WARNING, MONGOC_LOG_DOMAIN, "Integer overflow detected on your platform: %lld", value); \
+ 		tmp_len = spprintf(&tmp, 0, "%lld", value); \
+-		add_index_stringl(zval, index, tmp, tmp_len, 0); \
++		ADD_ASSOC_STRINGL(zval, index, tmp, tmp_len); \
++		efree(tmp); \
+ 	} else { \
+ 		add_index_long(zval, index, val); \
+ 	}
+@@ -109,7 +110,8 @@
+ 		int tmp_len; \
+ 		mongoc_log(MONGOC_LOG_LEVEL_WARNING, MONGOC_LOG_DOMAIN, "Integer overflow detected on your platform: %lld", value); \
+ 		tmp_len = spprintf(&tmp, 0, "%lld", value); \
+-		add_assoc_stringl(zval, key, tmp, tmp_len, 0); \
++		ADD_ASSOC_STRINGL(zval, key, tmp, tmp_len); \
++		efree(tmp); \
+ 	} else { \
+ 		add_assoc_long(zval, key, value); \
+ 	}
diff --git a/php-pecl-mongodb-dev.spec b/php-pecl-mongodb-dev.spec
index b31edc4..285d743 100644
--- a/php-pecl-mongodb-dev.spec
+++ b/php-pecl-mongodb-dev.spec
@@ -11,7 +11,7 @@
 %{!?__pecl:      %global __pecl      %{_bindir}/pecl}
 %{!?__php:       %global __php       %{_bindir}/php}
 
-%global with_zts   0%{?__ztsphp:1}
+%global with_zts   0%{!?_without_zts:%{?__ztsphp:1}}
 %global pecl_name  mongodb
 %if "%{php_version}" < "5.6"
 %global ini_name   %{pecl_name}.ini
@@ -24,13 +24,16 @@
 
 Summary:        MongoDB driver for PHP
 Name:           %{?scl_prefix}php-pecl-%{pecl_name}
-Version:        1.1.0
+Version:        1.1.1
 Release:        2%{?dist}%{!?scl:%{!?nophptag:%(%{__php} -r 'echo ".".PHP_MAJOR_VERSION.".".PHP_MINOR_VERSION;')}}
 License:        BSD
 Group:          Development/Languages
 URL:            http://pecl.php.net/package/%{pecl_name}
 Source0:        http://pecl.php.net/get/%{pecl_name}-%{version}%{?prever}.tgz
 
+# https://github.com/mongodb/mongo-php-driver/pull/185
+Patch0:         %{pecl_name}-pr185.patch
+
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:  %{?scl_prefix}php-devel > 5.4
 BuildRequires:  %{?scl_prefix}php-pear
@@ -93,6 +96,7 @@ mv %{pecl_name}-%{version}%{?prever} NTS
 sed -e 's/role="test"/role="src"/' -i package.xml
 
 cd NTS
+%patch0 -p1 -b .pr185
 
 # Sanity check, really often broken
 extver=$(sed -n '/#define MONGODB_VERSION_S/{s/.* "//;s/".*$//;p}' php_phongo.h)
@@ -223,6 +227,11 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Sat Dec 26 2015 Remi Collet <remi@fedoraproject.org> - 1.1.1-1
+- Update to 1.1.1 (stable)
+- add patch for 32bits build,
+  open https://github.com/mongodb/mongo-php-driver/pull/185
+
 * Wed Dec 16 2015 Remi Collet <remi@fedoraproject.org> - 1.1.0-1
 - Update to 1.1.0 (stable)
 - raise dependency on libmongoc >= 1.3.0
diff --git a/php-pecl-mongodb.spec b/php-pecl-mongodb.spec
index 9208cfc..862a2d9 100644
--- a/php-pecl-mongodb.spec
+++ b/php-pecl-mongodb.spec
@@ -24,13 +24,16 @@
 
 Summary:        MongoDB driver for PHP
 Name:           php-pecl-%{pecl_name}
-Version:        1.1.0
+Version:        1.1.1
 Release:        1%{?dist}
 License:        BSD
 Group:          Development/Languages
 URL:            http://pecl.php.net/package/%{pecl_name}
 Source0:        http://pecl.php.net/get/%{pecl_name}-%{version}%{?prever}.tgz
 
+# https://github.com/mongodb/mongo-php-driver/pull/185
+Patch0:         %{pecl_name}-pr185.patch
+
 BuildRequires:  php-devel > 5.4
 BuildRequires:  php-pear
 BuildRequires:  cyrus-sasl-devel
@@ -69,6 +72,7 @@ mv %{pecl_name}-%{version}%{?prever} NTS
 sed -e 's/role="test"/role="src"/' -i package.xml
 
 cd NTS
+%patch0 -p1 -b .pr185
 
 # Sanity check, really often broken
 extver=$(sed -n '/#define MONGODB_VERSION_S/{s/.* "//;s/".*$//;p}' php_phongo.h)
@@ -192,6 +196,11 @@ cd ../ZTS
 
 
 %changelog
+* Sat Dec 26 2015 Remi Collet <remi@fedoraproject.org> - 1.1.1-1
+- Update to 1.1.1 (stable)
+- add patch for 32bits build,
+  open https://github.com/mongodb/mongo-php-driver/pull/185
+
 * Wed Dec 16 2015 Remi Collet <remi@fedoraproject.org> - 1.1.0-1
 - Update to 1.1.0 (stable)
 - raise dependency on libmongoc >= 1.3.0