summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorsbd <sbd>2011-02-11 06:18:05 +0000
committersbd <sbd>2011-02-11 06:18:05 +0000
commit359b35803bed5a85ccb9783588b956b545ec6b5c (patch)
tree4978dddb6c23817c8c80ee19fcf29b0a8d57b527
parent99ea7739fdf13cc442ab98984a502dd9db7ec23e (diff)
downloadpkgsrc-359b35803bed5a85ccb9783588b956b545ec6b5c.tar.gz
Pullup ticket #3348 - requested by rumko
lang/php53 with suhosin build fix Revisions pulled up: - pkgsrc/lang/php53/Makefile.php ------------------------------------------------------------------------- Module Name: pkgsrc Committed By: rumko Date: Sun Jan 30 17:58:06 UTC 2011 Modified Files: pkgsrc/lang/php53: Makefile.php distinfo Log Message: lang/php53: add the missing suhosin patch 5.3.5 was released due to a critical issue and the previous suhosin patch still applies. Prior art of this can be seen in OpenBSD's and FreeBSD's ports. ok@ wiz To generate a diff of this commit: cvs rdiff -u -r1.3 -r1.4 pkgsrc/lang/php53/Makefile.php cvs rdiff -u -r1.10 -r1.11 pkgsrc/lang/php53/distinfo
-rw-r--r--lang/php53/Makefile.php6
-rw-r--r--lang/php53/distinfo5
2 files changed, 7 insertions, 4 deletions
diff --git a/lang/php53/Makefile.php b/lang/php53/Makefile.php
index 975d438b409..cb5524d9579 100644
--- a/lang/php53/Makefile.php
+++ b/lang/php53/Makefile.php
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.php,v 1.3 2010/07/24 22:23:37 tron Exp $
+# $NetBSD: Makefile.php,v 1.3.4.1 2011/02/11 06:18:05 sbd Exp $
# used by lang/php53/Makefile
# used by www/ap-php/Makefile
@@ -59,8 +59,8 @@ PKG_SUGGESTED_OPTIONS+= inet6 ssl
.include "../../mk/bsd.options.mk"
.if !empty(PKG_OPTIONS:Msuhosin)
-SUHOSIN_PHPVER= 5.3.3
-. if ${SUHOSIN_PHPVER} != ${PHP_BASE_VERS}
+SUHOSIN_PHPVER= 5.3.4
+. if ${SUHOSIN_PHPVER} != ${PHP_BASE_VERS} && (${SUHOSIN_PHPVER} != "5.3.4" || ${PHP_BASE_VERS} != "5.3.5")
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"
diff --git a/lang/php53/distinfo b/lang/php53/distinfo
index daa464234df..2114932ffc9 100644
--- a/lang/php53/distinfo
+++ b/lang/php53/distinfo
@@ -1,8 +1,11 @@
-$NetBSD: distinfo,v 1.9 2011/01/07 09:20:16 taca Exp $
+$NetBSD: distinfo,v 1.9.2.1 2011/02/11 06:18:05 sbd Exp $
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 (php-5.3.5/suhosin-patch-5.3.4-0.9.10.patch.gz) = a2ab4bd03a329ec56a1f8b99e12e59f1838e0da6
+RMD160 (php-5.3.5/suhosin-patch-5.3.4-0.9.10.patch.gz) = e5105397a9e41997ad11d2a0be01c7e3c9d06c6e
+Size (php-5.3.5/suhosin-patch-5.3.4-0.9.10.patch.gz) = 41092 bytes
SHA1 (patch-aa) = f51491af7c577f36979fc07d52b5857368392e09
SHA1 (patch-ab) = 7aeb5148056e7f0b150388c4cf60a139f6aeec44
SHA1 (patch-ac) = a896371d3343c07a5cf46c79d9ca9e1b2164797a