Skip to content

Commit a0d53dc

Browse files
qiluo-msftqiluo-msft
committed
Merged PR 7731268: Manually merge github/202012 to internal-202012 branch
Change history commit ``` cc17c7a 2023-02-26 | [ci/build]: Upgrade SONiC package versions (sonic-net#13992) [mssonicbld] ``` To prevent secret scan alert. Related work items: #17429052
2 parents 0b87b53 + fd8db09 commit a0d53dc

File tree

14 files changed

+211
-70
lines changed

14 files changed

+211
-70
lines changed

‎device/celestica/x86_64-cel_seastone-r0/sonic_platform/sfp.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -1520,7 +1520,7 @@ def get_power_override(self):
15201520
if dom_control_raw is not None:
15211521
dom_control_data = sfpd_obj.parse_control_bytes(
15221522
dom_control_raw, 0)
1523-
return ('On' == dom_control_data['data']['PowerOverride'])
1523+
return ('On' == dom_control_data['data']['PowerOverride']['value'])
15241524
else:
15251525
return False
15261526
else:

‎dockers/docker-sonic-telemetry/critical_processes

-1
Original file line numberDiff line numberDiff line change
@@ -1,2 +1 @@
11
program:telemetry
2-
program:dialout

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

+2-2
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ innovium-sai==0.107.7
55
innovium-sai-headers==0.107.7
66
iproute2-dev==1.mlnx.4.5.3196
77
isc-dhcp-relay==4.4.1-2
8-
kernel-mft-dkms==4.18.0-106
8+
kernel-mft-dkms==4.21.0-100
99
libhiredis-dev==0.14.0-3~bpo9+1
1010
libhiredis0.14==0.14.0-3~bpo9+1
1111
libnl-cli-3-200==3.5.0-1
@@ -40,7 +40,7 @@ linux-headers-4.19.0-12-2-amd64==4.19.152-1
4040
linux-headers-4.19.0-12-2-common==4.19.152-1
4141
lldpd==1.0.4-1
4242
lm-sensors==1:3.5.0-3
43-
mft==4.18.0-106
43+
mft==4.21.0-100
4444
python-swsscommon==1.0.0
4545
python-thrift==0.11.0-4
4646
python2-yang==1.0.73

‎files/build/versions/build/build-sonic-slave-buster/versions-git

+3-3
Original file line numberDiff line numberDiff line change
@@ -3,12 +3,12 @@ https://github.com/daveolson53/libnss-tacplus.git==19008ab68d9d504aa58eb34d5f564
33
https://github.com/jeroennijhof/pam_tacplus.git==7908a7faa0205beda9ea198bdd3aa37868be6da2
44
https://github.com/jpirko/libteam.git==61e27812c1074a865d7e1a778c0ce442837c28d7
55
https://github.com/Mellanox/libpsample.git==62bb27d9a49424e45191eee81df7ce0d8c74e774
6-
https://github.com/sflow/host-sflow==e026e2b57f3c7736a75cd1278f7867fb5e5006ee
6+
https://github.com/sflow/host-sflow==b7d12c7fe18f2c4b2377f1b34c1e848d1a5ea16c
77
https://github.com/sflow/sflowtool==8c914e79ecb7930adcba2e5296041c3f9eb8e450
88
https://github.com/thom311/libnl==cbafad9ddf24caef5230fef715d34f0539603be0
99
https://salsa.debian.org/debian/libteam.git==48142125234a665ad5367b724af36a58fb484d3d
10-
https://salsa.debian.org/dhcp-team/isc-dhcp.git==1dca6def2766980a46540dd2d6c6765142966d9f
10+
https://salsa.debian.org/dhcp-team/isc-dhcp.git==7a6f5a9d178439a56a8eb0cd4446329a8d5631ce
1111
https://salsa.debian.org/kernel-team/ethtool/==b24474c5f4cad2bb690ced33a3c7df397170a699
1212
https://salsa.debian.org/kernel-team/initramfs-tools.git==40e544e13611c1b2690eb99a8096fc16c1b9c74e
1313
https://salsa.debian.org/sk-guest/monit.git==c9da7ebb1f35dfba17b50b5969a6e75e29cbec0d
14-
https://salsa.debian.org/ssh-team/openssh.git==48770216530d8a0a57f5f1d7cc60addd67d1b549
14+
https://salsa.debian.org/ssh-team/openssh.git==48770216530d8a0a57f5f1d7cc60addd67d1b549

