diff options
| author | Kaarle Ritvanen <kaarle.ritvanen@datakunkku.fi> | 2016-05-02 18:54:21 +0300 |
|---|---|---|
| committer | Kaarle Ritvanen <kaarle.ritvanen@datakunkku.fi> | 2016-05-02 18:54:21 +0300 |
| commit | eb35135e39609692fc3326b768b9a402ecfa78cc (patch) | |
| tree | 70ba3bb3b5771c8137f1ccca125d73f0dd9f127f | |
| parent | 693349646ea024a789592a07972bc27e5eabac1f (diff) | |
| download | aports-eb35135e39609692fc3326b768b9a402ecfa78cc.tar.bz2 aports-eb35135e39609692fc3326b768b9a402ecfa78cc.tar.xz | |
main/php: upgrade to 5.6.21
| -rw-r--r-- | main/php/APKBUILD | 18 | ||||
| -rw-r--r-- | main/php/fix-crypt.patch | 48 |
2 files changed, 7 insertions, 59 deletions
diff --git a/main/php/APKBUILD b/main/php/APKBUILD index 82bb1ab114..ca820cb192 100644 --- a/main/php/APKBUILD +++ b/main/php/APKBUILD @@ -3,7 +3,7 @@ # Contributor: Carlo Landmeter <clandmeter@gmail.com> # Maintainer: Matt Smith <mcs@darkregion.net> pkgname=php -pkgver=5.6.20 +pkgver=5.6.21 pkgrel=0 pkgdesc="The PHP language runtime engine" url="http://www.php.net/" @@ -113,7 +113,6 @@ source="http://php.net/distributions/php-$pkgver.tar.bz2 php5-module.conf php-install-pear-xml.patch gd-iconv.patch - fix-crypt.patch " _apiver="20131106" @@ -492,21 +491,18 @@ pdo_dblib() { _mv_ext pdo_dblib "php-pdo freetds"; } wddx() { _mv_ext wddx; } opcache() { _mv_ext opcache; } -md5sums="e6422449bb0342f074eb649a9adf586b php-5.6.20.tar.bz2 +md5sums="141464ce6b297aa2295b8416c6dbd5e5 php-5.6.21.tar.bz2 02417a82d080c858933e945ced0c6818 php-fpm.initd 67719f428f44ec004da18705cbabe2ee php5-module.conf 483bc0a85c50a9a9aedbe14a19ed4526 php-install-pear-xml.patch -162d8d079944387eab2bc80edab347ae gd-iconv.patch -91de1566b540d629fa058f1145415740 fix-crypt.patch" -sha256sums="5ac7bf7caec7a79b18cf458e786fd1609ad2da771224b80bc15cc6f01b22bf1f php-5.6.20.tar.bz2 +162d8d079944387eab2bc80edab347ae gd-iconv.patch" +sha256sums="b4ed7ab574b689fd6d6494fde954826c06efc85c505e017b8d776c7c7f479590 php-5.6.21.tar.bz2 3ad0252894d628e9832dbefb24d7043ac0f75475cd26d6ca12332e71cc3fc0f5 php-fpm.initd ceec4d5b2a128c6a97e49830af604f0bb555bca1a86a9cd0366b828ba392257f php5-module.conf f739ca427a1dd53a388bad0823565299c5d4a5796b1171b892884e4d7d099bab php-install-pear-xml.patch -6122bf279cdb7c387dd000761b2426969a73cf63a10a132aa98a79eb1dd259b2 gd-iconv.patch -0166b8bad6ded93fdb5a960eeabe970e2ade68b2159061dd75849e43a8e98e2d fix-crypt.patch" -sha512sums="9e26f2564ee7329ab50d4d8d27f029c4f88317ea761888138e60d13a3cf51e49676ded406a3ec18433be2ec5d2a49c904eaa9f32d473b99d11550025e026a61c php-5.6.20.tar.bz2 +6122bf279cdb7c387dd000761b2426969a73cf63a10a132aa98a79eb1dd259b2 gd-iconv.patch" +sha512sums="028d62434e7932b4a07fa7d404b8ad938f0ca7968ae2b23386038f77482984d2b6145523e11f37b9e72621c8bf40f08e38a6db1d209493770ac99e13e2fac0d0 php-5.6.21.tar.bz2 38c24e84c9be2dcf4f291e5f04187f40e5a8b325da73e79580d82b8a9e0e496c4fb17df92dcf8157bb9df4f1beadce102df9265c83849ca4e55560abf4937c43 php-fpm.initd 895e94c791bd82060ad820fef049d366a09c932097faa6b7b9a2c2e9e00a18cb7c0f9b128679c7659b404379266fd0f95dba5c0333f626194cf60f7bf6044102 php5-module.conf f1177cbf6b1f44402f421c3d317aab1a2a40d0b1209c11519c1158df337c8945f3a313d689c939768584f3e4edbe52e8bd6103fb6777462326a9d94e8ab1f505 php-install-pear-xml.patch -59443fb464f49ff7d9b64739df982e7240f9d4792226d96ad1538286945125fc7eb6f0cab88b64d5c81ee3679fd89bffdca59ebd20eca2778ab801ee54529028 gd-iconv.patch -7b1a3a0c586afb19d53561acd75ae591c26a77fa0e38117467dba811b235f77ad87c0867ad61567e4666ef9891ce9140102bc77b297b777bcaaa39027617f327 fix-crypt.patch" +59443fb464f49ff7d9b64739df982e7240f9d4792226d96ad1538286945125fc7eb6f0cab88b64d5c81ee3679fd89bffdca59ebd20eca2778ab801ee54529028 gd-iconv.patch" diff --git a/main/php/fix-crypt.patch b/main/php/fix-crypt.patch deleted file mode 100644 index 2b6b1d3011..0000000000 --- a/main/php/fix-crypt.patch +++ /dev/null @@ -1,48 +0,0 @@ -https://bugs.php.net/bug.php?id=67512 - ---- php-5.6.19.orig/ext/standard/crypt.c -+++ php-5.6.19/ext/standard/crypt.c -@@ -58,6 +58,7 @@ - #include "php_lcg.h" - #include "php_crypt.h" - #include "php_rand.h" -+#include "php_config.h" - - /* The capabilities of the crypt() function is determined by the test programs - * run by configure from aclocal.m4. They will set PHP_STD_DES_CRYPT, -@@ -227,18 +228,20 @@ - } - } - #else -- --# if defined(HAVE_CRYPT_R) && (defined(_REENTRANT) || defined(_THREAD_SAFE)) - { --# if defined(CRYPT_R_STRUCT_CRYPT_DATA) -+# if defined(HAVE_CRYPT_R) -+# if defined(CRYPT_R_STRUCT_CRYPT_DATA) - struct crypt_data buffer; - memset(&buffer, 0, sizeof(buffer)); --# elif defined(CRYPT_R_CRYPTD) -+# elif defined(CRYPT_R_CRYPTD) - CRYPTD buffer; --# else --# error Data struct used by crypt_r() is unknown. Please report. --# endif -+# else -+# error Data struct used by crypt_r() is unknown. Please report. -+# endif - crypt_res = crypt_r(password, salt, &buffer); -+# else -+ crypt_res = crypt(passwrd, salt); -+#endif - if (!crypt_res || (salt[0] == '*' && salt[1] == '0')) { - return FAILURE; - } else { -@@ -246,7 +249,6 @@ - return SUCCESS; - } - } --# endif - #endif - } - /* }}} */ |