Merge branch '202106' of http://github.com/azure/sonic-buildimage int…

…o 202106

files/build/versions/build/build-sonic-slave-buster/versions-deb-buster

@@ -16,7 +16,6 @@ libnl-nf-3-200==3.5.0-1
 libnl-nf-3-dev==3.5.0-1
 libnl-route-3-200==3.5.0-1
 libnl-route-3-dev==3.5.0-1
-libsaibcm==5.0.0.12
 libsaimetadata==1.0.0
 libsaimetadata-dev==1.0.0
 libsairedis==1.0.0
@@ -36,7 +35,6 @@ libthrift-dev==0.11.0-4
 libyang==1.0.73
 libyang-cpp==1.0.73
 libyang-dev==1.0.73
-libyang1==1.0.184-2
 linux-headers-4.19.0-12-2-amd64==4.19.152-1
 linux-headers-4.19.0-12-2-common==4.19.152-1
 lldpd==1.0.4-1

files/build/versions/build/build-sonic-slave-buster/versions-py3

@@ -4,7 +4,7 @@ click==7.0
 click-log==0.4.0
 colorful==0.5.5
 dbus-python==1.3.2
-docker==6.0.1
+docker==6.1.2
 docker-image-py==0.1.12
 enlighten==1.11.2
 filelock==3.12.0

files/build/versions/build/build-sonic-slave-buster/versions-py3-all-arm64

@@ -3,6 +3,6 @@ jinja2==3.1.2
 lxml==4.6.3
 markupsafe==2.1.2
 redis==3.5.3
-requests==2.29.0
-urllib3==1.26.15
+requests==2.30.0
+urllib3==2.0.2
 zipp==1.2.0

files/build/versions/default/versions-docker

@@ -1,9 +1,9 @@
-amd64:amd64/debian:buster==sha256:2803ab27dfe4f2e23b58d351e80e8d433942b6fb830225e6d034098ed450a169
-amd64:debian:buster==sha256:173f0b19d2ac5ee17194dbe9a888a4a617dbf905ee666c9e780afad55eaf1d8c
+amd64:amd64/debian:buster==sha256:ebc58102f66492508f6d0f0c5164978afbe27f4a69bd3431ed8bb015c82a8b80
+amd64:debian:buster==sha256:cca6bcced970f7634197ff1821aabb452024eb437958ab98bfc146ece96969c6
 amd64:debian:stretch==sha256:c5c5200ff1e9c73ffbf188b4a67eb1c91531b644856b4aefe86a58d2f0cb05be
-arm64:arm64v8/debian:buster==sha256:55cd39723a057f730e9c33487fea9fe151bbe86dce51e92a73ccfd12206a1f43
-arm64:debian:buster==sha256:173f0b19d2ac5ee17194dbe9a888a4a617dbf905ee666c9e780afad55eaf1d8c
+arm64:arm64v8/debian:buster==sha256:4db99637cd48a7181532cbd61a0da9295ae135ac590f1948fea5cd7c9acfab0b
+arm64:debian:buster==sha256:cca6bcced970f7634197ff1821aabb452024eb437958ab98bfc146ece96969c6
 arm64:debian:stretch==sha256:c5c5200ff1e9c73ffbf188b4a67eb1c91531b644856b4aefe86a58d2f0cb05be
-armhf:arm32v7/debian:buster==sha256:3e45d273ad15d7b648212c8faa5e236f6fdc694af7272b8c4bd25a5d90c27fe1
-armhf:debian:buster==sha256:173f0b19d2ac5ee17194dbe9a888a4a617dbf905ee666c9e780afad55eaf1d8c
+armhf:arm32v7/debian:buster==sha256:9606bc9689ace2b3958d23babcf39a7bbcbebdc3ff99b9050014558273a95e4a
+armhf:debian:buster==sha256:cca6bcced970f7634197ff1821aabb452024eb437958ab98bfc146ece96969c6
 armhf:debian:stretch==sha256:c5c5200ff1e9c73ffbf188b4a67eb1c91531b644856b4aefe86a58d2f0cb05be

files/build/versions/default/versions-git

@@ -1,21 +1,20 @@
-https://chromium.googlesource.com/chromium/tools/depot_tools.git==1398e4fc6999ef6423626c782599e88bc7fcb5fb
+https://chromium.googlesource.com/chromium/tools/depot_tools.git==a1e578320b09a600894b6b11bc4e7d5f31627c6c
 https://github.com/aristanetworks/swi-tools.git==b5f087e4774168bf536360d43c9c509c8f14ad9f
 https://github.com/CESNET/libyang.git==9a4e5b2ce30b9696116d6e654ee55caab5aafed8
 https://github.com/daveolson53/libnss-tacplus.git==19008ab68d9d504aa58eb34d5f564755a1613b8b
