Commit 70ed1cdc authored by Leonardo Arena's avatar Leonardo Arena
Browse files

main/php: security fix CVE-2013-6712. Fixes #2561

parent d1f93e95
......@@ -2,7 +2,7 @@
# Maintainer: Matt Smith <mcs@darkregion.net>
pkgname=php
pkgver=5.4.23
pkgrel=0
pkgrel=1
pkgdesc="The PHP language runtime engine"
url="http://www.php.net/"
arch="all"
......@@ -106,6 +106,7 @@ source="http://php.net/distributions/${pkgname}-${pkgver}.tar.bz2
php5-module.conf
php-install-pear-xml.patch
gd-iconv.patch
CVE-2013-6712.patch
"
_apiver="20100412"
......@@ -477,14 +478,17 @@ md5sums="023857598b92ea5c78137543817f4bc5 php-5.4.23.tar.bz2
9ab162ff3428511a68aa9801c746e0d5 php-fpm.initd
67719f428f44ec004da18705cbabe2ee php5-module.conf
483bc0a85c50a9a9aedbe14a19ed4526 php-install-pear-xml.patch
3e0faaaf0abd573300d54f92325e4dba gd-iconv.patch"
3e0faaaf0abd573300d54f92325e4dba gd-iconv.patch
199601f453e426e39a8f53728b69854b CVE-2013-6712.patch"
sha256sums="ae7c070fa9b9e16413ef944d910b68f3ba79192eca4010b0af132b8631bd91cc php-5.4.23.tar.bz2
96e68f7c545adcac56ed1f5824b33041e270680ca884a9cfe27e7f4ac8abfd3b php-fpm.initd
ceec4d5b2a128c6a97e49830af604f0bb555bca1a86a9cd0366b828ba392257f php5-module.conf
f739ca427a1dd53a388bad0823565299c5d4a5796b1171b892884e4d7d099bab php-install-pear-xml.patch
acbbc559063e04f69b3c481af007c00541846750c7d47a6daeb72b22c1b793fe gd-iconv.patch"
acbbc559063e04f69b3c481af007c00541846750c7d47a6daeb72b22c1b793fe gd-iconv.patch
ed10c184482023eea87dc1d67ccc70132b918988bfea7f51341e973e05b380d7 CVE-2013-6712.patch"
sha512sums="3c306ba40e3649ef79a88534e1a12aa83c01f9edbbe9822a741af03e18c9a4e8587351e0f1760cc539b3b599209d546233e40d4d816f6a49cf81ad2d738486b7 php-5.4.23.tar.bz2
33247a1c9188eba893bb0be13456eeeec9b971c7f482a4e2bd0f318fb63d8c67d379a021840768bef8e4d630be859c5bdb424c1e90b9b816ec691c078147e915 php-fpm.initd
895e94c791bd82060ad820fef049d366a09c932097faa6b7b9a2c2e9e00a18cb7c0f9b128679c7659b404379266fd0f95dba5c0333f626194cf60f7bf6044102 php5-module.conf
f1177cbf6b1f44402f421c3d317aab1a2a40d0b1209c11519c1158df337c8945f3a313d689c939768584f3e4edbe52e8bd6103fb6777462326a9d94e8ab1f505 php-install-pear-xml.patch
18836154d589fd105e220ad12557789bf4f253f91fb11292c27a96f8ab4ba1619bc21a2f8e5e9df296fb9914c0d94394baad79ffbf9a459d56f7e0a6558094f4 gd-iconv.patch"
18836154d589fd105e220ad12557789bf4f253f91fb11292c27a96f8ab4ba1619bc21a2f8e5e9df296fb9914c0d94394baad79ffbf9a459d56f7e0a6558094f4 gd-iconv.patch
1b74b00788bf1ef0d77be433ed16b2b9ba52d3c5230a60ed303f5ea36379b9ea2ec72295030c650ff5d27a311a5feed00c2209c1a0cc68dd1bfeaaeff015ea55 CVE-2013-6712.patch"
--- a/ext/date/lib/parse_iso_intervals.re.old 2013-11-08 18:09:18.815549958 +0100
+++ b/ext/date/lib/parse_iso_intervals.re 2013-11-08 18:09:34.461608419 +0100
@@ -348,7 +348,7 @@
break;
}
ptr++;
- } while (*ptr);
+ } while (!s->errors->error_count && *ptr);
s->have_period = 1;
TIMELIB_DEINIT;
return TIMELIB_PERIOD;
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment