Index: branches/fc17-dev/server/fedora/specs/httpd.spec.patch
===================================================================
--- branches/fc17-dev/server/fedora/specs/httpd.spec.patch	(revision 2195)
+++ branches/fc17-dev/server/fedora/specs/httpd.spec.patch	(revision 2198)
@@ -1,16 +1,16 @@
---- httpd.spec.~1~	2012-02-13 09:46:36.000000000 -0500
-+++ httpd.spec	2012-03-26 01:33:53.247271289 -0400
-@@ -8,7 +8,7 @@
+--- httpd.spec.~1~	2012-04-30 05:52:31.000000000 -0400
++++ httpd.spec	2012-05-22 23:31:12.397142763 -0400
+@@ -9,7 +9,7 @@
  Summary: Apache HTTP Server
  Name: httpd
  Version: 2.2.22
--Release: 1%{?dist}
-+Release: 1%{?dist}.scripts.%{scriptsversion}
+-Release: 4%{?dist}
++Release: 4%{?dist}.scripts.%{scriptsversion}
  URL: http://httpd.apache.org/
  Source0: http://www.apache.org/dist/httpd/httpd-%{version}.tar.bz2
  Source1: index.html
-@@ -54,6 +54,15 @@
- Provides: httpd-mmn = %{mmn}, httpd-mmn = %{mmnisa}
- Requires: httpd-tools = %{version}-%{release}, apr-util-ldap, systemd-units
+@@ -58,6 +58,15 @@
+ Requires(postun): systemd-units
+ Requires(post): systemd-units
  
 +Provides: scripts-httpd = %{version}-%{release}
@@ -26,5 +26,5 @@
  The Apache HTTP Server is a powerful, efficient, and extensible
  web server.
-@@ -64,6 +76,7 @@
+@@ -68,6 +77,7 @@
  Obsoletes: secureweb-devel, apache-devel, stronghold-apache-devel
  Requires: apr-devel, apr-util-devel, pkgconfig
@@ -34,5 +34,5 @@
  %description devel
  The httpd-devel package contains the APXS binary and other files
-@@ -102,6 +115,7 @@
+@@ -106,6 +116,7 @@
  Requires(post): openssl, /bin/cat
  Requires(pre): httpd
@@ -42,5 +42,5 @@
  
  %description -n mod_ssl
-@@ -110,6 +124,11 @@
+@@ -114,6 +125,11 @@
  Security (TLS) protocols.
  
@@ -54,5 +54,5 @@
  %patch1 -p1 -b .apctl
  %patch2 -p1 -b .apxs
-@@ -128,6 +147,14 @@
+@@ -133,6 +149,14 @@
  # Patch in vendor/release string
  sed "s/@RELEASE@/%{vstring}/" < %{PATCH20} | patch -p1
@@ -69,5 +69,5 @@
  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 +205,12 @@
+@@ -193,10 +217,12 @@
          --with-apr=%{_prefix} --with-apr-util=%{_prefix} \
  	--enable-suexec --with-suexec \
Index: branches/fc17-dev/server/fedora/specs/krb5.spec.patch
===================================================================
--- branches/fc17-dev/server/fedora/specs/krb5.spec.patch	(revision 2195)
+++ branches/fc17-dev/server/fedora/specs/krb5.spec.patch	(revision 2198)
@@ -1,16 +1,16 @@
---- krb5.spec.~1~	2012-03-08 16:20:41.000000000 -0500
-+++ krb5.spec	2012-04-01 22:07:14.834013302 -0400
-@@ -6,7 +6,7 @@
+--- krb5.spec.~1~	2012-03-08 16:26:28.000000000 -0500
++++ krb5.spec	2012-05-22 23:34:03.312147899 -0400
+@@ -15,7 +15,7 @@
  Summary: The Kerberos network authentication system
  Name: krb5
- Version: 1.9.3
--Release: 1%{?dist}
-+Release: 1%{?dist}.scripts.%{scriptsversion}
+ Version: 1.10
+-Release: 5%{?dist}
++Release: 5%{?dist}.scripts.%{scriptsversion}
  # Maybe we should explode from the now-available-to-everybody tarball instead?
- # http://web.mit.edu/kerberos/dist/krb5/1.9/krb5-1.9.3-signed.tar
+ # http://web.mit.edu/kerberos/dist/krb5/1.10/krb5-1.10-signed.tar
  Source0: krb5-%{version}.tar.gz
-@@ -64,6 +64,8 @@
- Patch102: krb5-1.9-7048.patch
- Patch103: krb5-kvno-230379.patch
+@@ -66,6 +66,8 @@
+ Patch106: krb5-1.10-lookaside.patch
+ Patch107: krb5-1.10-string-rpc-acl-fix.patch
  
 +Patch1000: krb5-kuserok-scripts.patch
