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

[code sync] Merge code from sonic-net/sonic-buildimage:202205 to 202205

files/build/versions/default/versions-docker

@@ -1,12 +1,12 @@
-amd64:amd64/debian:bullseye==sha256:1bf0e24813ee8306c3fba1fe074793eb91c15ee580b61fff7f3f41662bc0031d
-amd64:amd64/debian:buster==sha256:a067a9e8b39d5f19659b3bc9fd4348f6319afabd0d6ba1fe3b43df108926ea92
-amd64:debian:bullseye==sha256:432f545c6ba13b79e2681f4cc4858788b0ab099fc1cca799cc0fae4687c69070
-amd64:debian:buster==sha256:322859539526a04978dee1a2575b515295f6706f17d280f877a634299a7c1414
-arm64:arm64v8/debian:bullseye==sha256:0d1881fd981442bd6721e0e4ff40eb0ba705475c3a8469482ccee9029af56ebf
-arm64:arm64v8/debian:buster==sha256:62a3eb2f5ace2f8415171855a84375616cb3cdb60b799d1811c3fda923b8dfbc
-arm64:debian:bullseye==sha256:432f545c6ba13b79e2681f4cc4858788b0ab099fc1cca799cc0fae4687c69070
-arm64:debian:buster==sha256:322859539526a04978dee1a2575b515295f6706f17d280f877a634299a7c1414
-armhf:arm32v7/debian:bullseye==sha256:16aa677e45937a8c9f2e5a932ff1a611bc85b6416e47ab66532e05af2c08e066
-armhf:arm32v7/debian:buster==sha256:5340ee96c308b59f4590ec929adeeaf61ffe5a0758adcba09d0595a6619c3462
-armhf:debian:bullseye==sha256:432f545c6ba13b79e2681f4cc4858788b0ab099fc1cca799cc0fae4687c69070
-armhf:debian:buster==sha256:322859539526a04978dee1a2575b515295f6706f17d280f877a634299a7c1414
+amd64:amd64/debian:bullseye==sha256:1e8185ca8683c04e6c23cc7bb21b564d54faeb7e20852a6068c85cbdd7bac531
+amd64:amd64/debian:buster==sha256:108052254277ea53cd807d2782ed3cbe4b9242256af5c7519c6e5692ae2b5d97
+amd64:debian:bullseye==sha256:1e5f2d70c9441c971607727f56d0776fb9eecf23cd37b595b26db7a974b2301d
+amd64:debian:buster==sha256:28842e4895d36e67c49015c0b41089fa3248e865c76994b19f706ab91e800b95
+arm64:arm64v8/debian:bullseye==sha256:0f56dd5a1687619972eeb539b273b4f3ec04431db69d4b569c2ce6ef48478538
+arm64:arm64v8/debian:buster==sha256:25bb297f257d6422b3aa44891469abc07e63096ea721da57002f0297ddcc599c
+arm64:debian:bullseye==sha256:1e5f2d70c9441c971607727f56d0776fb9eecf23cd37b595b26db7a974b2301d
+arm64:debian:buster==sha256:28842e4895d36e67c49015c0b41089fa3248e865c76994b19f706ab91e800b95
+armhf:arm32v7/debian:bullseye==sha256:93effc32fdca33aebfcef7225219dde573daebd3e1ddd09ab21e635887271096
+armhf:arm32v7/debian:buster==sha256:626ee3ce3a78f7a900fc5a99bfdbb44297f1c943a4fe261de4ec3fb4a23266bd
+armhf:debian:bullseye==sha256:1e5f2d70c9441c971607727f56d0776fb9eecf23cd37b595b26db7a974b2301d
+armhf:debian:buster==sha256:28842e4895d36e67c49015c0b41089fa3248e865c76994b19f706ab91e800b95

files/build/versions/default/versions-git

