diff options
| -rw-r--r-- | main/php/APKBUILD | 6 | ||||
| -rw-r--r-- | main/php/php-fix-crypt.patch | 38 |
2 files changed, 43 insertions, 1 deletions
diff --git a/main/php/APKBUILD b/main/php/APKBUILD index 664b441d25..9871d6958d 100644 --- a/main/php/APKBUILD +++ b/main/php/APKBUILD @@ -2,7 +2,7 @@ # Maintainer: Matt Smith <mcs@darkregion.net> pkgname=php pkgver=5.5.13 -pkgrel=3 +pkgrel=4 pkgdesc="The PHP language runtime engine" url="http://www.php.net/" arch="all" @@ -108,6 +108,7 @@ source="http://php.net/distributions/php-$pkgver.tar.bz2 php5-module.conf php-install-pear-xml.patch gd-iconv.patch + php-fix-crypt.patch CVE-2014-4049.patch " @@ -491,16 +492,19 @@ md5sums="e26e90af25ee6505dc18855e0180ffe9 php-5.5.13.tar.bz2 67719f428f44ec004da18705cbabe2ee php5-module.conf 483bc0a85c50a9a9aedbe14a19ed4526 php-install-pear-xml.patch 162d8d079944387eab2bc80edab347ae gd-iconv.patch +36862b64aa9d2c527ef634610644aa66 php-fix-crypt.patch bd763609e1a4cd15ba0142cb7e5bc7a4 CVE-2014-4049.patch" sha256sums="e58a4a754eb18d2d8b1a120cad5cce4ed24a7db5d49eca5830a40e4c8ca78b9c php-5.5.13.tar.bz2 375892c6997f48659f7087ccb7fac039e4bb2f375453247295caa7858b9e15b9 php-fpm.initd ceec4d5b2a128c6a97e49830af604f0bb555bca1a86a9cd0366b828ba392257f php5-module.conf f739ca427a1dd53a388bad0823565299c5d4a5796b1171b892884e4d7d099bab php-install-pear-xml.patch 6122bf279cdb7c387dd000761b2426969a73cf63a10a132aa98a79eb1dd259b2 gd-iconv.patch +bd44019db3c36d09502a4f869b4824364375df460aceef2d2b0a1956dc75e7cb php-fix-crypt.patch fc2275931dee760718a935d7247e57b36879ae6adba4ecdc2e5b824f3834db05 CVE-2014-4049.patch" sha512sums="0c82635d73b328c5798163dba2b293fc1ad976793a9fac21a36840594c4f26d5a6582ba437f54bfaacf1fde3df2d09366b106bb555cb42a29097e6ad33ac36d9 php-5.5.13.tar.bz2 2d294022f2c45b2f3229655e5883b8ccab6852ed0378df682b9dd85a31038666ad3a622580861ce2d26dedf187326727ecf93694eb716271e9be25f79daddae9 php-fpm.initd 895e94c791bd82060ad820fef049d366a09c932097faa6b7b9a2c2e9e00a18cb7c0f9b128679c7659b404379266fd0f95dba5c0333f626194cf60f7bf6044102 php5-module.conf f1177cbf6b1f44402f421c3d317aab1a2a40d0b1209c11519c1158df337c8945f3a313d689c939768584f3e4edbe52e8bd6103fb6777462326a9d94e8ab1f505 php-install-pear-xml.patch 59443fb464f49ff7d9b64739df982e7240f9d4792226d96ad1538286945125fc7eb6f0cab88b64d5c81ee3679fd89bffdca59ebd20eca2778ab801ee54529028 gd-iconv.patch +278b629ffd0796c85799e7a047c5d50c4186e81f68265247d1fb688431b303351feec519ef1b3318d7f1b15cf3e75e0f745aeb84218ada2a0a94777d57f4cf2c php-fix-crypt.patch d852e632b145d6157469bea7f76128ddec8a0634739c302d5888d6a135246ecb44ff7d65e9557049b0e655845b79c9f6ebed2afca8402d34b2ee5cae9ad71220 CVE-2014-4049.patch" diff --git a/main/php/php-fix-crypt.patch b/main/php/php-fix-crypt.patch new file mode 100644 index 0000000000..5fc4d346ff --- /dev/null +++ b/main/php/php-fix-crypt.patch @@ -0,0 +1,38 @@ +--- php-5.5.13/ext/standard/crypt.c.orig 2014-06-25 13:10:38.930010191 -0300 ++++ php-5.5.13/ext/standard/crypt.c 2014-06-25 13:45:09.762124864 -0300 +@@ -228,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) { + return FAILURE; + } else { +@@ -247,7 +249,6 @@ + return SUCCESS; + } + } +-# endif + #endif + } + /* }}} */ |