Update php53 package to 5.3.8.

(crypt()'s problem was already fixed our php53-5.3.7nb1 package.)


PHP                                                                        NEWS
|||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
23 Aug 2011, PHP 5.3.8

- Core:
  . Fixed bug #55439 (crypt() returns only the salt for MD5). (Stas)

- OpenSSL:
  . Reverted a change in timeout handling restoring PHP 5.3.6 behavior,
    as the new behavior caused mysqlnd SSL connections to hang (#55283).
    (Pierre, Andrey, Johannes)
This commit is contained in:
taca 2011-08-23 22:22:27 +00:00
parent 9049a8cb57
commit 39d5090c80
5 changed files with 12 additions and 29 deletions

View file

@ -1,10 +1,9 @@
# $NetBSD: Makefile,v 1.16 2011/08/22 11:43:30 obache Exp $
# $NetBSD: Makefile,v 1.17 2011/08/23 22:22:27 taca Exp $
#
# We can't omit PKGNAME here to handle PKG_OPTIONS.
#
PKGNAME= php-${PHP_BASE_VERS}
PKGREVISION= 1
CATEGORIES= lang
HOMEPAGE= http://www.php.net/

View file

@ -1,4 +1,4 @@
# $NetBSD: Makefile.common,v 1.7 2011/08/20 13:55:09 taca Exp $
# $NetBSD: Makefile.common,v 1.8 2011/08/23 22:22:27 taca Exp $
# used by lang/php53/Makefile.php
# used by lang/php/ext.mk
# used by meta-pkgs/php53-extensions/Makefile
@ -39,7 +39,7 @@ EXTRACT_SUFX?= .tar.bz2
MAINTAINER?= pkgsrc-users@NetBSD.org
HOMEPAGE?= http://www.php.net/
PHP_BASE_VERS= 5.3.7
PHP_BASE_VERS= 5.3.8
PHP_EXTENSION_DIR= lib/php/20090630
PLIST_SUBST+= PHP_EXTENSION_DIR=${PHP_EXTENSION_DIR}

View file

@ -1,4 +1,4 @@
# $NetBSD: Makefile.php,v 1.7 2011/08/20 14:41:04 taca Exp $
# $NetBSD: Makefile.php,v 1.8 2011/08/23 22:22:27 taca Exp $
# used by lang/php53/Makefile
# used by www/ap-php/Makefile
@ -60,7 +60,7 @@ PKG_SUGGESTED_OPTIONS+= inet6 ssl
.if !empty(PKG_OPTIONS:Msuhosin)
SUHOSIN_PHPVER= 5.3.7
. if ${SUHOSIN_PHPVER} != ${PHP_BASE_VERS} && (${SUHOSIN_PHPVER} != "5.3.4" || ${PHP_BASE_VERS} != "5.3.5")
. if ${SUHOSIN_PHPVER} != ${PHP_BASE_VERS} && ${SUHOSIN_PHPVER} != "5.3.7"
PKG_FAIL_REASON+= "The suhosin patch is currently not available for"
PKG_FAIL_REASON+= "this version of PHP. You may have to wait until"
PKG_FAIL_REASON+= "an updated patch is released or temporarily"

View file

@ -1,11 +1,11 @@
$NetBSD: distinfo,v 1.20 2011/08/22 09:40:00 taca Exp $
$NetBSD: distinfo,v 1.21 2011/08/23 22:22:27 taca Exp $
SHA1 (php-5.3.7/php-5.3.7.tar.bz2) = 811e84b75d41ad997c075e3ebc8470f5c26d03ea
RMD160 (php-5.3.7/php-5.3.7.tar.bz2) = d14c52036f35d79193783b590c0cf131e1cd00c0
Size (php-5.3.7/php-5.3.7.tar.bz2) = 11144328 bytes
SHA1 (php-5.3.7/suhosin-patch-5.3.7-0.9.10.patch.gz) = 3c38e873584b8f9e325a813cc9b197a342595099
RMD160 (php-5.3.7/suhosin-patch-5.3.7-0.9.10.patch.gz) = 19f789bf49a5fed2cd88b199fd8ac5d1ffa9bdc8
Size (php-5.3.7/suhosin-patch-5.3.7-0.9.10.patch.gz) = 41175 bytes
SHA1 (php-5.3.8/php-5.3.8.tar.bz2) = 8f29029e092f262876bfdd2ce56f6867e2b74b85
RMD160 (php-5.3.8/php-5.3.8.tar.bz2) = f18a18e2dfd7ea7885760eec2a05b3c4a15ad9db
Size (php-5.3.8/php-5.3.8.tar.bz2) = 11190060 bytes
SHA1 (php-5.3.8/suhosin-patch-5.3.7-0.9.10.patch.gz) = 3c38e873584b8f9e325a813cc9b197a342595099
RMD160 (php-5.3.8/suhosin-patch-5.3.7-0.9.10.patch.gz) = 19f789bf49a5fed2cd88b199fd8ac5d1ffa9bdc8
Size (php-5.3.8/suhosin-patch-5.3.7-0.9.10.patch.gz) = 41175 bytes
SHA1 (patch-aa) = b0dc6cd0b2103d5858280202506b33322a98496e
SHA1 (patch-ab) = d08bb50cf074a6065ef0d1d67a713b7573cb2f5b
SHA1 (patch-ac) = 1720f154232241c19d0c6e08a824e33252f1b690
@ -17,4 +17,3 @@ SHA1 (patch-ah) = b20c29c64b3099f77855a5ec28960dc1c4f65c83
SHA1 (patch-ai) = d4766893a2c47a4e4a744248dda265b0a9a66a1f
SHA1 (patch-aj) = d611d13fcc28c5d2b9e9586832ce4b8ae5707b48
SHA1 (patch-al) = fbbee5502e0cd1c47c6e7c15e0d54746414ec32e
SHA1 (patch-ext_standard_php__crypt__r.c) = 47ddf0ecb5d740e0a72af7d3071883f4c368d2f4

View file

@ -1,15 +0,0 @@
$NetBSD: patch-ext_standard_php__crypt__r.c,v 1.1 2011/08/22 09:40:00 taca Exp $
Fix for MD5 password encryption problem (r315218 from PHP repository).
--- ext/standard/php_crypt_r.c.orig 2011-08-07 16:10:34.000000000 +0000
+++ ext/standard/php_crypt_r.c
@@ -382,7 +382,7 @@ char * php_md5_crypt_r(const char *pw, c
/* Now make the output string */
memcpy(passwd, MD5_MAGIC, MD5_MAGIC_LEN);
strlcpy(passwd + MD5_MAGIC_LEN, sp, sl + 1);
- strlcat(passwd, "$", 1);
+ strcat(passwd, "$");
PHP_MD5Final(final, &ctx);