-https://github.com/flashrom/flashrom.git==1776bb46ba6ea3d1ab2ec3f0cd88158aabed7400
-https://github.com/FreeRADIUS/freeradius-server.git==9c146d29e07513ace9db29d197c2596a47986552
+https://github.com/flashrom/flashrom.git==fe2eea4d16dd53a641e04f02ced79eb1e90aefb9
+https://github.com/FreeRADIUS/freeradius-server.git==00c5a858cc91827fdda20f0a0c75a66785e89ffc
 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==3f379dc8c48ebb77f074b0512d3dae1a5aa95111
 https://github.com/Mellanox/libpsample.git==62bb27d9a49424e45191eee81df7ce0d8c74e774
 https://github.com/p4lang/scapy-vxlan.git==85ffe83da156568ee47a0750f638227e6e1d7479
-https://github.com/sflow/host-sflow==71a250f56c6f101d6f3821827e5de19086f00b55
+https://github.com/sflow/host-sflow==74f819f9695975fa9746c3e61888646d58c34ded
 https://github.com/sflow/sflowtool==4ce1223bb4c2cd0cbb1dd688dc0914561fcbb6c4
 https://github.com/thom311/libnl==cbafad9ddf24caef5230fef715d34f0539603be0
 https://salsa.debian.org/debian/libteam.git==48142125234a665ad5367b724af36a58fb484d3d
-https://salsa.debian.org/dhcp-team/isc-dhcp.git==7a6f5a9d178439a56a8eb0cd4446329a8d5631ce
+https://salsa.debian.org/dhcp-team/isc-dhcp.git==1a94f4dc97f1c8bcaf848117eb4477ed1a987a93
 https://salsa.debian.org/kernel-team/ethtool/==68409b09a969b49a07fbf3930409f155b953434b
 https://salsa.debian.org/kernel-team/initramfs-tools.git==40e544e13611c1b2690eb99a8096fc16c1b9c74e
 https://salsa.debian.org/sk-guest/monit.git==c9da7ebb1f35dfba17b50b5969a6e75e29cbec0d

files/build/versions/default/versions-mirror

@@ -1,14 +1,14 @@
 deb.nodesource.com_node%5f10.x_dists_stretch==2021-04-06T21:05:39Z
 deb.nodesource.com_node%5f14.x_dists_buster==2023-02-17T00:35:28Z
-debian==20230502T000201Z
-debian-security==20230502T000201Z
-download.docker.com_linux_debian_dists_buster==2023-04-28T15:03:42Z
+debian==20230513T000158Z
+debian-security==20230513T000158Z
+download.docker.com_linux_debian_dists_buster==2023-05-12T20:59:25Z
 download.docker.com_linux_debian_dists_stretch==2021-02-01T21:46:06Z
 packages.microsoft.com_repos_sonic-dev_dists_jessie==2022-10-31T19:34:29Z
-packages.trafficmanager.net_snapshot_debian-security_20230502T000201Z_dists_buster_updates==2023-05-01T17:44:44Z
-packages.trafficmanager.net_snapshot_debian-security_20230502T000201Z_dists_stretch_updates==2023-02-18T04:22:44Z
-packages.trafficmanager.net_snapshot_debian_20230502T000201Z_dists_buster==2022-09-10T11:30:54Z
-packages.trafficmanager.net_snapshot_debian_20230502T000201Z_dists_buster-backports==2023-05-01T20:14:55Z
-packages.trafficmanager.net_snapshot_debian_20230502T000201Z_dists_buster-updates==2023-05-01T20:14:55Z
-packages.trafficmanager.net_snapshot_debian_20230502T000201Z_dists_stretch-backports==2023-03-30T14:20:42Z
-packages.trafficmanager.net_snapshot_debian_20230502T000201Z_dists_stretch-updates==2021-08-14T07:47:11Z
+packages.trafficmanager.net_snapshot_debian-security_20230513T000158Z_dists_buster_updates==2023-05-11T18:53:09Z
+packages.trafficmanager.net_snapshot_debian-security_20230513T000158Z_dists_stretch_updates==2023-02-18T04:22:44Z
+packages.trafficmanager.net_snapshot_debian_20230513T000158Z_dists_buster==2022-09-10T11:30:54Z
+packages.trafficmanager.net_snapshot_debian_20230513T000158Z_dists_buster-backports==2023-05-12T20:15:34Z
+packages.trafficmanager.net_snapshot_debian_20230513T000158Z_dists_buster-updates==2023-05-12T20:15:34Z
+packages.trafficmanager.net_snapshot_debian_20230513T000158Z_dists_stretch-backports==2023-03-30T14:20:42Z
+packages.trafficmanager.net_snapshot_debian_20230513T000158Z_dists_stretch-updates==2021-08-14T07:47:11Z

