diff options
author | taca <taca@pkgsrc.org> | 2012-01-20 03:22:08 +0000 |
---|---|---|
committer | taca <taca@pkgsrc.org> | 2012-01-20 03:22:08 +0000 |
commit | 132e9aa97292108536d2b6ec65539a6bed46cc4a (patch) | |
tree | 173cfee0d88d86e01b8a12e178040a543d56c160 /lang/php53 | |
parent | d36479b18c628bf5f4e128ba69533880d2ec53b5 (diff) | |
download | pkgsrc-132e9aa97292108536d2b6ec65539a6bed46cc4a.tar.gz |
Use official suhosin-patch for PHP 5.3.9 instead of local one based on
for PHP5.3.7.
Bump PKGREVISION.
Diffstat (limited to 'lang/php53')
-rw-r--r-- | lang/php53/Makefile | 3 | ||||
-rw-r--r-- | lang/php53/Makefile.php | 12 | ||||
-rw-r--r-- | lang/php53/distinfo | 8 |
3 files changed, 11 insertions, 12 deletions
diff --git a/lang/php53/Makefile b/lang/php53/Makefile index 00c0da264a3..4325786c092 100644 --- a/lang/php53/Makefile +++ b/lang/php53/Makefile @@ -1,9 +1,10 @@ -# $NetBSD: Makefile,v 1.20 2012/01/11 14:53:35 taca Exp $ +# $NetBSD: Makefile,v 1.21 2012/01/20 03:22:08 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/ diff --git a/lang/php53/Makefile.php b/lang/php53/Makefile.php index 79bab651a2c..7657cd9947e 100644 --- a/lang/php53/Makefile.php +++ b/lang/php53/Makefile.php @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.php,v 1.11 2012/01/11 14:53:35 taca Exp $ +# $NetBSD: Makefile.php,v 1.12 2012/01/20 03:22:08 taca Exp $ # used by lang/php53/Makefile # used by www/ap-php/Makefile @@ -60,17 +60,15 @@ PKG_SUGGESTED_OPTIONS+= inet6 ssl .include "../../mk/bsd.options.mk" .if !empty(PKG_OPTIONS:Msuhosin) -SUHOSIN_PHPVER= 5.3.7 -. if ${SUHOSIN_PHPVER} != ${PHP_BASE_VERS} && ${SUHOSIN_PHPVER} != "5.3.7" +SUHOSIN_PHPVER= 5.3.9 +. if ${SUHOSIN_PHPVER} != ${PHP_BASE_VERS} 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" PKG_FAIL_REASON+= "build this package without the suhosin option." . else -#PATCH_SITES= http://download.suhosin.org/ -#PATCHFILES+= suhosin-patch-${SUHOSIN_PHPVER}-0.9.10.patch.gz -PATCH_SITES= ${MASTER_SITE_LOCAL} -PATCHFILES+= suhosin-patch-${SUHOSIN_PHPVER}-0.9.10-local.patch.gz +PATCH_SITES= http://download.suhosin.org/ +PATCHFILES+= suhosin-patch-${SUHOSIN_PHPVER}-0.9.10.patch.gz PATCH_DIST_STRIP= -p1 PLIST.suhosin= yes MESSAGE_SRC= ${.CURDIR}/../../lang/php53/MESSAGE diff --git a/lang/php53/distinfo b/lang/php53/distinfo index 94365668c43..45d6fa49c0f 100644 --- a/lang/php53/distinfo +++ b/lang/php53/distinfo @@ -1,11 +1,11 @@ -$NetBSD: distinfo,v 1.30 2012/01/12 12:58:47 taca Exp $ +$NetBSD: distinfo,v 1.31 2012/01/20 03:22:08 taca Exp $ SHA1 (php-5.3.9/php-5.3.9.tar.bz2) = fe0626735c3d9dd370cef9bdcfe9506629449f51 RMD160 (php-5.3.9/php-5.3.9.tar.bz2) = 428ed51982637f092c43369cf5cfb284d58da3f6 Size (php-5.3.9/php-5.3.9.tar.bz2) = 11704944 bytes -SHA1 (php-5.3.9/suhosin-patch-5.3.7-0.9.10-local.patch.gz) = 29ca7a59dc829c6e50ffb18d74330e5f2a515cbd -RMD160 (php-5.3.9/suhosin-patch-5.3.7-0.9.10-local.patch.gz) = 0617b31095e693f1a7471ce40f0e8e83b4ac1c8a -Size (php-5.3.9/suhosin-patch-5.3.7-0.9.10-local.patch.gz) = 40541 bytes +SHA1 (php-5.3.9/suhosin-patch-5.3.9-0.9.10.patch.gz) = 7b9ef5c3e0831154df0d6290aba0989ca90138ed +RMD160 (php-5.3.9/suhosin-patch-5.3.9-0.9.10.patch.gz) = ce43921fd9b183b154713ecda98294f6c68d5f22 +Size (php-5.3.9/suhosin-patch-5.3.9-0.9.10.patch.gz) = 40967 bytes SHA1 (patch-aa) = b0dc6cd0b2103d5858280202506b33322a98496e SHA1 (patch-ab) = d08bb50cf074a6065ef0d1d67a713b7573cb2f5b SHA1 (patch-ac) = 1720f154232241c19d0c6e08a824e33252f1b690 |