@@ -1,24 +1,24 @@
-https://chromium.googlesource.com/chromium/tools/depot_tools.git==df2f11113c23d65c1fd7824b7ab3c55f7cfb9604
+https://chromium.googlesource.com/chromium/tools/depot_tools.git==522e12caff136406943edbf7c025821681c05749
 https://github.com/aristanetworks/swi-tools.git==b5f087e4774168bf536360d43c9c509c8f14ad9f
 https://github.com/CESNET/libyang.git==ea94c8b9f513f8a6ddc6ce1540fa41eaf4c8922a
 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==c7812231bd5c69956ef8d97315e8e2f306d1c550
-https://github.com/FreeRADIUS/freeradius-server.git==fe2ea7b89312774ce007a2fdc0da27fd41f29a89
+https://github.com/flashrom/flashrom.git==885f7923265e4e48f4bfc109f3723bb9167b75bc
+https://github.com/FreeRADIUS/freeradius-server.git==7832608debf040d46117012a547475ae79c99c8d
 https://github.com/FreeRADIUS/pam_radius.git==8d373539bb9f13b0abfe8bcae0095a930a00fad0
 https://github.com/jeroennijhof/pam_tacplus.git==4284d9016e64def2bb81d5f50f96dc3b59bfdc39
 https://github.com/jpirko/libteam.git==61e27812c1074a865d7e1a778c0ce442837c28d7
 https://github.com/lguohan/gnxi.git==f2b11e45b16ab13485ae14933f30c18ee6336499
-https://github.com/Marvell-switching/mrvl-prestera.git==9dbae444204a2c27b33be698ce497d55926b8893
+https://github.com/Marvell-switching/mrvl-prestera.git==179c08b0544db0b3a95a843e31266e00a68fb4b0
 https://github.com/Mellanox/libpsample.git==62bb27d9a49424e45191eee81df7ce0d8c74e774
-https://github.com/opencomputeproject/SAI.git==fdaf928679dfa53ae21690f963b9b1f80032f2bf
+https://github.com/opencomputeproject/SAI.git==e06d81e955ef7be957226f80ba98363b61595dfc
 https://github.com/p4lang/scapy-vxlan.git==85ffe83da156568ee47a0750f638227e6e1d7479
-https://github.com/sflow/host-sflow==b9b61bc037aed4d3d0fac6b0b4d88bc78b7b485d
+https://github.com/sflow/host-sflow==4dc68a95fa57758119d76e42965b32493ffd7094
 https://github.com/sflow/sflowtool==4ce1223bb4c2cd0cbb1dd688dc0914561fcbb6c4
 https://github.com/thom311/libnl==cbafad9ddf24caef5230fef715d34f0539603be0
 https://salsa.debian.org/debian/libteam.git==48142125234a665ad5367b724af36a58fb484d3d
-https://salsa.debian.org/kernel-team/ethtool/==532e36ef02837c78df47f8d561aa04b5cfed438f
+https://salsa.debian.org/kernel-team/ethtool/==581ffbde5b349852a56fa581f7b512a755c33e26
 https://salsa.debian.org/kernel-team/initramfs-tools.git==193dfbb7929e518976f89f6c8dd9201982e56f80
 https://salsa.debian.org/sk-guest/monit.git==c9da7ebb1f35dfba17b50b5969a6e75e29cbec0d
-https://salsa.debian.org/ssh-team/openssh.git==4cb9ac54235e8f90a590a976e1404480fb521930
+https://salsa.debian.org/ssh-team/openssh.git==74d15e80b8730335a9b13469ca6cafe4c1c8e485

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==20230604T000128Z
-debian-security==20230604T000129Z
-download.docker.com_linux_debian_dists_bullseye==2023-05-26T07:49:37Z
+debian==20230620T000414Z
+debian-security==20230620T000233Z
+download.docker.com_linux_debian_dists_bullseye==2023-06-09T17:17:20Z
 download.docker.com_linux_debian_dists_buster==2023-05-26T07:49:38Z
 packages.microsoft.com_repos_sonic-dev_dists_jessie==2022-10-31T19:34:29Z
