commit 91b7596ecd8a146909d5061bec83924180e41f86
Author: Arkadiusz Miśkiewicz <[email protected]>
Date: Mon Mar 25 17:35:39 2013 +0100
- rel 30; complete patch
php-crypt-null.patch | 8 ++++++++
php.spec | 2 +-
2 files changed, 9 insertions(+), 1 deletion(-)
---
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
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);
}
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/php.git/commitdiff/91b7596ecd8a146909d5061bec83924180e41f86
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
