Revert "[ci/build]: Upgrade SONiC package versions (#20095)" (#20124)

This reverts commit 652b388.
sonic-net · Sep 4, 2024 · f97f69d · f97f69d
1 parent b93c15a
commit f97f69d
Show file tree

Hide file tree

Showing 9 changed files with 14 additions and 28 deletions.
diff --git a/files/build/versions/build/build-sonic-slave-bullseye/versions-py3-all-arm64 b/files/build/versions/build/build-sonic-slave-bullseye/versions-py3-all-arm64
@@ -3,4 +3,3 @@ bitarray==1.5.3
 click==7.0
 requests==2.31.0
 urllib3==2.0.5
-zipp==1.2.0
diff --git a/files/build/versions/default/versions-git b/files/build/versions/default/versions-git
@@ -1,12 +1,12 @@
-https://chromium.googlesource.com/chromium/tools/depot_tools.git==2836a02f55cd943760ab4949d5846cc5fb1fadcb
+https://chromium.googlesource.com/chromium/tools/depot_tools.git==1f6ef165b726ed7316b8e88666390e90a82e8e50
 https://github.com/aristanetworks/swi-tools.git==b5f087e4774168bf536360d43c9c509c8f14ad9f
 https://github.com/CESNET/libyang.git==fba28260f382d81cf8f4b91b24cd717b52324fc2
 https://github.com/daveolson53/audisp-tacplus.git==559c9f22edd4f2dea0ecedffb3ad9502b12a75b6
 https://github.com/daveolson53/libnss-tacplus.git==19008ab68d9d504aa58eb34d5f564755a1613b8b
 https://github.com/dyninc/OpenBFDD.git==e35f43ad8d2b3f084e96a84c392528a90d05a287
-https://github.com/flashrom/flashrom.git==00e02a61840d0f230d25f8988d2f30100ae1388d
-https://github.com/FreeRADIUS/freeradius-server.git==e61cfd0d01dfebd290beb499fce6476443018c98
-https://github.com/FreeRADIUS/pam_radius.git==c898ed12675cf386218e6e071bb158b725e9bdf4
+https://github.com/flashrom/flashrom.git==6ccfef8ccdf79f74a6212f4ba1dfe668b55c24a7
+https://github.com/FreeRADIUS/freeradius-server.git==1c1f9cfab2ce4f331e63bfc41caa8e9557fc33f9
+https://github.com/FreeRADIUS/pam_radius.git==b6442c3e0147f1019990520483fa3a30e4ccf059
 https://github.com/jeroennijhof/pam_tacplus.git==b839c440e33c36eced9dcbc287fcfe6237c4c4ce
 https://github.com/jpirko/libteam.git==337125ce8d24ed66d7f4c7e6eef50458f3e7d154
 https://github.com/lguohan/gnxi.git==3adf8b97755b49947e465b5a14645f11e79fa0cd
@@ -20,4 +20,4 @@ https://github.com/thom311/libnl==81c40cbb904fb4844411cc660eaa0fd1d5d9f5f3
 https://salsa.debian.org/debian/libteam.git==48142125234a665ad5367b724af36a58fb484d3d
 https://salsa.debian.org/kernel-team/initramfs-tools.git==1030062ea45fe8c0dcde0586e588bd95075afe5c
 https://salsa.debian.org/sk-guest/monit.git==c9da7ebb1f35dfba17b50b5969a6e75e29cbec0d
-https://salsa.debian.org/ssh-team/openssh.git==c4fa29df5c0d25128200979b0cb592dd2b1fef7b
+https://salsa.debian.org/ssh-team/openssh.git==52676cdebf990f4f1bbaeb1e3ab131f76d86e86b
diff --git a/files/build/versions/default/versions-web b/files/build/versions/default/versions-web
@@ -40,7 +40,7 @@ https://github.com/CentecNetworks/sonic-binaries/raw/master/amd64/third_party/ad
 https://github.com/CentecNetworks/sonic-binaries/raw/master/arm64/sai/libsaictc-dev_1.13.0-1_arm64.deb==1162131e154bba573bf7502d743f1d81
 https://github.com/CentecNetworks/sonic-binaries/raw/master/arm64/sai/libsaictc_1.13.0-1_arm64.deb==b8b25694a1dc9b4d8dffc2f2c04ddaed
 https://github.com/CumulusNetworks/ifupdown2/archive/3.0.0-1.tar.gz==755459b3a58fbc11625336846cea7420
-https://github.com/Marvell-switching/sonic-marvell-binaries/raw/master/armhf/sai-plugin/mrvllibsai_1.13.3-2_armhf.deb==348a4cacaaed11a3ad85898a193f9e0b
+https://github.com/Marvell-switching/sonic-marvell-binaries/raw/master/armhf/sai-plugin/mrvllibsai_1.13.3-1_armhf.deb==bfeb30fcf6a047040d06a8e6a67b4964
 https://github.com/Mellanox/Spectrum-SDK-Drivers-SONiC-Bins/releases/download/fw-2012.4082/fw-SPC-rel-13_2012_4082-EVB.mfa==d8a22843f114337904e2bc9e88865ddc
 https://github.com/Mellanox/Spectrum-SDK-Drivers-SONiC-Bins/releases/download/fw-2012.4082/fw-SPC2-rel-29_2012_4082-EVB.mfa==1b01e826c84766ac00bde3cdf750df48
 https://github.com/Mellanox/Spectrum-SDK-Drivers-SONiC-Bins/releases/download/fw-2012.4082/fw-SPC3-rel-30_2012_4082-EVB.mfa==aa0d846ff436481e7edcd9c19c62c072

diff --git a/files/build/versions/dockers/docker-sonic-vs/versions-py3 b/files/build/versions/dockers/docker-sonic-vs/versions-py3
@@ -25,7 +25,6 @@ paramiko==2.11.0
 pexpect==4.8.0
 prefixed==0.7.0
 prettyprinter==0.18.0
-psutil==6.0.0
 ptyprocess==0.7.0
 pycairo==1.24.0
 pycparser==2.21

diff --git a/files/build/versions/dockers/docker-syncd-mrvl/versions-deb-bullseye-armhf b/files/build/versions/dockers/docker-syncd-mrvl/versions-deb-bullseye-armhf
@@ -25,7 +25,7 @@ libsensors4-dev==1:3.6.0-7
 libsensors5==1:3.6.0-7
 mailcap==3.69
 mime-support==3.66
-mrvllibsai==1.13.3-2
+mrvllibsai==1.13.3-1
 nfs-common==1:1.3.4-6
 pkg-config==0.29.2-1
 python-dev-is-python2==2.7.18-9

diff --git a/files/build/versions/dockers/sonic-slave-bullseye/versions-py3 b/files/build/versions/dockers/sonic-slave-bullseye/versions-py3
@@ -60,7 +60,7 @@ parameterized==0.8.1
 parse==1.6.6
 pexpect==4.8.0
 pillow==9.4.0
-pip==24.2
+pip==23.2.1
 pluggy==0.13.0
 protobuf==4.25.2
 ptyprocess==0.7.0

diff --git a/files/build/versions/host-image/versions-deb-bullseye b/files/build/versions/host-image/versions-deb-bullseye
@@ -164,7 +164,7 @@ libjansson4==2.13.1-1.1
 libjq1==1.6-2.1
 libjs-jquery==3.5.1+dfsg+~3.5.5-7
 libjson-c5==0.15-2+deb11u1
-libk5crypto3==1.18.3-6+deb11u5
+libk5crypto3==1.18.3-6+deb11u5+fips
 libklibc==2.0.8-6.1
 libkmod2==28-1
 libkrb5-3==1.18.3-6+deb11u5
@@ -273,14 +273,14 @@ ndisc6==1.0.4-2
 net-tools==1.60+git20181103.0eebece-1
 netbase==6.3
 netfilter-persistent==1.0.15
-ntp==1:4.2.8p15+dfsg-1
+ntp==1:4.2.8p15+dfsg-1+deb10u2
 ntpdate==1:4.2.8p15+dfsg-1
 ntpstat==0.0.0.1-2+b1
 opennsl-modules==7.1.0.0
-openssh-client==1:8.4p1-5+deb11u3
-openssh-server==1:8.4p1-5+deb11u3
-openssh-sftp-server==1:8.4p1-5+deb11u3
-openssl==1.1.1w-0+deb11u1
+openssh-client==1:8.4p1-5+deb11u2+fips
+openssh-server==1:8.4p1-5+deb11u2+fips
+openssh-sftp-server==1:8.4p1-5+deb11u2+fips
+openssl==1.1.1n-0+deb11u5+fips
 pci.ids==0.0~2021.02.08-1
 pciutils==1:3.7.0-5
 perl==5.32.1-4+deb11u3

diff --git a/files/build/versions/host-image/versions-deb-bullseye-arm64 b/files/build/versions/host-image/versions-deb-bullseye-arm64
@@ -5,20 +5,14 @@ libc-dev-bin==2.31-13+deb11u10
 libc6-dev==2.31-13+deb11u10
 libcrypt-dev==1:4.4.18-4
 libicu-dev==67.1-7
-libk5crypto3==1.18.3-6+deb11u5+fips
 libnsl-dev==1.3.0-2
 libtirpc-dev==1.3.1-1+deb11u1
 libxml2-dev==2.9.10+dfsg-6.7+deb11u4
 libxslt1-dev==1.1.34-4+deb11u1
 libxslt1.1==1.1.34-4+deb11u1
 linux-image-5.10.0-23-2-arm64-unsigned==5.10.179-3
 linux-libc-dev==5.10.221-1
-ntp==1:4.2.8p15+dfsg-1+deb10u2
 ntpstat==0.0.0.1-2
-openssh-client==1:8.4p1-5+deb11u2+fips
-openssh-server==1:8.4p1-5+deb11u2+fips
-openssh-sftp-server==1:8.4p1-5+deb11u2+fips
-openssl==1.1.1n-0+deb11u5+fips
 picocom==3.1-2
 tsingma-bsp==1.0
 zlib1g-dev==1:1.2.11.dfsg-2+deb11u2
diff --git a/files/build/versions/host-image/versions-deb-bullseye-armhf b/files/build/versions/host-image/versions-deb-bullseye-armhf
@@ -5,7 +5,6 @@ libc-dev-bin==2.31-13+deb11u10
 libc6-dev==2.31-13+deb11u10
 libcrypt-dev==1:4.4.18-4
 libicu-dev==67.1-7
-libk5crypto3==1.18.3-6+deb11u5+fips
 libnsl-dev==1.3.0-2
 libtirpc-dev==1.3.1-1+deb11u1
 libxml2-dev==2.9.10+dfsg-6.7+deb11u4
@@ -14,11 +13,6 @@ libxslt1.1==1.1.34-4+deb11u1
 linux-image-5.10.0-23-2-armmp==5.10.179-3
 linux-libc-dev==5.10.221-1
 mrvlprestera==1.0
-ntp==1:4.2.8p15+dfsg-1+deb10u2
 ntpstat==0.0.0.1-2
-openssh-client==1:8.4p1-5+deb11u2+fips
-openssh-server==1:8.4p1-5+deb11u2+fips
-openssh-sftp-server==1:8.4p1-5+deb11u2+fips
-openssl==1.1.1n-0+deb11u5+fips
 picocom==3.1-2
 zlib1g-dev==1:1.2.11.dfsg-2+deb11u2