--- rpms/e-smith-openssh/sme8/e-smith-openssh.spec	2008/02/27 18:26:15	1.1
+++ rpms/e-smith-openssh/sme8/e-smith-openssh.spec	2010/11/26 20:56:38	1.5
@@ -1,21 +1,17 @@
+# $Id: e-smith-openssh.spec,v 1.4 2010/11/25 22:31:04 wellsi Exp $
+
 Summary: e-smith module to configure and enable ssh
 %define name e-smith-openssh
 Name: %{name}
-%define version 1.12.0
-%define release 13
+%define version 2.2.0
+%define release 4
 Version: %{version}
 Release: %{release}%{?dist}
 License: GPL
 Group: Networking/Daemons
 Source: %{name}-%{version}.tar.gz
-Patch0: e-smith-openssh-1.12.0-PrintMotdNo.patch
-Patch1: e-smith-openssh-1.12.0-RSSHNewLine.patch
-Patch2: e-smith-openssh-1.12.0-UsePAM.patch
-Patch3: e-smith-openssh-1.12.0-SSHPort.patch
-Patch4: e-smith-openssh-1.12.0-sftpserver.patch
-Patch5: e-smith-openssh-1.12.0-disabled_false_positive.patch
-Patch6: e-smith-openssh-1.12.0-rootkey.patch
-Patch7: e-smith-openssh-1.12.0-remove.sshconfig.patch
+Patch0: e-smith-openssh-2.2.0-LoginGraceTime.patch
+Patch1: e-smith-openssh-2.2.0-sshConfig.patch
 BuildRoot: /var/tmp/%{name}-%{version}-%{release}-buildroot
 BuildRequires: e-smith-devtools
 BuildArchitectures: noarch
@@ -28,6 +24,18 @@ Requires: runit
 AutoReqProv: no
 
 %changelog
+* 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]
+
 * Wed Jan 09 2008 Stephen Noble <support@dungog.net> 1.12.0-13
 - Remove template fragments for /root/.ssh/config [SME: 513]
 
@@ -580,12 +588,6 @@ e-smith server enhancement to configure
 %setup
 %patch0 -p1
 %patch1 -p1
-%patch2 -p1
-%patch3 -p1
-%patch4 -p1
-%patch5 -p1
-%patch6 -p1
-%patch7 -p1
 
 %build
 for i in console-save \