--- rpms/e-smith-openssh/sme10/e-smith-openssh.spec	2020/12/11 20:41:42	1.5
+++ rpms/e-smith-openssh/sme10/e-smith-openssh.spec	2023/06/25 00:20:23	1.11
@@ -1,10 +1,10 @@
-# $Id: e-smith-openssh.spec,v 1.4 2020/12/11 19:42:15 jpp Exp $
+# $Id: e-smith-openssh.spec,v 1.10 2021/03/16 20:59:51 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 4
+%define release 8
 Version: %{version}
 Release: %{release}%{?dist}
 License: GPL
@@ -14,11 +14,13 @@ Patch0: e-smith-openssh-2.6.0-bz10621-bz
 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
-Requires: e-smith, openssl, 
+Requires: e-smith-base, openssl, 
 Requires: openssh >= 3.5
 Requires: openssh-clients
 Requires: openssh-server
@@ -27,6 +29,16 @@ Requires: runit
 AutoReqProv: no
 
 %changelog
+* Sun Jun 25 2023 Trevor Batley <trevor@batley.id.au> 2.6.0-8.sme
+- change requires of e-smith to e-smith-base [SME: #12371]
+ 
+* Tue Mar 16 2021 Jean-Philippe Pialasse <tests@pialasse.com> 2.6.0-7.sme
+- clean rsyslog syntax for sshd [SME: 11422]
+
+* Thu Feb 18 2021 Jean-Philipe Pialasse <tests@pialasse.com> 2.6.0-6.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]
@@ -634,6 +646,8 @@ e-smith server enhancement to configure
 %patch2 -p1
 %patch3 -p1
 rm -rf  root/var/service root/service
+%patch4 -p1
+%patch5 -p1
 
 %build
 perl createlinks
@@ -647,7 +661,7 @@ rm -f %{name}-%{version}-%{release}-file
 
 /sbin/e-smith/genfilelist \
     --file '/sbin/e-smith/systemd/sshd-prepare' 'attr(0554,root,root)' \
-    --dir '/var/log/sshd' 'attr(2750,root,nofiles)' \
+    --dir '/var/log/sshd' 'attr(2750,root,root)' \
     --dir '/var/empty/sshd' 'attr(0711,root,root)' \
     $RPM_BUILD_ROOT \
     > %{name}-%{version}-%{release}-filelist
@@ -659,3 +673,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