--- rpms/e-smith-openssh/sme10/e-smith-openssh.spec	2016/02/05 22:15:50	1.1
+++ rpms/e-smith-openssh/sme10/e-smith-openssh.spec	2021/02/19 04:17:23	1.8
@@ -1,15 +1,22 @@
-# $Id: e-smith-openssh.spec,v 1.7 2015/07/03 19:56:18 stephdl Exp $
+# $Id: e-smith-openssh.spec,v 1.7 2021/02/19 04:11:15 jpp Exp $
 
 Summary: e-smith module to configure and enable ssh
 %define name e-smith-openssh
 Name: %{name}
 %define version 2.6.0
-%define release 1
+%define release 5
 Version: %{version}
 Release: %{release}%{?dist}
 License: GPL
 Group: Networking/Daemons
 Source: %{name}-%{version}.tar.xz
+Patch0: e-smith-openssh-2.6.0-bz10621-bz10937.patch
+Patch1: e-smith-openssh-2.6.0-bz9893-autoblock-whitelist.patch
+Patch2: e-smith-openssh-2.6.0-bz10939-denyhosts.patch
+Patch3: e-smith-openssh-2.6.0-bz11147-bz11109-systemd-update.patch
+Patch4: e-smith-openssh-2.6.0-bz11359.patch
+Patch5: e-smith-openssh-2.6.0-bz11256-logging.patch
+
 BuildRoot: /var/tmp/%{name}-%{version}-%{release}-buildroot
 BuildRequires: e-smith-devtools
 BuildArchitectures: noarch
@@ -22,6 +29,23 @@ Requires: runit
 AutoReqProv: no
 
 %changelog
+* Thu Feb 18 2021 Jean-Philipe Pialasse <tests@pialasse.com> 2.6.0-5.sme
+- increase default host key size [SME: 11359]
+- redirect logging to /var/log/sshd/sshd.log and logrotate [SME: 11256]
+
+* Fri Dec 11 2020 Jean-Philipe Pialasse <tests@pialasse.com> 2.6.0-4.sme
+- add support for denyhost [SME: 10939]
+- move sshd to systemd [SME: 11109]
+- create -update event [SME: 11147]
+- add ed25519 and ecdsa hostkeys [SME: 10940]
+
+* Sun May 03 2020 Jean-Philipe Pialasse <tests@pialasse.com> 2.6.0-3.sme
+- add Whitelist to AutoBlock using property sshd ValidFrom [SME: 9893]
+
+* Sat May 02 2020 Jean-Philipe Pialasse <tests@pialasse.com> 2.6.0-2.sme
+- update client ciphers to use [SME: 10621]
+- add ciphers, macs and KexAlgorithms for server [SME: 10937]
+
 * Fri Feb 05 2016 stephane de Labrusse <stephdl@de-labrusse.fr> 2.6.0-1.sme
 - Initial release to sme10
 
@@ -611,6 +635,13 @@ e-smith server enhancement to configure
 
 %prep
 %setup
+%patch0 -p1
+%patch1 -p1
+%patch2 -p1
+%patch3 -p1
+rm -rf  root/var/service root/service
+%patch4 -p1
+%patch5 -p1
 
 %build
 perl createlinks
@@ -623,14 +654,8 @@ rm -rf $RPM_BUILD_ROOT
 rm -f %{name}-%{version}-%{release}-filelist
 
 /sbin/e-smith/genfilelist \
-    --dir '/var/service/sshd' 'attr(1755,root,root)' \
-    --file '/var/service/sshd/down' 'attr(0644,root,root)' \
-    --file '/var/service/sshd/run' 'attr(0755,root,root)' \
-    --dir '/var/service/sshd/supervise' 'attr(0700,root,root)' \
-    --dir '/var/service/sshd/log' 'attr(1755,root,root)' \
-    --dir '/var/service/sshd/log/supervise' 'attr(0700,root,root)' \
-    --file '/var/service/sshd/log/run' 'attr(0755,root,root)' \
-    --dir '/var/log/sshd' 'attr(2750,root,nofiles)' \
+    --file '/sbin/e-smith/systemd/sshd-prepare' 'attr(0554,root,root)' \
+    --dir '/var/log/sshd' 'attr(2750,root,root)' \
     --dir '/var/empty/sshd' 'attr(0711,root,root)' \
     $RPM_BUILD_ROOT \
     > %{name}-%{version}-%{release}-filelist
@@ -642,3 +667,11 @@ rm -rf $RPM_BUILD_ROOT
 
 %files -f %{name}-%{version}-%{release}-filelist
 %defattr(-,root,root)
+
+%pre
+if [ $1 -gt 1 ] ; then
+  if [ -e /var/service/sshd/run ] ; then
+       /usr/bin/sv d sshd
+       /usr/bin/sv d sshd/log
+  fi
+fi