Index: trunk/server/fedora/specs/openssh.spec.patch
===================================================================
--- trunk/server/fedora/specs/openssh.spec.patch	(revision 2246)
+++ trunk/server/fedora/specs/openssh.spec.patch	(revision 2339)
@@ -1,5 +1,5 @@
 --- 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 @@
+@@ -74,7 +74,7 @@
  Summary: An open source implementation of SSH protocol versions 1 and 2
  Name: openssh
@@ -10,5 +10,5 @@
  #URL1: http://pamsshagentauth.sourceforge.net
  #Source0: ftp://ftp.openbsd.org/pub/OpenBSD/OpenSSH/portable/openssh-%{version}.tar.gz
-@@ -218,6 +218,7 @@
+@@ -221,6 +221,7 @@
  #https://bugzilla.mindrot.org/show_bug.cgi?id=1604
  # sctp
@@ -26,6 +26,6 @@
  %package server
  Summary: An open source SSH server daemon
-@@ -456,15 +458,19 @@
- %patch713 -p1 -b .ctr-cavs
+@@ -458,10 +460,12 @@
+ %patch714 -p0 -b .null-xcrypt
  
  %patch800 -p1 -b .gsskex
@@ -38,6 +38,8 @@
 +# Remove the kuserok patch as it won't apply without patch800
 +# %patch901 -p1 -b .kuserok
+ %patch902 -p1 -b .man-moduli
+ %patch903 -p1 -b .ipqos
  
- %if 0
+@@ -469,6 +473,8 @@
  # Nothing here yet
  %endif