--- rpms/e-smith-openssh/sme10/e-smith-openssh.spec 2020/12/11 19:42:15 1.4 +++ rpms/e-smith-openssh/sme10/e-smith-openssh.spec 2020/12/11 20:41:42 1.5 @@ -1,4 +1,4 @@ -# $Id: e-smith-openssh.spec,v 1.3 2020/05/03 07:07:36 jpp Exp $ +# $Id: e-smith-openssh.spec,v 1.4 2020/12/11 19:42:15 jpp Exp $ Summary: e-smith module to configure and enable ssh %define name e-smith-openssh @@ -13,6 +13,7 @@ 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 BuildRoot: /var/tmp/%{name}-%{version}-%{release}-buildroot BuildRequires: e-smith-devtools @@ -28,6 +29,9 @@ AutoReqProv: no %changelog * Fri Dec 11 2020 Jean-Philipe Pialasse 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 2.6.0-3.sme - add Whitelist to AutoBlock using property sshd ValidFrom [SME: 9893] @@ -628,6 +632,8 @@ e-smith server enhancement to configure %patch0 -p1 %patch1 -p1 %patch2 -p1 +%patch3 -p1 +rm -rf root/var/service root/service %build perl createlinks @@ -640,13 +646,7 @@ 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)' \ + --file '/sbin/e-smith/systemd/sshd-prepare' 'attr(0554,root,root)' \ --dir '/var/log/sshd' 'attr(2750,root,nofiles)' \ --dir '/var/empty/sshd' 'attr(0711,root,root)' \ $RPM_BUILD_ROOT \