From 726565c3b0d7231c67bcad4938fc2ab43cbd1439 Mon Sep 17 00:00:00 2001
From: Jan F. Chadima <jfch2222@fedoraproject.org>
Date: Aug 31 2009 12:38:20 +0000
Subject: Upstream convergence


---

diff --git a/openssh.spec b/openssh.spec
index 7ea548a..44ec403 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: 20%{?dist}%{?rescue_rel}
+Release: 21%{?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
@@ -468,6 +468,10 @@ fi
 %endif
 
 %changelog
+* Mon Auc 31 2009 Jan F. Chadima <jchadima@redhat.com> - 5.2p1-21
+- rearange selinux patch to be acceptable for upstream
+- replace seftp patch by an upstream version
+
 * Fri Aug 28 2009 Jan F. Chadima <jchadima@redhat.com> - 5.2p1-20
 - merged xmodifiers to redhat patch
 - merged gssapi-role to selinux patch