From 5871a3676c0fefea23e0d2c766f3cb659115420a Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Thu, 7 Jan 2016 20:37:55 +0100 Subject: php-pecl-mongodb: 1.1.2 (stable) --- REFLECTION | 4 +-- mongodb-pr185.patch | 71 ----------------------------------------------- php-pecl-mongodb-dev.spec | 15 +++++----- php-pecl-mongodb.spec | 11 ++++---- 4 files changed, 14 insertions(+), 87 deletions(-) delete mode 100644 mongodb-pr185.patch diff --git a/REFLECTION b/REFLECTION index 1f2ced4..56bb867 100644 --- a/REFLECTION +++ b/REFLECTION @@ -1,4 +1,4 @@ -Extension [ extension #129 mongodb version 1.1.1 ] { +Extension [ extension #131 mongodb version 1.1.2 ] { - INI { Entry [ mongodb.debug ] @@ -7,7 +7,7 @@ Extension [ extension #129 mongodb version 1.1.1 ] { } - Constants [3] { - Constant [ string MONGODB_VERSION ] { 1.1.1 } + Constant [ string MONGODB_VERSION ] { 1.1.2 } Constant [ string MONGODB_STABILITY ] { stable } Constant [ string BSON_NAMESPACE ] { MongoDB\BSON } } diff --git a/mongodb-pr185.patch b/mongodb-pr185.patch deleted file mode 100644 index 1e07435..0000000 --- a/mongodb-pr185.patch +++ /dev/null @@ -1,71 +0,0 @@ -From c6cc67b5721acf927d712267bebe9d5180e31fc1 Mon Sep 17 00:00:00 2001 -From: Remi Collet -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); \ - } -From 236e1670e12e527fe0c3ca36fe9fe11b22af9e2b Mon Sep 17 00:00:00 2001 -From: Remi Collet -Date: Wed, 30 Dec 2015 17:53:38 +0100 -Subject: [PATCH] PHPC-527: fix call to add_index_stringl - ---- - phongo_compat.h | 4 +++- - 1 file changed, 3 insertions(+), 1 deletion(-) - -diff --git a/phongo_compat.h b/phongo_compat.h -index adbf21c..b865b88 100644 ---- a/phongo_compat.h -+++ b/phongo_compat.h -@@ -99,7 +99,7 @@ - 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, index, tmp, tmp_len); \ -+ ADD_INDEX_STRINGL(zval, index, tmp, tmp_len); \ - efree(tmp); \ - } else { \ - add_index_long(zval, index, val); \ -@@ -167,6 +167,7 @@ - # define ADD_ASSOC_ZVAL(_zv, _key, _value) add_assoc_zval(_zv, _key, _value); - # define ADD_ASSOC_NULL_EX(_zv, _key) add_assoc_null_ex(_zv, ZEND_STRL(_key)); - # define ADD_ASSOC_BOOL_EX(_zv, _key, _value) add_assoc_bool_ex(_zv, ZEND_STRL(_key), _value); -+# define ADD_INDEX_STRINGL(_zv, _ind, _value, _len) add_index_stringl(_zv, _ind, _value, _len); - # define phongo_free_object_arg zend_object - # define phongo_zpp_char_len size_t - # define ZEND_HASH_APPLY_COUNT(ht) (ht)->u.v.nApplyCount -@@ -193,6 +194,7 @@ - # define ADD_ASSOC_ZVAL(_zv, _key, _value) add_assoc_zval(_zv, _key, _value); - # define ADD_ASSOC_NULL_EX(_zv, _key) add_assoc_null_ex(_zv, ZEND_STRS(_key)); - # define ADD_ASSOC_BOOL_EX(_zv, _key, _value) add_assoc_bool_ex(_zv, ZEND_STRS(_key), _value); -+# define ADD_INDEX_STRINGL(_zv, _ind, _value, _len) add_index_stringl(_zv, _ind, _value, _len, 0); - # define Z_PHPDATE_P(object) zend_object_store_get_object(object TSRMLS_CC) - # define Z_ISUNDEF(x) !x - # define phongo_free_object_arg void diff --git a/php-pecl-mongodb-dev.spec b/php-pecl-mongodb-dev.spec index f2e7e66..2828315 100644 --- a/php-pecl-mongodb-dev.spec +++ b/php-pecl-mongodb-dev.spec @@ -24,16 +24,13 @@ Summary: MongoDB driver for PHP Name: %{?scl_prefix}php-pecl-%{pecl_name} -Version: 1.1.1 -Release: 4%{?dist}%{!?scl:%{!?nophptag:%(%{__php} -r 'echo ".".PHP_MAJOR_VERSION.".".PHP_MINOR_VERSION;')}} +Version: 1.1.2 +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 @@ -96,7 +93,6 @@ 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) @@ -227,11 +223,14 @@ rm -rf %{buildroot} %changelog -* Thu Dec 31 2015 Remi Collet - 1.1.1-2 +* Thu Jan 07 2016 Remi Collet - 1.1.2-2 +- Update to 1.1.2 (stable) + +* Thu Dec 31 2015 Remi Collet - 1.1.1-4 - fix patch for 32bits build open https://github.com/mongodb/mongo-php-driver/pull/191 -* Sat Dec 26 2015 Remi Collet - 1.1.1-1 +* Sat Dec 26 2015 Remi Collet - 1.1.1-2 - Update to 1.1.1 (stable) - add patch for 32bits build, open https://github.com/mongodb/mongo-php-driver/pull/185 diff --git a/php-pecl-mongodb.spec b/php-pecl-mongodb.spec index 70fa183..5a76147 100644 --- a/php-pecl-mongodb.spec +++ b/php-pecl-mongodb.spec @@ -24,16 +24,13 @@ Summary: MongoDB driver for PHP Name: php-pecl-%{pecl_name} -Version: 1.1.1 -Release: 3%{?dist} +Version: 1.1.2 +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 @@ -72,7 +69,6 @@ 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) @@ -196,6 +192,9 @@ cd ../ZTS %changelog +* Thu Jan 07 2016 Remi Collet - 1.1.2-1 +- Update to 1.1.2 (stable) + * Thu Dec 31 2015 Remi Collet - 1.1.1-3 - fix patch for 32bits build open https://github.com/mongodb/mongo-php-driver/pull/191 -- cgit