Implement RFE 93937 by adding fastcgi USE flag to php-cgi-4.4.0-r1 and php-cgi-5.0.4. Add force-cgi-redirect USE flag to php-cgi-5.0.4.

Package-Manager: portage-2.0.51.22-r1

6 files changed, 86 insertions, 17 deletions

diff --git a/dev-php/php-cgi/ChangeLog b/dev-php/php-cgi/ChangeLog
index ba9c7779ac53..78b89d7ad690 100644
--- a/dev-php/php-cgi/ChangeLog
+++ b/dev-php/php-cgi/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for dev-php/php-cgi
 # Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-php/php-cgi/ChangeLog,v 1.88 2005/07/13 18:39:51 kloeri Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-php/php-cgi/ChangeLog,v 1.89 2005/07/14 08:48:19 sebastian Exp $
+
+*php-cgi-4.4.0-r1 (14 Jul 2005)
+
+  14 Jul 2005; Sebastian Bergmann <sebastian@gentoo.org>
+  +php-cgi-4.4.0-r1.ebuild, php-cgi-5.0.4.ebuild:
+  Implement RFE 93937 by adding fastcgi USE flag to php-cgi-4.4.0-r1 and
+  php-cgi-5.0.4. Add force-cgi-redirect USE flag to php-cgi-5.0.4.
 
   13 Jul 2005; Bryan Østergaard <kloeri@gentoo.org> php-cgi-4.4.0.ebuild:
   Stable on alpha + ia64, bug 97655.
diff --git a/dev-php/php-cgi/Manifest b/dev-php/php-cgi/Manifest
index da23118d5bdc..a430a9d7297f 100644
--- a/dev-php/php-cgi/Manifest
+++ b/dev-php/php-cgi/Manifest
@@ -1,24 +1,26 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-MD5 5330a65e5fa5eccca33cf0697bec2c78 ChangeLog 11892
-MD5 38fe937e954ab7109395cefa86fcd2d4 metadata.xml 384
-MD5 307aab11df88d8308b9f240d02d54759 php-cgi-4.3.11-r1.ebuild 1117
+MD5 b0abc433de48dad86cce6647f6510f25 php-cgi-5.0.4.ebuild 1311
+MD5 e42859576d80bd6623cf4d889562fbc1 php-cgi-4.4.0-r1.ebuild 981
 MD5 ff2863a4bc96f2e0e7a4e8ea63ebc3ed php-cgi-4.4.0.ebuild 979
-MD5 51972dccf5217964e25e8bff75343961 php-cgi-5.0.4.ebuild 1117
-MD5 ad986b02a371b2fea3b4ae5060c9dc81 files/stdint.diff 358
-MD5 cdec3284251432935f950c2d15a405b7 files/php-4.3.11-flash.patch 694
-MD5 cd07c33356df77acd61cd300f2869d19 files/php-5.0.0-httpauthfix.patch 518
-MD5 273799e60d5a41a1e6f5ac53781a152f files/php5_soap_persistence_session.diff 1976
-MD5 cc21a816357d93a1d31cd44f861183c7 files/digest-php-cgi-4.3.11-r1 287
+MD5 307aab11df88d8308b9f240d02d54759 php-cgi-4.3.11-r1.ebuild 1117
+MD5 d2ca882f1c7202202f19683e9e6068b8 ChangeLog 12176
+MD5 38fe937e954ab7109395cefa86fcd2d4 metadata.xml 384
+MD5 225b57325cbdf582288a8796da9d72f5 files/digest-php-cgi-4.3.11-r1 287
+MD5 09d7dee078c684b0de0e4de6209ef634 files/digest-php-cgi-4.4.0 285
 MD5 74a728966bc5ec6d37ad89f4182ee135 files/digest-php-cgi-5.0.4 143
+MD5 9b7f8c71395e9ac97dc87a48c9e4770d files/digest-php-cgi-4.4.0-r1 285
+MD5 cd07c33356df77acd61cd300f2869d19 files/php-5.0.0-httpauthfix.patch 518
+MD5 ad986b02a371b2fea3b4ae5060c9dc81 files/stdint.diff 358
 MD5 f7a7898637874593f519c336db79fa45 files/php-cgi-5.0.3-missing-arches.patch 524
-MD5 09d7dee078c684b0de0e4de6209ef634 files/digest-php-cgi-4.4.0 285
+MD5 273799e60d5a41a1e6f5ac53781a152f files/php5_soap_persistence_session.diff 1976
 MD5 b2aa5952d5c805b3e57a5a6bf0f0b8d0 files/php-4.3.11-gmp.patch 925
+MD5 cdec3284251432935f950c2d15a405b7 files/php-4.3.11-flash.patch 694
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.1 (GNU/Linux)
 
-iD8DBQFC1WASKf2g/qXtneoRAvRkAJ9y6YXX7HXkiUC9m+Q67TsFKGMlJgCdHTrS
-/T5OS2kwM3m0snulg/tCYYY=
-=5PuR
+iD8DBQFC1iboaGfFFLhbXWkRAs7gAJsG9gpDxNxim5oGmRIOmoVBZpb1PQCcDvcK
+EqPJdlTkvY0XllWEc+84A98=
+=k7fL
 -----END PGP SIGNATURE-----
