From ea1f4e8854d6d7b74ff9ad5ef59fbacb2ff4f4a1 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Thu, 22 Mar 2018 13:58:12 +0100 Subject: more PR + apply patches --- .gitignore | 9 +++ Makefile | 4 + REFLECTION | 127 +++++++++++++++++++++++++++++ php-pecl-nsq.spec | 236 ++++++++++++++++++++++++++++++++++++++++++++++++++++++ 4 files changed, 376 insertions(+) create mode 100644 .gitignore create mode 100644 Makefile create mode 100644 REFLECTION create mode 100644 php-pecl-nsq.spec diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..6f69818 --- /dev/null +++ b/.gitignore @@ -0,0 +1,9 @@ +clog +package-*.xml +*.tgz +*.tar.gz +*.tar.bz2 +*.tar.xz +*.tar.xz.asc +*.src.rpm +*/*rpm diff --git a/Makefile b/Makefile new file mode 100644 index 0000000..13af741 --- /dev/null +++ b/Makefile @@ -0,0 +1,4 @@ +SRCDIR := $(shell pwd) +NAME := $(shell basename $(SRCDIR)) +include ../../../common/Makefile + diff --git a/REFLECTION b/REFLECTION new file mode 100644 index 0000000..97df2b1 --- /dev/null +++ b/REFLECTION @@ -0,0 +1,127 @@ +Extension [ extension #117 nsq version 2.3.2 ] { + + - Classes [3] { + Class [ class Nsq ] { + + - Constants [0] { + } + + - Static properties [0] { + } + + - Static methods [0] { + } + + - Properties [1] { + Property [ public $nsqd_connection_fds ] + } + + - Methods [6] { + Method [ public method connectNsqd ] { + + - Parameters [1] { + Parameter #0 [ $connect_addr_arr ] + } + } + + Method [ public method closeNsqdConnection ] { + } + + Method [ public method publish ] { + + - Parameters [2] { + Parameter #0 [ $topic ] + Parameter #1 [ $msg ] + } + } + + Method [ public method deferredPublish ] { + + - Parameters [3] { + Parameter #0 [ $topic ] + Parameter #1 [ $msg ] + Parameter #2 [ $delay_time ] + } + } + + Method [ public method subscribe ] { + + - Parameters [2] { + Parameter #0 [ $conifg ] + Parameter #1 [ $callback ] + } + } + + Method [ public method requeue ] { + + - Parameters [1] { + Parameter #0 [ $delay_time ] + } + } + } + } + + Class [ class NsqLookupd ] { + + - Constants [0] { + } + + - Static properties [0] { + } + + - Static methods [0] { + } + + - Properties [1] { + Property [ public $address ] + } + + - Methods [1] { + Method [ public method __construct ] { + + - Parameters [1] { + Parameter #0 [ $address ] + } + } + } + } + + Class [ class NsqMessage ] { + + - Constants [0] { + } + + - Static properties [0] { + } + + - Static methods [0] { + } + + - Properties [4] { + Property [ public $message_id ] + Property [ public $timestamp ] + Property [ public $attempts ] + Property [ public $payload ] + } + + - Methods [2] { + Method [ public method touch ] { + + - Parameters [2] { + Parameter #0 [ $bev_zval ] + Parameter #1 [ $message_id ] + } + } + + Method [ public method finish ] { + + - Parameters [2] { + Parameter #0 [ $bev_zval ] + Parameter #1 [ $message_id ] + } + } + } + } + } +} + diff --git a/php-pecl-nsq.spec b/php-pecl-nsq.spec new file mode 100644 index 0000000..1069fd5 --- /dev/null +++ b/php-pecl-nsq.spec @@ -0,0 +1,236 @@ +# remirepo spec file for php-pecl-nsq +# +# Copyright (c) 2018 Remi Collet +# License: CC-BY-SA +# http://creativecommons.org/licenses/by-sa/4.0/ +# +# Please, preserve the changelog entries +# + +# we don't want -z defs linker flag +%undefine _strict_symbol_defs_build + +%if 0%{?scl:1} +%global sub_prefix %{scl_prefix} +%scl_package php-pecl-nsq +%else +%global _root_prefix %{_prefix} +%endif + +%global with_zts 0%{!?_without_zts:%{?__ztsphp:1}} +%global pecl_name nsq +%global ini_name 40-%{pecl_name}.ini + +Summary: PHP extension for NSQ client +Name: %{?sub_prefix}php-pecl-nsq +Version: 2.3.2 +Release: 1%{?dist}%{!?scl:%{!?nophptag:%(%{__php} -r 'echo ".".PHP_MAJOR_VERSION.".".PHP_MINOR_VERSION;')}} +Source: http://pecl.php.net/get/%{pecl_name}-%{version}%{?prever}.tgz +License: PHP +URL: http://pecl.php.net/package/nsq + +Patch0: https://patch-diff.githubusercontent.com/raw/yunnian/php-nsq/pull/19.patch +Patch1: https://patch-diff.githubusercontent.com/raw/yunnian/php-nsq/pull/21.patch + +BuildRequires: %{?dtsprefix}gcc +BuildRequires: %{?scl_prefix}php-devel >= 7 +BuildRequires: %{?scl_prefix}php-json +BuildRequires: %{?scl_prefix}php-pear +BuildRequires: pkgconfig(libevent) >= 2 + +Requires: %{?scl_prefix}php(zend-abi) = %{php_zend_api} +Requires: %{?scl_prefix}php(api) = %{php_core_api} +Requires: %{?scl_prefix}php-json%{?_isa} +%{?_sclreq:Requires: %{?scl_prefix}runtime%{?_sclreq}%{?_isa}} + +Provides: %{?scl_prefix}php-%{pecl_name} = %{version} +Provides: %{?scl_prefix}php-%{pecl_name}%{?_isa} = %{version} +Provides: %{?scl_prefix}php-pecl(%{pecl_name}) = %{version} +Provides: %{?scl_prefix}php-pecl(%{pecl_name})%{?_isa} = %{version} +%if "%{?scl_prefix}" != "%{?sub_prefix}" +Provides: %{?scl_prefix}php-pecl-%{pecl_name} = %{version}-%{release} +Provides: %{?scl_prefix}php-pecl-%{pecl_name}%{?_isa} = %{version}-%{release} +%endif + +%if "%{?vendor}" == "Remi Collet" && 0%{!?scl:1} && 0%{?rhel} +# Other third party repo stuff +Obsoletes: php70u-pecl-%{pecl_name} <= %{version} +Obsoletes: php70w-pecl-%{pecl_name} <= %{version} +%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 +%endif + +%if 0%{?fedora} < 20 && 0%{?rhel} < 7 +# Filter shared private +%{?filter_provides_in: %filter_provides_in %{_libdir}/.*\.so$} +%{?filter_setup} +%endif + + +%description +This extension is a NSQ client .NSQ is a message queue system which like Kafka. + +Package built for PHP %(%{__php} -r 'echo PHP_MAJOR_VERSION.".".PHP_MINOR_VERSION;')%{?scl: as Software Collection (%{scl} by %{?scl_vendor}%{!?scl_vendor:rh})}. + + +%prep +%setup -qc +mv %{pecl_name}-%{version} NTS + +# Don't install/register tests +sed -e 's/role="test"/role="src"/' \ + %{?_licensedir:-e '/LICENSE/s/role="doc"/role="src"/' } \ + -i package.xml + +cd NTS +%patch0 -p1 -b .pr19 +%patch1 -p1 -b .pr21 + +# bad permission in generated archive +find . -type f -exec chmod -x {} \; + +# Sanity check, really often broken +extver=$(sed -n '/#define PHP_NSQ_VERSION/{s/.* "//;s/".*$//;p}' php_nsq.h ) +if test "x${extver}" != "x%{version}"; then + : Error: Upstream extension version is ${extver}, expecting %{version}. + exit 1 +fi +cd .. + +%if %{with_zts} +# duplicate for ZTS build +cp -pr NTS ZTS +%endif + +# Drop in the bit of configuration +cat << 'EOF' | tee %{ini_name} +; Enable %{summary} +extension = %{pecl_name}.so +EOF + + + + +%build +%{?dtsenable} + +cd NTS +%{_bindir}/phpize +%configure \ + --with-nsq \ + --with-libevent-path=%{_root_prefix} \ + --with-php-config=%{_bindir}/php-config +make %{?_smp_mflags} + +%if %{with_zts} +cd ../ZTS +%{_bindir}/zts-phpize +%configure \ + --with-nsq \ + --with-libevent-path=%{_root_prefix} \ + --with-php-config=%{_bindir}/zts-php-config +make %{?_smp_mflags} +%endif + + +%install +%{?dtsenable} + +: Install the NTS stuff +make -C NTS install INSTALL_ROOT=%{buildroot} +install -D -m 644 %{ini_name} %{buildroot}%{php_inidir}/%{ini_name} + +: Install the ZTS stuff +%if %{with_zts} +make -C ZTS install INSTALL_ROOT=%{buildroot} +install -D -m 644 %{ini_name} %{buildroot}%{php_ztsinidir}/%{ini_name} +%endif + +: Install the package XML file +install -D -m 644 package.xml %{buildroot}%{pecl_xmldir}/%{name}.xml + +: Documentation +for i in $(grep 'role="doc"' package.xml | sed -e 's/^.*name="//;s/".*$//') +do install -Dpm 644 NTS/$i %{buildroot}%{pecl_docdir}/%{pecl_name}/$i +done + + +%check +cd NTS +: Minimal load test for NTS extension +%{__php} --no-php-ini \ + --define extension=json.so \ + --define extension=%{buildroot}%{php_extdir}/%{pecl_name}.so \ + --modules | grep %{pecl_name} + +: Upstream test suite for NTS extension +TEST_PHP_EXECUTABLE=%{__php} \ +TEST_PHP_ARGS="-n -d extension=json.so -d extension=%{buildroot}%{php_extdir}/%{pecl_name}.so" \ +NO_INTERACTION=1 \ +REPORT_EXIT_STATUS=1 \ +%{__php} -n run-tests.php --show-diff + +%if %{with_zts} +cd ../ZTS + +: Minimal load test for ZTS extension +%{__ztsphp} --no-php-ini \ + --define extension=json.so \ + --define extension=%{buildroot}%{php_ztsextdir}/%{pecl_name}.so \ + --modules | grep %{pecl_name} + +: Upstream test suite for NTS extension +TEST_PHP_EXECUTABLE=%{__ztsphp} \ +TEST_PHP_ARGS="-n -d extension=json.so -d extension=%{buildroot}%{php_ztsextdir}/%{pecl_name}.so" \ +NO_INTERACTION=1 \ +REPORT_EXIT_STATUS=1 \ +%{__ztsphp} -n run-tests.php --show-diff +%endif + + +%if 0%{?fedora} < 24 && 0%{?rhel} < 8 +# when pear installed alone, after us +%triggerin -- %{?scl_prefix}php-pear +if [ -x %{__pecl} ] ; then + %{pecl_install} %{pecl_xmldir}/%{name}.xml >/dev/null || : +fi + +# posttrans as pear can be installed after us +%posttrans +if [ -x %{__pecl} ] ; then + %{pecl_install} %{pecl_xmldir}/%{name}.xml >/dev/null || : +fi + +%postun +if [ $1 -eq 0 -a -x %{__pecl} ] ; then + %{pecl_uninstall} %{pecl_name} >/dev/null || : +fi +%endif + + +%files +%{?_licensedir:%license NTS/LICENSE} +%doc %{pecl_docdir}/%{pecl_name} +%{pecl_xmldir}/%{name}.xml + +%config(noreplace) %{php_inidir}/%{ini_name} +%{php_extdir}/%{pecl_name}.so + +%if %{with_zts} +%{php_ztsextdir}/%{pecl_name}.so +%config(noreplace) %{php_ztsinidir}/%{ini_name} +%endif + + +%changelog +* Thu Mar 22 2018 Remi Collet - 2.3.2-1 +- initial package, version 2.3.2 (stable) +- open https://github.com/yunnian/php-nsq/pull/19 - json dependency +- open https://github.com/yunnian/php-nsq/pull/20 - examples role +- open https://github.com/yunnian/php-nsq/pull/21 - missing include -- cgit