php: update to 7.0.6.

This commit is contained in:
Steve Prybylski 2016-04-28 21:38:52 -04:00
parent 2e523cc353
commit df461d931c
3 changed files with 18 additions and 23 deletions

View file

@ -1,20 +0,0 @@
--- ext/standard/crypt.c.orig 2016-03-29 16:44:22.000000000 +0200
+++ ext/standard/crypt.c 2016-04-12 18:15:09.987505656 +0200
@@ -270,6 +270,17 @@
return result;
}
}
+# elif defined(HAVE_CRYPT)
+ crypt_res = crypt(password, salt);
+ if (!crypt_res || (salt[0] == '*' && salt[1] == '0')) {
+ return NULL;
+ } else {
+ result = zend_string_init(crypt_res, strlen(crypt_res), 0);
+ return result;
+ }
+
+# else
+# error No crypt() implementation
# endif
#endif
}

View file

@ -0,0 +1,15 @@
--- ext/standard/crypt.c.orig 2016-04-28 14:13:00.000000000 -0400
+++ ext/standard/crypt.c 2016-04-28 21:45:24.340955313 -0400
@@ -267,6 +267,12 @@
}
# elif defined(HAVE_CRYPT)
crypt_res = crypt(password, salt);
+ if (!crypt_res || (salt[0] == '*' && salt[1] == '0')) {
+ return NULL;
+ } else {
+ result = zend_string_init(crypt_res, strlen(crypt_res), 0);
+ return result;
+ }
# else
# error No crypt() implementation
# endif

View file

@ -1,7 +1,7 @@
# Template build file for 'php'
pkgname=php
version=7.0.5
revision=4
version=7.0.6
revision=1
short_desc="An HTML-embedded scripting language"
maintainer="Steve Prybylski <sa.prybylx@gmail.com>"
license="PHP"
@ -15,7 +15,7 @@ makedepends="postgresql-libs-devel libldap-devel libvpx-devel sqlite-devel
readline-devel libmysqlclient-devel"
conf_files="/etc/php/php.ini"
distfiles="http://www.php.net/distributions/php-${version}.tar.gz"
checksum=f9d93419031b4df663fc48f03b8a833545de8776225e46637563e2be6029908d
checksum=f6b47cb3e02530d96787ae5c7888aefbd1db6ae4164d68b88808ee6f4da94277
# Package build options
nocross=yes