--- rpms/e-smith-openssh/sme8/e-smith-openssh.spec	2008/10/07 18:49:47	1.2
+++ rpms/e-smith-openssh/sme8/e-smith-openssh.spec	2014/04/07 12:51:11	1.8
@@ -1,15 +1,20 @@
-# $Id$
+# $Id: e-smith-openssh.spec,v 1.7 2014/04/05 00:27:20 burnat Exp $
 
 Summary: e-smith module to configure and enable ssh
 %define name e-smith-openssh
 Name: %{name}
 %define version 2.2.0
-%define release 1
+%define release 7
 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
+Patch4: e-smith-openssh-2.2.0-ssh_autoblock.patch
 BuildRoot: /var/tmp/%{name}-%{version}-%{release}-buildroot
 BuildRequires: e-smith-devtools
 BuildArchitectures: noarch
@@ -22,6 +27,24 @@ Requires: runit
 AutoReqProv: no
 
 %changelog
+* Mon Apr  7 2014 Charlie Brady <charlie_brady@mitel.com> 2.2.0-7.sme
+- Avoid uninitialized variable warning from last update. [SME: 8257]
+
+* Sat Apr 5 2014 Chris Burnat <devlist@burnat.com> 2.2.0-6.sme
+- Add ssh-autoblock for external interface - patch by Chris Maltby [SME: 8257]
+
+* 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]
+
 * Tue Oct 7 2008 Shad L. Lords <slords@mail.com> 2.2.0-1.sme
 - Roll new stream to separate sme7/sme8 trees [SME: 4633]
 
@@ -575,6 +598,11 @@ e-smith server enhancement to configure
 
 %prep
 %setup
+%patch0 -p1
+%patch1 -p1
+%patch2 -p1
+%patch3 -p1
+%patch4 -p1
 
 %build
 for i in console-save \