source: trunk/server/fedora/specs/openssh.spec.patch @ 2258

--- 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
 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
@@ -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
 
 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
 
 %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
+
 autoreconf
 pushd pam_ssh_agent_auth-%{pam_ssh_agent_ver}
 autoreconf