From 6c78de0edede968caaa9b527796d6572e3221f23 Mon Sep 17 00:00:00 2001 From: Stuart Herbert Date: Sun, 4 Sep 2005 17:37:14 +0000 Subject: [PATCH] Removed obsolete versions Package-Manager: portage-2.0.51.22-r2 --- dev-php/PEAR-PEAR/Manifest | 14 +-- dev-php/mod_php/ChangeLog | 6 +- dev-php/mod_php/Manifest | 10 +- dev-php/mod_php/files/5.0.4/70_mod_php5.conf | 20 ---- dev-php/mod_php/files/70_mod_php5.conf | 19 ---- dev-php/mod_php/files/digest-mod_php-5.0.4 | 2 - .../files/digest-mod_php-5.1.0_beta-r2 | 1 - dev-php/mod_php/files/php5-prefork.patch | 26 ----- .../files/php5_soap_persistence_session.diff | 35 ------- dev-php/mod_php/mod_php-5.0.4.ebuild | 96 ------------------ dev-php/mod_php/mod_php-5.1.0_beta-r2.ebuild | 97 ------------------- 11 files changed, 9 insertions(+), 317 deletions(-) delete mode 100644 dev-php/mod_php/files/5.0.4/70_mod_php5.conf delete mode 100644 dev-php/mod_php/files/70_mod_php5.conf delete mode 100644 dev-php/mod_php/files/digest-mod_php-5.0.4 delete mode 100644 dev-php/mod_php/files/digest-mod_php-5.1.0_beta-r2 delete mode 100644 dev-php/mod_php/files/php5-prefork.patch delete mode 100644 dev-php/mod_php/files/php5_soap_persistence_session.diff delete mode 100644 dev-php/mod_php/mod_php-5.0.4.ebuild delete mode 100644 dev-php/mod_php/mod_php-5.1.0_beta-r2.ebuild diff --git a/dev-php/PEAR-PEAR/Manifest b/dev-php/PEAR-PEAR/Manifest index bc90d0a98385..c209b8f845fd 100644 --- a/dev-php/PEAR-PEAR/Manifest +++ b/dev-php/PEAR-PEAR/Manifest @@ -1,16 +1,8 @@ ------BEGIN PGP SIGNED MESSAGE----- -Hash: SHA1 - +MD5 f167bc0fb84071fbecf3e595d381f66c ChangeLog 3001 MD5 7e92e897d5dd12b435216d3ec6f31cbb PEAR-PEAR-1.3.5-r1.ebuild 3753 MD5 e68f890941cc02efec6b8f2235bf8919 PEAR-PEAR-1.3.5.ebuild 470 -MD5 52ef2abdab301a8e68ed0afe0c9d5aa4 ChangeLog 2840 MD5 34b376f52ca199fffb4e52b83169574a metadata.xml 156 +MD5 8a4411b810886b41c9600772c38997d4 PEAR-PEAR-1.3.6.ebuild 4021 MD5 3554c88b634f100ef42729557e042fea files/digest-PEAR-PEAR-1.3.5 59 MD5 46061bca70e685875cd072b811107a83 files/digest-PEAR-PEAR-1.3.5-r1 248 ------BEGIN PGP SIGNATURE----- -Version: GnuPG v1.4.1 (GNU/Linux) - -iD8DBQFC11DRaGfFFLhbXWkRAgsEAJ4nmsNLBT+VvCRg9nfbsXflbgqGHgCeLCIF -Y8QvMW65ELVFgjnqyM6edXw= -=q5+B ------END PGP SIGNATURE----- +MD5 40d581b70213127824825738217f0b74 files/digest-PEAR-PEAR-1.3.6 250 diff --git a/dev-php/mod_php/ChangeLog b/dev-php/mod_php/ChangeLog index 95c672aee146..4bedefe973a1 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.263 2005/08/25 12:31:35 stuart Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-php/mod_php/ChangeLog,v 1.264 2005/09/04 17:37:14 stuart Exp $ + + 04 Sep 2005; Stuart Herbert -mod_php-5.0.4.ebuild, + -mod_php-5.1.0_beta-r2.ebuild: + Removed obsolete version 25 Aug 2005; Stuart Herbert mod_php-4.4.0-r1.ebuild, mod_php-4.4.0.ebuild: diff --git a/dev-php/mod_php/Manifest b/dev-php/mod_php/Manifest index b8560b9b3b40..015eb83c91bd 100644 --- a/dev-php/mod_php/Manifest +++ b/dev-php/mod_php/Manifest @@ -1,26 +1,18 @@ -MD5 00b0ff0113f973acc6ad0b7ddfb00979 ChangeLog 45335 +MD5 1dcbd7b4be71bd0b18216ded4c07a103 ChangeLog 45469 MD5 38fe937e954ab7109395cefa86fcd2d4 metadata.xml 384 -MD5 e01a616646006d75956f46179304c854 mod_php-5.0.4.ebuild 2416 MD5 e6721e08724c94791badf2dbdd34bc40 mod_php-4.4.0-r1.ebuild 6368 MD5 3c4b36a601b9a55e19407336c098374c mod_php-4.4.0.ebuild 6143 -MD5 74e788ea170a50549906a9e3919033b5 mod_php-5.1.0_beta-r2.ebuild 2422 MD5 ba40dfc456334836c25b00860748fdbd mod_php-4.3.11.ebuild 6196 -MD5 80c45eef4f54629e893249f869cff5c6 files/70_mod_php5.conf 484 MD5 79ed63479c494aeb2ed0bc7f5c059fb9 files/70_mod_php.conf 1022 -MD5 34c8c0361c81f5aedd386d228ccfe728 files/digest-mod_php-5.1.0_beta-r2 65 MD5 9b7f8c71395e9ac97dc87a48c9e4770d files/digest-mod_php-4.4.0 285 MD5 9b7f8c71395e9ac97dc87a48c9e4770d files/digest-mod_php-4.4.0-r1 285 MD5 7515e9b1dc298a0fb1c12d35a58c265d files/mod_php-4.3.4-amd64hack.diff 1028 MD5 3bf664b414787f8f3c1dcbda5750aef4 files/mod_php-4.3.5-apache1security.diff 425 MD5 cceddd5c262e0ffef31d45b7da269851 files/mod_php.conf 148 MD5 ad986b02a371b2fea3b4ae5060c9dc81 files/stdint.diff 358 -MD5 273799e60d5a41a1e6f5ac53781a152f files/php5_soap_persistence_session.diff 1976 -MD5 058042718bc876bf27ab902673919ca9 files/php5-prefork.patch 850 MD5 cc21a816357d93a1d31cd44f861183c7 files/digest-mod_php-4.3.11 287 -MD5 74a728966bc5ec6d37ad89f4182ee135 files/digest-mod_php-5.0.4 143 MD5 07529a6c32d73282c53d2936ed8ea9bd files/with-iodbc.diff 444 MD5 cdec3284251432935f950c2d15a405b7 files/php-4.3.11-flash.patch 694 MD5 b2aa5952d5c805b3e57a5a6bf0f0b8d0 files/php-4.3.11-gmp.patch 925 MD5 158cb07377a3e2a0028947b0aeb505cb files/4.3.10-r1/70_mod_php.conf 1017 MD5 2dfe55aa49dbca0c3316e859f8bebcb1 files/4.3.11-r2/70_mod_php.conf 1125 -MD5 60cfe0c621237790195bafe595ddcbee files/5.0.4/70_mod_php5.conf 536 diff --git a/dev-php/mod_php/files/5.0.4/70_mod_php5.conf b/dev-php/mod_php/files/5.0.4/70_mod_php5.conf deleted file mode 100644 index d8cfa377aee7..000000000000 --- a/dev-php/mod_php/files/5.0.4/70_mod_php5.conf +++ /dev/null @@ -1,20 +0,0 @@ -# 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 - - - AddDirectoryIndex index.php index.phtml index.php5 - diff --git a/dev-php/mod_php/files/70_mod_php5.conf b/dev-php/mod_php/files/70_mod_php5.conf deleted file mode 100644 index 37a8e41c88a7..000000000000 --- a/dev-php/mod_php/files/70_mod_php5.conf +++ /dev/null @@ -1,19 +0,0 @@ -# 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/files/digest-mod_php-5.0.4 b/dev-php/mod_php/files/digest-mod_php-5.0.4 deleted file mode 100644 index 0c63f459d7d7..000000000000 --- a/dev-php/mod_php/files/digest-mod_php-5.0.4 +++ /dev/null @@ -1,2 +0,0 @@ -MD5 fb1aac107870f897d26563a9cc5053c0 php-5.0.4.tar.bz2 4731383 -MD5 13d1cec199f3144f9715194a59db3a8f hardening-patch-5.0.4-0.3.2.patch.gz 78117 diff --git a/dev-php/mod_php/files/digest-mod_php-5.1.0_beta-r2 b/dev-php/mod_php/files/digest-mod_php-5.1.0_beta-r2 deleted file mode 100644 index 36de97e6a7c9..000000000000 --- a/dev-php/mod_php/files/digest-mod_php-5.1.0_beta-r2 +++ /dev/null @@ -1 +0,0 @@ -MD5 06a6f86743b5fd13cf6c95a8ddb1deac php-5.1.0b3.tar.bz2 5938988 diff --git a/dev-php/mod_php/files/php5-prefork.patch b/dev-php/mod_php/files/php5-prefork.patch deleted file mode 100644 index 135579c33d82..000000000000 --- a/dev-php/mod_php/files/php5-prefork.patch +++ /dev/null @@ -1,26 +0,0 @@ -diff -u --recursive php-5.0.4-orig/sapi/apache2filter/config.m4 php-5.0.4/sapi/apache2filter/config.m4 ---- php-5.0.4-orig/sapi/apache2filter/config.m4 2005-03-13 20:30:44.767051120 +0000 -+++ php-5.0.4/sapi/apache2filter/config.m4 2005-03-13 20:32:01.999310032 +0000 -@@ -115,9 +115,6 @@ - ;; - esac - -- if test "$APXS_MPM" != "prefork"; then -- PHP_BUILD_THREAD_SAFE -- fi - AC_MSG_RESULT(yes) - - PHP_SUBST(APXS) -diff -u --recursive php-5.0.4-orig/sapi/apache2handler/config.m4 php-5.0.4/sapi/apache2handler/config.m4 ---- php-5.0.4-orig/sapi/apache2handler/config.m4 2005-03-13 20:30:44.771050512 +0000 -+++ php-5.0.4/sapi/apache2handler/config.m4 2005-03-13 20:31:50.106118072 +0000 -@@ -114,9 +114,6 @@ - ;; - esac - -- if test "$APXS_MPM" != "prefork"; then -- PHP_BUILD_THREAD_SAFE -- fi - AC_MSG_RESULT(yes) - - PHP_SUBST(APXS) diff --git a/dev-php/mod_php/files/php5_soap_persistence_session.diff b/dev-php/mod_php/files/php5_soap_persistence_session.diff deleted file mode 100644 index 626ac67f9081..000000000000 --- a/dev-php/mod_php/files/php5_soap_persistence_session.diff +++ /dev/null @@ -1,35 +0,0 @@ -diff -ruN php-5.0.0RC3.orig/ext/soap/soap.c php-5.0.0RC3/ext/soap/soap.c ---- php-5.0.0RC3.orig/ext/soap/soap.c 2004-06-22 19:35:59.801348936 +0300 -+++ php-5.0.0RC3/ext/soap/soap.c 2004-06-29 13:39:00.506820928 +0300 -@@ -1341,16 +1341,21 @@ - soap_obj = NULL; - #if HAVE_PHP_SESSION - /* If persistent then set soap_obj from from the previous created session (if available) */ -+ char soapname[32+sizeof("_bogus_session_name")]; //Now we use max 32 chars from class name, must be overwriten with dynamic allocation with exact length!! - if (service->soap_class.persistance == SOAP_PERSISTENCE_SESSION) { - zval **tmp_soap; - -+ bzero(soapname,32+sizeof("_bogus_session_name")); -+ strncpy(soapname,service->soap_class.ce->name,32); -+ strcat(soapname,"_bogus_session_name"); -+ - if (PS(session_status) != php_session_active && - PS(session_status) != php_session_disabled) { - php_session_start(TSRMLS_C); - } - - /* Find the soap object and assign */ -- if (zend_hash_find(Z_ARRVAL_P(PS(http_session_vars)), "_bogus_session_name", sizeof("_bogus_session_name"), (void **) &tmp_soap) == SUCCESS && -+ if (zend_hash_find(Z_ARRVAL_P(PS(http_session_vars)), soapname, sizeof(soapname), (void **) &tmp_soap) == SUCCESS && - Z_TYPE_PP(tmp_soap) == IS_OBJECT && - Z_OBJCE_PP(tmp_soap) == service->soap_class.ce) { - soap_obj = *tmp_soap; -@@ -1432,7 +1437,7 @@ - /* If session then update session hash with new object */ - if (service->soap_class.persistance == SOAP_PERSISTENCE_SESSION) { - zval **tmp_soap_pp; -- if (zend_hash_update(Z_ARRVAL_P(PS(http_session_vars)), "_bogus_session_name", sizeof("_bogus_session_name"), &tmp_soap, sizeof(zval *), (void **)&tmp_soap_pp) == SUCCESS) { -+ if (zend_hash_update(Z_ARRVAL_P(PS(http_session_vars)), soapname, sizeof(soapname), &tmp_soap, sizeof(zval *), (void **)&tmp_soap_pp) == SUCCESS) { - soap_obj = *tmp_soap_pp; - } - } else { diff --git a/dev-php/mod_php/mod_php-5.0.4.ebuild b/dev-php/mod_php/mod_php-5.0.4.ebuild deleted file mode 100644 index 3246b14e395a..000000000000 --- a/dev-php/mod_php/mod_php-5.0.4.ebuild +++ /dev/null @@ -1,96 +0,0 @@ -# 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.4.ebuild,v 1.9 2005/08/16 04:07:44 vapier Exp $ - -IUSE="apache2" - -# this duplicates the code from depend.apache.eclass, but it's the -# only way to do this here - -if useq apache2 ; then - APACHE_VERSION=2 -else - APACHE_VERSION=1 -fi - -KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~s390 ~x86" -PROVIDE="virtual/httpd-php" - -SLOT="${APACHE_VERSION}" - -PHPSAPI="apache${APACHE_VERSION}" -MY_PHP_P="php-${PV}" -PHP_S="${WORKDIR}/php-${PV}" -PHP_PACKAGE=1 - -# BIG FAT WARNING! -# the php eclass requires the PHPSAPI setting! -inherit eutils php5-sapi-r2 apache-module - -need_apache - -DESCRIPTION="Apache module for PHP 5" - -pkg_setup() { - - # the list of safe MPM's may need revising - if ! useq threads ; then - APACHE2_SAFE_MPMS="prefork" - else - APACHE2_SAFE_MPMS="event metuxmpm peruser worker threadpool" - fi - - apache-module_pkg_setup - php5-sapi-r2_pkg_setup -} - -src_unpack() { - php5-sapi-r2_src_unpack - - # if we're not using threads, we need to force them to be switched - # off by patching php's configure script - cd ${S} - if ! useq threads ; then - epatch ${FILESDIR}/php5-prefork.patch || die "Unable to patch for prefork support" - einfo "Rebuilding configure script" - WANT_AUTOCONF=2.5 \ - autoconf -W no-cross || die "Unable to regenerate configure script" - fi - - ######################################################################### - # DO NOT ADD PATCHES HERE UNLESS THEY ARE UNIQUE TO MOD_PHP - # - # Please add your patches to the eclass, where they belong ;-) - # - # Best regards, - # Stu - ######################################################################### -} - -src_compile() { - if [ "${APACHE_VERSION}" = "2" ]; then - if useq threads ; then - my_conf="${my_conf} --enable-experimental-zts" - ewarn "Enabling ZTS for Apache2 MPM" - fi - fi - - my_conf="${my_conf} --with-apxs${USE_APACHE2}=/usr/sbin/apxs${USE_APACHE2}" - - php5-sapi-r2_src_compile -} - -src_install() { - PHP_INSTALLTARGETS="install" - php5-sapi-r2_src_install - - if [ -n "${USE_APACHE2}" ] ; then - einfo "Installing a Apache2 config for PHP (70_mod_php5.conf)" - insinto ${APACHE_MODULES_CONFDIR} - doins "${FILESDIR}/5.0.4/70_mod_php5.conf" - else - einfo "Installing a Apache config for PHP (mod_php5.conf)" - insinto ${APACHE_MODULES_CONFDIR} - doins ${FILESDIR}/mod_php5.conf - fi -} diff --git a/dev-php/mod_php/mod_php-5.1.0_beta-r2.ebuild b/dev-php/mod_php/mod_php-5.1.0_beta-r2.ebuild deleted file mode 100644 index db880803d479..000000000000 --- a/dev-php/mod_php/mod_php-5.1.0_beta-r2.ebuild +++ /dev/null @@ -1,97 +0,0 @@ -# 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.1.0_beta-r2.ebuild,v 1.2 2005/07/16 15:23:54 swegener Exp $ - -IUSE="apache2" - -# this duplicates the code from depend.apache.eclass, but it's the -# only way to do this here - -if useq apache2 ; then - APACHE_VERSION=2 -else - APACHE_VERSION=1 -fi - -KEYWORDS="~x86 ~amd64 ~ppc64" -PROVIDE="virtual/httpd-php" - -SLOT="${APACHE_VERSION}" - -PHPSAPI="apache${APACHE_VERSION}" -MY_PVR="5.1.0b3" -MY_PHP_P="php-${MY_PVR}" -PHP_S="${WORKDIR}/php-${MY_PVR}" -PHP_PACKAGE=1 - -# BIG FAT WARNING! -# the php eclass requires the PHPSAPI setting! -inherit eutils php5-sapi-r3 apache-module - -need_apache - -DESCRIPTION="Apache module for PHP 5" - -pkg_setup() { - - # the list of safe MPM's may need revising - if ! useq threads ; then - APACHE2_SAFE_MPMS="prefork" - else - APACHE2_SAFE_MPMS="event metuxmpm peruser worker threadpool" - fi - - apache-module_pkg_setup - php5-sapi-r3_pkg_setup -} - -src_unpack() { - php5-sapi-r3_src_unpack - - # if we're not using threads, we need to force them to be switched - # off by patching php's configure script - cd ${S} - if ! useq threads ; then - epatch ${FILESDIR}/php5-prefork.patch || die "Unable to patch for prefork support" - einfo "Rebuilding configure script" - WANT_AUTOCONF=2.5 \ - autoconf -W no-cross || die "Unable to regenerate configure script" - fi - - ######################################################################### - # DO NOT ADD PATCHES HERE UNLESS THEY ARE UNIQUE TO MOD_PHP - # - # Please add your patches to the eclass, where they belong ;-) - # - # Best regards, - # Stu - ######################################################################### -} - -src_compile() { - if [ "${APACHE_VERSION}" = "2" ]; then - if useq threads ; then - my_conf="${my_conf} --enable-experimental-zts" - ewarn "Enabling ZTS for Apache2 MPM" - fi - fi - - my_conf="${my_conf} --with-apxs${USE_APACHE2}=/usr/sbin/apxs${USE_APACHE2}" - - php5-sapi-r3_src_compile -} - -src_install() { - PHP_INSTALLTARGETS="install" - php5-sapi-r3_src_install - - if [ -n "${USE_APACHE2}" ] ; then - einfo "Installing a Apache2 config for PHP (70_mod_php5.conf)" - insinto ${APACHE_MODULES_CONFDIR} - doins "${FILESDIR}/5.0.4/70_mod_php5.conf" - else - einfo "Installing a Apache config for PHP (mod_php5.conf)" - insinto ${APACHE_MODULES_CONFDIR} - doins ${FILESDIR}/mod_php5.conf - fi -} -- 2.26.2