diff options
author | jdolecek <jdolecek@pkgsrc.org> | 2004-12-12 11:03:33 +0000 |
---|---|---|
committer | jdolecek <jdolecek@pkgsrc.org> | 2004-12-12 11:03:33 +0000 |
commit | 9b81fff133f04f94629b796b8100004939760e4f (patch) | |
tree | f0ff181e83479bf6ca6227c679c036404d7733d9 /lang | |
parent | 1c217a3f540b77b6712ea23be7530f6e87815a1a (diff) | |
download | pkgsrc-9b81fff133f04f94629b796b8100004939760e4f.tar.gz |
completely ignore system php.ini for all pear-related operations; this
is necessary to avoid being subject to e.g. open_basedir or safe_mode settings
Diffstat (limited to 'lang')
-rw-r--r-- | lang/php/pear.mk | 4 | ||||
-rw-r--r-- | lang/php5/Makefile | 4 | ||||
-rw-r--r-- | lang/php5/distinfo | 3 | ||||
-rw-r--r-- | lang/php5/patches/patch-al | 10 |
4 files changed, 16 insertions, 5 deletions
diff --git a/lang/php/pear.mk b/lang/php/pear.mk index 505734d64ea..467b855a6d7 100644 --- a/lang/php/pear.mk +++ b/lang/php/pear.mk @@ -1,4 +1,4 @@ -# $NetBSD: pear.mk,v 1.4 2004/12/12 09:41:14 jdolecek Exp $ +# $NetBSD: pear.mk,v 1.5 2004/12/12 11:03:33 jdolecek Exp $ # # This Makefile fragment is intended to be included by packages that build # and install pear packages. @@ -43,7 +43,7 @@ PEAR_GENERATE_PLIST= \ ${ECHO} "@comment The following lines are automatically generated"; \ PEAR_LIB="${PEAR_LIB}" WRKSRC="${WRKSRC}" \ PEAR_DIRRM_BASEDIR="${PEAR_DIRRM_BASEDIR}" \ - ${PREFIX}/bin/php ${PKGDIR}/../../lang/php/pear_plist.php; + ${PREFIX}/bin/php -C -n ${PKGDIR}/../../lang/php/pear_plist.php; GENERATE_PLIST+= ${PEAR_GENERATE_PLIST} NO_BUILD= # defined diff --git a/lang/php5/Makefile b/lang/php5/Makefile index 5038d4e45b0..1b3d3d3c725 100644 --- a/lang/php5/Makefile +++ b/lang/php5/Makefile @@ -1,8 +1,8 @@ -# $NetBSD: Makefile,v 1.4 2004/11/04 18:38:55 jdolecek Exp $ +# $NetBSD: Makefile,v 1.5 2004/12/12 11:03:33 jdolecek Exp $ # PKGNAME= php-${PHP_BASE_VERS} -PKGREVISION= 1 +PKGREVISION= 2 CATEGORIES= lang MAINTAINER= pancake@phreaker.net diff --git a/lang/php5/distinfo b/lang/php5/distinfo index b9aea93648f..c15bbf728bb 100644 --- a/lang/php5/distinfo +++ b/lang/php5/distinfo @@ -1,6 +1,7 @@ -$NetBSD: distinfo,v 1.2 2004/10/31 21:14:54 jdolecek Exp $ +$NetBSD: distinfo,v 1.3 2004/12/12 11:03:33 jdolecek Exp $ SHA1 (php-5.0.2.tar.bz2) = 85e4635ce764199d60329a578421159f338be082 Size (php-5.0.2.tar.bz2) = 4577974 bytes SHA1 (patch-aj) = 88e456015f4d8e92ea57019df39195905b3f6c28 SHA1 (patch-ak) = 0faa523103e0a9a3c01c78c2fe9a64c0a9b2fc43 +SHA1 (patch-al) = 28ad9006b387e2b9984ad49beea21c9d46e63b46 diff --git a/lang/php5/patches/patch-al b/lang/php5/patches/patch-al new file mode 100644 index 00000000000..cd7ca10e362 --- /dev/null +++ b/lang/php5/patches/patch-al @@ -0,0 +1,10 @@ +$NetBSD: patch-al,v 1.1 2004/12/12 11:03:33 jdolecek Exp $ + +--- pear/scripts/pear.sh.orig 2004-12-12 10:44:13.000000000 +0100 ++++ pear/scripts/pear.sh 2004-12-12 10:44:21.000000000 +0100 +@@ -25,4 +25,4 @@ + fi + fi + +-exec $PHP -C -q $INCARG -d output_buffering=1 $INCDIR/pearcmd.php "$@" ++exec $PHP -C -q $INCARG -d output_buffering=1 -n $INCDIR/pearcmd.php "$@" |