‎files/build/versions/default/versions-docker

+7-7
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
1-
amd64:amd64/debian:buster==sha256:b589ffbcc03bb272c9e0c0e699aedb2271a1ca65b2a3447057cbfd80d9eff9bf
1+
amd64:amd64/debian:buster==sha256:c75d609d1d06a44ac87c52e9afe4102af856dd1c075f316b4d219f072af0b3b1
22
amd64:amd64/debian:stretch==sha256:16ee3e11da473f6565ef94a715f1a38b3079e0664913be78869c336a71cb6085
3-
amd64:debian:buster==sha256:233c3bbc892229c82da7231980d50adceba4db56a08c0b7053a4852782703459
3+
amd64:debian:buster==sha256:2d356e1e22c0902f88ef65cb7159ecd5a96feb62345747edfd4324b0d83a2923
44
amd64:debian:stretch==sha256:c5c5200ff1e9c73ffbf188b4a67eb1c91531b644856b4aefe86a58d2f0cb05be
5-
arm64:arm64v8/debian:buster==sha256:88d3e537769c4ef5bc7961ad5460739dacb29d266d178e6f9befbe900afeb9b9
6-
arm64:debian:buster==sha256:233c3bbc892229c82da7231980d50adceba4db56a08c0b7053a4852782703459
5+
arm64:arm64v8/debian:buster==sha256:0100d882223b08bc979db07977fd493163c545abcac553086bba75a96aebe0bd
6+
arm64:debian:buster==sha256:2d356e1e22c0902f88ef65cb7159ecd5a96feb62345747edfd4324b0d83a2923
77
arm64:debian:stretch==sha256:c5c5200ff1e9c73ffbf188b4a67eb1c91531b644856b4aefe86a58d2f0cb05be
8-
armhf:arm32v7/debian:buster==sha256:d0a16ffa3bc4302a306263e5abffe04d0340ea964e0e037afef17a3e9765b48a
9-
armhf:debian:buster==sha256:233c3bbc892229c82da7231980d50adceba4db56a08c0b7053a4852782703459
10-
armhf:debian:stretch==sha256:c5c5200ff1e9c73ffbf188b4a67eb1c91531b644856b4aefe86a58d2f0cb05be
8+
armhf:arm32v7/debian:buster==sha256:43b845d5864322e89773a602535f5db85debe3356e50488c63dd99bf2cc16899
9+
armhf:debian:buster==sha256:2d356e1e22c0902f88ef65cb7159ecd5a96feb62345747edfd4324b0d83a2923
10+
armhf:debian:stretch==sha256:c5c5200ff1e9c73ffbf188b4a67eb1c91531b644856b4aefe86a58d2f0cb05be

‎files/build/versions/default/versions-git