files/build/versions/default/versions-web

@@ -28,7 +28,6 @@ https://github.com/barefootnetworks/sonic-release-pkgs/raw/dev/bfnsdk_20210423_s
 https://github.com/CentecNetworks/sonic-binaries/raw/master/amd64/libsai_1.6.3-1_amd64.deb==e7a41e5cf06b44ae3ed615d553de40d3
 https://github.com/CentecNetworks/sonic-binaries/raw/master/arm64/sai/libsai_1.7.1-1_arm64.deb==33b9545529052c124595c097fb4ae7ef
 https://github.com/CumulusNetworks/ifupdown2/archive/1.2.8-1.tar.gz==12f45e90d23178e96cf70f68dc9455e6
-https://github.com/Marvell-switching/sonic-marvell-binaries/raw/master/armhf/sai-plugin/mrvllibsai_armhf_1.8.1-1.deb==2b30ad03659fc79ed183e3e0f3e590e4
 https://github.com/nanomsg/nanomsg/archive/1.0.0.tar.gz==6f56ef28c93cee644e8c4aaaef7cfb55
 https://raw.githubusercontent.com/p4lang/ptf/master/ptf_nn/ptf_nn_agent.py==628956b660575965429cec84b1778816
 https://repo1.maven.org/maven2/io/swagger/swagger-codegen-cli/2.4.5/swagger-codegen-cli-2.4.5.jar==219f1453ff22482d9e080effbfa7fa81

files/build/versions/dockers/docker-config-engine-buster/versions-py3

@@ -9,6 +9,6 @@ pyangbind==0.8.1
 pyyaml==5.4.1
 redis==3.5.3
 redis-dump-load==1.1
-regex==2022.10.31
+regex==2023.5.5
 six==1.16.0
 xmltodict==0.12.0

files/build/versions/dockers/docker-ptf/versions-py2

@@ -60,6 +60,7 @@ traitlets==4.3.3
 twisted==16.0.0
 typing==3.10.0.0
 unittest-xml-reporting==2.5.2
+unknown==0.0.0
 wcwidth==0.2.6
 werkzeug==1.0.1
 yabgp==0.8.2

files/build/versions/dockers/docker-snmp/versions-py3

@@ -1,4 +1,4 @@
-hiredis==2.2.2
+hiredis==2.2.3
 psutil==5.9.5
 python-arptable==0.0.2
 smbus==1.1.post2

files/build/versions/dockers/docker-sonic-mgmt-framework/versions-py3

@@ -4,8 +4,8 @@ charset-normalizer==3.1.0
 click==8.1.3
 clickclick==20.10.2
 connexion==2.7.0
-flask==2.2.4
-grpcio==1.54.0
+flask==2.2.5
+grpcio==1.54.2
 grpcio-tools==1.20.0
 idna==3.4
 importlib-metadata==6.6.0
@@ -19,10 +19,10 @@ openapi-schema-validator==0.4.4
 openapi-spec-validator==0.5.6
 pathable==0.4.3
 pkgutil_resolve_name==1.3.10
-protobuf==4.22.3
+protobuf==4.23.0
 pyrsistent==0.19.3
 python-dateutil==2.6.0
-requests==2.29.0
+requests==2.30.0
 rfc3339-validator==0.1.4
 six==1.11.0
 typing_extensions==4.5.0

files/build/versions/dockers/docker-sonic-vs/versions-py3

@@ -1,11 +1,11 @@
 blessed==1.20.0
-certifi==2022.12.7
+certifi==2023.5.7
 charset-normalizer==3.1.0
 click==7.0
 click-log==0.4.0
 colorful==0.5.5
 dbus-python==1.3.2
-docker==6.0.1
+docker==6.1.2
 docker-image-py==0.1.12
 enlighten==1.11.2
 filelock==3.12.0
@@ -25,12 +25,12 @@ pygments==2.15.1
 pygobject==3.44.1
 pyparsing==3.0.9
 pyroute2==0.5.14
-requests==2.29.0
+requests==2.30.0
 scapy==2.4.4
 semantic-version==2.10.0
 tabulate==0.8.2
 toposort==1.6
-urllib3==1.26.15
+urllib3==2.0.2
 wcwidth==0.2.6
 websocket-client==1.5.1
 www-authenticate==0.9.2

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

