summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRemi Collet <remi@remirepo.net>2019-07-09 06:10:04 +0200
committerRemi Collet <remi@remirepo.net>2019-07-09 06:10:04 +0200
commitbd888acc44ff6293d0352d60ba54d146eb6002ad (patch)
treecfb1cc94f1b2af98c6ad98b759ea8c761a49c9b5
parent479c402b036aaea957c89eaf4b77c01b9ad37ab5 (diff)
-rw-r--r--15bc0173ef7b06ef16e477e8b12c3eac5bcf2abc.patch48
-rw-r--r--PHPINFO4
-rw-r--r--REFLECTION2
-rw-r--r--php-pecl-rdkafka.spec11
4 files changed, 8 insertions, 57 deletions
diff --git a/15bc0173ef7b06ef16e477e8b12c3eac5bcf2abc.patch b/15bc0173ef7b06ef16e477e8b12c3eac5bcf2abc.patch
deleted file mode 100644
index 95474cf..0000000
--- a/15bc0173ef7b06ef16e477e8b12c3eac5bcf2abc.patch
+++ /dev/null
@@ -1,48 +0,0 @@
-From 15bc0173ef7b06ef16e477e8b12c3eac5bcf2abc Mon Sep 17 00:00:00 2001
-From: Arnaud Le Blanc <arnaud.lb@gmail.com>
-Date: Wed, 3 Jul 2019 18:54:11 +0200
-Subject: [PATCH] Fix PHP 5.6 build
-
----
- rdkafka.c | 4 ++--
- travis.sh | 2 +-
- zeval.h | 4 ++++
- 3 files changed, 7 insertions(+), 3 deletions(-)
-
-diff --git a/rdkafka.c b/rdkafka.c
-index 74bc2b1..fd9c9d1 100644
---- a/rdkafka.c
-+++ b/rdkafka.c
-@@ -567,8 +567,8 @@ PHP_METHOD(RdKafka__Kafka, queryWatermarkOffsets)
- return;
- }
-
-- ZVAL_DEREF(lowResult);
-- ZVAL_DEREF(highResult);
-+ ZEVAL_DEREF(lowResult);
-+ ZEVAL_DEREF(highResult);
-
- intern = get_kafka_object(getThis() TSRMLS_CC);
- if (!intern) {
-diff --git a/zeval.h b/zeval.h
-index 62d445c..74c2711 100644
---- a/zeval.h
-+++ b/zeval.h
-@@ -31,6 +31,8 @@ typedef zval zeval;
- #define ZEVAL_DUP_C
- #define ZEVAL_DUP_CC
-
-+#define ZEVAL_DEREF(v) ZVAL_DEREF(v)
-+
- /***************************************************************************/
- #elif defined(ZEND_ENGINE_2)
-
-@@ -59,6 +61,8 @@ typedef zval* zeval;
- #define ZEVAL_DUP_C 1
- #define ZEVAL_DUP_CC , 1
-
-+#define ZEVAL_DEREF(v) (v)
-+
- /***************************************************************************/
- #else
- # error "Unknown Zend Engine version"
diff --git a/PHPINFO b/PHPINFO
index 1ed3226..f2da1e9 100644
--- a/PHPINFO
+++ b/PHPINFO
@@ -2,7 +2,7 @@
rdkafka
rdkafka support => enabled
-version => 3.1.1
-build date => Jul 3 2019 13:07:07
+version => 3.1.2
+build date => Jul 9 2019 06:07:10
librdkafka version (runtime) => 1.1.0
librdkafka version (build) => 1.1.0.255
diff --git a/REFLECTION b/REFLECTION
index e1f4f69..7c6f71c 100644
--- a/REFLECTION
+++ b/REFLECTION
@@ -1,4 +1,4 @@
-Extension [ <persistent> extension #136 rdkafka version 3.1.1 ] {
+Extension [ <persistent> extension #136 rdkafka version 3.1.2 ] {
- Constants [154] {
Constant [ integer RD_KAFKA_CONSUMER ] { 1 }
diff --git a/php-pecl-rdkafka.spec b/php-pecl-rdkafka.spec
index 90e4f38..15e9eba 100644
--- a/php-pecl-rdkafka.spec
+++ b/php-pecl-rdkafka.spec
@@ -20,14 +20,12 @@
Summary: Kafka client based on librdkafka
Name: %{?sub_prefix}php-pecl-%{pecl_name}
-Version: 3.1.1
-Release: 2%{?dist}%{!?nophptag:%(%{__php} -r 'echo ".".PHP_MAJOR_VERSION.".".PHP_MINOR_VERSION;')}
+Version: 3.1.2
+Release: 1%{?dist}%{!?nophptag:%(%{__php} -r 'echo ".".PHP_MAJOR_VERSION.".".PHP_MINOR_VERSION;')}
License: MIT
URL: http://pecl.php.net/package/%{pecl_name}
Source0: http://pecl.php.net/get/%{pecl_name}-%{version}.tgz
-Patch0: https://github.com/arnaud-lb/php-rdkafka/commit/15bc0173ef7b06ef16e477e8b12c3eac5bcf2abc.patch
-
BuildRequires: %{?dtsprefix}gcc
BuildRequires: librdkafka-devel > 0.8
BuildRequires: %{?scl_prefix}php-devel > 5.6
@@ -93,8 +91,6 @@ sed -e 's/role="test"/role="src"/' \
-i package.xml
cd NTS
-%patch0 -p1 -b .up
-
# Sanity check, really often broken
extver=$(sed -n '/#define PHP_RDKAFKA_VERSION/{s/.* "//;s/".*$//;p}' php_rdkafka.h)
if test "x${extver}" != "x%{version}"; then
@@ -209,6 +205,9 @@ cd ../ZTS
%changelog
+* Tue Jul 9 2019 Remi Collet <remi@remirepo.net> - 3.1.2-1
+- update to 3.1.2
+
* Mon Jul 8 2019 Remi Collet <remi@remirepo.net> - 3.1.1-2
- add upstream patch to fix PHP 5.6 build