Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=c7aa95b9fa55a9fdb61ebf040e091b77b4949cbf
commit c7aa95b9fa55a9fdb61ebf040e091b77b4949cbf Author: kikadf <[email protected]> Date: Thu Aug 21 16:31:38 2014 +0200 php-5.5.15-1-x86_64 * Version bump (security/bug fixes) * Fix CVE-2014-3587 diff --git a/source/devel/php/CVE-2014-3587.patch b/source/devel/php/CVE-2014-3587.patch new file mode 100644 index 0000000..40ee64e --- /dev/null +++ b/source/devel/php/CVE-2014-3587.patch @@ -0,0 +1,21 @@ +From 9217c8d8e3760a9747311727f49150af84f189a4 Mon Sep 17 00:00:00 2001 +From: Remi Collet <[email protected]> +Date: Tue, 29 Jul 2014 13:06:17 +0200 +Subject: [PATCH] fix possible pointer overflow + +Signed-off-by: Remi Collet <[email protected]> +--- + src/cdf.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +--- php5.orig/ext/fileinfo/libmagic/cdf.c ++++ php5/ext/fileinfo/libmagic/cdf.c +@@ -820,7 +820,7 @@ cdf_read_property_info(const cdf_stream_ + q = (const uint8_t *)(const void *) + ((const char *)(const void *)p + ofs + - 2 * sizeof(uint32_t)); +- if (q > e) { ++ if (q < p || q > e) { + DPRINTF(("Ran of the end %p > %p\n", q, e)); + goto out; + } diff --git a/source/devel/php/FrugalBuild b/source/devel/php/FrugalBuild index ec7da32..2904110 100644 --- a/source/devel/php/FrugalBuild +++ b/source/devel/php/FrugalBuild @@ -3,7 +3,7 @@ # Contributor: Miklos Vajna <[email protected]> pkgname=php -pkgver=5.5.14 +pkgver=5.5.15 pkgrel=1 pkgdesc="A widely-used general-purpose scripting language" url="http://www.php.net"; @@ -18,7 +18,7 @@ archs=('i686' 'x86_64') up2date="lynx -dump $url | sed -n 's/.*downloads.php#v\(.*\)/\1/p' | head -1" source=(http://www.php.net/distributions/$pkgname-$pkgver.tar.gz \ php.ini php.conf README.Frugalware phpize.in.patch) -sha1sums=('be2e4bf894952760275fe59a0390c6976a17a82e' \ +sha1sums=('d9df11b97a9f1c686194e91165602f47e3bd74e6' \ '9249ca52e57a3069befe20311fd02fc8bee7aeef' \ '0850ef23512a02e8460dc36f08f453d148dcd9df' \ '40ae88f0721e02a2c75de76be342c51c85bf734d' \ @@ -35,6 +35,11 @@ replaces=('php-pecl-fileinfo') conflicts=('php-pecl-fileinfo') provides=('php-pecl-fileinfo') +# FSA fix *** +source=(${source[@]} CVE-2014-3587.patch) +sha1sums=(${sha1sums[@]} '4739e1eab6f4522d91ecb05492e0430fbd28f42e') +# *********** + build() { ## the php config _______________________________________________ Frugalware-git mailing list [email protected] http://frugalware.org/mailman/listinfo/frugalware-git
