Index: trunk/server/common/patches/php-cve-2012-1823.patch
===================================================================
--- trunk/server/common/patches/php-cve-2012-1823.patch	(revision 2184)
+++ trunk/server/common/patches/php-cve-2012-1823.patch	(revision 2184)
@@ -0,0 +1,20 @@
+--- sapi/cgi/cgi_main.c.orig	2012-05-03 14:33:04.243763906 -0400
++++ sapi/cgi/cgi_main.c	2012-05-03 14:34:03.294241200 -0400
+@@ -1552,7 +1552,7 @@
+ 		}
+ 	}
+ 
+-	while ((c = php_getopt(argc, argv, OPTIONS, &php_optarg, &php_optind, 0, 2)) != -1) {
++	if (!cgi) while ((c = php_getopt(argc, argv, OPTIONS, &php_optarg, &php_optind, 0, 2)) != -1) {
+ 		switch (c) {
+ 			case 'c':
+ 				if (cgi_sapi_module.php_ini_path_override) {
+@@ -1801,7 +1801,7 @@
+ 	}
+ 
+ 	zend_first_try {
+-		while ((c = php_getopt(argc, argv, OPTIONS, &php_optarg, &php_optind, 1, 2)) != -1) {
++		if (!cgi) while ((c = php_getopt(argc, argv, OPTIONS, &php_optarg, &php_optind, 1, 2)) != -1) {
+ 			switch (c) {
+ 				case 'T':
+ 					benchmark = 1;
Index: trunk/server/fedora/Makefile
===================================================================
--- trunk/server/fedora/Makefile	(revision 2183)
+++ trunk/server/fedora/Makefile	(revision 2184)
@@ -19,5 +19,5 @@
 # See /COPYRIGHT in this repository for more information.
 
-upstream_yum	= krb5 krb5.i686 httpd openssh redland-bindings rubygems
+upstream_yum	= krb5 krb5.i686 httpd openssh redland-bindings rubygems php
 hackage		= MonadCatchIO-mtl-0.3.0.2 cgi-3001.1.8.2 unix-handle-0.0.0
 upstream_hackage = ghc-MonadCatchIO-mtl ghc-cgi ghc-unix-handle
Index: trunk/server/fedora/specs/php.spec.patch
===================================================================
--- trunk/server/fedora/specs/php.spec.patch	(revision 2184)
+++ trunk/server/fedora/specs/php.spec.patch	(revision 2184)
@@ -0,0 +1,30 @@
+--- php.spec.~1~	2012-02-02 17:13:59.000000000 -0500
++++ php.spec	2012-05-03 14:18:22.234721036 -0400
+@@ -37,7 +37,7 @@
+ Summary: PHP scripting language for creating dynamic web sites
+ Name: php
+ Version: 5.3.10
+-Release: 1%{?dist}
++Release: 1%{?dist}.scripts.%{scriptsversion}
+ License: PHP
+ Group: Development/Languages
+ URL: http://www.php.net/
+@@ -76,6 +76,9 @@
+ # Fixes for tests
+ Patch61: php-5.0.4-tests-wddx.patch
+ 
++Provides: scripts-php
++Patch100: php-cve-2012-1823.patch
++
+ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+ 
+ BuildRequires: bzip2-devel, curl-devel >= 7.9, db4-devel, gmp-devel
+@@ -544,6 +547,8 @@
+ 
+ %patch61 -p1 -b .tests-wddx
+ 
++%patch100 -p0 -b .cve-2012-1823
++
+ # Prevent %%doc confusion over LICENSE files
+ cp Zend/LICENSE Zend/ZEND_LICENSE
+ cp TSRM/LICENSE TSRM_LICENSE