Index: branches/fc17-dev/server/common/patches/php-cve-2012-1823.patch
===================================================================
--- branches/fc17-dev/server/common/patches/php-cve-2012-1823.patch	(revision 2207)
+++ 	(revision )
@@ -1,20 +1,0 @@
---- 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: branches/fc17-dev/server/fedora/Makefile
===================================================================
--- branches/fc17-dev/server/fedora/Makefile	(revision 2207)
+++ branches/fc17-dev/server/fedora/Makefile	(revision 2208)
@@ -19,5 +19,5 @@
 # See /COPYRIGHT in this repository for more information.
 
-upstream_yum	= krb5 krb5.i686 httpd openssh rubygems php
+upstream_yum	= krb5 krb5.i686 httpd openssh rubygems
 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