-packages.trafficmanager.net_snapshot_debian-security_20230604T000129Z_dists_bullseye-security==2023-06-03T16:23:43Z
-packages.trafficmanager.net_snapshot_debian-security_20230604T000129Z_dists_buster_updates==2023-06-03T16:23:43Z
-packages.trafficmanager.net_snapshot_debian_20230604T000128Z_dists_bullseye==2023-04-29T09:31:02Z
-packages.trafficmanager.net_snapshot_debian_20230604T000128Z_dists_bullseye-backports==2023-06-03T20:10:57Z
-packages.trafficmanager.net_snapshot_debian_20230604T000128Z_dists_bullseye-updates==2023-06-03T20:10:57Z
-packages.trafficmanager.net_snapshot_debian_20230604T000128Z_dists_buster==2022-09-10T11:30:54Z
-packages.trafficmanager.net_snapshot_debian_20230604T000128Z_dists_buster-backports==2023-06-03T20:10:57Z
-packages.trafficmanager.net_snapshot_debian_20230604T000128Z_dists_buster-updates==2023-06-03T20:10:57Z
+packages.trafficmanager.net_snapshot_debian-security_20230620T000233Z_dists_bullseye-security==2023-06-19T23:23:18Z
+packages.trafficmanager.net_snapshot_debian-security_20230620T000233Z_dists_buster_updates==2023-06-19T23:23:18Z
+packages.trafficmanager.net_snapshot_debian_20230620T000414Z_dists_bullseye==2023-06-10T08:52:21Z
+packages.trafficmanager.net_snapshot_debian_20230620T000414Z_dists_bullseye-backports==2023-06-19T20:13:05Z
+packages.trafficmanager.net_snapshot_debian_20230620T000414Z_dists_bullseye-updates==2023-06-19T20:13:05Z
+packages.trafficmanager.net_snapshot_debian_20230620T000414Z_dists_buster==2023-06-10T08:53:33Z
+packages.trafficmanager.net_snapshot_debian_20230620T000414Z_dists_buster-backports==2023-06-19T20:13:05Z
+packages.trafficmanager.net_snapshot_debian_20230620T000414Z_dists_buster-updates==2023-06-10T08:55:10Z

files/build/versions/default/versions-web

@@ -72,7 +72,7 @@ https://github.com/nanomsg/nanomsg/archive/1.0.0.tar.gz==6f56ef28c93cee644e8c4aa
 https://launchpad.net/debian/+archive/primary/+sourcefiles/bash/5.1-2/bash_5.1-2.debian.tar.xz==9d0cbd5f463f461c840c95f62a64d61b
 https://launchpad.net/debian/+archive/primary/+sourcefiles/bash/5.1-2/bash_5.1-2.dsc==be44c5a9fc12fb567a486f54b842dd9e
 https://launchpad.net/debian/+archive/primary/+sourcefiles/bash/5.1-2/bash_5.1.orig.tar.xz==6ddb13b6111f601db08fc7c72afa0263
-https://raw.githubusercontent.com/p4lang/ptf/master/ptf_nn/ptf_nn_agent.py==628956b660575965429cec84b1778816
+https://raw.githubusercontent.com/p4lang/ptf/master/ptf_nn/ptf_nn_agent.py==963c345c75fe5c5bdedc05ed98a5fd1f
 https://repo1.maven.org/maven2/io/swagger/swagger-codegen-cli/2.4.5/swagger-codegen-cli-2.4.5.jar==219f1453ff22482d9e080effbfa7fa81
 https://sonicstorage.blob.core.windows.net/debian-security/pool/updates/main/l/linux/linux_5.10.140-1.debian.tar.xz==9813a002af43da3a5be05f3d31e85328
 https://sonicstorage.blob.core.windows.net/debian-security/pool/updates/main/l/linux/linux_5.10.140-1.dsc==84ab224b073f97978802d9f998248fcc

files/build/versions/dockers/docker-base-bullseye/versions-deb-bullseye

