summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--REFLECTION2
-rw-r--r--ev-leak.patch25
-rw-r--r--php-pecl-ev.spec11
3 files changed, 6 insertions, 32 deletions
diff --git a/REFLECTION b/REFLECTION
index b6510e5..d6324d9 100644
--- a/REFLECTION
+++ b/REFLECTION
@@ -1,4 +1,4 @@
-Extension [ <persistent> extension #84 ev version 0.2.11 ] {
+Extension [ <persistent> extension #84 ev version 0.2.12 ] {
- Dependencies {
Dependency [ sockets (Optional) ]
diff --git a/ev-leak.patch b/ev-leak.patch
deleted file mode 100644
index c013ed5..0000000
--- a/ev-leak.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From 904388b5cc122a3331120b73aaa987aa8b70f84d Mon Sep 17 00:00:00 2001
-From: Remi Collet <fedora@famillecollet.com>
-Date: Mon, 8 Sep 2014 18:54:42 +0200
-Subject: [PATCH] fix #10 segfault in ZTS test suite
-
----
- loop.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/loop.c b/loop.c
-index c180b7f..85c3f10 100644
---- a/loop.c
-+++ b/loop.c
-@@ -64,7 +64,7 @@ static void php_ev_loop_object_ctor(INTERNAL_FUNCTION_PARAMETERS, const zend_boo
-
- /* Save return_value in MyG(default_loop) */
- if (is_default_loop && !*default_loop_ptr_ptr) {
-- MAKE_STD_ZVAL(*default_loop_ptr_ptr);
-+ ALLOC_INIT_ZVAL(*default_loop_ptr_ptr);
- REPLACE_ZVAL_VALUE(default_loop_ptr_ptr, return_value, 1);
- }
- } else {
---
-1.8.5.2
-
diff --git a/php-pecl-ev.spec b/php-pecl-ev.spec
index 4764e07..eb8994f 100644
--- a/php-pecl-ev.spec
+++ b/php-pecl-ev.spec
@@ -29,16 +29,13 @@
Summary: Provides interface to libev library
Name: %{?scl_prefix}php-pecl-%{pecl_name}
-Version: 0.2.11
+Version: 0.2.12
Release: 2%{?dist}%{!?nophptag:%(%{__php} -r 'echo ".".PHP_MAJOR_VERSION.".".PHP_MINOR_VERSION;')}
License: PHP
Group: Development/Languages
URL: http://pecl.php.net/package/%{pecl_name}
Source0: http://pecl.php.net/get/%{pecl_name}-%{version}.tgz
-# https://bitbucket.org/osmanov/pecl-ev/pull-request/3
-Patch0: %{pecl_name}-leak.patch
-
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: %{?scl_prefix}php-devel > 5.4
BuildRequires: %{?scl_prefix}php-pear
@@ -94,8 +91,6 @@ mv %{pecl_name}-%{version} NTS
sed -e '/role="test"/d' -i package.xml
cd NTS
-%patch0 -p1 -b .leak
-
# Sanity check, really often broken
extver=$(sed -n '/define PHP_EV_VERSION/{s/.* "//;s/".*$//;p}' php_ev.h)
if test "x${extver}" != "x%{version}%{?prever:-%{prever}}"; then
@@ -226,6 +221,10 @@ rm -rf %{buildroot}
%changelog
+* Tue Sep 09 2014 Remi Collet <remi@fedoraproject.org> - 0.2.12-1
+- Update to 0.2.12 (no change, only our patch merged)
+- enable posix during build as some tests need it
+
* Mon Sep 8 2014 Remi Collet <rcollet@redhat.com> - 0.2.11-2
- open https://bitbucket.org/osmanov/pecl-ev/pull-request/3
- enable ZTS build