diff --git a/debian/changelog b/debian/changelog index 1cfb062..2c5d961 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,12 @@ +openssh (1:9.9p1-3deepin2) unstable; urgency=medium + + [ liujianqiang ] + * ssh.service is disabled by default. + * update ChannelTimeout config to implement auto close inactive + connections. + + -- Tianyu Chen Wed, 15 Jan 2025 14:50:47 +0800 + openssh (1:9.9p1-3deepin1) unstable; urgency=medium * Refresh and re-apply deepin patches: diff --git a/debian/control b/debian/control index b14d925..a74bfd0 100644 --- a/debian/control +++ b/debian/control @@ -19,6 +19,7 @@ Build-Depends: libwrap0-dev | libwrap-dev, pkgconf, zlib1g-dev, + lsb-release, Standards-Version: 4.6.2 Uploaders: Colin Watson , diff --git a/debian/openssh-server.ucf-md5sum b/debian/openssh-server.ucf-md5sum index 0e375c8..1e0caef 100644 --- a/debian/openssh-server.ucf-md5sum +++ b/debian/openssh-server.ucf-md5sum @@ -114,3 +114,9 @@ a2cdc592eacf8a884829729418005d27 84066063a3f2c9412d5df7a7a0e6e293 8933d57d77504756fdde370bbdd08ee1 49d53e44b746ec2ad2103ac2860f97ff + +# From 1:9.7p1-4deepin3 +34f13e3344c394d1e9b8f36d55afd5e6 +c94aa65d347d95e3c30aba50187b4417 +3fecc6a74e3e70b0e65cdd8520c86aba +cc97f6a047873d4d9f3f962239601c74 diff --git a/debian/patches/deepin-ssh-connect-idle-timeout.patch b/debian/patches/deepin-ssh-connect-idle-timeout.patch index a7f889a..08ea714 100644 --- a/debian/patches/deepin-ssh-connect-idle-timeout.patch +++ b/debian/patches/deepin-ssh-connect-idle-timeout.patch @@ -13,8 +13,8 @@ Last-Update: 2022-05-19 #Compression delayed -#ClientAliveInterval 0 -#ClientAliveCountMax 3 -+ClientAliveInterval 900 -+ClientAliveCountMax 1 ++# set inactive timeout for shell & subsystem connections ++ChannelTimeout session:shell=900 session:subsystem*=900 #UseDNS no #PidFile /var/run/sshd.pid #MaxStartups 10:30:100 diff --git a/debian/rules b/debian/rules index d0a45d3..35c323f 100755 --- a/debian/rules +++ b/debian/rules @@ -195,7 +195,11 @@ override_dh_installinit: dh_installinit -R --name ssh override_dh_installsystemd: +ifeq ($(shell lsb_release -i -s),uos) + dh_installsystemd -popenssh-server --no-enable ssh.service +else dh_installsystemd -popenssh-server ssh.service +endif dh_installsystemd -popenssh-server --no-enable ssh.socket dh_installsystemd -popenssh-server --no-start rescue-ssh.target