diff --git a/dev-php/php-cgi/files/digest-php-cgi-4.3.11-r1 b/dev-php/php-cgi/files/digest-php-cgi-4.3.11-r1
index 46b217bb8db5..56f35b38ea94 100644
--- a/dev-php/php-cgi/files/digest-php-cgi-4.3.11-r1
+++ b/dev-php/php-cgi/files/digest-php-cgi-4.3.11-r1
@@ -1,4 +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 912ff94309b762563d0542db5187315f php-4.3.2-fopen-url-secure.patch 416
 MD5 fbb6b365f4c0263b1dfd498aef092a77 php-4.3.6-includepath.diff 285
+MD5 611cdddabfd71ffb724c428be33c14cb hardening-patch-4.3.11-0.3.2.patch.gz 80613
diff --git a/dev-php/php-cgi/files/digest-php-cgi-4.4.0-r1 b/dev-php/php-cgi/files/digest-php-cgi-4.4.0-r1
new file mode 100644
index 000000000000..fe5e22bcebde
--- /dev/null
+++ b/dev-php/php-cgi/files/digest-php-cgi-4.4.0-r1
@@ -0,0 +1,4 @@
+MD5 e85b606fe48198bfcd785e5a5b1c9613 php-4.4.0.tar.bz2 4086074
+MD5 912ff94309b762563d0542db5187315f php-4.3.2-fopen-url-secure.patch 416
+MD5 fbb6b365f4c0263b1dfd498aef092a77 php-4.3.6-includepath.diff 285
+MD5 0a52b85692ebbc299e6b1f6d9d206691 hardening-patch-4.4.0-0.3.2.patch.gz 33347
diff --git a/dev-php/php-cgi/php-cgi-4.4.0-r1.ebuild b/dev-php/php-cgi/php-cgi-4.4.0-r1.ebuild
new file mode 100644
index 000000000000..7f60c4d0a314
--- /dev/null
+++ b/dev-php/php-cgi/php-cgi-4.4.0-r1.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-php/php-cgi/php-cgi-4.4.0-r1.ebuild,v 1.1 2005/07/14 08:48:19 sebastian Exp $
+
+PHPSAPI="cgi"
+inherit php-sapi eutils
+
+DESCRIPTION="PHP CGI"
+SLOT="0"
+IUSE="${IUSE} fastcgi force-cgi-redirect"
+KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~mips ~ppc ~sparc ~x86"
+
+# for this revision only
+PDEPEND=">=${PHP_PROVIDER_PKG}-4.4.0"
+PROVIDE="${PROVIDE} virtual/httpd-php"
+
+src_unpack() {
+	php-sapi_src_unpack
+}
+
+src_compile() {
+	myconf="${myconf} --enable-cgi --disable-cli"
+
+	if use fastcgi; then
+		myconf="${myconf} --enable-fastcgi"
+	fi
+
+	if use force-cgi-redirect; then
+		myconf="${myconf} --enable-force-cgi-redirect"
+	fi
+
+	php-sapi_src_compile
+}
+
+src_install() {
+	PHP_INSTALLTARGETS="install"
+	php-sapi_src_install
+
+	# rename binary
+	newbin ${S}/sapi/cgi/php php-cgi
+}
+
+pkg_postinst() {
+	php-sapi_pkg_postinst
+	einfo "This is a CGI only build."
+}
diff --git a/dev-php/php-cgi/php-cgi-5.0.4.ebuild b/dev-php/php-cgi/php-cgi-5.0.4.ebuild
index 253d8fa4e2e6..0d3dfc101e70 100644
--- a/dev-php/php-cgi/php-cgi-5.0.4.ebuild
+++ b/dev-php/php-cgi/php-cgi-5.0.4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-php/php-cgi/php-cgi-5.0.4.ebuild,v 1.4 2005/07/13 09:38:52 stuart Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-php/php-cgi/php-cgi-5.0.4.ebuild,v 1.5 2005/07/14 08:48:19 sebastian Exp $
 
 PHPSAPI="cgi"
 MY_PHP_P="php-${PV}"
@@ -16,6 +16,7 @@ DEPEND="$DEPEND"
 RDEPEND="$RDEPEND"
 PROVIDE="virtual/httpd-php"
 SLOT="0"
+IUSE="$IUSE fastcgi force-cgi-redirect"
 
 PHP_INSTALLTARGETS="install"
 
@@ -33,7 +34,16 @@ src_unpack() {
 }
 
 src_compile () {
-	my_conf="--disable-cli --enable-cgi --enable-fastcgi"
+	my_conf="${my_conf} --enable-cgi --disable-cli"
+
+	if use fastcgi; then
+		my_conf="${my_conf} --enable-fastcgi"
+	fi
+
+	if use force-cgi-redirect; then
+		my_conf="${my_conf} --enable-force-cgi-redirect"
+	fi
+
 	php5-sapi-r2_src_compile
 }