Date: Monday, February 17, 2020 @ 01:12:45 Author: bisson Revision: 375720
enable builtin u2f, add announcement for compat break Modified: openssh/trunk/PKGBUILD openssh/trunk/install ----------+ PKGBUILD | 27 +++++++++++++-------------- install | 8 ++++++++ 2 files changed, 21 insertions(+), 14 deletions(-) Modified: PKGBUILD =================================================================== --- PKGBUILD 2020-02-17 01:01:27 UTC (rev 375719) +++ PKGBUILD 2020-02-17 01:12:45 UTC (rev 375720) @@ -4,24 +4,26 @@ pkgname=openssh pkgver=8.2p1 -pkgrel=1 +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' 'git') +makedepends=('linux-headers' 'git' 'libfido2') depends=('krb5' 'openssl' 'libedit' 'ldns') optdepends=('xorg-xauth: X11 forwarding' - 'x11-ssh-askpass: input passphrase in X') + 'x11-ssh-askpass: input passphrase in X' + 'libfido2: FIDO/U2F support') validpgpkeys=('59C2118ED206D927E667EBE3D3E5F56B6D920D30') -#source=("https://ftp.openbsd.org/pub/OpenBSD/OpenSSH/portable/${pkgname}-${pkgver}.tar.gz"{,.asc} -source=("git://anongit.mindrot.org/openssh.git?signed#tag=V_8_2_P1" +#source=("git://anongit.mindrot.org/openssh.git?signed#tag=V_8_2_P1" +source=("https://ftp.openbsd.org/pub/OpenBSD/OpenSSH/portable/${pkgname}-${pkgver}.tar.gz"{,.asc} 'sshdgenkeys.service' 'sshd.service' 'sshd.conf' 'sshd.pam' 'glibc-2.31.patch') -sha256sums=('SKIP' +sha256sums=('43925151e6cf6cee1450190c0e9af4dc36b41c12737619edff8bcebdff64e671' + 'SKIP' '4031577db6416fcbaacf8a26a024ecd3939e5c10fe6a86ee3f0eea5093d533b7' 'e40f8b7c8e5e2ecf3084b3511a6c36d5b5c9f9e61f2bb13e3726c71dc7d4fbc7' '4effac1186cc62617f44385415103021f72f674f8b8e26447fc1139c670090f6' @@ -33,15 +35,13 @@ install=install prepare() { -# cd "${srcdir}/${pkgname}-${pkgver}" - cd "${srcdir}/${pkgname}" + cd "${srcdir}/${pkgname}-${pkgver}" patch -p1 -i ../glibc-2.31.patch autoreconf } build() { -# cd "${srcdir}/${pkgname}-${pkgver}" - cd "${srcdir}/${pkgname}" + cd "${srcdir}/${pkgname}-${pkgver}" ./configure \ --prefix=/usr \ @@ -51,6 +51,7 @@ --disable-strip \ --with-ldns \ --with-libedit \ + --with-security-key-builtin \ --with-ssl-engine \ --with-pam \ --with-privsep-user=nobody \ @@ -64,8 +65,7 @@ } check() { -# cd "${srcdir}/${pkgname}-${pkgver}" - cd "${srcdir}/${pkgname}" + cd "${srcdir}/${pkgname}-${pkgver}" # Tests require openssh to be already installed system-wide, # also connectivity tests will fail under makechrootpkg since @@ -77,8 +77,7 @@ } package() { -# cd "${srcdir}/${pkgname}-${pkgver}" - cd "${srcdir}/${pkgname}" + cd "${srcdir}/${pkgname}-${pkgver}" make DESTDIR="${pkgdir}" install Modified: install =================================================================== --- install 2020-02-17 01:01:27 UTC (rev 375719) +++ install 2020-02-17 01:12:45 UTC (rev 375720) @@ -1,4 +1,12 @@ pre_upgrade() { + if (( $(vercmp $2 8.2p1-2) < 0 )); then + cat <<EOF +==> Your current SSH daemon may be unable to accept new connections. +==> To fix this, please restart it right now using: +==> systemctl restart sshd +EOF + fi + # 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
