Revbump to fix http://bugs.php.net/bug.php?id=35067.

(Portage version: 2.0.53_rc6)

6 files changed, 199 insertions, 2 deletions

diff --git a/dev-php/php/ChangeLog b/dev-php/php/ChangeLog
index 872e015e95b5..7f82b690d41c 100644
--- a/dev-php/php/ChangeLog
+++ b/dev-php/php/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for dev-php/php
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-php/php/ChangeLog,v 1.202 2005/11/04 10:56:29 chtekk Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-php/php/ChangeLog,v 1.203 2005/11/04 12:09:52 chtekk Exp $
+
+*php-4.4.0-r4 (04 Nov 2005)
+*php-4.3.11-r4 (04 Nov 2005)
+
+  04 Nov 2005; Luca Longinotti <chtekk@gentoo.org> +php-4.3.11-r4.ebuild,
+  +php-4.4.0-r4.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,
diff --git a/dev-php/php/Manifest b/dev-php/php/Manifest
index 68863226311b..aa641ec650b6 100644
--- a/dev-php/php/Manifest
+++ b/dev-php/php/Manifest
@@ -1,10 +1,12 @@
-MD5 f4c636ba866f8667435542ddda2f633e ChangeLog 28572
+MD5 3f89816f4fd5de1e8ded1c99bf7942f5 ChangeLog 28784
 MD5 289778209b2df87dbc5052351e604b1a files/digest-php-4.3.11 213
 MD5 a7b81d42cc56fdd6c72fbe2549dbe898 files/digest-php-4.3.11-r1 290
 MD5 a7b81d42cc56fdd6c72fbe2549dbe898 files/digest-php-4.3.11-r3 290
+MD5 a7b81d42cc56fdd6c72fbe2549dbe898 files/digest-php-4.3.11-r4 290
 MD5 f25bbe20f37a0eb83f7a57ca2c3a25e3 files/digest-php-4.4.0 211
 MD5 43c5b30a9e9bde68a44cf414341e32e8 files/digest-php-4.4.0-r1 288
 MD5 43c5b30a9e9bde68a44cf414341e32e8 files/digest-php-4.4.0-r3 288
+MD5 43c5b30a9e9bde68a44cf414341e32e8 files/digest-php-4.4.0-r4 288
 MD5 cdec3284251432935f950c2d15a405b7 files/php-4.3.11-flash.patch 694
 MD5 b2aa5952d5c805b3e57a5a6bf0f0b8d0 files/php-4.3.11-gmp.patch 925
 MD5 7515e9b1dc298a0fb1c12d35a58c265d files/php-4.3.4-amd64hack.diff 1028
@@ -29,7 +31,9 @@ MD5 83fb9efb602c178741ea2e40e13b014f files/php4.4.0-session_save_path-segf.patch
 MD5 38fe937e954ab7109395cefa86fcd2d4 metadata.xml 384
 MD5 5c877d02b146b5885cecc89b9f445c73 php-4.3.11-r1.ebuild 1972
 MD5 c757b9ce357a04d26ae0f88d731cf5c2 php-4.3.11-r3.ebuild 2898
+MD5 9bfd68b032d3ab8a4f7585a1c8cc439b php-4.3.11-r4.ebuild 2902
 MD5 7b0585a1b1826288946cd49c26d85d61 php-4.3.11.ebuild 1219
 MD5 1bbf33997259477ea2ff61296875184e php-4.4.0-r1.ebuild 1831
 MD5 f8b5aa5ec5358b0ecced16d21e3613a9 php-4.4.0-r3.ebuild 2753
+MD5 c21182d8164c4a3b6987c211e5a626ad php-4.4.0-r4.ebuild 2757
 MD5 3457e095190ae0497eff026b2351bb14 php-4.4.0.ebuild 1082
