diff options
| author |   Robin H. Johnson <robbat2@gentoo.org> | 2004-02-26 02:43:45 +0000 |
|---|---|---|
| committer | Robin H. Johnson <robbat2@gentoo.org> | 2004-02-26 02:43:45 +0000 |
| commit | 7163b1dde908743a3aa2c26cc43fcc07792534ab (patch) | |
| tree | 2d7655693f6a53d496afac335b7b455479b11dfe /eclass | |
| parent | Version bump (Manifest recommit) (diff) | |
| download | gentoo-2-7163b1dde908743a3aa2c26cc43fcc07792534ab.tar.gz gentoo-2-7163b1dde908743a3aa2c26cc43fcc07792534ab.tar.bz2 gentoo-2-7163b1dde908743a3aa2c26cc43fcc07792534ab.zip | |
fix bug #42944
Diffstat (limited to 'eclass')
| -rw-r--r-- | eclass/perl-module.eclass | 3 | ||||
| -rw-r--r-- | eclass/php-sapi.eclass | 16 |
2 files changed, 12 insertions, 7 deletions
diff --git a/eclass/perl-module.eclass b/eclass/perl-module.eclass index 155907694177..6f04c8495fbe 100644 --- a/eclass/perl-module.eclass +++ b/eclass/perl-module.eclass @@ -1,6 +1,6 @@ # Copyright 1999-2003 Gentoo Technologies, Inc. # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/eclass/perl-module.eclass,v 1.55 2003/12/22 20:40:05 rac Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/perl-module.eclass,v 1.56 2004/02/26 02:43:45 robbat2 Exp $ # # Author: Seemant Kulleen <seemant@gentoo.org> # @@ -27,7 +27,6 @@ POD_DIR="" MMSIXELEVEN=`perl -e 'use ExtUtils::MakeMaker; print( $ExtUtils::MakeMaker::VERSION ge "6.11" )'` perl-module_src_prep() { - SRC_PREP="yes" if [ "${style}" == "builder" ]; then perl ${S}/Build.PL installdirs=vendor destdir=${D} diff --git a/eclass/php-sapi.eclass b/eclass/php-sapi.eclass index e9982360ff78..2e3188316a67 100644 --- a/eclass/php-sapi.eclass +++ b/eclass/php-sapi.eclass @@ -1,6 +1,6 @@ # Copyright 1999-2003 Gentoo Technologies, Inc. # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/eclass/php-sapi.eclass,v 1.9 2004/02/11 17:31:37 robbat2 Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/php-sapi.eclass,v 1.10 2004/02/26 02:43:45 robbat2 Exp $ # Author: Robin H. Johnson <robbat2@gentoo.org> inherit eutils flag-o-matic @@ -29,8 +29,11 @@ PHPMAJORVER=${MY_PV//\.*} if [ -z "${SRC_URI}" ]; then SRC_URI="${SRC_URI_BASE}/${MY_P}.tar.bz2" fi -# A patch for PHP for security -SRC_URI="${SRC_URI} mirror://gentoo/php-4.3.2-fopen-url-secure.patch" +# A patch for PHP for security. PHP-CLI interface is exempt, as it cannot be +# fed bad data from outside. +if [ "${PHPSAPI}" != "cli" ]; then + SRC_URI="${SRC_URI} mirror://gentoo/php-4.3.2-fopen-url-secure.patch" +fi # Where we work S=${WORKDIR}/${MY_P} @@ -504,8 +507,11 @@ php-sapi_src_install() { dosym ${PHPEXTDIR}/java.so ${PHPEXTDIR}/libphp_java.so fi - #url_fopen - patch ${phpinisrc} <${DISTDIR}/php-4.3.2-fopen-url-secure.patch + # A patch for PHP for security. PHP-CLI interface is exempt, as it cannot be + # fed bad data from outside. + if [ "${PHPSAPI}" != "cli" ]; then + patch ${phpinisrc} <${DISTDIR}/php-4.3.2-fopen-url-secure.patch + fi # A lot of ini file funkiness insinto ${PHPINIDIRECTORY} |