From: Arkadiusz Miśkiewicz <arekm@maven.pl>
Date: Mon, 25 Mar 2013 16:35:39 +0000 (+0100)
Subject: - rel 30; complete patch
X-Git-Tag: auto/th/php52-5.2.17-30
X-Git-Url: https://git.pld-linux.org/?p=packages%2Fphp.git;a=commitdiff_plain;h=91b7596ecd8a146909d5061bec83924180e41f86

- rel 30; complete patch
---

diff --git a/php-crypt-null.patch b/php-crypt-null.patch
index ee02006..9cf79d0 100644
--- a/php-crypt-null.patch
+++ b/php-crypt-null.patch
@@ -1,5 +1,13 @@
 --- php-5.2.17/ext/standard/crypt.c~	2013-03-25 17:26:27.000000000 +0100
 +++ php-5.2.17/ext/standard/crypt.c	2013-03-25 17:27:42.866436012 +0100
+@@ -118,6 +118,7 @@
+    Encrypt a string */
+ PHP_FUNCTION(crypt)
+ {
++	char *crypt_res;
+ 	char salt[PHP_MAX_SALT_LEN+1];
+ 	char *str, *salt_in = NULL;
+ 	int str_len, salt_in_len;
 @@ -163,7 +163,12 @@
  		RETURN_STRING(crypt_r(str, salt, &buffer), 1);
  	}
diff --git a/php.spec b/php.spec
index 4cbc1c6..8325319 100644
--- a/php.spec
+++ b/php.spec
@@ -120,7 +120,7 @@ Summary(ru.UTF-8):	PHP Версии 5 - язык препроцессирова
 Summary(uk.UTF-8):	PHP Версії 5 - мова препроцесування HTML-файлів, виконувана на сервері
 Name:		%{orgname}%{php_suffix}
 Version:	5.2.17
-Release:	29
+Release:	30
 Epoch:		4
 License:	PHP
 Group:		Libraries