@@ -48,7 +48,6 @@ libsodium23==1.0.18-1
 libsqlite3-0==3.34.1-3
 libssh2-1==1.9.0-2
 libssl-dev==1.1.1n-0+deb11u4+fips
-libssl1.1==1.1.1n-0+deb11u4+fips
 libwrap0==7.6.q-31
 libxtables12==1.8.7-1
 libzmq5==4.3.4-1

files/build/versions/dockers/docker-base-buster/versions-deb-buster

@@ -42,15 +42,15 @@ libsasl2-modules-db==2.1.27+dfsg-1+deb10u2
 libsodium23==1.0.17-1
 libsqlite3-0==3.27.2-3+deb10u2
 libssh2-1==1.8.0-2.1
-libssl1.1==1.1.1n-0+deb10u4
+libssl1.1==1.1.1n-0+deb10u5
 libwrap0==7.6.q-28
 libzmq5==4.3.1-4+deb10u2
 lsb-base==10.2019051400
 lua-bitop==1.0.2-5
 lua-cjson==2.1.0+dfsg-2.1
 mime-support==3.62
 net-tools==1.60+git20180626.aebd88e-1
-openssl==1.1.1n-0+deb10u4
+openssl==1.1.1n-0+deb10u5
 perl==5.28.1-6+deb10u1
 perl-modules-5.28==5.28.1-6+deb10u1
 procps==2:3.3.15-2
@@ -66,6 +66,6 @@ readline-common==7.0-5
 redis-tools==5:6.0.6-1~bpo10+1
 rsyslog==8.1901.0-1+deb10u2
 socat==1.7.4.1-3
-vim-common==2:8.1.0875-5+deb10u4
-vim-tiny==2:8.1.0875-5+deb10u4
-xxd==2:8.1.0875-5+deb10u4
+vim-common==2:8.1.0875-5+deb10u5
+vim-tiny==2:8.1.0875-5+deb10u5
+xxd==2:8.1.0875-5+deb10u5

files/build/versions/dockers/docker-fpm-frr/versions-deb-bullseye

@@ -7,7 +7,7 @@ gdb==10.1-1.7
 gdbserver==10.1-1.7
 libbabeltrace1==1.5.8-1+b3
 libboost-regex1.74.0==1.74.0-9
-libc-ares2==1.17.1-1+deb11u2
+libc-ares2==1.17.1-1+deb11u3
 libcbor0==0.5.0+dfsg-2
 libcurl3-gnutls==7.74.0-1.3+deb11u7
 libdebuginfod1==0.183-1

files/build/versions/dockers/docker-nat/versions-deb-buster

@@ -24,5 +24,5 @@ openssh-client==1:7.9p1-10+deb10u2
 sshpass==1.06-1
 strace==4.26-0.2
 swss-dbg==1.0.0
-vim==2:8.1.0875-5+deb10u4
-vim-runtime==2:8.1.0875-5+deb10u4
+vim==2:8.1.0875-5+deb10u5
+vim-runtime==2:8.1.0875-5+deb10u5

files/build/versions/dockers/docker-ptf/versions-deb-buster

@@ -285,8 +285,8 @@ libsigsegv2==2.12-2
 libsm6==2:1.2.3-1
 libsqlite3-0==3.27.2-3+deb10u2
 libssh2-1==1.8.0-2.1
-libssl-dev==1.1.1n-0+deb10u4
-libssl1.1==1.1.1n-0+deb10u4
+libssl-dev==1.1.1n-0+deb10u5
+libssl1.1==1.1.1n-0+deb10u5
 libstdc++-8-dev==8.3.0-6
 libsynctex2==2018.20181218.49446-1+deb10u2
 libsystemd0==241-7~deb10u9
@@ -355,7 +355,7 @@ libxml-xpathengine-perl==0.14-1
 libxml2==2.9.4+dfsg1-7+deb10u6
 libxmu6==2:1.1.2-2+b3
 libxmuu1==2:1.1.2-2+b3
