matthew/sonic-buildimage
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Revert "[202012][openssh] openssh: Upgrade from 7.9 to 8.4, to match version in buster-backports (#10910)" (#11136)

Browse Source 
This reverts commit 14fdcc815a.
This commit is contained in:
Jing Kan 2022-06-17 20:46:43 +08:00 committed by GitHub
parent 05ff95fdfc
commit 5b2261da37
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 20 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
build_debian.sh
View File

@ -281,6 +281,7 @@ sudo LANG=C DEBIAN_FRONTEND=noninteractive chroot $FILESYSTEM_ROOT apt-get -y in
tcpdump \ tcpdump \
dbus \ dbus \
ntpstat \ ntpstat \
openssh-server \
python \ python \
python-apt \ python-apt \
traceroute \ traceroute \
@ -322,10 +323,6 @@ sudo LANG=C DEBIAN_FRONTEND=noninteractive chroot $FILESYSTEM_ROOT apt-get -y in
haveged \ haveged \
jq jq
## Install openssh-server from buster-backports for required security patches
sudo LANG=C DEBIAN_FRONTEND=noninteractive chroot $FILESYSTEM_ROOT apt-get -y install -t buster-backports \
openssh-server
if [[ $CONFIGURED_ARCH == amd64 ]]; then if [[ $CONFIGURED_ARCH == amd64 ]]; then
## Pre-install the fundamental packages for amd64 (x86) ## Pre-install the fundamental packages for amd64 (x86)
sudo LANG=C DEBIAN_FRONTEND=noninteractive chroot $FILESYSTEM_ROOT apt-get -y install \ sudo LANG=C DEBIAN_FRONTEND=noninteractive chroot $FILESYSTEM_ROOT apt-get -y install \

6
files/build/versions/host-image/versions-deb-buster
View File

@ -251,9 +251,9 @@ netfilter-persistent==1.0.11+deb10u1
ntp==1:4.2.8p12+dfsg-4+deb10u2 ntp==1:4.2.8p12+dfsg-4+deb10u2
ntpstat==0.0.0.1-2 ntpstat==0.0.0.1-2
opennsl-modules==4.3.0.10-2 opennsl-modules==4.3.0.10-2
openssh-client==1:8.4p1-2~bpo10+1 openssh-client==1:7.9p1-10+deb10u2
openssh-server==1:8.4p1-2~bpo10+1 openssh-server==1:7.9p1-10+deb10u2
openssh-sftp-server==1:8.4p1-2~bpo10+1 openssh-sftp-server==1:7.9p1-10+deb10u2
openssl==1.1.1n-0+deb10u2 openssl==1.1.1n-0+deb10u2
patch==2.7.6-3+deb10u1 patch==2.7.6-3+deb10u1
pciutils==1:3.5.2-1 pciutils==1:3.5.2-1

15
rules/openssh.mk
View File

@ -1,15 +1,14 @@
# openssh package # openssh package
OPENSSH_VERSION = 8.4p1 OPENSSH_VERSION = 7.9p1-10+deb10u2
OPENSSH_VERSION_FULL = ${OPENSSH_VERSION}-2~bpo10+1
export OPENSSH_VERSION OPENSSH_VERSION_FULL export OPENSSH_VERSION
OPENSSH_SERVER = openssh-server_$(OPENSSH_VERSION_FULL)_$(CONFIGURED_ARCH).deb OPENSSH_SERVER = openssh-server_$(OPENSSH_VERSION)_$(CONFIGURED_ARCH).deb
$(OPENSSH_SERVER)_SRC_PATH = $(SRC_PATH)/openssh $(OPENSSH_SERVER)_SRC_PATH = $(SRC_PATH)/openssh
SONIC_MAKE_DEBS += $(OPENSSH_SERVER) SONIC_MAKE_DEBS += $(OPENSSH_SERVER)
OPENSSH_SERVER_DBG = openssh-server-dbgsym_$(OPENSSH_VERSION_FULL)_$(CONFIGURED_ARCH).deb # The .c, .cpp, .h & .hpp files under src/{$DBG_SRC_ARCHIVE list}
$(eval $(call add_derived_package,$(OPENSSH_SERVER),$(OPENSSH_SERVER_DBG))) # are archived into debug one image to facilitate debugging.
#
export OPENSSH_SERVER OPENSSH_SERVER_DBG DBG_SRC_ARCHIVE += openssh

5
sonic-slave-buster/Dockerfile.j2
View File

@ -49,6 +49,7 @@ ENV DEBIAN_FRONTEND=noninteractive
RUN apt-get update && apt-get install -y \ RUN apt-get update && apt-get install -y \
apt-utils \ apt-utils \
default-jre-headless \ default-jre-headless \
openssh-server \
curl \ curl \
wget \ wget \
unzip \ unzip \
@ -332,10 +333,6 @@ RUN apt-get update && apt-get install -y \
libgtest-dev \ libgtest-dev \
libgcc-8-dev libgcc-8-dev
# For openssh-server
RUN apt-get -y install -t buster-backports \
openssh-server \
libfido2-dev
RUN apt-get -y build-dep openssh RUN apt-get -y build-dep openssh
# Build fix for ARMHF buster libsairedis # Build fix for ARMHF buster libsairedis

18
src/openssh/Makefile
View File

@ -2,19 +2,17 @@
SHELL = /bin/bash SHELL = /bin/bash
.SHELLFLAGS += -e .SHELLFLAGS += -e
MAIN_TARGET = $(OPENSSH_SERVER) MAIN_TARGET = openssh-server_$(OPENSSH_VERSION)_$(CONFIGURED_ARCH).deb
DERIVED_TARGETS = $(OPENSSH_SERVER_DBG) DERIVED_TARGETS = openssh-server-dbgsym_$(OPENSSH_VERSION)_$(CONFIGURED_ARCH).deb
$(addprefix $(DEST)/, $(MAIN_TARGET)): $(DEST)/% : $(addprefix $(DEST)/, $(MAIN_TARGET)): $(DEST)/% :
# Remove stale files # Obtain openssh: https://salsa.debian.org/ssh-team/openssh/-/tree/debian/1%257.9p1-10+deb10u2
rm -rf ./openssh-$(OPENSSH_VERSION) rm -rf ./openssh-server
git clone https://salsa.debian.org/ssh-team/openssh.git openssh-server
pushd ./openssh-server
dget https://deb.debian.org/debian/pool/main/o/openssh/openssh_$(OPENSSH_VERSION_FULL).dsc # Check out tag: debian/1%7.9p1-10+deb10u2
pushd ./openssh-$(OPENSSH_VERSION) git checkout -b openssh-src -f 6d9ca74c48d9911342c6ca5aaac8a25974fa2619
git init
git add -f *
git commit -qm "initial commit"
# Apply patch series # Apply patch series
stg init stg init