Date: Saturday, September 21, 2019 @ 20:34:19 Author: bisson Revision: 363206
db-move: moved openssh from [testing] to [core] (x86_64) Added: openssh/repos/core-x86_64/PKGBUILD (from rev 363205, openssh/repos/testing-x86_64/PKGBUILD) openssh/repos/core-x86_64/PKGBUILD.snap (from rev 363205, openssh/repos/testing-x86_64/PKGBUILD.snap) openssh/repos/core-x86_64/install (from rev 363205, openssh/repos/testing-x86_64/install) openssh/repos/core-x86_64/sshd.conf (from rev 363205, openssh/repos/testing-x86_64/sshd.conf) openssh/repos/core-x86_64/sshd.pam (from rev 363205, openssh/repos/testing-x86_64/sshd.pam) openssh/repos/core-x86_64/sshd.service (from rev 363205, openssh/repos/testing-x86_64/sshd.service) openssh/repos/core-x86_64/sshdgenkeys.service (from rev 363205, openssh/repos/testing-x86_64/sshdgenkeys.service) Deleted: openssh/repos/core-x86_64/PKGBUILD openssh/repos/core-x86_64/PKGBUILD.snap openssh/repos/core-x86_64/sshd.conf openssh/repos/core-x86_64/sshd.pam openssh/repos/core-x86_64/sshd.service openssh/repos/core-x86_64/sshd.socket openssh/repos/core-x86_64/sshd@.service openssh/repos/core-x86_64/sshdgenkeys.service openssh/repos/testing-x86_64/ ---------------------------------+ /PKGBUILD | 89 ++++++++++++++++++++++++++++++++++ /PKGBUILD.snap | 93 +++++++++++++++++++++++++++++++++++ /sshd.conf | 1 /sshd.pam | 6 ++ /sshd.service | 14 +++++ /sshdgenkeys.service | 15 +++++ core-x86_64/PKGBUILD | 93 ----------------------------------- core-x86_64/PKGBUILD.snap | 99 -------------------------------------- core-x86_64/install | 20 +++++++ core-x86_64/sshd.conf | 1 core-x86_64/sshd.pam | 6 -- core-x86_64/sshd.service | 17 ------ core-x86_64/sshd.socket | 10 --- core-x86_64/sshd@.service | 9 --- core-x86_64/sshdgenkeys.service | 15 ----- 15 files changed, 238 insertions(+), 250 deletions(-) Deleted: core-x86_64/PKGBUILD =================================================================== --- core-x86_64/PKGBUILD 2019-09-21 15:44:48 UTC (rev 363205) +++ core-x86_64/PKGBUILD 2019-09-21 20:34:19 UTC (rev 363206) @@ -1,93 +0,0 @@ -# Maintainer: Gaetan Bisson <bis...@archlinux.org> -# Contributor: Aaron Griffin <aa...@archlinux.org> -# Contributor: judd <jvi...@zeroflux.org> - -pkgname=openssh -pkgver=8.0p1 -pkgrel=2 -pkgdesc='Premier connectivity tool for remote login with the SSH protocol' -url='https://www.openssh.com/portable.html' -license=('custom:BSD') -arch=('x86_64') -makedepends=('linux-headers') -depends=('krb5' 'openssl' 'libedit' 'ldns') -optdepends=('xorg-xauth: X11 forwarding' - 'x11-ssh-askpass: input passphrase in X') -validpgpkeys=('59C2118ED206D927E667EBE3D3E5F56B6D920D30') -source=("https://ftp.openbsd.org/pub/OpenBSD/OpenSSH/portable/${pkgname}-${pkgver}.tar.gz"{,.asc} - 'sshdgenkeys.service' - 'sshd@.service' - 'sshd.service' - 'sshd.socket' - 'sshd.conf' - 'sshd.pam') -sha256sums=('bd943879e69498e8031eb6b7f44d08cdc37d59a7ab689aa0b437320c3481fd68' - 'SKIP' - '4031577db6416fcbaacf8a26a024ecd3939e5c10fe6a86ee3f0eea5093d533b7' - '3a0845737207f4eda221c9c9fb64e766ade9684562d8ba4f705f7ae6826886e5' - 'c5ed9fa629f8f8dbf3bae4edbad4441c36df535088553fe82695c52d7bde30aa' - 'de14363e9d4ed92848e524036d9e6b57b2d35cc77d377b7247c38111d2a3defd' - '4effac1186cc62617f44385415103021f72f674f8b8e26447fc1139c670090f6' - '64576021515c0a98b0aaf0a0ae02e0f5ebe8ee525b1e647ab68f369f81ecd846') - -backup=('etc/ssh/ssh_config' 'etc/ssh/sshd_config' 'etc/pam.d/sshd') - -build() { - cd "${srcdir}/${pkgname}-${pkgver}" - - ./configure \ - --prefix=/usr \ - --sbindir=/usr/bin \ - --libexecdir=/usr/lib/ssh \ - --sysconfdir=/etc/ssh \ - --with-ldns \ - --with-libedit \ - --with-ssl-engine \ - --with-pam \ - --with-privsep-user=nobody \ - --with-kerberos5=/usr \ - --with-xauth=/usr/bin/xauth \ - --with-md5-passwords \ - --with-pid-dir=/run \ - --with-default-path='/usr/local/sbin:/usr/local/bin:/usr/bin' \ - - make -} - -check() { - cd "${srcdir}/${pkgname}-${pkgver}" - - # Tests require openssh to be already installed system-wide, - # also connectivity tests will fail under makechrootpkg since - # it runs as nobody which has /bin/false as login shell. - - if [[ -e /usr/bin/scp && ! -e /.arch-chroot ]]; then - make tests - fi -} - -package() { - cd "${srcdir}/${pkgname}-${pkgver}" - - make DESTDIR="${pkgdir}" install - - ln -sf ssh.1.gz "${pkgdir}"/usr/share/man/man1/slogin.1.gz - install -Dm644 LICENCE "${pkgdir}/usr/share/licenses/${pkgname}/LICENCE" - - install -Dm644 ../sshdgenkeys.service "${pkgdir}"/usr/lib/systemd/system/sshdgenkeys.service - install -Dm644 ../sshd@.service "${pkgdir}"/usr/lib/systemd/system/sshd@.service - install -Dm644 ../sshd.service "${pkgdir}"/usr/lib/systemd/system/sshd.service - install -Dm644 ../sshd.socket "${pkgdir}"/usr/lib/systemd/system/sshd.socket - install -Dm644 ../sshd.conf "${pkgdir}"/usr/lib/tmpfiles.d/sshd.conf - install -Dm644 ../sshd.pam "${pkgdir}"/etc/pam.d/sshd - - install -Dm755 contrib/findssl.sh "${pkgdir}"/usr/bin/findssl.sh - install -Dm755 contrib/ssh-copy-id "${pkgdir}"/usr/bin/ssh-copy-id - install -Dm644 contrib/ssh-copy-id.1 "${pkgdir}"/usr/share/man/man1/ssh-copy-id.1 - - sed \ - -e '/^#ChallengeResponseAuthentication yes$/c ChallengeResponseAuthentication no' \ - -e '/^#PrintMotd yes$/c PrintMotd no # pam does that' \ - -e '/^#UsePAM no$/c UsePAM yes' \ - -i "${pkgdir}"/etc/ssh/sshd_config -} Copied: openssh/repos/core-x86_64/PKGBUILD (from rev 363205, openssh/repos/testing-x86_64/PKGBUILD) =================================================================== --- core-x86_64/PKGBUILD (rev 0) +++ core-x86_64/PKGBUILD 2019-09-21 20:34:19 UTC (rev 363206) @@ -0,0 +1,89 @@ +# Maintainer: Gaetan Bisson <bis...@archlinux.org> +# Contributor: Aaron Griffin <aa...@archlinux.org> +# Contributor: judd <jvi...@zeroflux.org> + +pkgname=openssh +pkgver=8.0p1 +pkgrel=3 +pkgdesc='Premier connectivity tool for remote login with the SSH protocol' +url='https://www.openssh.com/portable.html' +license=('custom:BSD') +arch=('x86_64') +makedepends=('linux-headers') +depends=('krb5' 'openssl' 'libedit' 'ldns') +optdepends=('xorg-xauth: X11 forwarding' + 'x11-ssh-askpass: input passphrase in X') +validpgpkeys=('59C2118ED206D927E667EBE3D3E5F56B6D920D30') +source=("https://ftp.openbsd.org/pub/OpenBSD/OpenSSH/portable/${pkgname}-${pkgver}.tar.gz"{,.asc} + 'sshdgenkeys.service' + 'sshd.service' + 'sshd.conf' + 'sshd.pam') +sha256sums=('bd943879e69498e8031eb6b7f44d08cdc37d59a7ab689aa0b437320c3481fd68' + 'SKIP' + '4031577db6416fcbaacf8a26a024ecd3939e5c10fe6a86ee3f0eea5093d533b7' + 'e40f8b7c8e5e2ecf3084b3511a6c36d5b5c9f9e61f2bb13e3726c71dc7d4fbc7' + '4effac1186cc62617f44385415103021f72f674f8b8e26447fc1139c670090f6' + '64576021515c0a98b0aaf0a0ae02e0f5ebe8ee525b1e647ab68f369f81ecd846') + +backup=('etc/ssh/ssh_config' 'etc/ssh/sshd_config' 'etc/pam.d/sshd') + +install=install + +build() { + cd "${srcdir}/${pkgname}-${pkgver}" + + ./configure \ + --prefix=/usr \ + --sbindir=/usr/bin \ + --libexecdir=/usr/lib/ssh \ + --sysconfdir=/etc/ssh \ + --with-ldns \ + --with-libedit \ + --with-ssl-engine \ + --with-pam \ + --with-privsep-user=nobody \ + --with-kerberos5=/usr \ + --with-xauth=/usr/bin/xauth \ + --with-md5-passwords \ + --with-pid-dir=/run \ + --with-default-path='/usr/local/sbin:/usr/local/bin:/usr/bin' \ + + make +} + +check() { + cd "${srcdir}/${pkgname}-${pkgver}" + + # Tests require openssh to be already installed system-wide, + # also connectivity tests will fail under makechrootpkg since + # it runs as nobody which has /bin/false as login shell. + + if [[ -e /usr/bin/scp && ! -e /.arch-chroot ]]; then + make tests + fi +} + +package() { + cd "${srcdir}/${pkgname}-${pkgver}" + + make DESTDIR="${pkgdir}" install + + ln -sf ssh.1.gz "${pkgdir}"/usr/share/man/man1/slogin.1.gz + install -Dm644 LICENCE "${pkgdir}/usr/share/licenses/${pkgname}/LICENCE" + + install -Dm644 ../sshdgenkeys.service "${pkgdir}"/usr/lib/systemd/system/sshdgenkeys.service + install -Dm644 ../sshd.service "${pkgdir}"/usr/lib/systemd/system/sshd.service + install -Dm644 ../sshd.conf "${pkgdir}"/usr/lib/tmpfiles.d/sshd.conf + install -Dm644 ../sshd.pam "${pkgdir}"/etc/pam.d/sshd + + install -Dm755 contrib/findssl.sh "${pkgdir}"/usr/bin/findssl.sh + install -Dm755 contrib/ssh-copy-id "${pkgdir}"/usr/bin/ssh-copy-id + install -Dm644 contrib/ssh-copy-id.1 "${pkgdir}"/usr/share/man/man1/ssh-copy-id.1 + + sed \ + -e '/^#ChallengeResponseAuthentication yes$/c ChallengeResponseAuthentication no' \ + -e '/^#PrintMotd yes$/c PrintMotd no # pam does that' \ + -e '/^#UsePAM no$/c UsePAM yes' \ + -i "${pkgdir}"/etc/ssh/sshd_config +} Deleted: core-x86_64/PKGBUILD.snap =================================================================== --- core-x86_64/PKGBUILD.snap 2019-09-21 15:44:48 UTC (rev 363205) +++ core-x86_64/PKGBUILD.snap 2019-09-21 20:34:19 UTC (rev 363206) @@ -1,99 +0,0 @@ -# Maintainer: Gaetan Bisson <bis...@archlinux.org> -# Contributor: Aaron Griffin <aa...@archlinux.org> -# Contributor: judd <jvi...@zeroflux.org> - -pkgname=openssh -_YMD=20190414 -pkgver=8.0snap$_YMD -pkgrel=1 -pkgdesc='Premier connectivity tool for remote login with the SSH protocol' -url='https://www.openssh.com/portable.html' -license=('custom:BSD') -arch=('x86_64') -makedepends=('linux-headers') -depends=('krb5' 'openssl' 'libedit' 'ldns') -optdepends=('xorg-xauth: X11 forwarding' - 'x11-ssh-askpass: input passphrase in X') -validpgpkeys=('59C2118ED206D927E667EBE3D3E5F56B6D920D30') -#source=("https://ftp.openbsd.org/pub/OpenBSD/OpenSSH/portable/${pkgname}-${pkgver}.tar.gz"{,.asc} -source=("http://www.mindrot.org/openssh_snap/openssh-SNAP-$_YMD.tar.gz" - 'sshdgenkeys.service' - 'sshd@.service' - 'sshd.service' - 'sshd.socket' - 'sshd.conf' - 'sshd.pam') -#sha256sums=('6b4b3ba2253d84ed3771c8050728d597c91cfce898713beb7b64a305b6f11aad3' -# 'SKIP' -sha256sums=('6b4b3ba2253d84ed3771c8050728d597c91cfce898713beb7b64a305b6f11aad' - '4031577db6416fcbaacf8a26a024ecd3939e5c10fe6a86ee3f0eea5093d533b7' - '3a0845737207f4eda221c9c9fb64e766ade9684562d8ba4f705f7ae6826886e5' - 'c5ed9fa629f8f8dbf3bae4edbad4441c36df535088553fe82695c52d7bde30aa' - 'de14363e9d4ed92848e524036d9e6b57b2d35cc77d377b7247c38111d2a3defd' - '4effac1186cc62617f44385415103021f72f674f8b8e26447fc1139c670090f6' - '64576021515c0a98b0aaf0a0ae02e0f5ebe8ee525b1e647ab68f369f81ecd846') - -backup=('etc/ssh/ssh_config' 'etc/ssh/sshd_config' 'etc/pam.d/sshd') - -build() { -# cd "${srcdir}/${pkgname}-${pkgver}" - cd "${srcdir}/${pkgname}" - - ./configure \ - --prefix=/usr \ - --sbindir=/usr/bin \ - --libexecdir=/usr/lib/ssh \ - --sysconfdir=/etc/ssh \ - --with-ldns \ - --with-libedit \ - --with-ssl-engine \ - --with-pam \ - --with-privsep-user=nobody \ - --with-kerberos5=/usr \ - --with-xauth=/usr/bin/xauth \ - --with-md5-passwords \ - --with-pid-dir=/run \ - --with-default-path='/usr/local/sbin:/usr/local/bin:/usr/bin' \ - - make -} - -check() { -# cd "${srcdir}/${pkgname}-${pkgver}" - cd "${srcdir}/${pkgname}" - - # Tests require openssh to be already installed system-wide, - # also connectivity tests will fail under makechrootpkg since - # it runs as nobody which has /bin/false as login shell. - - if [[ -e /usr/bin/scp && ! -e /.arch-chroot ]]; then - make tests - fi -} - -package() { -# cd "${srcdir}/${pkgname}-${pkgver}" - cd "${srcdir}/${pkgname}" - - make DESTDIR="${pkgdir}" install - - ln -sf ssh.1.gz "${pkgdir}"/usr/share/man/man1/slogin.1.gz - install -Dm644 LICENCE "${pkgdir}/usr/share/licenses/${pkgname}/LICENCE" - - install -Dm644 ../sshdgenkeys.service "${pkgdir}"/usr/lib/systemd/system/sshdgenkeys.service - install -Dm644 ../sshd@.service "${pkgdir}"/usr/lib/systemd/system/sshd@.service - install -Dm644 ../sshd.service "${pkgdir}"/usr/lib/systemd/system/sshd.service - install -Dm644 ../sshd.socket "${pkgdir}"/usr/lib/systemd/system/sshd.socket - install -Dm644 ../sshd.conf "${pkgdir}"/usr/lib/tmpfiles.d/sshd.conf - install -Dm644 ../sshd.pam "${pkgdir}"/etc/pam.d/sshd - - install -Dm755 contrib/findssl.sh "${pkgdir}"/usr/bin/findssl.sh - install -Dm755 contrib/ssh-copy-id "${pkgdir}"/usr/bin/ssh-copy-id - install -Dm644 contrib/ssh-copy-id.1 "${pkgdir}"/usr/share/man/man1/ssh-copy-id.1 - - sed \ - -e '/^#ChallengeResponseAuthentication yes$/c ChallengeResponseAuthentication no' \ - -e '/^#PrintMotd yes$/c PrintMotd no # pam does that' \ - -e '/^#UsePAM no$/c UsePAM yes' \ - -i "${pkgdir}"/etc/ssh/sshd_config -} Copied: openssh/repos/core-x86_64/PKGBUILD.snap (from rev 363205, openssh/repos/testing-x86_64/PKGBUILD.snap) =================================================================== --- core-x86_64/PKGBUILD.snap (rev 0) +++ core-x86_64/PKGBUILD.snap 2019-09-21 20:34:19 UTC (rev 363206) @@ -0,0 +1,93 @@ +# Maintainer: Gaetan Bisson <bis...@archlinux.org> +# Contributor: Aaron Griffin <aa...@archlinux.org> +# Contributor: judd <jvi...@zeroflux.org> + +pkgname=openssh +_YMD=20190414 +pkgver=8.0snap$_YMD +pkgrel=1 +pkgdesc='Premier connectivity tool for remote login with the SSH protocol' +url='https://www.openssh.com/portable.html' +license=('custom:BSD') +arch=('x86_64') +makedepends=('linux-headers') +depends=('krb5' 'openssl' 'libedit' 'ldns') +optdepends=('xorg-xauth: X11 forwarding' + 'x11-ssh-askpass: input passphrase in X') +validpgpkeys=('59C2118ED206D927E667EBE3D3E5F56B6D920D30') +#source=("https://ftp.openbsd.org/pub/OpenBSD/OpenSSH/portable/${pkgname}-${pkgver}.tar.gz"{,.asc} +source=("http://www.mindrot.org/openssh_snap/openssh-SNAP-$_YMD.tar.gz" + 'sshdgenkeys.service' + 'sshd.service' + 'sshd.conf' + 'sshd.pam') +#sha256sums=('6b4b3ba2253d84ed3771c8050728d597c91cfce898713beb7b64a305b6f11aad3' +# 'SKIP' +sha256sums=('6b4b3ba2253d84ed3771c8050728d597c91cfce898713beb7b64a305b6f11aad' + '4031577db6416fcbaacf8a26a024ecd3939e5c10fe6a86ee3f0eea5093d533b7' + 'e40f8b7c8e5e2ecf3084b3511a6c36d5b5c9f9e61f2bb13e3726c71dc7d4fbc7' + '4effac1186cc62617f44385415103021f72f674f8b8e26447fc1139c670090f6' + '64576021515c0a98b0aaf0a0ae02e0f5ebe8ee525b1e647ab68f369f81ecd846') + +backup=('etc/ssh/ssh_config' 'etc/ssh/sshd_config' 'etc/pam.d/sshd') + +build() { +# cd "${srcdir}/${pkgname}-${pkgver}" + cd "${srcdir}/${pkgname}" + + ./configure \ + --prefix=/usr \ + --sbindir=/usr/bin \ + --libexecdir=/usr/lib/ssh \ + --sysconfdir=/etc/ssh \ + --with-ldns \ + --with-libedit \ + --with-ssl-engine \ + --with-pam \ + --with-privsep-user=nobody \ + --with-kerberos5=/usr \ + --with-xauth=/usr/bin/xauth \ + --with-md5-passwords \ + --with-pid-dir=/run \ + --with-default-path='/usr/local/sbin:/usr/local/bin:/usr/bin' \ + + make +} + +check() { +# cd "${srcdir}/${pkgname}-${pkgver}" + cd "${srcdir}/${pkgname}" + + # Tests require openssh to be already installed system-wide, + # also connectivity tests will fail under makechrootpkg since + # it runs as nobody which has /bin/false as login shell. + + if [[ -e /usr/bin/scp && ! -e /.arch-chroot ]]; then + make tests + fi +} + +package() { +# cd "${srcdir}/${pkgname}-${pkgver}" + cd "${srcdir}/${pkgname}" + + make DESTDIR="${pkgdir}" install + + ln -sf ssh.1.gz "${pkgdir}"/usr/share/man/man1/slogin.1.gz + install -Dm644 LICENCE "${pkgdir}/usr/share/licenses/${pkgname}/LICENCE" + + install -Dm644 ../sshdgenkeys.service "${pkgdir}"/usr/lib/systemd/system/sshdgenkeys.service + install -Dm644 ../sshd.service "${pkgdir}"/usr/lib/systemd/system/sshd.service + install -Dm644 ../sshd.conf "${pkgdir}"/usr/lib/tmpfiles.d/sshd.conf + install -Dm644 ../sshd.pam "${pkgdir}"/etc/pam.d/sshd + + install -Dm755 contrib/findssl.sh "${pkgdir}"/usr/bin/findssl.sh + install -Dm755 contrib/ssh-copy-id "${pkgdir}"/usr/bin/ssh-copy-id + install -Dm644 contrib/ssh-copy-id.1 "${pkgdir}"/usr/share/man/man1/ssh-copy-id.1 + + sed \ + -e '/^#ChallengeResponseAuthentication yes$/c ChallengeResponseAuthentication no' \ + -e '/^#PrintMotd yes$/c PrintMotd no # pam does that' \ + -e '/^#UsePAM no$/c UsePAM yes' \ + -i "${pkgdir}"/etc/ssh/sshd_config +} Copied: openssh/repos/core-x86_64/install (from rev 363205, openssh/repos/testing-x86_64/install) =================================================================== --- core-x86_64/install (rev 0) +++ core-x86_64/install 2019-09-21 20:34:19 UTC (rev 363206) @@ -0,0 +1,20 @@ +pre_upgrade() { + # Remove socket activation. See: https://bugs.archlinux.org/task/62248 + if (( $(vercmp $2 8.0p1-3) < 0 )); then + if systemctl is-enabled -q sshd.socket; then + cat <<EOF +==> This package no longer provides sshd.socket and sshd@.service; +==> copies of those files will be placed under /etc/systemd/system +==> but please migrate to sshd.service whenever possible. +EOF + src=/usr/lib/systemd/system + dst=/etc/systemd/system + for i in sshd.socket sshd\@.service; do + if [[ ! -e "$dst/$i" ]]; then + cp -v "$src/$i" "$dst/$i" + fi + done + systemctl reenable sshd.socket + fi + fi +} Deleted: core-x86_64/sshd.conf =================================================================== --- core-x86_64/sshd.conf 2019-09-21 15:44:48 UTC (rev 363205) +++ core-x86_64/sshd.conf 2019-09-21 20:34:19 UTC (rev 363206) @@ -1 +0,0 @@ -d /var/empty 0755 root root Copied: openssh/repos/core-x86_64/sshd.conf (from rev 363205, openssh/repos/testing-x86_64/sshd.conf) =================================================================== --- core-x86_64/sshd.conf (rev 0) +++ core-x86_64/sshd.conf 2019-09-21 20:34:19 UTC (rev 363206) @@ -0,0 +1 @@ +d /var/empty 0755 root root Deleted: core-x86_64/sshd.pam =================================================================== --- core-x86_64/sshd.pam 2019-09-21 15:44:48 UTC (rev 363205) +++ core-x86_64/sshd.pam 2019-09-21 20:34:19 UTC (rev 363206) @@ -1,6 +0,0 @@ -#%PAM-1.0 -#auth required pam_securetty.so #disable remote root -auth include system-remote-login -account include system-remote-login -password include system-remote-login -session include system-remote-login Copied: openssh/repos/core-x86_64/sshd.pam (from rev 363205, openssh/repos/testing-x86_64/sshd.pam) =================================================================== --- core-x86_64/sshd.pam (rev 0) +++ core-x86_64/sshd.pam 2019-09-21 20:34:19 UTC (rev 363206) @@ -0,0 +1,6 @@ +#%PAM-1.0 +#auth required pam_securetty.so #disable remote root +auth include system-remote-login +account include system-remote-login +password include system-remote-login +session include system-remote-login Deleted: core-x86_64/sshd.service =================================================================== --- core-x86_64/sshd.service 2019-09-21 15:44:48 UTC (rev 363205) +++ core-x86_64/sshd.service 2019-09-21 20:34:19 UTC (rev 363206) @@ -1,17 +0,0 @@ -[Unit] -Description=OpenSSH Daemon -Wants=sshdgenkeys.service -After=sshdgenkeys.service -After=network.target - -[Service] -ExecStart=/usr/bin/sshd -D -ExecReload=/bin/kill -HUP $MAINPID -KillMode=process -Restart=always - -[Install] -WantedBy=multi-user.target - -# This service file runs an SSH daemon that forks for each incoming connection. -# If you prefer to spawn on-demand daemons, use sshd.socket and sshd@.service. Copied: openssh/repos/core-x86_64/sshd.service (from rev 363205, openssh/repos/testing-x86_64/sshd.service) =================================================================== --- core-x86_64/sshd.service (rev 0) +++ core-x86_64/sshd.service 2019-09-21 20:34:19 UTC (rev 363206) @@ -0,0 +1,14 @@ +[Unit] +Description=OpenSSH Daemon +Wants=sshdgenkeys.service +After=sshdgenkeys.service +After=network.target + +[Service] +ExecStart=/usr/bin/sshd -D +ExecReload=/bin/kill -HUP $MAINPID +KillMode=process +Restart=always + +[Install] +WantedBy=multi-user.target Deleted: core-x86_64/sshd.socket =================================================================== --- core-x86_64/sshd.socket 2019-09-21 15:44:48 UTC (rev 363205) +++ core-x86_64/sshd.socket 2019-09-21 20:34:19 UTC (rev 363206) @@ -1,10 +0,0 @@ -[Unit] -Conflicts=sshd.service -Wants=sshdgenkeys.service - -[Socket] -ListenStream=22 -Accept=yes - -[Install] -WantedBy=sockets.target Deleted: core-x86_64/sshd@.service =================================================================== --- core-x86_64/sshd@.service 2019-09-21 15:44:48 UTC (rev 363205) +++ core-x86_64/sshd@.service 2019-09-21 20:34:19 UTC (rev 363206) @@ -1,9 +0,0 @@ -[Unit] -Description=OpenSSH Per-Connection Daemon -After=sshdgenkeys.service - -[Service] -ExecStart=-/usr/bin/sshd -i -StandardInput=socket -StandardError=syslog -KillMode=process Deleted: core-x86_64/sshdgenkeys.service =================================================================== --- core-x86_64/sshdgenkeys.service 2019-09-21 15:44:48 UTC (rev 363205) +++ core-x86_64/sshdgenkeys.service 2019-09-21 20:34:19 UTC (rev 363206) @@ -1,15 +0,0 @@ -[Unit] -Description=SSH Key Generation -ConditionPathExists=|!/etc/ssh/ssh_host_dsa_key -ConditionPathExists=|!/etc/ssh/ssh_host_dsa_key.pub -ConditionPathExists=|!/etc/ssh/ssh_host_ecdsa_key -ConditionPathExists=|!/etc/ssh/ssh_host_ecdsa_key.pub -ConditionPathExists=|!/etc/ssh/ssh_host_ed25519_key -ConditionPathExists=|!/etc/ssh/ssh_host_ed25519_key.pub -ConditionPathExists=|!/etc/ssh/ssh_host_rsa_key -ConditionPathExists=|!/etc/ssh/ssh_host_rsa_key.pub - -[Service] -ExecStart=/usr/bin/ssh-keygen -A -Type=oneshot -RemainAfterExit=yes Copied: openssh/repos/core-x86_64/sshdgenkeys.service (from rev 363205, openssh/repos/testing-x86_64/sshdgenkeys.service) =================================================================== --- core-x86_64/sshdgenkeys.service (rev 0) +++ core-x86_64/sshdgenkeys.service 2019-09-21 20:34:19 UTC (rev 363206) @@ -0,0 +1,15 @@ +[Unit] +Description=SSH Key Generation +ConditionPathExists=|!/etc/ssh/ssh_host_dsa_key +ConditionPathExists=|!/etc/ssh/ssh_host_dsa_key.pub +ConditionPathExists=|!/etc/ssh/ssh_host_ecdsa_key +ConditionPathExists=|!/etc/ssh/ssh_host_ecdsa_key.pub +ConditionPathExists=|!/etc/ssh/ssh_host_ed25519_key +ConditionPathExists=|!/etc/ssh/ssh_host_ed25519_key.pub +ConditionPathExists=|!/etc/ssh/ssh_host_rsa_key +ConditionPathExists=|!/etc/ssh/ssh_host_rsa_key.pub + +[Service] +ExecStart=/usr/bin/ssh-keygen -A +Type=oneshot +RemainAfterExit=yes