@@ -50,7 +50,7 @@ cmake==3.13.4-1
 cmake-data==3.13.4-1
 cmocka-doc==1.1.3-1
 comerr-dev==2.1-1.44.5-1+deb10u3
-containerd.io==1.6.20-1
+containerd.io==1.6.21-1
 cowbuilder==0.88
 cowdancer==0.88
 cpio==2.12+dfsg-9
@@ -264,9 +264,9 @@ libaudio2==1.9.4-6
 libaudit-dev==1:2.8.4-3
 libaugeas0==1.11.0-3
 libauthen-sasl-perl==2.1600-1
-libavahi-client3==0.7-4+deb10u1
-libavahi-common-data==0.7-4+deb10u1
-libavahi-common3==0.7-4+deb10u1
+libavahi-client3==0.7-4+deb10u2
+libavahi-common-data==0.7-4+deb10u2
+libavahi-common3==0.7-4+deb10u2
 libavalon-framework-java==4.2.0-10
 libavc1394-0==0.5.4-5
 libavcodec58==7:4.1.10-0+deb10u1
@@ -1315,9 +1315,9 @@ libzzip-0-13==0.13.62-3.2+deb10u1
 licensecheck==3.0.31-3
 lintian==2.15.0
 linux-compiler-gcc-8-x86==4.19.282-1
-linux-headers-4.19.0-23-amd64==4.19.269-1
-linux-headers-4.19.0-23-common==4.19.269-1
-linux-headers-amd64==4.19+105+deb10u18
+linux-headers-4.19.0-24-amd64==4.19.282-1
+linux-headers-4.19.0-24-common==4.19.282-1
+linux-headers-amd64==4.19+105+deb10u19
 linux-kbuild-4.19==4.19.282-1
 linux-libc-dev==4.19.282-1
 linuxdoc-tools==0.9.73-2

files/build/versions/dockers/sonic-slave-buster/versions-py3

@@ -63,8 +63,8 @@ python-magic==0.4.16
 pytz==2019.1
 pyxdg==0.25
 pyyaml==5.4.1
-redis==4.5.4
-regex==2022.10.31
+redis==4.5.5
+regex==2023.5.5
 requests==2.21.0
 roman==2.0.0
 secretstorage==2.3.1

files/build/versions/host-image/versions-deb-buster

@@ -14,7 +14,7 @@ bzip2==1.0.6-9.2~deb10u2
 ca-certificates==20200601~deb10u2
 cgroup-tools==0.41-8.1
 conntrack==1:1.4.5-2
-containerd.io==1.6.20-1
+containerd.io==1.6.21-1
 cpio==2.12+dfsg-9
 cpp==4:8.3.0-1
 cpp-8==8.3.0-6
@@ -378,7 +378,7 @@ systemd-timesyncd==247.3-6~bpo10+1
 tcpdump==4.9.3-1~deb10u2
 tcptraceroute==1.5beta7+debian-4+b2
 traceroute==1:2.1.0-2
-tzdata==2021a-0+deb10u10
+tzdata==2021a-0+deb10u11
 u-boot-tools==2019.01+dfsg-7
 ucf==3.0038+nmu1
 udev==247.3-6~bpo10+1

files/build/versions/host-image/versions-py3

@@ -3,15 +3,15 @@ azure-nspkg==3.0.2
 azure-storage==0.36.0
 bitarray==1.5.3
 blessed==1.20.0
-certifi==2022.12.7
+certifi==2023.5.7
 cffi==1.15.1
 charset-normalizer==3.1.0
 click==7.0
 click-log==0.4.0
 colorful==0.5.5
 cryptography==40.0.2
 dbus-python==1.2.18
-docker==5.0.3
+docker==6.1.1
 docker-image-py==0.1.12
 enlighten==1.11.2
 filelock==3.12.0
@@ -30,6 +30,7 @@ markupsafe==2.1.2
 natsort==6.2.1
 netaddr==0.8.0
 netifaces==0.11.0
+packaging==23.1
 pathtools==0.1.2
 pexpect==4.8.0
 prefixed==0.7.0
@@ -46,15 +47,15 @@ pyroute2==0.5.19
 python-dateutil==2.8.2
 pyyaml==5.4.1
 redis==3.5.3
-regex==2022.10.31
-requests==2.29.0
+regex==2023.5.5
+requests==2.30.0
 scapy==2.4.4
 semantic-version==2.10.0
 six==1.16.0
 tabulate==0.8.2
 thrift==0.13.0
 toposort==1.6
-urllib3==1.26.15
+urllib3==2.0.2
 watchdog==0.10.3
 wcwidth==0.2.6
 websocket-client==1.5.1