+4-4
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
https://chromium.googlesource.com/chromium/tools/depot_tools.git==9144b67c7f037577516ebdfe220997560bd01e14
1+
https://chromium.googlesource.com/chromium/tools/depot_tools.git==c962e86f7bafddfc582922dec44cf7a843228abb
22
https://github.com/aristanetworks/swi-tools.git==b5f087e4774168bf536360d43c9c509c8f14ad9f
33
https://github.com/CESNET/libyang.git==d57c8888922d1663508ad0f0a5b66f8ad600276d
44
https://github.com/daveolson53/libnss-tacplus.git==19008ab68d9d504aa58eb34d5f564755a1613b8b
@@ -9,12 +9,12 @@ https://github.com/lguohan/gnxi.git==f2b11e45b16ab13485ae14933f30c18ee6336499
99
https://github.com/Marvell-switching/mrvl-prestera.git==21a100e01b2ab00229da35dd178d9b294c66303f
1010
https://github.com/Mellanox/libpsample.git==62bb27d9a49424e45191eee81df7ce0d8c74e774
1111
https://github.com/p4lang/scapy-vxlan.git==85ffe83da156568ee47a0750f638227e6e1d7479
12-
https://github.com/sflow/host-sflow==e026e2b57f3c7736a75cd1278f7867fb5e5006ee
12+
https://github.com/sflow/host-sflow==b7d12c7fe18f2c4b2377f1b34c1e848d1a5ea16c
1313
https://github.com/sflow/sflowtool==8c914e79ecb7930adcba2e5296041c3f9eb8e450
1414
https://github.com/thom311/libnl==cbafad9ddf24caef5230fef715d34f0539603be0
1515
https://salsa.debian.org/debian/libteam.git==48142125234a665ad5367b724af36a58fb484d3d
16-
https://salsa.debian.org/dhcp-team/isc-dhcp.git==1dca6def2766980a46540dd2d6c6765142966d9f
16+
https://salsa.debian.org/dhcp-team/isc-dhcp.git==7a6f5a9d178439a56a8eb0cd4446329a8d5631ce
1717
https://salsa.debian.org/kernel-team/ethtool/==b24474c5f4cad2bb690ced33a3c7df397170a699
1818
https://salsa.debian.org/kernel-team/initramfs-tools.git==40e544e13611c1b2690eb99a8096fc16c1b9c74e
1919
https://salsa.debian.org/sk-guest/monit.git==c9da7ebb1f35dfba17b50b5969a6e75e29cbec0d
20-
https://salsa.debian.org/ssh-team/openssh.git==48770216530d8a0a57f5f1d7cc60addd67d1b549
20+
https://salsa.debian.org/ssh-team/openssh.git==48770216530d8a0a57f5f1d7cc60addd67d1b549

‎files/build/versions/default/versions-web