diff --git a/dev-php/php/files/digest-php-4.3.11-r4 b/dev-php/php/files/digest-php-4.3.11-r4
new file mode 100644
index 000000000000..252c3a932b24
--- /dev/null
+++ b/dev-php/php/files/digest-php-4.3.11-r4
@@ -0,0 +1,4 @@
+MD5 611cdddabfd71ffb724c428be33c14cb hardening-patch-4.3.11-0.3.2.patch.gz 80613
+MD5 fbc67d240812136a9842bc1f2a217b7a php-4.3.11.tar.bz2 4012575
+MD5 fbb6b365f4c0263b1dfd498aef092a77 php-4.3.6-includepath.diff 285
+MD5 33be24619f3a10953f9e1e32beeee97a php-pcrelib-new-secpatch.tar.bz2 357619
diff --git a/dev-php/php/files/digest-php-4.4.0-r4 b/dev-php/php/files/digest-php-4.4.0-r4
new file mode 100644
index 000000000000..077ffb8eedda
--- /dev/null
+++ b/dev-php/php/files/digest-php-4.4.0-r4
@@ -0,0 +1,4 @@
+MD5 0a52b85692ebbc299e6b1f6d9d206691 hardening-patch-4.4.0-0.3.2.patch.gz 33347
+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/php/php-4.3.11-r4.ebuild b/dev-php/php/php-4.3.11-r4.ebuild
new file mode 100644
index 000000000000..4929568cb111
--- /dev/null
+++ b/dev-php/php/php-4.3.11-r4.ebuild
@@ -0,0 +1,92 @@
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-php/php/php-4.3.11-r4.ebuild,v 1.1 2005/11/04 12:09:52 chtekk Exp $
+
+PHPSAPI="cli"
+inherit php-sapi eutils
+
+DESCRIPTION="PHP Shell Interpreter"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
+IUSE=""
+
+# fixed PCRE library for security issues, bug #102373
+SRC_URI="${SRC_URI} http://gentoo.longitekk.com/php-pcrelib-new-secpatch.tar.bz2"
+
+src_unpack() {
+	php-sapi_src_unpack
+	[ "${ARCH}" == "amd64" ] && epatch "${FILESDIR}/php-4.3.4-amd64hack.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"
+
+	# 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() {
+	myconf="${myconf} \
+		--disable-cgi \
+		--enable-cli"
+
+	php-sapi_src_compile
+}
+
+
+src_install() {
+	PHP_INSTALLTARGETS="install"
+	php-sapi_src_install
+
+	einfo "Installing manpage"
+	doman sapi/cli/php.1
+}
+
+pkg_postinst() {
+	php-sapi_pkg_postinst
+	einfo "This is a CLI only build."
+	einfo "You cannot use it on a webserver."
+
+	if [ -f "${ROOT}/root/.pearrc" -a "`md5sum ${ROOT}/root/.pearrc`" = "f0243f51b2457bc545158cf066e4e7a2  ${ROOT}/root/.pearrc" ]; then
+		einfo "Cleaning up an old PEAR install glitch"
+		mv ${ROOT}/root/.pearrc ${ROOT}/root/.pearrc.`date +%Y%m%d%H%M%S`
+	fi
+}
diff --git a/dev-php/php/php-4.4.0-r4.ebuild b/dev-php/php/php-4.4.0-r4.ebuild
new file mode 100644
index 000000000000..2b84785c14fb
--- /dev/null
+++ b/dev-php/php/php-4.4.0-r4.ebuild
@@ -0,0 +1,86 @@
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-php/php/php-4.4.0-r4.ebuild,v 1.1 2005/11/04 12:09:52 chtekk Exp $
+
+PHPSAPI="cli"
+inherit php-sapi eutils
+
+DESCRIPTION="PHP Shell Interpreter"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
+IUSE=""
+
+# fixed PCRE library for security issues, bug #102373
+SRC_URI="${SRC_URI} http://gentoo.longitekk.com/php-pcrelib-new-secpatch.tar.bz2"
+
+src_unpack() {
+	php-sapi_src_unpack
+	[ "${ARCH}" == "amd64" ] && epatch "${FILESDIR}/php-4.3.4-amd64hack.diff"
+
+	# 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() {
+	myconf="${myconf} \
+		--disable-cgi \
+		--enable-cli"
+
+	php-sapi_src_compile
+}
+
+
+src_install() {
+	PHP_INSTALLTARGETS="install"
+	php-sapi_src_install
+
+	einfo "Installing manpage"
+	doman sapi/cli/php.1
+}
+
+pkg_postinst() {
+	php-sapi_pkg_postinst
+	einfo "This is a CLI only build."
+	einfo "You cannot use it on a webserver."
+
+	if [ -f "${ROOT}/root/.pearrc" -a "`md5sum ${ROOT}/root/.pearrc`" = "f0243f51b2457bc545158cf066e4e7a2  ${ROOT}/root/.pearrc" ]; then
+		einfo "Cleaning up an old PEAR install glitch"
+		mv ${ROOT}/root/.pearrc ${ROOT}/root/.pearrc.`date +%Y%m%d%H%M%S`
+	fi
+}