php-lz4: 0.2.5 - New package

4 files changed, 286 insertions, 0 deletions

diff --git a/Makefile b/Makefile
new file mode 100644
index 0000000..91b0fd5
--- /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..c001124
--- /dev/null
+++ b/REFLECTION
@@ -0,0 +1,22 @@
+Extension [ <persistent> extension #99 lz4 version 0.2.5 ] {
+
+  - Functions {
+    Function [ <internal:lz4> function lz4_compress ] {
+
+      - Parameters [3] {
+        Parameter #0 [ <required> $data ]
+        Parameter #1 [ <optional> $high ]
+        Parameter #2 [ <optional> $extra ]
+      }
+    }
+    Function [ <internal:lz4> function lz4_uncompress ] {
+
+      - Parameters [3] {
+        Parameter #0 [ <required> $data ]
+        Parameter #1 [ <optional> $max ]
+        Parameter #2 [ <optional> $offset ]
+      }
+    }
+  }
+}
+
diff --git a/php-ext-lz4-pr12.patch b/php-ext-lz4-pr12.patch
new file mode 100644
index 0000000..79c8036
--- /dev/null
+++ b/php-ext-lz4-pr12.patch
@@ -0,0 +1,42 @@
+From 620320c8a6e7ffa959a232626e46877dab7b85c9 Mon Sep 17 00:00:00 2001
+From: Remi Collet <fedora@famillecollet.com>
+Date: Wed, 7 Sep 2016 15:12:21 +0200
+Subject: [PATCH] fix some types
+
+---
+ lz4.c | 11 +++++++----
+ 1 file changed, 7 insertions(+), 4 deletions(-)
+
+diff --git a/lz4.c b/lz4.c
+index 5dac48f..3ddbfc2 100644
+--- a/lz4.c
++++ b/lz4.c
+@@ -100,12 +100,12 @@ static ZEND_FUNCTION(lz4_compress)
+     int output_len, data_len;
+     zend_bool high = 0;
+     char *extra = NULL;
+-    int extra_len = -1;
+ #if ZEND_MODULE_API_NO >= 20141001
+-    size_t offset = 0;
++    size_t extra_len = -1;
+ #else
+-    int offset = 0;
++    int extra_len = -1;
+ #endif
++    int offset = 0;
+ 
+     if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC,
+                               "z|bs", &data, &high,
+@@ -164,8 +164,11 @@ static ZEND_FUNCTION(lz4_uncompress)
+     zval *data;
+     int output_len, data_size;
+     char *output;
++#if ZEND_MODULE_API_NO >= 20141001
++    zend_long max_size = -1, offset = 0;
++#else
+     long max_size = -1, offset = 0;
+-    void *len;
++#endif
+ 
+     if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC,
+                               "z|ll", &data, &max_size, &offset) == FAILURE) {
diff --git a/php-lz4.spec b/php-lz4.spec
new file mode 100644
index 0000000..e6a09d6
--- /dev/null
+++ b/php-lz4.spec
@@ -0,0 +1,218 @@
+# remirepo spec file for php-lz4
+#
+# Copyright (c) 2016 Remi Collet
+# License: CC-BY-SA
+# http://creativecommons.org/licenses/by-sa/4.0/
+#
+# Please, preserve the changelog entries
+#
+%if 0%{?scl:1}
+%if "%{scl}" == "rh-php56"
+%global sub_prefix more-php56-
+%else
+%global sub_prefix %{scl_prefix}
+%endif
+%scl_package        php-lz4
+%endif
+
+%global gh_commit   35f942c0e26f12999332d5043777ed5f0264a775
+%global gh_short    %(c=%{gh_commit}; echo ${c:0:7})
+%global gh_owner    kjdev
+%global gh_project  php-ext-lz4
+#global gh_date     20160608
+%global pecl_name   lz4
+%global with_zts    0%{!?_without_zts:%{?__ztsphp:1}}
+%global ini_name    40-%{pecl_name}.ini
+
+Summary:       LZ4 Extension for PHP
+Name:          %{?sub_prefix}php-lz4
+Version:       0.2.5
+%if 0%{?gh_date:1}
+Release:       0.1.%{gh_date}git%{gh_short}%{?dist}%{!?scl:%{!?nophptag:%(%{__php} -r 'echo ".".PHP_MAJOR_VERSION.".".PHP_MINOR_VERSION;')}}
+%else
+Release:       1%{?dist}%{!?scl:%{!?nophptag:%(%{__php} -r 'echo ".".PHP_MAJOR_VERSION.".".PHP_MINOR_VERSION;')}}
+%endif
+License:       MIT
+Group:         Development/Languages
+URL:           https://github.com/%{gh_owner}/%{gh_project}
+Source0:       https://github.com/%{gh_owner}/%{gh_project}/archive/%{gh_commit}/%{gh_project}-%{version}-%{gh_short}.tar.gz
+
+# https://github.com/kjdev/php-ext-lz4/pull/12
+Patch0:        %{gh_project}-pr12.patch
+
+BuildRoot:     %{_tmppath}/%{name}-%{version}-%{release}-root
+BuildRequires: %{?scl_prefix}php-devel
+BuildRequires: lz4-devel
+
+Requires:      %{?scl_prefix}php(zend-abi) = %{php_zend_api}
+Requires:      %{?scl_prefix}php(api) = %{php_core_api}
+%{?_sclreq:Requires: %{?scl_prefix}runtime%{?_sclreq}%{?_isa}}
+
+%if "%{?vendor}" == "Remi Collet" && 0%{!?scl:1}
+# Other third party repo stuff
+Obsoletes:     php53-%{pecl_name}  <= %{version}
+Obsoletes:     php53u-%{pecl_name} <= %{version}
+Obsoletes:     php54-%{pecl_name}  <= %{version}
+Obsoletes:     php54w-%{pecl_name} <= %{version}
+%if "%{php_version}" > "5.5"
+Obsoletes:     php55u-%{pecl_name} <= %{version}
+Obsoletes:     php55w-%{pecl_name} <= %{version}
+%endif
+%if "%{php_version}" > "5.6"
+Obsoletes:     php56u-%{pecl_name} <= %{version}
+Obsoletes:     php56w-%{pecl_name} <= %{version}
+%endif
+%if "%{php_version}" > "7.0"
+Obsoletes:     php70u-%{pecl_name} <= %{version}
+Obsoletes:     php70w-%{pecl_name} <= %{version}
+%endif
+%if "%{php_version}" > "7.1"
+Obsoletes:     php71u-%{pecl_name} <= %{version}
+Obsoletes:     php71w-%{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 allows LZ4, a compression/decompression library.
+
+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 %{gh_project}-%{gh_commit} NTS
+
+cd NTS
+# See https://github.com/kjdev/php-ext-lz4/pull/11
+sed -e 's/HAVE_LIBSNAPPY/HAVE_LIBLZ4/' -i lz4.c
+
+# Use the system library
+rm -r lz4
+
+%patch0 -p1 -b .pr12
+
+# Sanity check, really often broken
+extver=$(sed -n '/#define LZ4_EXT_VERSION/{s/.* "//;s/".*$//;p}' php_lz4.h)
+if test "x${extver}" != "x%{version}%{?gh_date:-dev}"; then
+   : Error: Upstream extension version is ${extver}, expecting %{version}%{?gh_date:-dev}.
+   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 module
+extension = %{pecl_name}.so
+EOF
+
+
+%build
+cd NTS
+%{_bindir}/phpize
+%configure \
+    --with-php-config=%{_bindir}/php-config \
+    --with-lz4-includedir=/usr \
+    --with-libdir=%{_lib} \
+    --enable-lz4
+make %{?_smp_mflags}
+
+%if %{with_zts}
+cd ../ZTS
+%{_bindir}/zts-phpize
+%configure \
+    --with-php-config=%{_bindir}/zts-php-config \
+    --with-lz4-includedir=/usr \
+    --with-libdir=%{_lib} \
+    --enable-lz4
+make %{?_smp_mflags}
+%endif
+
+
+%install
+rm -rf %{buildroot}
+# Install the NTS stuff
+make -C NTS install INSTALL_ROOT=%{buildroot}
+install -D -m 644 %{ini_name} %{buildroot}%{php_inidir}/%{ini_name}
+
+%if %{with_zts}
+# Install the ZTS stuff
+make -C ZTS install INSTALL_ROOT=%{buildroot}
+install -D -m 644 %{ini_name} %{buildroot}%{php_ztsinidir}/%{ini_name}
+%endif
+
+
+
+%check
+%ifnarch x86_64
+: ignore test with different output on 32bits - md5 diff only
+rm ?TS/tests/001.phpt
+rm ?TS/tests/003.phpt
+rm ?TS/tests/008.phpt
+%endif
+
+cd NTS
+: Minimal load test for NTS extension
+%{__php} --no-php-ini \
+    --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=%{buildroot}%{php_extdir}/%{pecl_name}.so" \
+NO_INTERACTION=1 \
+REPORT_EXIT_STATUS=1 \
+%{__php} -n run-tests.php --show-diff || : ignore
+
+%if %{with_zts}
+cd ../ZTS
+: Minimal load test for ZTS extension
+%{__ztsphp} --no-php-ini \
+    --define extension=%{buildroot}%{php_ztsextdir}/%{pecl_name}.so \
+    --modules | grep %{pecl_name}
+
+: Upstream test suite  for ZTS extension
+TEST_PHP_EXECUTABLE=%{__ztsphp} \
+TEST_PHP_ARGS="-n -d extension=%{buildroot}%{php_ztsextdir}/%{pecl_name}.so" \
+NO_INTERACTION=1 \
+REPORT_EXIT_STATUS=1 \
+%{__ztsphp} -n run-tests.php --show-diff
+%endif
+
+
+%clean
+rm -rf %{buildroot}
+
+
+%files
+%defattr(-,root,root,-)
+%{!?_licensedir:%global license %%doc}
+%license NTS/LICENSE
+%doc NTS/CREDITS
+%doc NTS/README.md
+
+%config(noreplace) %{php_inidir}/%{ini_name}
+%{php_extdir}/%{pecl_name}.so
+
+%if %{with_zts}
+%config(noreplace) %{php_ztsinidir}/%{ini_name}
+%{php_ztsextdir}/%{pecl_name}.so
+%endif
+
+
+%changelog
+* Wed Sep  7 2016 Remi Collet <remi@fedoraproject.org> - 0.2.5-1
+- new package, version 0.2.5
+- open https://github.com/kjdev/php-ext-lz4/pull/12
+