+5-2
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ http://deb.debian.org/debian/pool/main/n/ntp/ntp_4.2.8p12+dfsg.orig.tar.xz==7104
1414
http://http.debian.net/debian/pool/main/h/hiredis/hiredis_0.14.0-3~bpo9+1.debian.tar.xz==ef340aedc6fd42c549cd503bffb498b2
1515
http://http.debian.net/debian/pool/main/h/hiredis/hiredis_0.14.0-3~bpo9+1.dsc==be4ce11ef67268e59e4b6be587327c40
1616
http://http.debian.net/debian/pool/main/h/hiredis/hiredis_0.14.0.orig.tar.gz==6d565680a4af0d2e261abbc3e3431b2b
17-
http://www.mellanox.com/downloads/MFT/mft-4.18.0-106-x86_64-deb.tgz==83d169e43bc9fea43fa0d69a4f8c1398
17+
http://www.mellanox.com/downloads/MFT/mft-4.21.0-100-x86_64-deb.tgz==51efe115cbada1120fefe7e4c6958baf
1818
https://bootstrap.pypa.io/pip/2.7/get-pip.py==60e8267eb1b7bc71dc4843eb7bd294d3
1919
https://deb.nodesource.com/gpgkey/nodesource.gpg.key==003b51a89a133b5db4cca98b2dea3117
2020
https://deb.nodesource.com/node_10.x/dists/stretch/Release==22738118af583db3bfad39d6fcb4fa5a
@@ -32,6 +32,9 @@ https://github.com/Innovium/SONiC/raw/master/debian/202012/isai.deb==93d5a552bf3
3232
https://github.com/Innovium/SONiC/raw/master/debian/202012/saihdr.deb==ac05a7ac58f537fc7e7c7f2f2ced4465
3333
https://github.com/Marvell-switching/sonic-marvell-binaries/raw/master/armhf/sai-plugin/mrvllibsai_1.7.1-9_armhf.deb==b21b91609632e813443ccb00bf2d7c61
3434
https://github.com/nanomsg/nanomsg/archive/1.0.0.tar.gz==6f56ef28c93cee644e8c4aaaef7cfb55
35+
https://github.com/NephosInc/SONiC/raw/master/sai/libsainps-dev_3.0.0_sai_1.5.0_06a67d_amd64.deb==64931041f82533e2a05e003ed9d878c8
36+
https://github.com/NephosInc/SONiC/raw/master/sai/libsainps_3.0.0_sai_1.5.0_06a67d_amd64.deb==385b84051259ebb2580522a990cca161
37+
https://github.com/NephosInc/SONiC/raw/master/sdk/npx_diag==a444c876aaf2a8b4c99238f15fbc13a0
3538
https://raw.githubusercontent.com/p4lang/ptf/master/ptf_nn/ptf_nn_agent.py==628956b660575965429cec84b1778816
3639
https://repo1.maven.org/maven2/io/swagger/swagger-codegen-cli/2.4.5/swagger-codegen-cli-2.4.5.jar==219f1453ff22482d9e080effbfa7fa81
3740
https://sonicstorage.blob.core.windows.net/debian-security/pool/updates/main/l/linux/linux_4.19.152-1.debian.tar.xz==875d84b0edad0210c090195a8df4eb6c
@@ -68,4 +71,4 @@ https://sonicstorage.blob.core.windows.net/packages/redis/redis-tools_6.0.6-1_bp
6871
https://sonicstorage.blob.core.windows.net/packages/redis/redis-tools_6.0.6-1~bpo10+1_amd64.deb?sv=2015-04-05&sr=b&sig=73zbmjkf3pi%2Bn0R8Hy7CWT2EUvOAyzM5aLYJWCLySGM%3D&se=2030-09-06T19%3A44%3A59Z&sp=r==2d58c3c3358290c04d5e0ba70f297f18
6972
https://storage.googleapis.com/golang/go1.14.2.linux-amd64.tar.gz==856d248e3ea8a287d13e5f6afd086282
7073
https://storage.googleapis.com/golang/go1.14.2.linux-arm64.tar.gz==e5f79b403701e00f20d13f0ea561b064
71-
https://storage.googleapis.com/golang/go1.14.2.linux-armv6l.tar.gz==04467414e783b18de4278e9f24baf4be
74+
https://storage.googleapis.com/golang/go1.14.2.linux-armv6l.tar.gz==04467414e783b18de4278e9f24baf4be

‎files/build/versions/dockers/docker-syncd-mlnx/versions-deb-buster

+1-1
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ libswsscommon-dbg==1.0.0
3232
libunwind8==1.2.1-10~deb10u1
3333
libxml2==2.9.4+dfsg1-7+deb10u5
3434
linux-libc-dev==4.19.269-1
35-
mft==4.18.0-106
35+
mft==4.21.0-100
3636
mlnx-sai==1.mlnx.SAIRel1.22.0.0
3737
openssh-client==1:7.9p1-10+deb10u2
3838
python==2.7.16-1

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

