From 78630ed29ace131b81429ae56c621980ff0ce0ee Mon Sep 17 00:00:00 2001
From: Petr Lautrbach <plautrba@redhat.com>
Date: Thu, 2 Feb 2012 14:04:32 +0100
Subject: [PATCH] remove openssh-5.8p1-sftpcontext.patch sshd_sftpd_t type
 doesn't exist in F16 anymore

---
 openssh-5.8p1-sftpcontext.patch | 14 --------------
 openssh.spec                    |  4 ----
 2 files changed, 18 deletions(-)
 delete mode 100644 openssh-5.8p1-sftpcontext.patch

diff --git a/openssh-5.8p1-sftpcontext.patch b/openssh-5.8p1-sftpcontext.patch
deleted file mode 100644
index 872dae9..0000000
--- a/openssh-5.8p1-sftpcontext.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-diff -up openssh-5.8p1/session.c.sftpcontext openssh-5.8p1/session.c
---- openssh-5.8p1/session.c.sftpcontext	2011-04-05 19:46:53.674654050 +0200
-+++ openssh-5.8p1/session.c	2011-04-05 19:48:32.942658237 +0200
-@@ -1520,6 +1520,10 @@ do_setusercontext(struct passwd *pw)
- 			free(chroot_path);
- 		}
- 
-+#ifdef WITH_SELINUX
-+		ssh_selinux_change_context("sshd_sftpd_t");
-+#endif
-+
- #ifdef HAVE_LOGIN_CAP
- 		if (setusercontext(lc, pw, pw->pw_uid, LOGIN_SETUSER) < 0) {
- 			perror("unable to set user context (setuser)");
diff --git a/openssh.spec b/openssh.spec
index 9761738..b83dd76 100644
--- a/openssh.spec
+++ b/openssh.spec
@@ -145,9 +145,6 @@ Patch23: openssh-5.8p1-selinux-role.patch
 Patch24: openssh-5.8p1-mls.patch
 # #https://bugzilla.mindrot.org/show_bug.cgi?id=1614
 # Patch25: openssh-5.6p1-selabel.patch
-#was https://bugzilla.mindrot.org/show_bug.cgi?id=1637
-#?
-Patch26: openssh-5.8p1-sftpcontext.patch
 #https://bugzilla.mindrot.org/show_bug.cgi?id=1668
 Patch30: openssh-5.6p1-keygen.patch
 #https://bugzilla.mindrot.org/show_bug.cgi?id=1644
@@ -412,7 +409,6 @@ popd
 # %patch22 -p1 -b .selinux
 %patch23 -p1 -b .role
 %patch24 -p1 -b .mls
-%patch26 -p1 -b .sftpcontext
 %endif
 %patch30 -p1 -b .keygen
 %patch31 -p1 -b .ip-opts