diff options
| author | taca <taca> | 2012-10-20 00:29:40 +0000 |
|---|---|---|
| committer | taca <taca> | 2012-10-20 00:29:40 +0000 |
| commit | 3bea9d3b0c850e45813bc71ac3f19ce692512984 (patch) | |
| tree | 48403c208abc2c187c1da90bd35c1ca4b0ecaf9f | |
| parent | 9840a8c6a71cb413f64384a0925c357487a06301 (diff) | |
| download | pkgsrc-3bea9d3b0c850e45813bc71ac3f19ce692512984.tar.gz | |
Fix build problem when suhosin option enabled with a little dirty way.
Since this problem was build problem with suhosin option, no PKGREVISION
bump.
Thanks Amitai Schlair who noted this problem via private mail.
| -rw-r--r-- | lang/php53/Makefile.php | 18 | ||||
| -rw-r--r-- | lang/php53/distinfo | 5 |
2 files changed, 21 insertions, 2 deletions
diff --git a/lang/php53/Makefile.php b/lang/php53/Makefile.php index 6a8cdd47c5b..b26e0c7846c 100644 --- a/lang/php53/Makefile.php +++ b/lang/php53/Makefile.php @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.php,v 1.24 2012/10/19 14:57:02 taca Exp $ +# $NetBSD: Makefile.php,v 1.25 2012/10/20 00:29:40 taca Exp $ # used by lang/php53/Makefile # used by www/ap-php/Makefile @@ -70,6 +70,22 @@ PATCH_DIST_STRIP= -p1 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 944c8e3f7b1..f48d4a519b3 100644 --- a/lang/php53/distinfo +++ b/lang/php53/distinfo @@ -1,8 +1,11 @@ -$NetBSD: distinfo,v 1.52 2012/10/19 14:57:02 taca Exp $ +$NetBSD: distinfo,v 1.53 2012/10/20 00:29:40 taca Exp $ SHA1 (php-5.3.18.tar.bz2) = 561b7ed1ad147346d97f4cac78159e5918a7b5b9 RMD160 (php-5.3.18.tar.bz2) = f1b0059816fb817d159532239c02ddefac0085f4 Size (php-5.3.18.tar.bz2) = 11335289 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 (patch-aa) = b0dc6cd0b2103d5858280202506b33322a98496e SHA1 (patch-ab) = d08bb50cf074a6065ef0d1d67a713b7573cb2f5b SHA1 (patch-ac) = 1720f154232241c19d0c6e08a824e33252f1b690 |