Index: trunk/server/fedora/specs/openssh.spec.patch
===================================================================
--- trunk/server/fedora/specs/openssh.spec.patch	(revision 2185)
+++ trunk/server/fedora/specs/openssh.spec.patch	(revision 2246)
@@ -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.orig	2012-06-18 18:16:43.764813595 -0400
++++ openssh.spec	2012-06-18 18:24:40.478720527 -0400
+@@ -82,7 +82,7 @@
  Summary: An open source implementation of SSH protocol versions 1 and 2
  Name: openssh
@@ -10,23 +10,36 @@
  #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
+@@ -456,15 +458,19 @@
+ %patch713 -p1 -b .ctr-cavs
+ 
+ %patch800 -p1 -b .gsskex
+-%patch801 -p1 -b .force_krb
++# Remove force_krb as it conflicts with admof
++# %patch801 -p1 -b .force_krb
+ 
+ %patch900 -p1 -b .canohost
+-%patch901 -p1 -b .kuserok
++# Remove the kuserok patch as it won't apply without patch800
++# %patch901 -p1 -b .kuserok
+ 
+ %if 0
+ # Nothing here yet
+ %endif
  
 +%patch1001 -p1 -b .gssapi-env