From: Marcin Krol Date: Sun, 30 Jun 2013 13:02:07 +0000 (+0000) Subject: - updated to 5.4.16 X-Git-Url: https://git.tld-linux.org/?a=commitdiff_plain;h=b10469553eda31d5ddf1af46568035a8ff68239d;p=packages%2Fphp.git - updated to 5.4.16 --- diff --git a/php-mysql-charsetphpini.patch b/php-mysql-charsetphpini.patch index d3a2a64..cd3e132 100644 --- a/php-mysql-charsetphpini.patch +++ b/php-mysql-charsetphpini.patch @@ -19,11 +19,11 @@ @@ -515,6 +517,7 @@ { char *user=NULL, *passwd=NULL, *host_and_port=NULL, *socket=NULL, *tmp=NULL, *host=NULL; - int user_len, passwd_len, host_len; + int user_len = 0, passwd_len = 0, host_len = 0; + char *connect_charset=NULL; char *hashed_details=NULL; int hashed_details_length, port = MYSQL_PORT; - int client_flags = 0; + long client_flags = 0; @@ -527,6 +530,7 @@ diff --git a/php.spec b/php.spec index 51f72dd..9724413 100644 --- a/php.spec +++ b/php.spec @@ -126,7 +126,7 @@ ERROR: You need to select at least one Apache SAPI to build shared modules. %define orgname php %define php_suffix %{nil} -%define rel 3 +%define rel 1 Summary: PHP: Hypertext Preprocessor Summary(fr.UTF-8): Le langage de script embarque-HTML PHP Summary(pl.UTF-8): Język skryptowy PHP @@ -134,13 +134,13 @@ Summary(pt_BR.UTF-8): A linguagem de script PHP Summary(ru.UTF-8): PHP Версии 5 - язык препроцессирования HTML-файлов, выполняемый на сервере Summary(uk.UTF-8): PHP Версії 5 - мова препроцесування HTML-файлів, виконувана на сервері Name: %{orgname}%{php_suffix} -Version: 5.4.14 +Version: 5.4.16 Release: %{rel}%{?with_type_hints:.th}%{?with_oci8:.oci} Epoch: 4 License: PHP Group: Libraries Source0: http://www.php.net/distributions/%{orgname}-%{version}.tar.bz2 -# Source0-md5: cfdc044be2c582991a1fe0967898fa38 +# Source0-md5: 3d2c694d28861d707b2622c3cc941cff Source2: %{orgname}-mod_%{orgname}.conf Source3: %{orgname}-cgi-fcgi.ini Source4: %{orgname}-apache.ini