Skip to content

Commit

Permalink
Pullup ticket #3319 - requested by taca
Browse files Browse the repository at this point in the history 
lang/php5: security update
lang/php53: security update

Revisions pulled up:
- lang/php5/Makefile.common			1.45
- lang/php5/distinfo				1.83
- lang/php5/distinfo				1.84
- lang/php5/patches/patch-ab			1.6
- lang/php5/patches/patch-ab			delete
- lang/php53/Makefile.common			1.4
- lang/php53/distinfo				1.9
- lang/php53/patches/patch-ar			1.1
---
Module Name:	pkgsrc
Committed By:	jklos
Date:		Thu Jan  6 22:13:24 UTC 2011

Modified Files:
	pkgsrc/lang/php5: distinfo
Added Files:
	pkgsrc/lang/php5/patches: patch-ab

Log Message:
Fix VAX floating point handling in zend_strtod.c.
---
Module Name:	pkgsrc
Committed By:	taca
Date:		Fri Jan  7 09:16:28 UTC 2011

Modified Files:
	pkgsrc/lang/php5: Makefile.common distinfo
Removed Files:
	pkgsrc/lang/php5/patches: patch-ab

Log Message:
Update php5 pacakge to 5.2.17.

* patch-ab (Fix VAX floating point handling) is merge to PHP 5.2.17.

06 Jan 2010, PHP 5.2.17
- Fixed Bug #53632 (infinite loop with x87 fpu). (CVE-2010-4645) (Scott,
  Rasmus)
---
Module Name:	pkgsrc
Committed By:	taca
Date:		Fri Jan  7 09:20:16 UTC 2011

Modified Files:
	pkgsrc/lang/php53: Makefile.common distinfo
Added Files:
	pkgsrc/lang/php53/patches: patch-ar

Log Message:
Update php53 pacakge to 5.3.5.

