From 23bc31b25aff0fd048197821a901a1361af328cd Mon Sep 17 00:00:00 2001
From: Jakub Jelen <jjelen@redhat.com>
Date: Mon, 30 Mar 2015 10:52:52 +0200
Subject: [PATCH] Remove krb5-config workaround for #1203900

---
 ...ssh-6.8p1-workaround-krb5-config-bug.patch | 22 -------------------
 openssh.spec                                  |  7 ++----
 2 files changed, 2 insertions(+), 27 deletions(-)
 delete mode 100644 openssh-6.8p1-workaround-krb5-config-bug.patch

diff --git a/openssh-6.8p1-workaround-krb5-config-bug.patch b/openssh-6.8p1-workaround-krb5-config-bug.patch
deleted file mode 100644
index 17f5820..0000000
--- a/openssh-6.8p1-workaround-krb5-config-bug.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-diff --git a/configure.ac b/configure.ac
-index 4e6abce..af08091 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -4173,7 +4173,7 @@ AC_ARG_WITH([kerberos5],
- 			     [$KRB5ROOT/bin:$PATH])
- 		if test -x $KRB5CONF ; then
- 			K5CFLAGS="`$KRB5CONF --cflags`"
--			K5LIBS="`$KRB5CONF --libs`"
-+			K5LIBS="-lkrb5 -lk5crypto -lcom_err"
- 			CPPFLAGS="$CPPFLAGS $K5CFLAGS"
- 
- 			AC_MSG_CHECKING([for gssapi support])
-@@ -4183,7 +4183,7 @@ AC_ARG_WITH([kerberos5],
- 					[Define this if you want GSSAPI
- 					support in the version 2 protocol])
- 				GSSCFLAGS="`$KRB5CONF --cflags gssapi`"
--				GSSLIBS="`$KRB5CONF --libs gssapi`"
-+				GSSLIBS="-lgssapi_krb5 -lkrb5 -lk5crypto -lcom_err"
- 				CPPFLAGS="$CPPFLAGS $GSSCFLAGS"
- 			else
- 				AC_MSG_RESULT([no])
diff --git a/openssh.spec b/openssh.spec
index 5960d79..dce595f 100644
--- a/openssh.spec
+++ b/openssh.spec
@@ -215,10 +215,8 @@ Patch924: openssh-6.7p1-seccomp-aarch64.patch
 Patch925: openssh-6.7p1-ssh-copy-id-truncated-keys.patch
 # Add sftp option to force mode of created files (#1191055)
 Patch926: openssh-6.7p1-sftp-force-permission.patch
-# Workaround krb5-config bug #1204646
-Patch927: openssh-6.8p1-workaround-krb5-config-bug.patch
 # Upstream bug #1878 reintroduced in openssh6.7p1
-Patch928: openssh-6.8p1-880575.patch
+Patch927: openssh-6.8p1-880575.patch
 
 
 
@@ -439,8 +437,7 @@ popd
 %patch924 -p1 -b .seccomp
 %patch925 -p1 -b .newline
 %patch926 -p1 -b .sftp-force-mode
-%patch927 -p1 -b .bz1204646
-%patch928 -p1 -b .bz880575
+%patch927 -p1 -b .bz880575
 
 %patch200 -p1 -b .audit
 %patch700 -p1 -b .fips