--- rpms/e-smith-openssh/sme8/e-smith-openssh.spec	2008/12/28 11:25:00	1.3
+++ rpms/e-smith-openssh/sme8/e-smith-openssh.spec	2011/03/01 20:21:38	1.6
@@ -1,16 +1,19 @@
-# $Id: e-smith-openssh.spec,v 1.2 2008/10/07 18:49:47 slords Exp $
+# $Id: e-smith-openssh.spec,v 1.5 2010/11/26 20:56:38 wellsi Exp $
 
 Summary: e-smith module to configure and enable ssh
 %define name e-smith-openssh
 Name: %{name}
 %define version 2.2.0
-%define release 2
+%define release 5
 Version: %{version}
 Release: %{release}%{?dist}
 License: GPL
 Group: Networking/Daemons
 Source: %{name}-%{version}.tar.gz
 Patch0: e-smith-openssh-2.2.0-LoginGraceTime.patch
+Patch1: e-smith-openssh-2.2.0-sshConfig.patch
+Patch2: e-smith-openssh-2.2.0-obsolete-KeepAlive.patch
+Patch3: e-smith-openssh-2.2.0-ClientAliveParameters.patch
 BuildRoot: /var/tmp/%{name}-%{version}-%{release}-buildroot
 BuildRequires: e-smith-devtools
 BuildArchitectures: noarch
@@ -23,6 +26,15 @@ Requires: runit
 AutoReqProv: no
 
 %changelog
+* Tue Mar 1 2011 Jonathan Martens <smesevrer-contribs@snetram.nl> 2.2.0-5.sme
+- Obsolete KeepAlive and replace ClientAliveInterval and ClientAliveCountMax  [SME: 6380]
+
+* Fri Nov 26 2010 Ian Wells <esmith@wellsi.com> 2.2.0-4.sme
+- Change permissions of ssh_config file to 644 [SME: 43]
+
+* Thu Nov 25 2010 Ian Wells <esmith@wellsi.com> 2.2.0-3.sme
+- Template ssh_config with improved defaults [SME: 43]
+
 * Sun Dec 28 2008 Jonathan Martens <smesevrer-contribs@snetram.nl> 2.2.0-2.sme
 - Template sshd login grace time, kept default at 600s [SME: 4903]
 
@@ -580,6 +592,9 @@ e-smith server enhancement to configure
 %prep
 %setup
 %patch0 -p1
+%patch1 -p1
+%patch2 -p1
+%patch3 -p1
 
 %build
 for i in console-save \