Thu Oct 20 12:38:24 2011 UTC ()
Re-add suhosin-patch to distinfo.


(taca)
diff -r1.8 -r1.9 pkgsrc/lang/php53/Makefile.php
diff -r1.23 -r1.24 pkgsrc/lang/php53/distinfo
cvs diff -r1.8 -r1.9 pkgsrc/lang/php53/Attic/Makefile.php (expand / switch to unified diff)

--- pkgsrc/lang/php53/Attic/Makefile.php 2011/08/23 22:22:27 1.8
+++ pkgsrc/lang/php53/Attic/Makefile.php 2011/10/20 12:38:24 1.9
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: Makefile.php,v 1.8 2011/08/23 22:22:27 taca Exp $ 1# $NetBSD: Makefile.php,v 1.9 2011/10/20 12:38:24 taca 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
@@ -29,26 +29,27 @@ CONFIGURE_ARGS+= --with-regex=system @@ -29,26 +29,27 @@ CONFIGURE_ARGS+= --with-regex=system
29 29
30CONFIGURE_ARGS+= --without-mysql 30CONFIGURE_ARGS+= --without-mysql
31CONFIGURE_ARGS+= --without-sqlite 31CONFIGURE_ARGS+= --without-sqlite
32#CONFIGURE_ARGS+= --without-sqlite3 32#CONFIGURE_ARGS+= --without-sqlite3
33CONFIGURE_ARGS+= --without-iconv 33CONFIGURE_ARGS+= --without-iconv
34CONFIGURE_ARGS+= --without-pear 34CONFIGURE_ARGS+= --without-pear
35#CONFIGURE_ARGS+= --without-intl 35#CONFIGURE_ARGS+= --without-intl
36 36
37CONFIGURE_ARGS+= --disable-posix 37CONFIGURE_ARGS+= --disable-posix
38CONFIGURE_ARGS+= --disable-dom 38CONFIGURE_ARGS+= --disable-dom
39CONFIGURE_ARGS+= --disable-pdo 39CONFIGURE_ARGS+= --disable-pdo
40CONFIGURE_ARGS+= --disable-json 40CONFIGURE_ARGS+= --disable-json
41 41
 42#CONFIGURE_ARGS+= --enable-fpm
42CONFIGURE_ARGS+= --enable-xml 43CONFIGURE_ARGS+= --enable-xml
43CONFIGURE_ARGS+= --with-libxml-dir=${PREFIX} 44CONFIGURE_ARGS+= --with-libxml-dir=${PREFIX}
44.include "../../textproc/libxml2/buildlink3.mk" 45.include "../../textproc/libxml2/buildlink3.mk"
45 46
46# Note: This expression is the same as ${PKGBASE}, but the latter is 47# Note: This expression is the same as ${PKGBASE}, but the latter is
47# not defined yet, so we cannot use it here. 48# not defined yet, so we cannot use it here.
48PKG_OPTIONS_VAR= PKG_OPTIONS.${PKGNAME:C/-[0-9].*//} 49PKG_OPTIONS_VAR= PKG_OPTIONS.${PKGNAME:C/-[0-9].*//}
49PKG_SUPPORTED_OPTIONS+= inet6 ssl maintainer-zts suhosin 50PKG_SUPPORTED_OPTIONS+= inet6 ssl maintainer-zts suhosin
50PKG_SUGGESTED_OPTIONS+= inet6 ssl 51PKG_SUGGESTED_OPTIONS+= inet6 ssl
51 52
52#SUBST_CLASSES+= ini 53#SUBST_CLASSES+= ini
53#SUBST_STAGE.ini= post-patch 54#SUBST_STAGE.ini= post-patch
54#SUBST_FILES.ini= php.ini-development 55#SUBST_FILES.ini= php.ini-development
cvs diff -r1.23 -r1.24 pkgsrc/lang/php53/Attic/distinfo (expand / switch to unified diff)

--- pkgsrc/lang/php53/Attic/distinfo 2011/10/06 05:34:00 1.23
+++ pkgsrc/lang/php53/Attic/distinfo 2011/10/20 12:38:24 1.24
@@ -1,18 +1,21 @@ @@ -1,18 +1,21 @@
1$NetBSD: distinfo,v 1.23 2011/10/06 05:34:00 jklos Exp $ 1$NetBSD: distinfo,v 1.24 2011/10/20 12:38:24 taca Exp $
2 2
3SHA1 (php-5.3.8/php-5.3.8.tar.bz2) = 8f29029e092f262876bfdd2ce56f6867e2b74b85 3SHA1 (php-5.3.8/php-5.3.8.tar.bz2) = 8f29029e092f262876bfdd2ce56f6867e2b74b85
4RMD160 (php-5.3.8/php-5.3.8.tar.bz2) = f18a18e2dfd7ea7885760eec2a05b3c4a15ad9db 4RMD160 (php-5.3.8/php-5.3.8.tar.bz2) = f18a18e2dfd7ea7885760eec2a05b3c4a15ad9db
5Size (php-5.3.8/php-5.3.8.tar.bz2) = 11190060 bytes 5Size (php-5.3.8/php-5.3.8.tar.bz2) = 11190060 bytes
 6SHA1 (php-5.3.8/suhosin-patch-5.3.7-0.9.10.patch.gz) = 3c38e873584b8f9e325a813cc9b197a342595099
 7RMD160 (php-5.3.8/suhosin-patch-5.3.7-0.9.10.patch.gz) = 19f789bf49a5fed2cd88b199fd8ac5d1ffa9bdc8
 8Size (php-5.3.8/suhosin-patch-5.3.7-0.9.10.patch.gz) = 41175 bytes
6SHA1 (patch-aa) = b0dc6cd0b2103d5858280202506b33322a98496e 9SHA1 (patch-aa) = b0dc6cd0b2103d5858280202506b33322a98496e
7SHA1 (patch-ab) = d08bb50cf074a6065ef0d1d67a713b7573cb2f5b 10SHA1 (patch-ab) = d08bb50cf074a6065ef0d1d67a713b7573cb2f5b
8SHA1 (patch-ac) = 1720f154232241c19d0c6e08a824e33252f1b690 11SHA1 (patch-ac) = 1720f154232241c19d0c6e08a824e33252f1b690
9SHA1 (patch-ad) = 1608c58860a43b4e31df8646b5ded253ec9aa881 12SHA1 (patch-ad) = 1608c58860a43b4e31df8646b5ded253ec9aa881
10SHA1 (patch-ae) = e590db60a60f4e5ef2da4e5edb786335a67a3d56 13SHA1 (patch-ae) = e590db60a60f4e5ef2da4e5edb786335a67a3d56
11SHA1 (patch-af) = 1618b23fd6d090ce5aa929208416028724278bfc 14SHA1 (patch-af) = 1618b23fd6d090ce5aa929208416028724278bfc
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-as) = 5faa039f0ab7663e82787973e937aea685ba2dac 20SHA1 (patch-as) = 5faa039f0ab7663e82787973e937aea685ba2dac
18SHA1 (patch-php__mssql.c) = b46c688ff2d8da33ca2f9beb0eb9182b6edf7e23 21SHA1 (patch-php__mssql.c) = b46c688ff2d8da33ca2f9beb0eb9182b6edf7e23