summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--REFLECTION2
-rw-r--r--amqp-pr274.patch35
-rw-r--r--php-pecl-amqp.spec11
3 files changed, 7 insertions, 41 deletions
diff --git a/REFLECTION b/REFLECTION
index a238e6b..bce73cd 100644
--- a/REFLECTION
+++ b/REFLECTION
@@ -1,4 +1,4 @@
-Extension [ <persistent> extension #72 amqp version 1.9.0beta1 ] {
+Extension [ <persistent> extension #72 amqp version 1.9.0beta2 ] {
- INI {
Entry [ amqp.host <ALL> ]
diff --git a/amqp-pr274.patch b/amqp-pr274.patch
deleted file mode 100644
index 4817470..0000000
--- a/amqp-pr274.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-From f031d8492f0acfc0f38e8e5e4e01ed87a22234b2 Mon Sep 17 00:00:00 2001
-From: Remi Collet <fedora@famillecollet.com>
-Date: Mon, 13 Mar 2017 06:57:14 +0100
-Subject: [PATCH] adapt buffer size and secure its usage, fix #273
-
----
- amqp_timestamp.c | 6 +++---
- 1 file changed, 3 insertions(+), 3 deletions(-)
-
-diff --git a/amqp_timestamp.c b/amqp_timestamp.c
-index 70013f1..79b0e52 100644
---- a/amqp_timestamp.c
-+++ b/amqp_timestamp.c
-@@ -119,7 +119,7 @@ zend_function_entry amqp_timestamp_class_functions[] = {
- PHP_MINIT_FUNCTION(amqp_timestamp)
- {
- zend_class_entry ce;
-- char min[1], max[20];
-+ char min[20], max[20];
- int min_len, max_len;
-
- INIT_CLASS_ENTRY(ce, "AMQPTimestamp", amqp_timestamp_class_functions);
-@@ -128,10 +128,10 @@ PHP_MINIT_FUNCTION(amqp_timestamp)
-
- zend_declare_property_null(this_ce, ZEND_STRL("timestamp"), ZEND_ACC_PRIVATE TSRMLS_CC);
-
-- max_len = sprintf(max, "%.0f", AMQP_TIMESTAMP_MAX);
-+ max_len = snprintf(max, sizeof(max), "%.0f", AMQP_TIMESTAMP_MAX);
- zend_declare_class_constant_stringl(this_ce, ZEND_STRL("MAX"), max, max_len TSRMLS_CC);
-
-- min_len = sprintf(min, "%.0f", AMQP_TIMESTAMP_MIN);
-+ min_len = snprintf(min, sizeof(min), "%.0f", AMQP_TIMESTAMP_MIN);
- zend_declare_class_constant_stringl(this_ce, ZEND_STRL("MIN"), min, min_len TSRMLS_CC);
-
- return SUCCESS;
diff --git a/php-pecl-amqp.spec b/php-pecl-amqp.spec
index 599b178..58da513 100644
--- a/php-pecl-amqp.spec
+++ b/php-pecl-amqp.spec
@@ -22,21 +22,19 @@
%else
%global ini_name 40-%{pecl_name}.ini
%endif
-%global prever beta1
+%global prever beta2
%global buildver %(pkg-config --silence-errors --modversion librabbitmq 2>/dev/null || echo 65536)
Summary: Communicate with any AMQP compliant server
Name: %{?sub_prefix}php-pecl-amqp
Version: 1.9.0
-Release: 0.1.%{prever}%{?dist}%{!?scl:%{!?nophptag:%(%{__php} -r 'echo ".".PHP_MAJOR_VERSION.".".PHP_MINOR_VERSION;')}}
+Release: 0.2.%{prever}%{?dist}%{!?scl:%{!?nophptag:%(%{__php} -r 'echo ".".PHP_MAJOR_VERSION.".".PHP_MINOR_VERSION;')}}
License: PHP
Group: Development/Languages
URL: http://pecl.php.net/package/amqp
Source0: http://pecl.php.net/get/%{pecl_name}-%{version}%{?prever}.tgz
-Patch0: %{pecl_name}-pr274.patch
-
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
BuildRequires: %{?scl_prefix}php-devel > 5.3.0
BuildRequires: %{?scl_prefix}php-pear
@@ -117,7 +115,6 @@ sed -e 's/role="test"/role="src"/' \
mv %{pecl_name}-%{version}%{?prever} NTS
cd NTS
-%patch0 -p1 -b .pr274
sed -e 's/CFLAGS="-I/CFLAGS="-fPIC -I/' -i config.m4
# Upstream often forget to change this
@@ -312,6 +309,10 @@ fi
%changelog
+* Mon Mar 13 2017 Remi Collet <remi@remirepo.net> - 1.9.0-0.2.beta2
+- Update to 1.9.0beta2
+- drop patch merged upstream
+
* Mon Mar 13 2017 Remi Collet <remi@remirepo.net> - 1.9.0-0.1.beta1
- Update to 1.9.0beta1
- add patch from https://github.com/pdezwart/php-amqp/pull/274