From df461d931cea58f995c18ff65b8c12500a519cf1 Mon Sep 17 00:00:00 2001 From: Steve Prybylski Date: Thu, 28 Apr 2016 21:38:52 -0400 Subject: [PATCH] php: update to 7.0.6. --- srcpkgs/php/patches/php-705-crypt.patch | 20 -------------------- srcpkgs/php/patches/php-706-crypt.patch | 15 +++++++++++++++ srcpkgs/php/template | 6 +++--- 3 files changed, 18 insertions(+), 23 deletions(-) delete mode 100644 srcpkgs/php/patches/php-705-crypt.patch create mode 100644 srcpkgs/php/patches/php-706-crypt.patch diff --git a/srcpkgs/php/patches/php-705-crypt.patch b/srcpkgs/php/patches/php-705-crypt.patch deleted file mode 100644 index 0aa78d2f9a9..00000000000 --- a/srcpkgs/php/patches/php-705-crypt.patch +++ /dev/null @@ -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 - } diff --git a/srcpkgs/php/patches/php-706-crypt.patch b/srcpkgs/php/patches/php-706-crypt.patch new file mode 100644 index 00000000000..12bee4ae7ad --- /dev/null +++ b/srcpkgs/php/patches/php-706-crypt.patch @@ -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 diff --git a/srcpkgs/php/template b/srcpkgs/php/template index a6133b0f316..e75c8b41a75 100644 --- a/srcpkgs/php/template +++ b/srcpkgs/php/template @@ -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 " 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