From 54f33f64510abfa5308af9dcb870ca8734f40f9b Mon Sep 17 00:00:00 2001
From: Jan F. Chadima <jfch@eglon.jagda.eu>
Date: Aug 08 2011 11:24:47 +0000
Subject: improve selinux's change context log


---

diff --git a/openssh-5.8p2-sesftplog.patch b/openssh-5.8p2-sesftplog.patch
new file mode 100644
index 0000000..926c1ac
--- /dev/null
+++ b/openssh-5.8p2-sesftplog.patch
@@ -0,0 +1,12 @@
+diff -up openssh-5.8p2/openbsd-compat/port-linux.c.sesftplog openssh-5.8p2/openbsd-compat/port-linux.c
+--- openssh-5.8p2/openbsd-compat/port-linux.c.sesftplog	2011-08-08 12:47:21.000000000 +0200
++++ openssh-5.8p2/openbsd-compat/port-linux.c	2011-08-08 12:54:10.234607372 +0200
+@@ -506,7 +506,7 @@ ssh_selinux_change_context(const char *n
+ 	debug3("%s: setting context from '%s' to '%s'", __func__, oldctx,
+ 	    newctx);
+ 	if (setcon(newctx) < 0)
+-		logit("%s: setcon failed with %s", __func__, strerror (errno));
++		logit("%s: setcon %s from %s failed with %s", __func__, newctx, oldctx, strerror (errno));
+ 	xfree(oldctx);
+ 	xfree(newctx);
+ }
diff --git a/openssh.spec b/openssh.spec
index 2872393..401f47b 100644
--- a/openssh.spec
+++ b/openssh.spec
@@ -79,7 +79,7 @@
 
 # Do not forget to bump pam_ssh_agent_auth release if you rewind the main package release to 1
 %define openssh_ver 5.8p2
-%define openssh_rel 17
+%define openssh_rel 18
 %define pam_ssh_agent_ver 0.9.2
 %define pam_ssh_agent_rel 31
 
@@ -194,6 +194,8 @@ Patch65: openssh-5.8p2-remove-stale-control-socket.patch
 Patch66: openssh-5.8p2-ipv6man.patch
 #https://bugzilla.mindrot.org/show_bug.cgi?id=1919
 Patch67: openssh-5.8p2-unconfined.patch
+#?
+Patch68: openssh-5.8p2-sesftplog.patch
 #---
 #https://bugzilla.mindrot.org/show_bug.cgi?id=1604
 # sctp
@@ -431,6 +433,7 @@ popd
 %patch65 -p1 -b .remove_stale
 %patch66 -p1 -b .ipv6man
 %patch67 -p1 -b .unconfined
+%patch68 -p1 -b .sesftplog
 
 autoreconf
 pushd pam_ssh_agent_auth-%{pam_ssh_agent_ver}
@@ -768,6 +771,9 @@ fi
 %endif
 
 %changelog
+* Mon Aug  8 2011 Jan F. Chadima <jchadima@redhat.com> - 5.8p2-18 + 0.9.2-31
+- improve selinux's change context log 
+
 * Mon Aug  8 2011 Jan F. Chadima <jchadima@redhat.com> - 5.8p2-17 + 0.9.2-31
 - repair broken man pages