From: Marcin Krol <hawk@tld-linux.org>
Date: Thu, 12 Apr 2018 13:02:12 +0000 (+0000)
Subject: - updated to 7.1.16, fixed libs problems
X-Git-Url: https://git.tld-linux.org/?a=commitdiff_plain;h=f981b15d2bfa686b60b16676acf03f03791b890e;p=packages%2Fphp.git

- updated to 7.1.16, fixed libs problems
---

diff --git a/php-ini.patch b/php-ini.patch
index 2b8f90a..91b4c87 100644
--- a/php-ini.patch
+++ b/php-ini.patch
@@ -1,5 +1,5 @@
---- php-7.0.12/php.ini	2016-10-13 14:04:17.000000000 +0000
-+++ php-7.0.12/php.ini	2016-10-27 07:40:55.773715000 +0000
+--- php-7.0.13/php.ini	2018-03-28 07:11:55.000000000 +0000
++++ php-7.0.13/php.ini	2018-04-12 12:56:14.398571302 +0000
 @@ -82,6 +82,20 @@
  ; much more verbose when it comes to errors. We recommend using the
  ; development version only in development environments, as errors shown to
@@ -30,7 +30,7 @@
  ;   Development Value: Off
  ;   Production Value: Off
  
-@@ -175,7 +189,7 @@
+@@ -170,7 +184,7 @@
  ;user_ini.filename = ".user.ini"
  
  ; To disable this feature set this option to empty value
@@ -39,7 +39,7 @@
  
  ; TTL for user-defined php.ini files (time-to-live) in seconds. Default is 300 seconds (5 minutes)
  ;user_ini.cache_ttl = 300
-@@ -195,7 +209,7 @@
+@@ -190,7 +204,7 @@
  ; documents, however this remains supported for backward compatibility reasons.
  ; Note that this directive does not control the <?= shorthand tag, which can be
  ; used regardless of this directive.
@@ -48,7 +48,7 @@
  ; Development Value: Off
  ; Production Value: Off
  ; http://php.net/short-open-tag
-@@ -356,7 +370,7 @@
+@@ -371,7 +385,7 @@
  ; threat in any way, but it makes it possible to determine whether you use PHP
  ; on your server or not.
  ; http://php.net/expose-php
@@ -57,7 +57,7 @@
  
  ;;;;;;;;;;;;;;;;;;;
  ; Resource Limits ;
-@@ -718,7 +732,7 @@
+@@ -733,7 +747,7 @@
  
  ; Directory in which the loadable extensions (modules) reside.
  ; http://php.net/extension-dir
@@ -66,7 +66,7 @@
  ; On windows:
  ; extension_dir = "ext"
  
-@@ -732,65 +746,6 @@
+@@ -747,65 +761,6 @@
  ; http://php.net/enable-dl
  enable_dl = Off
  
@@ -132,12 +132,11 @@
  ;;;;;;;;;;;;;;;;
  ; File Uploads ;
  ;;;;;;;;;;;;;;;;
-@@ -868,47 +823,8 @@
+@@ -883,47 +838,8 @@
  ; If you only provide the name of the extension, PHP will look for it in its
  ; default extension directory.
  ;
 -; Windows Extensions
--; Note that ODBC support is built in, so no dll is needed for it.
 -; Note that many DLL files are located in the extensions/ (PHP 4) ext/ (PHP 5+)
 -; extension folders as well as the separate PECL DLL download (PHP 5+).
 -; Be sure to appropriately set the extension_dir directive.
@@ -157,6 +156,7 @@
 -;extension=php_exif.dll      ; Must be after mbstring as it depends on it
 -;extension=php_mysqli.dll
 -;extension=php_oci8_12c.dll  ; Use with Oracle Database 12c Instant Client
+-;extension=php_odbc.dll
 -;extension=php_openssl.dll
 -;extension=php_pdo_firebird.dll
 -;extension=php_pdo_mysql.dll
@@ -182,7 +182,7 @@
  
  ;;;;;;;;;;;;;;;;;;;
  ; Module Settings ;
-@@ -946,19 +862,19 @@
+@@ -961,19 +877,19 @@
  ; Use of this INI entry is deprecated, use global input_encoding instead.
  ; If empty, default_charset or input_encoding or iconv.input_encoding is used.
  ; The precedence is: default_charset < intput_encoding < iconv.input_encoding
@@ -205,7 +205,7 @@
  
  [intl]
  ;intl.default_locale =
-@@ -1154,6 +1070,9 @@
+@@ -1169,6 +1085,9 @@
  ; http://php.net/mysqli.default-socket
  mysqli.default_socket =
  
@@ -215,7 +215,7 @@
  ; Default host for mysql_connect() (doesn't apply in safe mode).
  ; http://php.net/mysqli.default-host
  mysqli.default_host =
-@@ -1281,7 +1200,7 @@
+@@ -1318,7 +1237,7 @@
  
  [browscap]
  ; http://php.net/browscap
@@ -224,7 +224,7 @@
  
  [Session]
  ; Handler used to store/retrieve data.
-@@ -1708,7 +1627,7 @@
+@@ -1745,7 +1664,7 @@
  
  ; Sets the directory name where SOAP extension will put cache files.
  ; http://php.net/soap.wsdl-cache-dir
diff --git a/php.spec b/php.spec
index 8427b14..8d11680 100644
--- a/php.spec
+++ b/php.spec
@@ -142,8 +142,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.1.15
-Release:	2
+Version:	7.1.16
+Release:	1
 Epoch:		4
 # All files licensed under PHP version 3.01, except
 # Zend is licensed under Zend
@@ -151,7 +151,7 @@ Epoch:		4
 License:	PHP 3.01 and Zend and BSD
 Group:		Libraries
 Source0:	http://php.net/distributions/%{orgname}-%{version}.tar.xz
-# Source0-md5:	9bf2b48c9f928cbb99d59338da28e5b4
+# Source0-md5:	537bf278c8f4d3afa163bab90af868a4
 Source2:	%{orgname}-mod_php.conf
 Source3:	%{orgname}-cgi-fcgi.ini
 Source4:	%{orgname}-apache.ini
@@ -2667,6 +2667,9 @@ if [ $1 -eq 0 ]; then
 	update-alternatives --remove php %{_bindir}/php || :
 fi
 
+%post	common -p /sbin/ldconfig
+%postun	common -p /sbin/ldconfig
+
 %post devel
 update-alternatives \
 	--install %{_bindir}/phpize phpize %{_bindir}/phpize%{php_suffix} %{php_suffix} \