summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSebastian Bergmann <sebastian@gentoo.org>2005-07-10 13:34:05 +0000
committerSebastian Bergmann <sebastian@gentoo.org>2005-07-10 13:34:05 +0000
commit3a0a8aa2abde8b6bd4bcc1ea670d27689adcccc6 (patch)
tree0491350772ce2bcdfd59ee7950958e6289526f83
parentStable on hppa (diff)
downloadgentoo-2-3a0a8aa2abde8b6bd4bcc1ea670d27689adcccc6.tar.gz
gentoo-2-3a0a8aa2abde8b6bd4bcc1ea670d27689adcccc6.tar.bz2
gentoo-2-3a0a8aa2abde8b6bd4bcc1ea670d27689adcccc6.zip
Fix bug 98559.
-rw-r--r--eclass/php-sapi.eclass6
-rw-r--r--eclass/php5-sapi-r2.eclass4
-rw-r--r--eclass/php5-sapi-r3.eclass4
3 files changed, 7 insertions, 7 deletions
diff --git a/eclass/php-sapi.eclass b/eclass/php-sapi.eclass
index 6d2b8e9a2480..697e4f21b49d 100644
--- a/eclass/php-sapi.eclass
+++ b/eclass/php-sapi.eclass
@@ -1,6 +1,6 @@
# Copyright 1999-2005 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/php-sapi.eclass,v 1.72 2005/07/09 08:33:27 sebastian Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/php-sapi.eclass,v 1.73 2005/07/10 13:34:05 sebastian Exp $
# Author: Robin H. Johnson <robbat2@gentoo.org>
inherit eutils flag-o-matic multilib libtool
@@ -56,8 +56,8 @@ case "$PV" in
4.3.8) HARDENEDPHP_PATCH="hardened-php-$PV-0.2.2.patch.gz" ;;
4.3.9) HARDENEDPHP_PATCH="hardened-php-$PV-0.2.6.patch.gz" ;;
4.3.10) HARDENEDPHP_PATCH="hardened-php-$PV-0.2.7.patch.gz" ;;
- 4.3.11) HARDENEDPHP_PATCH="hardened-php-$PV-0.3.2.patch.gz" ;;
- 4.4.0RC2) HARDENEDPHP_PATCH="hardened-php-$PV-0.3.2.patch.gz" ;;
+ 4.3.11) HARDENEDPHP_PATCH="hardening-patch-$PV-0.3.2.patch.gz" ;;
+ 4.4.0RC2) HARDENEDPHP_PATCH="hardening-patch-$PV-0.3.2.patch.gz" ;;
esac
[ -n "$HARDENEDPHP_PATCH" ] && SRC_URI="${SRC_URI} hardenedphp? ( http://www.hardened-php.net/$HARDENEDPHP_PATCH )"
diff --git a/eclass/php5-sapi-r2.eclass b/eclass/php5-sapi-r2.eclass
index 93dc820980a7..5665e0e211f4 100644
--- a/eclass/php5-sapi-r2.eclass
+++ b/eclass/php5-sapi-r2.eclass
@@ -1,6 +1,6 @@
# Copyright 1999-2005 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/php5-sapi-r2.eclass,v 1.24 2005/07/09 08:33:27 sebastian Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/php5-sapi-r2.eclass,v 1.25 2005/07/10 13:34:05 sebastian Exp $
#
# eclass/php5-sapi-r2.eclass
# Eclass for building different php5 SAPI instances
@@ -112,7 +112,7 @@ PHP_INI_FILE="php.ini"
# the patch for different versions of PHP
case "$PV" in
- 5.0.4) HARDENEDPHP_PATCH="hardened-php-$PV-0.3.2.patch.gz" ;;
+ 5.0.4) HARDENEDPHP_PATCH="hardening-patch-$PV-0.3.2.patch.gz" ;;
esac
[ -n "$HARDENEDPHP_PATCH" ] && SRC_URI="${SRC_URI} hardenedphp? ( http://www.hardened-php.net/$HARDENEDPHP_PATCH )"
diff --git a/eclass/php5-sapi-r3.eclass b/eclass/php5-sapi-r3.eclass
index c2976f53e524..0c0896333129 100644
--- a/eclass/php5-sapi-r3.eclass
+++ b/eclass/php5-sapi-r3.eclass
@@ -1,6 +1,6 @@
# Copyright 1999-2005 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/php5-sapi-r3.eclass,v 1.12 2005/07/09 08:33:27 sebastian Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/php5-sapi-r3.eclass,v 1.13 2005/07/10 13:34:05 sebastian Exp $
#
# ########################################################################
#
@@ -113,7 +113,7 @@ PHP_INI_FILE="php.ini"
# the patch for different versions of PHP
case "$PV" in
- 5.0.4) HARDENEDPHP_PATCH="hardened-php-$PV-0.3.2.patch.gz" ;;
+ 5.0.4) HARDENEDPHP_PATCH="hardening-patch-$PV-0.3.2.patch.gz" ;;
esac
[ -n "$HARDENEDPHP_PATCH" ] && SRC_URI="${SRC_URI} hardenedphp? ( http://www.hardened-php.net/$HARDENEDPHP_PATCH )"