From c5c6826bf09fc4e9e28f879146d9fd82bec60731 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Sun, 13 May 2018 08:57:33 +0200 Subject: v2.4.0RC2 --- REFLECTION | 2 +- event-upstream.patch | 107 --------------------------------------------------- php-pecl-event.spec | 11 ++---- 3 files changed, 5 insertions(+), 115 deletions(-) delete mode 100644 event-upstream.patch diff --git a/REFLECTION b/REFLECTION index cf598a4..54578eb 100644 --- a/REFLECTION +++ b/REFLECTION @@ -1,4 +1,4 @@ -Extension [ extension #196 event version 2.4.0RC1 ] { +Extension [ extension #196 event version 2.4.0RC2 ] { - Dependencies { Dependency [ sockets (Required) ] diff --git a/event-upstream.patch b/event-upstream.patch deleted file mode 100644 index 396011c..0000000 --- a/event-upstream.patch +++ /dev/null @@ -1,107 +0,0 @@ -From 935302065af825f82fbbc3e6e93eb83f408c9121 Mon Sep 17 00:00:00 2001 -From: Ruslan Osmanov -Date: Mon, 23 Apr 2018 15:15:29 +0700 -Subject: [PATCH] Fixed tests/12-serialization.phpt - ---- - package.xml | 23 +++++++++++++++++++---- - php5/php_event.h | 2 +- - php7/php_event.h | 2 +- - tests/12-serialization.phpt | 2 +- - 4 files changed, 22 insertions(+), 7 deletions(-) - -diff --git a/tests/12-serialization.phpt b/tests/12-serialization.phpt -index 2a8f15d..d5945df 100644 ---- a/tests/12-serialization.phpt -+++ b/tests/12-serialization.phpt -@@ -22,7 +22,7 @@ $http_connection = new $eventHttpConnectionClass($base, null, "0.0.0.0", 9099); - $config = new $eventConfigClass; - - if (class_exists($eventSslContextClass)) { -- $ssl_context = new $eventSslContextClass($eventSslContextClass::SSLv3_SERVER_METHOD, []); -+ $ssl_context = new $eventSslContextClass($eventSslContextClass::TLS_SERVER_METHOD, []); - serialize($ssl_context); - } - --- -2.10.5 - -From 5827e342d81f196f35601a6227852e9a075f9df1 Mon Sep 17 00:00:00 2001 -From: Ruslan Osmanov -Date: Mon, 23 Apr 2018 15:36:51 +0700 -Subject: [PATCH] Fixed PHP 5.4-related issue in tests/12-serialization.phpt - ---- - tests/12-serialization.phpt | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/tests/12-serialization.phpt b/tests/12-serialization.phpt -index d5945df..e37b2b1 100644 ---- a/tests/12-serialization.phpt -+++ b/tests/12-serialization.phpt -@@ -38,7 +38,7 @@ echo "1 - ok\n"; - - ///////////////////////////////////////////// - --foreach ([ $base, $http, $http_request, $http_connection, $config, $listener ] as &$object) { -+foreach ([ $base, $http, $http_request, $http_connection, $config, $listener ] as $object) { - try { - serialize($object); - } catch (\Exception $e) { --- -2.10.5 - -From 0ea49e828fac05f17f258f525420ed807bd81716 Mon Sep 17 00:00:00 2001 -From: Ruslan Osmanov -Date: Mon, 23 Apr 2018 16:01:40 +0700 -Subject: [PATCH] Fixed build errors in PHP 5.4 - ---- - tests/12-serialization.phpt | 16 ++++++++++++---- - 1 file changed, 12 insertions(+), 4 deletions(-) - -diff --git a/tests/12-serialization.phpt b/tests/12-serialization.phpt -index e37b2b1..82125a5 100644 ---- a/tests/12-serialization.phpt -+++ b/tests/12-serialization.phpt -@@ -11,7 +11,6 @@ $eventHttpConnectionClass = EVENT_NS . '\\EventHttpConnection'; - $eventBaseClass = EVENT_NS . '\\EventBase'; - $eventHttpRequestClass = EVENT_NS . '\\EventHttpRequest'; - $eventSslContextClass = EVENT_NS . '\\EventSslContext'; --$eventExceptionClass = EVENT_NS . '\\EventException'; - - $base = new $eventBaseClass(); - $listener = new $eventListenerClass($base, function () { }, null, 0, -1, '0.0.0.0:12345'); -@@ -38,17 +37,26 @@ echo "1 - ok\n"; - - ///////////////////////////////////////////// - --foreach ([ $base, $http, $http_request, $http_connection, $config, $listener ] as $object) { -+function testSerializeEventObject($object) { -+ $eventExceptionClass = EVENT_NS . '\\EventException'; -+ - try { - serialize($object); - } catch (\Exception $e) { - echo get_class($object), ' - ', - ($e instanceof $eventExceptionClass ? 'ok' : 'error - ' . get_class($e)), - "\n"; -- } finally { -- $object = null; - } - } -+ -+testSerializeEventObject($base); -+testSerializeEventObject($http); -+testSerializeEventObject($http_request); -+testSerializeEventObject($http_connection); -+testSerializeEventObject($config); -+testSerializeEventObject($listener); -+ -+ - ?> - --EXPECTF-- - 1 - ok --- -2.10.5 - diff --git a/php-pecl-event.spec b/php-pecl-event.spec index 24e2cc3..ce476b6 100644 --- a/php-pecl-event.spec +++ b/php-pecl-event.spec @@ -31,7 +31,7 @@ %global ini_name 40-%{pecl_name}.ini %endif %global upstream_version 2.4.0 -%global upstream_prever RC1 +%global upstream_prever RC2 Summary: Provides interface to libevent library Name: %{?sub_prefix}php-pecl-%{pecl_name} @@ -41,8 +41,6 @@ License: PHP URL: http://pecl.php.net/package/event Source0: http://pecl.php.net/get/%{pecl_name}-%{upstream_version}%{?upstream_prever}.tgz -Patch0: %{pecl_name}-upstream.patch - BuildRequires: %{?dtsprefix}gcc BuildRequires: %{?scl_prefix}php-devel BuildRequires: %{?scl_prefix}php-pear @@ -120,8 +118,6 @@ sed -e 's/role="test"/role="src"/' \ mv %{pecl_name}-%{upstream_version}%{?upstream_prever} NTS cd NTS -%patch0 -p1 -b .upstream - # Sanity check, really often broken DIR=$(%{__php} -r 'echo "php" . PHP_MAJOR_VERSION;') extver=$(sed -n '/#define PHP_EVENT_VERSION/{s/.* "//;s/".*$//;p}' $DIR/php_event.h) @@ -213,8 +209,6 @@ fi %endif %if %{with_tests} -sed -e 's/SSLv3_SERVER_METHOD/TLS_SERVER_METHOD/' -i ?TS/tests/12-serialization.phpt - cd NTS : Upstream test suite for NTS extension SKIP_ONLINE_TESTS=1 \ @@ -276,6 +270,9 @@ fi %changelog +* Sun May 13 2018 Remi Collet - 2.4.0~RC2-1 +- update to 2.4.0RC2 + * Mon Apr 23 2018 Remi Collet - 2.4.0~RC1-1 - update to 2.4.0RC1 -- cgit