Sun Jan 30 17:58:06 2011 UTC ()
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


(rumko)
diff -r1.3 -r1.4 pkgsrc/lang/php53/Makefile.php
diff -r1.10 -r1.11 pkgsrc/lang/php53/distinfo
cvs diff -r1.3 -r1.4 pkgsrc/lang/php53/Attic/Makefile.php (expand / switch to unified diff)

--- pkgsrc/lang/php53/Attic/Makefile.php 2010/07/24 22:23:37 1.3
+++ pkgsrc/lang/php53/Attic/Makefile.php 2011/01/30 17:58:06 1.4
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: Makefile.php,v 1.3 2010/07/24 22:23:37 tron Exp $ 1# $NetBSD: Makefile.php,v 1.4 2011/01/30 17:58:06 rumko Exp $
2# used by lang/php53/Makefile 2# used by lang/php53/Makefile
3# used by www/ap-php/Makefile 3# used by www/ap-php/Makefile
4 4
5.include "../../lang/php53/Makefile.common" 5.include "../../lang/php53/Makefile.common"
6 6
7DISTINFO_FILE= ${.CURDIR}/../../lang/php53/distinfo 7DISTINFO_FILE= ${.CURDIR}/../../lang/php53/distinfo
8PATCHDIR= ${.CURDIR}/../../lang/php53/patches 8PATCHDIR= ${.CURDIR}/../../lang/php53/patches
9 9
10USE_LIBTOOL= YES 10USE_LIBTOOL= YES
11USE_LANGUAGES= c c++ 11USE_LANGUAGES= c c++
12GNU_CONFIGURE= YES 12GNU_CONFIGURE= YES
13BUILD_DEFS+= VARBASE 13BUILD_DEFS+= VARBASE
14PLIST_VARS+= suhosin 14PLIST_VARS+= suhosin
@@ -49,28 +49,28 @@ PKG_OPTIONS_VAR= PKG_OPTIONS.${PKGNAME:C @@ -49,28 +49,28 @@ PKG_OPTIONS_VAR= PKG_OPTIONS.${PKGNAME:C
49PKG_SUPPORTED_OPTIONS+= inet6 ssl maintainer-zts suhosin 49PKG_SUPPORTED_OPTIONS+= inet6 ssl maintainer-zts suhosin
50PKG_SUGGESTED_OPTIONS+= inet6 ssl 50PKG_SUGGESTED_OPTIONS+= inet6 ssl
51 51
52#SUBST_CLASSES+= ini 52#SUBST_CLASSES+= ini
53#SUBST_STAGE.ini= post-patch 53#SUBST_STAGE.ini= post-patch
54#SUBST_FILES.ini= php.ini-development 54#SUBST_FILES.ini= php.ini-development
55#SUBST_FILES.ini+= php.ini-production 55#SUBST_FILES.ini+= php.ini-production
56#SUBST_SED.ini= -e "s|\\;include_path = \".:/php/includes\"|include_path = \".:${PREFIX}/lib/php\"|g" 56#SUBST_SED.ini= -e "s|\\;include_path = \".:/php/includes\"|include_path = \".:${PREFIX}/lib/php\"|g"
57#SUBST_MESSAGE.ini= Fixing default ini files. 57#SUBST_MESSAGE.ini= Fixing default ini files.
58 58
59.include "../../mk/bsd.options.mk" 59.include "../../mk/bsd.options.mk"
60 60
61.if !empty(PKG_OPTIONS:Msuhosin) 61.if !empty(PKG_OPTIONS:Msuhosin)
62SUHOSIN_PHPVER= 5.3.3 62SUHOSIN_PHPVER= 5.3.4
63. if ${SUHOSIN_PHPVER} != ${PHP_BASE_VERS} 63. if ${SUHOSIN_PHPVER} != ${PHP_BASE_VERS} && (${SUHOSIN_PHPVER} != "5.3.4" || ${PHP_BASE_VERS} != "5.3.5")
64PKG_FAIL_REASON+= "The suhosin patch is currently not available for" 64PKG_FAIL_REASON+= "The suhosin patch is currently not available for"
65PKG_FAIL_REASON+= "this version of PHP. You may have to wait until" 65PKG_FAIL_REASON+= "this version of PHP. You may have to wait until"
66PKG_FAIL_REASON+= "an updated patch is released or temporarily" 66PKG_FAIL_REASON+= "an updated patch is released or temporarily"
67PKG_FAIL_REASON+= "build this package without the suhosin option." 67PKG_FAIL_REASON+= "build this package without the suhosin option."
68. else 68. else
69PATCH_SITES= http://download.suhosin.org/ 69PATCH_SITES= http://download.suhosin.org/
70PATCHFILES+= suhosin-patch-${SUHOSIN_PHPVER}-0.9.10.patch.gz 70PATCHFILES+= suhosin-patch-${SUHOSIN_PHPVER}-0.9.10.patch.gz
71PATCH_DIST_STRIP= -p1 71PATCH_DIST_STRIP= -p1
72PLIST.suhosin= yes 72PLIST.suhosin= yes
73MESSAGE_SRC= ${.CURDIR}/../../lang/php53/MESSAGE 73MESSAGE_SRC= ${.CURDIR}/../../lang/php53/MESSAGE
74MESSAGE_SRC+= ${.CURDIR}/../../lang/php53/MESSAGE.suhosin 74MESSAGE_SRC+= ${.CURDIR}/../../lang/php53/MESSAGE.suhosin
75. endif 75. endif
76.endif 76.endif
cvs diff -r1.10 -r1.11 pkgsrc/lang/php53/Attic/distinfo (expand / switch to unified diff)

--- pkgsrc/lang/php53/Attic/distinfo 2011/01/13 13:52:53 1.10
+++ pkgsrc/lang/php53/Attic/distinfo 2011/01/30 17:58:06 1.11
@@ -1,17 +1,20 @@ @@ -1,17 +1,20 @@
1$NetBSD: distinfo,v 1.10 2011/01/13 13:52:53 wiz Exp $ 1$NetBSD: distinfo,v 1.11 2011/01/30 17:58:06 rumko Exp $
2 2
3SHA1 (php-5.3.5/php-5.3.5.tar.bz2) = 355701b723fcb497581c368be4d6e572c150a5ea 3SHA1 (php-5.3.5/php-5.3.5.tar.bz2) = 355701b723fcb497581c368be4d6e572c150a5ea
4RMD160 (php-5.3.5/php-5.3.5.tar.bz2) = 831018429b87c46da7571397e0d463b81ded11eb 4RMD160 (php-5.3.5/php-5.3.5.tar.bz2) = 831018429b87c46da7571397e0d463b81ded11eb
5Size (php-5.3.5/php-5.3.5.tar.bz2) = 10806092 bytes 5Size (php-5.3.5/php-5.3.5.tar.bz2) = 10806092 bytes
 6SHA1 (php-5.3.5/suhosin-patch-5.3.4-0.9.10.patch.gz) = a2ab4bd03a329ec56a1f8b99e12e59f1838e0da6
 7RMD160 (php-5.3.5/suhosin-patch-5.3.4-0.9.10.patch.gz) = e5105397a9e41997ad11d2a0be01c7e3c9d06c6e
 8Size (php-5.3.5/suhosin-patch-5.3.4-0.9.10.patch.gz) = 41092 bytes
6SHA1 (patch-aa) = f51491af7c577f36979fc07d52b5857368392e09 9SHA1 (patch-aa) = f51491af7c577f36979fc07d52b5857368392e09
7SHA1 (patch-ab) = 7aeb5148056e7f0b150388c4cf60a139f6aeec44 10SHA1 (patch-ab) = 7aeb5148056e7f0b150388c4cf60a139f6aeec44
8SHA1 (patch-ac) = 07a3d6c9ee4c316033afd8c7db71eb21045a3afd 11SHA1 (patch-ac) = 07a3d6c9ee4c316033afd8c7db71eb21045a3afd
9SHA1 (patch-ad) = 1608c58860a43b4e31df8646b5ded253ec9aa881 12SHA1 (patch-ad) = 1608c58860a43b4e31df8646b5ded253ec9aa881
10SHA1 (patch-ae) = e590db60a60f4e5ef2da4e5edb786335a67a3d56 13SHA1 (patch-ae) = e590db60a60f4e5ef2da4e5edb786335a67a3d56
11SHA1 (patch-af) = 6e903ea7ff501226601fa73ce74c272d44d7346b 14SHA1 (patch-af) = 6e903ea7ff501226601fa73ce74c272d44d7346b
12SHA1 (patch-ag) = c49cdff097d1e54ebe93b5afb550e89b0cc2468e 15SHA1 (patch-ag) = c49cdff097d1e54ebe93b5afb550e89b0cc2468e
13SHA1 (patch-ah) = b20c29c64b3099f77855a5ec28960dc1c4f65c83 16SHA1 (patch-ah) = b20c29c64b3099f77855a5ec28960dc1c4f65c83
14SHA1 (patch-ai) = d4766893a2c47a4e4a744248dda265b0a9a66a1f 17SHA1 (patch-ai) = d4766893a2c47a4e4a744248dda265b0a9a66a1f
15SHA1 (patch-aj) = d611d13fcc28c5d2b9e9586832ce4b8ae5707b48 18SHA1 (patch-aj) = d611d13fcc28c5d2b9e9586832ce4b8ae5707b48
16SHA1 (patch-al) = fbbee5502e0cd1c47c6e7c15e0d54746414ec32e 19SHA1 (patch-al) = fbbee5502e0cd1c47c6e7c15e0d54746414ec32e
17SHA1 (patch-ar) = edad3e866106cec502ccd93bacf722a771a6c1c0 20SHA1 (patch-ar) = edad3e866106cec502ccd93bacf722a771a6c1c0