openssh: upgraded package to upstream
Upgraded net-misc/openssh to version 8.8_p1-r2 on amd64, arm64
Removed linux-headers version restriction and added condition
on removing dir var/empty to make it work in COS.
diff --git a/net-misc/openssh/openssh-8.8_p1-r2.ebuild b/net-misc/openssh/openssh-8.8_p1-r2.ebuild
index 275cee9a5..88d4712cb 100644
--- a/net-misc/openssh/openssh-8.8_p1-r2.ebuild
+++ b/net-misc/openssh/openssh-8.8_p1-r2.ebuild
@@ -86,7 +86,7 @@ RDEPEND="
"
DEPEND="${RDEPEND}
virtual/os-headers
- kernel_linux? ( !prefix-guest? ( >=sys-kernel/linux-headers-5.1 ) )
+ kernel_linux? ( !prefix-guest? ( sys-kernel/linux-headers ) )
static? ( ${LIB_DEPEND} )
"
RDEPEND="${RDEPEND}
@@ -440,7 +440,9 @@ src_install() {
|| die "failed to remove scp"
fi
- rmdir "${ED}"/var/empty || die
+ if [[ -d "${ED}"/var/empty ]]; then
+ rmdir "${ED}"/var/empty || die
+ fi
systemd_dounit "${FILESDIR}"/sshd.{service,socket}
systemd_newunit "${FILESDIR}"/sshd_at.service 'sshd@.service'
BUG=b/205336232,b/205267203
TEST=presubmit
RELEASE_NOTE=Upgraded net-misc/openssh to v8.8_p1-r2. This resolved
CVE-2016-20012 and CVE-2021-41617.
Change-Id: I4e7e7799470a7c4cbd9a1ea115bfefc225281d1f
Reviewed-on: https://cos-review.googlesource.com/c/third_party/overlays/portage-stable/+/24984
Tested-by: Cusky Presubmit Bot <presubmit@cos-infra-prod.iam.gserviceaccount.com>
Reviewed-by: Vaibhav Rustagi <vaibhavrustagi@google.com>
30 files changed