Merge pull request sonic-net#151 from mssonicbld/sonicbld/202205-merge

[code sync] Merge code from sonic-net/sonic-buildimage:202205 to 202205
mlok-nokia · Nov 3, 2023 · 261e1fd · 261e1fd
2 parents c022ef3 + f85a2a4
commit 261e1fd
Show file tree

Hide file tree

Showing 8 changed files with 25 additions and 24 deletions.
diff --git a/files/build/versions/build/build-sonic-slave-bullseye/versions-deb-bullseye-armhf b/files/build/versions/build/build-sonic-slave-bullseye/versions-deb-bullseye-armhf
@@ -1,4 +1,3 @@
 libnl-3-200==3.5.0-1
 libnl-route-3-200==3.5.0-1
-linux-headers-5.10.0-18-2-armmp==5.10.140-1
-mrvllibsai==1.10.2-5
+linux-headers-5.10.0-18-2-armmp==5.10.140-1
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
@@ -1,3 +1,4 @@
 bitarray==1.5.3
 click==7.0
-requests==2.31.0
+requests==2.31.0
+zipp==1.2.0
diff --git a/files/build/versions/build/build-sonic-slave-bullseye/versions-py3-all-armhf b/files/build/versions/build/build-sonic-slave-bullseye/versions-py3-all-armhf
@@ -1,3 +1,4 @@
 bitarray==1.5.3
 click==7.0
-requests==2.31.0
+requests==2.31.0
+zipp==1.2.0
diff --git a/files/build/versions/default/versions-git b/files/build/versions/default/versions-git
@@ -1,22 +1,22 @@
-https://chromium.googlesource.com/chromium/tools/depot_tools.git==c7628f780970136892e71d9de0dee072a1982dc9
+https://chromium.googlesource.com/chromium/tools/depot_tools.git==9f3b33a275e7a5b19d8ce4aba7960d2a38858681
 https://github.com/aristanetworks/swi-tools.git==b5f087e4774168bf536360d43c9c509c8f14ad9f
 https://github.com/CESNET/libyang.git==7e5ea21030fe6632b6faad30c0de8d9669503773
 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==1dd7c88f41e49a076a189154928030d37ca00d26
-https://github.com/FreeRADIUS/freeradius-server.git==9bf966d8c506a15c07aa8413b744116a3b0faa39
+https://github.com/FreeRADIUS/freeradius-server.git==f687a780b002f407e24a74427781f916a861307f
 https://github.com/FreeRADIUS/pam_radius.git==7d75a319e43d5e234b93f89cd461a11861d07b95
 https://github.com/jeroennijhof/pam_tacplus.git==b89dba44b58ec7fdc9b5365b982aa4a316484a3c
 https://github.com/jpirko/libteam.git==8b843e93cee1dab61fb79b01791201cdad45e1d1
 https://github.com/lguohan/gnxi.git==3adf8b97755b49947e465b5a14645f11e79fa0cd
 https://github.com/Marvell-switching/mrvl-prestera.git==8f9bcdaf58406c71a9038aea834fc8255de59848
 https://github.com/Mellanox/libpsample.git==62bb27d9a49424e45191eee81df7ce0d8c74e774
-https://github.com/opencomputeproject/SAI.git==f981a1f618ff84c28f75f8185ccad6dd73bf2bb4
+https://github.com/opencomputeproject/SAI.git==16e505062ed1f2181e0144c891d617cddfb44f20
 https://github.com/p4lang/scapy-vxlan.git==85ffe83da156568ee47a0750f638227e6e1d7479
 https://github.com/sflow/host-sflow==6296a172c2c3879126298dc66994d38e68956185
 https://github.com/sflow/sflowtool==2b622f99d36254884507d9137e6e99020db260cb
-https://github.com/thom311/libnl==a735989cff5576fa2a8f9188eccf1fb30832f426
+https://github.com/thom311/libnl==5979fcb0a6855ddc8fa3b3a20d6ba37c1856d040
 https://salsa.debian.org/debian/libteam.git==48142125234a665ad5367b724af36a58fb484d3d
 https://salsa.debian.org/kernel-team/ethtool/==895b011970dffae1b34fd3f80fc6f62e6284d55c
 https://salsa.debian.org/kernel-team/initramfs-tools.git==cf964bfb4362019fd7fba1e839e403ff950dca8e

diff --git a/files/build/versions/default/versions-mirror b/files/build/versions/default/versions-mirror
@@ -1,15 +1,15 @@
 deb.nodesource.com_node%5f14.x_dists_bullseye==2023-02-17T00:35:28Z
 deb.nodesource.com_node%5f14.x_dists_buster==2023-02-17T00:35:28Z
-debian==20231029T000252Z
-debian-security==20231029T000253Z
+debian==20231031T000225Z
+debian-security==20231031T000224Z
 download.docker.com_linux_debian_dists_bullseye==2023-10-26T15:36:36Z
 download.docker.com_linux_debian_dists_buster==2023-10-26T15:36:37Z
 packages.microsoft.com_repos_sonic-dev_dists_jessie==2022-10-31T19:34:29Z