+7-8
Original file line numberDiff line numberDiff line change
@@ -557,7 +557,6 @@ libgmpxx4ldbl==2:6.1.2+dfsg-4+deb10u1
557557
libgnutls-dane0==3.6.7-4+deb10u10
558558
libgnutls-openssl27==3.6.7-4+deb10u10
559559
libgnutls28-dev==3.6.7-4+deb10u10
560-
libgnutls30==3.6.7-4+deb10u10
561560
libgnutlsxx28==3.6.7-4+deb10u10
562561
libgomp1==8.3.0-6
563562
libgoogle-perftools4==2.7-1
@@ -1402,13 +1401,13 @@ php-token-stream==3.0.1-1
14021401
php-tokenizer==1.1.0-1
14031402
php-webmozart-assert==1.4.0-3
14041403
php-xml==2:7.3+69
1405-
php7.3-cli==7.3.31-1~deb10u2
1406-
php7.3-common==7.3.31-1~deb10u2
1407-
php7.3-json==7.3.31-1~deb10u2
1408-
php7.3-mbstring==7.3.31-1~deb10u2
1409-
php7.3-opcache==7.3.31-1~deb10u2
1410-
php7.3-readline==7.3.31-1~deb10u2
1411-
php7.3-xml==7.3.31-1~deb10u2
1404+
php7.3-cli==7.3.31-1~deb10u3
1405+
php7.3-common==7.3.31-1~deb10u3
1406+
php7.3-json==7.3.31-1~deb10u3
1407+
php7.3-mbstring==7.3.31-1~deb10u3
1408+
php7.3-opcache==7.3.31-1~deb10u3
1409+
php7.3-readline==7.3.31-1~deb10u3
1410+
php7.3-xml==7.3.31-1~deb10u3
14121411
phpunit==7.5.6-1
14131412
phpunit-code-unit-reverse-lookup==1.0.1-1
14141413
phpunit-comparator==3.0.2-1

‎files/build/versions/dockers/sonic-slave-buster/versions-git

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
1-
https://chromium.googlesource.com/chromium/tools/depot_tools.git==9144b67c7f037577516ebdfe220997560bd01e14
2-
https://github.com/aristanetworks/swi-tools.git==b5f087e4774168bf536360d43c9c509c8f14ad9f
1+
https://chromium.googlesource.com/chromium/tools/depot_tools.git==c962e86f7bafddfc582922dec44cf7a843228abb
2+
https://github.com/aristanetworks/swi-tools.git==b5f087e4774168bf536360d43c9c509c8f14ad9f

‎files/build/versions/dockers/sonic-slave-stretch/versions-git

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
1-
https://chromium.googlesource.com/chromium/tools/depot_tools.git==9144b67c7f037577516ebdfe220997560bd01e14
2-
https://github.com/aristanetworks/swi-tools.git==b5f087e4774168bf536360d43c9c509c8f14ad9f
1+
https://chromium.googlesource.com/chromium/tools/depot_tools.git==c962e86f7bafddfc582922dec44cf7a843228abb
2+
https://github.com/aristanetworks/swi-tools.git==b5f087e4774168bf536360d43c9c509c8f14ad9f

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

+3-3
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,7 @@ isc-dhcp-client==4.4.1-2+deb10u3
7777
iso-codes==4.2-1
7878
jq==1.5+dfsg-2+b1
7979
kdump-tools==1:1.6.1-1
80-
kernel-mft-dkms-modules-4.19.0-12-2-amd64==4.18.0
80+
kernel-mft-dkms-modules-4.19.0-12-2-amd64==4.21.0
8181
kexec-tools==1:2.0.18-1
8282
klibc-utils==2.0.6-1+deb10u1
8383
kmod==26-1
@@ -240,8 +240,8 @@ lsb-release==10.2019051400
240240
make==4.2.1-1.2
241241
makedev==2.3.1-94
242242
makedumpfile==1:1.6.5-1
243-
mft==4.18.0-106
244-
mft-oem==4.18.0-106
243+
mft==4.21.0-100
244+
mft-oem==4.21.0-100
245245
mime-support==3.62
246246
monit==1:5.20.0-6
247247
mtd-utils==1:2.0.1-1

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ certifi==2022.12.7
66
cffi==1.15.1
77
charset-normalizer==3.0.1
88
click==7.0
9-
cryptography==39.0.1
9+
cryptography==39.0.2
1010
docker==4.3.1
1111
idna==3.4
1212
ijson==2.6.1

0 commit comments

Comments
 (0)