summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRemi Collet <remi@remirepo.net>2020-01-02 07:43:15 +0100
committerRemi Collet <remi@remirepo.net>2020-01-02 07:43:15 +0100
commit85f00423eb83eb08d4eda16168d743c29efdcd90 (patch)
treed7f3cf879c7147cf26835cd420a063b43dd2535b
parentf9a60030327ef74a70aaab84d1075ced667f494d (diff)
- update to 2.1.0HEADmaster
- open https://github.com/SeasX/SeasLog/issues/286 broken build on 32-bit
-rw-r--r--PHPINFO2
-rw-r--r--REFLECTION37
-rw-r--r--e1ebead8120aa27a3bdd14f00e468df1a4ff7a7e.patch24
-rw-r--r--php-pecl-seaslog.spec25
4 files changed, 35 insertions, 53 deletions
diff --git a/PHPINFO b/PHPINFO
index 120c120..0f106bf 100644
--- a/PHPINFO
+++ b/PHPINFO
@@ -2,7 +2,7 @@
SeasLog
SeasLog support => Enabled
-SeasLog Version => 2.0.2
+SeasLog Version => 2.1.0
SeasLog Author => Chitao.Gao [ neeke@php.net ]
SeasLog Supports => https://github.com/SeasX/SeasLog
diff --git a/REFLECTION b/REFLECTION
index bfa0536..f7e2ac1 100644
--- a/REFLECTION
+++ b/REFLECTION
@@ -1,4 +1,4 @@
-Extension [ <persistent> extension #200 SeasLog version 2.0.2 ] {
+Extension [ <persistent> extension #108 SeasLog version 2.1.0 ] {
- Dependencies {
}
@@ -100,7 +100,7 @@ Extension [ <persistent> extension #200 SeasLog version 2.0.2 ] {
}
- Constants [22] {
- Constant [ string SEASLOG_VERSION ] { 2.0.2 }
+ Constant [ string SEASLOG_VERSION ] { 2.1.0 }
Constant [ string SEASLOG_AUTHOR ] { Chitao.Gao [ neeke@php.net ] }
Constant [ string SEASLOG_ALL ] { ALL }
Constant [ string SEASLOG_DEBUG ] { DEBUG }
@@ -111,17 +111,17 @@ Extension [ <persistent> extension #200 SeasLog version 2.0.2 ] {
Constant [ string SEASLOG_CRITICAL ] { CRITICAL }
Constant [ string SEASLOG_ALERT ] { ALERT }
Constant [ string SEASLOG_EMERGENCY ] { EMERGENCY }
- Constant [ integer SEASLOG_DETAIL_ORDER_ASC ] { 1 }
- Constant [ integer SEASLOG_DETAIL_ORDER_DESC ] { 2 }
- Constant [ integer SEASLOG_APPENDER_FILE ] { 1 }
- Constant [ integer SEASLOG_APPENDER_TCP ] { 2 }
- Constant [ integer SEASLOG_APPENDER_UDP ] { 3 }
- Constant [ integer SEASLOG_CLOSE_LOGGER_STREAM_MOD_ALL ] { 1 }
- Constant [ integer SEASLOG_CLOSE_LOGGER_STREAM_MOD_ASSIGN ] { 2 }
- Constant [ integer SEASLOG_REQUEST_VARIABLE_DOMAIN_PORT ] { 1 }
- Constant [ integer SEASLOG_REQUEST_VARIABLE_REQUEST_URI ] { 2 }
- Constant [ integer SEASLOG_REQUEST_VARIABLE_REQUEST_METHOD ] { 3 }
- Constant [ integer SEASLOG_REQUEST_VARIABLE_CLIENT_IP ] { 4 }
+ Constant [ int SEASLOG_DETAIL_ORDER_ASC ] { 1 }
+ Constant [ int SEASLOG_DETAIL_ORDER_DESC ] { 2 }
+ Constant [ int SEASLOG_APPENDER_FILE ] { 1 }
+ Constant [ int SEASLOG_APPENDER_TCP ] { 2 }
+ Constant [ int SEASLOG_APPENDER_UDP ] { 3 }
+ Constant [ int SEASLOG_CLOSE_LOGGER_STREAM_MOD_ALL ] { 1 }
+ Constant [ int SEASLOG_CLOSE_LOGGER_STREAM_MOD_ASSIGN ] { 2 }
+ Constant [ int SEASLOG_REQUEST_VARIABLE_DOMAIN_PORT ] { 1 }
+ Constant [ int SEASLOG_REQUEST_VARIABLE_REQUEST_URI ] { 2 }
+ Constant [ int SEASLOG_REQUEST_VARIABLE_REQUEST_METHOD ] { 3 }
+ Constant [ int SEASLOG_REQUEST_VARIABLE_CLIENT_IP ] { 4 }
}
- Functions {
@@ -132,7 +132,7 @@ Extension [ <persistent> extension #200 SeasLog version 2.0.2 ] {
}
- Classes [1] {
- Class [ <internal:SeasLog> class SeasLog ] {
+ Class [ <internal:SeasLog> final class SeasLog ] {
- Constants [0] {
}
@@ -140,7 +140,7 @@ Extension [ <persistent> extension #200 SeasLog version 2.0.2 ] {
- Static properties [0] {
}
- - Static methods [25] {
+ - Static methods [26] {
Method [ <internal:SeasLog> static public method setBasePath ] {
- Parameters [1] {
@@ -228,10 +228,17 @@ Extension [ <persistent> extension #200 SeasLog version 2.0.2 ] {
Method [ <internal:SeasLog> static public method getBuffer ] {
}
+ Method [ <internal:SeasLog> static public method getBufferCount ] {
+ }
+
Method [ <internal:SeasLog> static public method getBufferEnabled ] {
}
Method [ <internal:SeasLog> static public method flushBuffer ] {
+
+ - Parameters [1] {
+ Parameter #0 [ <optional> $type ]
+ }
}
Method [ <internal:SeasLog> static public method log ] {
diff --git a/e1ebead8120aa27a3bdd14f00e468df1a4ff7a7e.patch b/e1ebead8120aa27a3bdd14f00e468df1a4ff7a7e.patch
deleted file mode 100644
index 01f2a9a..0000000
--- a/e1ebead8120aa27a3bdd14f00e468df1a4ff7a7e.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-From e1ebead8120aa27a3bdd14f00e468df1a4ff7a7e Mon Sep 17 00:00:00 2001
-From: wujunze <itwujunze@163.com>
-Date: Tue, 28 May 2019 11:39:05 +0800
-Subject: [PATCH] php 70400 define ZEND_ACC_IMPLICIT_PUBLIC ZEND_ACC_PUBLIC
-
----
- include/php7_wrapper.h | 4 ++++
- 1 file changed, 4 insertions(+)
-
-diff --git a/include/php7_wrapper.h b/include/php7_wrapper.h
-index 701ce34..c3fa839 100644
---- a/include/php7_wrapper.h
-+++ b/include/php7_wrapper.h
-@@ -14,6 +14,10 @@
- +----------------------------------------------------------------------+
- */
-
-+#if !defined(ZEND_ACC_IMPLICIT_PUBLIC)
-+# define ZEND_ACC_IMPLICIT_PUBLIC ZEND_ACC_PUBLIC
-+#endif
-+
- #if PHP_VERSION_ID >= 70000
-
- # define SEASLOG_MAKE_ZVAL(z) zval _stack_zval_##z; z = &(_stack_zval_##z)
diff --git a/php-pecl-seaslog.spec b/php-pecl-seaslog.spec
index 25eda46..3435d78 100644
--- a/php-pecl-seaslog.spec
+++ b/php-pecl-seaslog.spec
@@ -25,13 +25,11 @@
Summary: An effective, fast, stable log extension for PHP
Name: %{?sub_prefix}php-pecl-%{pecl_name}
-Version: 2.0.2
-Release: 3%{?dist}%{!?scl:%{!?nophptag:%(%{__php} -r 'echo ".".PHP_MAJOR_VERSION.".".PHP_MINOR_VERSION;')}}
+Version: 2.1.0
+Release: 1%{?dist}%{!?scl:%{!?nophptag:%(%{__php} -r 'echo ".".PHP_MAJOR_VERSION.".".PHP_MINOR_VERSION;')}}
License: PHP
-URL: http://pecl.php.net/package/%{proj_name}
-Source0: http://pecl.php.net/get/%{proj_name}-%{version}.tgz
-
-Patch0: https://github.com/SeasX/SeasLog/commit/e1ebead8120aa27a3bdd14f00e468df1a4ff7a7e.patch
+URL: https://pecl.php.net/package/%{proj_name}
+Source0: https://pecl.php.net/get/%{proj_name}-%{version}.tgz
BuildRequires: %{?dtsprefix}gcc
BuildRequires: %{?scl_prefix}php-devel
@@ -54,20 +52,16 @@ Provides: %{?scl_prefix}php-pecl-%{pecl_name}%{?_isa} = %{version}-%{rele
%if "%{?vendor}" == "Remi Collet" && 0%{!?scl:1} && 0%{?rhel}
# Other third party repo stuff
-%if "%{php_version}" > "7.1"
-Obsoletes: php71u-pecl-%{pecl_name} <= %{version}
-Obsoletes: php71w-pecl-%{pecl_name} <= %{version}
-%endif
%if "%{php_version}" > "7.2"
Obsoletes: php72u-pecl-%{pecl_name} <= %{version}
Obsoletes: php72w-pecl-%{pecl_name} <= %{version}
%endif
%if "%{php_version}" > "7.3"
-Obsoletes: php73-pecl-%{pecl_name} <= %{version}
+Obsoletes: php73-pecl-%{pecl_name} <= %{version}
Obsoletes: php73w-pecl-%{pecl_name} <= %{version}
%endif
%if "%{php_version}" > "7.4"
-Obsoletes: php74-pecl-%{pecl_name} <= %{version}
+Obsoletes: php74-pecl-%{pecl_name} <= %{version}
Obsoletes: php74w-pecl-%{pecl_name} <= %{version}
%endif
%endif
@@ -106,7 +100,7 @@ sed -e 's/role="test"/role="src"/' \
-i package.xml
cd NTS
-%patch0 -p1 -b .up
+sed -e 's/ifndef ulong/if 0/' -i include/php7_wrapper.h
: Sanity check, really often broken
extver=$(sed -n '/#define SEASLOG_VERSION /{s/.* "//;s/".*$//;p}' include/SeasLog.h)
@@ -259,6 +253,11 @@ fi
%changelog
+* Thu Jan 2 2020 Remi Collet <remi@remirepo.net> - 2.1.0-1
+- update to 2.1.0
+- open https://github.com/SeasX/SeasLog/issues/286
+ broken build on 32-bit
+
* Tue Sep 03 2019 Remi Collet <remi@remirepo.net> - 2.0.2-3
- rebuild for 7.4.0RC1