From a14d263c0052c9aef63b03d43e42c6c48bad8812 Mon Sep 17 00:00:00 2001
From: "Jan F. Chadima" <jfch2222@fedoraproject.org>
Date: Tue, 30 Jun 2009 11:14:25 +0000
Subject: [PATCH] create '~/.ssh/known_hosts' within proper context

---
 openssh-5.2p1-selabel.patch | 12 ++++++++++++
 openssh.spec                |  7 ++++++-
 2 files changed, 18 insertions(+), 1 deletion(-)
 create mode 100644 openssh-5.2p1-selabel.patch

diff --git a/openssh-5.2p1-selabel.patch b/openssh-5.2p1-selabel.patch
new file mode 100644
index 0000000..cb9d1da
--- /dev/null
+++ b/openssh-5.2p1-selabel.patch
@@ -0,0 +1,12 @@
+diff -up openssh-5.2p1/contrib/ssh-copy-id.selabel openssh-5.2p1/contrib/ssh-copy-id
+--- openssh-5.2p1/contrib/ssh-copy-id.selabel	2009-06-29 23:43:03.514390092 +0200
++++ openssh-5.2p1/contrib/ssh-copy-id	2009-06-29 23:44:11.188382120 +0200
+@@ -38,7 +38,7 @@ if [ "$#" -lt 1 ] || [ "$1" = "-h" ] || 
+   exit 1
+ fi
+ 
+-{ eval "$GET_ID" ; } | ssh $1 "umask 077; test -d .ssh || mkdir .ssh ; cat >> .ssh/authorized_keys" || exit 1
++{ eval "$GET_ID" ; } | ssh $1 "umask 077; test -d .ssh || mkdir .ssh ; cat >> .ssh/authorized_keys; test -x /sbin/restorecon && /sbin/restorecon .ssh .ssh/authorized_keys" || exit 1
+ 
+ cat <<EOF
+ Now try logging into the machine, with "ssh '$1'", and check in:
diff --git a/openssh.spec b/openssh.spec
index 5e63797..344fb33 100644
--- a/openssh.spec
+++ b/openssh.spec
@@ -63,7 +63,7 @@
 Summary: An open source implementation of SSH protocol versions 1 and 2
 Name: openssh
 Version: 5.2p1
-Release: 4%{?dist}%{?rescue_rel}
+Release: 5%{?dist}%{?rescue_rel}
 URL: http://www.openssh.com/portable.html
 #Source0: ftp://ftp.openbsd.org/pub/OpenBSD/OpenSSH/portable/openssh-%{version}.tar.gz
 #Source1: ftp://ftp.openbsd.org/pub/OpenBSD/OpenSSH/portable/openssh-%{version}.tar.gz.asc
@@ -98,6 +98,7 @@ Patch55: openssh-5.1p1-cloexec.patch
 Patch62: openssh-5.1p1-scp-manpage.patch
 Patch65: openssh-5.2p1-fips.patch
 Patch66: openssh-5.2p1-homechroot.patch
+Patch67: openssh-5.2p1-selabel.patch
 
 License: BSD
 Group: Applications/Internet
@@ -230,6 +231,7 @@ an X11 passphrase dialog for OpenSSH.
 %patch62 -p1 -b .manpage
 %patch65 -p1 -b .fips
 %patch66 -p1 -b .homechroot
+%patch67 -p1 -b .selabel
 
 autoreconf
 
@@ -474,6 +476,9 @@ fi
 %endif
 
 %changelog
+* Tue Jun 30 2009 Jan F. Chadima <jchadima@redhat.com> - 5.2p1-11
+- create '~/.ssh/known_hosts' within proper context
+
 * Tue Jun 23 2009 Jan F. Chadima <jchadima@redhat.com> - 5.2p1-4
 - repair broken ls in chroot %%h