summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorjdolecek <jdolecek@pkgsrc.org>2006-10-20 22:10:33 +0000
committerjdolecek <jdolecek@pkgsrc.org>2006-10-20 22:10:33 +0000
commit0f3f8f42e9fa96e31d1cceaa31d990e8914bf681 (patch)
tree5ec88dde909e4f5b266b31e5fded854a2be6cfb8
parent39eae3cc0d1f0f6394a3204880c9c1a68b63c075 (diff)
downloadpkgsrc-0f3f8f42e9fa96e31d1cceaa31d990e8914bf681.tar.gz
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
-rw-r--r--lang/php5/Makefile3
-rw-r--r--lang/php5/Makefile.php5
-rw-r--r--www/ap-php/Makefile3
-rw-r--r--www/php4/Makefile3
-rw-r--r--www/php4/Makefile.php4
5 files changed, 8 insertions, 10 deletions
diff --git a/lang/php5/Makefile b/lang/php5/Makefile
index c2fc77925cc..1076073b34c 100644
--- a/lang/php5/Makefile
+++ b/lang/php5/Makefile
@@ -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 --git a/lang/php5/Makefile.php b/lang/php5/Makefile.php
index a80b152f4e0..e3c6c8ea316 100644
--- a/lang/php5/Makefile.php
+++ b/lang/php5/Makefile.php
@@ -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-mysql
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 --git a/www/ap-php/Makefile b/www/ap-php/Makefile
index 620d00cce47..aa543633ff8 100644
--- a/www/ap-php/Makefile
+++ b/www/ap-php/Makefile
@@ -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 --git a/www/php4/Makefile b/www/php4/Makefile
index 9577f98ddc7..dc2b5f63b23 100644
--- a/www/php4/Makefile
+++ b/www/php4/Makefile
@@ -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 --git a/www/php4/Makefile.php b/www/php4/Makefile.php
index c15229b4e5c..4b3fb00683d 100644
--- a/www/php4/Makefile.php
+++ b/www/php4/Makefile.php
@@ -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 @@ CONFIGURE_ARGS+= --with-exec-dir=${PREFIX}/libexec/php4
.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.