-libxpm4==1:3.5.12-1
+libxpm4==1:3.5.12-1+deb10u1
 libxrandr2==2:1.5.1-1
 libxrender1==1:0.9.10-1
 libxshmfence1==1.3-1
@@ -388,7 +388,7 @@ ntpstat==0.0.0.1-2
 openssh-client==1:7.9p1-10+deb10u2
 openssh-server==1:7.9p1-10+deb10u2
 openssh-sftp-server==1:7.9p1-10+deb10u2
-openssl==1.1.1n-0+deb10u4
+openssl==1.1.1n-0+deb10u5
 patch==2.7.6-3+deb10u1
 perl==5.28.1-6+deb10u1
 perl-modules-5.28==5.28.1-6+deb10u1
@@ -487,9 +487,9 @@ ttf-bitstream-vera==1.10-8
 tzdata==2021a-0+deb10u11
 ucf==3.0038+nmu1
 unzip==6.0-23+deb10u3
-vim==2:8.1.0875-5+deb10u4
-vim-common==2:8.1.0875-5+deb10u4
-vim-runtime==2:8.1.0875-5+deb10u4
+vim==2:8.1.0875-5+deb10u5
+vim-common==2:8.1.0875-5+deb10u5
+vim-runtime==2:8.1.0875-5+deb10u5
 wget==1.20.1-1.1
 x11-common==1:7.7+19
 x11-utils==7.7+4
@@ -499,6 +499,6 @@ xdg-user-dirs==0.17-2
 xdg-utils==1.1.3-1+deb10u1
 xfonts-encodings==1:1.0.4-2
 xfonts-utils==1:7.7+6
-xxd==2:8.1.0875-5+deb10u4
+xxd==2:8.1.0875-5+deb10u5
 xz-utils==5.2.4-1+deb10u1
 zlib1g==1:1.2.11.dfsg-1+deb10u2

files/build/versions/dockers/docker-sflow/versions-deb-buster

@@ -18,5 +18,5 @@ psample==1.1-1
 sflowtool==5.04
 sshpass==1.06-1
 strace==4.26-0.2
-vim==2:8.1.0875-5+deb10u4
-vim-runtime==2:8.1.0875-5+deb10u4
+vim==2:8.1.0875-5+deb10u5
+vim-runtime==2:8.1.0875-5+deb10u5

files/build/versions/dockers/docker-sonic-mgmt-framework/versions-deb-buster

@@ -55,5 +55,5 @@ sonic-mgmt-framework==1.0-01
 sonic-mgmt-framework-dbg==1.0-01
 sshpass==1.06-1
 strace==4.26-0.2
-vim==2:8.1.0875-5+deb10u4
-vim-runtime==2:8.1.0875-5+deb10u4
+vim==2:8.1.0875-5+deb10u5
+vim-runtime==2:8.1.0875-5+deb10u5

files/build/versions/dockers/docker-sonic-vs/versions-deb-buster

@@ -138,7 +138,7 @@ libselinux1-dev==2.8-1+b1
 libsepol1-dev==2.8-1
 libsm-dev==2:1.2.3-1
 libsm6==2:1.2.3-1
-libssl-dev==1.1.1n-0+deb10u4
+libssl-dev==1.1.1n-0+deb10u5
 libstdc++-8-dev==8.3.0-6
 libsystemd-dev==241-7~deb10u9
 libsystemd0==241-7~deb10u9

files/build/versions/dockers/docker-syncd-bfn-rpc/versions-deb-buster

@@ -44,7 +44,7 @@ libqt5dbus5==5.11.3+dfsg1-1+deb10u5
 libqt5network5==5.11.3+dfsg1-1+deb10u5
 libquadmath0==8.3.0-6
 librhash0==1.3.8-1
-libssl-dev==1.1.1n-0+deb10u4
+libssl-dev==1.1.1n-0+deb10u5
 libstdc++-8-dev==8.3.0-6
 libthrift0==0.14.1
 libtsan0==8.3.0-6

