--- openssh.spec.orig	2013-05-01 19:02:52.961058569 -0400
+++ openssh.spec	2013-05-01 19:15:58.952058569 -0400
@@ -74,7 +74,7 @@
 Summary: An open source implementation of SSH protocol versions 1 and 2
 Name: openssh
 Version: %{openssh_ver}
-Release: %{openssh_rel}%{?dist}%{?rescue_rel}
+Release: %{openssh_rel}%{?dist}%{?rescue_rel}.scripts.%{scriptsversion}
 URL: http://www.openssh.com/portable.html
 #URL1: http://pamsshagentauth.sourceforge.net
 Source0: ftp://ftp.openbsd.org/pub/OpenBSD/OpenSSH/portable/openssh-%{version}.tar.gz
@@ -187,6 +187,7 @@
 # add latest config.{sub,guess} to support aarch64 (#926284)
 Patch907: openssh-6.2p1-aarch64.patch
 
+Patch1001: openssh-4.7p1-gssapi-name-in-env.patch
 
 License: BSD
 Group: Applications/Internet
@@ -238,6 +239,7 @@
 Group: Applications/Internet
 Requires: openssh = %{version}-%{release}
 Requires: fipscheck-lib%{_isa} >= 1.3.0
+Provides: scripts-openssh-server
 
 %package server
 Summary: An open source SSH server daemon
@@ -407,10 +409,12 @@
 %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
 %patch905 -p1 -b .modpipe-cflags
 %patch906 -p1 -b .identityfile
 %patch907 -p1 -b .aarch64
@@ -419,6 +423,8 @@
 # Nothing here yet
 %endif
 
+%patch1001 -p1 -b .gssapi-env
+
 autoreconf
 pushd pam_ssh_agent_auth-%{pam_ssh_agent_ver}
 autoreconf