From b0b9bb0d68b3b5d68fc85b9a214c1d71eef1dfc2 Mon Sep 17 00:00:00 2001 From: Saikrishna Arcot Date: Fri, 23 Jul 2021 08:21:05 -0700 Subject: [PATCH] openssh: Upgrade from 7.9 to 8.4, to match version in Bullseye Signed-off-by: Saikrishna Arcot --- rules/openssh.mk | 2 +- src/openssh/Makefile | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/rules/openssh.mk b/rules/openssh.mk index 0cc3de6210..0e4696ed9d 100644 --- a/rules/openssh.mk +++ b/rules/openssh.mk @@ -1,6 +1,6 @@ # openssh package -OPENSSH_VERSION = 7.9p1-10+deb10u2 +OPENSSH_VERSION = 8.4p1-5 export OPENSSH_VERSION diff --git a/src/openssh/Makefile b/src/openssh/Makefile index be05c6ffd6..91d4fd52bc 100644 --- a/src/openssh/Makefile +++ b/src/openssh/Makefile @@ -6,13 +6,13 @@ MAIN_TARGET = openssh-server_$(OPENSSH_VERSION)_$(CONFIGURED_ARCH).deb DERIVED_TARGETS = openssh-server-dbgsym_$(OPENSSH_VERSION)_$(CONFIGURED_ARCH).deb $(addprefix $(DEST)/, $(MAIN_TARGET)): $(DEST)/% : - # Obtain openssh: https://salsa.debian.org/ssh-team/openssh/-/tree/debian/1%257.9p1-10+deb10u2 + # Obtain openssh: https://salsa.debian.org/ssh-team/openssh/-/tree/debian/1%258.4p1-5 rm -rf ./openssh-server git clone https://salsa.debian.org/ssh-team/openssh.git openssh-server pushd ./openssh-server - # Check out tag: debian/1%7.9p1-10+deb10u2 - git checkout -b openssh-src -f 6d9ca74c48d9911342c6ca5aaac8a25974fa2619 + # Check out tag: debian/1%8.4p1-5 + git checkout -b openssh-src -f debian/1\%$(OPENSSH_VERSION) # Apply patch series stg init