summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--3_01.txt68
-rw-r--r--REFLECTION2
-rw-r--r--dio-svn.patch71
-rw-r--r--php-pecl-dio.spec13
4 files changed, 8 insertions, 146 deletions
diff --git a/3_01.txt b/3_01.txt
deleted file mode 100644
index 42536af..0000000
--- a/3_01.txt
+++ /dev/null
@@ -1,68 +0,0 @@
---------------------------------------------------------------------
- The PHP License, version 3.01
-Copyright (c) 1999 - 2012 The PHP Group. All rights reserved.
---------------------------------------------------------------------
-
-Redistribution and use in source and binary forms, with or without
-modification, is permitted provided that the following conditions
-are met:
-
- 1. Redistributions of source code must retain the above copyright
- notice, this list of conditions and the following disclaimer.
-
- 2. Redistributions in binary form must reproduce the above copyright
- notice, this list of conditions and the following disclaimer in
- the documentation and/or other materials provided with the
- distribution.
-
- 3. The name "PHP" must not be used to endorse or promote products
- derived from this software without prior written permission. For
- written permission, please contact group@php.net.
-
- 4. Products derived from this software may not be called "PHP", nor
- may "PHP" appear in their name, without prior written permission
- from group@php.net. You may indicate that your software works in
- conjunction with PHP by saying "Foo for PHP" instead of calling
- it "PHP Foo" or "phpfoo"
-
- 5. The PHP Group may publish revised and/or new versions of the
- license from time to time. Each version will be given a
- distinguishing version number.
- Once covered code has been published under a particular version
- of the license, you may always continue to use it under the terms
- of that version. You may also choose to use such covered code
- under the terms of any subsequent version of the license
- published by the PHP Group. No one other than the PHP Group has
- the right to modify the terms applicable to covered code created
- under this License.
-
- 6. Redistributions of any form whatsoever must retain the following
- acknowledgment:
- "This product includes PHP software, freely available from
- <http://www.php.net/software/>".
-
-THIS SOFTWARE IS PROVIDED BY THE PHP DEVELOPMENT TEAM ``AS IS'' AND
-ANY EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
-THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A
-PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE PHP
-DEVELOPMENT TEAM OR ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT,
-INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
-SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
-HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
-STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
-OF THE POSSIBILITY OF SUCH DAMAGE.
-
---------------------------------------------------------------------
-
-This software consists of voluntary contributions made by many
-individuals on behalf of the PHP Group.
-
-The PHP Group can be contacted via Email at group@php.net.
-
-For more information on the PHP Group and the PHP project,
-please see <http://www.php.net>.
-
-PHP includes the Zend Engine, freely available at
-<http://www.zend.com>.
diff --git a/REFLECTION b/REFLECTION
index 4eff918..fbf5208 100644
--- a/REFLECTION
+++ b/REFLECTION
@@ -1,4 +1,4 @@
-Extension [ <persistent> extension #80 dio version 0.0.8-dev ] {
+Extension [ <persistent> extension #80 dio version 0.0.8 ] {
- Constants [36] {
Constant [ integer O_RDONLY ] { 0 }
diff --git a/dio-svn.patch b/dio-svn.patch
deleted file mode 100644
index 7bbf472..0000000
--- a/dio-svn.patch
+++ /dev/null
@@ -1,71 +0,0 @@
---- pecl/dio/trunk/dio.c 2013/10/09 12:04:16 331748
-+++ pecl/dio/trunk/dio.c 2013/10/09 12:15:51 331749
-@@ -775,7 +775,7 @@
- ZEND_ARG_INFO(0, options)
- ZEND_END_ARG_INFO()
-
--static zend_object_handlers dio_raw_object_handlers;
-+// not used static zend_object_handlers dio_raw_object_handlers;
-
- static zend_function_entry dio_functions[] = {
- /* Class functions. */
---- pecl/dio/trunk/dio_posix.c 2013/10/09 12:04:16 331748
-+++ pecl/dio/trunk/dio_posix.c 2013/10/09 12:15:51 331749
-@@ -266,7 +266,6 @@
- * earlier than early time.
- */
- static int dio_timeval_subtract(struct timeval *late, struct timeval *early, struct timeval *diff) {
-- struct timeval *tmp;
-
- /* Handle negatives */
- if (late->tv_sec < early->tv_sec) {
---- pecl/dio/trunk/dio_stream_wrappers.c 2013/10/09 12:15:51 331749
-+++ pecl/dio/trunk/dio_stream_wrappers.c 2013/10/09 12:18:34 331750
-@@ -228,9 +228,8 @@
- efree(data);
- RETURN_FALSE;
- }
-+ php_stream_to_zval(stream, return_value);
- }
--
-- php_stream_to_zval(stream, return_value);
- }
- /* }}} */
-
-@@ -390,9 +389,8 @@
- efree(data);
- RETURN_FALSE;
- }
-+ php_stream_to_zval(stream, return_value);
- }
--
-- php_stream_to_zval(stream, return_value);
- }
- /* }}} */
-
---- pecl/dio/trunk/dio_posix.c 2013/10/09 12:18:34 331750
-+++ pecl/dio/trunk/dio_posix.c 2013/10/09 12:24:28 331751
-@@ -28,7 +28,10 @@
- * Convert an fopen() mode string to open() flags
- */
- static int dio_stream_mode_to_flags(const char *mode) {
-- int flags = 0, ch = 0, bin = 1;
-+ int flags = 0, ch = 0;
-+#if defined(_O_TEXT) && defined(O_BINARY)
-+ int bin = 1;
-+#endif
-
- switch(mode[ch++]) {
- case 'r':
-@@ -45,9 +48,11 @@
- break;
- }
-
-+#if defined(_O_TEXT) && defined(O_BINARY)
- if (mode[ch] != '+') {
- bin = (mode[ch++] == 'b');
- }
-+#endif
-
- if (mode[ch] == '+') {
- flags |= O_RDWR;
diff --git a/php-pecl-dio.spec b/php-pecl-dio.spec
index 5adde6c..da81c76 100644
--- a/php-pecl-dio.spec
+++ b/php-pecl-dio.spec
@@ -8,9 +8,7 @@
#
%{?scl: %scl_package php-pecl-dio}
-%global svn_date 20161113
-%global svn_rev 340995
-%global prever dev
+#global prever dev
%global pecl_name dio
%global with_zts 0%{?__ztsphp:1}
%if "%{php_version}" < "5.6"
@@ -22,11 +20,11 @@
Summary: Direct I/O functions
Name: %{?scl_prefix}php-pecl-%{pecl_name}
Version: 0.0.8
-Release: 0.3.%{svn_date}svn%{svn_rev}%{?dist}%{!?nophptag:%(%{__php} -r 'echo ".".PHP_MAJOR_VERSION.".".PHP_MINOR_VERSION;')}
+Release: 1%{?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}%{prever}.tgz
+Source0: http://pecl.php.net/get/%{pecl_name}-%{version}%{?prever}.tgz
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: %{?scl_prefix}php-devel
@@ -91,7 +89,7 @@ more than adequate.
%prep
%setup -q -c
-mv %{pecl_name}-%{version}%{prever} NTS
+mv %{pecl_name}-%{version}%{?prever} NTS
# Don't install/register tests
sed -e 's/role="test"/role="src"/' \
@@ -234,6 +232,9 @@ rm -rf %{buildroot}
%changelog
+* Tue Dec 13 2016 Remi Collet <remi@fedoraproject.org> - 0.0.8-1
+- update to 0.0.8
+
* Thu Dec 1 2016 Remi Collet <remi@fedoraproject.org> - 0.0.8-0.3.20161113svn340995
- rebuild with PHP 7.1.0 GA
generated by cgit (git 2.34.1) at 2024-11-21 22:48:26 +0000