diff options
Diffstat (limited to 'dev-php/mod_php')
55 files changed, 0 insertions, 7075 deletions
diff --git a/dev-php/mod_php/ChangeLog b/dev-php/mod_php/ChangeLog deleted file mode 100644 index 2d12fc6c9f70..000000000000 --- a/dev-php/mod_php/ChangeLog +++ /dev/null @@ -1,1384 +0,0 @@ -# ChangeLog for dev-php/mod_php -# Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-php/mod_php/ChangeLog,v 1.294 2006/02/04 17:40:18 agriffis Exp $ - - 04 Feb 2006; Aron Griffis <agriffis@gentoo.org> mod_php-4.4.0-r9.ebuild: - Mark 4.4.0-r9 stable on ia64 - - 12 Nov 2005; Brent Baude <ranger@gentoo.org> mod_php-4.3.11-r4.ebuild, - mod_php-4.4.0-r8.ebuild, mod_php-4.4.0-r9.ebuild: - Marking mod_php-4.4.0-r9 && mod_php-4.4.0-r8 && mod_php-4.3.11-r4 ppc64 - stable per 111032 - - 06 Nov 2005; Luca Longinotti <chtekk@gentoo.org> - files/php4.3.11-pcre-security.patch, files/php4.4.0-pcre-security.patch: - Fix PHP branding. - - 06 Nov 2005; Simon Stelling <blubb@gentoo.org> mod_php-4.3.11-r4.ebuild, - mod_php-4.4.0-r8.ebuild, mod_php-4.4.0-r9.ebuild: - stable on amd64 wrt bug 111032 - - 04 Nov 2005; Fernando J. Pereda <ferdy@gentoo.org> - mod_php-4.4.0-r8.ebuild, mod_php-4.4.0-r9.ebuild: - stable on alpha wrt bug #111032 - - 04 Nov 2005; Mark Loeser <halcy0n@gentoo.org> mod_php-4.3.11-r4.ebuild, - mod_php-4.4.0-r8.ebuild, mod_php-4.4.0-r9.ebuild: - Stable on x86; bug #111032 - - 04 Nov 2005; Fernando J. Pereda <ferdy@gentoo.org> - mod_php-4.3.11-r4.ebuild: - stable on alpha wrt bug #111032 - - 04 Nov 2005; Michael Hanselmann <hansmi@gentoo.org> - mod_php-4.3.11-r4.ebuild, mod_php-4.4.0-r8.ebuild, - mod_php-4.4.0-r9.ebuild: - Stable on hppa, ppc. See bug #111032. - - 04 Nov 2005; Gustavo Zacarias <gustavoz@gentoo.org> - mod_php-4.3.11-r4.ebuild, mod_php-4.4.0-r8.ebuild, - mod_php-4.4.0-r9.ebuild: - Stable on sparc wrt #111032 - - 04 Nov 2005; Luca Longinotti <chtekk@gentoo.org> - files/php4.3.11-session_save_path-segf.patch, - files/php4.4.0-session_save_path-segf.patch: - Fix bug in Apache2 SAPI. - -*mod_php-4.4.0-r9 (04 Nov 2005) -*mod_php-4.4.0-r8 (04 Nov 2005) -*mod_php-4.3.11-r4 (04 Nov 2005) - - 04 Nov 2005; Luca Longinotti <chtekk@gentoo.org> - +mod_php-4.3.11-r4.ebuild, +mod_php-4.4.0-r8.ebuild, - +mod_php-4.4.0-r9.ebuild: - Revbump to fix http://bugs.php.net/bug.php?id=35067. - - 04 Nov 2005; Luca Longinotti <chtekk@gentoo.org> - files/php4.3.11-globals_overwrite.patch, - files/php4.4.0-globals_overwrite.patch: - Fix for http://bugs.php.net/bug.php?id=35067. - - 04 Nov 2005; Mark Loeser <halcy0n@gentoo.org> mod_php-4.3.11-r3.ebuild, - mod_php-4.4.0-r6.ebuild, mod_php-4.4.0-r7.ebuild: - Stable on x86; bug #111032 - - 03 Nov 2005; Michael Hanselmann <hansmi@gentoo.org> - mod_php-4.3.11-r3.ebuild, mod_php-4.4.0-r6.ebuild: - Stable on hppa, ppc. See bug #111032. - -*mod_php-4.4.0-r7 (02 Nov 2005) -*mod_php-4.4.0-r6 (02 Nov 2005) -*mod_php-4.3.11-r3 (02 Nov 2005) - - 02 Nov 2005; Luca Longinotti <chtekk@gentoo.org> - +files/php4.3.11-curl_safemode.patch, - +files/php4.3.11-globals_overwrite.patch, - +files/php4.3.11-phpinfo_xss.patch, +files/php4.4.0-curl_safemode.patch, - +files/php4.4.0-globals_overwrite.patch, - +files/php4.4.0-phpinfo_xss.patch, -mod_php-4.3.11-r2.ebuild, - +mod_php-4.3.11-r3.ebuild, -mod_php-4.4.0-r4.ebuild, - -mod_php-4.4.0-r5.ebuild, +mod_php-4.4.0-r6.ebuild, - +mod_php-4.4.0-r7.ebuild: - Security-update: fix bugs #111032, #111015, #111011 and bug #111014. - -*mod_php-4.4.0-r5 (29 Oct 2005) -*mod_php-4.4.0-r4 (29 Oct 2005) - - 29 Oct 2005; Luca Longinotti <chtekk@gentoo.org> - +files/php4.3.11-fopen_wrappers.patch, - +files/php4.3.11-gd_safe_mode.patch, - +files/php4.3.11-pspell-ext-segf.patch, - +files/php4.3.11-session_save_path-segf.patch, - +files/php4.4.0-fopen_wrappers.patch, +files/php4.4.0-gd_safe_mode.patch, - +files/php4.4.0-pspell-ext-segf.patch, - +files/php4.4.0-session_save_path-segf.patch, -files/stdint.diff, - -files/with-iodbc.diff, mod_php-4.3.11.ebuild, mod_php-4.3.11-r1.ebuild, - +mod_php-4.3.11-r2.ebuild, mod_php-4.4.0.ebuild, mod_php-4.4.0-r1.ebuild, - mod_php-4.4.0-r2.ebuild, mod_php-4.4.0-r3.ebuild, - +mod_php-4.4.0-r4.ebuild, +mod_php-4.4.0-r5.ebuild: - Old-style PHP update: change URI of a mirror, remove two unused patches and - fix bugs #99312, #109669, #102943, #107602, #109482. - - 07 Oct 2005; Gustavo Zacarias <gustavoz@gentoo.org> - mod_php-4.4.0-r3.ebuild: - Stable on sparc - - 02 Oct 2005; Aron Griffis <agriffis@gentoo.org> mod_php-4.4.0-r3.ebuild: - Mark 4.4.0-r3 stable on alpha - - 02 Oct 2005; Aron Griffis <agriffis@gentoo.org> mod_php-4.4.0-r3.ebuild: - Mark 4.4.0-r3 stable on ia64 - - 01 Oct 2005; Brian Harring <ferringb@gentoo.org> mod_php-4.3.11-r1.ebuild, - mod_php-4.3.11.ebuild, mod_php-4.4.0-r1.ebuild, mod_php-4.4.0-r2.ebuild, - mod_php-4.4.0-r3.ebuild, mod_php-4.4.0.ebuild: - Adjusted the has_version hack so these ebuilds are still usable under upcoming - portage release. - - Do not duplicate the has_version trick in the tree, lest QA beats you to a pulp. - This code has an extremely short life span, it won't work under the next - major portage version; further it *is* a kludge and cannot be implemented - anywhere else in the tree without asking portage devs and QA (they'll - tell you no, FYI). - - 27 Sep 2005; Jason Wever <weeve@gentoo.org> mod_php-4.3.11-r1.ebuild, - mod_php-4.4.0-r2.ebuild: - Stable on SPARC wrt security bug #102373. - - 21 Sep 2005; Fernando J. Pereda <ferdy@gentoo.org> - mod_php-4.4.0-r2.ebuild: - stable on alpha wrt bug #102373 - - 21 Sep 2005; Fernando J. Pereda <ferdy@gentoo.org> - mod_php-4.3.11-r1.ebuild, mod_php-4.4.0-r3.ebuild: - stable on alpha wrt bug #102373 - - 21 Sep 2005; Michael Hanselmann <hansmi@gentoo.org> - mod_php-4.4.0-r3.ebuild: - Stable on hppa. - - 21 Sep 2005; Benedikt Boehm <hollow@gentoo.org> - +files/4.4.0-a1/70_mod_php.conf, +files/4.4.0-a2/70_mod_php.conf, - mod_php-4.4.0-r3.ebuild: - fix support for Apache1 - - 19 Sep 2005; Michael Hanselmann <hansmi@gentoo.org> - mod_php-4.3.11-r1.ebuild, mod_php-4.4.0-r2.ebuild, - mod_php-4.4.0-r3.ebuild: - Stable on hppa and ppc. - - 19 Sep 2005; Markus Rothe <corsair@gentoo.org> mod_php-4.3.11-r1.ebuild, - mod_php-4.4.0-r2.ebuild, mod_php-4.4.0-r3.ebuild: - Stable on ppc64 (bug #102373) - - 19 Sep 2005; Marcus D. Hanwell <cryos@gentoo.org> - mod_php-4.3.11-r1.ebuild, mod_php-4.4.0-r2.ebuild, - mod_php-4.4.0-r3.ebuild: - Stable on amd64, bug 102373. - - 19 Sep 2005; Seemant Kulleen <seemant@gentoo.org> mod_php-4.4.0-r3.ebuild: - stable marking for sec. fix -- at CHTEKK's request - -*mod_php-4.4.0-r3 (18 Sep 2005) -*mod_php-4.4.0-r2 (18 Sep 2005) - - 18 Sep 2005; Benedikt Boehm <hollow@gentoo.org> - +files/php4.3.11-pcre-security.patch, +files/php4.4.0-imap-symlink.diff, - +files/php4.3.11-imap-symlink.diff, +files/php4.4.0-pcre-security.patch, - +mod_php-4.3.11-r1.ebuild, +mod_php-4.4.0-r2.ebuild, - +mod_php-4.4.0-r3.ebuild: - Fix security issue in PHP 4.3.11 and 4.4.0, bug #102373, Fix sandbox issue - in PHP 4.3.11 and 4.4.0, bug #105351 - - 04 Sep 2005; Stuart Herbert <stuart@gentoo.org> -mod_php-5.0.4.ebuild, - -mod_php-5.1.0_beta-r2.ebuild: - Removed obsolete version - - 25 Aug 2005; Stuart Herbert <stuart@gentoo.org> mod_php-4.4.0-r1.ebuild, - mod_php-4.4.0.ebuild: - Fix for incorrect SRC_URI_BASE in ebuilds; fixes bug 102965 - - 26 Jul 2005; Stuart Herbert <stuart@gentoo.org> mod_php-5.0.4.ebuild: - Added ~ppc - - 24 Jul 2005; Hardave Riar <hardave@gentoo.org> mod_php-4.4.0.ebuild, - mod_php-4.4.0-r1.ebuild: - Stable on mips, bug #97655. Also added back the ~mips keyword that was dropped. - - 14 Jul 2005; Sebastian Bergmann <sebastian@gentoo.org> - files/digest-mod_php-5.1.0_beta-r2, Manifest: - PHP 5.1.0 Beta 3 rerolled. - - 14 Jul 2005; Simon Stelling <blubb@gentoo.org> mod_php-4.4.0.ebuild: - stable on amd64 wrt bug 97655 - - 13 Jul 2005; Bryan Østergaard <kloeri@gentoo.org> mod_php-4.4.0.ebuild: - Stable on alpha + ia64, bug 97655. - -*mod_php-5.1.0_beta-r2 (13 Jul 2005) - - 13 Jul 2005; Sebastian Bergmann <sebastian@gentoo.org> - -mod_php-5.1.0_beta-r1.ebuild, +mod_php-5.1.0_beta-r2.ebuild: - Version bump. - - 12 Jul 2005; Rene Nussbaumer <killerfox@gentoo.org> mod_php-4.4.0.ebuild: - Stable on hppa. bug #97655 - - 12 Jul 2005; Tobias Scherbaum <dertobi123@gentoo.org> - mod_php-4.4.0.ebuild: - ppc stable, #97655 - - 12 Jul 2005; Markus Rothe <corsair@gentoo.org> mod_php-4.4.0.ebuild: - Stable on ppc64 (bug #97655) - - 12 Jul 2005; Gustavo Zacarias <gustavoz@gentoo.org> mod_php-4.4.0.ebuild: - Stable on sparc wrt #97655 - - 12 Jul 2005; Sebastian Bergmann <sebastian@gentoo.org> - mod_php-4.4.0.ebuild, mod_php-4.4.0-r1.ebuild: - Correct DEPEND on PHP CLI binary. Do not build PHP CLI binary. - - 12 Jul 2005; Sebastian Bergmann <sebastian@gentoo.org> - mod_php-4.4.0.ebuild: - Stable on x86 with regard to security bug 97655. - -*mod_php-4.4.0-r1 (12 Jul 2005) - - 12 Jul 2005; Sebastian Bergmann <sebastian@gentoo.org> - mod_php-4.4.0.ebuild, +mod_php-4.4.0-r1.ebuild: - Change mod_php-4.4.0.ebuild to use the old Apache layout, thus allowing it - to become stable. mod_php-4.4.0-r1.ebuild uses the new Apache layout and is - supposed to stay in unstable until the new Apache layout goes into stable. - - 11 Jul 2005; Sebastian Bergmann <sebastian@gentoo.org> - files/digest-mod_php-4.4.0, Manifest: - Update Hardened-PHP digest. - - 11 Jul 2005; Sebastian Bergmann <sebastian@gentoo.org> - -mod_php-4.3.8.ebuild, -mod_php-4.3.9.ebuild, -mod_php-4.3.10.ebuild, - -mod_php-4.3.10-r1.ebuild, -mod_php-4.3.11-r1.ebuild, - -mod_php-4.3.11-r2.ebuild: - Remove old versions. - -*mod_php-4.4.0 (11 Jul 2005) - - 11 Jul 2005; Sebastian Bergmann <sebastian@gentoo.org> - -mod_php-4.4.0_rc2.ebuild, +mod_php-4.4.0.ebuild: - Version bump. - - 10 Jul 2005; Sebastian Bergmann <sebastian@gentoo.org> - files/digest-mod_php-4.3.11, files/digest-mod_php-4.3.11-r1, - files/digest-mod_php-4.3.11-r2, files/digest-mod_php-5.0.4, Manifest: - Update Hardened-PHP digests. - - 08 Jul 2005; Hardave Riar <hardave@gentoo.org> mod_php-4.3.11.ebuild: - Stable on mips. - - 05 Jul 2005; Sebastian Bergmann <sebastian@gentoo.org> - -mod_php-4.3.9_rc1.ebuild: - Pull old RC. - -*mod_php-5.1.0_beta-r1 (05 Jul 2005) - - 05 Jul 2005; Sebastian Bergmann <sebastian@gentoo.org> - +mod_php-5.1.0_beta-r1.ebuild: - Version bump. - -*mod_php-4.4.0_rc2 (01 Jul 2005) - - 01 Jul 2005; Sebastian Bergmann <sebastian@gentoo.org> - -mod_php-4.4.0_rc1.ebuild, +mod_php-4.4.0_rc2.ebuild: - Version bump. - -*mod_php-5.1.0_beta (19 Jun 2005) - - 19 Jun 2005; Stuart Herbert <stuart@gentoo.org> mod_php-5.1.0_beta.ebuild: - Modified to use php5-sapi-r3 eclass; see bug #96479 - - 15 Jun 2005; Sebastian Bergmann <sebastian@gentoo.org> - mod_php-4.4.0_rc1.ebuild: - Patch no longer needed, fixed UPSTREAM. - - 15 Jun 2005; Sebastian Bergmann <sebastian@gentoo.org> - mod_php-4.4.0_rc1.ebuild: - Patch no longer needed, fixed UPSTREAM. - -*mod_php-4.4.0_rc1 (13 Jun 2005) - - 13 Jun 2005; Sebastian Bergmann <sebastian@gentoo.org> - +mod_php-4.4.0_rc1.ebuild: - Version bump. - - 11 Jun 2005; Bryan Østergaard <kloeri@gentoo.org> mod_php-5.0.4.ebuild: - Add ~ia64 and ~alpha keywords. - - 11 Jun 2005; Stuart Herbert <stuart@gentoo.org> : - Added php-5.1.0 beta 1 - - 11 Jun 2005; Stuart Herbert <stuart@gentoo.org> - -files/mod_php-5.0.3-missing-arches.patch, - -files/php-5.0.0-httpauthfix.patch, -files/5.0.2-r1/70_mod_php5.conf, - -mod_php-5.0.0-r1.ebuild, -mod_php-5.0.0.ebuild, -mod_php-5.0.1.ebuild, - -mod_php-5.0.2-r1.ebuild, -mod_php-5.0.2.ebuild, -mod_php-5.0.3-r1.ebuild, - -mod_php-5.0.3-r2.ebuild, -mod_php-5.0.3.ebuild, mod_php-5.0.4.ebuild: - Removed old files & patches - - 31 May 2005; Stuart Herbert <stuart@gentoo.org> +files/with-iodbc.diff: - Added patch to support iodbc database library - - 19 May 2005; Robin H. Johnson <robbat2@gentoo.org> - mod_php-4.3.9_rc1.ebuild, mod_php-4.3.9.ebuild, mod_php-4.3.10.ebuild, - mod_php-4.3.10-r1.ebuild, mod_php-4.3.11.ebuild, mod_php-4.3.11-r1.ebuild, - mod_php-4.3.11-r2.ebuild, mod_php-5.0.0.ebuild, mod_php-5.0.0-r1.ebuild, - mod_php-5.0.1.ebuild, mod_php-5.0.2.ebuild, mod_php-5.0.2-r1.ebuild, - mod_php-5.0.3.ebuild, mod_php-5.0.3-r1.ebuild, mod_php-5.0.3-r2.ebuild, - mod_php-5.0.4.ebuild: - Bug #93028, clean up PROVIDE instances. - - 19 May 2005; Markus Rothe <corsair@gentoo.org> mod_php-5.0.4.ebuild: - Added ~ppc64 to KEYWORDS - - 12 May 2005; Elfyn McBratney <beu@gentoo.org> mod_php-4.3.11-r2.ebuild: - Drop ~mips keyword until net-www/apache-2.0.54-r5 (plus deps) has been - keyworded ~mips. - - 12 May 2005; Elfyn McBratney <beu@gentoo.org> mod_php-4.3.8.ebuild, - mod_php-4.3.9_rc1.ebuild, mod_php-4.3.9.ebuild, mod_php-4.3.10.ebuild, - mod_php-4.3.10-r1.ebuild, mod_php-4.3.11.ebuild, mod_php-4.3.11-r1.ebuild, - mod_php-4.3.11-r2.ebuild: - Update *DEPEND. - - 10 May 2005; Bret Curtis <psi29a@gentoo.org> mod_php-4.3.11-r2.ebuild: - marked for testing, ~mips - - 06 May 2005; Sebastian Bergmann <sebastian@gentoo.org> - +files/php-4.3.11-flash.patch, mod_php-4.3.11.ebuild, - mod_php-4.3.11-r1.ebuild, mod_php-4.3.11-r2.ebuild: - Fix bug #88756. - - 06 May 2005; Sebastian Bergmann <sebastian@gentoo.org> - +files/php-4.3.11-gmp.patch, mod_php-4.3.11.ebuild, - mod_php-4.3.11-r1.ebuild, mod_php-4.3.11-r2.ebuild: - Fix bug #88795. - -*mod_php-5.0.4 (05 May 2005) - - 05 May 2005; Stuart Herbert <stuart@gentoo.org> files/php5-prefork.patch, - +files/5.0.4/70_mod_php5.conf, +mod_php-5.0.4.ebuild: - Version bump; this ebuild ONLY works with the Apache Refresh packages - - 30 Apr 2005; Elfyn McBratney <beu@gentoo.org> - files/4.3.11-r2/70_mod_php.conf: - Fix syntax in files/4.3.11-r2/70_mod_php.conf (arguments must be file names - not extensions). - - 24 Apr 2005; Guy Martin <gmsoft@gentoo.org> mod_php-4.3.11.ebuild: - Stable on hppa. - - 14 Apr 2005; Bryan Østergaard <kloeri@gentoo.org> mod_php-4.3.11.ebuild: - Stable on ia64, bug 87517. - - 14 Apr 2005; Bryan Østergaard <kloeri@gentoo.org> mod_php-4.3.11.ebuild: - Stable on alpha, bug 87517. - - 14 Apr 2005; Gustavo Zacarias <gustavoz@gentoo.org> mod_php-4.3.11.ebuild: - Stable on sparc wrt #88683 - - 14 Apr 2005; Simon Stelling <blubb@gentoo.org> mod_php-4.3.11.ebuild: - stable on amd64 wrt bug 87517 - -*mod_php-4.3.11-r2 (13 Apr 2005) - - 13 Apr 2005; Christian Parpart <trapni@gentoo.org> - +files/4.3.11-r2/70_mod_php.conf, +mod_php-4.3.11-r2.ebuild: - adding missing AddDirectoryIndex directive to config - - 12 Apr 2005; Christian Parpart <trapni@gentoo.org> - mod_php-4.3.10-r1.ebuild, mod_php-4.3.11-r1.ebuild: - completing the mod_php<->apache dependency hell - - 12 Apr 2005; Christian Parpart <trapni@gentoo.org> - mod_php-4.3.11-r1.ebuild: - let mod_php-4.3.11-r1 depend on apache-2.0.52-r3 instead of 2.0.43-r1 since - only 2.0.52-r3 and above contain (and will contain) the new configuration - layout, thus, this should prevent invalid bug reports, too - - 11 Apr 2005; Gustavo Zacarias <gustavoz@gentoo.org> mod_php-4.3.11.ebuild, - mod_php-4.3.11-r1.ebuild: - Sparc fix - - 11 Apr 2005; Michael Hanselmann <hansmi@gentoo.org> mod_php-4.3.11.ebuild: - Stable on ppc. - - 11 Apr 2005; Markus Rothe <corsair@gentoo.org> mod_php-4.3.11.ebuild: - Stable on ppc64 - -*mod_php-4.3.11-r1 (11 Apr 2005) - - 11 Apr 2005; Christian Parpart <trapni@gentoo.org> - +mod_php-4.3.11-r1.ebuild: - bumping 4.3.11-r1 to fit in with apache-2.0.52-r3 and above - -*mod_php-4.3.11 (10 Apr 2005) - - 10 Apr 2005; Stuart Herbert <stuart@gentoo.org> +mod_php-4.3.11.ebuild: - Version bump; see bug #87517 for security-related details - - 10 Apr 2005; Christian Parpart <trapni@gentoo.org> - mod_php-4.3.10-r1.ebuild: - adding already existing keywords back (but into testing) - - 09 Apr 2005; Christian Parpart <trapni@gentoo.org> mod_php-4.3.8.ebuild, - mod_php-4.3.9_rc1.ebuild, mod_php-4.3.9.ebuild, mod_php-4.3.10.ebuild: - let ebuilds block to new apache that are supposed not to comply with new - apache-module eclass style; This is to prevent invalid bug reports. - -*mod_php-5.0.3-r2 (13 Mar 2005) - - 13 Mar 2005; Stuart Herbert <stuart@gentoo.org> +files/php5-prefork.patch, - +mod_php-5.0.3-r2.ebuild: - Updated to work w/ the unstable apache, & to allow mixed php4/php5 - installations - - 06 Mar 2005; Michael Hanselmann <hansmi@gentoo.org> - mod_php-5.0.3-r1.ebuild: - Added to ~ppc. - - 21 Feb 2005; Hardave Riar <hardave@gentoo.org> mod_php-4.3.10.ebuild: - Stable on mips - - 11 Feb 2005; Mike Frysinger <vapier@gentoo.org> - +files/mod_php-5.0.3-missing-arches.patch, mod_php-5.0.3-r1.ebuild, - mod_php-5.0.3.ebuild: - Add fix for ia64/s390. - - 01 Feb 2005; Marcus D. Hanwell <cryos@gentoo.org> mod_php-5.0.3.ebuild: - Marked ~amd64 too, -r1 is currently masked. - - 01 Feb 2005; Marcus D. Hanwell <cryos@gentoo.org> mod_php-5.0.3-r1.ebuild: - Marked ~amd64 as the c-client issues should now be resolved in the latest - c-client/uw-imap ebuilds. - - 25 Jan 2005; Marcus D. Hanwell <cryos@gentoo.org> mod_php-5.0.3-r1.ebuild: - Removing ~amd64 from KEYWORDS until problems with c-client are resolved. - - 23 Jan 2005; Christian Parpart <trapni@gentoo.org> - mod_php-4.3.10-r1.ebuild, mod_php-5.0.3-r1.ebuild: - -m added ~amd64 keywords - - 14 Jan 2005; Christian Parpart <trapni@gentoo.org> - +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 <gmsoft@gentoo.org> mod_php-4.3.10.ebuild: - Stable on hppa. - -*mod_php-5.0.2-r1 (13 Jan 2005) - - 13 Jan 2005; Christian Parpart <trapni@gentoo.org> - +mod_php-4.3.10-r1.ebuild, +mod_php-5.0.2-r1.ebuild, - +mod_php-5.0.3-r1.ebuild: - apache herd package refresh - - 09 Jan 2005; Jason Wever <weeve@gentoo.org> mod_php-5.0.3.ebuild: - Added ~sparc keyword. - - 30 Dec 2004; Ciaran McCreesh <ciaranm@gentoo.org> : - Change encoding to UTF-8 for GLEP 31 compliance - - 18 Dec 2004; Michael Hanselmann <hansmi@gentoo.org> mod_php-4.3.10.ebuild: - Stable on ppc. - - 17 Dec 2004; Bryan Østergaard <kloeri@gentoo.org> mod_php-4.3.10.ebuild: - Stable on alpha, bug 74547. - - 16 Dec 2004; Gustavo Zacarias <gustavoz@gentoo.org> +files/stdint.diff, - mod_php-4.3.10.ebuild: - Stable on sparc wrt #74547, solves #74627 - - 16 Dec 2004; Dylan Carlson <absinthe@gentoo.org> mod_php-4.3.10.ebuild: - Stable on amd64. - - 16 Dec 2004; Markus Rothe <corsair@gentoo.org> mod_php-4.3.10.ebuild: - Stable on ppc64 - -*mod_php-4.3.10 (15 Dec 2004) -*mod_php-5.0.3 (15 Dec 2004) - - 15 Dec 2004; Robin H. Johnson <robbat2@gentoo.org> +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 <eradicator@gentoo.org> - mod_php-5.0.2.ebuild: - Removing amd64 keyword as it's not quite ready yet... - - 07 Nov 2004; Markus Rothe <corsair@gentoo.org> mod_php-5.0.2.ebuild: - Marked ~ppc64 - - 03 Nov 2004; Bret Curtis <psi29a@gentoo.org> mod_php-4.3.9.ebuild: - marked as ~mips for testing - - 26 Oct 2004; Tom Gall <tgall@gentoo.org> mod_php-4.3.9.ebuild: - stable on ppc64, bug #66968 - - 09 Oct 2004; Tom Gall <tgall@gentoo.org> mod_php-4.3.8.ebuild: - stable on ppc64, bug #66752 - - 28 Sep 2004; Robin H. Johnson <robbat2@gentoo.org> mod_php-4.3.9.ebuild: - Stable on x86. - - 27 Sep 2004; Bryan Østergaard,,, <kloeri@gentoo.org> mod_php-4.3.9.ebuild: - Stable on alpha, bug 64223. - - 27 Sep 2004; Gustavo Zacarias <gustavoz@gentoo.org> mod_php-4.3.9.ebuild: - Stable on sparc wrt #64223 - -*mod_php-5.0.2 (24 Sep 2004) - - 24 Sep 2004; Robin H. Johnson <robbat2@gentoo.org> +mod_php-4.3.9.ebuild, - +mod_php-5.0.2.ebuild: - Bug #65180, version bump. - - 14 Sep 2004; Robin H. Johnson <robbat2@gentoo.org> files/70_mod_php.conf, - files/70_mod_php5.conf: - Fix bug #63702, remove the old workaround. - - 12 Sep 2004; Robin H. Johnson <robbat2@gentoo.org> mod_php-5.0.0-r1.ebuild, - mod_php-5.0.0.ebuild, mod_php-5.0.1.ebuild: - Bug #61910 fixed. No version bump. - - 26 Aug 2004; Robin H. Johnson <robbat2@gentoo.org> mod_php-5.0.1.ebuild: - better warning message. - - 14 Aug 2004; David Holm <dholm@gentoo.org> mod_php-5.0.1.ebuild: - Added to ~ppc. - -*mod_php-5.0.1 (13 Aug 2004) - - 13 Aug 2004; Robin H. Johnson <robbat2@gentoo.org> +mod_php-5.0.1.ebuild: - Version bump, many upstream fixes. Bug #60216. - - 13 Aug 2004; Robin H. Johnson <robbat2@gentoo.org> : - update apache depend. - - 12 Aug 2004; Robin H. Johnson <robbat2@gentoo.org> mod_php-5.0.0-r1.ebuild: - Roll out 5.0.0-r1 to ~x86 ONLY. Other interested arches need to keyword the - required dependancies first. Create virtual/httpd-php. - -*mod_php-4.3.9_rc1 (12 Aug 2004) - - 12 Aug 2004; Robin H. Johnson <robbat2@gentoo.org> - +mod_php-4.3.9_rc1.ebuild: - Roll out 4.3.9rc1 in ~arch, to fix 4.3.8 problems. Create virtual/httpd-php. - - 08 Aug 2004; Robin H. Johnson <robbat2@gentoo.org> - +files/php-5.0.0-httpauthfix.patch: - bug #59755. - - 05 Aug 2004; Robin H. Johnson <robbat2@gentoo.org> - -files/mod_php-4.3.4-r3.diff, -mod_php-4.3.4-r4.ebuild, - -mod_php-4.3.5.ebuild, -mod_php-4.3.6-r1.ebuild, -mod_php-4.3.6-r2.ebuild, - -mod_php-4.3.6.ebuild, -mod_php-4.3.6_rc2.ebuild, -mod_php-4.3.7-r1.ebuild, - -mod_php-4.3.7.ebuild, -files/pear_config.diff: - The Great PHP ebuild cleanup. - - 03 Aug 2004; <agriffis@gentoo.org> mod_php-4.3.8.ebuild: - stable on ia64 for bug 56295 - - 29 Jul 2004; Gustavo Zacarias <gustavoz@gentoo.org> mod_php-4.3.8.ebuild: - Stable on hppa - - 22 Jul 2004; Stuart Herbert <stuart@gentoo.org> mod_php-5.0.0.ebuild: - Added missing PROVIDE - - 15 Jul 2004; Bryan Østergaard <kloeri@gentoo.org> mod_php-4.3.8.ebuild: - Stable on alpha, see bug #56985. - - 14 Jul 2004; Robin H. Johnson <robbat2@gentoo.org> mod_php-4.3.8.ebuild: - stable on x86, security. - - 15 Jul 2004; Christian Birchinger <joker@gentoo.org> mod_php-4.3.8.ebuild: - Added sparc stable keyword - - 14 Jul 2004; Luca Barbato <lu_zero@gentoo.org> mod_php-4.3.8.ebuild: - Marked ppc for security reason (bug #56985) - - 14 Jul 2004; Robin H. Johnson <robbat2@gentoo.org> : - add hardendephp support for 4.3.8 - - 14 Jul 2004; Stuart Herbert <stuart@gentoo.org> mod_php-5.0.0.ebuild: - Updated to use PHP 5 final release. - -*mod_php-4.3.8 (13 Jul 2004) - - 13 Jul 2004; Robin H. Johnson <robbat2@gentoo.org> mod_php-4.3.8.ebuild: - new version, security reasons. - -*mod_php-5.0.0 (10 Jul 2004) - - 10 Jul 2004; Stuart Herbert <stuart@gentoo.org> +files/70_mod_php5.conf, - +files/php5_soap_persistence_session.diff, +mod_php-5.0.0.ebuild: - Added ebuild for mod_php5; thanks to nickyk <nickyk@gmx.net> for the SOAP - persistence patch - - 07 Jul 2004; Jason Wever <weeve@gentoo.org> mod_php-4.3.7-r1.ebuild: - Stable on sparc. - - 07 Jul 2004; Bryan Østergaard <kloeri@gentoo.org> mod_php-4.3.7-r1.ebuild: - Stable on alpha. - - 06 Jul 2004; Michael Hanselmann <hansmi@gentoo.org> mod_php-4.3.7-r1.ebuild: - Stable on ppc. - - 04 Jul 2004; Robin H. Johnson <robbat2@gentoo.org> mod_php-4.3.4-r4.ebuild, - mod_php-4.3.5.ebuild, mod_php-4.3.6-r1.ebuild, mod_php-4.3.6-r2.ebuild, - mod_php-4.3.6.ebuild, mod_php-4.3.6_rc2.ebuild, mod_php-4.3.7-r1.ebuild, - mod_php-4.3.7.ebuild: - fix bug #55634. - - 04 Jul 2004; Robin H. Johnson <robbat2@gentoo.org> mod_php-4.3.7-r1.ebuild: - stable on x86. - - 04 Jul 2004; Bryan Østergaard <kloeri@gentoo.org> mod_php-4.3.6-r2.ebuild: - Stable on alpha. - -*mod_php-4.3.7-r1 (27 Jun 2004) - - 27 Jun 2004; Robin H. Johnson <robbat2@gentoo.org> mod_php-4.3.7-r1.ebuild, - files/70_mod_php.conf: - fix bugs 55150, 52165, 52912 and 55129 - - 23 Jun 2004; Stuart Herbert <stuart@gentoo.org> : - Added support for hardenedphp into mod_php 4.3.7 - - 18 Jun 2004; Robin H. Johnson <robbat2@gentoo.org> files/70_mod_php.conf: - fix bug #49020 and bug #54086. - - 11 Jun 2004; Guy Martin <gmsoft@gentoo.org> mod_php-4.3.6-r2.ebuild: - Marked stable on hppa. - - 06 Jun 2004; Aron Griffis <agriffis@gentoo.org> mod_php-4.3.7.ebuild: - Fix use invocation - -*mod_php-4.3.7 (05 Jun 2004) - - 05 Jun 2004; Robin H. Johnson <robbat2@gentoo.org> mod_php-4.3.7.ebuild: - put 4.3.7 in, but it doesn't work yet, so hardmasked - - 03 Jun 2004; Aron Griffis <agriffis@gentoo.org> mod_php-4.3.4-r4.ebuild, - mod_php-4.3.5.ebuild, mod_php-4.3.6-r1.ebuild, mod_php-4.3.6-r2.ebuild, - mod_php-4.3.6.ebuild, mod_php-4.3.6_rc2.ebuild: - Fix use invocation - -*mod_php-4.3.6-r2 (28 May 2004) - - 28 May 2004; Robin H. Johnson <robbat2@gentoo.org> mod_php-4.3.6-r2.ebuild: - fixed bugs 50991, 49420 in php-sapi eclass, so bump ebuilds. - - 18 May 2004; Stuart Herbert <stuart@gentoo.org> : - Added digest for hardened-php patch - - 13 May 2004; Michael McCabe <randy@gentoo.org> mod_php-4.3.6-r1.ebuild: - Added s390 keywords - - 09 May 2004; Jason Wever <weeve@gentoo.org> mod_php-4.3.6-r1.ebuild: - Stable on sparc. - - 04 May 2004; Robin H. Johnson <robbat2@gentoo.org> mod_php-4.3.6-r1.ebuild: - stable on x86 - -*mod_php-4.3.6-r1 (20 Apr 2004) - - 20 Apr 2004; Robin H. Johnson <robbat2@gentoo.org> mod_php-4.3.6-r1.ebuild: - pcre fix bug #47498 - -*mod_php-4.3.6 (16 Apr 2004) - - 16 Apr 2004; Robin H. Johnson <robbat2@gentoo.org> mod_php-4.3.6.ebuild: - new version. - - 14 Apr 2004; Guy Martin <gmsoft@gentoo.org> mod_php-4.3.6_rc2.ebuild: - Marked stable on hppa. - - 13 Apr 2004; Jason Wever <weeve@gentoo.org> mod_php-4.3.6_rc2.ebuild: - Stable on sparc. - - 08 Apr 2004; Stuart Herbert <stuart@gentoo.org> mod_php-4.3.6_rc2.ebuild: - Marked as stable, because 4.3.5 has issues - - 06 Apr 2004; Jon Portnoy <avenj@gentoo.org> mod_php-4.3.6_rc2.ebuild : - Fix typo in epatch statement for amd64, bug #46939 - -*mod_php-4.3.6_rc2 (05 Apr 2004) - - 05 Apr 2004; Robin H. Johnson <robbat2@gentoo.org> mod_php-4.3.6_rc2.ebuild: - bump to new rc as 4.3.5 has issues - - 31 Mar 2004; Robin H. Johnson <robbat2@gentoo.org> mod_php-4.3.2-r1.ebuild, - mod_php-4.3.2-r2.ebuild, mod_php-4.3.2-r3.ebuild, mod_php-4.3.2-r4.ebuild, - mod_php-4.3.2-r5.ebuild, mod_php-4.3.2.ebuild, mod_php-4.3.3-r1.ebuild, - mod_php-4.3.3-r2.ebuild, mod_php-4.3.3-r3.ebuild, mod_php-4.3.3.ebuild, - mod_php-4.3.3_rc3.ebuild, mod_php-4.3.4-r1.ebuild, mod_php-4.3.4-r2.ebuild, - mod_php-4.3.4-r3.ebuild, mod_php-4.3.4-r4.ebuild, mod_php-4.3.4.ebuild, - mod_php-4.3.5.ebuild: - remove all old php ebuilds before 4.3.4-r4. fix bug #46309. - - 31 Mar 2004; Daniel Ahlberg <aliz@gentoo.org> mod_php-4.3.5.ebuild: - Fixed amd64 patch, closing #46260. - - 29 Mar 2004; Robin H. Johnson <robbat2@gentoo.org> mod_php-4.3.5.ebuild: - need a second revision for an apache1 fix - - 29 Mar 2004; Robin H. Johnson <robbat2@gentoo.org> mod_php-4.3.5.ebuild: - fix bug #46048 for new php - -*mod_php-4.3.5 (29 Mar 2004) - - 29 Mar 2004; Stuart Herbert <stuart@gentoo.org> mod_php-4.3.5.ebuild: - Version bump - - 09 Mar 2004; <agriffis@gentoo.org> mod_php-4.3.4-r4.ebuild: - stable on alpha and ia64 - - 16 Feb 2004; Guy Martin <gmsoft@gentoo.org> mod_php-4.3.4-r4.ebuild: - Marked stable on hppa. - - 07 Feb 2004; Christian Birchinger <joker@gentoo.org> - mod_php-4.3.4-r4.ebuild: - Added sparc stable keyword - -*mod_php-4.3.4-r4 (07 Feb 2004) - - 07 Feb 2004; <plasmaroo@gentoo.org> mod_php-4.3.4-r4.ebuild: - Bump and stable on X86 for GLSA 200402-01. - - 06 Feb 2004; Lars Weiler <pylon@gentoo.org> mod_php-4.3.4-r3.ebuild: - stable on ppc - - 05 Feb 2004; Mike Frysinger <vapier@gentoo.org> : - Add amd64 patch #35956 by Ryan C. Gordon. - - 31 Jan 2004; Stuart Herbert <stuart@gentoo.org> files/mod_php-4.3.4-r3.diff: - Additional holes added to the patch - -*mod_php-4.3.4-r3 (31 Jan 2004) - - 31 Jan 2004; Stuart Herbert <stuart@gentoo.org> mod_php-4.3.3-r1.ebuild, - mod_php-4.3.3-r2.ebuild, mod_php-4.3.3-r3.ebuild, mod_php-4.3.4-r1.ebuild, - mod_php-4.3.4-r2.ebuild, mod_php-4.3.4-r3.ebuild, mod_php-4.3.4.ebuild, - files/mod_php-4.3.4-r3.diff: - Removed amd64 from the ARCH list until it passes a 'repoman full' scan. - - 31 Jan 2004; Stuart Herbert <stuart@gentoo.org> mod_php-4.3.4-r3.ebuild, - files/mod_php-4.3.4-r3.diff: - Added patch for bug #39952 - GLSA to follow from plasmaroo - - 24 Jan 2004; <gustavoz@gentoo.org> mod_php-4.3.4-r2.ebuild: - marked stable on sparc - - 12 Jan 2003; Guy Martin <gmsoft@gentoo.org> mod_php-4.3.4-r2.ebuild : - Marked stable on hppa. - - 10 Jan 2004; Robin H. Johnson <robbat2@gentoo.org> mod_php-4.3.4-r2.ebuild: - Undo brad_mssw's broken fixup and fix it properly, it's a bug in portage for - the moment. - - 10 Jan 2004; Brad House <brad_mssw@gentoo.org> mod_php-4.3.4-r2.ebuild: - reverse change made by robbat2, as it messed up stable x86 - - 10 Jan 2004; Aron Griffis <agriffis@gentoo.org> mod_php-4.3.3-r3.ebuild, - mod_php-4.3.4-r2.ebuild: - stable on alpha and ia64 - - 10 Jan 2004; Robin H. Johnson <robbat2@gentoo.org> mod_php-4.3.4-r2.ebuild: - add a little debug data for #37721. - -*mod_php-4.3.4-r2 (07 Jan 2004) - - 07 Jan 2004; Robin H. Johnson <robbat2@gentoo.org> mod_php-4.3.2-r1.ebuild, - mod_php-4.3.2-r2.ebuild, mod_php-4.3.2-r3.ebuild, mod_php-4.3.2-r4.ebuild, - mod_php-4.3.2-r5.ebuild, mod_php-4.3.2.ebuild, mod_php-4.3.3-r1.ebuild, - mod_php-4.3.3-r2.ebuild, mod_php-4.3.3-r3.ebuild, mod_php-4.3.3.ebuild, - mod_php-4.3.4-r1.ebuild, mod_php-4.3.4-r2.ebuild, mod_php-4.3.4.ebuild: - remove ~mips and ~arm KEYWORDS due to lack of support, ready for new repoman. - - 07 Jan 2004; Robin H. Johnson <robbat2@gentoo.org> mod_php-4.3.2-r1.ebuild, - mod_php-4.3.2-r2.ebuild, mod_php-4.3.2-r3.ebuild, mod_php-4.3.2-r4.ebuild, - mod_php-4.3.2-r5.ebuild, mod_php-4.3.2.ebuild, mod_php-4.3.3-r1.ebuild, - mod_php-4.3.3-r2.ebuild, mod_php-4.3.3-r3.ebuild, mod_php-4.3.3.ebuild, - mod_php-4.3.3_rc3.ebuild, mod_php-4.3.4-r1.ebuild: - fix copyright headers and add new mod_php build - - 19 Dec 2003; Guy Martin <gmsoft@gentoo.org> mod_php-4.3.3-r3.ebuild: - Marked stable on hppa. - - 15 Dec 2003; Guy Martin <gmsoft@gentoo.org> mod_php-4.3.3-r1.ebuild: - Marked stable on hppa. - - 23 Nov 2003; Robin H. Johnson <robbat2@gentoo.org> mod_php-4.3.3-r2.ebuild, - mod_php-4.3.3-r3.ebuild, mod_php-4.3.4-r1.ebuild, mod_php-4.3.4.ebuild: - remove obsolete findutils deps - - 23 Nov 2003; Robin H. Johnson <robbat2@gentoo.org> mod_php-4.3.3-r2.ebuild, - mod_php-4.3.3-r3.ebuild, mod_php-4.3.4-r1.ebuild, mod_php-4.3.4.ebuild: - cleanup whitespace - -*mod_php-4.3.4-r1 (16 Nov 2003) - - 16 Nov 2003; Robin H. Johnson <robbat2@gentoo.org> mod_php-4.3.4-r1.ebuild: - add new split-up php - -*mod_php-4.3.4 (07 Nov 2003) - - 07 Nov 2003; Robin H. Johnson <robbat2@gentoo.org> mod_php-4.3.4.ebuild: - bug #32962, new version - - 07 Nov 2003; Robin H. Johnson <robbat2@gentoo.org> mod_php-4.3.3-r3.ebuild: - change postinst comment slightly - - 05 Nov 2003; Christian Birchinger <joker@gentoo.org> - mod_php-4.3.3-r3.ebuild: - Added sparc stable keyword - -*mod_php-4.3.3-r3 (25 Oct 2003) - - 25 Oct 2003; Robin H. Johnson <robbat2@gentoo.org> mod_php-4.3.2-r1.ebuild, - mod_php-4.3.2-r2.ebuild, mod_php-4.3.2-r3.ebuild, mod_php-4.3.2-r4.ebuild, - mod_php-4.3.2-r5.ebuild, mod_php-4.3.2.ebuild, mod_php-4.3.3-r1.ebuild, - mod_php-4.3.3-r2.ebuild, mod_php-4.3.3-r3.ebuild, mod_php-4.3.3.ebuild, - mod_php-4.3.3_rc3.ebuild: - large cleanups of xargs usage per bug #31794, and a bump to force it in with - the new eclass - -*mod_php-4.3.3-r2 (22 Oct 2003) - - 22 Oct 2003; Robin H. Johnson <robbat2@gentoo.org> mod_php-4.3.3-r2.ebuild: - cleanup ebuild and version bump for eclass changes - - 10 Oct 2003; Robin H. Johnson <robbat2@gentoo.org> mod_php-4.3.3-r1.ebuild: - message cleanup thanks to bug #30833 - - 05 Oct 2003; Brad House <brad_mssw@gentoo.org> mod_php-4.3.3-r1.ebuild: - add ~amd64 flag - -*mod_php-4.3.3-r1 (01 Oct 2003) - - 01 Oct 2003; Robin H. Johnson <robbat2@gentoo.org> mod_php-4.3.3-r1.ebuild: - bump rev on ebuild for eclass changes, and move to stable - - 29 Aug 2003; Robin Johnson,,604-339-5621,604-298-8414 <robbat2@gentoo.org> - mod_php-4.3.2-r1.ebuild, mod_php-4.3.2-r2.ebuild, mod_php-4.3.2-r3.ebuild, - mod_php-4.3.2-r4.ebuild, mod_php-4.3.2-r5.ebuild, mod_php-4.3.2.ebuild, - mod_php-4.3.3.ebuild, mod_php-4.3.3_rc3.ebuild: - fix bug #27524, just for good measure, even tho it doesn't affect much - -*mod_php-4.3.3 (28 Aug 2003) - - 28 Aug 2003; Robin H. Johnson <robbat2@gentoo.org> mod_php-4.3.3.ebuild: - version bump - - 20 Aug 2003; Robin H. Johnson <robbat2@gentoo.org> metadata.xml: - add metadata.xml - -*mod_php-4.3.3_rc3 (11 Aug 2003) - - 11 Aug 2003; Robin H. Johnson <robbat2@gentoo.org> mod_php-4.3.3_rc3.ebuild: - add an rc build of php to try and fix #16825 - - 11 Aug 2003; Robin H. Johnson <robbat2@gentoo.org> mod_php-4.3.2-r5.ebuild: - Make mod_php actually depend on apache if it isn't installed... - -*mod_php-4.3.2-r5 (30 Jul 2003) - - 30 Jul 2003; Tal Peer <coredumb@gentoo.org> mod_php-4.3.2-r5.ebuild: - Dropped cjk from IUSE. Now mbstring and mbregex are always enabled. - -*mod_php-4.3.2-r4 (21 Jul 2003) - - 04 Aug 2003; Guy Martin <gmsoft@gentoo.org> mod-php-4.3.2-r4.ebuild : - Marked stable on hppa. - - 22 Jul 2003; Christian Birchinger <joker@gentoo.org> - mod_php-4.3.2-r4.ebuild: - Added sparc stable keyword - - 21 Jul 2003; Robin H. Johnson <robbat2@gentoo.org> mod_php-4.3.2-r4.ebuild, - files/digest-mod_php-4.3.2-r4: - Add in URL fopen security fix. - -*mod_php-4.3.2-r3 (30 Jun 2003) - - 12 Jul 2003; Donny Davies <woodchip@gentoo.org> mod_php-4.3.2-r3.ebuild: - Marked `x86' keyword. - - 1 July 2003; 30 June 2003; Robin H. Johnson <robbat2@gentoo.org> mod_php-4.3.2-r3.ebuild: - Fix a typo in the ebuild sed script that updates the apache[2] config file. - - 1 July 2003; 30 June 2003; Robin H. Johnson <robbat2@gentoo.org> - files/70_mod_php.conf: - Fix typo in Apache2 conf file. - - 30 June 2003; Robin H. Johnson <robbat2@gentoo.org> mod_php-4.3.2-r3.ebuild, - files/digest-mod_php-4.3.2-r3: - Commited new version to ~x86 with hopefully all of the fixes required for - Apache1 and Apache2 required longterm. Uses new PHPSAPI and configuration - style. Apache2 enbling variable has CHANGED to PHP4, this is a breakage - compared to previously. - - 30 June 2003; Robin H. Johnson <robbat2@gentoo.org> mod_php-4.3.2-r1.ebuild, - mod_php-4.3.2-r2.ebuild, mod_php-4.3.2.ebuild, files/70_mod_php.conf: - Updated for new PHPSAPI variable. Moved configuration files to new style - cleanly (/etc/php/${PHPSAPI}-php${PHPMAJORVERSION}/php.ini). - - 24 June 2003; Robin H. Johnson <robbat2@gentoo.org> mod_php-4.2.3-r2.ebuild, - mod_php-4.3.0-r2.ebuild, mod_php-4.3.1-r1.ebuild, mod_php-4.3.1-r2.ebuild, - mod_php-4.3.1-r3.ebuild, mod_php-4.3.1.ebuild, - files/digest-mod_php-4.2.3-r2, files/digest-mod_php-4.3.0-r2, - files/digest-mod_php-4.3.1, files/digest-mod_php-4.3.1-r1, - files/digest-mod_php-4.3.1-r2, files/digest-mod_php-4.3.1-r3: - Removed old ebuilds as per GLSA 200306-02. - -*mod_php-4.3.2-r2 (10 Jun 2003) - - 24 June 2003; Robin H. Johnson <robbat2@gentoo.org> mod_php-4.3.2-r2.ebuild: - Fix bug #23200 - - 21 June 2003; Robin H. Johnson <robbat2@gentoo.org> mod_php-4.3.2-r2.ebuild: - Cleanup some of the magic, hopefully make it work better. - - 12 June 2003; Robin H. Johnson <robbat2@gentoo.org> mod_php-4.3.2-r2.ebuild: - syntax errors are bad. - - 10 June 2003; Robin H. Johnson <robbat2@gentoo.org> mod_php-4.3.2-r2.ebuild: - This is an extension of the fixes in 4.3.2-r1, but I'm uncertain if some of - this magic is valid, so it is in a sepearate ebulid for now. - A special note on the change of behavior depending on the Apache(s) you have installed: - Apache1 ONLY: uses apache1 version - Apache2 ONLY: uses apache2 version (no USE="apache2" needed) - Apache1 AND Apache2: Use apache1 version unless the USE flag is in place. - -*mod_php-4.3.2-r1 (10 Jun 2003) - - 10 June 2003; Robin H. Johnson <robbat2@gentoo.org> mod_php-4.3.2-r1.ebuild: - Try to fix bug #22352. mod_php is now SLOTed by the major version of Apache - that you are building it for. This SHOULD enable you to have mod_php - installed on both at the same time, but is is experimental at this time. - -*mod_php-4.3.2 (31 May 2003) - - 05 June 2003; Robin H. Johnson <robbat2@gentoo.org> mod_php-4.3.2.ebuild: - Fix DEPEND for apache2. This is the ONLY method that works properly with - repoman afaik. - - 31 May 2003; Robin H. Johnson <robbat2@gentoo.org> mod_php-4.3.2.ebuild, - files/digest-mod_php-4.3.2: - Version bump. - BerkDB is disabled due to DB4 issues and changes in PHP 4.3.2 presently. - If you need BerkDB support, please do NOT upgrade at this time. - -*mod_php-4.3.1-r3 (23 Apr 2003) - - 27 May 2003; Paul de Vrieze <pauldv@gentoo.org> mod_php-4.3.1-r3.ebuild: - Fix apache dependency when the apache2 useflag is not set. - - 26 May 2003; Robin H. Johnson <robbat2@gentoo.org> mod_php-4.3.1-r3.ebuild: - Added DB4 fix in eclass. Cleaned up the config section. Fix digest. - Correctly postinst slightly with regards to conf.d/apache* directives. - - 17 May 2003; Robin H. Johnson <robbat2@gentoo.org> files/70_mod_php.conf: - Fixed bug #18445 properly. Apache2 doesn't like shell wildcarding in it's - config files. - - 15 May 2003; Robin H. Johnson <robbat2@gentoo.org> mod_php-4.3.1-r3.ebuild: - Released to all archs on unstable. - - 14 May 2003; Robin H. Johnson <robbat2@gentoo.org> mod_php-4.3.1-r3.ebuild: - Fix symlink for /etc/php4/lib under Apache2. Thanks to Bluesman - <bluesman@byteme.no> on IRC. Fixed ACCEPT_KEYWORDS and RDEPEND. - Ensure ZTS is used for some Apache2 MPMs. - ./files/70_mod_php.conf updated to fix bug #18445 - - 13 May 2003; Robin H. Johnson <robbat2@gentoo.org> mod_php-4.3.1-r3.ebuild: - More cleanups, nearly ready for ~x86. - - 24 Apr 2003; Tal Peer <coredumb@gentoo.org> mod_php-4.3.1-r2.ebuild, - mod_php-4.3.1-r3.ebuild: - Fixed bug #18551 - - 23 Apr 2003; Robin H. Johnson <robbat2@gentoo.org> mod_php-4.3.1-r3.ebuild: - New version utilizing PHP eclass - Masked still, very untested - -*mod_php-4.3.1-r2 (21 Apr 2003) - - 08 May 2003; Todd Heim <heim@gentoo.org> mod_php-4.3.1-r2.ebuild: - Fixed bug #20603, #15622 - - 22 Apr 2003; Todd Heim <heim@gentoo.org> mod_php-4.3.1-r2.ebuild: - Re-added -r2 (Mar 02 copy had been deleted). Fixed world readable files bug by patching pear/PEAR/Config.php (bug# 16325) - -*mod_php-4.3.1-r2 (04 Mar 2003) - - 04 Mar 2003; Troy Dack <tad@gentoo.org. mod_php-4.3.1-r2.ebuild: - Fix to incorrect DEPENDS= entry - -*mod_php-4.3.1-r1 (24 Feb 2003) - - 12 May 2003; Todd Heim <heim@gentoo.org> mod_php-4.3.1-r1.ebuild: - fixed world writable files bug (#20706) - - 08 May 2003; Todd Heim <heim@gentoo.org> mod_php-4.3.1-r1.ebuild: - Fixed bug #20603 - - 17 Mar 2003; Masatomo Nakano <nakano@gentoo.org> mod_php-4.3.1-r1.ebuild, - mod_php-4.3.1.ebuild: - Fixed bug #16910 - - 03 Mar 2003; Seemant Kulleen <seemant@gentoo.org> mod_php-4.3.1-r1.ebuild, - mod_php-4.3.1.ebuild: - qt fixes and spell support added - - 25 Feb 2003; Guy Martin <gmsoft@gentoo.org> mod_php-4.3.1-r1.ebuild : - Added ~hppa to keywords. - - 24 feb 2003; ryan phillips <rphillips@gentoo.org> mod_php-4.3.1-r1.ebuild : - Added logic to install rest of needed files for phpize - Added permission change to /usr/bin/pear to 755 - -*mod_php-4.3.1 (18 Feb 2003) - - 02 June 2003; Robin H. Johnson <robbat2@gentoo.org> mod_php-4.3.1.ebuild: - Improve my java-config again. - - 31 May 2003; Robin H. Johnson <robbat2@gentoo.org> mod_php-4.3.1.ebuild: - Improve the slight java fix with java-config. - - 22 May 2003; Robin H. Johnson <robbat2@gentoo.org> mod_php-4.3.1.ebuild: - Slight fix to the java stuff to forestall problems for the moment. - Bump version requirements on Sabltron for bug #21229. - - 12 May 2003; Todd Heim <heim@gentoo.org> mod_php-4.3.1.ebuild : - fixed world writable files bug (#20706) - - 08 May 2003; Todd Heim <heim@gentoo.org> mod_php-4.3.1.ebuild: - Fixed bug #20603 - - 25 Feb 2003; Guy Martin <gmsoft@gentoo.org> mod_php-4.3.1.ebuild : - Added hppa to keywords. - - 24 Feb 2003; Ryan Phillips <rphillips@gentoo.org> mod_php-4.3.1.ebuild : - removed subshell from ebuild. Fixes #16211 - - 18 Feb 2003; Ryan Phillips <rphillips@gentoo.org> mod_php-4.3.1.ebuild : - Security Fix - -*mod_php-4.3.0-r2 (10 Jan 2003) - - 08 May 2003; Todd Heim <heim@gentoo.org> mod_php-4.3.0-r2.ebuild: - Fixed bug #20603 - - 07 Feb 2003; Ryan Phillips <rphillips@gentoo.org> mod_php-4.3.0-r2.ebuild : - Fix bug #15277, #14067, #14068, #14330, #14364 - - 24 Jan 2003; Ryan Phillips <rphillips@gentoo.org> files/70_mod_php.conf : - added php-source (.phps) support to the available types - - 13 Jan 2003; Ryan Phillips <rphillips@gentoo.org> mod_php-4.3.0-r2.ebuild : - Added Quequero tweaks. Fixes #13721 - - 13 Jan 2003; Daniel Ahlberg <aliz@genoto.org> mod_php-4.3.0-r2.ebuild : - Added ppc and alpha keyword becuse this is a security update. - - 10 Jan 2003; Ryan Phillips <rphillips@gentoo.org> mod_php-4.3.0-r2.ebuild : - Added third party helper scripts to the install. (phpize, php-config, and phpextdist) - Fixes #13525 - -*mod_php-4.3.0-r1 (06 Jan 2003) - - 08 Jan 2003; Ryan Phillips <rphillips@gentoo.org> mod_php-4.3.0-r1.ebuild : - Changed ebuild to reflect truetype use var instead of freetype - - 08 Jan 2003; Ryan Phillips <rphillips@gentoo.org> mod_php-4.3.0-r1.ebuild : - Use internal GD support - - 08 Jan 2003; Ryan Phillips <rphillips@gentoo.org> mod_php-4.3.0-r1.ebuild : - fixed dependencies - - 06 Jan 2003; Ryan Phillips <rphillips@gentoo.org> mod_php-4.3.0-r1.ebuild : - added Roman Weber's patches: - - reverting PEAR patch in /image [DONE] - - added EXIF Handling [DONE] - - Removed register_globals patch (PHP Scipts should now be safe) Bug #10302 [DONE] - - #11714 IMAP thing...already Fixed? [should be DONE] - - -*mod_php-4.3.0 (30 Dec 2002) - - 31 Dec 2002; Ryan Phillips <rphillips@gentoo.org> mod_php-4.3.0.ebuild : - Fixed sandbox violation with snmp - - 30 Dec 2002; Ryan Phillips <rphillips@gentoo.org> : - Tweaked sed... maybe this will fix the sandbox issues - - 30 Dec 2002; Ryan Phillips <rphillips@gentoo.org> : Version bump. - Added sed statement to fix the PEAR installer. - -*mod_php-4.2.3-r2 (13 Dec 2002) - - 25 Mar 2003; Seemant Kulleen <seemant@gentoo.org> mod_php-4.2.3-r2.ebuild: - freetype USE to truetype USE, which ACTUALLY EXISTS, Sheesh - - 27 Dec 2002; Ryan Phillips <rphillips@gentoo.org> : included mbregex in the cjk use var. - - 22 Dec 2002; Donny Davies <woodchip@gentoo.org> mod_php-4.2.3-r2.ebuild : - #12582 fix apache2 DEPEND. - - 16 Dec 2002; Ryan Phillips <rphillips@gentoo.org> mod_php-4.2.3-r2.ebuild : - Unmasked -r2 for production. Should fix many bugs in the bug tracker. - -*mod_php-4.2.3-r2 (13 Dec 2002) - - 15 Dec 2002; Bjoern Brauel <bjb@gentoo.org> mod_php-4.2.3-r2.ebuild : - Add alpha to KEYWORDS - - 13 Dec 2002; Donny Davies <woodchip@gentoo.org> : Added --enable-sockets - and --enable-wddx per received requests; thanks Verwilst and Heiko. - -*mod_php-4.2.3-r1 (10 Dec 2002) - - 10 Dec 2002; Donny Davies <woodchip@gentoo.org> : Added Apache2 support. - Please put 'apache2' in your USE variable, then emerge mod_php. After - it installs, simply edit /etc/conf.d/apache2 and add '-D PHP'. Then - restart apache2. You're done :) - - Autoupdate keywords (12-6-02) - 06 Dec 2002; Rodney Rees <manson@gentoo.org> : changed sparc ~sparc keywords - - 02 Sep 2002; Daniel Robbins <drobbins@gentoo.org> mod_php-4.2.2-r1.ebuild : - rphillips' gmp fix broke the ebuild, fixing... (no rev bump) - - 02 Sep 2002; Brandon Low <lostlogic@gentoo.org> mod_php-4.2.2-r1.ebuild : - Test your ebuilds, you can't just comment in the middle like that, then - the next thing becomes a separate funky command. - -*mod_php-4.2.3 (10 Sep 2002) - - 05 Dec 2002; Ryan Phillips <rphillips@gentoo.org> mod_php-4.2.3.ebuild : - Do not include libpng if pdflib is included. Fixes #5444 - - 19 Nov 2002; Ryan Phillips <rphillips@gentoo.org> mod_php-4.2.3.ebuild : - Tweaked deps... - - 27 Oct 2002; Ryan Phillips <rphillips@gentoo.org> mod_php-4.2.3.ebuild : - Fixed QT dep - - 12 Sep 2002; Ryan Phillips <rphillips@gentoo.org> mod_php-4.2.3.ebuild : - Added xmlrpc to 'xml' use flag. Fixes #7811 - - 10 Sep 2002; Ryan Phillips <rphillips@gentoo.org> mod_php-4.2.3.ebuild : - New version. Fixes #7716 - -*mod_php-4.2.2-r1 (18 Aug 2002) - - 27 Oct 2002; Ryan Phillips <rphillips@gentoo.org> mod_php-4.2.2-r1.ebuild : - Fixed QT dep - - 19 Oct 2002; Ryan Phillips <rphillips@gentoo.org> mod_php-4.2.2-r1.ebuild : - Is pdflib playing nice now? Moved the image formats out of the pdflib - 'if' statement - - 03 Sep 2002; Ryan Phillips <rphillips@gentoo.org> mod_php-4.2.2-r1.ebuild : - Users have had issues compiling php with java support. It works fine - on my two computers. I'm not sure if it is user error or config file - problems. I've disabled it for now. - - 01 Sep 2002; Ryan Phillips <rphillips@gentoo.org> mod_php-4.2.2-r1.ebuild : - Users have had trouble compiling with gmp support... Disabled for now - - 30 Aug 2002; Ryan Phillips <rphillips@gentoo.org> mod_php-4.2.2-r1.ebuild : - Fixed xml dependency bug - - 26 Aug 2002; Donny Davies <woodchip@gentoo.org> mod_php-4.2.2-r1.ebuild : - Clarified/cleaned pkg_postinst, cosmetic-only fix. - - 26 Aug 2002; Ryan Phillips <rphillips@gentoo.org> mod_php-4.2.2-r1.ebuild : - Added support for multibyte strings. Fixes #6747 Submitted by Ryan Shaw - - 18 Aug 2002; Ryan Phillips <rphillips@gentoo.org> mod_php-4.2.2-r1.ebuild : - Should fix pdflib/jpeg/tiff/java bug... #2708 - -*mod_php-4.2.2 (22 Jul 2002) - - 22 Jul 2002; Daniel Ahlberg <aliz@gentoo.org> Security update, no other - changes. - -*mod_php-4.2.1-r5 (12 Jul 2002) - - 26 Aug 2002; Ryan Phillips <rphillips@gentoo.org> Added --enable-exif - - 15 Jul 2002; Owen Stampflee <owen@gentoo.org> Added KEYWORDS="x86 ppc" for - all versions of the mod_php ebuild - - 27 Apr 2002; Ryan Phillips <rphillips@gentoo.org> : There is a compilation - problem with the --with-gettext variable being passed to configure from - within portage. - - 25 Apr 2002; Donny Davies <woodchip@gentoo.org> : Clarify the pkg_postinst() - message. - - 16 Apr 2002; Seemant Kulleen <seemant@gentoo.org> : I caused the gettext bug. - The configure options do not like --with-gettext set. They only like - --without-gettext set. Who knew? Hmm, and I did not edit the ChangeLog for - some reason to say that the mhash and mcrypt flags are encapsulated by the - crypt flag now. - - 16 Jul 2002; Ryan Phillips <rphillips@gentoo.org> mod_php-4.2.1-r5.ebuild : - Added libwww depedency to xml use var - - 16 Jul 2002; Ryan Phillips <rphillips@gentoo.org> mod_php-4.2.1-r5.ebuild : - Now provides virtual support - - 12 Jul 2002; Roman Weber <gentoo@gonzo.ch> mod_php-4.2.1-r5.ebuild : Fixed - compile error with sablotron 0.95 Fixed weird uname bug. (Bug #4913) - -*mod_php-4.2.1-r4 (09 Jul 2002) - - 09 Jul 2002; Roman Weber <gentoo@gonzo.ch> Changed dependency from - >=net-www/apache-1.3.24-r1 to >=net-www/apache-1.3.26-r2 (Apache 1.3.26 - >includes a fix for the "chunked encoding" issue). Closes bug #4677. added - >oci8 use variable to support Oracle databases - -*mod_php-4.2.1-r3 (02 Jul 2002) - - 02 Jul 2002; Owen Stampflee <owen@gentoo.org> Fixed syntax errors in use vars - freetype, jpeg, tiff, png, and gd - -*mod_php-4.2.1-r2 (26 June 2002) - - 26 June 2002; Roman Weber <gentoo@gonzo.ch> mod_php-4.2.1-r2.ebuild : - Added 'use' variables: freetype, jpeg, tiff, png and gd (Bug #3900) - -*mod_php-4.2.1-r1 (17 June 2002) - - 17 June 2002; Roman Weber <gentoo@gonzo.ch> mod_php-4.2.1-r1.ebuild : Fixed - 'use nls' issue. (Bug #2895) - -*php-4.2.1-r1 (21 May 2002) - - 05 June 2002; Ryan Phillips <rphillips@gentoo.org> php-4.2.1-r1.ebuild : - Added support for firebird - - 21 May 2002; Roman Weber <gentoo@gonzo.ch> php-4.2.1-r1.ebuild : Added XSLT - sablotron to XML USE variable. Bug #2863 Fixed symlink to extensions - directory. Bug #2886 - -*php-4.2.1 (17 May 2002) - - 19 May 2002; Ryan Phillips <rphillips@gentoo.org> php-4.2.1.ebuild: Changed - --with-png-dir=/usr/lib \ to --with-png-dir=/usr \ - - 17 May 2002; Roman Weber <gentoo@gonzo.ch> php-4.2.1.ebuild : New release - Fixed flash ming issue. Bug #2707 Fixed mysql issue. Bug #2711 Set - register_globals = On in php.ini. Lower security but more compatibility. See - http://www.php.net/release_4_1_2.php Readded curl/snmp/bz2/ssl. Tnx Todd - Symlinked php.ini to old place. Tnx Todd. Disabled Java in ebuild. I'm not - glad about it but it's imho the only way to fix a nasty bug. Perhaps it will - work with an extra ebuild for the java extension. Bug #2708 - -*php-4.2.0 (12 May 2002) - - 12 May 2002; Ryan Phillips <rphillips@gentoo.org> php-4.2.0.ebuild : - Added a message to warn the user that setting the register_globals - option to off may break compatibility with some scripts. - - 8 May 2002; Ryan Phillips <rphillips@gentoo.org> php-4.2.0.ebuild : - New release - -*php-4.1.2-r9 (5 May 2002) - - 5 May 2002; Ryan Phillips <rphillips@gentoo.org> php-4.1.2-r9.ebuild : - Added support for SSL, snmp, curl, and bzip2 to package. Fixes #2468 - -*php-4.1.2-r8 (28 Apr 2002) - - 27 Apr 2002; Ryan Phillips <rphillips@gentoo.org> php-4.1.2-r7.ebuild : - for some reason --with-gettext doesn't find the libraries it needs. - ./configure --with-gettext from the commandline works fine. reopening - bug report. - -*php-4.1.2-r8 (27 Apr 2002) - - 27 Apr 2002; Ryan Phillips <rphillips@gentoo.org> php-4.1.2-r7.ebuild : - Tweaked ebuild to include --with-gettext support. This fixes #2106, but - does it break anything else? - -*php-4.1.2-r7 (15 Apr 2002) - - 15 Apr 2002; Jared H. Hudson <jhhudso@gentoo.org> php-4.1.2-r7.ebuild : Fixed - php to check for imap with ssl support when compiling the imap extension. Bug - #1254 Fixed bug where php couldn't find path to javac. Bug #1401 Modified the - ebuild so it DEPENDs on net-mail/uw-imap instead of the old virtual/imapUW - -*php-4.1.2-r6 (12 Apr 2002) - - 12 Apr 2002; Spider <spider@gentoo.org> update -r to force rebuild with - updated libpng - -*php-4.1.2-r5 php-4.1.1-r5 (12 Apr 2002) - - 12 Apr 2002; Seemant Kulleen <seemant@gentoo.org> php-4.1.2-r5.ebuild, - php-4.1.1-r5.ebuild : Changed the "gettext" USE flag to "nls" since that is - the same thing. - -*php-4.1.2-r5 (10 Apr 2002) - - 10 Apr 2002; Donny Davies <woodchip@gentoo.org> php-4.1.2-r5.ebuild, - files/mod_php.conf : Added a mod_php.conf file, which installs into the - apache addon-modules config directory. This eliminates the need to "sed" the - apache config file in order to "turn on" the php mime types. Removed some - stale ebuilds/digests. Ooops, round two for today: fix the php.ini location - with a symlink. Keeps things tidy. - -*php-4.1.2-r4 (9 Apr 2002) - - 9 Apr 2002; Donny Davies <woodchip@gentoo.org> : Small updates to fit in with - the reworked apache package. - -*php-4.1.2-r3 (13 Mar 2002) - - 13 Mar 2002; Grant Goodyear <g2boojum@gentoo.org> : - Minor update to fix bug # 1042. - -*php-4.1.2 (28 Feb 2002) - - 28 Feb 2002; Bruce A. Locke <blocke@shivan.org> php-4.1.2.ebuild : - Major security fixes in this version. All php users are urged - to upgrade to this version. - -*php-4.1.1-r5 ( 25 Feb 2002 ) - - 25 Feb 2002; Karl Trygve Kalleberg <karltk@gentoo.org> php-4.1.1-r5.ebuild - Fixed a bug that made compiling with libpng bug out on some - installations. Old revisions removed. - -*php-4.1.1-r4 ( 22 Feb 2002 ) - - 22 Feb 2002; Grant Goodyear <g2boojum@gentoo.org> php-4.1.1-r4.ebuild - Now imap support should work. Building php w/ imap support requires - the uw-imap library and headers (from uw-imap or pine). Annoying - problem that uw-imap or pine needs to be compiled w/ SSL; otherwise - the php build will fail due to header problems. - -*php-4.0.6-r5 ( 18 Feb 2002 ) - - 18 Feb 2002; Karl Trygve Kalleberg <karltk@gentoo.org> php-4.0.6-r4.ebuild - As Java support fails to work with Blackdown, and the fix seems non-trivial, - Java support is removed from PHP 4.0.6 altogether. - Old revisions have been removed. - -*php-4.0.6-r4 ( 12 Feb 2002 ) - - 12 Feb 2002; Karl Trygve Kalleberg <karltk@gentoo.org> php-4.0.6-r4.ebuild - Java support is back. The ebuild also tries harder to follow the style - guide. Old revisions have been removed. - -*php-4.1.1-r3 ( 18 Feb 2002 ) - - 18 Feb 2002; Karl Trygve Kalleberg <karltk@gentoo.org> php-4.1.1-r3.ebuild - Java is still here, but now it actually works with Blackdown as well. - Old revisions have been removed. - -*php-4.1.1-r2 ( 12 Feb 2002 ) - - 12 Feb 2002; Karl Trygve Kalleberg <karltk@gentoo.org> php-4.1.1-r2.ebuild - Java support is back. The ebuild also tries harder to follow the style guide. - Old revisions have been removed. - -*php-4.1.1 (1 Feb 2002) - - 6 Feb 2002; Grant Goodyear <g2boojum@gentoo.org>: - Added a new -r1 revision of the php-4.1.1 ebuild that adds - two new USE variables, mcrypt and mhash. -k diff --git a/dev-php/mod_php/Manifest b/dev-php/mod_php/Manifest deleted file mode 100644 index 731894dbd788..000000000000 --- a/dev-php/mod_php/Manifest +++ /dev/null @@ -1,172 +0,0 @@ ------BEGIN PGP SIGNED MESSAGE----- -Hash: SHA1 - -MD5 6a1eb62a590d19c595b18be1710fa0a7 ChangeLog 52000 -RMD160 55ef40125d8121bd9739104ddb8eb44bde4af778 ChangeLog 52000 -SHA256 5a0f6ee5197c199f304d2da1521a340f8e1d7d8d63128396cb3b8055275285ca ChangeLog 52000 -MD5 158cb07377a3e2a0028947b0aeb505cb files/4.3.10-r1/70_mod_php.conf 1017 -RMD160 fce7c73182779d64bfaec4aaefb3cea6078c9ecf files/4.3.10-r1/70_mod_php.conf 1017 -SHA256 0820615d9f3ef28209e4220b5459167326ea1dff4c0e264c4055a85cc4462a77 files/4.3.10-r1/70_mod_php.conf 1017 -MD5 2dfe55aa49dbca0c3316e859f8bebcb1 files/4.3.11-r2/70_mod_php.conf 1125 -RMD160 5fee58451b3c88cdca303ec37d8960cd223e4323 files/4.3.11-r2/70_mod_php.conf 1125 -SHA256 73b32fa0d639aaf93b3976f880d4f387d9a32ec21761443431e0421043974f57 files/4.3.11-r2/70_mod_php.conf 1125 -MD5 389638f1d46b6c41cd4d87b471572f4b files/4.4.0-a1/70_mod_php.conf 484 -RMD160 a39e519414c7ac3c81198c0447d8466986432c29 files/4.4.0-a1/70_mod_php.conf 484 -SHA256 40f8161df164177b3cb9d285014ed97b000ad85a621a3858539e8ccf959755b1 files/4.4.0-a1/70_mod_php.conf 484 -MD5 ee36e31632adb08b7abf70f78b5b2125 files/4.4.0-a2/70_mod_php.conf 485 -RMD160 6257eff7856e149d18528381a501ab50efed46e1 files/4.4.0-a2/70_mod_php.conf 485 -SHA256 a1fbc68cca42e75620a975fce075038605c1064b44d7205c4b75ff32742ad899 files/4.4.0-a2/70_mod_php.conf 485 -MD5 79ed63479c494aeb2ed0bc7f5c059fb9 files/70_mod_php.conf 1022 -RMD160 33c019f635531d43e98c77e39c5f50335a7e8a9b files/70_mod_php.conf 1022 -SHA256 014710f1e411881a0ddbf4f22340d86c5eefcfda381daf53869848fbffabb467 files/70_mod_php.conf 1022 -MD5 cc21a816357d93a1d31cd44f861183c7 files/digest-mod_php-4.3.11 287 -RMD160 c44e8821590c934637a279ac377f9ea80c7fe6ba files/digest-mod_php-4.3.11 287 -SHA256 09a77226e9400c872f6404b17217ffffffc06e79bc56916a9d5004c2e7705836 files/digest-mod_php-4.3.11 287 -MD5 05df4c881b1833626d9a75a08a0098fd files/digest-mod_php-4.3.11-r1 364 -RMD160 ed1cce916a50e06a17ff021109c0d518d7d07319 files/digest-mod_php-4.3.11-r1 364 -SHA256 df1cb25edc2470e876cc2c4e7d6938660fa2b3f03872e7286f90cb69f5d4946e files/digest-mod_php-4.3.11-r1 364 -MD5 05df4c881b1833626d9a75a08a0098fd files/digest-mod_php-4.3.11-r3 364 -RMD160 ed1cce916a50e06a17ff021109c0d518d7d07319 files/digest-mod_php-4.3.11-r3 364 -SHA256 df1cb25edc2470e876cc2c4e7d6938660fa2b3f03872e7286f90cb69f5d4946e files/digest-mod_php-4.3.11-r3 364 -MD5 05df4c881b1833626d9a75a08a0098fd files/digest-mod_php-4.3.11-r4 364 -RMD160 ed1cce916a50e06a17ff021109c0d518d7d07319 files/digest-mod_php-4.3.11-r4 364 -SHA256 df1cb25edc2470e876cc2c4e7d6938660fa2b3f03872e7286f90cb69f5d4946e files/digest-mod_php-4.3.11-r4 364 -MD5 09d7dee078c684b0de0e4de6209ef634 files/digest-mod_php-4.4.0 285 -RMD160 f39c4c16247a6d72c1f2c09e2b9fb9ef33682d37 files/digest-mod_php-4.4.0 285 -SHA256 ed0c7e3faa5b9188e5c4f51e153acc0d5b8a96638a3866ec9265d90f032d7606 files/digest-mod_php-4.4.0 285 -MD5 09d7dee078c684b0de0e4de6209ef634 files/digest-mod_php-4.4.0-r1 285 -RMD160 f39c4c16247a6d72c1f2c09e2b9fb9ef33682d37 files/digest-mod_php-4.4.0-r1 285 -SHA256 ed0c7e3faa5b9188e5c4f51e153acc0d5b8a96638a3866ec9265d90f032d7606 files/digest-mod_php-4.4.0-r1 285 -MD5 472ce8342d69fdad9d2a642b03b31bac files/digest-mod_php-4.4.0-r2 362 -RMD160 9290514a00fa79874931189768663e107b468f95 files/digest-mod_php-4.4.0-r2 362 -SHA256 70ded7698e7196ad1594a64523f482ae8ebacaa4f7a0230ca9dc7e68183b605a files/digest-mod_php-4.4.0-r2 362 -MD5 472ce8342d69fdad9d2a642b03b31bac files/digest-mod_php-4.4.0-r3 362 -RMD160 9290514a00fa79874931189768663e107b468f95 files/digest-mod_php-4.4.0-r3 362 -SHA256 70ded7698e7196ad1594a64523f482ae8ebacaa4f7a0230ca9dc7e68183b605a files/digest-mod_php-4.4.0-r3 362 -MD5 472ce8342d69fdad9d2a642b03b31bac files/digest-mod_php-4.4.0-r6 362 -RMD160 9290514a00fa79874931189768663e107b468f95 files/digest-mod_php-4.4.0-r6 362 -SHA256 70ded7698e7196ad1594a64523f482ae8ebacaa4f7a0230ca9dc7e68183b605a files/digest-mod_php-4.4.0-r6 362 -MD5 472ce8342d69fdad9d2a642b03b31bac files/digest-mod_php-4.4.0-r7 362 -RMD160 9290514a00fa79874931189768663e107b468f95 files/digest-mod_php-4.4.0-r7 362 -SHA256 70ded7698e7196ad1594a64523f482ae8ebacaa4f7a0230ca9dc7e68183b605a files/digest-mod_php-4.4.0-r7 362 -MD5 472ce8342d69fdad9d2a642b03b31bac files/digest-mod_php-4.4.0-r8 362 -RMD160 9290514a00fa79874931189768663e107b468f95 files/digest-mod_php-4.4.0-r8 362 -SHA256 70ded7698e7196ad1594a64523f482ae8ebacaa4f7a0230ca9dc7e68183b605a files/digest-mod_php-4.4.0-r8 362 -MD5 36132f9337aaa3d0cae9cbd31da27ae5 files/digest-mod_php-4.4.0-r9 562 -RMD160 6aaf0822e897e8e15681e1a56da3900b70e488f2 files/digest-mod_php-4.4.0-r9 562 -SHA256 ccf9b8b00a6b459f852bdf853758fd40642ff82b5636c07a01b4a30f71f81336 files/digest-mod_php-4.4.0-r9 562 -MD5 7515e9b1dc298a0fb1c12d35a58c265d files/mod_php-4.3.4-amd64hack.diff 1028 -RMD160 84fa573a23f3842db02b5283a3d5cc15ba27766b files/mod_php-4.3.4-amd64hack.diff 1028 -SHA256 c30c8f1adfe78e6b6c0b0dd11787d14776e939814157f68299dea2d001d14a5f files/mod_php-4.3.4-amd64hack.diff 1028 -MD5 3bf664b414787f8f3c1dcbda5750aef4 files/mod_php-4.3.5-apache1security.diff 425 -RMD160 a8d62ccac0528d0354b8968096d374ed521824fd files/mod_php-4.3.5-apache1security.diff 425 -SHA256 9fc83ad1f59235bb6d597755679a5ccee49a958a6708576a06965f0b6fe623bd files/mod_php-4.3.5-apache1security.diff 425 -MD5 cceddd5c262e0ffef31d45b7da269851 files/mod_php.conf 148 -RMD160 3ad646a63e07307b887522f3a1cb3a459f87561d files/mod_php.conf 148 -SHA256 5826aec6f5bc241bb2a45870d99e99e22185b206f604935b6fb80eb16f556027 files/mod_php.conf 148 -MD5 cdec3284251432935f950c2d15a405b7 files/php-4.3.11-flash.patch 694 -RMD160 52978dc08b21a6307bd24eb0d49692b31b969979 files/php-4.3.11-flash.patch 694 -SHA256 0975a5fabb1d4752aaaf613a2de8220def0ef57553eea39c17351a46763ddcde files/php-4.3.11-flash.patch 694 -MD5 b2aa5952d5c805b3e57a5a6bf0f0b8d0 files/php-4.3.11-gmp.patch 925 -RMD160 6535beacc771e516b7fa41e8e555a748025c07b2 files/php-4.3.11-gmp.patch 925 -SHA256 ff937380a99a5c8a8c483bb66898cafb8fadb62e55b4382cd9d519cf2a5ecc5f files/php-4.3.11-gmp.patch 925 -MD5 09637e8f6f861b1f3698ec0390ec6b57 files/php4.3.11-curl_safemode.patch 5129 -RMD160 150cb7bf9db093d4fa10b7f2e9564ee83c9c6b59 files/php4.3.11-curl_safemode.patch 5129 -SHA256 c70fc8c00c5702d55ac8cef5447d2d67bf387d70ebfaab06057550f3290707d7 files/php4.3.11-curl_safemode.patch 5129 -MD5 cb36a386184ed6a887f62d2205f57173 files/php4.3.11-fopen_wrappers.patch 1481 -RMD160 584002693e3689dae96d884f00c258a469131318 files/php4.3.11-fopen_wrappers.patch 1481 -SHA256 266f41e3304bb47c72cd77306b75de3dcc3e0ee2d2713ae5e6b5031b37fcfea9 files/php4.3.11-fopen_wrappers.patch 1481 -MD5 4db8e0b66cde22dd4e4d9f51e59f6098 files/php4.3.11-gd_safe_mode.patch 1573 -RMD160 d7f89f4c823f8e88fb96713de745f33de22b1fbc files/php4.3.11-gd_safe_mode.patch 1573 -SHA256 bcdb721a5238622a7aa23498eae86a71c7e5473785063d2e30bad39a0c16ca1f files/php4.3.11-gd_safe_mode.patch 1573 -MD5 89d12226b1726b681df274be79043411 files/php4.3.11-globals_overwrite.patch 18011 -RMD160 23bf6b4941386ce0b5e6fb6eab497fa556f4594e files/php4.3.11-globals_overwrite.patch 18011 -SHA256 6efad1c0e53b68731c0c08b4d136dfabc40b738d8774a44e84b4a689ee707748 files/php4.3.11-globals_overwrite.patch 18011 -MD5 47a031979331eeb527d0918d2c38cdbe files/php4.3.11-imap-symlink.diff 1238 -RMD160 66eeeae71823c7b5524c0b48d41d8c0fa01cde79 files/php4.3.11-imap-symlink.diff 1238 -SHA256 0b31759ee6d55623a7ab71522366956b54b7b789b97008d1589479300da481c8 files/php4.3.11-imap-symlink.diff 1238 -MD5 5a66b2ff838bd8ba8a1a1160460683ae files/php4.3.11-pcre-security.patch 6032 -RMD160 551de43faaafd57507c4c066d4d4f52ce8c4cc3d files/php4.3.11-pcre-security.patch 6032 -SHA256 56029f505cb171f6090247d482eb0bc82886017e3b9be4f3f18b47d0ea635bde files/php4.3.11-pcre-security.patch 6032 -MD5 43b4113d1fb159955b0d5ed307cac143 files/php4.3.11-phpinfo_xss.patch 2518 -RMD160 943115562c29a566e54dfaa45dbc2a9dff7d7e30 files/php4.3.11-phpinfo_xss.patch 2518 -SHA256 f44651b5f0e7fd48e56153ade13659d1ea495903786697c13d987aa2e1bff2ca files/php4.3.11-phpinfo_xss.patch 2518 -MD5 48d9c939434e9b01d0696410d59c503c files/php4.3.11-pspell-ext-segf.patch 8482 -RMD160 ddf8243e1d92d5d954f4b12d76c6c40be94c60df files/php4.3.11-pspell-ext-segf.patch 8482 -SHA256 f389ad160c694bb5dc18c203fec89660d9b66404789b2a2592f92b7f35fcbceb files/php4.3.11-pspell-ext-segf.patch 8482 -MD5 2646498369dc5c64c318ee6da2f9487a files/php4.3.11-session_save_path-segf.patch 4961 -RMD160 96a62c80867b7a2f5117d67bb8dbb0cb5fdd90fe files/php4.3.11-session_save_path-segf.patch 4961 -SHA256 a9da67403191cf9d362dc2a71181623285dc5e41ddf523d99207edcfdd1be588 files/php4.3.11-session_save_path-segf.patch 4961 -MD5 0429f8334ba4bab659a2e41ce5debc80 files/php4.4.0-curl_safemode.patch 1937 -RMD160 8534ad8228ad28049ede7cd6d5df1b2b826c6344 files/php4.4.0-curl_safemode.patch 1937 -SHA256 5c9f8c3e45dd65595e50aa526b6ad1d541f7264104703ed892b4ec6b98cb323a files/php4.4.0-curl_safemode.patch 1937 -MD5 cb36a386184ed6a887f62d2205f57173 files/php4.4.0-fopen_wrappers.patch 1481 -RMD160 584002693e3689dae96d884f00c258a469131318 files/php4.4.0-fopen_wrappers.patch 1481 -SHA256 266f41e3304bb47c72cd77306b75de3dcc3e0ee2d2713ae5e6b5031b37fcfea9 files/php4.4.0-fopen_wrappers.patch 1481 -MD5 a540c54ba22dc16b157edcf1ecb6258f files/php4.4.0-gd_safe_mode.patch 883 -RMD160 5e2aebde4f617ebd86ee509fc0923643ea79e7c6 files/php4.4.0-gd_safe_mode.patch 883 -SHA256 7a9cc9502934ef3736c19147f0cd28f4dc1538aa951789582c714ef552cb3e2f files/php4.4.0-gd_safe_mode.patch 883 -MD5 7c45198e6118d82c680e9ed56e7d1df0 files/php4.4.0-globals_overwrite.patch 9731 -RMD160 14d6e7ffb958dd18af0c26e48c77bb3d333abfee files/php4.4.0-globals_overwrite.patch 9731 -SHA256 301fea9f488a41bf33e73a35704150f3026cae4241f263a5f77b7b193eb56ca7 files/php4.4.0-globals_overwrite.patch 9731 -MD5 4c86d8ed96f2bb38b94e826c1f028c80 files/php4.4.0-imap-symlink.diff 1238 -RMD160 f58ad26a677b6ce320ff0eff5b5f7440436003f0 files/php4.4.0-imap-symlink.diff 1238 -SHA256 45106a92b8e9737df17f12d03ddd65e298e08f78b18f61ecd1e0ede3378eda73 files/php4.4.0-imap-symlink.diff 1238 -MD5 48b1aa50f8a3ebdfbda4c796b6e3fbec files/php4.4.0-pcre-security.patch 6178 -RMD160 07d751aac1061c107cb71e586059317f5f71613b files/php4.4.0-pcre-security.patch 6178 -SHA256 2323a265d505420ec0997d62e39a4c52b410c52de73462cd8ce52d4498fca39c files/php4.4.0-pcre-security.patch 6178 -MD5 57644300fb52ad610fa52ae8ba6b522b files/php4.4.0-phpinfo_xss.patch 1284 -RMD160 00bc57d1b2ff4e81d26211a163c2aa9e6e163aa5 files/php4.4.0-phpinfo_xss.patch 1284 -SHA256 496ac4070ea6c5458122489af1b4eb797ae028b981e01cd7488acbb713c5a863 files/php4.4.0-phpinfo_xss.patch 1284 -MD5 48d9c939434e9b01d0696410d59c503c files/php4.4.0-pspell-ext-segf.patch 8482 -RMD160 ddf8243e1d92d5d954f4b12d76c6c40be94c60df files/php4.4.0-pspell-ext-segf.patch 8482 -SHA256 f389ad160c694bb5dc18c203fec89660d9b66404789b2a2592f92b7f35fcbceb files/php4.4.0-pspell-ext-segf.patch 8482 -MD5 3d3986815e0e06adce512b36959e6f26 files/php4.4.0-session_save_path-segf.patch 4155 -RMD160 cc2d9630a5a4fc93788e99bb8d555ee0e708d0d2 files/php4.4.0-session_save_path-segf.patch 4155 -SHA256 23d0e93141272ac98b9556fa29dc4c2aa7450baebed2fb29fe14cd14c2c09451 files/php4.4.0-session_save_path-segf.patch 4155 -MD5 38fe937e954ab7109395cefa86fcd2d4 metadata.xml 384 -RMD160 721e74e8a8784cc075ea3ee0f77a2284afb69ab7 metadata.xml 384 -SHA256 504f89df60311a5a906be8dfff5aecf897c4e4eaec96e017af364035086ede4d metadata.xml 384 -MD5 90610a0b9cdbcbec3cd33fcef432e00c mod_php-4.3.11-r1.ebuild 7127 -RMD160 3f6fad71dcbe0f827a7c4ce31f52109f8e424842 mod_php-4.3.11-r1.ebuild 7127 -SHA256 3bc3b1bca4013e2ee6bf54a5aaf8c876e314095a7ccf606b461489208293776e mod_php-4.3.11-r1.ebuild 7127 -MD5 3e4b2d8a6ea6c859ef96e9de3aed8b81 mod_php-4.3.11-r3.ebuild 8053 -RMD160 619d39767abb2682f0232f7f3d011d1f34259a61 mod_php-4.3.11-r3.ebuild 8053 -SHA256 7fa1919f1072dbf3d2cde5befc14ed149a46a48cf4ec59c7d63556b1e65c4548 mod_php-4.3.11-r3.ebuild 8053 -MD5 59112fab705dca533d293f8ea9c6ff14 mod_php-4.3.11-r4.ebuild 8048 -RMD160 1336c06053f8740b2bb103abcf6732dcf92152d7 mod_php-4.3.11-r4.ebuild 8048 -SHA256 e92beea814ea4c355e9c8c26ee935cb04f99152057111606818881e3c4b80bb3 mod_php-4.3.11-r4.ebuild 8048 -MD5 cd88a76d8ca70243cb58ed076582a857 mod_php-4.3.11.ebuild 6387 -RMD160 3a1722357b27204406db342652657d6f58a3f0cf mod_php-4.3.11.ebuild 6387 -SHA256 8b2612c198eb3594ee006965155e0659563dace1387ad093cb557d25a3dfb289 mod_php-4.3.11.ebuild 6387 -MD5 29d9e7ef90de139245d7c5e06dd9b67c mod_php-4.4.0-r1.ebuild 6561 -RMD160 1eb5933fd2309a7bbd3e3604b9588bbc999f1f67 mod_php-4.4.0-r1.ebuild 6561 -SHA256 c6624bfc1c12366d016f53ad8bc9180bff8c31bb92df9ea898c4e1a242767536 mod_php-4.4.0-r1.ebuild 6561 -MD5 68092beafbec1bd1b054a153b834bd13 mod_php-4.4.0-r2.ebuild 7074 -RMD160 a51cf43ed222c20b2f41d431e499b1627d305dde mod_php-4.4.0-r2.ebuild 7074 -SHA256 0e46a2f3dfabb2262e021a58fd65cf120d9c27322476acdfa9aa2877e3921652 mod_php-4.4.0-r2.ebuild 7074 -MD5 47959bde0d770eddf3d212d43766332d mod_php-4.4.0-r3.ebuild 6145 -RMD160 1041745bdc4fabef6dea0be83e850c28272d5843 mod_php-4.4.0-r3.ebuild 6145 -SHA256 8b78a76be6d7e47563561dbaf22963a88153be87014a78a4ae43640b9f77f31a mod_php-4.4.0-r3.ebuild 6145 -MD5 9b13b3622e2a53585adc6c881198bdb6 mod_php-4.4.0-r6.ebuild 7994 -RMD160 adcd3c0a8df817b9a0a8a42c1a7d78c97adc8d22 mod_php-4.4.0-r6.ebuild 7994 -SHA256 a687f7af38a7cbb45290fb32769c35fe7cd38ac1ba47d301d8d5fa3c8e6a16bd mod_php-4.4.0-r6.ebuild 7994 -MD5 921eddffa3b656c7c08da0d0c709622b mod_php-4.4.0-r7.ebuild 7069 -RMD160 272782af8ba97459159a07cdfd0cb7cd74942b07 mod_php-4.4.0-r7.ebuild 7069 -SHA256 ebc5ae1fface6d7b6734146de995198d0748672f926cf501f6e40de0db15918a mod_php-4.4.0-r7.ebuild 7069 -MD5 387b3e921c12e779607b3ddeb72e82ea mod_php-4.4.0-r8.ebuild 7989 -RMD160 9c967a7a4723d2e496cc264203999b494b2b4abc mod_php-4.4.0-r8.ebuild 7989 -SHA256 6163bd6803dbf8e9287c73202161d0f6ecb6572b1a5b7c30f1f43ec0faacc929 mod_php-4.4.0-r8.ebuild 7989 -MD5 0b15448d93de3bd4707539a67f36bb28 mod_php-4.4.0-r9.ebuild 7063 -RMD160 748d413f15e7b60a14157412e78f2113938a4151 mod_php-4.4.0-r9.ebuild 7063 -SHA256 7e477a685e541563c1392ce1917da61a50699c325087c6dcdd460f19d39f03ff mod_php-4.4.0-r9.ebuild 7063 -MD5 b7f57c4f896ce046f8a6b4472ddfcb2b mod_php-4.4.0.ebuild 6336 -RMD160 be0b923ccbdaf1cb86fb2a6c1bbcb48a5087860c mod_php-4.4.0.ebuild 6336 -SHA256 f6c9517335619b06bf2b6c7ea525ae0d2961ae8d5a649e76dc7cb7b1af71533e mod_php-4.4.0.ebuild 6336 ------BEGIN PGP SIGNATURE----- -Version: GnuPG v1.4.1 (GNU/Linux) - -iD8DBQFD5OcNJrHF4yAQTrARAt5XAKCTne9/3SoT5BWlRzOBhK60zh3iRQCeMjC9 -g3wbfZrqDQXLLLVqwoiCke4= -=uBGx ------END PGP SIGNATURE----- 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 deleted file mode 100644 index 6263db962a8b..000000000000 --- a/dev-php/mod_php/files/4.3.10-r1/70_mod_php.conf +++ /dev/null @@ -1,40 +0,0 @@ -# vim: ft=apache sw=4 ts=4 -<IfDefine PHP4> - - # Load the module first - <IfModule !sapi_apache2.c> - LoadModule php4_module modules/libphp4.so - </IfModule> - - # Set it to handle the files - <IfModule mod_mime.c> - 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 - </IfModule> - - # Fix some bugs - <Files *.php> - # keep this the same size as post_max_size in php.ini - # LimitRequestBody 8388608 - </Files> - <Files *.php3> - # keep this the same size as post_max_size in php.ini - # LimitRequestBody 8388608 - </Files> - <Files *.php4> - # keep this the same size as post_max_size in php.ini - # LimitRequestBody 8388608 - </Files> - <Files *.phps> - # keep this the same size as post_max_size in php.ini - # LimitRequestBody 8388608 - </Files> - <Files *.phtml> - # keep this the same size as post_max_size in php.ini - # LimitRequestBody 8388608 - </Files> - -</IfDefine> diff --git a/dev-php/mod_php/files/4.3.11-r2/70_mod_php.conf b/dev-php/mod_php/files/4.3.11-r2/70_mod_php.conf deleted file mode 100644 index ceb4369a998d..000000000000 --- a/dev-php/mod_php/files/4.3.11-r2/70_mod_php.conf +++ /dev/null @@ -1,43 +0,0 @@ -# vim: ft=apache sw=4 ts=4 -<IfDefine PHP4> - - # Load the module first - <IfModule !sapi_apache2.c> - LoadModule php4_module modules/libphp4.so - </IfModule> - - # Set it to handle the files - <IfModule mod_mime.c> - 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 - </IfModule> - - # post-adding DirectoryIndex'es - AddDirectoryIndex index.php index.php3 index.php4 index.phps index.phtml - - # Fix some bugs - <Files *.php> - # keep this the same size as post_max_size in php.ini - # LimitRequestBody 8388608 - </Files> - <Files *.php3> - # keep this the same size as post_max_size in php.ini - # LimitRequestBody 8388608 - </Files> - <Files *.php4> - # keep this the same size as post_max_size in php.ini - # LimitRequestBody 8388608 - </Files> - <Files *.phps> - # keep this the same size as post_max_size in php.ini - # LimitRequestBody 8388608 - </Files> - <Files *.phtml> - # keep this the same size as post_max_size in php.ini - # LimitRequestBody 8388608 - </Files> - -</IfDefine> diff --git a/dev-php/mod_php/files/4.4.0-a1/70_mod_php.conf b/dev-php/mod_php/files/4.4.0-a1/70_mod_php.conf deleted file mode 100644 index 34a41d81193c..000000000000 --- a/dev-php/mod_php/files/4.4.0-a1/70_mod_php.conf +++ /dev/null @@ -1,19 +0,0 @@ -# vim: ft=apache sw=4 ts=4 -<IfDefine PHP4> - - # Load the module first - <IfModule !sapi_apache.c> - LoadModule php4_module modules/libphp4.so - </IfModule> - - # Set it to handle the files - <IfModule mod_mime.c> - 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 - </IfModule> - - AddDirectoryIndex index.php index.phtml -</IfDefine> diff --git a/dev-php/mod_php/files/4.4.0-a2/70_mod_php.conf b/dev-php/mod_php/files/4.4.0-a2/70_mod_php.conf deleted file mode 100644 index ce680323f6e0..000000000000 --- a/dev-php/mod_php/files/4.4.0-a2/70_mod_php.conf +++ /dev/null @@ -1,19 +0,0 @@ -# vim: ft=apache sw=4 ts=4 -<IfDefine PHP4> - - # Load the module first - <IfModule !sapi_apache2.c> - LoadModule php4_module modules/libphp4.so - </IfModule> - - # Set it to handle the files - <IfModule mod_mime.c> - 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 - </IfModule> - - AddDirectoryIndex index.php index.phtml -</IfDefine> diff --git a/dev-php/mod_php/files/70_mod_php.conf b/dev-php/mod_php/files/70_mod_php.conf deleted file mode 100644 index 1bb3a229d505..000000000000 --- a/dev-php/mod_php/files/70_mod_php.conf +++ /dev/null @@ -1,40 +0,0 @@ -# vim: ft=apache sw=4 ts=4 -<IfDefine PHP4> - - # Load the module first - <IfModule !sapi_apache2.c> - LoadModule php4_module extramodules/libphp4.so - </IfModule> - - # Set it to handle the files - <IfModule mod_mime.c> - 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 - </IfModule> - - # Fix some bugs - <Files *.php> - # keep this the same size as post_max_size in php.ini - # LimitRequestBody 8388608 - </Files> - <Files *.php3> - # keep this the same size as post_max_size in php.ini - # LimitRequestBody 8388608 - </Files> - <Files *.php4> - # keep this the same size as post_max_size in php.ini - # LimitRequestBody 8388608 - </Files> - <Files *.phps> - # keep this the same size as post_max_size in php.ini - # LimitRequestBody 8388608 - </Files> - <Files *.phtml> - # keep this the same size as post_max_size in php.ini - # LimitRequestBody 8388608 - </Files> - -</IfDefine> diff --git a/dev-php/mod_php/files/digest-mod_php-4.3.11 b/dev-php/mod_php/files/digest-mod_php-4.3.11 deleted file mode 100644 index 46b217bb8db5..000000000000 --- a/dev-php/mod_php/files/digest-mod_php-4.3.11 +++ /dev/null @@ -1,4 +0,0 @@ -MD5 611cdddabfd71ffb724c428be33c14cb hardening-patch-4.3.11-0.3.2.patch.gz 80613 -MD5 fbc67d240812136a9842bc1f2a217b7a php-4.3.11.tar.bz2 4012575 -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-4.3.11-r1 b/dev-php/mod_php/files/digest-mod_php-4.3.11-r1 deleted file mode 100644 index 8a51d50e2303..000000000000 --- a/dev-php/mod_php/files/digest-mod_php-4.3.11-r1 +++ /dev/null @@ -1,5 +0,0 @@ -MD5 611cdddabfd71ffb724c428be33c14cb hardening-patch-4.3.11-0.3.2.patch.gz 80613 -MD5 fbc67d240812136a9842bc1f2a217b7a php-4.3.11.tar.bz2 4012575 -MD5 912ff94309b762563d0542db5187315f php-4.3.2-fopen-url-secure.patch 416 -MD5 fbb6b365f4c0263b1dfd498aef092a77 php-4.3.6-includepath.diff 285 -MD5 33be24619f3a10953f9e1e32beeee97a php-pcrelib-new-secpatch.tar.bz2 357619 diff --git a/dev-php/mod_php/files/digest-mod_php-4.3.11-r3 b/dev-php/mod_php/files/digest-mod_php-4.3.11-r3 deleted file mode 100644 index 8a51d50e2303..000000000000 --- a/dev-php/mod_php/files/digest-mod_php-4.3.11-r3 +++ /dev/null @@ -1,5 +0,0 @@ -MD5 611cdddabfd71ffb724c428be33c14cb hardening-patch-4.3.11-0.3.2.patch.gz 80613 -MD5 fbc67d240812136a9842bc1f2a217b7a php-4.3.11.tar.bz2 4012575 -MD5 912ff94309b762563d0542db5187315f php-4.3.2-fopen-url-secure.patch 416 -MD5 fbb6b365f4c0263b1dfd498aef092a77 php-4.3.6-includepath.diff 285 -MD5 33be24619f3a10953f9e1e32beeee97a php-pcrelib-new-secpatch.tar.bz2 357619 diff --git a/dev-php/mod_php/files/digest-mod_php-4.3.11-r4 b/dev-php/mod_php/files/digest-mod_php-4.3.11-r4 deleted file mode 100644 index 8a51d50e2303..000000000000 --- a/dev-php/mod_php/files/digest-mod_php-4.3.11-r4 +++ /dev/null @@ -1,5 +0,0 @@ -MD5 611cdddabfd71ffb724c428be33c14cb hardening-patch-4.3.11-0.3.2.patch.gz 80613 -MD5 fbc67d240812136a9842bc1f2a217b7a php-4.3.11.tar.bz2 4012575 -MD5 912ff94309b762563d0542db5187315f php-4.3.2-fopen-url-secure.patch 416 -MD5 fbb6b365f4c0263b1dfd498aef092a77 php-4.3.6-includepath.diff 285 -MD5 33be24619f3a10953f9e1e32beeee97a php-pcrelib-new-secpatch.tar.bz2 357619 diff --git a/dev-php/mod_php/files/digest-mod_php-4.4.0 b/dev-php/mod_php/files/digest-mod_php-4.4.0 deleted file mode 100644 index 8f3ade5dd226..000000000000 --- a/dev-php/mod_php/files/digest-mod_php-4.4.0 +++ /dev/null @@ -1,4 +0,0 @@ -MD5 0a52b85692ebbc299e6b1f6d9d206691 hardening-patch-4.4.0-0.3.2.patch.gz 33347 -MD5 912ff94309b762563d0542db5187315f php-4.3.2-fopen-url-secure.patch 416 -MD5 fbb6b365f4c0263b1dfd498aef092a77 php-4.3.6-includepath.diff 285 -MD5 e85b606fe48198bfcd785e5a5b1c9613 php-4.4.0.tar.bz2 4086074 diff --git a/dev-php/mod_php/files/digest-mod_php-4.4.0-r1 b/dev-php/mod_php/files/digest-mod_php-4.4.0-r1 deleted file mode 100644 index 8f3ade5dd226..000000000000 --- a/dev-php/mod_php/files/digest-mod_php-4.4.0-r1 +++ /dev/null @@ -1,4 +0,0 @@ -MD5 0a52b85692ebbc299e6b1f6d9d206691 hardening-patch-4.4.0-0.3.2.patch.gz 33347 -MD5 912ff94309b762563d0542db5187315f php-4.3.2-fopen-url-secure.patch 416 -MD5 fbb6b365f4c0263b1dfd498aef092a77 php-4.3.6-includepath.diff 285 -MD5 e85b606fe48198bfcd785e5a5b1c9613 php-4.4.0.tar.bz2 4086074 diff --git a/dev-php/mod_php/files/digest-mod_php-4.4.0-r2 b/dev-php/mod_php/files/digest-mod_php-4.4.0-r2 deleted file mode 100644 index dfbd3919a8b5..000000000000 --- a/dev-php/mod_php/files/digest-mod_php-4.4.0-r2 +++ /dev/null @@ -1,5 +0,0 @@ -MD5 0a52b85692ebbc299e6b1f6d9d206691 hardening-patch-4.4.0-0.3.2.patch.gz 33347 -MD5 912ff94309b762563d0542db5187315f php-4.3.2-fopen-url-secure.patch 416 -MD5 fbb6b365f4c0263b1dfd498aef092a77 php-4.3.6-includepath.diff 285 -MD5 e85b606fe48198bfcd785e5a5b1c9613 php-4.4.0.tar.bz2 4086074 -MD5 33be24619f3a10953f9e1e32beeee97a php-pcrelib-new-secpatch.tar.bz2 357619 diff --git a/dev-php/mod_php/files/digest-mod_php-4.4.0-r3 b/dev-php/mod_php/files/digest-mod_php-4.4.0-r3 deleted file mode 100644 index dfbd3919a8b5..000000000000 --- a/dev-php/mod_php/files/digest-mod_php-4.4.0-r3 +++ /dev/null @@ -1,5 +0,0 @@ -MD5 0a52b85692ebbc299e6b1f6d9d206691 hardening-patch-4.4.0-0.3.2.patch.gz 33347 -MD5 912ff94309b762563d0542db5187315f php-4.3.2-fopen-url-secure.patch 416 -MD5 fbb6b365f4c0263b1dfd498aef092a77 php-4.3.6-includepath.diff 285 -MD5 e85b606fe48198bfcd785e5a5b1c9613 php-4.4.0.tar.bz2 4086074 -MD5 33be24619f3a10953f9e1e32beeee97a php-pcrelib-new-secpatch.tar.bz2 357619 diff --git a/dev-php/mod_php/files/digest-mod_php-4.4.0-r6 b/dev-php/mod_php/files/digest-mod_php-4.4.0-r6 deleted file mode 100644 index dfbd3919a8b5..000000000000 --- a/dev-php/mod_php/files/digest-mod_php-4.4.0-r6 +++ /dev/null @@ -1,5 +0,0 @@ -MD5 0a52b85692ebbc299e6b1f6d9d206691 hardening-patch-4.4.0-0.3.2.patch.gz 33347 -MD5 912ff94309b762563d0542db5187315f php-4.3.2-fopen-url-secure.patch 416 -MD5 fbb6b365f4c0263b1dfd498aef092a77 php-4.3.6-includepath.diff 285 -MD5 e85b606fe48198bfcd785e5a5b1c9613 php-4.4.0.tar.bz2 4086074 -MD5 33be24619f3a10953f9e1e32beeee97a php-pcrelib-new-secpatch.tar.bz2 357619 diff --git a/dev-php/mod_php/files/digest-mod_php-4.4.0-r7 b/dev-php/mod_php/files/digest-mod_php-4.4.0-r7 deleted file mode 100644 index dfbd3919a8b5..000000000000 --- a/dev-php/mod_php/files/digest-mod_php-4.4.0-r7 +++ /dev/null @@ -1,5 +0,0 @@ -MD5 0a52b85692ebbc299e6b1f6d9d206691 hardening-patch-4.4.0-0.3.2.patch.gz 33347 -MD5 912ff94309b762563d0542db5187315f php-4.3.2-fopen-url-secure.patch 416 -MD5 fbb6b365f4c0263b1dfd498aef092a77 php-4.3.6-includepath.diff 285 -MD5 e85b606fe48198bfcd785e5a5b1c9613 php-4.4.0.tar.bz2 4086074 -MD5 33be24619f3a10953f9e1e32beeee97a php-pcrelib-new-secpatch.tar.bz2 357619 diff --git a/dev-php/mod_php/files/digest-mod_php-4.4.0-r8 b/dev-php/mod_php/files/digest-mod_php-4.4.0-r8 deleted file mode 100644 index dfbd3919a8b5..000000000000 --- a/dev-php/mod_php/files/digest-mod_php-4.4.0-r8 +++ /dev/null @@ -1,5 +0,0 @@ -MD5 0a52b85692ebbc299e6b1f6d9d206691 hardening-patch-4.4.0-0.3.2.patch.gz 33347 -MD5 912ff94309b762563d0542db5187315f php-4.3.2-fopen-url-secure.patch 416 -MD5 fbb6b365f4c0263b1dfd498aef092a77 php-4.3.6-includepath.diff 285 -MD5 e85b606fe48198bfcd785e5a5b1c9613 php-4.4.0.tar.bz2 4086074 -MD5 33be24619f3a10953f9e1e32beeee97a php-pcrelib-new-secpatch.tar.bz2 357619 diff --git a/dev-php/mod_php/files/digest-mod_php-4.4.0-r9 b/dev-php/mod_php/files/digest-mod_php-4.4.0-r9 deleted file mode 100644 index ea2877f68ac2..000000000000 --- a/dev-php/mod_php/files/digest-mod_php-4.4.0-r9 +++ /dev/null @@ -1,7 +0,0 @@ -MD5 0a52b85692ebbc299e6b1f6d9d206691 hardening-patch-4.4.0-0.3.2.patch.gz 33347 -MD5 912ff94309b762563d0542db5187315f php-4.3.2-fopen-url-secure.patch 416 -MD5 fbb6b365f4c0263b1dfd498aef092a77 php-4.3.6-includepath.diff 285 -MD5 e85b606fe48198bfcd785e5a5b1c9613 php-4.4.0.tar.bz2 4086074 -MD5 33be24619f3a10953f9e1e32beeee97a php-pcrelib-new-secpatch.tar.bz2 357619 -RMD160 1748ef9837f3f5ce7ad81f0dd751b430c8c2c6f6 php-pcrelib-new-secpatch.tar.bz2 357619 -SHA256 7c49aa2c6be704b576720673fa123febdddc541d8152ccacea5cb2c9d1560a19 php-pcrelib-new-secpatch.tar.bz2 357619 diff --git a/dev-php/mod_php/files/mod_php-4.3.4-amd64hack.diff b/dev-php/mod_php/files/mod_php-4.3.4-amd64hack.diff deleted file mode 100644 index 2e36b25b9a08..000000000000 --- a/dev-php/mod_php/files/mod_php-4.3.4-amd64hack.diff +++ /dev/null @@ -1,28 +0,0 @@ ---- ltmain.sh_orig 2004-01-29 02:00:07.202890120 -0500 -+++ ltmain.sh 2004-01-29 02:05:30.628721920 -0500 -@@ -2586,6 +2586,12 @@ - set dummy $deplibs_check_method - file_magic_regex=`expr "$deplibs_check_method" : "$2 \(.*\)"` - for a_deplib in $deplibs; do -+ -+ if test "x$a_deplib" = "x-lc-client" ; then -+ newdeplibs="$newdeplibs $a_deplib" -+ continue -+ fi -+ - name="`expr $a_deplib : '-l\(.*\)'`" - # If $name is empty we are operating on a -L argument. - if test -n "$name" && test "$name" != "0"; then -@@ -2645,6 +2651,12 @@ - set dummy $deplibs_check_method - match_pattern_regex=`expr "$deplibs_check_method" : "$2 \(.*\)"` - for a_deplib in $deplibs; do -+ -+ if test "x$a_deplib" = "x-lc-client" ; then -+ newdeplibs="$newdeplibs $a_deplib" -+ continue -+ fi -+ - name="`expr $a_deplib : '-l\(.*\)'`" - # If $name is empty we are operating on a -L argument. - if test -n "$name" && test "$name" != "0"; then diff --git a/dev-php/mod_php/files/mod_php-4.3.5-apache1security.diff b/dev-php/mod_php/files/mod_php-4.3.5-apache1security.diff deleted file mode 100644 index 373038097cf6..000000000000 --- a/dev-php/mod_php/files/mod_php-4.3.5-apache1security.diff +++ /dev/null @@ -1,12 +0,0 @@ ---- php-4.3.5/sapi/apache/mod_php4.c.old 2004-01-31 21:44:55.000000000 +0000 -+++ php-4.3.5/sapi/apache/mod_php4.c 2004-01-31 21:49:59.000000000 +0000 -@@ -822,6 +822,9 @@ - - if (!(r->finfo.st_mode & S_IXUSR)) { - r->allowed |= (1 << METHODS) - 1; -+ zend_try { -+ zend_ini_deactivate(TSRMLS_C); -+ } zend_end_try(); - return DECLINED; - } - per_dir_conf = (HashTable *) get_module_config(r->per_dir_config, &php4_module); diff --git a/dev-php/mod_php/files/mod_php.conf b/dev-php/mod_php/files/mod_php.conf deleted file mode 100644 index 6f1f47494bf3..000000000000 --- a/dev-php/mod_php/files/mod_php.conf +++ /dev/null @@ -1,6 +0,0 @@ -<IfModule mod_php4.c> - -AddType application/x-httpd-php .php .php4 .php3 .phtml -AddType application/x-httpd-php-source .phps - -</IfModule> diff --git a/dev-php/mod_php/files/php-4.3.11-flash.patch b/dev-php/mod_php/files/php-4.3.11-flash.patch deleted file mode 100644 index 9cda1b40ce9c..000000000000 --- a/dev-php/mod_php/files/php-4.3.11-flash.patch +++ /dev/null @@ -1,25 +0,0 @@ ---- ext/swf/swf.c.orig 2005-04-01 14:27:16.419352696 -0500 -+++ ext/swf/swf.c 2005-04-01 14:25:41.775740712 -0500 -@@ -240,7 +240,10 @@ PHP_FUNCTION(swf_openfile) - na = tmpna; - #endif - if (php_check_open_basedir(na TSRMLS_CC) || (PG(safe_mode) && !php_checkuid(na, "wb+", CHECKUID_CHECK_MODE_PARAM))) { -- goto err; -+#ifdef VIRTUAL_DIR -+ free(na); -+#endif -+ return; - } - - if (!SWFG(use_file)) -@@ -249,10 +252,6 @@ PHP_FUNCTION(swf_openfile) - swf_openfile(na,(float)Z_DVAL_PP(sizeX), (float)Z_DVAL_PP(sizeY), - (float)Z_DVAL_PP(frameRate), (float)Z_DVAL_PP(r), - (float)Z_DVAL_PP(g), (float)Z_DVAL_PP(b)); --err: --#ifdef VIRTUAL_DIR -- free(na); --#endif - } - /* }}} */ - diff --git a/dev-php/mod_php/files/php-4.3.11-gmp.patch b/dev-php/mod_php/files/php-4.3.11-gmp.patch deleted file mode 100644 index 76d7b7b9d94e..000000000000 --- a/dev-php/mod_php/files/php-4.3.11-gmp.patch +++ /dev/null @@ -1,29 +0,0 @@ ---- ext/gmp/gmp.c.orig 2005-03-01 14:18:31.000000000 +0100 -+++ ext/gmp/gmp.c 2005-04-12 10:22:02.000000000 +0200 -@@ -205,7 +205,7 @@ - if(Z_TYPE_PP(zval) == IS_RESOURCE) { \ - ZEND_FETCH_RESOURCE(gmpnumber, mpz_t *, zval, -1, GMP_RESOURCE_NAME, le_gmp);\ - } else {\ -- if(convert_to_gmp(&gmpnumber, zval, 0) == FAILURE) {\ -+ if(convert_to_gmp(&gmpnumber, zval, 0 TSRMLS_CC) == FAILURE) {\ - RETURN_FALSE;\ - }\ - ZEND_REGISTER_RESOURCE(NULL, gmpnumber, le_gmp);\ -@@ -217,7 +217,7 @@ - - /* {{{ convert_to_gmp - * Convert zval to be gmp number */ --static int convert_to_gmp(mpz_t * *gmpnumber, zval **val, int base) -+static int convert_to_gmp(mpz_t * *gmpnumber, zval **val, int base TSRMLS_DC) - { - int ret = 0; - int skip_lead = 0; -@@ -509,7 +509,7 @@ - } - } - -- if(convert_to_gmp(&gmpnumber, number_arg, base) == FAILURE) { -+ if(convert_to_gmp(&gmpnumber, number_arg, base TSRMLS_CC) == FAILURE) { - RETURN_FALSE; - } - diff --git a/dev-php/mod_php/files/php4.3.11-curl_safemode.patch b/dev-php/mod_php/files/php4.3.11-curl_safemode.patch deleted file mode 100644 index f308dea57dde..000000000000 --- a/dev-php/mod_php/files/php4.3.11-curl_safemode.patch +++ /dev/null @@ -1,141 +0,0 @@ ---- ext/curl/curl.c 2005-03-14 10:03:09.000000000 +0100 -+++ ext/curl/curl.c 2005-10-17 04:42:51.000000000 +0200 -@@ -16,7 +16,7 @@ - +----------------------------------------------------------------------+ - */ - --/* $Id: curl.c,v 1.124.2.29 2005/03/14 09:03:09 sniper Exp $ */ -+/* $Id: curl.c,v 1.124.2.30.2.3 2005/10/17 02:42:51 iliaa Exp $ */ - - #ifdef HAVE_CONFIG_H - #include "config.h" -@@ -66,7 +66,7 @@ - #define CAAZ(s, v) add_assoc_zval_ex(return_value, s, sizeof(s), (zval *) v); - - #define PHP_CURL_CHECK_OPEN_BASEDIR(str, len) \ -- if (PG(open_basedir) && *PG(open_basedir) && \ -+ if (((PG(open_basedir) && *PG(open_basedir)) || PG(safe_mode)) && \ - strncasecmp(str, "file://", sizeof("file://") - 1) == 0) \ - { \ - php_url *tmp_url; \ -@@ -76,7 +76,7 @@ - RETURN_FALSE; \ - } \ - \ -- if (php_check_open_basedir(tmp_url->path TSRMLS_CC) || \ -+ if (tmp_url->query || php_check_open_basedir(tmp_url->path TSRMLS_CC) || \ - (PG(safe_mode) && !php_checkuid(tmp_url->path, "rb+", CHECKUID_CHECK_MODE_PARAM)) \ - ) { \ - php_url_free(tmp_url); \ -@@ -436,10 +436,12 @@ - zend_list_addref(ch->id); - ZVAL_STRINGL(argv[1], data, length, 1); - -+ ch->in_callback = 1; - error = call_user_function(EG(function_table), - NULL, - t->func, - retval, 2, argv TSRMLS_CC); -+ ch->in_callback = 0; - if (error == FAILURE) { - php_error(E_WARNING, "%s(): Couldn't call the CURLOPT_WRITEFUNCTION", - get_active_function_name(TSRMLS_C)); -@@ -495,10 +497,12 @@ - zend_list_addref(t->fd); - ZVAL_LONG(argv[2], (int) size * nmemb); - -+ ch->in_callback = 1; - error = call_user_function(EG(function_table), - NULL, - t->func, - retval, 3, argv TSRMLS_CC); -+ ch->in_callback = 0; - if (error == FAILURE) { - php_error(E_WARNING, "%s(): Cannot call the CURLOPT_READFUNCTION", - get_active_function_name(TSRMLS_C)); -@@ -553,10 +557,12 @@ - zend_list_addref(ch->id); - ZVAL_STRINGL(argv[1], data, length, 1); - -+ ch->in_callback = 1; - error = call_user_function(EG(function_table), - NULL, - t->func, - retval, 2, argv TSRMLS_CC); -+ ch->in_callback = 0; - if (error == FAILURE) { - php_error(E_WARNING, "%s(): Couldn't call the CURLOPT_HEADERFUNCTION", - get_active_function_name(TSRMLS_C)); -@@ -606,10 +612,12 @@ - ZVAL_STRING(argv[1], prompt, 1); - ZVAL_LONG(argv[2], buflen); - -+ ch->in_callback = 1; - error = call_user_function(EG(function_table), - NULL, - func, - retval, 2, argv TSRMLS_CC); -+ ch->in_callback = 0; - if (error == FAILURE) { - php_error(E_WARNING, "%s(): Couldn't call the CURLOPT_PASSWDFUNCTION", get_active_function_name(TSRMLS_C)); - } else if (Z_TYPE_P(retval) == IS_STRING) { -@@ -680,7 +688,9 @@ - (*ch)->handlers->write_header = ecalloc(1, sizeof(php_curl_write)); - (*ch)->handlers->read = ecalloc(1, sizeof(php_curl_read)); - memset(&(*ch)->err, 0, sizeof((*ch)->err)); -- -+ -+ (*ch)->in_callback = 0; -+ - zend_llist_init(&(*ch)->to_free.str, sizeof(char *), - (void(*)(void *)) curl_free_string, 0); - zend_llist_init(&(*ch)->to_free.slist, sizeof(struct curl_slist), -@@ -982,10 +992,15 @@ - - postval = Z_STRVAL_PP(current); - if (*postval == '@') { -+ ++postval; -+ /* safe_mode / open_basedir check */ -+ if (php_check_open_basedir(postval TSRMLS_CC) || (PG(safe_mode) && !php_checkuid(postval, "rb+", CHECKUID_CHECK_MODE_PARAM))) { -+ RETURN_FALSE; -+ } - error = curl_formadd(&first, &last, - CURLFORM_COPYNAME, string_key, - CURLFORM_NAMELENGTH, (long)string_key_len - 1, -- CURLFORM_FILE, ++postval, -+ CURLFORM_FILE, postval, - CURLFORM_END); - } - else { -@@ -1337,7 +1352,11 @@ - WRONG_PARAM_COUNT; - } - ZEND_FETCH_RESOURCE(ch, php_curl *, zid, -1, le_curl_name, le_curl); -- -+ -+ if (ch->in_callback) { -+ php_error_docref(NULL TSRMLS_CC, E_WARNING, "Attempt to close CURL handle from a callback"); -+ return; -+ } - zend_list_delete(Z_LVAL_PP(zid)); - } - /* }}} */ ---- ext/curl/php_curl.h 2002-12-31 17:34:15.000000000 +0100 -+++ ext/curl/php_curl.h 2005-06-02 23:05:06.000000000 +0200 -@@ -17,7 +17,7 @@ - +----------------------------------------------------------------------+ - */ - --/* $Id: php_curl.h,v 1.29.2.1 2002/12/31 16:34:15 sebastian Exp $ */ -+/* $Id: php_curl.h,v 1.29.2.2 2005/06/02 21:05:06 tony2001 Exp $ */ - - #ifndef _PHP_CURL_H - #define _PHP_CURL_H -@@ -93,6 +93,7 @@ - struct _php_curl_free to_free; - long id; - unsigned int uses; -+ zend_bool in_callback; - } php_curl; - - /* streams support */ diff --git a/dev-php/mod_php/files/php4.3.11-fopen_wrappers.patch b/dev-php/mod_php/files/php4.3.11-fopen_wrappers.patch deleted file mode 100644 index 672da5ece63b..000000000000 --- a/dev-php/mod_php/files/php4.3.11-fopen_wrappers.patch +++ /dev/null @@ -1,46 +0,0 @@ ---- main/fopen_wrappers.c 2005/02/02 23:44:07 1.153.2.10 -+++ main/fopen_wrappers.c 2005/09/27 15:08:43 1.153.2.10.2.2 -@@ -16,7 +16,7 @@ - | Jim Winstead <jimw@php.net> | - +----------------------------------------------------------------------+ - */ --/* $Id: fopen_wrappers.c,v 1.153.2.10 2005/02/02 23:44:07 iliaa Exp $ */ -+/* $Id: fopen_wrappers.c,v 1.153.2.10.2.2 2005/09/27 15:08:43 iliaa Exp $ */ - - /* {{{ includes - */ -@@ -36,14 +36,6 @@ - #include <winsock.h> - #define O_RDONLY _O_RDONLY - #include "win32/param.h" --#elif defined(NETWARE) --/*#include <ws2nlm.h>*/ --/*#include <sys/socket.h>*/ --#ifdef NEW_LIBC --#include <sys/param.h> --#else --#include "netware/param.h" --#endif - #else - #include <sys/param.h> - #endif -@@ -57,8 +49,6 @@ - #if HAVE_PWD_H - #ifdef PHP_WIN32 - #include "win32/pwd.h" --#elif defined(NETWARE) --#include "netware/pwd.h" - #else - #include <pwd.h> - #endif -@@ -120,8 +110,8 @@ PHPAPI int php_check_specific_open_based - /* Handler for basedirs that end with a / */ - resolved_basedir_len = strlen(resolved_basedir); - if (basedir[strlen(basedir) - 1] == PHP_DIR_SEPARATOR) { -- if (resolved_basedir[resolved_basedir_len - 1] == '/') { -- resolved_basedir[resolved_basedir_len - 1] = PHP_DIR_SEPARATOR; -+ if (resolved_basedir[resolved_basedir_len - 1] != PHP_DIR_SEPARATOR) { -+ resolved_basedir[resolved_basedir_len] = PHP_DIR_SEPARATOR; - resolved_basedir[++resolved_basedir_len] = '\0'; - } - } diff --git a/dev-php/mod_php/files/php4.3.11-gd_safe_mode.patch b/dev-php/mod_php/files/php4.3.11-gd_safe_mode.patch deleted file mode 100644 index 19011120eea2..000000000000 --- a/dev-php/mod_php/files/php4.3.11-gd_safe_mode.patch +++ /dev/null @@ -1,39 +0,0 @@ ---- ext/gd/gd.c 2005/01/17 17:07:57 1.221.2.54 -+++ ext/gd/gd.c 2005/10/06 20:44:52 1.221.2.56.2.1 -@@ -18,7 +18,7 @@ - +----------------------------------------------------------------------+ - */ - --/* $Id: gd.c,v 1.221.2.54 2005/01/17 17:07:57 sniper Exp $ */ -+/* $Id: gd.c,v 1.221.2.56.2.1 2005/10/06 20:44:52 iliaa Exp $ */ - - /* gd 1.2 is copyright 1994, 1995, Quest Protein Database Center, - Cold Spring Harbor Labs. */ -@@ -1644,7 +1644,7 @@ static void _php_image_output(INTERNAL_F - } - - if ((argc == 2) || (argc > 2 && Z_STRLEN_PP(file))) { -- if (!fn || fn == empty_string || php_check_open_basedir(fn TSRMLS_CC)) { -+ if (!fn || fn == empty_string || php_check_open_basedir(fn TSRMLS_CC) || (PG(safe_mode) && !php_checkuid(fn, "rb+", CHECKUID_CHECK_FILE_AND_DIR))) { - php_error_docref(NULL TSRMLS_CC, E_WARNING, "Invalid filename '%s'", fn); - RETURN_FALSE; - } -@@ -1699,7 +1699,7 @@ static void _php_image_output(INTERNAL_F - char buf[4096]; - char *path; - -- tmp = php_open_temporary_file("", "", &path TSRMLS_CC); -+ tmp = php_open_temporary_file(NULL, NULL, &path TSRMLS_CC); - if (tmp == NULL) { - php_error_docref(NULL TSRMLS_CC, E_WARNING, "Unable to open temporary file"); - RETURN_FALSE; -@@ -3017,7 +3017,8 @@ static void php_imagettftext_common(INTE - { - zval *IM, *EXT = NULL; - gdImagePtr im=NULL; -- int col = -1, x = -1, y = -1, str_len, fontname_len, i, brect[8]; -+ long col = -1, x = -1, y = -1; -+ int str_len, fontname_len, i, brect[8]; - double ptsize, angle; - unsigned char *str = NULL, *fontname = NULL; - char *error = NULL; diff --git a/dev-php/mod_php/files/php4.3.11-globals_overwrite.patch b/dev-php/mod_php/files/php4.3.11-globals_overwrite.patch deleted file mode 100644 index fea8c7a1ec50..000000000000 --- a/dev-php/mod_php/files/php4.3.11-globals_overwrite.patch +++ /dev/null @@ -1,548 +0,0 @@ ---- ext/standard/array.c 2004-12-23 17:40:03.000000000 +0100 -+++ ext/standard/array.c 2005-10-31 23:26:23.000000000 +0100 -@@ -22,7 +22,7 @@ - */ - - --/* $Id: array.c,v 1.199.2.42 2004/12/23 16:40:03 tony2001 Exp $ */ -+/* $Id: array.c,v 1.199.2.44.2.9 2005/10/03 14:05:07 iliaa Exp $ */ - - #include "php.h" - #include "php_ini.h" -@@ -631,7 +640,7 @@ - s = *((Bucket **) b); - - if (f->nKeyLength) { -- Z_STRVAL(key1) = estrndup(f->arKey, f->nKeyLength); -+ Z_STRVAL(key1) = estrndup(f->arKey, f->nKeyLength-1); - Z_STRLEN(key1) = f->nKeyLength-1; - Z_TYPE(key1) = IS_STRING; - } else { -@@ -639,7 +648,7 @@ - Z_TYPE(key1) = IS_LONG; - } - if (s->nKeyLength) { -- Z_STRVAL(key2) = estrndup(s->arKey, s->nKeyLength); -+ Z_STRVAL(key2) = estrndup(s->arKey, s->nKeyLength-1); - Z_STRLEN(key2) = s->nKeyLength-1; - Z_TYPE(key2) = IS_STRING; - } else { -@@ -1243,6 +1252,10 @@ - /* break omitted intentionally */ - - case EXTR_OVERWRITE: -+ /* GLOBALS protection */ -+ if (var_exists && !strcmp(var_name, "GLOBALS")) { -+ break; -+ } - smart_str_appendl(&final_name, var_name, var_name_len); - break; - -@@ -1291,14 +1304,18 @@ - zval **orig_var; - - if (zend_hash_find(EG(active_symbol_table), final_name.c, final_name.len+1, (void **) &orig_var) == SUCCESS) { -- zval_ptr_dtor(orig_var); -- - SEPARATE_ZVAL_TO_MAKE_IS_REF(entry); - zval_add_ref(entry); - -+ zval_ptr_dtor(orig_var); -+ - *orig_var = *entry; - } else { -- (*entry)->is_ref = 1; -+ if ((*var_array)->refcount > 1) { -+ SEPARATE_ZVAL_TO_MAKE_IS_REF(entry); -+ } else { -+ (*entry)->is_ref = 1; -+ } - zval_add_ref(entry); - zend_hash_update(EG(active_symbol_table), final_name.c, final_name.len+1, (void **) entry, sizeof(zval *), NULL); - } -@@ -1818,8 +1835,8 @@ - hashtable and replace it with new one */ - new_hash = php_splice(Z_ARRVAL_P(stack), 0, 0, &args[1], argc-1, NULL); - zend_hash_destroy(Z_ARRVAL_P(stack)); -- efree(Z_ARRVAL_P(stack)); -- Z_ARRVAL_P(stack) = new_hash; -+ *Z_ARRVAL_P(stack) = *new_hash; -+ FREE_HASHTABLE(new_hash); - - /* Clean up and return the number of elements in the stack */ - efree(args); -@@ -1896,8 +1913,8 @@ - - /* Replace input array's hashtable with the new one */ - zend_hash_destroy(Z_ARRVAL_P(array)); -- efree(Z_ARRVAL_P(array)); -- Z_ARRVAL_P(array) = new_hash; -+ *Z_ARRVAL_P(array) = *new_hash; -+ FREE_HASHTABLE(new_hash); - - /* Clean up */ - if (argc == 4) -@@ -2384,8 +2401,8 @@ - - /* Copy the result hash into return value */ - zend_hash_destroy(Z_ARRVAL_P(return_value)); -- efree(Z_ARRVAL_P(return_value)); -- Z_ARRVAL_P(return_value) = new_hash; -+ *Z_ARRVAL_P(return_value) = *new_hash; -+ FREE_HASHTABLE(new_hash); - - /* Clean up */ - efree(pads); -@@ -2483,7 +2500,7 @@ - zend_hash_index_update(Z_ARRVAL_P(return_value), num_key, entry, sizeof(entry), NULL); - break; - case HASH_KEY_IS_STRING: -- new_key=estrndup(string_key,str_key_len); -+ new_key=estrndup(string_key,str_key_len - 1); - if (change_to_upper) - php_strtoupper(new_key, str_key_len - 1); - else -@@ -2609,6 +2626,15 @@ - /* copy the argument array */ - *return_value = **args[0]; - zval_copy_ctor(return_value); -+ if (return_value->value.ht == &EG(symbol_table)) { -+ HashTable *ht; -+ zval *tmp; -+ -+ ALLOC_HASHTABLE(ht); -+ zend_hash_init(ht, 0, NULL, ZVAL_PTR_DTOR, 0); -+ zend_hash_copy(ht, return_value->value.ht, (copy_ctor_func_t) zval_add_ref, (void *) &tmp, sizeof(zval *)); -+ return_value->value.ht = ht; -+ } - - /* go through the lists and look for common values */ - while (*ptrs[0]) { -@@ -2759,6 +2785,15 @@ - /* copy the argument array */ - *return_value = **args[0]; - zval_copy_ctor(return_value); -+ if (return_value->value.ht == &EG(symbol_table)) { -+ HashTable *ht; -+ zval *tmp; -+ -+ ALLOC_HASHTABLE(ht); -+ zend_hash_init(ht, 0, NULL, ZVAL_PTR_DTOR, 0); -+ zend_hash_copy(ht, return_value->value.ht, (copy_ctor_func_t) zval_add_ref, (void *) &tmp, sizeof(zval *)); -+ return_value->value.ht = ht; -+ } - - /* go through the lists and look for values of ptr[0] - that are not in the others */ -@@ -3229,8 +3264,11 @@ - efree(callback_name); - - if (ZEND_NUM_ARGS() > 2) { -- convert_to_long_ex(initial); -- result = *initial; -+ ALLOC_ZVAL(result); -+ *result = **initial; -+ zval_copy_ctor(result); -+ convert_to_long(result); -+ INIT_PZVAL(result); - } else { - MAKE_STD_ZVAL(result); - ZVAL_NULL(result); -@@ -3246,6 +3284,7 @@ - if (result) { - *return_value = *result; - zval_copy_ctor(return_value); -+ zval_ptr_dtor(&result); - } - return; - } -@@ -3282,6 +3321,7 @@ - PHP_FUNCTION(array_filter) - { - zval **input, **callback = NULL; -+ zval *array, *func = NULL; - zval **operand; - zval **args[1]; - zval *retval = NULL; -@@ -3300,9 +3340,13 @@ - php_error_docref(NULL TSRMLS_CC, E_WARNING, "The first argument should be an array"); - return; - } -+ if (callback) { -+ func = *callback; -+ } -+ array = *input; - - if (ZEND_NUM_ARGS() > 1) { -- if (!zend_is_callable(*callback, 0, &callback_name)) { -+ if (!zend_is_callable(func, 0, &callback_name)) { - php_error_docref(NULL TSRMLS_CC, E_WARNING, "The second argument, '%s', should be a valid callback", callback_name); - efree(callback_name); - return; -@@ -3311,16 +3355,16 @@ - } - - array_init(return_value); -- if (zend_hash_num_elements(Z_ARRVAL_PP(input)) == 0) -+ if (zend_hash_num_elements(Z_ARRVAL_P(array)) == 0) - return; - -- for (zend_hash_internal_pointer_reset_ex(Z_ARRVAL_PP(input), &pos); -- zend_hash_get_current_data_ex(Z_ARRVAL_PP(input), (void **)&operand, &pos) == SUCCESS; -- zend_hash_move_forward_ex(Z_ARRVAL_PP(input), &pos)) { -+ for (zend_hash_internal_pointer_reset_ex(Z_ARRVAL_P(array), &pos); -+ zend_hash_get_current_data_ex(Z_ARRVAL_P(array), (void **)&operand, &pos) == SUCCESS; -+ zend_hash_move_forward_ex(Z_ARRVAL_P(array), &pos)) { - -- if (callback) { -+ if (func) { - args[0] = operand; -- if (call_user_function_ex(EG(function_table), NULL, *callback, &retval, 1, args, 0, NULL TSRMLS_CC) == SUCCESS && retval) { -+ if (call_user_function_ex(EG(function_table), NULL, func, &retval, 1, args, 0, NULL TSRMLS_CC) == SUCCESS && retval) { - if (!zend_is_true(retval)) { - zval_ptr_dtor(&retval); - continue; -@@ -3334,7 +3378,7 @@ - continue; - - zval_add_ref(operand); -- switch (zend_hash_get_current_key_ex(Z_ARRVAL_PP(input), &string_key, &string_key_len, &num_key, 0, &pos)) { -+ switch (zend_hash_get_current_key_ex(Z_ARRVAL_P(array), &string_key, &string_key_len, &num_key, 0, &pos)) { - case HASH_KEY_IS_STRING: - zend_hash_update(Z_ARRVAL_P(return_value), string_key, - string_key_len, operand, sizeof(zval *), NULL); -@@ -3401,6 +3445,7 @@ - efree(array_pos); - return; - } -+ SEPARATE_ZVAL_IF_NOT_REF(pargs[i]); - args[i] = *pargs[i]; - array_len[i] = zend_hash_num_elements(Z_ARRVAL_PP(pargs[i])); - if (array_len[i] > maxlen) { ---- ext/standard/basic_functions.c 2005-01-18 12:01:20.000000000 +0100 -+++ ext/standard/basic_functions.c 2005-10-31 23:29:26.000000000 +0100 -@@ -17,7 +17,7 @@ - +----------------------------------------------------------------------+ - */ - --/* $Id: basic_functions.c,v 1.543.2.47 2005/01/18 11:01:20 sniper Exp $ */ -+/* $Id: basic_functions.c,v 1.543.2.51.2.3 2005/09/29 16:31:48 iliaa Exp $ */ - - #include "php.h" - #include "php_streams.h" -@@ -42,18 +42,7 @@ - #include <time.h> - #include <stdio.h> - --#ifndef NETWARE - #include <netdb.h> --#else --/*#include "netware/env.h"*/ /* Temporary */ --#ifdef NEW_LIBC /* Same headers hold good for Winsock and Berkeley sockets */ --#include <netinet/in.h> --/*#include <arpa/inet.h>*/ --#include <netdb.h> --#else --#include <sys/socket.h> --#endif --#endif - - #if HAVE_ARPA_INET_H - # include <arpa/inet.h> -@@ -944,6 +933,13 @@ - static void php_putenv_destructor(putenv_entry *pe) - { - if (pe->previous_value) { -+#if _MSC_VER -+ /* VS.Net has a bug in putenv() when setting a variable that -+ * is already set; if the SetEnvironmentVariable() API call -+ * fails, the Crt will double free() a string. -+ * We try to avoid this by setting our own value first */ -+ SetEnvironmentVariable(pe->key, "bugbug"); -+#endif - putenv(pe->previous_value); - } else { - # if HAVE_UNSETENV -@@ -1232,11 +1228,10 @@ - } - STR_FREE(BG(locale_string)); - -- if (FG(stream_wrappers)) { -- zend_hash_destroy(FG(stream_wrappers)); -- efree(FG(stream_wrappers)); -- FG(stream_wrappers) = NULL; -- } -+ /* -+ FG(stream_wrappers) are destroyed -+ during php_request_shutdown() -+ */ - - PHP_RSHUTDOWN(fsock) (SHUTDOWN_FUNC_ARGS_PASSTHRU); - PHP_RSHUTDOWN(filestat) (SHUTDOWN_FUNC_ARGS_PASSTHRU); -@@ -1430,6 +1425,14 @@ - } - } - -+#if _MSC_VER -+ /* VS.Net has a bug in putenv() when setting a variable that -+ * is already set; if the SetEnvironmentVariable() API call -+ * fails, the Crt will double free() a string. -+ * We try to avoid this by setting our own value first */ -+ SetEnvironmentVariable(pe.key, "bugbug"); -+#endif -+ - if (putenv(pe.putenv_string) == 0) { /* success */ - zend_hash_add(&BG(putenv_ht), pe.key, pe.key_len+1, (void **) &pe, sizeof(putenv_entry), NULL); - #ifdef HAVE_TZSET -@@ -2089,17 +2092,21 @@ - static int user_shutdown_function_call(php_shutdown_function_entry *shutdown_function_entry TSRMLS_DC) - { - zval retval; -+ char *function_name = NULL; - -- if (call_user_function( EG(function_table), NULL, -- shutdown_function_entry->arguments[0], -- &retval, -- shutdown_function_entry->arg_count - 1, -- shutdown_function_entry->arguments + 1 -- TSRMLS_CC ) == SUCCESS ) { -+ if (!zend_is_callable(shutdown_function_entry->arguments[0], 0, &function_name)) { -+ php_error(E_WARNING, "(Registered shutdown functions) Unable to call %s() - function does not exist", function_name); -+ } else if (call_user_function(EG(function_table), NULL, -+ shutdown_function_entry->arguments[0], -+ &retval, -+ shutdown_function_entry->arg_count - 1, -+ shutdown_function_entry->arguments + 1 -+ TSRMLS_CC ) == SUCCESS) -+ { - zval_dtor(&retval); -- -- } else { -- php_error_docref(NULL TSRMLS_CC, E_WARNING, "Unable to call %s() - function does not exist", Z_STRVAL_P(shutdown_function_entry->arguments[0])); -+ } -+ if (function_name) { -+ efree(function_name); - } - return 0; - } -@@ -2192,6 +2199,7 @@ - PHP_FUNCTION(register_shutdown_function) - { - php_shutdown_function_entry shutdown_function_entry; -+ char *function_name = NULL; - int i; - - shutdown_function_entry.arg_count = ZEND_NUM_ARGS(); -@@ -2200,26 +2208,31 @@ - WRONG_PARAM_COUNT; - } - -- shutdown_function_entry.arguments = (pval **) safe_emalloc(sizeof(pval *), shutdown_function_entry.arg_count, 0); -+ shutdown_function_entry.arguments = (zval **) safe_emalloc(sizeof(zval *), shutdown_function_entry.arg_count, 0); - - if (zend_get_parameters_array(ht, shutdown_function_entry.arg_count, shutdown_function_entry.arguments) == FAILURE) { - RETURN_FALSE; - } - -- /* Prevent entering of anything but arrays/strings */ -- if (Z_TYPE_P(shutdown_function_entry.arguments[0]) != IS_ARRAY) { -- convert_to_string(shutdown_function_entry.arguments[0]); -- } -- -- if (!BG(user_shutdown_function_names)) { -- ALLOC_HASHTABLE(BG(user_shutdown_function_names)); -- zend_hash_init(BG(user_shutdown_function_names), 0, NULL, (void (*)(void *)) user_shutdown_function_dtor, 0); -- } -+ /* Prevent entering of anything but valid callback (syntax check only!) */ -+ if (!zend_is_callable(shutdown_function_entry.arguments[0], 1, &function_name)) { -+ php_error_docref(NULL TSRMLS_CC, E_WARNING, "Invalid shutdown callback '%s' passed", function_name); -+ efree(shutdown_function_entry.arguments); -+ RETVAL_FALSE; -+ } else { -+ if (!BG(user_shutdown_function_names)) { -+ ALLOC_HASHTABLE(BG(user_shutdown_function_names)); -+ zend_hash_init(BG(user_shutdown_function_names), 0, NULL, (void (*)(void *)) user_shutdown_function_dtor, 0); -+ } - -- for (i = 0; i < shutdown_function_entry.arg_count; i++) { -- shutdown_function_entry.arguments[i]->refcount++; -+ for (i = 0; i < shutdown_function_entry.arg_count; i++) { -+ shutdown_function_entry.arguments[i]->refcount++; -+ } -+ zend_hash_next_index_insert(BG(user_shutdown_function_names), &shutdown_function_entry, sizeof(php_shutdown_function_entry), NULL); -+ } -+ if (function_name) { -+ efree(function_name); - } -- zend_hash_next_index_insert(BG(user_shutdown_function_names), &shutdown_function_entry, sizeof(php_shutdown_function_entry), NULL); - } - /* }}} */ - -@@ -3014,11 +3027,25 @@ - prefix = va_arg(args, char *); - prefix_len = va_arg(args, uint); - -- new_key_len = prefix_len + hash_key->nKeyLength; -- new_key = (char *) emalloc(new_key_len); -+ if (!prefix_len) { -+ if (!hash_key->nKeyLength) { -+ php_error_docref(NULL TSRMLS_CC, E_WARNING, "Numeric key detected - possible security hazard."); -+ return 0; -+ } else if (!strcmp(hash_key->arKey, "GLOBALS")) { -+ php_error_docref(NULL TSRMLS_CC, E_WARNING, "Attempted GLOBALS variable overwrite."); -+ return 0; -+ } -+ } -+ -+ if (hash_key->nKeyLength) { -+ new_key_len = prefix_len + hash_key->nKeyLength; -+ new_key = (char *) emalloc(new_key_len); - -- memcpy(new_key, prefix, prefix_len); -- memcpy(new_key+prefix_len, hash_key->arKey, hash_key->nKeyLength); -+ memcpy(new_key, prefix, prefix_len); -+ memcpy(new_key+prefix_len, hash_key->arKey, hash_key->nKeyLength); -+ } else { -+ new_key_len = spprintf(&new_key, 0, "%s%ld", prefix, hash_key->h); -+ } - - zend_hash_del(&EG(symbol_table), new_key, new_key_len); - ZEND_SET_SYMBOL_WITH_LENGTH(&EG(symbol_table), new_key, new_key_len, *var, (*var)->refcount+1, 0); ---- ext/standard/string.c 2005-01-20 18:57:41.000000000 +0100 -+++ ext/standard/string.c 2005-10-31 23:34:37.000000000 +0100 -@@ -18,7 +18,7 @@ - +----------------------------------------------------------------------+ - */ - --/* $Id: string.c,v 1.333.2.48 2005/01/20 17:57:41 iliaa Exp $ */ -+/* $Id: string.c,v 1.333.2.52.2.1 2005/09/28 22:34:04 iliaa Exp $ */ - - /* Synced with php 3.0 revision 1.193 1999-06-16 [ssb] */ - -@@ -1317,8 +1317,6 @@ - if (!Z_STRLEN_PP(needle)) { - php_error_docref(NULL TSRMLS_CC, E_WARNING, "Empty delimiter."); - efree(haystack_orig); -- zval_ptr_dtor(haystack); -- zval_ptr_dtor(needle); - RETURN_FALSE; - } - -@@ -1339,8 +1337,6 @@ - RETVAL_FALSE; - } - -- zval_ptr_dtor(haystack); -- zval_ptr_dtor(needle); - efree(haystack_orig); - } - /* }}} */ -@@ -1576,7 +1572,13 @@ - } - - if (chunklen > Z_STRLEN_PP(p_str)) { -- RETURN_STRINGL(Z_STRVAL_PP(p_str), Z_STRLEN_PP(p_str), 1); -+ /* to maintain BC, we must return original string + ending */ -+ result_len = endlen + Z_STRLEN_PP(p_str); -+ result = emalloc(result_len + 1); -+ memcpy(result, Z_STRVAL_PP(p_str), Z_STRLEN_PP(p_str)); -+ memcpy(result + Z_STRLEN_PP(p_str), end, endlen); -+ result[result_len] = '\0'; -+ RETURN_STRINGL(result, result_len, 0); - } - - if (!Z_STRLEN_PP(p_str)) { -@@ -3169,7 +3179,6 @@ - zval *sarg; - char *res = NULL; - int argCount; -- int old_rg; - - argCount = ARG_COUNT(ht); - if (argCount < 1 || argCount > 2 || zend_get_parameters_ex(argCount, &arg, &arrayArg) == FAILURE) { -@@ -3182,19 +3191,18 @@ - res = estrndup(Z_STRVAL_P(sarg), Z_STRLEN_P(sarg)); - } - -- old_rg = PG(register_globals); - if (argCount == 1) { -- PG(register_globals) = 1; -- sapi_module.treat_data(PARSE_STRING, res, NULL TSRMLS_CC); -+ zval tmp; -+ Z_ARRVAL(tmp) = EG(active_symbol_table); -+ -+ sapi_module.treat_data(PARSE_STRING, res, &tmp TSRMLS_CC); - } else { -- PG(register_globals) = 0; - /* Clear out the array that was passed in. */ - zval_dtor(*arrayArg); - array_init(*arrayArg); - - sapi_module.treat_data(PARSE_STRING, res, *arrayArg TSRMLS_CC); - } -- PG(register_globals) = old_rg; - } - /* }}} */ - ---- main/php_variables.c 2004-10-18 17:08:46.000000000 +0200 -+++ main/php_variables.c 2005-10-31 23:39:38.000000000 +0100 -@@ -16,7 +16,7 @@ - | Zeev Suraski <zeev@zend.com> | - +----------------------------------------------------------------------+ - */ --/* $Id: php_variables.c,v 1.45.2.8 2004/10/18 15:08:46 tony2001 Exp $ */ -+/* $Id: php_variables.c,v 1.45.2.13.2.4 2005/10/02 11:33:27 rrichards Exp $ */ - - #include <stdio.h> - #include "php.h" -@@ -73,6 +73,10 @@ - symtable1 = Z_ARRVAL_P(track_vars_array); - } else if (PG(register_globals)) { - symtable1 = EG(active_symbol_table); -+ /* GLOBALS hijack attempt, reject parameter */ -+ if (!strncmp("GLOBALS", var, sizeof("GLOBALS")) || !strncmp("GLOBALS", var, sizeof("GLOBALS[")-1)) { -+ return; -+ } - } - if (!symtable1) { - /* Nothing to do */ -@@ -99,6 +103,13 @@ - zval_dtor(val); - return; - } -+ -+ /* GLOBALS hijack attempt, reject parameter */ -+ if (symtable1 == EG(active_symbol_table) && !strcmp("GLOBALS", var)) { -+ zval_dtor(val); -+ return; -+ } -+ - /* ensure that we don't have spaces or dots in the variable name (not binary safe) */ - for (p=var; *p; p++) { - switch(*p) { -@@ -182,11 +193,25 @@ - if (!index) { - zend_hash_next_index_insert(symtable1, &gpc_element, sizeof(zval *), (void **) &gpc_element_p); - } else { -+ zval **tmp; -+ - if (PG(magic_quotes_gpc) && (index!=var)) { - char *escaped_index = php_addslashes(index, index_len, &index_len, 0 TSRMLS_CC); -+ -+ if (PG(http_globals)[TRACK_VARS_COOKIE] && symtable1 == Z_ARRVAL_P(PG(http_globals)[TRACK_VARS_COOKIE]) && -+ zend_hash_find(symtable1, escaped_index, index_len+1, (void **) &tmp) != FAILURE) { -+ efree(escaped_index); -+ break; -+ } -+ - zend_hash_update(symtable1, escaped_index, index_len+1, &gpc_element, sizeof(zval *), (void **) &gpc_element_p); - efree(escaped_index); - } else { -+ if (PG(http_globals)[TRACK_VARS_COOKIE] && symtable1 == Z_ARRVAL_P(PG(http_globals)[TRACK_VARS_COOKIE]) && -+ zend_hash_find(symtable1, index, index_len+1, (void **) &tmp) != FAILURE) { -+ break; -+ } -+ - zend_hash_update(symtable1, index, index_len+1, &gpc_element, sizeof(zval *), (void **) &gpc_element_p); - } - } diff --git a/dev-php/mod_php/files/php4.3.11-imap-symlink.diff b/dev-php/mod_php/files/php4.3.11-imap-symlink.diff deleted file mode 100644 index 8e80f433be44..000000000000 --- a/dev-php/mod_php/files/php4.3.11-imap-symlink.diff +++ /dev/null @@ -1,30 +0,0 @@ ---- configure 2005-09-18 02:13:48.000000000 +0200 -+++ configure 2005-09-18 16:45:07.000000000 +0200 -@@ -42421,12 +42421,6 @@ - { echo "configure: error: Cannot find rfc822.h. Please check your c-client installation." 1>&2; exit 1; } - fi - -- if test -r "$IMAP_DIR/c-client/c-client.a"; then -- ln -s "$IMAP_DIR/c-client/c-client.a" "$IMAP_DIR/c-client/libc-client.a" >/dev/null 2>&1 -- elif test -r "$IMAP_DIR/lib/c-client.a"; then -- ln -s "$IMAP_DIR/lib/c-client.a" "$IMAP_DIR/lib/libc-client.a" >/dev/null 2>&1 -- fi -- - for lib in c-client4 c-client imap; do - IMAP_LIB=$lib - ---- ext/imap/config.m4 2005-09-04 02:48:47.000000000 +0200 -+++ ext/imap/config.m4 2005-09-04 02:49:05.000000000 +0200 -@@ -158,12 +158,6 @@ - AC_MSG_ERROR(Cannot find rfc822.h. Please check your c-client installation.) - fi - -- if test -r "$IMAP_DIR/c-client/c-client.a"; then -- ln -s "$IMAP_DIR/c-client/c-client.a" "$IMAP_DIR/c-client/libc-client.a" >/dev/null 2>&1 -- elif test -r "$IMAP_DIR/lib/c-client.a"; then -- ln -s "$IMAP_DIR/lib/c-client.a" "$IMAP_DIR/lib/libc-client.a" >/dev/null 2>&1 -- fi -- - for lib in c-client4 c-client imap; do - IMAP_LIB=$lib - IMAP_LIB_CHK(lib) diff --git a/dev-php/mod_php/files/php4.3.11-pcre-security.patch b/dev-php/mod_php/files/php4.3.11-pcre-security.patch deleted file mode 100644 index ba7b414cfc40..000000000000 --- a/dev-php/mod_php/files/php4.3.11-pcre-security.patch +++ /dev/null @@ -1,96 +0,0 @@ ---- configure 2005-09-18 02:13:48.000000000 +0200 -+++ configure 2005-09-18 21:07:09.000000000 +0200 -@@ -1682,7 +1682,7 @@ - MAJOR_VERSION=4 - MINOR_VERSION=3 - RELEASE_VERSION=11 --EXTRA_VERSION="" -+EXTRA_VERSION="-pl1-gentoo" - VERSION="$MAJOR_VERSION.$MINOR_VERSION.$RELEASE_VERSION$EXTRA_VERSION" - - -@@ -70903,7 +70897,7 @@ - ext_builddir=ext/pcre - ext_srcdir=$abs_srcdir/ext/pcre - -- ac_extra=`echo "-DSUPPORT_UTF8 -DLINK_SIZE=2 -DPOSIX_MALLOC_THRESHOLD=10 -I@ext_srcdir@/pcrelib"|sed s#@ext_srcdir@#$ext_srcdir#g` -+ ac_extra=`echo "-DEXPORT= -DNEWLINE=10 -DSUPPORT_UTF8 -DSUPPORT_UCP -DLINK_SIZE=2 -DPOSIX_MALLOC_THRESHOLD=10 -DMATCH_LIMIT=10000000 -I@ext_srcdir@/pcrelib"|sed s#@ext_srcdir@#$ext_srcdir#g` - - if test "$ext_shared" != "shared" && test "$ext_shared" != "yes" && test "" != "cli"; then - -@@ -70927,7 +70921,7 @@ - - - old_IFS=$IFS -- for ac_src in pcrelib/maketables.c pcrelib/get.c pcrelib/study.c pcrelib/pcre.c php_pcre.c; do -+ for ac_src in pcrelib/pcre_chartables.c pcrelib/pcre_compile.c pcrelib/pcre_config.c pcrelib/pcre_dfa_exec.c pcrelib/pcre_exec.c pcrelib/pcre_fullinfo.c pcrelib/pcre_get.c pcrelib/pcre_globals.c pcrelib/pcre_info.c pcrelib/pcre_maketables.c pcrelib/pcre_ord2utf8.c pcrelib/pcre_printint.c pcrelib/pcre_refcount.c pcrelib/pcre_study.c pcrelib/pcre_tables.c pcrelib/pcre_try_flipped.c pcrelib/pcre_ucp_findchar.c pcrelib/pcre_valid_utf8.c pcrelib/pcre_version.c pcrelib/pcre_xclass.c php_pcre.c; do - - IFS=. - set $ac_src -@@ -70973,7 +70967,7 @@ - - - old_IFS=$IFS -- for ac_src in pcrelib/maketables.c pcrelib/get.c pcrelib/study.c pcrelib/pcre.c php_pcre.c; do -+ for ac_src in pcrelib/pcre_chartables.c pcrelib/pcre_compile.c pcrelib/pcre_config.c pcrelib/pcre_dfa_exec.c pcrelib/pcre_exec.c pcrelib/pcre_fullinfo.c pcrelib/pcre_get.c pcrelib/pcre_globals.c pcrelib/pcre_info.c pcrelib/pcre_maketables.c pcrelib/pcre_ord2utf8.c pcrelib/pcre_printint.c pcrelib/pcre_refcount.c pcrelib/pcre_study.c pcrelib/pcre_tables.c pcrelib/pcre_try_flipped.c pcrelib/pcre_ucp_findchar.c pcrelib/pcre_valid_utf8.c pcrelib/pcre_version.c pcrelib/pcre_xclass.c php_pcre.c; do - - IFS=. - set $ac_src -@@ -71049,7 +71043,7 @@ - - - old_IFS=$IFS -- for ac_src in pcrelib/maketables.c pcrelib/get.c pcrelib/study.c pcrelib/pcre.c php_pcre.c; do -+ for ac_src in pcrelib/pcre_chartables.c pcrelib/pcre_compile.c pcrelib/pcre_config.c pcrelib/pcre_dfa_exec.c pcrelib/pcre_exec.c pcrelib/pcre_fullinfo.c pcrelib/pcre_get.c pcrelib/pcre_globals.c pcrelib/pcre_info.c pcrelib/pcre_maketables.c pcrelib/pcre_ord2utf8.c pcrelib/pcre_printint.c pcrelib/pcre_refcount.c pcrelib/pcre_study.c pcrelib/pcre_tables.c pcrelib/pcre_try_flipped.c pcrelib/pcre_ucp_findchar.c pcrelib/pcre_valid_utf8.c pcrelib/pcre_version.c pcrelib/pcre_xclass.c php_pcre.c; do - - IFS=. - set $ac_src -@@ -71092,7 +71086,7 @@ - - - old_IFS=$IFS -- for ac_src in pcrelib/maketables.c pcrelib/get.c pcrelib/study.c pcrelib/pcre.c php_pcre.c; do -+ for ac_src in pcrelib/pcre_chartables.c pcrelib/pcre_compile.c pcrelib/pcre_config.c pcrelib/pcre_dfa_exec.c pcrelib/pcre_exec.c pcrelib/pcre_fullinfo.c pcrelib/pcre_get.c pcrelib/pcre_globals.c pcrelib/pcre_info.c pcrelib/pcre_maketables.c pcrelib/pcre_ord2utf8.c pcrelib/pcre_printint.c pcrelib/pcre_refcount.c pcrelib/pcre_study.c pcrelib/pcre_tables.c pcrelib/pcre_try_flipped.c pcrelib/pcre_ucp_findchar.c pcrelib/pcre_valid_utf8.c pcrelib/pcre_version.c pcrelib/pcre_xclass.c php_pcre.c; do - - IFS=. - set $ac_src -@@ -71293,7 +71287,7 @@ - ext_builddir=ext/pcre - ext_srcdir=$abs_srcdir/ext/pcre - -- ac_extra=`echo "-DSUPPORT_UTF8 -DLINK_SIZE=2 -DPOSIX_MALLOC_THRESHOLD=10"|sed s#@ext_srcdir@#$ext_srcdir#g` -+ ac_extra=`echo "-DEXPORT= -DNEWLINE=10 -DSUPPORT_UTF8 -DSUPPORT_UCP -DLINK_SIZE=2 -DPOSIX_MALLOC_THRESHOLD=10 -DMATCH_LIMIT=10000000"|sed s#@ext_srcdir@#$ext_srcdir#g` - - if test "$ext_shared" != "shared" && test "$ext_shared" != "yes" && test "" != "cli"; then - ---- configure.in 2005-09-17 21:00:43.000000000 +0200 -+++ configure.in 2005-09-17 21:00:18.000000000 +0200 -@@ -41,7 +41,7 @@ - MAJOR_VERSION=4 - MINOR_VERSION=3 - RELEASE_VERSION=11 --EXTRA_VERSION="" -+EXTRA_VERSION="-pl1-gentoo" - VERSION="$MAJOR_VERSION.$MINOR_VERSION.$RELEASE_VERSION$EXTRA_VERSION" - - dnl Define where extension directories are located in the configure context ---- ext/pcre/config.m4 2003/12/16 22:14:55 1.29.2.5 -+++ ext/pcre/config.m4 2005/08/09 17:41:56 1.29.2.7.2.1 -@@ -13,7 +13,7 @@ PHP_ARG_WITH(pcre-regex,for PCRE support - - if test "$PHP_PCRE_REGEX" != "no"; then - if test "$PHP_PCRE_REGEX" = "yes"; then -- PHP_NEW_EXTENSION(pcre, pcrelib/maketables.c pcrelib/get.c pcrelib/study.c pcrelib/pcre.c php_pcre.c, $ext_shared,,-DSUPPORT_UTF8 -DLINK_SIZE=2 -DPOSIX_MALLOC_THRESHOLD=10 -I@ext_srcdir@/pcrelib) -+ PHP_NEW_EXTENSION(pcre, pcrelib/pcre_chartables.c pcrelib/pcre_compile.c pcrelib/pcre_config.c pcrelib/pcre_dfa_exec.c pcrelib/pcre_exec.c pcrelib/pcre_fullinfo.c pcrelib/pcre_get.c pcrelib/pcre_globals.c pcrelib/pcre_info.c pcrelib/pcre_maketables.c pcrelib/pcre_ord2utf8.c pcrelib/pcre_printint.c pcrelib/pcre_refcount.c pcrelib/pcre_study.c pcrelib/pcre_tables.c pcrelib/pcre_try_flipped.c pcrelib/pcre_ucp_findchar.c pcrelib/pcre_valid_utf8.c pcrelib/pcre_version.c pcrelib/pcre_xclass.c php_pcre.c, $ext_shared,,-DEXPORT= -DNEWLINE=10 -DSUPPORT_UTF8 -DSUPPORT_UCP -DLINK_SIZE=2 -DPOSIX_MALLOC_THRESHOLD=10 -DMATCH_LIMIT=10000000 -I@ext_srcdir@/pcrelib) - PHP_ADD_BUILD_DIR($ext_builddir/pcrelib) - AC_DEFINE(HAVE_BUNDLED_PCRE, 1, [ ]) - else -@@ -50,7 +50,7 @@ if test "$PHP_PCRE_REGEX" != "no"; then - - AC_DEFINE(HAVE_PCRE, 1, [ ]) - PHP_ADD_INCLUDE($PCRE_INCDIR) -- PHP_NEW_EXTENSION(pcre, php_pcre.c, $ext_shared,,-DSUPPORT_UTF8 -DLINK_SIZE=2 -DPOSIX_MALLOC_THRESHOLD=10) -+ PHP_NEW_EXTENSION(pcre, php_pcre.c, $ext_shared,,-DEXPORT= -DNEWLINE=10 -DSUPPORT_UTF8 -DSUPPORT_UCP -DLINK_SIZE=2 -DPOSIX_MALLOC_THRESHOLD=10 -DMATCH_LIMIT=10000000) - fi - PHP_SUBST(PCRE_SHARED_LIBADD) - fi diff --git a/dev-php/mod_php/files/php4.3.11-phpinfo_xss.patch b/dev-php/mod_php/files/php4.3.11-phpinfo_xss.patch deleted file mode 100644 index 2c7d9991794f..000000000000 --- a/dev-php/mod_php/files/php4.3.11-phpinfo_xss.patch +++ /dev/null @@ -1,75 +0,0 @@ ---- ext/standard/info.c 2004-06-09 17:10:19.000000000 +0200 -+++ ext/standard/info.c 2005-11-01 01:22:42.000000000 +0100 -@@ -18,7 +18,7 @@ - +----------------------------------------------------------------------+ - */ - --/* $Id: info.c,v 1.218.2.16 2004/06/09 15:10:19 iliaa Exp $ */ -+/* $Id: info.c,v 1.218.2.18.2.4 2005/08/16 00:26:02 iliaa Exp $ */ - - #include "php.h" - #include "php_ini.h" -@@ -133,10 +133,21 @@ - PUTS(" => "); - } - if (Z_TYPE_PP(tmp) == IS_ARRAY) { -+ zval *tmp3; -+ MAKE_STD_ZVAL(tmp3); - if (!sapi_module.phpinfo_as_text) { - PUTS("<pre>"); - } -+ php_start_ob_buffer(NULL, 4096, 1 TSRMLS_CC); - zend_print_zval_r(*tmp, 0); -+ php_ob_get_buffer(tmp3 TSRMLS_CC); -+ php_end_ob_buffer(0, 0 TSRMLS_CC); -+ -+ elem_esc = php_info_html_esc(Z_STRVAL_P(tmp3) TSRMLS_CC); -+ PUTS(elem_esc); -+ efree(elem_esc); -+ zval_ptr_dtor(&tmp3); -+ - if (!sapi_module.phpinfo_as_text) { - PUTS("</pre>"); - } -@@ -196,7 +207,7 @@ - PHPAPI char *php_info_html_esc(char *string TSRMLS_DC) - { - int new_len; -- return php_escape_html_entities(string, strlen(string), &new_len, 0, ENT_NOQUOTES, NULL TSRMLS_CC); -+ return php_escape_html_entities(string, strlen(string), &new_len, 0, ENT_QUOTES, NULL TSRMLS_CC); - } - /* }}} */ - -@@ -408,7 +419,9 @@ - if (expose_php && !sapi_module.phpinfo_as_text) { - PUTS("<a href=\"http://www.php.net/\"><img border=\"0\" src=\""); - if (SG(request_info).request_uri) { -- PUTS(SG(request_info).request_uri); -+ char *elem_esc = php_info_html_esc(SG(request_info).request_uri TSRMLS_CC); -+ PUTS(elem_esc); -+ efree(elem_esc); - } - if ((ta->tm_mon==3) && (ta->tm_mday==1)) { - PUTS("?="PHP_EGG_LOGO_GUID"\" alt=\"Nadia!\" /></a>"); -@@ -510,7 +529,9 @@ - if (expose_php && !sapi_module.phpinfo_as_text) { - PUTS("<a href=\"http://www.zend.com/\"><img border=\"0\" src=\""); - if (SG(request_info).request_uri) { -- PUTS(SG(request_info).request_uri); -+ char *elem_esc = php_info_html_esc(SG(request_info).request_uri TSRMLS_CC); -+ PUTS(elem_esc); -+ efree(elem_esc); - } - PUTS("?="ZEND_LOGO_GUID"\" alt=\"Zend logo\" /></a>\n"); - } -@@ -525,7 +546,9 @@ - php_info_print_hr(); - PUTS("<h1><a href=\""); - if (SG(request_info).request_uri) { -- PUTS(SG(request_info).request_uri); -+ char *elem_esc = php_info_html_esc(SG(request_info).request_uri TSRMLS_CC); -+ PUTS(elem_esc); -+ efree(elem_esc); - } - PUTS("?=PHPB8B5F2A0-3C92-11d3-A3A9-4C7B08C10000\">"); - PUTS("PHP Credits"); diff --git a/dev-php/mod_php/files/php4.3.11-pspell-ext-segf.patch b/dev-php/mod_php/files/php4.3.11-pspell-ext-segf.patch deleted file mode 100644 index a62c42fec553..000000000000 --- a/dev-php/mod_php/files/php4.3.11-pspell-ext-segf.patch +++ /dev/null @@ -1,317 +0,0 @@ ---- ext/pspell/pspell.c 2003-08-28 22:01:29.000000000 +0200 -+++ ext/pspell/pspell.c 2005-10-26 23:24:22.000000000 +0200 -@@ -16,7 +16,7 @@ - +----------------------------------------------------------------------+ - */ - --/* $Id: pspell.c,v 1.28.8.5 2003/08/28 20:01:29 iliaa Exp $ */ -+/* $Id: pspell.c,v 1.28.8.5.4.2 2005/10/17 15:43:10 iliaa Exp $ */ - - #define IS_EXT_MODULE - -@@ -99,6 +99,22 @@ - delete_pspell_config(config); - } - -+#define PSPELL_FETCH_CONFIG \ -+ convert_to_long_ex(conf); \ -+ config = (PspellConfig *) zend_list_find(Z_LVAL_PP(conf), &type); \ -+ if (config == NULL || type != le_pspell_config) { \ -+ php_error_docref(NULL TSRMLS_CC, E_WARNING, "%ld is not a PSPELL config index", Z_LVAL_PP(conf)); \ -+ RETURN_FALSE; \ -+ } \ -+ -+#define PSPELL_FETCH_MANAGER \ -+ convert_to_long_ex(scin); \ -+ manager = (PspellManager *) zend_list_find(Z_LVAL_PP(scin), &type); \ -+ if (!manager || type != le_pspell) { \ -+ php_error_docref(NULL TSRMLS_CC, E_WARNING, "%ld is not a PSPELL result index", Z_LVAL_PP(scin)); \ -+ RETURN_FALSE; \ -+ } \ -+ - /* {{{ PHP_MINIT_FUNCTION - */ - PHP_MINIT_FUNCTION(pspell) -@@ -350,14 +366,8 @@ - WRONG_PARAM_COUNT; - } - -- convert_to_long_ex(conf); -- config = (PspellConfig *) zend_list_find(Z_LVAL_PP(conf), &type); -+ PSPELL_FETCH_CONFIG; - -- if (config == NULL || type != le_pspell_config) { -- php_error(E_WARNING, "%ld is not a PSPELL config index", Z_LVAL_PP(conf)); -- RETURN_FALSE; -- } -- - ret = new_pspell_manager(config); - - if(pspell_error_number(ret) != 0){ -@@ -385,13 +395,9 @@ - WRONG_PARAM_COUNT; - } - -- convert_to_long_ex(scin); - convert_to_string_ex(word); -- manager = (PspellManager *) zend_list_find(Z_LVAL_PP(scin), &type); -- if(!manager){ -- php_error(E_WARNING, "%ld is not a PSPELL result index",Z_LVAL_PP(scin)); -- RETURN_FALSE; -- } -+ -+ PSPELL_FETCH_MANAGER; - - if(pspell_manager_check(manager, Z_STRVAL_PP(word))){ - RETURN_TRUE; -@@ -417,13 +423,9 @@ - WRONG_PARAM_COUNT; - } - -- convert_to_long_ex(scin); - convert_to_string_ex(word); -- manager = (PspellManager *) zend_list_find(Z_LVAL_PP(scin), &type); -- if(!manager){ -- php_error(E_WARNING, "%ld is not a PSPELL result index",Z_LVAL_PP(scin)); -- RETURN_FALSE; -- } -+ -+ PSPELL_FETCH_MANAGER; - - array_init(return_value); - -@@ -455,14 +457,10 @@ - WRONG_PARAM_COUNT; - } - -- convert_to_long_ex(scin); - convert_to_string_ex(miss); - convert_to_string_ex(corr); -- manager = (PspellManager *) zend_list_find(Z_LVAL_PP(scin), &type); -- if(!manager){ -- php_error(E_WARNING, "%ld is not a PSPELL result index",Z_LVAL_PP(scin)); -- RETURN_FALSE; -- } -+ -+ PSPELL_FETCH_MANAGER; - - pspell_manager_store_replacement(manager, Z_STRVAL_PP(miss), Z_STRVAL_PP(corr)); - if(pspell_manager_error_number(manager) == 0){ -@@ -488,13 +486,9 @@ - WRONG_PARAM_COUNT; - } - -- convert_to_long_ex(scin); - convert_to_string_ex(word); -- manager = (PspellManager *) zend_list_find(Z_LVAL_PP(scin), &type); -- if(!manager){ -- php_error(E_WARNING, "%ld is not a PSPELL result index",Z_LVAL_PP(scin)); -- RETURN_FALSE; -- } -+ -+ PSPELL_FETCH_MANAGER; - - /*If the word is empty, we have to return; otherwise we'll segfault! ouch!*/ - if(Z_STRLEN_PP(word) == 0){ -@@ -525,13 +519,9 @@ - WRONG_PARAM_COUNT; - } - -- convert_to_long_ex(scin); - convert_to_string_ex(word); -- manager = (PspellManager *) zend_list_find(Z_LVAL_PP(scin), &type); -- if(!manager){ -- php_error(E_WARNING, "%ld is not a PSPELL result index",Z_LVAL_PP(scin)); -- RETURN_FALSE; -- } -+ -+ PSPELL_FETCH_MANAGER; - - /*If the word is empty, we have to return; otherwise we'll segfault! ouch!*/ - if(Z_STRLEN_PP(word) == 0){ -@@ -562,12 +552,7 @@ - WRONG_PARAM_COUNT; - } - -- convert_to_long_ex(scin); -- manager = (PspellManager *) zend_list_find(Z_LVAL_PP(scin), &type); -- if(!manager){ -- php_error(E_WARNING, "%ld is not a PSPELL result index",Z_LVAL_PP(scin)); -- RETURN_FALSE; -- } -+ PSPELL_FETCH_MANAGER; - - pspell_manager_clear_session(manager); - if(pspell_manager_error_number(manager) == 0){ -@@ -593,12 +578,7 @@ - WRONG_PARAM_COUNT; - } - -- convert_to_long_ex(scin); -- manager = (PspellManager *) zend_list_find(Z_LVAL_PP(scin), &type); -- if(!manager){ -- php_error(E_WARNING, "%ld is not a PSPELL result index",Z_LVAL_PP(scin)); -- RETURN_FALSE; -- } -+ PSPELL_FETCH_MANAGER; - - pspell_manager_save_all_word_lists(manager); - -@@ -666,22 +646,17 @@ - PHP_FUNCTION(pspell_config_runtogether) - { - int type; -- zval **sccin, **runtogether; -+ zval **conf, **runtogether; - int argc; - - PspellConfig *config; - - argc = ZEND_NUM_ARGS(); -- if (argc != 2 || zend_get_parameters_ex(argc,&sccin,&runtogether) == FAILURE) { -+ if (argc != 2 || zend_get_parameters_ex(argc,&conf,&runtogether) == FAILURE) { - WRONG_PARAM_COUNT; - } - -- convert_to_long_ex(sccin); -- config = (PspellConfig *) zend_list_find(Z_LVAL_PP(sccin), &type); -- if(!config){ -- php_error(E_WARNING, "%ld is not a PSPELL config index",Z_LVAL_PP(sccin)); -- RETURN_FALSE; -- } -+ PSPELL_FETCH_CONFIG; - - convert_to_boolean_ex(runtogether); - pspell_config_replace(config, "run-together", Z_LVAL_PP(runtogether) ? "true" : "false"); -@@ -695,22 +670,17 @@ - PHP_FUNCTION(pspell_config_mode) - { - int type; -- zval **sccin, **mode; -+ zval **conf, **mode; - int argc; - - PspellConfig *config; - - argc = ZEND_NUM_ARGS(); -- if (argc != 2 || zend_get_parameters_ex(argc,&sccin,&mode) == FAILURE) { -+ if (argc != 2 || zend_get_parameters_ex(argc,&conf,&mode) == FAILURE) { - WRONG_PARAM_COUNT; - } - -- convert_to_long_ex(sccin); -- config = (PspellConfig *) zend_list_find(Z_LVAL_PP(sccin), &type); -- if(!config){ -- php_error(E_WARNING, "%ld is not a PSPELL config index",Z_LVAL_PP(sccin)); -- RETURN_FALSE; -- } -+ PSPELL_FETCH_CONFIG; - - convert_to_long_ex(mode); - -@@ -732,7 +702,7 @@ - PHP_FUNCTION(pspell_config_ignore) - { - int type; -- zval **sccin, **pignore; -+ zval **conf, **pignore; - int argc; - - int loc = PSPELL_LARGEST_WORD; -@@ -742,16 +712,11 @@ - PspellConfig *config; - - argc = ZEND_NUM_ARGS(); -- if (argc != 2 || zend_get_parameters_ex(argc,&sccin,&pignore) == FAILURE) { -+ if (argc != 2 || zend_get_parameters_ex(argc,&conf,&pignore) == FAILURE) { - WRONG_PARAM_COUNT; - } - -- convert_to_long_ex(sccin); -- config = (PspellConfig *) zend_list_find(Z_LVAL_PP(sccin), &type); -- if(!config){ -- php_error(E_WARNING, "%ld is not a PSPELL config index",Z_LVAL_PP(sccin)); -- RETURN_FALSE; -- } -+ PSPELL_FETCH_CONFIG; - - convert_to_long_ex(pignore); - ignore = Z_LVAL_PP(pignore); -@@ -782,22 +747,17 @@ - PHP_FUNCTION(pspell_config_personal) - { - int type; -- zval **sccin, **personal; -+ zval **conf, **personal; - int argc; - - PspellConfig *config; - - argc = ZEND_NUM_ARGS(); -- if (argc != 2 || zend_get_parameters_ex(argc,&sccin,&personal) == FAILURE) { -+ if (argc != 2 || zend_get_parameters_ex(argc,&conf,&personal) == FAILURE) { - WRONG_PARAM_COUNT; - } - -- convert_to_long_ex(sccin); -- config = (PspellConfig *) zend_list_find(Z_LVAL_PP(sccin), &type); -- if(!config){ -- php_error(E_WARNING, "%ld is not a PSPELL config index",Z_LVAL_PP(sccin)); -- RETURN_FALSE; -- } -+ PSPELL_FETCH_CONFIG; - - convert_to_string_ex(personal); - -@@ -820,22 +780,17 @@ - PHP_FUNCTION(pspell_config_repl) - { - int type; -- zval **sccin, **repl; -+ zval **conf, **repl; - int argc; - - PspellConfig *config; - - argc = ZEND_NUM_ARGS(); -- if (argc != 2 || zend_get_parameters_ex(argc,&sccin,&repl) == FAILURE) { -+ if (argc != 2 || zend_get_parameters_ex(argc,&conf,&repl) == FAILURE) { - WRONG_PARAM_COUNT; - } - -- convert_to_long_ex(sccin); -- config = (PspellConfig *) zend_list_find(Z_LVAL_PP(sccin), &type); -- if(!config){ -- php_error(E_WARNING, "%ld is not a PSPELL config index",Z_LVAL_PP(sccin)); -- RETURN_FALSE; -- } -+ PSPELL_FETCH_CONFIG; - - pspell_config_replace(config, "save-repl", "true"); - -@@ -860,22 +815,17 @@ - PHP_FUNCTION(pspell_config_save_repl) - { - int type; -- zval **sccin, **save; -+ zval **conf, **save; - int argc; - - PspellConfig *config; - - argc = ZEND_NUM_ARGS(); -- if (argc != 2 || zend_get_parameters_ex(argc,&sccin,&save) == FAILURE) { -+ if (argc != 2 || zend_get_parameters_ex(argc,&conf,&save) == FAILURE) { - WRONG_PARAM_COUNT; - } - -- convert_to_long_ex(sccin); -- config = (PspellConfig *) zend_list_find(Z_LVAL_PP(sccin), &type); -- if(!config){ -- php_error(E_WARNING, "%ld is not a PSPELL config index",Z_LVAL_PP(sccin)); -- RETURN_FALSE; -- } -+ PSPELL_FETCH_CONFIG; - - convert_to_boolean_ex(save); - pspell_config_replace(config, "save-repl", Z_LVAL_PP(save) ? "true" : "false"); diff --git a/dev-php/mod_php/files/php4.3.11-session_save_path-segf.patch b/dev-php/mod_php/files/php4.3.11-session_save_path-segf.patch deleted file mode 100644 index 65886a2488e6..000000000000 --- a/dev-php/mod_php/files/php4.3.11-session_save_path-segf.patch +++ /dev/null @@ -1,154 +0,0 @@ ---- sapi/apache2handler/sapi_apache2.c 2005-03-10 12:39:04.000000000 +0100 -+++ sapi/apache2handler/sapi_apache2.c 2005-10-26 16:02:03.000000000 +0200 -@@ -18,7 +18,7 @@ - +----------------------------------------------------------------------+ - */ - --/* $Id: sapi_apache2.c,v 1.1.2.39 2005/03/10 11:39:04 jorton Exp $ */ -+/* $Id: sapi_apache2.c,v 1.1.2.40.2.5 2005/10/12 21:41:36 tony2001 Exp $ */ - - #include <fcntl.h> - -@@ -268,23 +268,18 @@ - TSRMLS_FETCH(); - - ctx = SG(server_context); -- -- /* We use APLOG_STARTUP because it keeps us from printing the -- * data and time information at the beginning of the error log -- * line. Not sure if this is correct, but it mirrors what happens -- * with Apache 1.3 -- rbb -- */ -+ - if (ctx == NULL) { /* we haven't initialized our ctx yet, oh well */ - ap_log_error(APLOG_MARK, APLOG_ERR | APLOG_STARTUP, 0, NULL, "%s", msg); - } else { -- ap_log_rerror(APLOG_MARK, APLOG_ERR | APLOG_STARTUP, 0, ctx->r, "%s", msg); -+ ap_log_rerror(APLOG_MARK, APLOG_ERR, 0, ctx->r, "%s", msg); - } - } - - static void php_apache_sapi_log_message_ex(char *msg, request_rec *r) - { - if (r) { -- ap_log_rerror(APLOG_MARK, APLOG_ERR | APLOG_STARTUP, 0, r, msg, r->filename); -+ ap_log_rerror(APLOG_MARK, APLOG_ERR, 0, r, msg, r->filename); - } else { - php_apache_sapi_log_message(msg); - } -@@ -458,15 +453,34 @@ - request_rec *parent_req = NULL; - TSRMLS_FETCH(); - -+#define PHPAP_INI_OFF \ -+ if (strcmp(r->protocol, "INCLUDED")) { \ -+ zend_try { zend_ini_deactivate(TSRMLS_C); } zend_end_try(); \ -+ } \ -+ - conf = ap_get_module_config(r->per_dir_config, &php4_module); -+ -+ /* apply_config() needs r in some cases, so allocate server_context early */ -+ ctx = SG(server_context); -+ if (ctx == NULL) { -+ ctx = SG(server_context) = apr_pcalloc(r->pool, sizeof(*ctx)); -+ /* register a cleanup so we clear out the SG(server_context) -+ * after each request. Note: We pass in the pointer to the -+ * server_context in case this is handled by a different thread. -+ */ -+ apr_pool_cleanup_register(r->pool, (void *)&SG(server_context), php_server_context_cleanup, apr_pool_cleanup_null); -+ ctx->r = r; -+ ctx = NULL; /* May look weird to null it here, but it is to catch the right case in the first_try later on */ -+ } else { -+ parent_req = ctx->r; -+ ctx->r = r; -+ } - apply_config(conf); - - if (strcmp(r->handler, PHP_MAGIC_TYPE) && strcmp(r->handler, PHP_SOURCE_MAGIC_TYPE) && strcmp(r->handler, PHP_SCRIPT)) { - /* Check for xbithack in this case. */ - if (!AP2(xbithack) || strcmp(r->handler, "text/html") || !(r->finfo.protection & APR_UEXECUTE)) { -- zend_try { -- zend_ini_deactivate(TSRMLS_C); -- } zend_end_try(); -+ PHPAP_INI_OFF; - return DECLINED; - } - } -@@ -475,32 +489,24 @@ - * the configuration; default behaviour is to accept. */ - if (r->used_path_info == AP_REQ_REJECT_PATH_INFO - && r->path_info && r->path_info[0]) { -- zend_try { -- zend_ini_deactivate(TSRMLS_C); -- } zend_end_try(); -+ PHPAP_INI_OFF; - return HTTP_NOT_FOUND; - } - - /* handle situations where user turns the engine off */ - if (!AP2(engine)) { -- zend_try { -- zend_ini_deactivate(TSRMLS_C); -- } zend_end_try(); -+ PHPAP_INI_OFF; - return DECLINED; - } - - if (r->finfo.filetype == 0) { - php_apache_sapi_log_message_ex("script '%s' not found or unable to stat", r); -- zend_try { -- zend_ini_deactivate(TSRMLS_C); -- } zend_end_try(); -+ PHPAP_INI_OFF; - return HTTP_NOT_FOUND; - } - if (r->finfo.filetype == APR_DIR) { - php_apache_sapi_log_message_ex("attempt to invoke directory '%s' as script", r); -- zend_try { -- zend_ini_deactivate(TSRMLS_C); -- } zend_end_try(); -+ PHPAP_INI_OFF; - return HTTP_FORBIDDEN; - } - -@@ -516,24 +522,30 @@ - - zend_first_try { - -- ctx = SG(server_context); - if (ctx == NULL) { -- ctx = SG(server_context) = apr_pcalloc(r->pool, sizeof(*ctx)); -- /* register a cleanup so we clear out the SG(server_context) -- * after each request. Note: We pass in the pointer to the -- * server_context in case this is handled by a different thread. -- */ -- apr_pool_cleanup_register(r->pool, (void *)&SG(server_context), php_server_context_cleanup, apr_pool_cleanup_null); -- -- ctx->r = r; -+normal: - brigade = apr_brigade_create(r->pool, r->connection->bucket_alloc); -+ ctx = SG(server_context); - ctx->brigade = brigade; - - if (php_apache_request_ctor(r, ctx TSRMLS_CC)!=SUCCESS) { - zend_bailout(); - } - } else { -- parent_req = ctx->r; -+ if (!parent_req) { -+ parent_req = ctx->r; -+ } -+ if (parent_req && parent_req->handler && strcmp(parent_req->handler, PHP_MAGIC_TYPE) && strcmp(parent_req->handler, PHP_SOURCE_MAGIC_TYPE) && strcmp(parent_req->handler, PHP_SCRIPT)) { -+ if (php_apache_request_ctor(r, ctx TSRMLS_CC)!=SUCCESS) { -+ zend_bailout(); -+ } -+ } -+ -+ /* check if comming due to ErrorDocument */ -+ if (parent_req && parent_req->status != HTTP_OK) { -+ parent_req = NULL; -+ goto normal; -+ } - ctx->r = r; - brigade = ctx->brigade; - } diff --git a/dev-php/mod_php/files/php4.4.0-curl_safemode.patch b/dev-php/mod_php/files/php4.4.0-curl_safemode.patch deleted file mode 100644 index 32a82e072077..000000000000 --- a/dev-php/mod_php/files/php4.4.0-curl_safemode.patch +++ /dev/null @@ -1,46 +0,0 @@ ---- ext/curl/curl.c 2005-06-02 23:05:06.000000000 +0200 -+++ ext/curl/curl.c 2005-10-17 04:42:51.000000000 +0200 -@@ -16,7 +16,7 @@ - +----------------------------------------------------------------------+ - */ - --/* $Id: curl.c,v 1.124.2.30 2005/06/02 21:05:06 tony2001 Exp $ */ -+/* $Id: curl.c,v 1.124.2.30.2.3 2005/10/17 02:42:51 iliaa Exp $ */ - - #ifdef HAVE_CONFIG_H - #include "config.h" -@@ -66,7 +66,7 @@ - #define CAAZ(s, v) add_assoc_zval_ex(return_value, s, sizeof(s), (zval *) v); - - #define PHP_CURL_CHECK_OPEN_BASEDIR(str, len) \ -- if (PG(open_basedir) && *PG(open_basedir) && \ -+ if (((PG(open_basedir) && *PG(open_basedir)) || PG(safe_mode)) && \ - strncasecmp(str, "file://", sizeof("file://") - 1) == 0) \ - { \ - php_url *tmp_url; \ -@@ -76,7 +76,7 @@ - RETURN_FALSE; \ - } \ - \ -- if (php_check_open_basedir(tmp_url->path TSRMLS_CC) || \ -+ if (tmp_url->query || php_check_open_basedir(tmp_url->path TSRMLS_CC) || \ - (PG(safe_mode) && !php_checkuid(tmp_url->path, "rb+", CHECKUID_CHECK_MODE_PARAM)) \ - ) { \ - php_url_free(tmp_url); \ -@@ -992,10 +992,15 @@ - - postval = Z_STRVAL_PP(current); - if (*postval == '@') { -+ ++postval; -+ /* safe_mode / open_basedir check */ -+ if (php_check_open_basedir(postval TSRMLS_CC) || (PG(safe_mode) && !php_checkuid(postval, "rb+", CHECKUID_CHECK_MODE_PARAM))) { -+ RETURN_FALSE; -+ } - error = curl_formadd(&first, &last, - CURLFORM_COPYNAME, string_key, - CURLFORM_NAMELENGTH, (long)string_key_len - 1, -- CURLFORM_FILE, ++postval, -+ CURLFORM_FILE, postval, - CURLFORM_END); - } - else { diff --git a/dev-php/mod_php/files/php4.4.0-fopen_wrappers.patch b/dev-php/mod_php/files/php4.4.0-fopen_wrappers.patch deleted file mode 100644 index 672da5ece63b..000000000000 --- a/dev-php/mod_php/files/php4.4.0-fopen_wrappers.patch +++ /dev/null @@ -1,46 +0,0 @@ ---- main/fopen_wrappers.c 2005/02/02 23:44:07 1.153.2.10 -+++ main/fopen_wrappers.c 2005/09/27 15:08:43 1.153.2.10.2.2 -@@ -16,7 +16,7 @@ - | Jim Winstead <jimw@php.net> | - +----------------------------------------------------------------------+ - */ --/* $Id: fopen_wrappers.c,v 1.153.2.10 2005/02/02 23:44:07 iliaa Exp $ */ -+/* $Id: fopen_wrappers.c,v 1.153.2.10.2.2 2005/09/27 15:08:43 iliaa Exp $ */ - - /* {{{ includes - */ -@@ -36,14 +36,6 @@ - #include <winsock.h> - #define O_RDONLY _O_RDONLY - #include "win32/param.h" --#elif defined(NETWARE) --/*#include <ws2nlm.h>*/ --/*#include <sys/socket.h>*/ --#ifdef NEW_LIBC --#include <sys/param.h> --#else --#include "netware/param.h" --#endif - #else - #include <sys/param.h> - #endif -@@ -57,8 +49,6 @@ - #if HAVE_PWD_H - #ifdef PHP_WIN32 - #include "win32/pwd.h" --#elif defined(NETWARE) --#include "netware/pwd.h" - #else - #include <pwd.h> - #endif -@@ -120,8 +110,8 @@ PHPAPI int php_check_specific_open_based - /* Handler for basedirs that end with a / */ - resolved_basedir_len = strlen(resolved_basedir); - if (basedir[strlen(basedir) - 1] == PHP_DIR_SEPARATOR) { -- if (resolved_basedir[resolved_basedir_len - 1] == '/') { -- resolved_basedir[resolved_basedir_len - 1] = PHP_DIR_SEPARATOR; -+ if (resolved_basedir[resolved_basedir_len - 1] != PHP_DIR_SEPARATOR) { -+ resolved_basedir[resolved_basedir_len] = PHP_DIR_SEPARATOR; - resolved_basedir[++resolved_basedir_len] = '\0'; - } - } diff --git a/dev-php/mod_php/files/php4.4.0-gd_safe_mode.patch b/dev-php/mod_php/files/php4.4.0-gd_safe_mode.patch deleted file mode 100644 index 1e0d49d1373c..000000000000 --- a/dev-php/mod_php/files/php4.4.0-gd_safe_mode.patch +++ /dev/null @@ -1,20 +0,0 @@ ---- ext/gd/gd.c 2005/05/06 16:51:54 1.221.2.56 -+++ ext/gd/gd.c 2005/10/06 20:44:52 1.221.2.56.2.1 -@@ -18,7 +18,7 @@ - +----------------------------------------------------------------------+ - */ - --/* $Id: gd.c,v 1.221.2.56 2005/05/06 16:51:54 tony2001 Exp $ */ -+/* $Id: gd.c,v 1.221.2.56.2.1 2005/10/06 20:44:52 iliaa Exp $ */ - - /* gd 1.2 is copyright 1994, 1995, Quest Protein Database Center, - Cold Spring Harbor Labs. */ -@@ -1644,7 +1644,7 @@ static void _php_image_output(INTERNAL_F - } - - if ((argc == 2) || (argc > 2 && Z_STRLEN_PP(file))) { -- if (!fn || fn == empty_string || php_check_open_basedir(fn TSRMLS_CC)) { -+ if (!fn || fn == empty_string || php_check_open_basedir(fn TSRMLS_CC) || (PG(safe_mode) && !php_checkuid(fn, "rb+", CHECKUID_CHECK_FILE_AND_DIR))) { - php_error_docref(NULL TSRMLS_CC, E_WARNING, "Invalid filename '%s'", fn); - RETURN_FALSE; - } diff --git a/dev-php/mod_php/files/php4.4.0-globals_overwrite.patch b/dev-php/mod_php/files/php4.4.0-globals_overwrite.patch deleted file mode 100644 index 3b13cd71966c..000000000000 --- a/dev-php/mod_php/files/php4.4.0-globals_overwrite.patch +++ /dev/null @@ -1,303 +0,0 @@ ---- ext/standard/array.c 2005-06-21 14:11:19.000000000 +0200 -+++ ext/standard/array.c 2005-11-01 00:40:11.000000000 +0100 -@@ -22,7 +22,7 @@ - */ - - --/* $Id: array.c,v 1.199.2.44.2.2 2005/06/21 12:11:19 dmitry Exp $ */ -+/* $Id: array.c,v 1.199.2.44.2.9 2005/10/03 14:05:07 iliaa Exp $ */ - - #include "php.h" - #include "php_ini.h" -@@ -1252,6 +1252,10 @@ - /* break omitted intentionally */ - - case EXTR_OVERWRITE: -+ /* GLOBALS protection */ -+ if (var_exists && !strcmp(var_name, "GLOBALS")) { -+ break; -+ } - smart_str_appendl(&final_name, var_name, var_name_len); - break; - -@@ -1300,11 +1304,11 @@ - zval **orig_var; - - if (zend_hash_find(EG(active_symbol_table), final_name.c, final_name.len+1, (void **) &orig_var) == SUCCESS) { -- zval_ptr_dtor(orig_var); -- - SEPARATE_ZVAL_TO_MAKE_IS_REF(entry); - zval_add_ref(entry); - -+ zval_ptr_dtor(orig_var); -+ - *orig_var = *entry; - } else { - if ((*var_array)->refcount > 1) { -@@ -1831,8 +1835,8 @@ - hashtable and replace it with new one */ - new_hash = php_splice(Z_ARRVAL_P(stack), 0, 0, &args[1], argc-1, NULL); - zend_hash_destroy(Z_ARRVAL_P(stack)); -- efree(Z_ARRVAL_P(stack)); -- Z_ARRVAL_P(stack) = new_hash; -+ *Z_ARRVAL_P(stack) = *new_hash; -+ FREE_HASHTABLE(new_hash); - - /* Clean up and return the number of elements in the stack */ - efree(args); -@@ -1909,8 +1913,8 @@ - - /* Replace input array's hashtable with the new one */ - zend_hash_destroy(Z_ARRVAL_P(array)); -- efree(Z_ARRVAL_P(array)); -- Z_ARRVAL_P(array) = new_hash; -+ *Z_ARRVAL_P(array) = *new_hash; -+ FREE_HASHTABLE(new_hash); - - /* Clean up */ - if (argc == 4) -@@ -2397,8 +2401,8 @@ - - /* Copy the result hash into return value */ - zend_hash_destroy(Z_ARRVAL_P(return_value)); -- efree(Z_ARRVAL_P(return_value)); -- Z_ARRVAL_P(return_value) = new_hash; -+ *Z_ARRVAL_P(return_value) = *new_hash; -+ FREE_HASHTABLE(new_hash); - - /* Clean up */ - efree(pads); -@@ -2622,6 +2626,15 @@ - /* copy the argument array */ - *return_value = **args[0]; - zval_copy_ctor(return_value); -+ if (return_value->value.ht == &EG(symbol_table)) { -+ HashTable *ht; -+ zval *tmp; -+ -+ ALLOC_HASHTABLE(ht); -+ zend_hash_init(ht, 0, NULL, ZVAL_PTR_DTOR, 0); -+ zend_hash_copy(ht, return_value->value.ht, (copy_ctor_func_t) zval_add_ref, (void *) &tmp, sizeof(zval *)); -+ return_value->value.ht = ht; -+ } - - /* go through the lists and look for common values */ - while (*ptrs[0]) { -@@ -2772,6 +2785,15 @@ - /* copy the argument array */ - *return_value = **args[0]; - zval_copy_ctor(return_value); -+ if (return_value->value.ht == &EG(symbol_table)) { -+ HashTable *ht; -+ zval *tmp; -+ -+ ALLOC_HASHTABLE(ht); -+ zend_hash_init(ht, 0, NULL, ZVAL_PTR_DTOR, 0); -+ zend_hash_copy(ht, return_value->value.ht, (copy_ctor_func_t) zval_add_ref, (void *) &tmp, sizeof(zval *)); -+ return_value->value.ht = ht; -+ } - - /* go through the lists and look for values of ptr[0] - that are not in the others */ -@@ -3299,6 +3321,7 @@ - PHP_FUNCTION(array_filter) - { - zval **input, **callback = NULL; -+ zval *array, *func = NULL; - zval **operand; - zval **args[1]; - zval *retval = NULL; -@@ -3317,9 +3340,13 @@ - php_error_docref(NULL TSRMLS_CC, E_WARNING, "The first argument should be an array"); - return; - } -+ if (callback) { -+ func = *callback; -+ } -+ array = *input; - - if (ZEND_NUM_ARGS() > 1) { -- if (!zend_is_callable(*callback, 0, &callback_name)) { -+ if (!zend_is_callable(func, 0, &callback_name)) { - php_error_docref(NULL TSRMLS_CC, E_WARNING, "The second argument, '%s', should be a valid callback", callback_name); - efree(callback_name); - return; -@@ -3328,16 +3355,16 @@ - } - - array_init(return_value); -- if (zend_hash_num_elements(Z_ARRVAL_PP(input)) == 0) -+ if (zend_hash_num_elements(Z_ARRVAL_P(array)) == 0) - return; - -- for (zend_hash_internal_pointer_reset_ex(Z_ARRVAL_PP(input), &pos); -- zend_hash_get_current_data_ex(Z_ARRVAL_PP(input), (void **)&operand, &pos) == SUCCESS; -- zend_hash_move_forward_ex(Z_ARRVAL_PP(input), &pos)) { -+ for (zend_hash_internal_pointer_reset_ex(Z_ARRVAL_P(array), &pos); -+ zend_hash_get_current_data_ex(Z_ARRVAL_P(array), (void **)&operand, &pos) == SUCCESS; -+ zend_hash_move_forward_ex(Z_ARRVAL_P(array), &pos)) { - -- if (callback) { -+ if (func) { - args[0] = operand; -- if (call_user_function_ex(EG(function_table), NULL, *callback, &retval, 1, args, 0, NULL TSRMLS_CC) == SUCCESS && retval) { -+ if (call_user_function_ex(EG(function_table), NULL, func, &retval, 1, args, 0, NULL TSRMLS_CC) == SUCCESS && retval) { - if (!zend_is_true(retval)) { - zval_ptr_dtor(&retval); - continue; -@@ -3351,7 +3378,7 @@ - continue; - - zval_add_ref(operand); -- switch (zend_hash_get_current_key_ex(Z_ARRVAL_PP(input), &string_key, &string_key_len, &num_key, 0, &pos)) { -+ switch (zend_hash_get_current_key_ex(Z_ARRVAL_P(array), &string_key, &string_key_len, &num_key, 0, &pos)) { - case HASH_KEY_IS_STRING: - zend_hash_update(Z_ARRVAL_P(return_value), string_key, - string_key_len, operand, sizeof(zval *), NULL); -@@ -3418,6 +3445,7 @@ - efree(array_pos); - return; - } -+ SEPARATE_ZVAL_IF_NOT_REF(pargs[i]); - args[i] = *pargs[i]; - array_len[i] = zend_hash_num_elements(Z_ARRVAL_PP(pargs[i])); - if (array_len[i] > maxlen) { ---- ext/standard/basic_functions.c 2005-05-16 10:55:31.000000000 +0200 -+++ ext/standard/basic_functions.c 2005-11-01 00:40:30.000000000 +0100 -@@ -17,7 +17,7 @@ - +----------------------------------------------------------------------+ - */ - --/* $Id: basic_functions.c,v 1.543.2.51 2005/05/16 08:55:31 tony2001 Exp $ */ -+/* $Id: basic_functions.c,v 1.543.2.51.2.3 2005/09/29 16:31:48 iliaa Exp $ */ - - #include "php.h" - #include "php_streams.h" -@@ -42,18 +42,7 @@ - #include <time.h> - #include <stdio.h> - --#ifndef NETWARE - #include <netdb.h> --#else --/*#include "netware/env.h"*/ /* Temporary */ --#ifdef NEW_LIBC /* Same headers hold good for Winsock and Berkeley sockets */ --#include <netinet/in.h> --/*#include <arpa/inet.h>*/ --#include <netdb.h> --#else --#include <sys/socket.h> --#endif --#endif - - #if HAVE_ARPA_INET_H - # include <arpa/inet.h> -@@ -3038,11 +3027,25 @@ - prefix = va_arg(args, char *); - prefix_len = va_arg(args, uint); - -- new_key_len = prefix_len + hash_key->nKeyLength; -- new_key = (char *) emalloc(new_key_len); -+ if (!prefix_len) { -+ if (!hash_key->nKeyLength) { -+ php_error_docref(NULL TSRMLS_CC, E_WARNING, "Numeric key detected - possible security hazard."); -+ return 0; -+ } else if (!strcmp(hash_key->arKey, "GLOBALS")) { -+ php_error_docref(NULL TSRMLS_CC, E_WARNING, "Attempted GLOBALS variable overwrite."); -+ return 0; -+ } -+ } -+ -+ if (hash_key->nKeyLength) { -+ new_key_len = prefix_len + hash_key->nKeyLength; -+ new_key = (char *) emalloc(new_key_len); - -- memcpy(new_key, prefix, prefix_len); -- memcpy(new_key+prefix_len, hash_key->arKey, hash_key->nKeyLength); -+ memcpy(new_key, prefix, prefix_len); -+ memcpy(new_key+prefix_len, hash_key->arKey, hash_key->nKeyLength); -+ } else { -+ new_key_len = spprintf(&new_key, 0, "%s%ld", prefix, hash_key->h); -+ } - - zend_hash_del(&EG(symbol_table), new_key, new_key_len); - ZEND_SET_SYMBOL_WITH_LENGTH(&EG(symbol_table), new_key, new_key_len, *var, (*var)->refcount+1, 0); ---- ext/standard/string.c 2005-06-02 10:50:52.000000000 +0200 -+++ ext/standard/string.c 2005-11-01 00:40:20.000000000 +0100 -@@ -18,7 +18,7 @@ - +----------------------------------------------------------------------+ - */ - --/* $Id: string.c,v 1.333.2.52 2005/06/02 08:50:52 derick Exp $ */ -+/* $Id: string.c,v 1.333.2.52.2.1 2005/09/28 22:34:04 iliaa Exp $ */ - - /* Synced with php 3.0 revision 1.193 1999-06-16 [ssb] */ - -@@ -3179,7 +3179,6 @@ - zval *sarg; - char *res = NULL; - int argCount; -- int old_rg; - - argCount = ARG_COUNT(ht); - if (argCount < 1 || argCount > 2 || zend_get_parameters_ex(argCount, &arg, &arrayArg) == FAILURE) { -@@ -3192,19 +3191,18 @@ - res = estrndup(Z_STRVAL_P(sarg), Z_STRLEN_P(sarg)); - } - -- old_rg = PG(register_globals); - if (argCount == 1) { -- PG(register_globals) = 1; -- sapi_module.treat_data(PARSE_STRING, res, NULL TSRMLS_CC); -+ zval tmp; -+ Z_ARRVAL(tmp) = EG(active_symbol_table); -+ -+ sapi_module.treat_data(PARSE_STRING, res, &tmp TSRMLS_CC); - } else { -- PG(register_globals) = 0; - /* Clear out the array that was passed in. */ - zval_dtor(*arrayArg); - array_init(*arrayArg); - - sapi_module.treat_data(PARSE_STRING, res, *arrayArg TSRMLS_CC); - } -- PG(register_globals) = old_rg; - } - /* }}} */ - ---- main/php_variables.c 2005-05-17 20:42:35.000000000 +0200 -+++ main/php_variables.c 2005-11-01 00:42:56.000000000 +0100 -@@ -16,7 +16,7 @@ - | Zeev Suraski <zeev@zend.com> | - +----------------------------------------------------------------------+ - */ --/* $Id: php_variables.c,v 1.45.2.13 2005/05/17 18:42:35 iliaa Exp $ */ -+/* $Id: php_variables.c,v 1.45.2.13.2.4 2005/10/02 11:33:27 rrichards Exp $ */ - - #include <stdio.h> - #include "php.h" -@@ -73,6 +73,10 @@ - symtable1 = Z_ARRVAL_P(track_vars_array); - } else if (PG(register_globals)) { - symtable1 = EG(active_symbol_table); -+ /* GLOBALS hijack attempt, reject parameter */ -+ if (!strncmp("GLOBALS", var, sizeof("GLOBALS")) || !strncmp("GLOBALS", var, sizeof("GLOBALS[")-1)) { -+ return; -+ } - } - if (!symtable1) { - /* Nothing to do */ -@@ -99,6 +103,13 @@ - zval_dtor(val); - return; - } -+ -+ /* GLOBALS hijack attempt, reject parameter */ -+ if (symtable1 == EG(active_symbol_table) && !strcmp("GLOBALS", var)) { -+ zval_dtor(val); -+ return; -+ } -+ - /* ensure that we don't have spaces or dots in the variable name (not binary safe) */ - for (p=var; *p; p++) { - switch(*p) { diff --git a/dev-php/mod_php/files/php4.4.0-imap-symlink.diff b/dev-php/mod_php/files/php4.4.0-imap-symlink.diff deleted file mode 100644 index 5c9eee40faa1..000000000000 --- a/dev-php/mod_php/files/php4.4.0-imap-symlink.diff +++ /dev/null @@ -1,30 +0,0 @@ ---- configure 2005-09-18 02:12:50.000000000 +0200 -+++ configure 2005-09-18 16:48:53.000000000 +0200 -@@ -42726,12 +42726,6 @@ - { echo "configure: error: Cannot find rfc822.h. Please check your c-client installation." 1>&2; exit 1; } - fi - -- if test -r "$IMAP_DIR/c-client/c-client.a"; then -- ln -s "$IMAP_DIR/c-client/c-client.a" "$IMAP_DIR/c-client/libc-client.a" >/dev/null 2>&1 -- elif test -r "$IMAP_DIR/lib/c-client.a"; then -- ln -s "$IMAP_DIR/lib/c-client.a" "$IMAP_DIR/lib/libc-client.a" >/dev/null 2>&1 -- fi -- - for lib in c-client4 c-client imap; do - IMAP_LIB=$lib - ---- ext/imap/config.m4 2005-09-04 02:48:47.000000000 +0200 -+++ ext/imap/config.m4 2005-09-04 02:49:05.000000000 +0200 -@@ -158,12 +158,6 @@ - AC_MSG_ERROR(Cannot find rfc822.h. Please check your c-client installation.) - fi - -- if test -r "$IMAP_DIR/c-client/c-client.a"; then -- ln -s "$IMAP_DIR/c-client/c-client.a" "$IMAP_DIR/c-client/libc-client.a" >/dev/null 2>&1 -- elif test -r "$IMAP_DIR/lib/c-client.a"; then -- ln -s "$IMAP_DIR/lib/c-client.a" "$IMAP_DIR/lib/libc-client.a" >/dev/null 2>&1 -- fi -- - for lib in c-client4 c-client imap; do - IMAP_LIB=$lib - IMAP_LIB_CHK(lib) diff --git a/dev-php/mod_php/files/php4.4.0-pcre-security.patch b/dev-php/mod_php/files/php4.4.0-pcre-security.patch deleted file mode 100644 index 086210da477e..000000000000 --- a/dev-php/mod_php/files/php4.4.0-pcre-security.patch +++ /dev/null @@ -1,96 +0,0 @@ ---- configure 2005-09-18 02:12:50.000000000 +0200 -+++ configure 2005-09-18 21:00:29.000000000 +0200 -@@ -1685,7 +1685,7 @@ - MAJOR_VERSION=4 - MINOR_VERSION=4 - RELEASE_VERSION=0 --EXTRA_VERSION="" -+EXTRA_VERSION="-pl1-gentoo" - VERSION="$MAJOR_VERSION.$MINOR_VERSION.$RELEASE_VERSION$EXTRA_VERSION" - - -@@ -71512,7 +71506,7 @@ - ext_builddir=ext/pcre - ext_srcdir=$abs_srcdir/ext/pcre - -- ac_extra=`echo "-DSUPPORT_UTF8 -DSUPPORT_UCP -DLINK_SIZE=2 -DPOSIX_MALLOC_THRESHOLD=10 -DMATCH_LIMIT=10000000 -I@ext_srcdir@/pcrelib"|sed s#@ext_srcdir@#$ext_srcdir#g` -+ ac_extra=`echo "-DEXPORT= -DNEWLINE=10 -DSUPPORT_UTF8 -DSUPPORT_UCP -DLINK_SIZE=2 -DPOSIX_MALLOC_THRESHOLD=10 -DMATCH_LIMIT=10000000 -I@ext_srcdir@/pcrelib"|sed s#@ext_srcdir@#$ext_srcdir#g` - - if test "$ext_shared" != "shared" && test "$ext_shared" != "yes" && test "" != "cli"; then - -@@ -71536,7 +71530,7 @@ - - - old_IFS=$IFS -- for ac_src in pcrelib/maketables.c pcrelib/get.c pcrelib/study.c pcrelib/pcre.c php_pcre.c; do -+ for ac_src in pcrelib/pcre_chartables.c pcrelib/pcre_compile.c pcrelib/pcre_config.c pcrelib/pcre_dfa_exec.c pcrelib/pcre_exec.c pcrelib/pcre_fullinfo.c pcrelib/pcre_get.c pcrelib/pcre_globals.c pcrelib/pcre_info.c pcrelib/pcre_maketables.c pcrelib/pcre_ord2utf8.c pcrelib/pcre_printint.c pcrelib/pcre_refcount.c pcrelib/pcre_study.c pcrelib/pcre_tables.c pcrelib/pcre_try_flipped.c pcrelib/pcre_ucp_findchar.c pcrelib/pcre_valid_utf8.c pcrelib/pcre_version.c pcrelib/pcre_xclass.c php_pcre.c; do - - IFS=. - set $ac_src -@@ -71582,7 +71576,7 @@ - - - old_IFS=$IFS -- for ac_src in pcrelib/maketables.c pcrelib/get.c pcrelib/study.c pcrelib/pcre.c php_pcre.c; do -+ for ac_src in pcrelib/pcre_chartables.c pcrelib/pcre_compile.c pcrelib/pcre_config.c pcrelib/pcre_dfa_exec.c pcrelib/pcre_exec.c pcrelib/pcre_fullinfo.c pcrelib/pcre_get.c pcrelib/pcre_globals.c pcrelib/pcre_info.c pcrelib/pcre_maketables.c pcrelib/pcre_ord2utf8.c pcrelib/pcre_printint.c pcrelib/pcre_refcount.c pcrelib/pcre_study.c pcrelib/pcre_tables.c pcrelib/pcre_try_flipped.c pcrelib/pcre_ucp_findchar.c pcrelib/pcre_valid_utf8.c pcrelib/pcre_version.c pcrelib/pcre_xclass.c php_pcre.c; do - - IFS=. - set $ac_src -@@ -71658,7 +71652,7 @@ - - - old_IFS=$IFS -- for ac_src in pcrelib/maketables.c pcrelib/get.c pcrelib/study.c pcrelib/pcre.c php_pcre.c; do -+ for ac_src in pcrelib/pcre_chartables.c pcrelib/pcre_compile.c pcrelib/pcre_config.c pcrelib/pcre_dfa_exec.c pcrelib/pcre_exec.c pcrelib/pcre_fullinfo.c pcrelib/pcre_get.c pcrelib/pcre_globals.c pcrelib/pcre_info.c pcrelib/pcre_maketables.c pcrelib/pcre_ord2utf8.c pcrelib/pcre_printint.c pcrelib/pcre_refcount.c pcrelib/pcre_study.c pcrelib/pcre_tables.c pcrelib/pcre_try_flipped.c pcrelib/pcre_ucp_findchar.c pcrelib/pcre_valid_utf8.c pcrelib/pcre_version.c pcrelib/pcre_xclass.c php_pcre.c; do - - IFS=. - set $ac_src -@@ -71701,7 +71695,7 @@ - - - old_IFS=$IFS -- for ac_src in pcrelib/maketables.c pcrelib/get.c pcrelib/study.c pcrelib/pcre.c php_pcre.c; do -+ for ac_src in pcrelib/pcre_chartables.c pcrelib/pcre_compile.c pcrelib/pcre_config.c pcrelib/pcre_dfa_exec.c pcrelib/pcre_exec.c pcrelib/pcre_fullinfo.c pcrelib/pcre_get.c pcrelib/pcre_globals.c pcrelib/pcre_info.c pcrelib/pcre_maketables.c pcrelib/pcre_ord2utf8.c pcrelib/pcre_printint.c pcrelib/pcre_refcount.c pcrelib/pcre_study.c pcrelib/pcre_tables.c pcrelib/pcre_try_flipped.c pcrelib/pcre_ucp_findchar.c pcrelib/pcre_valid_utf8.c pcrelib/pcre_version.c pcrelib/pcre_xclass.c php_pcre.c; do - - IFS=. - set $ac_src -@@ -71902,7 +71896,7 @@ - ext_builddir=ext/pcre - ext_srcdir=$abs_srcdir/ext/pcre - -- ac_extra=`echo "-DSUPPORT_UTF8 -DSUPPORT_UCP -DLINK_SIZE=2 -DPOSIX_MALLOC_THRESHOLD=10 -DMATCH_LIMIT=10000000"|sed s#@ext_srcdir@#$ext_srcdir#g` -+ ac_extra=`echo "-DEXPORT= -DNEWLINE=10 -DSUPPORT_UTF8 -DSUPPORT_UCP -DLINK_SIZE=2 -DPOSIX_MALLOC_THRESHOLD=10 -DMATCH_LIMIT=10000000"|sed s#@ext_srcdir@#$ext_srcdir#g` - - if test "$ext_shared" != "shared" && test "$ext_shared" != "yes" && test "" != "cli"; then - ---- configure.in 2005-09-17 17:44:30.000000000 +0200 -+++ configure.in 2005-09-17 17:45:01.000000000 +0200 -@@ -41,7 +41,7 @@ - MAJOR_VERSION=4 - MINOR_VERSION=4 - RELEASE_VERSION=0 --EXTRA_VERSION="" -+EXTRA_VERSION="-pl1-gentoo" - VERSION="$MAJOR_VERSION.$MINOR_VERSION.$RELEASE_VERSION$EXTRA_VERSION" - - dnl Define where extension directories are located in the configure context ---- ext/pcre/config.m4 2005/05/31 12:22:27 1.29.2.7 -+++ ext/pcre/config.m4 2005/08/09 17:41:56 1.29.2.7.2.1 -@@ -13,7 +13,7 @@ PHP_ARG_WITH(pcre-regex,for PCRE support - - if test "$PHP_PCRE_REGEX" != "no"; then - if test "$PHP_PCRE_REGEX" = "yes"; then -- PHP_NEW_EXTENSION(pcre, pcrelib/maketables.c pcrelib/get.c pcrelib/study.c pcrelib/pcre.c php_pcre.c, $ext_shared,,-DSUPPORT_UTF8 -DSUPPORT_UCP -DLINK_SIZE=2 -DPOSIX_MALLOC_THRESHOLD=10 -DMATCH_LIMIT=10000000 -I@ext_srcdir@/pcrelib) -+ PHP_NEW_EXTENSION(pcre, pcrelib/pcre_chartables.c pcrelib/pcre_compile.c pcrelib/pcre_config.c pcrelib/pcre_dfa_exec.c pcrelib/pcre_exec.c pcrelib/pcre_fullinfo.c pcrelib/pcre_get.c pcrelib/pcre_globals.c pcrelib/pcre_info.c pcrelib/pcre_maketables.c pcrelib/pcre_ord2utf8.c pcrelib/pcre_printint.c pcrelib/pcre_refcount.c pcrelib/pcre_study.c pcrelib/pcre_tables.c pcrelib/pcre_try_flipped.c pcrelib/pcre_ucp_findchar.c pcrelib/pcre_valid_utf8.c pcrelib/pcre_version.c pcrelib/pcre_xclass.c php_pcre.c, $ext_shared,,-DEXPORT= -DNEWLINE=10 -DSUPPORT_UTF8 -DSUPPORT_UCP -DLINK_SIZE=2 -DPOSIX_MALLOC_THRESHOLD=10 -DMATCH_LIMIT=10000000 -I@ext_srcdir@/pcrelib) - PHP_ADD_BUILD_DIR($ext_builddir/pcrelib) - AC_DEFINE(HAVE_BUNDLED_PCRE, 1, [ ]) - else -@@ -50,7 +50,7 @@ if test "$PHP_PCRE_REGEX" != "no"; then - - AC_DEFINE(HAVE_PCRE, 1, [ ]) - PHP_ADD_INCLUDE($PCRE_INCDIR) -- PHP_NEW_EXTENSION(pcre, php_pcre.c, $ext_shared,,-DSUPPORT_UTF8 -DSUPPORT_UCP -DLINK_SIZE=2 -DPOSIX_MALLOC_THRESHOLD=10 -DMATCH_LIMIT=10000000) -+ PHP_NEW_EXTENSION(pcre, php_pcre.c, $ext_shared,,-DEXPORT= -DNEWLINE=10 -DSUPPORT_UTF8 -DSUPPORT_UCP -DLINK_SIZE=2 -DPOSIX_MALLOC_THRESHOLD=10 -DMATCH_LIMIT=10000000) - fi - PHP_SUBST(PCRE_SHARED_LIBADD) - fi diff --git a/dev-php/mod_php/files/php4.4.0-phpinfo_xss.patch b/dev-php/mod_php/files/php4.4.0-phpinfo_xss.patch deleted file mode 100644 index 2f03ce4e273e..000000000000 --- a/dev-php/mod_php/files/php4.4.0-phpinfo_xss.patch +++ /dev/null @@ -1,42 +0,0 @@ ---- ext/standard/info.c 2005-06-07 15:37:33.000000000 +0200 -+++ ext/standard/info.c 2005-11-01 01:26:54.000000000 +0100 -@@ -18,7 +18,7 @@ - +----------------------------------------------------------------------+ - */ - --/* $Id: info.c,v 1.218.2.18.2.1 2005/06/07 13:37:33 derick Exp $ */ -+/* $Id: info.c,v 1.218.2.18.2.4 2005/08/16 00:26:02 iliaa Exp $ */ - - #include "php.h" - #include "php_ini.h" -@@ -133,10 +133,21 @@ - PUTS(" => "); - } - if (Z_TYPE_PP(tmp) == IS_ARRAY) { -+ zval *tmp3; -+ MAKE_STD_ZVAL(tmp3); - if (!sapi_module.phpinfo_as_text) { - PUTS("<pre>"); - } -+ php_start_ob_buffer(NULL, 4096, 1 TSRMLS_CC); - zend_print_zval_r(*tmp, 0); -+ php_ob_get_buffer(tmp3 TSRMLS_CC); -+ php_end_ob_buffer(0, 0 TSRMLS_CC); -+ -+ elem_esc = php_info_html_esc(Z_STRVAL_P(tmp3) TSRMLS_CC); -+ PUTS(elem_esc); -+ efree(elem_esc); -+ zval_ptr_dtor(&tmp3); -+ - if (!sapi_module.phpinfo_as_text) { - PUTS("</pre>"); - } -@@ -196,7 +207,7 @@ - PHPAPI char *php_info_html_esc(char *string TSRMLS_DC) - { - int new_len; -- return php_escape_html_entities(string, strlen(string), &new_len, 0, ENT_NOQUOTES, NULL TSRMLS_CC); -+ return php_escape_html_entities(string, strlen(string), &new_len, 0, ENT_QUOTES, NULL TSRMLS_CC); - } - /* }}} */ - diff --git a/dev-php/mod_php/files/php4.4.0-pspell-ext-segf.patch b/dev-php/mod_php/files/php4.4.0-pspell-ext-segf.patch deleted file mode 100644 index a62c42fec553..000000000000 --- a/dev-php/mod_php/files/php4.4.0-pspell-ext-segf.patch +++ /dev/null @@ -1,317 +0,0 @@ ---- ext/pspell/pspell.c 2003-08-28 22:01:29.000000000 +0200 -+++ ext/pspell/pspell.c 2005-10-26 23:24:22.000000000 +0200 -@@ -16,7 +16,7 @@ - +----------------------------------------------------------------------+ - */ - --/* $Id: pspell.c,v 1.28.8.5 2003/08/28 20:01:29 iliaa Exp $ */ -+/* $Id: pspell.c,v 1.28.8.5.4.2 2005/10/17 15:43:10 iliaa Exp $ */ - - #define IS_EXT_MODULE - -@@ -99,6 +99,22 @@ - delete_pspell_config(config); - } - -+#define PSPELL_FETCH_CONFIG \ -+ convert_to_long_ex(conf); \ -+ config = (PspellConfig *) zend_list_find(Z_LVAL_PP(conf), &type); \ -+ if (config == NULL || type != le_pspell_config) { \ -+ php_error_docref(NULL TSRMLS_CC, E_WARNING, "%ld is not a PSPELL config index", Z_LVAL_PP(conf)); \ -+ RETURN_FALSE; \ -+ } \ -+ -+#define PSPELL_FETCH_MANAGER \ -+ convert_to_long_ex(scin); \ -+ manager = (PspellManager *) zend_list_find(Z_LVAL_PP(scin), &type); \ -+ if (!manager || type != le_pspell) { \ -+ php_error_docref(NULL TSRMLS_CC, E_WARNING, "%ld is not a PSPELL result index", Z_LVAL_PP(scin)); \ -+ RETURN_FALSE; \ -+ } \ -+ - /* {{{ PHP_MINIT_FUNCTION - */ - PHP_MINIT_FUNCTION(pspell) -@@ -350,14 +366,8 @@ - WRONG_PARAM_COUNT; - } - -- convert_to_long_ex(conf); -- config = (PspellConfig *) zend_list_find(Z_LVAL_PP(conf), &type); -+ PSPELL_FETCH_CONFIG; - -- if (config == NULL || type != le_pspell_config) { -- php_error(E_WARNING, "%ld is not a PSPELL config index", Z_LVAL_PP(conf)); -- RETURN_FALSE; -- } -- - ret = new_pspell_manager(config); - - if(pspell_error_number(ret) != 0){ -@@ -385,13 +395,9 @@ - WRONG_PARAM_COUNT; - } - -- convert_to_long_ex(scin); - convert_to_string_ex(word); -- manager = (PspellManager *) zend_list_find(Z_LVAL_PP(scin), &type); -- if(!manager){ -- php_error(E_WARNING, "%ld is not a PSPELL result index",Z_LVAL_PP(scin)); -- RETURN_FALSE; -- } -+ -+ PSPELL_FETCH_MANAGER; - - if(pspell_manager_check(manager, Z_STRVAL_PP(word))){ - RETURN_TRUE; -@@ -417,13 +423,9 @@ - WRONG_PARAM_COUNT; - } - -- convert_to_long_ex(scin); - convert_to_string_ex(word); -- manager = (PspellManager *) zend_list_find(Z_LVAL_PP(scin), &type); -- if(!manager){ -- php_error(E_WARNING, "%ld is not a PSPELL result index",Z_LVAL_PP(scin)); -- RETURN_FALSE; -- } -+ -+ PSPELL_FETCH_MANAGER; - - array_init(return_value); - -@@ -455,14 +457,10 @@ - WRONG_PARAM_COUNT; - } - -- convert_to_long_ex(scin); - convert_to_string_ex(miss); - convert_to_string_ex(corr); -- manager = (PspellManager *) zend_list_find(Z_LVAL_PP(scin), &type); -- if(!manager){ -- php_error(E_WARNING, "%ld is not a PSPELL result index",Z_LVAL_PP(scin)); -- RETURN_FALSE; -- } -+ -+ PSPELL_FETCH_MANAGER; - - pspell_manager_store_replacement(manager, Z_STRVAL_PP(miss), Z_STRVAL_PP(corr)); - if(pspell_manager_error_number(manager) == 0){ -@@ -488,13 +486,9 @@ - WRONG_PARAM_COUNT; - } - -- convert_to_long_ex(scin); - convert_to_string_ex(word); -- manager = (PspellManager *) zend_list_find(Z_LVAL_PP(scin), &type); -- if(!manager){ -- php_error(E_WARNING, "%ld is not a PSPELL result index",Z_LVAL_PP(scin)); -- RETURN_FALSE; -- } -+ -+ PSPELL_FETCH_MANAGER; - - /*If the word is empty, we have to return; otherwise we'll segfault! ouch!*/ - if(Z_STRLEN_PP(word) == 0){ -@@ -525,13 +519,9 @@ - WRONG_PARAM_COUNT; - } - -- convert_to_long_ex(scin); - convert_to_string_ex(word); -- manager = (PspellManager *) zend_list_find(Z_LVAL_PP(scin), &type); -- if(!manager){ -- php_error(E_WARNING, "%ld is not a PSPELL result index",Z_LVAL_PP(scin)); -- RETURN_FALSE; -- } -+ -+ PSPELL_FETCH_MANAGER; - - /*If the word is empty, we have to return; otherwise we'll segfault! ouch!*/ - if(Z_STRLEN_PP(word) == 0){ -@@ -562,12 +552,7 @@ - WRONG_PARAM_COUNT; - } - -- convert_to_long_ex(scin); -- manager = (PspellManager *) zend_list_find(Z_LVAL_PP(scin), &type); -- if(!manager){ -- php_error(E_WARNING, "%ld is not a PSPELL result index",Z_LVAL_PP(scin)); -- RETURN_FALSE; -- } -+ PSPELL_FETCH_MANAGER; - - pspell_manager_clear_session(manager); - if(pspell_manager_error_number(manager) == 0){ -@@ -593,12 +578,7 @@ - WRONG_PARAM_COUNT; - } - -- convert_to_long_ex(scin); -- manager = (PspellManager *) zend_list_find(Z_LVAL_PP(scin), &type); -- if(!manager){ -- php_error(E_WARNING, "%ld is not a PSPELL result index",Z_LVAL_PP(scin)); -- RETURN_FALSE; -- } -+ PSPELL_FETCH_MANAGER; - - pspell_manager_save_all_word_lists(manager); - -@@ -666,22 +646,17 @@ - PHP_FUNCTION(pspell_config_runtogether) - { - int type; -- zval **sccin, **runtogether; -+ zval **conf, **runtogether; - int argc; - - PspellConfig *config; - - argc = ZEND_NUM_ARGS(); -- if (argc != 2 || zend_get_parameters_ex(argc,&sccin,&runtogether) == FAILURE) { -+ if (argc != 2 || zend_get_parameters_ex(argc,&conf,&runtogether) == FAILURE) { - WRONG_PARAM_COUNT; - } - -- convert_to_long_ex(sccin); -- config = (PspellConfig *) zend_list_find(Z_LVAL_PP(sccin), &type); -- if(!config){ -- php_error(E_WARNING, "%ld is not a PSPELL config index",Z_LVAL_PP(sccin)); -- RETURN_FALSE; -- } -+ PSPELL_FETCH_CONFIG; - - convert_to_boolean_ex(runtogether); - pspell_config_replace(config, "run-together", Z_LVAL_PP(runtogether) ? "true" : "false"); -@@ -695,22 +670,17 @@ - PHP_FUNCTION(pspell_config_mode) - { - int type; -- zval **sccin, **mode; -+ zval **conf, **mode; - int argc; - - PspellConfig *config; - - argc = ZEND_NUM_ARGS(); -- if (argc != 2 || zend_get_parameters_ex(argc,&sccin,&mode) == FAILURE) { -+ if (argc != 2 || zend_get_parameters_ex(argc,&conf,&mode) == FAILURE) { - WRONG_PARAM_COUNT; - } - -- convert_to_long_ex(sccin); -- config = (PspellConfig *) zend_list_find(Z_LVAL_PP(sccin), &type); -- if(!config){ -- php_error(E_WARNING, "%ld is not a PSPELL config index",Z_LVAL_PP(sccin)); -- RETURN_FALSE; -- } -+ PSPELL_FETCH_CONFIG; - - convert_to_long_ex(mode); - -@@ -732,7 +702,7 @@ - PHP_FUNCTION(pspell_config_ignore) - { - int type; -- zval **sccin, **pignore; -+ zval **conf, **pignore; - int argc; - - int loc = PSPELL_LARGEST_WORD; -@@ -742,16 +712,11 @@ - PspellConfig *config; - - argc = ZEND_NUM_ARGS(); -- if (argc != 2 || zend_get_parameters_ex(argc,&sccin,&pignore) == FAILURE) { -+ if (argc != 2 || zend_get_parameters_ex(argc,&conf,&pignore) == FAILURE) { - WRONG_PARAM_COUNT; - } - -- convert_to_long_ex(sccin); -- config = (PspellConfig *) zend_list_find(Z_LVAL_PP(sccin), &type); -- if(!config){ -- php_error(E_WARNING, "%ld is not a PSPELL config index",Z_LVAL_PP(sccin)); -- RETURN_FALSE; -- } -+ PSPELL_FETCH_CONFIG; - - convert_to_long_ex(pignore); - ignore = Z_LVAL_PP(pignore); -@@ -782,22 +747,17 @@ - PHP_FUNCTION(pspell_config_personal) - { - int type; -- zval **sccin, **personal; -+ zval **conf, **personal; - int argc; - - PspellConfig *config; - - argc = ZEND_NUM_ARGS(); -- if (argc != 2 || zend_get_parameters_ex(argc,&sccin,&personal) == FAILURE) { -+ if (argc != 2 || zend_get_parameters_ex(argc,&conf,&personal) == FAILURE) { - WRONG_PARAM_COUNT; - } - -- convert_to_long_ex(sccin); -- config = (PspellConfig *) zend_list_find(Z_LVAL_PP(sccin), &type); -- if(!config){ -- php_error(E_WARNING, "%ld is not a PSPELL config index",Z_LVAL_PP(sccin)); -- RETURN_FALSE; -- } -+ PSPELL_FETCH_CONFIG; - - convert_to_string_ex(personal); - -@@ -820,22 +780,17 @@ - PHP_FUNCTION(pspell_config_repl) - { - int type; -- zval **sccin, **repl; -+ zval **conf, **repl; - int argc; - - PspellConfig *config; - - argc = ZEND_NUM_ARGS(); -- if (argc != 2 || zend_get_parameters_ex(argc,&sccin,&repl) == FAILURE) { -+ if (argc != 2 || zend_get_parameters_ex(argc,&conf,&repl) == FAILURE) { - WRONG_PARAM_COUNT; - } - -- convert_to_long_ex(sccin); -- config = (PspellConfig *) zend_list_find(Z_LVAL_PP(sccin), &type); -- if(!config){ -- php_error(E_WARNING, "%ld is not a PSPELL config index",Z_LVAL_PP(sccin)); -- RETURN_FALSE; -- } -+ PSPELL_FETCH_CONFIG; - - pspell_config_replace(config, "save-repl", "true"); - -@@ -860,22 +815,17 @@ - PHP_FUNCTION(pspell_config_save_repl) - { - int type; -- zval **sccin, **save; -+ zval **conf, **save; - int argc; - - PspellConfig *config; - - argc = ZEND_NUM_ARGS(); -- if (argc != 2 || zend_get_parameters_ex(argc,&sccin,&save) == FAILURE) { -+ if (argc != 2 || zend_get_parameters_ex(argc,&conf,&save) == FAILURE) { - WRONG_PARAM_COUNT; - } - -- convert_to_long_ex(sccin); -- config = (PspellConfig *) zend_list_find(Z_LVAL_PP(sccin), &type); -- if(!config){ -- php_error(E_WARNING, "%ld is not a PSPELL config index",Z_LVAL_PP(sccin)); -- RETURN_FALSE; -- } -+ PSPELL_FETCH_CONFIG; - - convert_to_boolean_ex(save); - pspell_config_replace(config, "save-repl", Z_LVAL_PP(save) ? "true" : "false"); diff --git a/dev-php/mod_php/files/php4.4.0-session_save_path-segf.patch b/dev-php/mod_php/files/php4.4.0-session_save_path-segf.patch deleted file mode 100644 index 2c712b0da2d6..000000000000 --- a/dev-php/mod_php/files/php4.4.0-session_save_path-segf.patch +++ /dev/null @@ -1,127 +0,0 @@ ---- sapi/apache2handler/sapi_apache2.c 2005/04/08 20:35:02 1.1.2.40 -+++ sapi/apache2handler/sapi_apache2.c 2005/10/12 21:41:36 1.1.2.40.2.5 -@@ -18,7 +18,7 @@ - +----------------------------------------------------------------------+ - */ - --/* $Id: sapi_apache2.c,v 1.1.2.40 2005/04/08 20:35:02 sniper Exp $ */ -+/* $Id: sapi_apache2.c,v 1.1.2.40.2.5 2005/10/12 21:41:36 tony2001 Exp $ */ - - #include <fcntl.h> - -@@ -453,15 +453,34 @@ static int php_handler(request_rec *r) - request_rec *parent_req = NULL; - TSRMLS_FETCH(); - -+#define PHPAP_INI_OFF \ -+ if (strcmp(r->protocol, "INCLUDED")) { \ -+ zend_try { zend_ini_deactivate(TSRMLS_C); } zend_end_try(); \ -+ } \ -+ - conf = ap_get_module_config(r->per_dir_config, &php4_module); -+ -+ /* apply_config() needs r in some cases, so allocate server_context early */ -+ ctx = SG(server_context); -+ if (ctx == NULL) { -+ ctx = SG(server_context) = apr_pcalloc(r->pool, sizeof(*ctx)); -+ /* register a cleanup so we clear out the SG(server_context) -+ * after each request. Note: We pass in the pointer to the -+ * server_context in case this is handled by a different thread. -+ */ -+ apr_pool_cleanup_register(r->pool, (void *)&SG(server_context), php_server_context_cleanup, apr_pool_cleanup_null); -+ ctx->r = r; -+ ctx = NULL; /* May look weird to null it here, but it is to catch the right case in the first_try later on */ -+ } else { -+ parent_req = ctx->r; -+ ctx->r = r; -+ } - apply_config(conf); - - if (strcmp(r->handler, PHP_MAGIC_TYPE) && strcmp(r->handler, PHP_SOURCE_MAGIC_TYPE) && strcmp(r->handler, PHP_SCRIPT)) { - /* Check for xbithack in this case. */ - if (!AP2(xbithack) || strcmp(r->handler, "text/html") || !(r->finfo.protection & APR_UEXECUTE)) { -- zend_try { -- zend_ini_deactivate(TSRMLS_C); -- } zend_end_try(); -+ PHPAP_INI_OFF; - return DECLINED; - } - } -@@ -470,32 +489,24 @@ static int php_handler(request_rec *r) - * the configuration; default behaviour is to accept. */ - if (r->used_path_info == AP_REQ_REJECT_PATH_INFO - && r->path_info && r->path_info[0]) { -- zend_try { -- zend_ini_deactivate(TSRMLS_C); -- } zend_end_try(); -+ PHPAP_INI_OFF; - return HTTP_NOT_FOUND; - } - - /* handle situations where user turns the engine off */ - if (!AP2(engine)) { -- zend_try { -- zend_ini_deactivate(TSRMLS_C); -- } zend_end_try(); -+ PHPAP_INI_OFF; - return DECLINED; - } - - if (r->finfo.filetype == 0) { - php_apache_sapi_log_message_ex("script '%s' not found or unable to stat", r); -- zend_try { -- zend_ini_deactivate(TSRMLS_C); -- } zend_end_try(); -+ PHPAP_INI_OFF; - return HTTP_NOT_FOUND; - } - if (r->finfo.filetype == APR_DIR) { - php_apache_sapi_log_message_ex("attempt to invoke directory '%s' as script", r); -- zend_try { -- zend_ini_deactivate(TSRMLS_C); -- } zend_end_try(); -+ PHPAP_INI_OFF; - return HTTP_FORBIDDEN; - } - -@@ -511,24 +522,30 @@ static int php_handler(request_rec *r) - - zend_first_try { - -- ctx = SG(server_context); - if (ctx == NULL) { -- ctx = SG(server_context) = apr_pcalloc(r->pool, sizeof(*ctx)); -- /* register a cleanup so we clear out the SG(server_context) -- * after each request. Note: We pass in the pointer to the -- * server_context in case this is handled by a different thread. -- */ -- apr_pool_cleanup_register(r->pool, (void *)&SG(server_context), php_server_context_cleanup, apr_pool_cleanup_null); -- -- ctx->r = r; -+normal: - brigade = apr_brigade_create(r->pool, r->connection->bucket_alloc); -+ ctx = SG(server_context); - ctx->brigade = brigade; - - if (php_apache_request_ctor(r, ctx TSRMLS_CC)!=SUCCESS) { - zend_bailout(); - } - } else { -- parent_req = ctx->r; -+ if (!parent_req) { -+ parent_req = ctx->r; -+ } -+ if (parent_req && parent_req->handler && strcmp(parent_req->handler, PHP_MAGIC_TYPE) && strcmp(parent_req->handler, PHP_SOURCE_MAGIC_TYPE) && strcmp(parent_req->handler, PHP_SCRIPT)) { -+ if (php_apache_request_ctor(r, ctx TSRMLS_CC)!=SUCCESS) { -+ zend_bailout(); -+ } -+ } -+ -+ /* check if comming due to ErrorDocument */ -+ if (parent_req && parent_req->status != HTTP_OK) { -+ parent_req = NULL; -+ goto normal; -+ } - ctx->r = r; - brigade = ctx->brigade; - } diff --git a/dev-php/mod_php/metadata.xml b/dev-php/mod_php/metadata.xml deleted file mode 100644 index f1ebb2203ac7..000000000000 --- a/dev-php/mod_php/metadata.xml +++ /dev/null @@ -1,10 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> -<pkgmetadata> - <herd>php</herd> - <maintainer> - <email>robbat2@gentoo.org</email> - <name>Robin H. Johnson</name> - <description>Eclass author and primary maintainer (See the herd for other maintainers)</description> - </maintainer> -</pkgmetadata> diff --git a/dev-php/mod_php/mod_php-4.3.11-r1.ebuild b/dev-php/mod_php/mod_php-4.3.11-r1.ebuild deleted file mode 100644 index 535ddbcd27c2..000000000000 --- a/dev-php/mod_php/mod_php-4.3.11-r1.ebuild +++ /dev/null @@ -1,223 +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-4.3.11-r1.ebuild,v 1.18 2005/10/29 22:16:12 chtekk Exp $ - -IUSE="apache2" - -KEYWORDS="alpha amd64 hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86" - -detectapache() { - # DO NOT REPLICATE THIS IN ANY OTHER PACKAGE WITHOUT PORTAGE DEVS PERMISSION - # IT IS BROKEN AND A TEMPORARY MEASURE! - # YOU'VE BEEN WARNED. - if [[ ${EBUILD_PHASE/depend} != ${EBUILD_PHASE} ]]; then - APACHEVER=1 - return - fi - 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 - !>=net-www/apache-2.0.54-r30 )" -DEPEND="${DEPEND} ${DEPEND_EXTRA}" -RDEPEND="${RDEPEND} ${DEPEND_EXTRA}" -IUSE="${IUSE} debug" -# for this revision only -PDEPEND=">=${PHP_PROVIDER_PKG}-4.3.11" -PROVIDE="${PROVIDE} virtual/httpd-php" - -# fixed PCRE library for security issues, bug #102373 -SRC_URI="${SRC_URI} http://gentoo.longitekk.com/php-pcrelib-new-secpatch.tar.bz2" - -# 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 - - # Bug 88756 - use flash && epatch ${FILESDIR}/php-4.3.11-flash.patch - - # Bug 88795 - use gmp && epatch ${FILESDIR}/php-4.3.11-gmp.patch - - # 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 - - # fix imap symlink creation, bug #105351 - use imap && epatch ${FILESDIR}/php4.3.11-imap-symlink.diff - - # we need to unpack the files here, the eclass doesn't handle this - cd ${WORKDIR} - unpack php-pcrelib-new-secpatch.tar.bz2 - cd ${S} - - # patch to fix PCRE library security issues, bug #102373 - epatch ${FILESDIR}/php4.3.11-pcre-security.patch - - # sobstitute the bundled PCRE library with a fixed version for bug #102373 - einfo "Updating bundled PCRE library" - rm -rf ${S}/ext/pcre/pcrelib && mv -f ${WORKDIR}/pcrelib-new ${S}/ext/pcre/pcrelib || die "Unable to update the bundled PCRE library" -} - -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 " \"emerge --config =${PF}\"" - 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-4.3.11-r3.ebuild b/dev-php/mod_php/mod_php-4.3.11-r3.ebuild deleted file mode 100644 index 09138a209954..000000000000 --- a/dev-php/mod_php/mod_php-4.3.11-r3.ebuild +++ /dev/null @@ -1,247 +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-4.3.11-r3.ebuild,v 1.3 2005/11/04 07:49:13 halcy0n Exp $ - -IUSE="apache2" - -KEYWORDS="~alpha ~amd64 hppa ~ia64 ~mips ppc ~ppc64 ~s390 ~sparc x86" - -detectapache() { - # DO NOT REPLICATE THIS IN ANY OTHER PACKAGE WITHOUT PORTAGE DEVS PERMISSION - # IT IS BROKEN AND A TEMPORARY MEASURE! - # YOU'VE BEEN WARNED. - if [[ ${EBUILD_PHASE/depend} != ${EBUILD_PHASE} ]]; then - APACHEVER=1 - return - fi - 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 - !>=net-www/apache-2.0.54-r30 )" -DEPEND="${DEPEND} ${DEPEND_EXTRA}" -RDEPEND="${RDEPEND} ${DEPEND_EXTRA}" -IUSE="${IUSE} debug" -# for this revision only -PDEPEND=">=${PHP_PROVIDER_PKG}-4.3.11" -PROVIDE="${PROVIDE} virtual/httpd-php" - -# fixed PCRE library for security issues, bug #102373 -SRC_URI="${SRC_URI} http://gentoo.longitekk.com/php-pcrelib-new-secpatch.tar.bz2" - -# 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 - - # Bug 88756 - use flash && epatch ${FILESDIR}/php-4.3.11-flash.patch - - # Bug 88795 - use gmp && epatch ${FILESDIR}/php-4.3.11-gmp.patch - - # 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 - - # fix imap symlink creation, bug #105351 - use imap && epatch ${FILESDIR}/php4.3.11-imap-symlink.diff - - # patch to fix pspell extension, bug #99312 (new patch by upstream) - use spell && epatch "${FILESDIR}/php4.3.11-pspell-ext-segf.patch" - - # patch to fix safe_mode bypass in GD extension, bug #109669 - if use gd || use gd-external ; then - epatch "${FILESDIR}/php4.3.11-gd_safe_mode.patch" - fi - - # patch fo fix safe_mode bypass in CURL extension, bug #111032 - use curl && epatch "${FILESDIR}/php4.3.11-curl_safemode.patch" - - # patch $GLOBALS overwrite vulnerability, bug #111011 and bug #111014 - epatch "${FILESDIR}/php4.3.11-globals_overwrite.patch" - - # patch phpinfo() XSS vulnerability, bug #111015 - epatch "${FILESDIR}/php4.3.11-phpinfo_xss.patch" - - # patch open_basedir directory bypass, bug #102943 - epatch "${FILESDIR}/php4.3.11-fopen_wrappers.patch" - - # patch to fix session.save_path segfault and other issues in - # the apache2handler SAPI, bug #107602 - epatch "${FILESDIR}/php4.3.11-session_save_path-segf.patch" - - # we need to unpack the files here, the eclass doesn't handle this - cd ${WORKDIR} - unpack php-pcrelib-new-secpatch.tar.bz2 - cd ${S} - - # patch to fix PCRE library security issues, bug #102373 - epatch ${FILESDIR}/php4.3.11-pcre-security.patch - - # sobstitute the bundled PCRE library with a fixed version for bug #102373 - einfo "Updating bundled PCRE library" - rm -rf ${S}/ext/pcre/pcrelib && mv -f ${WORKDIR}/pcrelib-new ${S}/ext/pcre/pcrelib || die "Unable to update the bundled PCRE library" -} - -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 " \"emerge --config =${PF}\"" - 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-4.3.11-r4.ebuild b/dev-php/mod_php/mod_php-4.3.11-r4.ebuild deleted file mode 100644 index e6ba21bf4790..000000000000 --- a/dev-php/mod_php/mod_php-4.3.11-r4.ebuild +++ /dev/null @@ -1,247 +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-4.3.11-r4.ebuild,v 1.7 2005/11/12 21:29:53 ranger Exp $ - -IUSE="apache2" - -KEYWORDS="alpha amd64 hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86" - -detectapache() { - # DO NOT REPLICATE THIS IN ANY OTHER PACKAGE WITHOUT PORTAGE DEVS PERMISSION - # IT IS BROKEN AND A TEMPORARY MEASURE! - # YOU'VE BEEN WARNED. - if [[ ${EBUILD_PHASE/depend} != ${EBUILD_PHASE} ]]; then - APACHEVER=1 - return - fi - 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 - !>=net-www/apache-2.0.54-r30 )" -DEPEND="${DEPEND} ${DEPEND_EXTRA}" -RDEPEND="${RDEPEND} ${DEPEND_EXTRA}" -IUSE="${IUSE} debug" -# for this revision only -PDEPEND=">=${PHP_PROVIDER_PKG}-4.3.11" -PROVIDE="${PROVIDE} virtual/httpd-php" - -# fixed PCRE library for security issues, bug #102373 -SRC_URI="${SRC_URI} http://gentoo.longitekk.com/php-pcrelib-new-secpatch.tar.bz2" - -# 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 - - # Bug 88756 - use flash && epatch ${FILESDIR}/php-4.3.11-flash.patch - - # Bug 88795 - use gmp && epatch ${FILESDIR}/php-4.3.11-gmp.patch - - # 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 - - # fix imap symlink creation, bug #105351 - use imap && epatch ${FILESDIR}/php4.3.11-imap-symlink.diff - - # patch to fix pspell extension, bug #99312 (new patch by upstream) - use spell && epatch "${FILESDIR}/php4.3.11-pspell-ext-segf.patch" - - # patch to fix safe_mode bypass in GD extension, bug #109669 - if use gd || use gd-external ; then - epatch "${FILESDIR}/php4.3.11-gd_safe_mode.patch" - fi - - # patch fo fix safe_mode bypass in CURL extension, bug #111032 - use curl && epatch "${FILESDIR}/php4.3.11-curl_safemode.patch" - - # patch $GLOBALS overwrite vulnerability, bug #111011 and bug #111014 - epatch "${FILESDIR}/php4.3.11-globals_overwrite.patch" - - # patch phpinfo() XSS vulnerability, bug #111015 - epatch "${FILESDIR}/php4.3.11-phpinfo_xss.patch" - - # patch open_basedir directory bypass, bug #102943 - epatch "${FILESDIR}/php4.3.11-fopen_wrappers.patch" - - # patch to fix session.save_path segfault and other issues in - # the apache2handler SAPI, bug #107602 - epatch "${FILESDIR}/php4.3.11-session_save_path-segf.patch" - - # we need to unpack the files here, the eclass doesn't handle this - cd ${WORKDIR} - unpack php-pcrelib-new-secpatch.tar.bz2 - cd ${S} - - # patch to fix PCRE library security issues, bug #102373 - epatch ${FILESDIR}/php4.3.11-pcre-security.patch - - # sobstitute the bundled PCRE library with a fixed version for bug #102373 - einfo "Updating bundled PCRE library" - rm -rf ${S}/ext/pcre/pcrelib && mv -f ${WORKDIR}/pcrelib-new ${S}/ext/pcre/pcrelib || die "Unable to update the bundled PCRE library" -} - -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 " \"emerge --config =${PF}\"" - 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-4.3.11.ebuild b/dev-php/mod_php/mod_php-4.3.11.ebuild deleted file mode 100644 index e44da70ae88a..000000000000 --- a/dev-php/mod_php/mod_php-4.3.11.ebuild +++ /dev/null @@ -1,205 +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-4.3.11.ebuild,v 1.20 2005/10/29 22:16:12 chtekk Exp $ - -IUSE="apache2" - -KEYWORDS="alpha amd64 hppa ia64 mips ppc ppc64 s390 sparc x86" - -detectapache() { - # DO NOT REPLICATE THIS IN ANY OTHER PACKAGE WITHOUT PORTAGE DEVS PERMISSION - # IT IS BROKEN AND A TEMPORARY MEASURE! - # YOU'VE BEEN WARNED. - if [[ ${EBUILD_PHASE/depend} != ${EBUILD_PHASE} ]]; then - APACHEVER=1 - return - fi - 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 - !>=net-www/apache-2.0.54-r30 )" -DEPEND="${DEPEND} ${DEPEND_EXTRA}" -RDEPEND="${RDEPEND} ${DEPEND_EXTRA}" -IUSE="${IUSE} debug" -# for this revision only -PDEPEND=">=${PHP_PROVIDER_PKG}-4.3.11" -PROVIDE="${PROVIDE} virtual/httpd-php" - -# 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 - - # Bug 88756 - use flash && epatch ${FILESDIR}/php-4.3.11-flash.patch - - # Bug 88795 - use gmp && epatch ${FILESDIR}/php-4.3.11-gmp.patch - - # 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 " \"emerge --config =${PF}\"" - 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-4.4.0-r1.ebuild b/dev-php/mod_php/mod_php-4.4.0-r1.ebuild deleted file mode 100644 index 32329cacbc84..000000000000 --- a/dev-php/mod_php/mod_php-4.4.0-r1.ebuild +++ /dev/null @@ -1,218 +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-4.4.0-r1.ebuild,v 1.9 2005/10/29 22:16:12 chtekk Exp $ - -IUSE="apache2" - -KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86" - -detectapache() { - # DO NOT REPLICATE THIS IN ANY OTHER PACKAGE WITHOUT PORTAGE DEVS PERMISSION - # IT IS BROKEN AND A TEMPORARY MEASURE! - # YOU'VE BEEN WARNED. - if [[ ${EBUILD_PHASE/depend} != ${EBUILD_PHASE} ]]; then - APACHEVER=1 - return - fi - 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 apache-module flag-o-matic - -DESCRIPTION="Apache module for PHP" - -DEPEND_EXTRA=">=net-www/apache-1.3.33-r10 - apache2? ( >=net-www/apache-2.0.54-r30 )" -DEPEND="${DEPEND} ${DEPEND_EXTRA}" -RDEPEND="${RDEPEND} ${DEPEND_EXTRA}" -IUSE="${IUSE} debug" -# for this revision only -PDEPEND=">=${PHP_PROVIDER_PKG}-4.4.0" -PROVIDE="${PROVIDE} virtual/httpd-php" - -# generalize some apache{,2} vars (defined by apache-module.eclass) -if [ -n ${USE_APACHE2} ]; then - APACHE_MODULESDIR=${APACHE2_MODULESDIR} - APACHE_CONFDIR=${APACHE2_CONFDIR} -else - APACHE_MODULESDIR=${APACHE_MODULESDIR} - APACHE_CONFDIR=${APACHE_CONFDIR} -fi - -# 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 -} - -setup_environ() { - append-flags `apr-config --cppflags --cflags` -} - -src_compile() { - setup_environ - - # 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}" - - # Do not build CLI SAPI module. - myconf="${myconf} --disable-cli --without-pear" - - 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 ${APACHE_CONFDIR} - dodir ${PHPINIDIRECTORY} - dosym ${PHPINIDIRECTORY}/${PHPINIFILENAME} ${APACHE_CONFDIR}/${PHPINIFILENAME} - - einfo "Cleaning up a little" - rm -rf ${D}${APACHE_MODULESDIR}/libphp4.so - - einfo "Adding symlink to Apache${USE_APACHE2} modules for PHP" - dosym ${APACHE_MODULESDIR} ${PHPINIDIRECTORY}/lib - exeinto ${APACHE_MODULESDIR} - - 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 ${APACHE2_MODULES_CONFDIR} - doins "${FILESDIR}/4.3.11-r2/70_mod_php.conf" - else - einfo "Installing a Apache config for PHP (mod_php.conf)" - insinto ${APACHE1_MODULES_CONFDIR} - doins ${FILESDIR}/mod_php.conf - dosym ${PHPINIDIRECTORY}/${PHPINIFILENAME} ${APACHE1_MODULES_CONFDIR}/${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 " \"emerge --config =${PF}\"" - 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/apache.conf \ - modules/libphp4.so mod_php4.c php4_module \ - before=perl define=PHP4 addconf=addon-modules/mod_php.conf - :; - fi -} diff --git a/dev-php/mod_php/mod_php-4.4.0-r2.ebuild b/dev-php/mod_php/mod_php-4.4.0-r2.ebuild deleted file mode 100644 index e78001b193cb..000000000000 --- a/dev-php/mod_php/mod_php-4.4.0-r2.ebuild +++ /dev/null @@ -1,220 +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-4.4.0-r2.ebuild,v 1.8 2005/10/29 22:16:12 chtekk Exp $ - -IUSE="apache2" - -KEYWORDS="alpha amd64 ~arm hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86" - -detectapache() { - # DO NOT REPLICATE THIS IN ANY OTHER PACKAGE WITHOUT PORTAGE DEVS PERMISSION - # IT IS BROKEN AND A TEMPORARY MEASURE! - # YOU'VE BEEN WARNED. - if [[ ${EBUILD_PHASE/depend} != ${EBUILD_PHASE} ]]; then - APACHEVER=1 - return - fi - 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 - !>=net-www/apache-2.0.54-r30 )" -DEPEND="${DEPEND} ${DEPEND_EXTRA}" -RDEPEND="${RDEPEND} ${DEPEND_EXTRA}" -IUSE="${IUSE} debug" -# for this revision only -PDEPEND=">=${PHP_PROVIDER_PKG}-4.4.0" -PROVIDE="${PROVIDE} virtual/httpd-php" - -# fixed PCRE library for security issues, bug #102373 -SRC_URI="${SRC_URI} http://gentoo.longitekk.com/php-pcrelib-new-secpatch.tar.bz2" - -# 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 - - # fix imap symlink creation, bug #105351 - use imap && epatch ${FILESDIR}/php4.4.0-imap-symlink.diff - - # we need to unpack the files here, the eclass doesn't handle this - cd ${WORKDIR} - unpack php-pcrelib-new-secpatch.tar.bz2 - cd ${S} - - # patch to fix PCRE library security issues, bug #102373 - epatch ${FILESDIR}/php4.4.0-pcre-security.patch - - # sobstitute the bundled PCRE library with a fixed version for bug #102373 - einfo "Updating bundled PCRE library" - rm -rf ${S}/ext/pcre/pcrelib && mv -f ${WORKDIR}/pcrelib-new ${S}/ext/pcre/pcrelib || die "Unable to update the bundled PCRE library" -} - -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}" - - # Do not build CLI SAPI module. - myconf="${myconf} --disable-cli --without-pear" - - 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 " \"emerge --config =${PF}\"" - 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-4.4.0-r3.ebuild b/dev-php/mod_php/mod_php-4.4.0-r3.ebuild deleted file mode 100644 index 2394e92257ee..000000000000 --- a/dev-php/mod_php/mod_php-4.4.0-r3.ebuild +++ /dev/null @@ -1,206 +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-4.4.0-r3.ebuild,v 1.13 2005/10/29 22:16:12 chtekk Exp $ - -IUSE="apache2" - -KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sparc x86" - -detectapache() { - # DO NOT REPLICATE THIS IN ANY OTHER PACKAGE WITHOUT PORTAGE DEVS PERMISSION - # IT IS BROKEN AND A TEMPORARY MEASURE! - # YOU'VE BEEN WARNED. - if [[ ${EBUILD_PHASE/depend} != ${EBUILD_PHASE} ]]; then - APACHEVER=1 - return - fi - 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 apache-module flag-o-matic - -DESCRIPTION="Apache module for PHP" - -DEPEND_EXTRA=">=net-www/apache-1.3.33-r10 - apache2? ( >=net-www/apache-2.0.54-r30 )" -DEPEND="${DEPEND} ${DEPEND_EXTRA}" -RDEPEND="${RDEPEND} ${DEPEND_EXTRA}" -IUSE="${IUSE} debug" -# for this revision only -PDEPEND=">=${PHP_PROVIDER_PKG}-4.4.0" -PROVIDE="${PROVIDE} virtual/httpd-php" - -# fixed PCRE library for security issues, bug #102373 -SRC_URI="${SRC_URI} http://gentoo.longitekk.com/php-pcrelib-new-secpatch.tar.bz2" - -# generalize some apache{,2} vars (defined by apache-module.eclass) -if [ -n ${USE_APACHE2} ]; then - APACHE_MODULESDIR=${APACHE2_MODULESDIR} - APACHE_CONFDIR=${APACHE2_CONFDIR} -else - APACHE_MODULESDIR=${APACHE_MODULESDIR} - APACHE_CONFDIR=${APACHE_CONFDIR} -fi - -# 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 - - # fix imap symlink creation, bug #105351 - use imap && epatch ${FILESDIR}/php4.4.0-imap-symlink.diff - - # we need to unpack the files here, the eclass doesn't handle this - cd ${WORKDIR} - unpack php-pcrelib-new-secpatch.tar.bz2 - cd ${S} - - # patch to fix PCRE library security issues, bug #102373 - epatch ${FILESDIR}/php4.4.0-pcre-security.patch - - # sobstitute the bundled PCRE library with a fixed version for bug #102373 - einfo "Updating bundled PCRE library" - rm -rf ${S}/ext/pcre/pcrelib && mv -f ${WORKDIR}/pcrelib-new ${S}/ext/pcre/pcrelib || die "Unable to update the bundled PCRE library" -} - -setup_environ() { - append-flags `apr-config --cppflags --cflags` -} - -src_compile() { - setup_environ - - # 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*) ;; - *peruser*) ;; - *) 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}" - - # Do not build CLI SAPI module. - myconf="${myconf} --disable-cli --without-pear" - - php-sapi_src_compile -} - -src_install() { - PHP_INSTALLTARGETS="install" - php-sapi_src_install - - dodir ${APACHE_CONFDIR} - dodir ${PHPINIDIRECTORY} - - einfo "Cleaning up a little" - rm -rf ${D}${APACHE_MODULESDIR}/libphp4.so - - exeinto ${APACHE_MODULESDIR} - 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 ${APACHE2_MODULES_CONFDIR} - doins ${FILESDIR}/4.4.0-a2/70_mod_php.conf - else - einfo "Installing a Apache config for PHP (70_mod_php.conf)" - insinto ${APACHE1_MODULES_CONFDIR} - doins ${FILESDIR}/4.4.0-a1/70_mod_php.conf - fi -} - -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 - APACHE1_MOD_DEFINE="PHP4" - APACHE1_MOD_CONF="70_mod_php.conf" - APACHE2_MOD_DEFINE="PHP4" - APACHE2_MOD_CONF="70_mod_php.conf" - apache-module_pkg_postinst -} diff --git a/dev-php/mod_php/mod_php-4.4.0-r6.ebuild b/dev-php/mod_php/mod_php-4.4.0-r6.ebuild deleted file mode 100644 index dccd6d27c54d..000000000000 --- a/dev-php/mod_php/mod_php-4.4.0-r6.ebuild +++ /dev/null @@ -1,244 +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-4.4.0-r6.ebuild,v 1.3 2005/11/04 07:49:13 halcy0n Exp $ - -IUSE="apache2" - -KEYWORDS="~alpha ~amd64 ~arm hppa ~ia64 ~mips ppc ~ppc64 ~s390 ~sparc x86" - -detectapache() { - # DO NOT REPLICATE THIS IN ANY OTHER PACKAGE WITHOUT PORTAGE DEVS PERMISSION - # IT IS BROKEN AND A TEMPORARY MEASURE! - # YOU'VE BEEN WARNED. - if [[ ${EBUILD_PHASE/depend} != ${EBUILD_PHASE} ]]; then - APACHEVER=1 - return - fi - 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 - !>=net-www/apache-2.0.54-r30 )" -DEPEND="${DEPEND} ${DEPEND_EXTRA}" -RDEPEND="${RDEPEND} ${DEPEND_EXTRA}" -IUSE="${IUSE} debug" -# for this revision only -PDEPEND=">=${PHP_PROVIDER_PKG}-4.4.0" -PROVIDE="${PROVIDE} virtual/httpd-php" - -# fixed PCRE library for security issues, bug #102373 -SRC_URI="${SRC_URI} http://gentoo.longitekk.com/php-pcrelib-new-secpatch.tar.bz2" - -# 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 - - # fix imap symlink creation, bug #105351 - use imap && epatch ${FILESDIR}/php4.4.0-imap-symlink.diff - - # patch to fix pspell extension, bug #99312 (new patch by upstream) - use spell && epatch "${FILESDIR}/php4.4.0-pspell-ext-segf.patch" - - # patch to fix safe_mode bypass in GD extension, bug #109669 - if use gd || use gd-external ; then - epatch "${FILESDIR}/php4.4.0-gd_safe_mode.patch" - fi - - # patch fo fix safe_mode bypass in CURL extension, bug #111032 - use curl && epatch "${FILESDIR}/php4.4.0-curl_safemode.patch" - - # patch $GLOBALS overwrite vulnerability, bug #111011 and bug #111014 - epatch "${FILESDIR}/php4.4.0-globals_overwrite.patch" - - # patch phpinfo() XSS vulnerability, bug #111015 - epatch "${FILESDIR}/php4.4.0-phpinfo_xss.patch" - - # patch open_basedir directory bypass, bug #102943 - epatch "${FILESDIR}/php4.4.0-fopen_wrappers.patch" - - # patch to fix session.save_path segfault and other issues in - # the apache2handler SAPI, bug #107602 - epatch "${FILESDIR}/php4.4.0-session_save_path-segf.patch" - - # we need to unpack the files here, the eclass doesn't handle this - cd ${WORKDIR} - unpack php-pcrelib-new-secpatch.tar.bz2 - cd ${S} - - # patch to fix PCRE library security issues, bug #102373 - epatch ${FILESDIR}/php4.4.0-pcre-security.patch - - # sobstitute the bundled PCRE library with a fixed version for bug #102373 - einfo "Updating bundled PCRE library" - rm -rf ${S}/ext/pcre/pcrelib && mv -f ${WORKDIR}/pcrelib-new ${S}/ext/pcre/pcrelib || die "Unable to update the bundled PCRE library" -} - -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}" - - # Do not build CLI SAPI module. - myconf="${myconf} --disable-cli --without-pear" - - 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 " \"emerge --config =${PF}\"" - 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-4.4.0-r7.ebuild b/dev-php/mod_php/mod_php-4.4.0-r7.ebuild deleted file mode 100644 index 7a2e292bff96..000000000000 --- a/dev-php/mod_php/mod_php-4.4.0-r7.ebuild +++ /dev/null @@ -1,230 +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-4.4.0-r7.ebuild,v 1.2 2005/11/04 07:49:13 halcy0n Exp $ - -IUSE="apache2" - -KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc x86" - -detectapache() { - # DO NOT REPLICATE THIS IN ANY OTHER PACKAGE WITHOUT PORTAGE DEVS PERMISSION - # IT IS BROKEN AND A TEMPORARY MEASURE! - # YOU'VE BEEN WARNED. - if [[ ${EBUILD_PHASE/depend} != ${EBUILD_PHASE} ]]; then - APACHEVER=1 - return - fi - 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 apache-module flag-o-matic - -DESCRIPTION="Apache module for PHP" - -DEPEND_EXTRA=">=net-www/apache-1.3.33-r10 - apache2? ( >=net-www/apache-2.0.54-r30 )" -DEPEND="${DEPEND} ${DEPEND_EXTRA}" -RDEPEND="${RDEPEND} ${DEPEND_EXTRA}" -IUSE="${IUSE} debug" -# for this revision only -PDEPEND=">=${PHP_PROVIDER_PKG}-4.4.0" -PROVIDE="${PROVIDE} virtual/httpd-php" - -# fixed PCRE library for security issues, bug #102373 -SRC_URI="${SRC_URI} http://gentoo.longitekk.com/php-pcrelib-new-secpatch.tar.bz2" - -# generalize some apache{,2} vars (defined by apache-module.eclass) -if [ -n ${USE_APACHE2} ]; then - APACHE_MODULESDIR=${APACHE2_MODULESDIR} - APACHE_CONFDIR=${APACHE2_CONFDIR} -else - APACHE_MODULESDIR=${APACHE_MODULESDIR} - APACHE_CONFDIR=${APACHE_CONFDIR} -fi - -# 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 - - # fix imap symlink creation, bug #105351 - use imap && epatch ${FILESDIR}/php4.4.0-imap-symlink.diff - - # patch to fix pspell extension, bug #99312 (new patch by upstream) - use spell && epatch "${FILESDIR}/php4.4.0-pspell-ext-segf.patch" - - # patch to fix safe_mode bypass in GD extension, bug #109669 - if use gd || use gd-external ; then - epatch "${FILESDIR}/php4.4.0-gd_safe_mode.patch" - fi - - # patch fo fix safe_mode bypass in CURL extension, bug #111032 - use curl && epatch "${FILESDIR}/php4.4.0-curl_safemode.patch" - - # patch $GLOBALS overwrite vulnerability, bug #111011 and bug #111014 - epatch "${FILESDIR}/php4.4.0-globals_overwrite.patch" - - # patch phpinfo() XSS vulnerability, bug #111015 - epatch "${FILESDIR}/php4.4.0-phpinfo_xss.patch" - - # patch open_basedir directory bypass, bug #102943 - epatch "${FILESDIR}/php4.4.0-fopen_wrappers.patch" - - # patch to fix session.save_path segfault and other issues in - # the apache2handler SAPI, bug #107602 - epatch "${FILESDIR}/php4.4.0-session_save_path-segf.patch" - - # we need to unpack the files here, the eclass doesn't handle this - cd ${WORKDIR} - unpack php-pcrelib-new-secpatch.tar.bz2 - cd ${S} - - # patch to fix PCRE library security issues, bug #102373 - epatch ${FILESDIR}/php4.4.0-pcre-security.patch - - # sobstitute the bundled PCRE library with a fixed version for bug #102373 - einfo "Updating bundled PCRE library" - rm -rf ${S}/ext/pcre/pcrelib && mv -f ${WORKDIR}/pcrelib-new ${S}/ext/pcre/pcrelib || die "Unable to update the bundled PCRE library" -} - -setup_environ() { - append-flags `apr-config --cppflags --cflags` -} - -src_compile() { - setup_environ - - # 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*) ;; - *peruser*) ;; - *) 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}" - - # Do not build CLI SAPI module. - myconf="${myconf} --disable-cli --without-pear" - - php-sapi_src_compile -} - -src_install() { - PHP_INSTALLTARGETS="install" - php-sapi_src_install - - dodir ${APACHE_CONFDIR} - dodir ${PHPINIDIRECTORY} - - einfo "Cleaning up a little" - rm -rf ${D}${APACHE_MODULESDIR}/libphp4.so - - exeinto ${APACHE_MODULESDIR} - 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 ${APACHE2_MODULES_CONFDIR} - doins ${FILESDIR}/4.4.0-a2/70_mod_php.conf - else - einfo "Installing a Apache config for PHP (70_mod_php.conf)" - insinto ${APACHE1_MODULES_CONFDIR} - doins ${FILESDIR}/4.4.0-a1/70_mod_php.conf - fi -} - -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 - APACHE1_MOD_DEFINE="PHP4" - APACHE1_MOD_CONF="70_mod_php.conf" - APACHE2_MOD_DEFINE="PHP4" - APACHE2_MOD_CONF="70_mod_php.conf" - apache-module_pkg_postinst -} diff --git a/dev-php/mod_php/mod_php-4.4.0-r8.ebuild b/dev-php/mod_php/mod_php-4.4.0-r8.ebuild deleted file mode 100644 index 42a0b4edd177..000000000000 --- a/dev-php/mod_php/mod_php-4.4.0-r8.ebuild +++ /dev/null @@ -1,244 +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-4.4.0-r8.ebuild,v 1.7 2005/11/12 21:29:53 ranger Exp $ - -IUSE="apache2" - -KEYWORDS="alpha amd64 ~arm hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86" - -detectapache() { - # DO NOT REPLICATE THIS IN ANY OTHER PACKAGE WITHOUT PORTAGE DEVS PERMISSION - # IT IS BROKEN AND A TEMPORARY MEASURE! - # YOU'VE BEEN WARNED. - if [[ ${EBUILD_PHASE/depend} != ${EBUILD_PHASE} ]]; then - APACHEVER=1 - return - fi - 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 - !>=net-www/apache-2.0.54-r30 )" -DEPEND="${DEPEND} ${DEPEND_EXTRA}" -RDEPEND="${RDEPEND} ${DEPEND_EXTRA}" -IUSE="${IUSE} debug" -# for this revision only -PDEPEND=">=${PHP_PROVIDER_PKG}-4.4.0" -PROVIDE="${PROVIDE} virtual/httpd-php" - -# fixed PCRE library for security issues, bug #102373 -SRC_URI="${SRC_URI} http://gentoo.longitekk.com/php-pcrelib-new-secpatch.tar.bz2" - -# 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 - - # fix imap symlink creation, bug #105351 - use imap && epatch ${FILESDIR}/php4.4.0-imap-symlink.diff - - # patch to fix pspell extension, bug #99312 (new patch by upstream) - use spell && epatch "${FILESDIR}/php4.4.0-pspell-ext-segf.patch" - - # patch to fix safe_mode bypass in GD extension, bug #109669 - if use gd || use gd-external ; then - epatch "${FILESDIR}/php4.4.0-gd_safe_mode.patch" - fi - - # patch fo fix safe_mode bypass in CURL extension, bug #111032 - use curl && epatch "${FILESDIR}/php4.4.0-curl_safemode.patch" - - # patch $GLOBALS overwrite vulnerability, bug #111011 and bug #111014 - epatch "${FILESDIR}/php4.4.0-globals_overwrite.patch" - - # patch phpinfo() XSS vulnerability, bug #111015 - epatch "${FILESDIR}/php4.4.0-phpinfo_xss.patch" - - # patch open_basedir directory bypass, bug #102943 - epatch "${FILESDIR}/php4.4.0-fopen_wrappers.patch" - - # patch to fix session.save_path segfault and other issues in - # the apache2handler SAPI, bug #107602 - epatch "${FILESDIR}/php4.4.0-session_save_path-segf.patch" - - # we need to unpack the files here, the eclass doesn't handle this - cd ${WORKDIR} - unpack php-pcrelib-new-secpatch.tar.bz2 - cd ${S} - - # patch to fix PCRE library security issues, bug #102373 - epatch ${FILESDIR}/php4.4.0-pcre-security.patch - - # sobstitute the bundled PCRE library with a fixed version for bug #102373 - einfo "Updating bundled PCRE library" - rm -rf ${S}/ext/pcre/pcrelib && mv -f ${WORKDIR}/pcrelib-new ${S}/ext/pcre/pcrelib || die "Unable to update the bundled PCRE library" -} - -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}" - - # Do not build CLI SAPI module. - myconf="${myconf} --disable-cli --without-pear" - - 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 " \"emerge --config =${PF}\"" - 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-4.4.0-r9.ebuild b/dev-php/mod_php/mod_php-4.4.0-r9.ebuild deleted file mode 100644 index c9fda102ff99..000000000000 --- a/dev-php/mod_php/mod_php-4.4.0-r9.ebuild +++ /dev/null @@ -1,230 +0,0 @@ -# Copyright 1999-2006 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.4.0-r9.ebuild,v 1.8 2006/02/04 17:40:19 agriffis Exp $ - -IUSE="apache2" - -KEYWORDS="alpha amd64 ~arm hppa ia64 ~mips ppc ppc64 ~s390 sparc x86" - -detectapache() { - # DO NOT REPLICATE THIS IN ANY OTHER PACKAGE WITHOUT PORTAGE DEVS PERMISSION - # IT IS BROKEN AND A TEMPORARY MEASURE! - # YOU'VE BEEN WARNED. - if [[ ${EBUILD_PHASE/depend} != ${EBUILD_PHASE} ]]; then - APACHEVER=1 - return - fi - 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 apache-module flag-o-matic - -DESCRIPTION="Apache module for PHP" - -DEPEND_EXTRA=">=net-www/apache-1.3.33-r10 - apache2? ( >=net-www/apache-2.0.54-r30 )" -DEPEND="${DEPEND} ${DEPEND_EXTRA}" -RDEPEND="${RDEPEND} ${DEPEND_EXTRA}" -IUSE="${IUSE} debug" -# for this revision only -PDEPEND=">=${PHP_PROVIDER_PKG}-4.4.0" -PROVIDE="${PROVIDE} virtual/httpd-php" - -# fixed PCRE library for security issues, bug #102373 -SRC_URI="${SRC_URI} http://gentoo.longitekk.com/php-pcrelib-new-secpatch.tar.bz2" - -# generalize some apache{,2} vars (defined by apache-module.eclass) -if [ -n ${USE_APACHE2} ]; then - APACHE_MODULESDIR=${APACHE2_MODULESDIR} - APACHE_CONFDIR=${APACHE2_CONFDIR} -else - APACHE_MODULESDIR=${APACHE_MODULESDIR} - APACHE_CONFDIR=${APACHE_CONFDIR} -fi - -# 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 - - # fix imap symlink creation, bug #105351 - use imap && epatch ${FILESDIR}/php4.4.0-imap-symlink.diff - - # patch to fix pspell extension, bug #99312 (new patch by upstream) - use spell && epatch "${FILESDIR}/php4.4.0-pspell-ext-segf.patch" - - # patch to fix safe_mode bypass in GD extension, bug #109669 - if use gd || use gd-external ; then - epatch "${FILESDIR}/php4.4.0-gd_safe_mode.patch" - fi - - # patch fo fix safe_mode bypass in CURL extension, bug #111032 - use curl && epatch "${FILESDIR}/php4.4.0-curl_safemode.patch" - - # patch $GLOBALS overwrite vulnerability, bug #111011 and bug #111014 - epatch "${FILESDIR}/php4.4.0-globals_overwrite.patch" - - # patch phpinfo() XSS vulnerability, bug #111015 - epatch "${FILESDIR}/php4.4.0-phpinfo_xss.patch" - - # patch open_basedir directory bypass, bug #102943 - epatch "${FILESDIR}/php4.4.0-fopen_wrappers.patch" - - # patch to fix session.save_path segfault and other issues in - # the apache2handler SAPI, bug #107602 - epatch "${FILESDIR}/php4.4.0-session_save_path-segf.patch" - - # we need to unpack the files here, the eclass doesn't handle this - cd ${WORKDIR} - unpack php-pcrelib-new-secpatch.tar.bz2 - cd ${S} - - # patch to fix PCRE library security issues, bug #102373 - epatch ${FILESDIR}/php4.4.0-pcre-security.patch - - # sobstitute the bundled PCRE library with a fixed version for bug #102373 - einfo "Updating bundled PCRE library" - rm -rf ${S}/ext/pcre/pcrelib && mv -f ${WORKDIR}/pcrelib-new ${S}/ext/pcre/pcrelib || die "Unable to update the bundled PCRE library" -} - -setup_environ() { - append-flags `apr-config --cppflags --cflags` -} - -src_compile() { - setup_environ - - # 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*) ;; - *peruser*) ;; - *) 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}" - - # Do not build CLI SAPI module. - myconf="${myconf} --disable-cli --without-pear" - - php-sapi_src_compile -} - -src_install() { - PHP_INSTALLTARGETS="install" - php-sapi_src_install - - dodir ${APACHE_CONFDIR} - dodir ${PHPINIDIRECTORY} - - einfo "Cleaning up a little" - rm -rf ${D}${APACHE_MODULESDIR}/libphp4.so - - exeinto ${APACHE_MODULESDIR} - 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 ${APACHE2_MODULES_CONFDIR} - doins ${FILESDIR}/4.4.0-a2/70_mod_php.conf - else - einfo "Installing a Apache config for PHP (70_mod_php.conf)" - insinto ${APACHE1_MODULES_CONFDIR} - doins ${FILESDIR}/4.4.0-a1/70_mod_php.conf - fi -} - -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 - APACHE1_MOD_DEFINE="PHP4" - APACHE1_MOD_CONF="70_mod_php.conf" - APACHE2_MOD_DEFINE="PHP4" - APACHE2_MOD_CONF="70_mod_php.conf" - apache-module_pkg_postinst -} diff --git a/dev-php/mod_php/mod_php-4.4.0.ebuild b/dev-php/mod_php/mod_php-4.4.0.ebuild deleted file mode 100644 index eff05d2d8517..000000000000 --- a/dev-php/mod_php/mod_php-4.4.0.ebuild +++ /dev/null @@ -1,202 +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-4.4.0.ebuild,v 1.19 2005/10/29 22:16:12 chtekk Exp $ - -IUSE="apache2" - -KEYWORDS="alpha amd64 arm hppa ia64 mips ppc ppc64 s390 sparc x86" - -detectapache() { - # DO NOT REPLICATE THIS IN ANY OTHER PACKAGE WITHOUT PORTAGE DEVS PERMISSION - # IT IS BROKEN AND A TEMPORARY MEASURE! - # YOU'VE BEEN WARNED. - if [[ ${EBUILD_PHASE/depend} != ${EBUILD_PHASE} ]]; then - APACHEVER=1 - return - fi - 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 - !>=net-www/apache-2.0.54-r30 )" -DEPEND="${DEPEND} ${DEPEND_EXTRA}" -RDEPEND="${RDEPEND} ${DEPEND_EXTRA}" -IUSE="${IUSE} debug" -# for this revision only -PDEPEND=">=${PHP_PROVIDER_PKG}-4.4.0" -PROVIDE="${PROVIDE} virtual/httpd-php" - -# 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}" - - # Do not build CLI SAPI module. - myconf="${myconf} --disable-cli --without-pear" - - 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 " \"emerge --config =${PF}\"" - 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 -} |