-packages.trafficmanager.net_snapshot_debian-security_20231029T000253Z_dists_bullseye-security==2023-10-28T15:03:10Z
-packages.trafficmanager.net_snapshot_debian-security_20231029T000253Z_dists_buster_updates==2023-10-28T15:03:10Z
-packages.trafficmanager.net_snapshot_debian_20231029T000252Z_dists_bullseye==2023-10-07T11:07:16Z
-packages.trafficmanager.net_snapshot_debian_20231029T000252Z_dists_bullseye-backports==2023-10-28T20:16:40Z
-packages.trafficmanager.net_snapshot_debian_20231029T000252Z_dists_bullseye-updates==2023-10-28T20:16:40Z
-packages.trafficmanager.net_snapshot_debian_20231029T000252Z_dists_buster==2023-06-10T08:53:33Z
-packages.trafficmanager.net_snapshot_debian_20231029T000252Z_dists_buster-backports==2023-10-28T20:16:40Z
-packages.trafficmanager.net_snapshot_debian_20231029T000252Z_dists_buster-updates==2023-06-10T08:55:10Z
+packages.trafficmanager.net_snapshot_debian-security_20231031T000224Z_dists_bullseye-security==2023-10-30T21:33:05Z
+packages.trafficmanager.net_snapshot_debian-security_20231031T000224Z_dists_buster_updates==2023-10-30T21:33:04Z
+packages.trafficmanager.net_snapshot_debian_20231031T000225Z_dists_bullseye==2023-10-07T11:07:16Z
+packages.trafficmanager.net_snapshot_debian_20231031T000225Z_dists_bullseye-backports==2023-10-30T20:22:40Z
+packages.trafficmanager.net_snapshot_debian_20231031T000225Z_dists_bullseye-updates==2023-10-30T20:22:40Z
+packages.trafficmanager.net_snapshot_debian_20231031T000225Z_dists_buster==2023-06-10T08:53:33Z
+packages.trafficmanager.net_snapshot_debian_20231031T000225Z_dists_buster-backports==2023-10-30T20:22:40Z
+packages.trafficmanager.net_snapshot_debian_20231031T000225Z_dists_buster-updates==2023-06-10T08:55:10Z
diff --git a/files/build/versions/dockers/sonic-slave-bullseye/versions-deb-bullseye b/files/build/versions/dockers/sonic-slave-bullseye/versions-deb-bullseye
@@ -710,7 +710,7 @@ libjbig0==2.1-3.1+b2
 libjbig2dec0==0.19-2
 libjemalloc-dev==5.2.1-3
 libjemalloc2==5.2.1-3
-libjetty9-java==9.4.39-3+deb11u2
+libjetty9-java==9.4.50-4+deb11u1
 libjpeg62-turbo==1:2.0.6-4
 libjq1==1.6-2.1
 libjs-bootstrap4==4.5.2+dfsg1-8~deb11u1

diff --git a/files/build/versions/dockers/sonic-slave-buster/versions-deb-buster b/files/build/versions/dockers/sonic-slave-buster/versions-deb-buster
@@ -83,7 +83,7 @@ dh-systemd==12.1.1
 dictionaries-common==1.28.1
 diffstat==1.62-1
 dirmngr==2.2.12-1+deb10u2
-distro-info-data==0.41+deb10u7
+distro-info-data==0.41+deb10u8
 dkms==2.6.1-4
 dmeventd==2:1.02.155-3
 dmsetup==2:1.02.155-3
@@ -447,7 +447,7 @@ libdevmapper1.02.1==2:1.02.155-3
 libdigest-bubblebabble-perl==0.02-2
 libdigest-hmac-perl==1.03+dfsg-2
 libdist-checkconflicts-perl==0.11-1
-libdistro-info-perl==0.21
+libdistro-info-perl==0.21+deb10u1
 libdjvulibre-text==3.5.27.1-10+deb10u1
 libdjvulibre21==3.5.27.1-10+deb10u1
 libdns-export1104==1:9.11.5.P4+dfsg-5.1+deb10u9
@@ -688,7 +688,7 @@ libjbig0==2.1-3.1+b2
 libjbig2dec0==0.16-1+deb10u1
 libjemalloc-dev==5.1.0-3
 libjemalloc2==5.1.0-3
-libjetty9-java==9.4.16-0+deb10u3
+libjetty9-java==9.4.50-4+deb10u1
 libjpeg62-turbo==1:1.5.2-2+deb10u1
 libjq1==1.5+dfsg-2+b1
 libjs-bootstrap==3.4.1+dfsg-1
@@ -1597,7 +1597,7 @@ python3-dbg==3.7.3-1
 python3-dbus==1.2.8-3
 python3-debian==0.1.35
 python3-dev==3.7.3-1
-python3-distro-info==0.21
+python3-distro-info==0.21+deb10u1
 python3-distutils==3.7.3-1
 python3-docutils==0.14+dfsg-4
 python3-entrypoints==0.3-1

diff --git a/files/build/versions/dockers/sonic-slave-buster/versions-py3 b/files/build/versions/dockers/sonic-slave-buster/versions-py3
@@ -11,7 +11,7 @@ cov-core==1.15.0
 coverage==4.5.2
 cryptography==2.6.1
 devscripts==2.19.5+deb10u1
-distro-info==0.21
+distro-info==0.21+deb10u1
 docutils==0.14
 entrypoints==0.3
 fastentrypoints==0.12