diff options
| author | Nicolas Iooss | 2020-10-31 20:59:16 +0100 |
|---|---|---|
| committer | Nicolas Iooss | 2020-11-03 22:45:56 +0100 |
| commit | 8045fc35a2654d1e5b9fd64d175852c9c81ee95f (patch) | |
| tree | ff9b54d34bda802101ddde190fc5e02bae27ba19 | |
| parent | 47b2c2a31a5c14876f775122775c6506a809c471 (diff) | |
| download | aur-8045fc35a2654d1e5b9fd64d175852c9c81ee95f.tar.gz | |
openssh-selinux 8.4p1-2 update
| -rw-r--r-- | .SRCINFO | 8 | ||||
| -rw-r--r-- | 0001-Fix-EOF-command-not-found-error-in-ssh-copy-id.patch | 33 | ||||
| -rw-r--r-- | PKGBUILD | 12 |
3 files changed, 47 insertions, 6 deletions
@@ -1,7 +1,7 @@ pkgbase = openssh-selinux pkgdesc = Premier connectivity tool for remote login with the SSH protocol, with SELinux support pkgver = 8.4p1 - pkgrel = 1 + pkgrel = 2 url = https://www.openssh.com/portable.html install = install arch = x86_64 @@ -23,8 +23,8 @@ pkgbase = openssh-selinux optdepends = xorg-xauth: X11 forwarding optdepends = x11-ssh-askpass: input passphrase in X optdepends = libfido2: FIDO/U2F support - provides = openssh=8.4p1-1 - provides = selinux-openssh=8.4p1-1 + provides = openssh=8.4p1-2 + provides = selinux-openssh=8.4p1-2 conflicts = openssh conflicts = selinux-openssh backup = etc/ssh/ssh_config @@ -37,6 +37,7 @@ pkgbase = openssh-selinux source = sshd.conf source = sshd.pam source = glibc-2.31.patch + source = 0001-Fix-EOF-command-not-found-error-in-ssh-copy-id.patch validpgpkeys = 59C2118ED206D927E667EBE3D3E5F56B6D920D30 sha256sums = 5a01d22e407eb1c05ba8a8f7c654d388a13e9f226e4ed33bd38748dafa1d2b24 sha256sums = SKIP @@ -45,6 +46,7 @@ pkgbase = openssh-selinux sha256sums = 4effac1186cc62617f44385415103021f72f674f8b8e26447fc1139c670090f6 sha256sums = 64576021515c0a98b0aaf0a0ae02e0f5ebe8ee525b1e647ab68f369f81ecd846 sha256sums = 25b4a4d9e2d9d3289ef30636a30e85fa1c71dd930d5efd712cca1a01a5019f93 + sha256sums = a9093693586ea1150ac50249ce8937f86cde7977efa54a324e3f1155110aff49 pkgname = openssh-selinux diff --git a/0001-Fix-EOF-command-not-found-error-in-ssh-copy-id.patch b/0001-Fix-EOF-command-not-found-error-in-ssh-copy-id.patch new file mode 100644 index 000000000000..5cd0054c7d5c --- /dev/null +++ b/0001-Fix-EOF-command-not-found-error-in-ssh-copy-id.patch @@ -0,0 +1,33 @@ +From d9e727dcc04a52caaac87543ea1d230e9e6b5604 Mon Sep 17 00:00:00 2001 +From: Oleg <Fallmay@users.noreply.github.com> +Date: Thu, 1 Oct 2020 12:09:08 +0300 +Subject: [PATCH] Fix `EOF: command not found` error in ssh-copy-id + +--- + contrib/ssh-copy-id | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +diff --git a/contrib/ssh-copy-id b/contrib/ssh-copy-id +index 392f64f9..a7690771 100644 +--- a/contrib/ssh-copy-id ++++ b/contrib/ssh-copy-id +@@ -247,7 +247,7 @@ installkeys_sh() { + # the -z `tail ...` checks for a trailing newline. The echo adds one if was missing + # the cat adds the keys we're getting via STDIN + # and if available restorecon is used to restore the SELinux context +- INSTALLKEYS_SH=$(tr '\t\n' ' ' <<-EOF) ++ INSTALLKEYS_SH=$(tr '\t\n' ' ' <<-EOF + cd; + umask 077; + mkdir -p $(dirname "${AUTH_KEY_FILE}") && +@@ -258,6 +258,7 @@ installkeys_sh() { + restorecon -F .ssh ${AUTH_KEY_FILE}; + fi + EOF ++ ) + + # to defend against quirky remote shells: use 'exec sh -c' to get POSIX; + printf "exec sh -c '%s'" "${INSTALLKEYS_SH}" +-- +2.29.1 + @@ -11,7 +11,7 @@ pkgname=openssh-selinux pkgver=8.4p1 -pkgrel=1 +pkgrel=2 pkgdesc='Premier connectivity tool for remote login with the SSH protocol, with SELinux support' url='https://www.openssh.com/portable.html' license=('custom:BSD') @@ -33,14 +33,16 @@ source=("https://ftp.openbsd.org/pub/OpenBSD/OpenSSH/portable/${pkgname/-selinux 'sshd.service' 'sshd.conf' 'sshd.pam' - 'glibc-2.31.patch') + 'glibc-2.31.patch' + '0001-Fix-EOF-command-not-found-error-in-ssh-copy-id.patch') sha256sums=('5a01d22e407eb1c05ba8a8f7c654d388a13e9f226e4ed33bd38748dafa1d2b24' 'SKIP' '4031577db6416fcbaacf8a26a024ecd3939e5c10fe6a86ee3f0eea5093d533b7' 'e40f8b7c8e5e2ecf3084b3511a6c36d5b5c9f9e61f2bb13e3726c71dc7d4fbc7' '4effac1186cc62617f44385415103021f72f674f8b8e26447fc1139c670090f6' '64576021515c0a98b0aaf0a0ae02e0f5ebe8ee525b1e647ab68f369f81ecd846' - '25b4a4d9e2d9d3289ef30636a30e85fa1c71dd930d5efd712cca1a01a5019f93') + '25b4a4d9e2d9d3289ef30636a30e85fa1c71dd930d5efd712cca1a01a5019f93' + 'a9093693586ea1150ac50249ce8937f86cde7977efa54a324e3f1155110aff49') backup=('etc/ssh/ssh_config' 'etc/ssh/sshd_config' 'etc/pam.d/sshd') @@ -50,6 +52,10 @@ prepare() { cd "${srcdir}/${pkgname/-selinux}-${pkgver}" patch -p1 -i ../glibc-2.31.patch + + # Fix `EOF: command not found` error in ssh-copy-id + patch -p1 -i ../0001-Fix-EOF-command-not-found-error-in-ssh-copy-id.patch + autoreconf } |