[pkgsrc/trunk]: pkgsrc remove --enable-memory-limit - 8MB is too low, and thi...

[jdolecek <jdolecek%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/8980ba9a95c9
branches:  trunk
changeset: 520392:8980ba9a95c9
user:      jdolecek <jdolecek%pkgsrc.org@localhost>
date:      Fri Oct 20 22:10:33 2006 +0000

description:
remove --enable-memory-limit - 8MB is too low, and this just
duplicates process resource limits, which already provide necessary
"safety net" protection against rogue scripts

bump PKGREVISION for this

adressess PR pkg/32007 by "pancake"

also remove --enable-track-vars, since that configure argument
is long gone from PHP

diffstat:

 lang/php5/Makefile     |  3 ++-
 lang/php5/Makefile.php |  5 +----
 www/ap-php/Makefile    |  3 ++-
 www/php4/Makefile      |  3 ++-
 www/php4/Makefile.php  |  4 +---
 5 files changed, 8 insertions(+), 10 deletions(-)

diffs (74 lines):

diff -r b8b5d2474755 -r 8980ba9a95c9 lang/php5/Makefile
--- a/lang/php5/Makefile        Fri Oct 20 21:56:38 2006 +0000
+++ b/lang/php5/Makefile        Fri Oct 20 22:10:33 2006 +0000
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.43 2006/08/19 16:50:44 taca Exp $
+# $NetBSD: Makefile,v 1.44 2006/10/20 22:10:33 jdolecek Exp $
 
 PKGNAME=               php-${PHP_BASE_VERS}
+PKGREVISION=           1
 CATEGORIES=            lang
 
 HOMEPAGE=              http://www.php.net/
diff -r b8b5d2474755 -r 8980ba9a95c9 lang/php5/Makefile.php
--- a/lang/php5/Makefile.php    Fri Oct 20 21:56:38 2006 +0000
+++ b/lang/php5/Makefile.php    Fri Oct 20 22:10:33 2006 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.php,v 1.19 2006/06/05 17:24:06 minskim Exp $
+# $NetBSD: Makefile.php,v 1.20 2006/10/20 22:10:33 jdolecek Exp $
 #
 
 .include "../../lang/php5/Makefile.common"
@@ -26,9 +26,6 @@
 CONFIGURE_ARGS+=       --without-sqlite
 CONFIGURE_ARGS+=       --without-iconv
 
-CONFIGURE_ARGS+=       --enable-memory-limit
-CONFIGURE_ARGS+=       --enable-track-vars
-
 CONFIGURE_ARGS+=       --disable-posix
 CONFIGURE_ARGS+=       --disable-dom
 CONFIGURE_ARGS+=       --disable-pdo
diff -r b8b5d2474755 -r 8980ba9a95c9 www/ap-php/Makefile
--- a/www/ap-php/Makefile       Fri Oct 20 21:56:38 2006 +0000
+++ b/www/ap-php/Makefile       Fri Oct 20 22:10:33 2006 +0000
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.11 2006/07/07 15:49:34 jlam Exp $
+# $NetBSD: Makefile,v 1.12 2006/10/20 22:10:34 jdolecek Exp $
 #
 
 PKGNAME=               ${APACHE_PKG_PREFIX}-${PHP_PKG_PREFIX}-${PHP_BASE_VERS}
+PKGREVISION=           1
 COMMENT=               Apache (${PKG_APACHE}) module for ${PKG_PHP}
 
 CONFLICTS=             ap-php-[0-9]*
diff -r b8b5d2474755 -r 8980ba9a95c9 www/php4/Makefile
--- a/www/php4/Makefile Fri Oct 20 21:56:38 2006 +0000
+++ b/www/php4/Makefile Fri Oct 20 22:10:33 2006 +0000
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.70 2006/08/10 23:01:40 adrianp Exp $
+# $NetBSD: Makefile,v 1.71 2006/10/20 22:10:33 jdolecek Exp $
 
 PKGNAME=               php-${PHP_BASE_VERS}
+PKGREVISION=           1
 CATEGORIES+=           lang
 COMMENT=               HTML-embedded scripting language
 
diff -r b8b5d2474755 -r 8980ba9a95c9 www/php4/Makefile.php
--- a/www/php4/Makefile.php     Fri Oct 20 21:56:38 2006 +0000
+++ b/www/php4/Makefile.php     Fri Oct 20 22:10:33 2006 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.php,v 1.35 2005/12/05 23:55:23 rillig Exp $
+# $NetBSD: Makefile.php,v 1.36 2006/10/20 22:10:33 jdolecek Exp $
 
 .include "../../www/php4/Makefile.common"
 
@@ -22,8 +22,6 @@
 .include "../../mk/bsd.prefs.mk"
 
 CONFIGURE_ARGS+=       --with-regex=system
-CONFIGURE_ARGS+=       --enable-memory-limit
-CONFIGURE_ARGS+=       --enable-track-vars
 
 # Support for linking some PHP4 extensions statically into the php CGI and
 # into the apache mod_php.so DSO.