From fea2506302b0222ed06695334830e7f7ba67e254 Mon Sep 17 00:00:00 2001 From: "Robin H. Johnson" Date: Thu, 16 Dec 2004 06:49:45 +0000 Subject: New version, solves bugs #73698, 73525, 72752, 72735. --- dev-php/mod_php/ChangeLog | 10 +- dev-php/mod_php/Manifest | 40 +++--- dev-php/mod_php/files/digest-mod_php-4.3.10 | 3 + dev-php/mod_php/files/digest-mod_php-5.0.3 | 1 + dev-php/mod_php/mod_php-4.3.10.ebuild | 191 ++++++++++++++++++++++++++++ dev-php/mod_php/mod_php-5.0.3.ebuild | 144 +++++++++++++++++++++ dev-php/php-cgi/ChangeLog | 9 +- dev-php/php-cgi/Manifest | 26 ++-- dev-php/php-cgi/files/digest-php-cgi-4.3.10 | 3 + dev-php/php-cgi/files/digest-php-cgi-5.0.3 | 1 + dev-php/php-cgi/php-cgi-4.3.10.ebuild | 38 ++++++ dev-php/php-cgi/php-cgi-5.0.3.ebuild | 43 +++++++ dev-php/php/ChangeLog | 9 +- dev-php/php/Manifest | 40 +++--- dev-php/php/files/digest-php-4.3.10 | 2 + dev-php/php/files/digest-php-5.0.3 | 1 + dev-php/php/php-4.3.10.ebuild | 44 +++++++ dev-php/php/php-5.0.3.ebuild | 23 ++++ 18 files changed, 568 insertions(+), 60 deletions(-) create mode 100644 dev-php/mod_php/files/digest-mod_php-4.3.10 create mode 100644 dev-php/mod_php/files/digest-mod_php-5.0.3 create mode 100644 dev-php/mod_php/mod_php-4.3.10.ebuild create mode 100644 dev-php/mod_php/mod_php-5.0.3.ebuild create mode 100644 dev-php/php-cgi/files/digest-php-cgi-4.3.10 create mode 100644 dev-php/php-cgi/files/digest-php-cgi-5.0.3 create mode 100644 dev-php/php-cgi/php-cgi-4.3.10.ebuild create mode 100644 dev-php/php-cgi/php-cgi-5.0.3.ebuild create mode 100644 dev-php/php/files/digest-php-4.3.10 create mode 100644 dev-php/php/files/digest-php-5.0.3 create mode 100644 dev-php/php/php-4.3.10.ebuild create mode 100644 dev-php/php/php-5.0.3.ebuild (limited to 'dev-php') diff --git a/dev-php/mod_php/ChangeLog b/dev-php/mod_php/ChangeLog index 1dce7a5180a3..65bebd13bf98 100644 --- a/dev-php/mod_php/ChangeLog +++ b/dev-php/mod_php/ChangeLog @@ -1,6 +1,14 @@ # ChangeLog for dev-php/mod_php # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-php/mod_php/ChangeLog,v 1.190 2004/11/22 01:44:25 eradicator Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-php/mod_php/ChangeLog,v 1.191 2004/12/16 06:49:44 robbat2 Exp $ + + +*mod_php-4.3.10 (15 Dec 2004) +*mod_php-5.0.3 (15 Dec 2004) + + 15 Dec 2004; Robin H. Johnson +mod_php-4.3.10.ebuild, + +mod_php-5.0.3.ebuild: + New version, solves bugs #73698, 73525, 72752, 72735. 21 Nov 2004; Jeremy Huddleston mod_php-5.0.2.ebuild: diff --git a/dev-php/mod_php/Manifest b/dev-php/mod_php/Manifest index e642f312d818..634cfc21fad8 100644 --- a/dev-php/mod_php/Manifest +++ b/dev-php/mod_php/Manifest @@ -1,33 +1,27 @@ ------BEGIN PGP SIGNED MESSAGE----- -Hash: SHA1 - -MD5 223234c784965226551fd3ab05977514 ChangeLog 33971 -MD5 38fe937e954ab7109395cefa86fcd2d4 metadata.xml 384 -MD5 9e19b7f691662389947b59c9a1156935 mod_php-4.3.9_rc1.ebuild 6027 -MD5 ee2192bcf2a49ea2faf6dc79b9b03099 mod_php-5.0.0-r1.ebuild 4181 -MD5 f6c0b2da02a8c55fc260ae228e9cf2f4 mod_php-5.0.1.ebuild 4246 +MD5 309b2e76d5d4951508c3376817f1c416 mod_php-5.0.0.ebuild 3997 MD5 d28c2e434a6a8f2a19174abbb52ff607 mod_php-4.3.9.ebuild 6028 MD5 98a539b329e9a1198fe9f08a68a2dc16 mod_php-5.0.2.ebuild 4262 -MD5 309b2e76d5d4951508c3376817f1c416 mod_php-5.0.0.ebuild 3997 MD5 dd1b8aa8fe7bc6b23eabab0cd0ac9fc9 mod_php-4.3.8.ebuild 5915 +MD5 ee2192bcf2a49ea2faf6dc79b9b03099 mod_php-5.0.0-r1.ebuild 4181 +MD5 9e19b7f691662389947b59c9a1156935 mod_php-4.3.9_rc1.ebuild 6027 +MD5 f6c0b2da02a8c55fc260ae228e9cf2f4 mod_php-5.0.1.ebuild 4246 +MD5 223234c784965226551fd3ab05977514 ChangeLog 33971 +MD5 38fe937e954ab7109395cefa86fcd2d4 metadata.xml 384 +MD5 0a67c876dc5e78d9c7f036f590bd17a6 mod_php-4.3.10.ebuild 6029 +MD5 8537abb010641193fa1533023c8a5800 mod_php-5.0.3.ebuild 4262 +MD5 7515e9b1dc298a0fb1c12d35a58c265d files/mod_php-4.3.4-amd64hack.diff 1028 +MD5 cceddd5c262e0ffef31d45b7da269851 files/mod_php.conf 148 +MD5 0b0247c6314c5f7d6685268262edfd24 files/digest-mod_php-4.3.10 206 MD5 79ed63479c494aeb2ed0bc7f5c059fb9 files/70_mod_php.conf 1022 -MD5 286ce4ea00fde75122c14fd35c3d4672 files/digest-mod_php-4.3.9_rc1 208 MD5 11f305b98b753ee023da8503a360762a files/digest-mod_php-5.0.0-r1 63 -MD5 14d868f33e29b3c9a70b118e9da58dd0 files/digest-mod_php-5.0.1 63 MD5 cd07c33356df77acd61cd300f2869d19 files/php-5.0.0-httpauthfix.patch 518 +MD5 390a659097a43447e44ab5bdd59378b5 files/digest-mod_php-4.3.8 282 MD5 aeed7aba3334e2f1437aa1ef48d850e8 files/digest-mod_php-4.3.9 205 +MD5 11f305b98b753ee023da8503a360762a files/digest-mod_php-5.0.0 63 +MD5 14d868f33e29b3c9a70b118e9da58dd0 files/digest-mod_php-5.0.1 63 MD5 4792b645fe6b66cd3f1b1ec88d4d20e8 files/digest-mod_php-5.0.2 63 -MD5 7515e9b1dc298a0fb1c12d35a58c265d files/mod_php-4.3.4-amd64hack.diff 1028 +MD5 89a3a3b437e24b7ccc044376843d8446 files/digest-mod_php-5.0.3 63 MD5 3bf664b414787f8f3c1dcbda5750aef4 files/mod_php-4.3.5-apache1security.diff 425 -MD5 cceddd5c262e0ffef31d45b7da269851 files/mod_php.conf 148 -MD5 80c45eef4f54629e893249f869cff5c6 files/70_mod_php5.conf 484 -MD5 11f305b98b753ee023da8503a360762a files/digest-mod_php-5.0.0 63 +MD5 286ce4ea00fde75122c14fd35c3d4672 files/digest-mod_php-4.3.9_rc1 208 MD5 273799e60d5a41a1e6f5ac53781a152f files/php5_soap_persistence_session.diff 1976 -MD5 390a659097a43447e44ab5bdd59378b5 files/digest-mod_php-4.3.8 282 ------BEGIN PGP SIGNATURE----- -Version: GnuPG v1.2.6 (GNU/Linux) - -iD8DBQFBoUSXArHZZzCEUG0RAvydAKCELYjT+iqOqsNwyz8X4Lqxcgv0NACfWHNE -maWRxXxPRydIpjGl/z7CTn0= -=9eF7 ------END PGP SIGNATURE----- +MD5 80c45eef4f54629e893249f869cff5c6 files/70_mod_php5.conf 484 diff --git a/dev-php/mod_php/files/digest-mod_php-4.3.10 b/dev-php/mod_php/files/digest-mod_php-4.3.10 new file mode 100644 index 000000000000..1cab79adb8b6 --- /dev/null +++ b/dev-php/mod_php/files/digest-mod_php-4.3.10 @@ -0,0 +1,3 @@ +MD5 7e56824dae9679c59a8234eb848aa542 php-4.3.10.tar.bz2 4026148 +MD5 912ff94309b762563d0542db5187315f php-4.3.2-fopen-url-secure.patch 416 +MD5 fbb6b365f4c0263b1dfd498aef092a77 php-4.3.6-includepath.diff 285 diff --git a/dev-php/mod_php/files/digest-mod_php-5.0.3 b/dev-php/mod_php/files/digest-mod_php-5.0.3 new file mode 100644 index 000000000000..eb20872d0cc2 --- /dev/null +++ b/dev-php/mod_php/files/digest-mod_php-5.0.3 @@ -0,0 +1 @@ +MD5 fd26455febdddee0977ce226b9108d9c php-5.0.3.tar.bz2 4607759 diff --git a/dev-php/mod_php/mod_php-4.3.10.ebuild b/dev-php/mod_php/mod_php-4.3.10.ebuild new file mode 100644 index 000000000000..90b6f2fe4e9c --- /dev/null +++ b/dev-php/mod_php/mod_php-4.3.10.ebuild @@ -0,0 +1,191 @@ +# Copyright 1999-2004 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.ebuild,v 1.1 2004/12/16 06:49:45 robbat2 Exp $ + +IUSE="${IUSE} apache2" + +KEYWORDS="x86 ~ppc ~sparc ~alpha ~hppa ~amd64 ~ia64 ~s390 ~ppc64 ~mips" + +detectapache() { + local domsg= + [ -n "$1" ] && domsg=1 + HAVE_APACHE1= + HAVE_APACHE2= + has_version '=net-www/apache-1*' && HAVE_APACHE1=1 + has_version '=net-www/apache-2*' && HAVE_APACHE2=1 + + [ -n "${HAVE_APACHE1}" ] && APACHEVER=1 + [ -n "${HAVE_APACHE2}" ] && APACHEVER=2 + [ -n "${HAVE_APACHE1}" ] && [ -n "${HAVE_APACHE2}" ] && APACHEVER='both' + + case "${APACHEVER}" in + 1) [ -n "${domsg}" ] && einfo 'Apache1 only detected' ;; + 2) [ -n "${domsg}" ] && einfo 'Apache2 only detected';; + both) + if use apache2; then + [ -n "${domsg}" ] && einfo "Multiple Apache versions detected, using Apache2 (USE=apache2)" + APACHEVER=2 + else + [ -n "${domsg}" ] && einfo 'Multiple Apache versions detected, using Apache1 (USE=-apache2)' + APACHEVER=1 + fi ;; + *) if [ -n "${domsg}" ]; then + MSG="Unknown Apache version!"; eerror $MSG ; die $MSG + else + APACHEVER=0 + fi; ;; + esac +} + +detectapache + +SLOT="${APACHEVER}" +[ "${APACHEVER}" -eq '2' ] && USE_APACHE2='2' || USE_APACHE2='' + +PHPSAPI="apache${APACHEVER}" +SRC_URI_BASE="http://downloads.php.net/ilia/" # for RC only + +# BIG FAT WARNING! +# the php eclass requires the PHPSAPI setting! +# In this case the PHPSAPI setting is dependant on the detectapache function +# above this point as well! +inherit php-sapi eutils + +DESCRIPTION="Apache module for PHP" + +DEPEND_EXTRA=">=net-www/apache-1.3.26-r2 + apache2? ( >=net-www/apache-2.0.43-r1 )" +DEPEND="${DEPEND} ${DEPEND_EXTRA}" +RDEPEND="${RDEPEND} ${DEPEND_EXTRA}" +IUSE="${IUSE} debug" +# for this revision only +PDEPEND=">=${PHP_PROVIDER_PKG}-4.3.10" +PROVIDE="${PROVIDE} virtual/httpd-php-${PV}" + +# Add a 'return 0' as we DON'T want the return code checked +pkg_setup() { + use debug && einfo "Installing in SLOT=${SLOT}" + return 0 +} + +src_unpack() { + multiinstwarn + detectapache domsg + php-sapi_src_unpack + if [ "${ARCH}" == "amd64" ] ; then + epatch ${FILESDIR}/mod_php-4.3.4-amd64hack.diff + fi + + # bug fix for security problem - bug #39952 + # second revision as the apache2 stuff was resolved upstream + epatch ${FILESDIR}/mod_php-4.3.5-apache1security.diff + + # stop php from activing the apache config, as we will do that ourselves + for i in configure sapi/apache/config.m4 sapi/apache2filter/config.m4 sapi/apache2handler/config.m4; do + sed -i.orig -e 's,-i -a -n php4,-i -n php4,g' $i + done +} + +src_compile() { + # Every Apache2 MPM EXCEPT prefork needs Zend Thread Safety + if [ -n "${USE_APACHE2}" ]; then + APACHE2_MPM="`/usr/sbin/apache2 -l |egrep 'worker|perchild|leader|threadpool|prefork'|cut -d. -f1|sed -e 's/^[[:space:]]*//g;s/[[:space:]]+/ /g;'`" + einfo "Apache2 MPM: ${APACHE2_MPM}" + case "${APACHE2_MPM}" in + *prefork*) ;; + *) myconf="${myconf} --enable-experimental-zts" ; ewarn "Enabling ZTS for Apache2 MPM" ;; + esac; + fi + + #use apache2 \ + myconf="${myconf} --with-apxs${USE_APACHE2}=/usr/sbin/apxs${USE_APACHE2}" + + php-sapi_src_compile +} + + +src_install() { + PHP_INSTALLTARGETS="install" + php-sapi_src_install + einfo "Adding extra symlink to php.ini for Apache${USE_APACHE2}" + dodir /etc/apache${USE_APACHE2}/conf/ + dodir ${PHPINIDIRECTORY} + dosym ${PHPINIDIRECTORY}/${PHPINIFILENAME} /etc/apache${USE_APACHE2}/conf/${PHPINIFILENAME} + + einfo "Cleaning up a little" + rm -rf ${D}/usr/lib/apache${USE_APACHE2}/modules/libphp4.so + einfo "Adding extra symlink to Apache${USE_APACHE2} extramodules for PHP" + dosym /usr/lib/apache${USE_APACHE2}-extramodules ${PHPINIDIRECTORY}/lib + exeinto /usr/lib/apache${USE_APACHE2}-extramodules + einfo "Installing mod_php shared object now" + doexe .libs/libphp4.so + + if [ -n "${USE_APACHE2}" ] ; then + einfo "Installing a Apache2 config for PHP (70_mod_php.conf)" + insinto /etc/apache2/conf/modules.d + doins ${FILESDIR}/70_mod_php.conf + else + einfo "Installing a Apache config for PHP (mod_php.conf)" + insinto /etc/apache/conf/addon-modules + doins ${FILESDIR}/mod_php.conf + dosym ${PHPINIDIRECTORY}/${PHPINIFILENAME} /etc/apache/conf/addon-modules/${PHPINIFILENAME} + fi +} + +apache2msg() { + einfo "Edit /etc/conf.d/apache2 and add \"-D PHP4\" to APACHE2_OPTS" + ewarn "This is a CHANGE from previous behavior, which was \"-D PHP\"" + ewarn "This is for the upcoming PHP5 support. The ebuild will attempt" + ewarn "to make this update between PHP and PHP4 automatically" +} + +multiinstwarn() { + ewarn "Due to some previous bloopers with PHP and slotting, you may have" + ewarn "multiple instances of mod_php installed. Please look at the autoclean" + ewarn "output at the end of the emerge and unmerge all but relevant" + ewarn "instances." +} + +apache2fix() { + if egrep -q -- '-D PHP\>' /etc/conf.d/apache2; then + einfo "Attemping to update /etc/conf.d/apache2 automatically for the PHP/PHP4 change." + local oldfile="/etc/conf.d/apache2.old.`date +%Y%m%d%H%M%S`" + cp /etc/conf.d/apache2 ${oldfile} + sed -re 's,-D PHP\>,-D PHP4,g' ${oldfile} <${oldfile} >/etc/conf.d/apache2 + fi +} + + +pkg_preinst() { + multiinstwarn + [ "${APACHEVER}" -eq '2' ] && apache2fix + php-sapi_pkg_preinst +} + +pkg_postinst() { + php-sapi_pkg_postinst + multiinstwarn + einfo "To have Apache run php programs, please do the following:" + if [ -n "${USE_APACHE2}" ]; then + apache2msg + else + einfo "1. Execute the command:" + einfo " \"ebuild /var/db/pkg/${CATEGORY}/${PF}/${PF}.ebuild config\"" + einfo "2. Edit /etc/conf.d/apache and add \"-D PHP4\" to APACHE_OPTS" + einfo "That will include the php mime types in your configuration" + einfo "automagically and setup Apache to load php when it starts." + fi +} + +pkg_config() { + multiinstwarn + if [ -n "${USE_APACHE2}" ]; then + apache2msg + else + ${ROOT}/usr/sbin/apacheaddmod \ + ${ROOT}/etc/apache/conf/apache.conf \ + extramodules/libphp4.so mod_php4.c php4_module \ + before=perl define=PHP4 addconf=conf/addon-modules/mod_php.conf + :; + fi +} diff --git a/dev-php/mod_php/mod_php-5.0.3.ebuild b/dev-php/mod_php/mod_php-5.0.3.ebuild new file mode 100644 index 000000000000..9e738ffea20e --- /dev/null +++ b/dev-php/mod_php/mod_php-5.0.3.ebuild @@ -0,0 +1,144 @@ +# Copyright 1999-2004 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.ebuild,v 1.1 2004/12/16 06:49:45 robbat2 Exp $ + +IUSE="${IUSE} apache2" + +KEYWORDS="~ia64 ~ppc ~x86 ~ppc64" +PROVIDE="virtual/php-${PV} virtual/httpd-php-${PV}" + +detectapache() { + local domsg= + [ -n "$1" ] && domsg=1 + HAVE_APACHE1= + HAVE_APACHE2= + has_version '=net-www/apache-1*' && HAVE_APACHE1=1 + has_version '=net-www/apache-2*' && HAVE_APACHE2=1 + + [ -n "${HAVE_APACHE1}" ] && APACHEVER=1 + [ -n "${HAVE_APACHE2}" ] && APACHEVER=2 + [ -n "${HAVE_APACHE1}" ] && [ -n "${HAVE_APACHE2}" ] && APACHEVER='both' + + case "${APACHEVER}" in + 1) [ -n "${domsg}" ] && einfo 'Apache1 only detected' ;; + 2) [ -n "${domsg}" ] && einfo 'Apache2 only detected';; + both) + if use apache2; then + [ -n "${domsg}" ] && einfo "Multiple Apache versions detected, using Apache2 (USE=apache2)" + APACHEVER=2 + else + [ -n "${domsg}" ] && einfo 'Multiple Apache versions detected, using Apache1 (USE=-apache2)' + APACHEVER=1 + fi ;; + *) if [ -n "${domsg}" ]; then + MSG="Unknown Apache version!"; eerror $MSG ; die $MSG + else + APACHEVER=0 + fi; ;; + esac +} + +detectapache + +SLOT="${APACHEVER}" +[ "${APACHEVER}" -eq '2' ] && USE_APACHE2='2' || USE_APACHE2='' + +PHPSAPI="apache${APACHEVER}" +MY_P="php-${PV}" + +# BIG FAT WARNING! +# the php eclass requires the PHPSAPI setting! +# In this case the PHPSAPI setting is dependant on the detectapache function +# above this point as well! +inherit php5-sapi eutils + +DESCRIPTION="Apache module for PHP 5" + +# provides all base PHP extras (eg PEAR, extension building stuff) +DEPEND_EXTRA=">=${PHP_PROVIDER_PKG}-5.0.3 + >=net-www/apache-1.3.26-r2 + apache2? ( >=net-www/apache-2.0.50 ) + || ( >=net-www/apache-1.3.26-r2 >=net-www/apache-2.0.50 )" +DEPEND="${DEPEND} ${DEPEND_EXTRA}" +RDEPEND="${RDEPEND} ${DEPEND_EXTRA}" +IUSE="${IUSE} debug" + +# Add a 'return 0' as we DON'T want the return code checked +pkg_setup() { + use debug && einfo "Installing in SLOT=${SLOT}" + return 0 +} + +src_unpack() { + detectapache domsg + + php5-sapi_src_unpack +} + +src_compile() { + # Every Apache2 MPM EXCEPT prefork needs Zend Thread Safety + if [ -n "${USE_APACHE2}" ]; then + APACHE2_MPM="`/usr/sbin/apache2 -l |egrep 'worker|perchild|leader|threadpool|prefork'|cut -d. -f1|sed -e 's/^[[:space:]]*//g;s/[[:space:]]+/ /g;'`" + einfo "Apache2 MPM: ${APACHE2_MPM}" + case "${APACHE2_MPM}" in + *prefork*) ;; + *) my_conf="${my_conf} --enable-experimental-zts" ; ewarn "Enabling ZTS for Apache2 MPM" ;; + esac; + fi + + #use apache2 \ + my_conf="${my_conf} --with-apxs${USE_APACHE2}=/usr/sbin/apxs${USE_APACHE2}" + + php5-sapi_src_compile +} + + +src_install() { + PHP_INSTALLTARGETS="install" + php5-sapi_src_install + + einfo "Adding extra symlink to Apache${USE_APACHE2} extramodules for PHP" + dosym /usr/lib/apache${USE_APACHE2}-extramodules ${PHP_INI_DIR}/lib + + if [ -n "${USE_APACHE2}" ] ; then + einfo "Installing a Apache2 config for PHP (70_mod_php5.conf)" + insinto /etc/apache2/conf/modules.d + doins ${FILESDIR}/70_mod_php5.conf + else + einfo "Installing a Apache config for PHP (mod_php5.conf)" + insinto /etc/apache/conf/addon-modules + doins ${FILESDIR}/mod_php5.conf + dosym ${PHP_INI_DIR}/${PHP_INI_FILE} /etc/apache/conf/addon-modules/${PHP_INI_FILE} + fi +} + +apache2msg() { + einfo "Edit /etc/conf.d/apache2 and add \"-D PHP5\" to APACHE2_OPTS" + ewarn "This is a change from the old \"-D PHP4\"!" +} + +pkg_postinst() { + einfo "To have Apache run php programs, please do the following:" + if [ -n "${USE_APACHE2}" ]; then + apache2msg + else + einfo "1. Execute the command:" + einfo " \"ebuild /var/db/pkg/${CATEGORY}/${PF}/${PF}.ebuild config\"" + einfo "2. Edit /etc/conf.d/apache and add \"-D PHP5\" to APACHE_OPTS" + einfo "That will include the php mime types in your configuration" + einfo "automagically and setup Apache to load php when it starts." + ewarn "This is a change from the old \"-D PHP4\"!" + fi +} + +pkg_config() { + if [ -n "${USE_APACHE2}" ]; then + apache2msg + else + ${ROOT}/usr/sbin/apacheaddmod \ + ${ROOT}/etc/apache/conf/apache.conf \ + extramodules/libphp5.so mod_php5.c php5_module \ + before=perl define=PHP5 addconf=conf/addon-modules/mod_php.conf + :; + fi +} diff --git a/dev-php/php-cgi/ChangeLog b/dev-php/php-cgi/ChangeLog index 995d47b12225..46712603e395 100644 --- a/dev-php/php-cgi/ChangeLog +++ b/dev-php/php-cgi/ChangeLog @@ -1,6 +1,13 @@ # ChangeLog for dev-php/php-cgi # Copyright 2000-2004 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-php/php-cgi/ChangeLog,v 1.43 2004/11/07 08:00:33 corsair Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-php/php-cgi/ChangeLog,v 1.44 2004/12/16 06:46:47 robbat2 Exp $ + +*php-cgi-4.3.10 (15 Dec 2004) +*php-cgi-5.0.3 (15 Dec 2004) + + 15 Dec 2004; Robin H. Johnson +php-cgi-4.3.10.ebuild, + +php-cgi-5.0.3.ebuild: + New version, solves bugs #73698, 73525, 72752, 72735. 07 Nov 2004; Markus Rothe php-cgi-5.0.2.ebuild: Marked ~ppc64 diff --git a/dev-php/php-cgi/Manifest b/dev-php/php-cgi/Manifest index 757f94c31546..f4bcbb068d21 100644 --- a/dev-php/php-cgi/Manifest +++ b/dev-php/php-cgi/Manifest @@ -1,24 +1,28 @@ -MD5 4022e22ee556b9482758922cddc82a22 ChangeLog 5907 -MD5 38fe937e954ab7109395cefa86fcd2d4 metadata.xml 384 MD5 ca42c18e46b70937fe8c3ff46ec89dc2 php-cgi-4.3.8-r1.ebuild 771 MD5 a673bafe30cbf7e555363d4c6a136081 php-cgi-4.3.8.ebuild 752 -MD5 97e002bcf522c1fb90a38b7708789ce3 php-cgi-4.3.9-r1.ebuild 813 -MD5 28661c422a37c7eb23140532a3d84ab6 php-cgi-4.3.9.ebuild 795 -MD5 6069f9c2784adf67f7fb2ed0e860ca0d php-cgi-4.3.9_rc1-r1.ebuild 886 +MD5 dffa69fb33eb0cadc0ba2d01e178dda8 php-cgi-5.0.1.ebuild 895 MD5 3411777bc579d53726a119e9bcd58c0c php-cgi-4.3.9_rc1.ebuild 866 +MD5 7ed4415bf033ce8e8f75347c7601cdc9 php-cgi-5.0.3.ebuild 926 MD5 dea7eefba04e3e8d7fa6dcb9f01bd95a php-cgi-5.0.0-r1.ebuild 898 MD5 ff8d280e1df6a129bc07898d5acbb1c0 php-cgi-5.0.0.ebuild 751 -MD5 dffa69fb33eb0cadc0ba2d01e178dda8 php-cgi-5.0.1.ebuild 895 +MD5 28661c422a37c7eb23140532a3d84ab6 php-cgi-4.3.9.ebuild 795 +MD5 8cfb5f1d002517f56fc3420761f9d104 php-cgi-4.3.10.ebuild 814 +MD5 97e002bcf522c1fb90a38b7708789ce3 php-cgi-4.3.9-r1.ebuild 813 MD5 ad706bf1cfd99db6f3c56df52111feff php-cgi-5.0.2.ebuild 910 +MD5 6069f9c2784adf67f7fb2ed0e860ca0d php-cgi-4.3.9_rc1-r1.ebuild 886 +MD5 4022e22ee556b9482758922cddc82a22 ChangeLog 5907 +MD5 38fe937e954ab7109395cefa86fcd2d4 metadata.xml 384 +MD5 11f305b98b753ee023da8503a360762a files/digest-php-cgi-5.0.0-r1 63 +MD5 286ce4ea00fde75122c14fd35c3d4672 files/digest-php-cgi-4.3.9_rc1 208 MD5 390a659097a43447e44ab5bdd59378b5 files/digest-php-cgi-4.3.8 282 -MD5 390a659097a43447e44ab5bdd59378b5 files/digest-php-cgi-4.3.8-r1 282 MD5 aeed7aba3334e2f1437aa1ef48d850e8 files/digest-php-cgi-4.3.9 205 -MD5 aeed7aba3334e2f1437aa1ef48d850e8 files/digest-php-cgi-4.3.9-r1 205 -MD5 286ce4ea00fde75122c14fd35c3d4672 files/digest-php-cgi-4.3.9_rc1 208 -MD5 286ce4ea00fde75122c14fd35c3d4672 files/digest-php-cgi-4.3.9_rc1-r1 208 MD5 11f305b98b753ee023da8503a360762a files/digest-php-cgi-5.0.0 63 -MD5 11f305b98b753ee023da8503a360762a files/digest-php-cgi-5.0.0-r1 63 MD5 14d868f33e29b3c9a70b118e9da58dd0 files/digest-php-cgi-5.0.1 63 MD5 4792b645fe6b66cd3f1b1ec88d4d20e8 files/digest-php-cgi-5.0.2 63 +MD5 89a3a3b437e24b7ccc044376843d8446 files/digest-php-cgi-5.0.3 63 +MD5 286ce4ea00fde75122c14fd35c3d4672 files/digest-php-cgi-4.3.9_rc1-r1 208 +MD5 390a659097a43447e44ab5bdd59378b5 files/digest-php-cgi-4.3.8-r1 282 +MD5 aeed7aba3334e2f1437aa1ef48d850e8 files/digest-php-cgi-4.3.9-r1 205 MD5 cd07c33356df77acd61cd300f2869d19 files/php-5.0.0-httpauthfix.patch 518 +MD5 0b0247c6314c5f7d6685268262edfd24 files/digest-php-cgi-4.3.10 206 MD5 273799e60d5a41a1e6f5ac53781a152f files/php5_soap_persistence_session.diff 1976 diff --git a/dev-php/php-cgi/files/digest-php-cgi-4.3.10 b/dev-php/php-cgi/files/digest-php-cgi-4.3.10 new file mode 100644 index 000000000000..1cab79adb8b6 --- /dev/null +++ b/dev-php/php-cgi/files/digest-php-cgi-4.3.10 @@ -0,0 +1,3 @@ +MD5 7e56824dae9679c59a8234eb848aa542 php-4.3.10.tar.bz2 4026148 +MD5 912ff94309b762563d0542db5187315f php-4.3.2-fopen-url-secure.patch 416 +MD5 fbb6b365f4c0263b1dfd498aef092a77 php-4.3.6-includepath.diff 285 diff --git a/dev-php/php-cgi/files/digest-php-cgi-5.0.3 b/dev-php/php-cgi/files/digest-php-cgi-5.0.3 new file mode 100644 index 000000000000..eb20872d0cc2 --- /dev/null +++ b/dev-php/php-cgi/files/digest-php-cgi-5.0.3 @@ -0,0 +1 @@ +MD5 fd26455febdddee0977ce226b9108d9c php-5.0.3.tar.bz2 4607759 diff --git a/dev-php/php-cgi/php-cgi-4.3.10.ebuild b/dev-php/php-cgi/php-cgi-4.3.10.ebuild new file mode 100644 index 000000000000..67b3b2bc73d0 --- /dev/null +++ b/dev-php/php-cgi/php-cgi-4.3.10.ebuild @@ -0,0 +1,38 @@ +# Copyright 1999-2004 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/dev-php/php-cgi/php-cgi-4.3.10.ebuild,v 1.1 2004/12/16 06:46:47 robbat2 Exp $ + +PHPSAPI="cgi" +inherit php-sapi eutils + +DESCRIPTION="PHP CGI" +SLOT="0" +KEYWORDS="x86 ~sparc ~alpha ~hppa ~ppc ~ia64" + +# for this revision only +PDEPEND=">=${PHP_PROVIDER_PKG}-4.3.10" +PROVIDE="${PROVIDE} virtual/httpd-php-${PV}" + +src_compile() { + # CLI needed to build stuff + myconf="${myconf} \ + --enable-cgi \ + --enable-cli \ + --enable-fastcgi" + + php-sapi_src_compile +} + +src_install() { + PHP_INSTALLTARGETS="install" + php-sapi_src_install + + rm -f ${D}/usr/bin/php + # rename binary + newbin ${S}/sapi/cgi/php php-cgi +} + +pkg_postinst() { + php-sapi_pkg_postinst + einfo "This is a CGI only build." +} diff --git a/dev-php/php-cgi/php-cgi-5.0.3.ebuild b/dev-php/php-cgi/php-cgi-5.0.3.ebuild new file mode 100644 index 000000000000..f5348ac7fe8b --- /dev/null +++ b/dev-php/php-cgi/php-cgi-5.0.3.ebuild @@ -0,0 +1,43 @@ +# Copyright 1999-2004 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/dev-php/php-cgi/php-cgi-5.0.3.ebuild,v 1.1 2004/12/16 06:46:47 robbat2 Exp $ + +PHPSAPI="cgi" +MY_P="php-${PV}" + +inherit php5-sapi eutils + +DESCRIPTION="PHP CGI" +SLOT="0" +KEYWORDS="~ia64 ~ppc ~x86 ~ppc64" + +# provides all base PHP extras (eg PEAR, extension building stuff) +DEPEND_PHP=">=${PHP_PROVIDER_PKG}-5.0.3" +DEPEND="${DEPEND} ${DEPEND_PHP}" +RDEPEND="${RDEPEND} ${DEPEND_PHP}" + +PROVIDE="virtual/php-${PV} virtual/httpd-php-${PV}" + +src_compile() { + # CLI needed to build stuff + my_conf="${my_conf} \ + --enable-cgi \ + --enable-cli \ + --enable-fastcgi" + + php5-sapi_src_compile +} + + +src_install() { + PHP_INSTALLTARGETS="install" + php5-sapi_src_install + + rm -f ${D}/usr/bin/php + # rename binary + newbin ${S}/sapi/cgi/php php-cgi +} + +pkg_postinst() { + einfo "This is a CGI only build." +} diff --git a/dev-php/php/ChangeLog b/dev-php/php/ChangeLog index c799f340c90f..bdc5ba7887af 100644 --- a/dev-php/php/ChangeLog +++ b/dev-php/php/ChangeLog @@ -1,6 +1,13 @@ # ChangeLog for dev-php/php # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-php/php/ChangeLog,v 1.131 2004/11/22 01:38:02 eradicator Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-php/php/ChangeLog,v 1.132 2004/12/16 06:45:44 robbat2 Exp $ + +*php-4.3.10 (15 Dec 2004) +*php-5.0.3 (15 Dec 2004) + + 15 Dec 2004; Robin H. Johnson +php-4.3.10.ebuild, + +php-5.0.3.ebuild: + New version, solves bugs #73698, 73525, 72752, 72735. 21 Nov 2004; Jeremy Huddleston php-5.0.2-r1.ebuild: diff --git a/dev-php/php/Manifest b/dev-php/php/Manifest index 8bc4755e778c..0a160caa8e8c 100644 --- a/dev-php/php/Manifest +++ b/dev-php/php/Manifest @@ -1,31 +1,25 @@ ------BEGIN PGP SIGNED MESSAGE----- -Hash: SHA1 - -MD5 2f6cfc9a623ff03ca36534d43b3a0f95 ChangeLog 18248 -MD5 38fe937e954ab7109395cefa86fcd2d4 metadata.xml 384 -MD5 159ad5dc930e19ed38c8377ef7a8eb06 php-4.3.9_rc1.ebuild 1137 -MD5 abf5f97a49422c509b77b8077d714153 php-5.0.0-r1.ebuild 540 +MD5 7efc53f2d831c9205887379e0f79aed5 php-4.3.10.ebuild 1077 MD5 0413eca1cec9d3896cfe3634fd3e6806 php-5.0.1.ebuild 540 -MD5 7efc53f2d831c9205887379e0f79aed5 php-4.3.9.ebuild 1077 -MD5 66457079ee99ec81625f60af44bcda9c php-5.0.2.ebuild 558 +MD5 4a2d4a8397c2514cec55a8df4f62a778 php-5.0.3.ebuild 600 MD5 4a2d4a8397c2514cec55a8df4f62a778 php-5.0.2-r1.ebuild 600 MD5 48aa6f4b37fb2c3cc4fa6ad0527f4378 php-5.0.0.ebuild 521 +MD5 7efc53f2d831c9205887379e0f79aed5 php-4.3.9.ebuild 1077 +MD5 159ad5dc930e19ed38c8377ef7a8eb06 php-4.3.9_rc1.ebuild 1137 +MD5 66457079ee99ec81625f60af44bcda9c php-5.0.2.ebuild 558 +MD5 2f6cfc9a623ff03ca36534d43b3a0f95 ChangeLog 18248 +MD5 38fe937e954ab7109395cefa86fcd2d4 metadata.xml 384 +MD5 abf5f97a49422c509b77b8077d714153 php-5.0.0-r1.ebuild 540 MD5 43e57e69f231376d10554cf9874e8d5d php-4.3.8.ebuild 1071 +MD5 7515e9b1dc298a0fb1c12d35a58c265d files/php-4.3.4-amd64hack.diff 1028 MD5 3d9b5ebf0a273b87c7a9355fa0d0676d files/digest-php-4.3.9_rc1 134 -MD5 11f305b98b753ee023da8503a360762a files/digest-php-5.0.0-r1 63 -MD5 14d868f33e29b3c9a70b118e9da58dd0 files/digest-php-5.0.1 63 MD5 cd07c33356df77acd61cd300f2869d19 files/php-5.0.0-httpauthfix.patch 518 -MD5 b4787473c5b65d10113edd1635711e08 files/digest-php-4.3.9 131 -MD5 4792b645fe6b66cd3f1b1ec88d4d20e8 files/digest-php-5.0.2 63 -MD5 273799e60d5a41a1e6f5ac53781a152f files/php5_soap_persistence_session.diff 1976 +MD5 11f305b98b753ee023da8503a360762a files/digest-php-5.0.0-r1 63 MD5 4792b645fe6b66cd3f1b1ec88d4d20e8 files/digest-php-5.0.2-r1 63 -MD5 7515e9b1dc298a0fb1c12d35a58c265d files/php-4.3.4-amd64hack.diff 1028 -MD5 11f305b98b753ee023da8503a360762a files/digest-php-5.0.0 63 +MD5 273799e60d5a41a1e6f5ac53781a152f files/php5_soap_persistence_session.diff 1976 MD5 ae48d9701424c6ba150e00304b5d84b1 files/digest-php-4.3.8 208 ------BEGIN PGP SIGNATURE----- -Version: GnuPG v1.2.6 (GNU/Linux) - -iD8DBQFBoUN3ArHZZzCEUG0RAmR0AJ9dxABqLYdG65otqh4togypvLi5ngCdHSTF -yYnmiodDrZr+vQ44Y6o6FcU= -=7vBm ------END PGP SIGNATURE----- +MD5 b4787473c5b65d10113edd1635711e08 files/digest-php-4.3.9 131 +MD5 11f305b98b753ee023da8503a360762a files/digest-php-5.0.0 63 +MD5 14d868f33e29b3c9a70b118e9da58dd0 files/digest-php-5.0.1 63 +MD5 4792b645fe6b66cd3f1b1ec88d4d20e8 files/digest-php-5.0.2 63 +MD5 89a3a3b437e24b7ccc044376843d8446 files/digest-php-5.0.3 63 +MD5 541741db181f5a324ab6061ffd2ac424 files/digest-php-4.3.10 132 diff --git a/dev-php/php/files/digest-php-4.3.10 b/dev-php/php/files/digest-php-4.3.10 new file mode 100644 index 000000000000..3a29eb41ca6e --- /dev/null +++ b/dev-php/php/files/digest-php-4.3.10 @@ -0,0 +1,2 @@ +MD5 7e56824dae9679c59a8234eb848aa542 php-4.3.10.tar.bz2 4026148 +MD5 fbb6b365f4c0263b1dfd498aef092a77 php-4.3.6-includepath.diff 285 diff --git a/dev-php/php/files/digest-php-5.0.3 b/dev-php/php/files/digest-php-5.0.3 new file mode 100644 index 000000000000..eb20872d0cc2 --- /dev/null +++ b/dev-php/php/files/digest-php-5.0.3 @@ -0,0 +1 @@ +MD5 fd26455febdddee0977ce226b9108d9c php-5.0.3.tar.bz2 4607759 diff --git a/dev-php/php/php-4.3.10.ebuild b/dev-php/php/php-4.3.10.ebuild new file mode 100644 index 000000000000..1dfc67002ed3 --- /dev/null +++ b/dev-php/php/php-4.3.10.ebuild @@ -0,0 +1,44 @@ +# Copyright 1999-2004 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/dev-php/php/php-4.3.10.ebuild,v 1.1 2004/12/16 06:45:44 robbat2 Exp $ + +PHPSAPI="cli" +inherit php-sapi eutils + +DESCRIPTION="PHP Shell Interpreter" +SLOT="0" +KEYWORDS="x86 ~ppc ~sparc ~alpha ~hppa ~amd64 ~ia64 ~s390 ~ppc64 ~mips" +IUSE="" + +src_unpack() { + php-sapi_src_unpack + [ "${ARCH}" == "amd64" ] && epatch ${FILESDIR}/php-4.3.4-amd64hack.diff +} + +src_compile() { + myconf="${myconf} \ + --disable-cgi \ + --enable-cli" + + php-sapi_src_compile +} + + +src_install() { + PHP_INSTALLTARGETS="install" + php-sapi_src_install + + einfo "Installing manpage" + doman sapi/cli/php.1 +} + +pkg_postinst() { + php-sapi_pkg_postinst + einfo "This is a CLI only build." + einfo "You cannot use it on a webserver." + + if [ -f "${ROOT}/root/.pearrc" -a "`md5sum ${ROOT}/root/.pearrc`" = "f0243f51b2457bc545158cf066e4e7a2 ${ROOT}/root/.pearrc" ]; then + einfo "Cleaning up an old PEAR install glitch" + mv ${ROOT}/root/.pearrc ${ROOT}/root/.pearrc.`date +%Y%m%d%H%M%S` + fi +} diff --git a/dev-php/php/php-5.0.3.ebuild b/dev-php/php/php-5.0.3.ebuild new file mode 100644 index 000000000000..bd9b35686fa6 --- /dev/null +++ b/dev-php/php/php-5.0.3.ebuild @@ -0,0 +1,23 @@ +# Copyright 1999-2004 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/dev-php/php/php-5.0.3.ebuild,v 1.1 2004/12/16 06:45:44 robbat2 Exp $ + +PHPSAPI="cli" +MY_P="${PN}-${PV}" +inherit php5-sapi eutils + +DESCRIPTION="PHP Shell Interpreter" +LICENSE="PHP" +KEYWORDS="~arm ~hppa ~ia64 ~ppc ~x86 ~ppc64" +DEPEND="$DEPEND" +RDEPEND="$RDEPEND" +PROVIDE="virtual/php-${PV}" +SLOT="0" + +# PHP_INSTALLTARGETS="${PHP_INSTALLTARGETS} install-cli" + +src_compile () { + my_conf="--disable-cgi --enable-cli --enable-embed" + + php5-sapi_src_compile +} -- cgit v1.2.3-65-gdbad