Index: server/fedora/Makefile
===================================================================
--- server/fedora/Makefile	(revision 1034)
+++ server/fedora/Makefile	(revision 1035)
@@ -19,5 +19,5 @@
 # See /COPYRIGHT in this repository for more information.
 
-upstream_yum	= krb5 httpd openssh pysvn
+upstream_yum	= krb5 httpd openssh pysvn php
 upstream	= openafs $(upstream_yum)
 oursrc		= execsys tokensys accountadm httpdmods logview sql-signup nss_nonlocal nss_nonlocal.i386 whoisd mit-zephyr nss-ldapd scripts-base
Index: server/fedora/specs/httpd.spec.patch
===================================================================
--- server/fedora/specs/httpd.spec.patch	(revision 1034)
+++ server/fedora/specs/httpd.spec.patch	(revision 1035)
@@ -1,4 +1,4 @@
 --- httpd.spec.orig	2009-03-28 13:32:47.000000000 -0400
-+++ httpd.spec	2009-03-28 13:48:25.000000000 -0400
++++ httpd.spec	2009-03-28 14:20:15.000000000 -0400
 @@ -6,7 +6,7 @@
  Summary: Apache HTTP Server
@@ -10,5 +10,5 @@
  Source0: http://www.apache.org/dist/httpd/httpd-%{version}.tar.gz
  Source1: index.html
-@@ -54,6 +54,11 @@
+@@ -54,6 +54,12 @@
  Conflicts: pcre < 4.0
  Requires: httpd-tools = %{version}-%{release}
@@ -18,9 +18,10 @@
 +Patch1001: httpd-2.2.x-sni.patch
 +Patch1003: httpd-2.2.x-mod_status-security.patch
++Patch1004: httpd-2.2.x-304.patch
 +
  %description
  The Apache HTTP Server is a powerful, efficient, and extensible
  web server.
-@@ -100,6 +105,7 @@
+@@ -100,6 +106,7 @@
  BuildRequires: openssl-devel, distcache-devel
  Requires(post): openssl >= 0.9.7f-4, /bin/cat
@@ -30,5 +31,5 @@
  
  %description -n mod_ssl
-@@ -127,6 +133,10 @@
+@@ -127,6 +134,11 @@
  # Patch in vendor/release string
  sed "s/@RELEASE@/%{vstring}/" < %{PATCH20} | patch -p1
@@ -37,9 +38,10 @@
 +%patch1001 -p1 -b .sni
 +%patch1003 -p1 -b .permitstatus
++%patch1004 -p1 -b .scripts-304
 +
  # Safety check: prevent build if defined MMN does not equal upstream MMN.
  vmmn=`echo MODULE_MAGIC_NUMBER_MAJOR | cpp -include include/ap_mmn.h | sed -n '/^2/p'`
  if test "x${vmmn}" != "x%{mmn}"; then
-@@ -175,10 +185,12 @@
+@@ -175,10 +187,12 @@
          --with-apr=%{_prefix} --with-apr-util=%{_prefix} \
  	--enable-suexec --with-suexec \
Index: server/fedora/specs/php.spec.patch
===================================================================
--- server/fedora/specs/php.spec.patch	(revision 1035)
+++ server/fedora/specs/php.spec.patch	(revision 1035)
@@ -0,0 +1,31 @@
+--- php.spec.orig	2009-03-28 14:41:37.000000000 -0400
++++ php.spec	2009-03-28 14:46:46.000000000 -0400
+@@ -8,7 +8,7 @@
+ Summary: PHP scripting language for creating dynamic web sites
+ Name: php
+ Version: 5.2.8
+-Release: 1%{?dist}
++Release: 1%{?dist}.scripts.%{scriptsversion}
+ License: PHP
+ Group: Development/Languages
+ URL: http://www.php.net/
+@@ -39,6 +39,10 @@
+ Patch50: php-5.2.7-tests-dashn.patch
+ Patch51: php-5.0.4-tests-wddx.patch
+ 
++# Fix for the-bug (PHP bug #42362, php.cvs #56693)
++Provides: scripts-php
++Patch100: php-scripts-304.patch
++
+ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+ 
+ BuildRequires: bzip2-devel, curl-devel >= 7.9, db4-devel, expat-devel
+@@ -377,6 +381,8 @@
+ %patch50 -p1 -b .tests-dashn
+ %patch51 -p1 -b .tests-wddx
+ 
++%patch100 -p1 -b .scripts-304
++
+ # Prevent %%doc confusion over LICENSE files
+ cp Zend/LICENSE Zend/ZEND_LICENSE
+ cp TSRM/LICENSE TSRM_LICENSE
Index: server/fedora/specs/scripts-base.spec
===================================================================
--- server/fedora/specs/scripts-base.spec	(revision 1034)
+++ server/fedora/specs/scripts-base.spec	(revision 1035)
@@ -9,5 +9,5 @@
 Source: %{name}.tar.gz 
 BuildRoot: %{_tmppath}/%(%{__id_u} -n)-%{name}-%{version}-root
-Requires: accountadm, execsys, scripts-kmod-openafs, scripts-krb5-libs, scripts-httpd, scripts-mod_ssl, openafs, scripts-openafs-client, scripts-openafs-authlibs, scripts-openafs-devel, scripts-openafs-krb5, openafs-docs, scripts-openssh-server, sql-signup, tokensys, whoisd, logview, nss-ldapd, scripts-pysvn
+Requires: accountadm, execsys, scripts-kmod-openafs, scripts-krb5-libs, scripts-httpd, scripts-mod_ssl, openafs, scripts-openafs-client, scripts-openafs-authlibs, scripts-openafs-devel, scripts-openafs-krb5, openafs-docs, scripts-openssh-server, sql-signup, tokensys, whoisd, logview, nss-ldapd, scripts-pysvn, scripts-php
 %define debug_package %{nil}