diff options
| -rw-r--r-- | .gitignore | 7 | ||||
| -rw-r--r-- | 883.patch | 23 | ||||
| -rw-r--r-- | REFLECTION | 26 | ||||
| -rw-r--r-- | php-pecl-mongo.spec | 26 |
4 files changed, 57 insertions, 25 deletions
diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..1ab5c4f --- /dev/null +++ b/.gitignore @@ -0,0 +1,7 @@ +package-*.xml +*.tgz +*.tar.gz +*.tar.xz +*.tar.xz.asc +*.src.rpm +*/*rpm diff --git a/883.patch b/883.patch new file mode 100644 index 0000000..e36576f --- /dev/null +++ b/883.patch @@ -0,0 +1,23 @@ +From 8cffa3a1a1d0dcdf8178f1650376b902e396e3a0 Mon Sep 17 00:00:00 2001 +From: Remi Collet <remi@remirepo.net> +Date: Mon, 4 Sep 2017 08:18:55 +0200 +Subject: [PATCH] PHP-1529: read config.h to rerieve HAVE_MONGO_OPENSSL + +--- + contrib/php-ssl.c | 3 +++ + 1 file changed, 3 insertions(+) + +diff --git a/contrib/php-ssl.c b/contrib/php-ssl.c +index 944a62c60..5bdd935fa 100644 +--- a/contrib/php-ssl.c ++++ b/contrib/php-ssl.c +@@ -18,6 +18,9 @@ + +----------------------------------------------------------------------+ + */ + ++#ifdef HAVE_CONFIG_H ++# include "config.h" ++#endif + + #ifdef PHP_WIN32 + # include "config.w32.h" @@ -1,4 +1,4 @@ -Extension [ <persistent> extension #200 mongo version 1.6.14 ] { +Extension [ <persistent> extension #83 mongo version 1.6.15 ] { - Dependencies { Dependency [ openssl (Optional) ] @@ -77,7 +77,7 @@ Extension [ <persistent> extension #200 mongo version 1.6.14 ] { - Constants [8] { Constant [ string DEFAULT_HOST ] { localhost } Constant [ integer DEFAULT_PORT ] { 27017 } - Constant [ string VERSION ] { 1.6.14 } + Constant [ string VERSION ] { 1.6.15 } Constant [ string RP_PRIMARY ] { primary } Constant [ string RP_PRIMARY_PREFERRED ] { primaryPreferred } Constant [ string RP_SECONDARY ] { secondary } @@ -213,7 +213,7 @@ Extension [ <persistent> extension #200 mongo version 1.6.14 ] { - Constants [8] { Constant [ string DEFAULT_HOST ] { localhost } Constant [ integer DEFAULT_PORT ] { 27017 } - Constant [ string VERSION ] { 1.6.14 } + Constant [ string VERSION ] { 1.6.15 } Constant [ string RP_PRIMARY ] { primary } Constant [ string RP_PRIMARY_PREFERRED ] { primaryPreferred } Constant [ string RP_SECONDARY ] { secondary } @@ -2287,7 +2287,7 @@ Extension [ <persistent> extension #200 mongo version 1.6.14 ] { } - Methods [10] { - Method [ <internal:Core, inherits Exception, ctor> <visibility error> method __construct ] { + Method [ <internal:Core, inherits Exception, ctor> public method __construct ] { - Parameters [3] { Parameter #0 [ <optional> $message ] @@ -2344,7 +2344,7 @@ Extension [ <persistent> extension #200 mongo version 1.6.14 ] { } - Methods [10] { - Method [ <internal:Core, inherits Exception, ctor> <visibility error> method __construct ] { + Method [ <internal:Core, inherits Exception, ctor> public method __construct ] { - Parameters [3] { Parameter #0 [ <optional> $message ] @@ -2408,7 +2408,7 @@ Extension [ <persistent> extension #200 mongo version 1.6.14 ] { } } - Method [ <internal:Core, inherits Exception, ctor> <visibility error> method __construct ] { + Method [ <internal:Core, inherits Exception, ctor> public method __construct ] { - Parameters [3] { Parameter #0 [ <optional> $message ] @@ -2471,7 +2471,7 @@ Extension [ <persistent> extension #200 mongo version 1.6.14 ] { } } - Method [ <internal:Core, inherits Exception, ctor> <visibility error> method __construct ] { + Method [ <internal:Core, inherits Exception, ctor> public method __construct ] { - Parameters [3] { Parameter #0 [ <optional> $message ] @@ -2528,7 +2528,7 @@ Extension [ <persistent> extension #200 mongo version 1.6.14 ] { } - Methods [10] { - Method [ <internal:Core, inherits Exception, ctor> <visibility error> method __construct ] { + Method [ <internal:Core, inherits Exception, ctor> public method __construct ] { - Parameters [3] { Parameter #0 [ <optional> $message ] @@ -2599,7 +2599,7 @@ Extension [ <persistent> extension #200 mongo version 1.6.14 ] { } } - Method [ <internal:Core, inherits Exception, ctor> <visibility error> method __construct ] { + Method [ <internal:Core, inherits Exception, ctor> public method __construct ] { - Parameters [3] { Parameter #0 [ <optional> $message ] @@ -2669,7 +2669,7 @@ Extension [ <persistent> extension #200 mongo version 1.6.14 ] { } } - Method [ <internal:Core, inherits Exception, ctor> <visibility error> method __construct ] { + Method [ <internal:Core, inherits Exception, ctor> public method __construct ] { - Parameters [3] { Parameter #0 [ <optional> $message ] @@ -2738,7 +2738,7 @@ Extension [ <persistent> extension #200 mongo version 1.6.14 ] { } } - Method [ <internal:Core, inherits Exception, ctor> <visibility error> method __construct ] { + Method [ <internal:Core, inherits Exception, ctor> public method __construct ] { - Parameters [3] { Parameter #0 [ <optional> $message ] @@ -2795,7 +2795,7 @@ Extension [ <persistent> extension #200 mongo version 1.6.14 ] { } - Methods [10] { - Method [ <internal:Core, inherits Exception, ctor> <visibility error> method __construct ] { + Method [ <internal:Core, inherits Exception, ctor> public method __construct ] { - Parameters [3] { Parameter #0 [ <optional> $message ] @@ -2852,7 +2852,7 @@ Extension [ <persistent> extension #200 mongo version 1.6.14 ] { } - Methods [10] { - Method [ <internal:Core, inherits Exception, ctor> <visibility error> method __construct ] { + Method [ <internal:Core, inherits Exception, ctor> public method __construct ] { - Parameters [3] { Parameter #0 [ <optional> $message ] diff --git a/php-pecl-mongo.spec b/php-pecl-mongo.spec index bc4a7a4..d4442f4 100644 --- a/php-pecl-mongo.spec +++ b/php-pecl-mongo.spec @@ -14,10 +14,10 @@ %{?scl: %scl_package php-pecl-mongo} %global pecl_name mongo -%global with_zts 0%{?__ztsphp:1} +%global with_zts 0%{!?_without_zts:%{?__ztsphp:1}} #global prever RC3 # see https://github.com/mongodb/mongo-php-driver-legacy/releases -%global gh_commit 0b2945e4d96ad9407b68cd9ac403e5824b3f364e +%global gh_commit 026eaed503bc927b2ef6c79fd53314e07f44ddfb %global gh_short %(c=%{gh_commit}; echo ${c:0:7}) %global gh_owner mongodb %global gh_project mongo-php-driver-legacy @@ -32,7 +32,7 @@ Summary: PHP MongoDB database driver Name: %{?scl_prefix}php-pecl-mongo -Version: 1.6.14 +Version: 1.6.15 Release: 1%{?dist}%{!?nophptag:%(%{__php} -r 'echo ".".PHP_MAJOR_VERSION.".".PHP_MINOR_VERSION;')} License: ASL 2.0 Group: Development/Languages @@ -42,8 +42,10 @@ URL: http://pecl.php.net/package/%{pecl_name} Source0: https://github.com/%{gh_owner}/%{gh_project}/archive/%{gh_commit}/%{gh_project}-%{version}%{?prever}.tar.gz Source1: %{pecl_name}.ini -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -BuildRequires: %{?scl_prefix}php-devel >= 5.2.6 +# https://jira.mongodb.org/browse/PHP-1529 +Patch0: 883.patch + +BuildRequires: %{?scl_prefix}php-devel < 7 BuildRequires: %{?scl_prefix}php-pear BuildRequires: cyrus-sasl-devel BuildRequires: openssl-devel @@ -108,6 +110,8 @@ mv NTS/package.xml . %{?_licensedir:sed -e '/LICENSE/s/role="doc"/role="src"/' -i package.xml} cd NTS +%patch0 -p1 -b .pr883 + # Sanity check, really often broken extver=$(sed -n '/#define PHP_MONGO_VERSION/{s/.* "//;s/".*$//;p}' php_mongo.h) if test "x${extver}" != "x%{version}%{?prever}"; then @@ -140,8 +144,6 @@ make %{?_smp_mflags} %install -rm -rf %{buildroot} - make -C NTS install INSTALL_ROOT=%{buildroot} # Drop in the bit of configuration @@ -161,10 +163,6 @@ do install -Dpm 644 NTS/$i %{buildroot}%{pecl_docdir}/%{pecl_name}/$i done -%clean -rm -rf %{buildroot} - - %if 0%{?fedora} < 24 # when pear installed alone, after us %triggerin -- %{?scl_prefix}php-pear @@ -237,7 +235,6 @@ rm -rf data %files -%defattr(-, root, root, -) %{?_licensedir:%license NTS/LICENSE.md} %doc %{pecl_docdir}/%{pecl_name} %{pecl_xmldir}/%{name}.xml @@ -252,6 +249,11 @@ rm -rf data %changelog +* Mon Sep 4 2017 Remi Collet <remi@remirepo.net> - 1.6.15-1 +- Update to 1.6.15 +- add patch to fix undefine symbol + https://jira.mongodb.org/browse/PHP-1529 + * Tue Apr 26 2016 Remi Collet <remi@fedoraproject.org> - 1.6.14-1 - update to 1.6.14 (stable) |