@@ -19,5 +19,5 @@
  URL: http://web.mit.edu/kerberos/www/
  Group: System Environment/Libraries
-@@ -113,6 +115,7 @@
+@@ -119,6 +121,7 @@
  %package libs
  Summary: The shared libraries used by Kerberos 5
@@ -27,10 +27,10 @@
  %description libs
  Kerberos is a network authentication system. The krb5-libs package
-@@ -219,6 +222,7 @@
- %patch101 -p1 -b .7047
- %patch102 -p1 -b .7048
- %patch103 -p1 -b .kvno
+@@ -238,6 +241,7 @@
+ %patch105 -p1 -b .kvno
+ %patch106 -p1 -b .7082
+ %patch107 -p1 -b .7093
 +%patch1000 -p1 -b .kuserok
+ rm src/lib/krb5/krb/deltat.c
+ 
  gzip doc/*.ps
- 
- sed -i -e '1s!\[twoside\]!!;s!%\(\\usepackage{hyperref}\)!\1!' doc/api/library.tex
Index: branches/fc17-dev/server/fedora/specs/openssh.spec.patch
===================================================================
--- branches/fc17-dev/server/fedora/specs/openssh.spec.patch	(revision 2195)
+++ branches/fc17-dev/server/fedora/specs/openssh.spec.patch	(revision 2198)
@@ -1,5 +1,5 @@
---- openssh.spec.~1~	2012-02-14 11:06:13.000000000 -0500
-+++ openssh.spec	2012-02-25 13:02:28.660616538 -0500
-@@ -78,7 +78,7 @@
+--- openssh.spec.~1~	2012-04-06 15:22:23.000000000 -0400
++++ openssh.spec	2012-05-22 23:36:52.700142966 -0400
+@@ -82,7 +82,7 @@
  Summary: An open source implementation of SSH protocol versions 1 and 2
  Name: openssh
@@ -10,23 +10,23 @@
  #URL1: http://pamsshagentauth.sourceforge.net
  #Source0: ftp://ftp.openbsd.org/pub/OpenBSD/OpenSSH/portable/openssh-%{version}.tar.gz
-@@ -92,6 +92,7 @@
- Source3: sshd.init
- Source4: http://prdownloads.sourceforge.net/pamsshagentauth/pam_ssh_agent_auth/pam_ssh_agent_auth-%{pam_ssh_agent_ver}.tar.bz2
- Source5: pam_ssh_agent-rmheaders
+@@ -218,6 +218,7 @@
+ #https://bugzilla.mindrot.org/show_bug.cgi?id=1604
+ # sctp
+ #https://bugzilla.mindrot.org/show_bug.cgi?id=1873 => https://bugzilla.redhat.com/show_bug.cgi?id=668993
 +Patch1001: openssh-4.7p1-gssapi-name-in-env.patch
  
- Patch100: openssh-5.6p1-wIm.patch
- Patch0: openssh-5.6p1-redhat.patch
-@@ -214,6 +215,7 @@
- Requires(pre): /usr/sbin/useradd
- Requires: pam >= 1.0.1-3
+ License: BSD
+ Group: Applications/Internet
+@@ -271,6 +272,7 @@
+ Group: Applications/Internet
+ Requires: openssh = %{version}-%{release}
  Requires: fipscheck-lib%{_isa} >= 1.3.0
 +Provides: scripts-openssh-server
  
- %if %{ldap}
- %package ldap
-@@ -333,6 +335,8 @@
- %patch83 -p0 -b .oomkiller
- %patch84 -p1 -b .legacy
+ %package server
+ Summary: An open source SSH server daemon
+@@ -465,6 +467,8 @@
+ # Nothing here yet
+ %endif
  
 +%patch1001 -p1 -b .gssapi-env
Index: branches/fc17-dev/server/fedora/specs/php.spec.patch
===================================================================
--- branches/fc17-dev/server/fedora/specs/php.spec.patch	(revision 2195)
+++ branches/fc17-dev/server/fedora/specs/php.spec.patch	(revision 2198)
@@ -1,8 +1,8 @@
---- 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 @@
+--- php.spec.~1~	2012-04-27 13:42:25.000000000 -0400
++++ php.spec	2012-05-22 23:38:56.360148746 -0400
+@@ -56,7 +56,7 @@
  Summary: PHP scripting language for creating dynamic web sites
  Name: php
- Version: 5.3.10
+ Version: 5.4.1
 -Release: 1%{?dist}
 +Release: 1%{?dist}.scripts.%{scriptsversion}
@@ -10,7 +10,7 @@
  Group: Development/Languages
  URL: http://www.php.net/
-@@ -76,6 +76,9 @@
+@@ -91,6 +91,9 @@
  # Fixes for tests
- Patch61: php-5.0.4-tests-wddx.patch
+ 
  
 +Provides: scripts-php
@@ -19,8 +19,8 @@
  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
+ BuildRequires: bzip2-devel, curl-devel >= 7.9, %{db_devel}, gmp-devel
+@@ -584,6 +587,8 @@
+ %patch44 -p1 -b .systzip
+ %endif
  
 +%patch100 -p0 -b .cve-2012-1823
Index: branches/fc17-dev/server/fedora/specs/redland-bindings.spec.patch
===================================================================
--- branches/fc17-dev/server/fedora/specs/redland-bindings.spec.patch	(revision 2195)
+++ branches/fc17-dev/server/fedora/specs/redland-bindings.spec.patch	(revision 2198)
@@ -1,20 +1,19 @@
---- redland-bindings.spec.old	2011-10-12 14:51:58.000000000 -0400
-+++ redland-bindings.spec	2011-10-13 10:15:24.000000000 -0400
+--- redland-bindings.spec.~1~	2012-03-06 07:34:14.000000000 -0500
++++ redland-bindings.spec	2012-05-22 23:43:49.839142648 -0400
 @@ -1,6 +1,6 @@
  Name:           redland-bindings
- Version:        1.0.11.1
--Release:        6%{?dist}
-+Release:        6%{?dist}.scripts.%{scriptsversion}
+ Version:        1.0.14.1
+-Release:        1%{?dist}
++Release:        1%{?dist}.scripts.%{scriptsversion}
  Summary:        Redland RDF Application Framework API Bindings
  
  Group:          System Environment/Libraries
-@@ -137,6 +137,9 @@
- autoconf
- automake
+@@ -130,6 +130,8 @@
+ #autoconf
+ #automake
  
 +# Horrible hack to make PHP work
 +sed -i -e 's/zend_error_noreturn/zend_error/' php/*
-+
- # when specifying system redland, the configure check for the version
- # allows newer redland libraries; without it it doesn't.
- # authors says that older bindings work with newer redlands.
+ 
+ %build
+ %configure \
Index: branches/fc17-dev/server/fedora/specs/rubygems.spec.patch
===================================================================
--- branches/fc17-dev/server/fedora/specs/rubygems.spec.patch	(revision 2195)
+++ branches/fc17-dev/server/fedora/specs/rubygems.spec.patch	(revision 2198)
@@ -1,26 +1,25 @@
---- rubygems.spec.~1~	2012-04-20 14:46:27.000000000 -0400
-+++ rubygems.spec	2012-05-03 14:12:52.421863447 -0400
-@@ -15,7 +15,7 @@
+--- rubygems.spec.~1~	2012-04-28 04:01:50.000000000 -0400
++++ rubygems.spec	2012-05-22 23:47:16.001145101 -0400
+@@ -18,7 +18,7 @@
  Summary:	The Ruby standard for packaging ruby libraries
  Name:		rubygems
- Version:	1.7.2
--Release:	5%{?dist}
-+Release:	5%{?dist}.scripts.%{scriptsversion}
+ Version:	1.8.24
+-Release:	1%{?dist}
++Release:	1%{?dist}.scripts.%{scriptsversion}
  Group:		Development/Libraries
- # No GPL version is specified.
- License:	Ruby or GPL+
-@@ -42,6 +42,9 @@
- # Insecure connection to SSL repository fix
- Patch10:	rubygems-1.x.x-ssl-connection-don_t-revert.patch
+ License:	Ruby or MIT
+ 
+@@ -52,6 +52,8 @@
+ # https://github.com/rubygems/rubygems/issues/210
+ Patch109:	rubygems-1.8.11-binary-extensions.patch
  
 +Provides: scripts-rubygems = %{version}-%{release}
 +Patch1000: rubygems-rails-require-thread.patch
-+
- Requires:	ruby(abi) = 1.8
- Requires:	ruby >= 1.8.7
- Requires:	ruby-rdoc
-@@ -83,6 +86,8 @@
- %patch7 -p1 -b .esc.skip
- %patch10 -p1 -b .ssl
+ 
+ Requires:	ruby(abi) = 1.9.1
+ Requires:	rubygem(rdoc) >= 3.9.4
+@@ -97,6 +99,8 @@
+ %patch105 -p1 -b .uninst
+ %patch109 -p1 -b .bindir
  
 +%patch1000 -p1 -b .thread