* Add fix for VAX floating point handling (Bug #53682), r307192 from
  PHP's repositry.  (It is in PHP 5.2.17 but not in 5.3.5).

06 Jan 2011, PHP 5.3.5
- Fixed Bug #53632 (infinite loop with x87 fpu). (Scott, Rasmus)
  • Loading branch information
tron committed Jan 8, 2011
1 parent 693bf08 commit 0b2afd9
Show file tree
Hide file tree
Showing 5 changed files with 28 additions and 12 deletions.
4 changes: 2 additions & 2 deletions lang/php5/Makefile.common
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# $NetBSD: Makefile.common,v 1.42.2.1 2010/12/23 10:10:54 sbd Exp $
# $NetBSD: Makefile.common,v 1.42.2.2 2011/01/08 15:29:46 tron Exp $
# used by lang/php5/Makefile.php
# used by lang/php/ext.mk
# used by meta-pkgs/php5-extensions/Makefile
Expand Down Expand Up @@ -41,7 +41,7 @@ EXTRACT_SUFX?= .tar.bz2
MAINTAINER?= jdolecek@NetBSD.org
HOMEPAGE?= http://www.php.net/

PHP_BASE_VERS= 5.2.16
PHP_BASE_VERS= 5.2.17

PHP_EXTENSION_DIR= lib/php/20040412
PLIST_SUBST+= PHP_EXTENSION_DIR=${PHP_EXTENSION_DIR:Q}
Expand Down
9 changes: 5 additions & 4 deletions lang/php5/distinfo
View file
Original file line number Diff line number Diff line change
@@ -1,9 +1,10 @@
$NetBSD: distinfo,v 1.79.2.1 2010/12/23 10:10:54 sbd Exp $
$NetBSD: distinfo,v 1.79.2.2 2011/01/08 15:29:46 tron Exp $

SHA1 (php-5.2.16/php-5.2.16.tar.bz2) = b4d11c6593614fa4ad8bf133f622208ee5e8e9af
RMD160 (php-5.2.16/php-5.2.16.tar.bz2) = 2ab6de444af478f3b2b3a8a074c1656e8da0a4e1
Size (php-5.2.16/php-5.2.16.tar.bz2) = 9090930 bytes
SHA1 (php-5.2.17/php-5.2.17.tar.bz2) = d68f3b09f766990d815a3c4c63c157db8dab8095
RMD160 (php-5.2.17/php-5.2.17.tar.bz2) = 567fa8d718b93fb83a89494c83a8bec224ac99e9
Size (php-5.2.17/php-5.2.17.tar.bz2) = 9092312 bytes
SHA1 (patch-aa) = 20bc3831e435182d014b11ae9f1f6c537a21af20
SHA1 (patch-ab) = feeb73834db284e8b3acabc11fb4c934837cb13f
SHA1 (patch-af) = 68c5a31dccf1854ba1aff653e4c524767d6a64f6
SHA1 (patch-ag) = 5e3e822657925a77fbccaca63f283863a1cc6d94
SHA1 (patch-ah) = a25cb7fa3d1f5b9fb99493a4348fdba69d3d4728
Expand Down
4 changes: 2 additions & 2 deletions lang/php53/Makefile.common
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# $NetBSD: Makefile.common,v 1.2.2.1 2010/12/23 10:10:54 sbd Exp $
# $NetBSD: Makefile.common,v 1.2.2.2 2011/01/08 15:29:47 tron Exp $
# used by lang/php53/Makefile.php
# used by lang/php/ext.mk
# used by meta-pkgs/php53-extensions/Makefile
Expand Down Expand Up @@ -39,7 +39,7 @@ EXTRACT_SUFX?= .tar.bz2
MAINTAINER?= pkgsrc-users@NetBSD.org
HOMEPAGE?= http://www.php.net/

PHP_BASE_VERS= 5.3.4
PHP_BASE_VERS= 5.3.5

PHP_EXTENSION_DIR= lib/php/20090630
PLIST_SUBST+= PHP_EXTENSION_DIR=${PHP_EXTENSION_DIR:Q}
Expand Down
9 changes: 5 additions & 4 deletions lang/php53/distinfo
View file
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
$NetBSD: distinfo,v 1.6.2.1 2010/12/23 10:10:54 sbd Exp $
$NetBSD: distinfo,v 1.6.2.2 2011/01/08 15:29:47 tron Exp $

SHA1 (php-5.3.4/php-5.3.4.tar.bz2) = 0b33926e78e1683e3383b3b5c840ee60ba669b0b
RMD160 (php-5.3.4/php-5.3.4.tar.bz2) = dffbeced87117fd34c948de3ebdde01a25c24dae
Size (php-5.3.4/php-5.3.4.tar.bz2) = 10804376 bytes
SHA1 (php-5.3.5/php-5.3.5.tar.bz2) = 355701b723fcb497581c368be4d6e572c150a5ea
RMD160 (php-5.3.5/php-5.3.5.tar.bz2) = 831018429b87c46da7571397e0d463b81ded11eb
Size (php-5.3.5/php-5.3.5.tar.bz2) = 10806092 bytes
SHA1 (patch-aa) = f51491af7c577f36979fc07d52b5857368392e09
SHA1 (patch-ab) = 7aeb5148056e7f0b150388c4cf60a139f6aeec44
SHA1 (patch-ac) = a896371d3343c07a5cf46c79d9ca9e1b2164797a
Expand All @@ -14,3 +14,4 @@ SHA1 (patch-ah) = b20c29c64b3099f77855a5ec28960dc1c4f65c83
SHA1 (patch-ai) = d4766893a2c47a4e4a744248dda265b0a9a66a1f
SHA1 (patch-aj) = d611d13fcc28c5d2b9e9586832ce4b8ae5707b48
SHA1 (patch-al) = fbbee5502e0cd1c47c6e7c15e0d54746414ec32e
SHA1 (patch-ar) = edad3e866106cec502ccd93bacf722a771a6c1c0
14 changes: 14 additions & 0 deletions lang/php53/patches/patch-ar
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
$NetBSD: patch-ar,v 1.1.2.2 2011/01/08 15:29:47 tron Exp $

Fix for VAX floating point handling (Bug #53682), r307192 from PHP's repositry.

--- Zend/zend_strtod.c.orig 2011-01-05 13:32:26.000000000 +0000
+++ Zend/zend_strtod.c
@@ -164,6 +164,7 @@ typedef unsigned long int uint32_t;

#ifdef __vax__
#define VAX
+#undef IEEE_LITTLE_ENDIAN
#endif

#if defined(_MSC_VER)

0 comments on commit 0b2afd9

Please sign in to comment.