files/build/versions/dockers/docker-syncd-centec-rpc/versions-deb-buster

@@ -49,7 +49,7 @@ libqt5dbus5==5.11.3+dfsg1-1+deb10u5
 libqt5network5==5.11.3+dfsg1-1+deb10u5
 libquadmath0==8.3.0-6
 librhash0==1.3.8-1
-libssl-dev==1.1.1n-0+deb10u4
+libssl-dev==1.1.1n-0+deb10u5
 libstdc++-8-dev==8.3.0-6
 libthrift-0.11.0==0.11.0-4
 libtsan0==8.3.0-6

files/build/versions/dockers/docker-syncd-centec/versions-deb-buster

@@ -21,5 +21,5 @@ openssh-client==1:7.9p1-10+deb10u2
 sshpass==1.06-1
 strace==4.26-0.2
 syncd==1.0.0
-vim==2:8.1.0875-5+deb10u4
-vim-runtime==2:8.1.0875-5+deb10u4
+vim==2:8.1.0875-5+deb10u5
+vim-runtime==2:8.1.0875-5+deb10u5

files/build/versions/dockers/docker-syncd-vs/versions-deb-buster

@@ -25,5 +25,5 @@ sshpass==1.06-1
 strace==4.26-0.2
 syncd-vs==1.0.0
 syncd-vs-dbg==1.0.0
-vim==2:8.1.0875-5+deb10u4
-vim-runtime==2:8.1.0875-5+deb10u4
+vim==2:8.1.0875-5+deb10u5
+vim-runtime==2:8.1.0875-5+deb10u5

files/build/versions/dockers/sonic-slave-bullseye/versions-deb-bullseye

@@ -355,8 +355,8 @@ libbsd-dev==0.11.3-1
 libbsd0==0.11.3-1
 libbsh-java==2.0b4-20
 libbz2-dev==1.0.8-4
-libc-ares-dev==1.17.1-1+deb11u2
-libc-ares2==1.17.1-1+deb11u2
+libc-ares-dev==1.17.1-1+deb11u3
+libc-ares2==1.17.1-1+deb11u3
 libc-dev-bin==2.31-13+deb11u6
 libc-devtools==2.31-13+deb11u6
 libc-l10n==2.31-13+deb11u6
@@ -1105,7 +1105,6 @@ libsrt1.4-gnutls==1.4.2-1.3
 libssh-gcrypt-4==0.9.7-0+deb11u1
 libssh2-1==1.9.0-2
 libssl-dev==1.1.1n-0+deb11u5
-libssl1.1==1.1.1n-0+deb11u5
 libstdc++-10-dev==10.2.1-6
 libstemmer0d==2.1.0-1
 libstrictures-perl==2.000006-1
@@ -1460,13 +1459,13 @@ php-timer==5.0.3-2
 php-tokenizer==1.2.0-1
 php-webmozart-assert==1.9.1-2
 php-xml==2:7.4+76
-php7.4-cli==7.4.33-1+deb11u3
-php7.4-common==7.4.33-1+deb11u3
-php7.4-json==7.4.33-1+deb11u3
-php7.4-mbstring==7.4.33-1+deb11u3
-php7.4-opcache==7.4.33-1+deb11u3
-php7.4-readline==7.4.33-1+deb11u3
-php7.4-xml==7.4.33-1+deb11u3
+php7.4-cli==7.4.33-1+deb11u4
+php7.4-common==7.4.33-1+deb11u4
+php7.4-json==7.4.33-1+deb11u4
+php7.4-mbstring==7.4.33-1+deb11u4
+php7.4-opcache==7.4.33-1+deb11u4
+php7.4-readline==7.4.33-1+deb11u4
+php7.4-xml==7.4.33-1+deb11u4
 phpunit==9.5.2-1
 phpunit-cli-parser==1.0.1-1
 phpunit-code-unit==1.0.8-1