From 8e59a48bab0ad41ad8ef29b97279601556e19332 Mon Sep 17 00:00:00 2001 From: Christian Parpart Date: Fri, 14 Jan 2005 14:42:47 +0000 Subject: [PATCH] added missing config files for mod_php >= 4.3.10-r1 and >= 5.0.2-r1 Package-Manager: portage-2.0.51-r12 --- dev-php/mod_php/ChangeLog | 6 ++- dev-php/mod_php/Manifest | 10 +++-- .../mod_php/files/4.3.10-r1/70_mod_php.conf | 40 +++++++++++++++++++ .../mod_php/files/5.0.2-r1/70_mod_php5.conf | 19 +++++++++ dev-php/mod_php/mod_php-4.3.10-r1.ebuild | 4 +- dev-php/mod_php/mod_php-5.0.2-r1.ebuild | 4 +- dev-php/mod_php/mod_php-5.0.3-r1.ebuild | 5 +-- 7 files changed, 76 insertions(+), 12 deletions(-) create mode 100644 dev-php/mod_php/files/4.3.10-r1/70_mod_php.conf create mode 100644 dev-php/mod_php/files/5.0.2-r1/70_mod_php5.conf diff --git a/dev-php/mod_php/ChangeLog b/dev-php/mod_php/ChangeLog index d1a4556a10c1..20b11e9d0d12 100644 --- a/dev-php/mod_php/ChangeLog +++ b/dev-php/mod_php/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for dev-php/mod_php # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-php/mod_php/ChangeLog,v 1.200 2005/01/13 21:34:45 gmsoft Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-php/mod_php/ChangeLog,v 1.201 2005/01/14 14:42:46 trapni Exp $ + + 14 Jan 2005; Christian Parpart + +files/4.3.10-r1/70_mod_php.conf, +files/5.0.2-r1/70_mod_php5.conf: + added missing config files for mod_php >= 4.3.10-r1 and >= 5.0.2-r1 13 Jan 2005; Guy Martin mod_php-4.3.10.ebuild: Stable on hppa. diff --git a/dev-php/mod_php/Manifest b/dev-php/mod_php/Manifest index 68de4c96ebda..42d0914fe25d 100644 --- a/dev-php/mod_php/Manifest +++ b/dev-php/mod_php/Manifest @@ -1,4 +1,4 @@ -MD5 dda3ed18de4c1888811be2bd94f24ae4 ChangeLog 35207 +MD5 baf93c9b7794b7922fe1706e5edf948e ChangeLog 35401 MD5 38fe937e954ab7109395cefa86fcd2d4 metadata.xml 384 MD5 bf17d109788ccc5953b97a47d0b693bf mod_php-4.3.10.ebuild 6090 MD5 f3da06c0bb470ad2782dfe207ce75e4e mod_php-4.3.8.ebuild 5916 @@ -9,9 +9,9 @@ MD5 f7e4a6694e3b06296830077b47d766da mod_php-5.0.0.ebuild 3995 MD5 8dcccea239186458cae823a2b62b80d0 mod_php-5.0.1.ebuild 4244 MD5 3da695dab52a3e7eeea983bf1c493fa1 mod_php-5.0.2.ebuild 4257 MD5 af7473ef5d3920861bd3e501e8d26882 mod_php-5.0.3.ebuild 4324 -MD5 343587068f31576c4978a7982cb39284 mod_php-4.3.10-r1.ebuild 6292 -MD5 41ee3d6ee7d1a42ba5d2c25148fbb9c3 mod_php-5.0.2-r1.ebuild 4167 -MD5 60fb0cacf13ad87aa37d47d2b990a3f6 mod_php-5.0.3-r1.ebuild 4229 +MD5 c26a880ebf25c75febac00d8518b8605 mod_php-4.3.10-r1.ebuild 6304 +MD5 93afa9417917af1a31305b472ea8b70c mod_php-5.0.2-r1.ebuild 4177 +MD5 651d13f8e1733ab0724614438318117a mod_php-5.0.3-r1.ebuild 4238 MD5 79ed63479c494aeb2ed0bc7f5c059fb9 files/70_mod_php.conf 1022 MD5 80c45eef4f54629e893249f869cff5c6 files/70_mod_php5.conf 484 MD5 0b0247c6314c5f7d6685268262edfd24 files/digest-mod_php-4.3.10 206 @@ -32,3 +32,5 @@ MD5 ad986b02a371b2fea3b4ae5060c9dc81 files/stdint.diff 358 MD5 0b0247c6314c5f7d6685268262edfd24 files/digest-mod_php-4.3.10-r1 206 MD5 4792b645fe6b66cd3f1b1ec88d4d20e8 files/digest-mod_php-5.0.2-r1 63 MD5 89a3a3b437e24b7ccc044376843d8446 files/digest-mod_php-5.0.3-r1 63 +MD5 158cb07377a3e2a0028947b0aeb505cb files/4.3.10-r1/70_mod_php.conf 1017 +MD5 80c45eef4f54629e893249f869cff5c6 files/5.0.2-r1/70_mod_php5.conf 484 diff --git a/dev-php/mod_php/files/4.3.10-r1/70_mod_php.conf b/dev-php/mod_php/files/4.3.10-r1/70_mod_php.conf new file mode 100644 index 000000000000..6263db962a8b --- /dev/null +++ b/dev-php/mod_php/files/4.3.10-r1/70_mod_php.conf @@ -0,0 +1,40 @@ +# vim: ft=apache sw=4 ts=4 + + + # Load the module first + + LoadModule php4_module modules/libphp4.so + + + # Set it to handle the files + + AddType application/x-httpd-php .php + AddType application/x-httpd-php .phtml + AddType application/x-httpd-php .php3 + AddType application/x-httpd-php .php4 + AddType application/x-httpd-php-source .phps + + + # Fix some bugs + + # keep this the same size as post_max_size in php.ini + # LimitRequestBody 8388608 + + + # keep this the same size as post_max_size in php.ini + # LimitRequestBody 8388608 + + + # keep this the same size as post_max_size in php.ini + # LimitRequestBody 8388608 + + + # keep this the same size as post_max_size in php.ini + # LimitRequestBody 8388608 + + + # keep this the same size as post_max_size in php.ini + # LimitRequestBody 8388608 + + + diff --git a/dev-php/mod_php/files/5.0.2-r1/70_mod_php5.conf b/dev-php/mod_php/files/5.0.2-r1/70_mod_php5.conf new file mode 100644 index 000000000000..37a8e41c88a7 --- /dev/null +++ b/dev-php/mod_php/files/5.0.2-r1/70_mod_php5.conf @@ -0,0 +1,19 @@ +# vim: ft=apache sw=4 ts=4 + + + # Load the module first + + LoadModule php5_module modules/libphp5.so + + + # Set it to handle the files + + AddType application/x-httpd-php .php + AddType application/x-httpd-php .phtml + AddType application/x-httpd-php .php3 + AddType application/x-httpd-php .php4 + AddType application/x-httpd-php .php5 + AddType application/x-httpd-php-source .phps + + + diff --git a/dev-php/mod_php/mod_php-4.3.10-r1.ebuild b/dev-php/mod_php/mod_php-4.3.10-r1.ebuild index 902120cdf68c..4f3ec9f23efc 100644 --- a/dev-php/mod_php/mod_php-4.3.10-r1.ebuild +++ b/dev-php/mod_php/mod_php-4.3.10-r1.ebuild @@ -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/dev-php/mod_php/mod_php-4.3.10-r1.ebuild,v 1.1 2005/01/13 13:08:57 trapni Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-php/mod_php/mod_php-4.3.10-r1.ebuild,v 1.2 2005/01/14 14:42:46 trapni Exp $ IUSE="${IUSE} apache2" @@ -141,7 +141,7 @@ src_install() { if [ -n "${USE_APACHE2}" ] ; then einfo "Installing a Apache2 config for PHP (70_mod_php.conf)" insinto ${APACHE2_MODULES_CONFDIR} - doins ${FILESDIR}/70_mod_php.conf + doins "${FILESDIR}/4.3.10-r1/70_mod_php.conf" else einfo "Installing a Apache config for PHP (mod_php.conf)" insinto ${APACHE1_MODULES_CONFDIR} diff --git a/dev-php/mod_php/mod_php-5.0.2-r1.ebuild b/dev-php/mod_php/mod_php-5.0.2-r1.ebuild index b7be98c70702..2e12b5ef562c 100644 --- a/dev-php/mod_php/mod_php-5.0.2-r1.ebuild +++ b/dev-php/mod_php/mod_php-5.0.2-r1.ebuild @@ -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/dev-php/mod_php/mod_php-5.0.2-r1.ebuild,v 1.1 2005/01/13 13:08:57 trapni Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-php/mod_php/mod_php-5.0.2-r1.ebuild,v 1.2 2005/01/14 14:42:46 trapni Exp $ IUSE="${IUSE} apache2" @@ -103,7 +103,7 @@ src_install() { if [ -n "${USE_APACHE2}" ] ; then einfo "Installing a Apache2 config for PHP (70_mod_php5.conf)" insinto ${APACHE2_MODULES_CONFDIR} - doins ${FILESDIR}/70_mod_php5.conf + doins "${FILESDIR}/5.0.2-r170_mod_php5.conf" else einfo "Installing a Apache config for PHP (mod_php5.conf)" insinto ${APACHE_MODULES_CONFDIR} diff --git a/dev-php/mod_php/mod_php-5.0.3-r1.ebuild b/dev-php/mod_php/mod_php-5.0.3-r1.ebuild index 4c4159b066cf..e121354adb6a 100644 --- a/dev-php/mod_php/mod_php-5.0.3-r1.ebuild +++ b/dev-php/mod_php/mod_php-5.0.3-r1.ebuild @@ -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/dev-php/mod_php/mod_php-5.0.3-r1.ebuild,v 1.1 2005/01/13 13:08:57 trapni Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-php/mod_php/mod_php-5.0.3-r1.ebuild,v 1.2 2005/01/14 14:42:46 trapni Exp $ IUSE="${IUSE} apache2" @@ -74,7 +74,6 @@ src_unpack() { php5-sapi_src_unpack [ "${ARCH}" == "sparc" ] && epatch ${FILESDIR}/stdint.diff - } src_compile() { @@ -105,7 +104,7 @@ src_install() { if [ -n "${USE_APACHE2}" ] ; then einfo "Installing a Apache2 config for PHP (70_mod_php5.conf)" insinto ${APACHE2_MODULES_CONFDIR} - doins ${FILESDIR}/70_mod_php5.conf + doins "${FILESDIR}/5.0.2-r1/70_mod_php5.conf" else einfo "Installing a Apache config for PHP (mod_php5.conf)" insinto ${APACHE_MODULES_CONFDIR} -- 2.26.2