[packages/php] - updated to 7.2.12 - release 0.1 - no official announce yet, in theory tarball might change
adamg
adamg at pld-linux.org
Tue Nov 6 21:22:42 CET 2018
commit 981a37217309c1c5cb935725dae525bc38144009
Author: Adam Gołębiowski <adamg at pld-linux.org>
Date: Tue Nov 6 21:22:03 2018 +0100
- updated to 7.2.12
- release 0.1 - no official announce yet, in theory tarball might change
bug-52078-fileinode.patch | 2 +-
pcre-shared.patch | 2 +-
php-link-libs.patch | 4 ++--
php-pear.patch | 8 ++++----
php.spec | 8 ++++----
spl-shared.patch | 8 ++++----
6 files changed, 16 insertions(+), 16 deletions(-)
---
diff --git a/php.spec b/php.spec
index 43854dc..0e21551 100644
--- a/php.spec
+++ b/php.spec
@@ -154,8 +154,8 @@ Summary(pt_BR.UTF-8): A linguagem de script PHP
Summary(ru.UTF-8): PHP Версии 7 - язык препроцессирования HTML-файлов, выполняемый на сервере
Summary(uk.UTF-8): PHP Версії 7 - мова препроцесування HTML-файлів, виконувана на сервері
Name: %{orgname}%{php_suffix}
-Version: 7.2.11
-Release: 1
+Version: 7.2.12
+Release: 0.1
Epoch: 4
# All files licensed under PHP version 3.01, except
# Zend is licensed under Zend
@@ -163,7 +163,7 @@ Epoch: 4
License: PHP 3.01 and Zend and BSD
Group: Libraries
Source0: https://php.net/distributions/%{orgname}-%{version}.tar.xz
-# Source0-md5: 28c3d5310a64799fd54c5e49e4982cf9
+# Source0-md5: 6be4a00ca29dd9a63a26f79a2e8752c8
Source1: opcache.ini
Source2: %{orgname}-mod_php.conf
Source3: %{orgname}-cgi-fcgi.ini
@@ -319,7 +319,7 @@ BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
%define jsonver 1.6.0
%define pharver 2.0.2
%define sqlite3ver %{version}
-%define zipver 1.15.3
+%define zipver 1.15.4
%define phpdbgver 0.5.0
%define sodiumver %{version}
diff --git a/bug-52078-fileinode.patch b/bug-52078-fileinode.patch
index 0fd0163..419be68 100644
--- a/bug-52078-fileinode.patch
+++ b/bug-52078-fileinode.patch
@@ -72,7 +72,7 @@
@@ -30,17 +30,17 @@
echo "Done\n";
?>
- --EXPECTF--
+ --EXPECTF--
+int(%i)
int(%d)
int(%d)
diff --git a/pcre-shared.patch b/pcre-shared.patch
index 4eee40e..8bb03e4 100644
--- a/pcre-shared.patch
+++ b/pcre-shared.patch
@@ -24,7 +24,7 @@
])
- PHP_ADD_LIBRARY_WITH_PATH(pcre, $PCRE_LIBDIR)
+ PHP_ADD_LIBRARY_WITH_PATH(pcre, $PCRE_LIBDIR, PCRE_SHARED_LIBADD)
-
+
AC_DEFINE(HAVE_PCRE, 1, [ ])
PHP_ADD_INCLUDE($PCRE_INCDIR)
- PHP_NEW_EXTENSION(pcre, php_pcre.c, no,, -DZEND_ENABLE_STATIC_TSRMLS_CACHE=1)
diff --git a/php-link-libs.patch b/php-link-libs.patch
index c20149e..e65166a 100644
--- a/php-link-libs.patch
+++ b/php-link-libs.patch
@@ -10,14 +10,14 @@
if test "$ac_cv_func_dlopen" = "yes"; then
--- php-5.2.0/acinclude.m4.orig 2006-12-22 21:52:13.766461055 +0100
+++ php-5.2.0/acinclude.m4 2006-12-22 21:52:37.159794165 +0100
-@@ -1740,18 +1740,18 @@
+@@ -1834,18 +1834,18 @@
dnl Wrapper for AC_CHECK_LIB
dnl
AC_DEFUN([PHP_CHECK_LIBRARY], [
- save_old_LDFLAGS=$LDFLAGS
+ save_old_LIBS=$LIBS
ac_stuff="$5"
-
+
save_ext_shared=$ext_shared
ext_shared=yes
- PHP_EVAL_LIBLINE([$]ac_stuff, LDFLAGS)
diff --git a/php-pear.patch b/php-pear.patch
index 74a03d6..b198776 100644
--- a/php-pear.patch
+++ b/php-pear.patch
@@ -12,23 +12,23 @@
PHP_ARG_WITH(pear, [whether to install PEAR],
[ --with-pear=DIR Install PEAR in DIR [PREFIX/lib/php]
--without-pear Do not install PEAR], DEFAULT, yes)
-@@ -1023,11 +1023,11 @@
+@@ -1111,11 +1111,11 @@
dnl
dnl PEAR dependancies
dnl
- if test "$PHP_XML" = "no"; then
-- pear_error_msg="$pear_error_msg
+- pear_error_msg="$pear_error_msg
- PEAR requires XML to be enabled. Add --enable-xml to the configure line. (or --without-pear)"
- fi
-
+dnl if test "$PHP_XML" = "no"; then
-+dnl pear_error_msg="$pear_error_msg
++dnl pear_error_msg="$pear_error_msg
+dnl PEAR requires XML to be enabled. Add --enable-xml to the configure line. (or --without-pear)"
+dnl fi
+dnl
dnl
dnl if test "$PHP_XMLRPC" = "no"; then
- dnl pear_error_msg="$pear_error_msg
+ dnl pear_error_msg="$pear_error_msg
--- php-5.2.6/sapi/cli/config.m4~ 2008-11-16 18:35:31.000000000 +0200
+++ php-5.2.6/sapi/cli/config.m4 2008-11-20 19:04:12.585061299 +0200
@@ -4,7 +4,7 @@
diff --git a/spl-shared.patch b/spl-shared.patch
index a928d0c..9680530 100644
--- a/spl-shared.patch
+++ b/spl-shared.patch
@@ -1,9 +1,9 @@
--- php-7.0/ext/spl/config.m4~ 2015-05-21 17:57:06.000000000 +0300
+++ php-7.0/ext/spl/config.m4 2015-05-23 11:25:19.609715006 +0300
-@@ -22,6 +22,6 @@
- CPPFLAGS=$old_CPPFLAGS
- AC_DEFINE_UNQUOTED(HAVE_PACKED_OBJECT_VALUE, $ac_result, [Whether struct _zend_object_value is packed])
- AC_DEFINE(HAVE_SPL, 1, [Whether you want SPL (Standard PHP Library) support])
+@@ -2,6 +2,6 @@
+ dnl config.m4 for extension SPL
+
+ AC_DEFINE(HAVE_SPL, 1, [Whether you want SPL (Standard PHP Library) support])
- PHP_NEW_EXTENSION(spl, php_spl.c spl_functions.c spl_engine.c spl_iterators.c spl_array.c spl_directory.c spl_exceptions.c spl_observer.c spl_dllist.c spl_heap.c spl_fixedarray.c, no,, -DZEND_ENABLE_STATIC_TSRMLS_CACHE=1)
+ PHP_NEW_EXTENSION(spl, php_spl.c spl_functions.c spl_engine.c spl_iterators.c spl_array.c spl_directory.c spl_exceptions.c spl_observer.c spl_dllist.c spl_heap.c spl_fixedarray.c, $ext_shared,, -DZEND_ENABLE_STATIC_TSRMLS_CACHE=1)
PHP_INSTALL_HEADERS([ext/spl], [php_spl.h spl_array.h spl_directory.h spl_engine.h spl_exceptions.h spl_functions.h spl_iterators.h spl_observer.h spl_dllist.h spl_heap.h spl_fixedarray.h])
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/php.git/commitdiff/981a37217309c1c5cb935725dae525bc38144009
More information about the pld-cvs-commit
mailing list