[gsi-openssh/f15] Drop openssh-5.8p2-unblock-signals.patch - not needed for GT >= 5.2 Based on openssh-5.6p1-34.fc15.1

[Mattias Ellert]

commit 1ba9b48f737d0780edb68e65c8a32bd6a9427023
Author: Mattias Ellert <mattias.ellert at fysast.uu.se>
Date:   Sun Jan 22 18:02:10 2012 +0100

    Drop openssh-5.8p2-unblock-signals.patch - not needed for GT >= 5.2
    Based on openssh-5.6p1-34.fc15.1

 gsi-openssh.spec                    |   17 ++++----
 openssh-5.3p1-unblock-signals.patch |   76 -----------------------------------
 openssh-5.6p1-gsissh.patch          |    4 +-
 3 files changed, 11 insertions(+), 86 deletions(-)
---
diff --git a/gsi-openssh.spec b/gsi-openssh.spec
index 7d0c180..0e3ded8 100644
--- a/gsi-openssh.spec
+++ b/gsi-openssh.spec
@@ -32,7 +32,7 @@
 %global nologin 1
 
 %global openssh_ver 5.6p1
-%global openssh_rel 3
+%global openssh_rel 4
 
 Summary: An implementation of the SSH protocol with GSI authentication
 Name: gsi-openssh
@@ -105,10 +105,6 @@ Patch83:openssh-5.6p1-linux-oomkiller.patch
 # Based on http://grid.ncsa.illinois.edu/ssh/dl/patch/openssh-5.6p1.patch
 Patch98: openssh-5.6p1-gsissh.patch
 
-# The gsissh server has problems with blocked signals in threaded globus libs
-# This patch from OSG resolves these problems
-Patch99: openssh-5.3p1-unblock-signals.patch
-
 License: BSD
 Group: Applications/Internet
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -134,8 +130,10 @@ BuildRequires: krb5-devel
 %endif
 
 %if %{gsi}
-BuildRequires: globus-gss-assist-devel
-BuildRequires: globus-usage-devel
+BuildRequires: globus-gss-assist-devel >= 8
+BuildRequires: globus-gssapi-gsi >= 10
+BuildRequires: globus-common >=	 14
+BuildRequires: globus-usage-devel >= 3
 %endif
 
 %if %{libedit}
@@ -246,7 +244,6 @@ This version of OpenSSH has been modified to support GSI authentication.
 %patch82 -p1 -b .getaddrinfo
 %patch83 -p0 -b .oomkiller
 %patch98 -p1 -b .gsi
-%patch99 -p1 -b .signals
 
 sed 's/sshd.pid/gsisshd.pid/' -i pathnames.h
 sed 's!$(piddir)/sshd.pid!$(piddir)/gsisshd.pid!' -i Makefile.in
@@ -445,6 +442,10 @@ fi
 %attr(0640,root,root) %config(noreplace) /etc/sysconfig/gsisshd
 
 %changelog
+* Sun Jan 22 2012 Mattias Ellert <mattias.ellert at fysast.uu.se> - 5.6p1-4
+- Drop openssh-5.8p2-unblock-signals.patch - not needed for GT >= 5.2
+- Based on openssh-5.6p1-34.fc15.1
+
 * Thu Oct 06 2011 Mattias Ellert <mattias.ellert at fysast.uu.se> - 5.6p1-3
 - Change package name gsissh → gsi-openssh
 - Based on openssh-5.6p1-34.fc15.1
diff --git a/openssh-5.6p1-gsissh.patch b/openssh-5.6p1-gsissh.patch
index aca5ba9..8980701 100644
--- a/openssh-5.6p1-gsissh.patch
+++ b/openssh-5.6p1-gsissh.patch
@@ -607,8 +607,8 @@ diff -Nur openssh-5.6p1.orig/configure.ac openssh-5.6p1/configure.ac
 +		GSSAPI="GSI"
 +	fi
 +
-+	LIBS="$LIBS `pkg-config --libs globus-gss-assist`"
-+	CPPFLAGS="$CPPFLAGS `pkg-config --cflags globus-gss-assist`"
++	LIBS="$LIBS `pkg-config --libs globus-gss-assist globus-gssapi-gsi globus-common`"
++	CPPFLAGS="$CPPFLAGS `pkg-config --cflags globus-gss-assist globus-gssapi-gsi globus-common`"
 +
 +	AC_DEFINE(GSSAPI)
 +	AC_DEFINE(HAVE_GSSAPI_H)