diff options
Diffstat (limited to 'lang/php53')
-rw-r--r-- | lang/php53/Makefile.common | 4 | ||||
-rw-r--r-- | lang/php53/Makefile.php | 26 | ||||
-rw-r--r-- | lang/php53/distinfo | 14 |
3 files changed, 14 insertions, 30 deletions
diff --git a/lang/php53/Makefile.common b/lang/php53/Makefile.common index 1b8a3168a6a..debe29956a3 100644 --- a/lang/php53/Makefile.common +++ b/lang/php53/Makefile.common @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.common,v 1.20 2013/01/07 14:23:57 taca Exp $ +# $NetBSD: Makefile.common,v 1.21 2013/01/17 16:18:24 taca Exp $ # used by lang/php53/Makefile.php # used by lang/php/ext.mk # used by meta-pkgs/php53-extensions/Makefile @@ -38,7 +38,7 @@ EXTRACT_SUFX?= .tar.bz2 MAINTAINER?= pkgsrc-users@NetBSD.org HOMEPAGE?= http://www.php.net/ -PHP_BASE_VERS= 5.3.20 +PHP_BASE_VERS= 5.3.21 PHP_EXTENSION_DIR= lib/php/20090630 PLIST_SUBST+= PHP_EXTENSION_DIR=${PHP_EXTENSION_DIR} diff --git a/lang/php53/Makefile.php b/lang/php53/Makefile.php index 4d61f0c7895..a3132671149 100644 --- a/lang/php53/Makefile.php +++ b/lang/php53/Makefile.php @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.php,v 1.27 2013/01/07 14:23:57 taca Exp $ +# $NetBSD: Makefile.php,v 1.28 2013/01/17 16:18:24 taca Exp $ # used by lang/php53/Makefile # used by www/ap-php/Makefile @@ -57,35 +57,19 @@ PKG_SUGGESTED_OPTIONS+= inet6 ssl .include "../../mk/bsd.options.mk" .if !empty(PKG_OPTIONS:Msuhosin) -SUHOSIN_PHPVER= 5.3.9 -. if ${SUHOSIN_PHPVER} != ${PHP_BASE_VERS} && ${PHP_BASE_VERS} != 5.3.20 +SUHOSIN_PHPVER= 5.3.21 +. if ${SUHOSIN_PHPVER} != ${PHP_BASE_VERS} && ${PHP_BASE_VERS} != 5.3.21 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_DIST_STRIP= -p1 +PATCH_SITES= ${MASTER_SITE_LOCAL} +PATCHFILES+= suhosin-patch-${SUHOSIN_PHPVER}-0.9.10.patch.bz2 PLIST.suhosin= yes MESSAGE_SRC= ${.CURDIR}/../../lang/php53/MESSAGE MESSAGE_SRC+= ${.CURDIR}/../../lang/php53/MESSAGE.suhosin -# quick fix to apply suhosin patch -SUBST_CLASSES+= suhosin-pre -SUBST_STAGE.suhosin-pre= pre-patch # post-extract -SUBST_FILES.suhosin-pre= sapi/litespeed/lsapi_main.c -SUBST_SED.suhosin-pre= -e "s|1997-2012|1997-2004|g" -SUBST_MESSAGE.suhosin-pre= Modify before applying suhosin-patch - -# revert copyright year as original PHP -SUBST_CLASSES+= suhosin-post -SUBST_STAGE.suhosin-post= post-patch -SUBST_FILES.suhosin-post= sapi/litespeed/lsapi_main.c -SUBST_SED.suhosin-post= -e "s|1997-2004|1997-2012|g" -SUBST_SED.suhosin-post+= -e "s|1997-2011|1997-2012|g" -SUBST_MESSAGE.suhosin-post= Restore after applying suhosin-patch - . endif .endif diff --git a/lang/php53/distinfo b/lang/php53/distinfo index f707ea5adac..74704f48090 100644 --- a/lang/php53/distinfo +++ b/lang/php53/distinfo @@ -1,11 +1,11 @@ -$NetBSD: distinfo,v 1.55 2013/01/07 14:23:57 taca Exp $ +$NetBSD: distinfo,v 1.56 2013/01/17 16:18:24 taca Exp $ -SHA1 (php-5.3.20.tar.bz2) = 64d505884bc43ae3bf1f50c1d4b1cc4a8b749962 -RMD160 (php-5.3.20.tar.bz2) = e50668e3376b8790cf47f3b6cd91e4a7004f5cd5 -Size (php-5.3.20.tar.bz2) = 11358034 bytes -SHA1 (suhosin-patch-5.3.9-0.9.10.patch.gz) = 7b9ef5c3e0831154df0d6290aba0989ca90138ed -RMD160 (suhosin-patch-5.3.9-0.9.10.patch.gz) = ce43921fd9b183b154713ecda98294f6c68d5f22 -Size (suhosin-patch-5.3.9-0.9.10.patch.gz) = 40967 bytes +SHA1 (php-5.3.21.tar.bz2) = d67d2569b4782cf2faa049f22b08819ad8b15009 +RMD160 (php-5.3.21.tar.bz2) = 84aa653af6fbe66c02a572ad1add3daf6e46bb1e +Size (php-5.3.21.tar.bz2) = 11362683 bytes +SHA1 (suhosin-patch-5.3.21-0.9.10.patch.bz2) = 7df6bb0f39fe4111a96a7d6ce694f954f1796c48 +RMD160 (suhosin-patch-5.3.21-0.9.10.patch.bz2) = 4f2039676592c94fd923cdf7a35255d663ab56df +Size (suhosin-patch-5.3.21-0.9.10.patch.bz2) = 33131 bytes SHA1 (patch-aa) = b0dc6cd0b2103d5858280202506b33322a98496e SHA1 (patch-ab) = d08bb50cf074a6065ef0d1d67a713b7573cb2f5b SHA1 (patch-ac) = 1720f154232241c19d0c6e08a824e33252f1b690 |