From bb2d0986e28c7fec0e58e8d2e998962bd4840125 Mon Sep 17 00:00:00 2001 From: mssonicbld <79238446+mssonicbld@users.noreply.github.com> Date: Fri, 14 Oct 2022 22:02:13 +0800 Subject: [PATCH] [ci/build]: Upgrade SONiC package versions (#12407) --- .../build/build-sonic-slave-buster/versions-git | 4 ++-- files/build/versions/default/versions-docker | 12 ++++++------ files/build/versions/default/versions-git | 6 +++--- .../docker-config-engine-buster/versions-deb-buster | 1 - .../versions-deb-buster-arm64 | 1 - .../versions-deb-buster-armhf | 1 - .../dockers/docker-syncd-brcm/versions-deb-buster | 1 - .../dockers/sonic-slave-buster/versions-deb-buster | 2 -- .../versions/dockers/sonic-slave-buster/versions-git | 2 +- .../dockers/sonic-slave-stretch/versions-git | 2 +- files/build/versions/host-image/versions-py3 | 2 +- 11 files changed, 14 insertions(+), 20 deletions(-) diff --git a/files/build/versions/build/build-sonic-slave-buster/versions-git b/files/build/versions/build/build-sonic-slave-buster/versions-git index 7e32b79c50..1fef42531c 100644 --- a/files/build/versions/build/build-sonic-slave-buster/versions-git +++ b/files/build/versions/build/build-sonic-slave-buster/versions-git @@ -3,11 +3,11 @@ https://github.com/daveolson53/libnss-tacplus.git==19008ab68d9d504aa58eb34d5f564 https://github.com/jeroennijhof/pam_tacplus.git==453c7b6fc78eceeaaf39a59b6b87c124628f2fe8 https://github.com/jpirko/libteam.git==c32369829b2b1881e25fab85d74aa0b3ad017dcb https://github.com/Mellanox/libpsample.git==62bb27d9a49424e45191eee81df7ce0d8c74e774 -https://github.com/sflow/host-sflow==f1ddde6580ae049e53cb9e25822d4c7d98a672cf +https://github.com/sflow/host-sflow==7bac3b923581ef9e8def95ed00c9150dfc19e75c https://github.com/sflow/sflowtool==5307b19399ffb0a1a873c9d09e78cb5011deaf6f https://github.com/thom311/libnl==cbafad9ddf24caef5230fef715d34f0539603be0 https://salsa.debian.org/debian/libteam.git==f8808df228b00873926b5e7b998ad8b61368d4c5 -https://salsa.debian.org/dhcp-team/isc-dhcp.git==70e30ef107fc3bc5a8c8a7c1a48d596e0669f44a +https://salsa.debian.org/dhcp-team/isc-dhcp.git==800b6ea0960c9941ec9088979f9f3256d9f49f6d https://salsa.debian.org/kernel-team/ethtool/==fb77fb17864600d7deb46729c28c677c7da367d5 https://salsa.debian.org/kernel-team/initramfs-tools.git==40e544e13611c1b2690eb99a8096fc16c1b9c74e https://salsa.debian.org/sk-guest/monit.git==c9da7ebb1f35dfba17b50b5969a6e75e29cbec0d diff --git a/files/build/versions/default/versions-docker b/files/build/versions/default/versions-docker index 7793b4dd03..eaf3853c96 100644 --- a/files/build/versions/default/versions-docker +++ b/files/build/versions/default/versions-docker @@ -1,10 +1,10 @@ -amd64:amd64/debian:buster==sha256:12da36082ea17cd91307adaf2e91bb631a3fbbf2c92f7ca9545caa91036c1043 +amd64:amd64/debian:buster==sha256:98285d324777f612a82b68a2932c2ca0b1535cc1c9d94ea682a4968a6a2d0b07 amd64:amd64/debian:stretch==sha256:16ee3e11da473f6565ef94a715f1a38b3079e0664913be78869c336a71cb6085 -amd64:debian:buster==sha256:2f35b84014a5389e2a940113c51586bc067a05040ba181dee92c5a9fa9b15dcb +amd64:debian:buster==sha256:604db908f7ce93379b1289c0c7ba73b252002087a3fa64fe904b430083ba5f69 amd64:debian:stretch==sha256:c5c5200ff1e9c73ffbf188b4a67eb1c91531b644856b4aefe86a58d2f0cb05be -arm64:arm64v8/debian:buster==sha256:cb4597c2e5b3f7d54be4927f4f27d8d84d7b1cd5ef6743d4ecd752727a7e0a07 -arm64:debian:buster==sha256:2f35b84014a5389e2a940113c51586bc067a05040ba181dee92c5a9fa9b15dcb +arm64:arm64v8/debian:buster==sha256:122a0342878607a1a6c566db7a57e86504c96ce169f809ad09dbc98ceb5bf791 +arm64:debian:buster==sha256:604db908f7ce93379b1289c0c7ba73b252002087a3fa64fe904b430083ba5f69 arm64:debian:stretch==sha256:c5c5200ff1e9c73ffbf188b4a67eb1c91531b644856b4aefe86a58d2f0cb05be -armhf:arm32v7/debian:buster==sha256:94d59fccce5b8617ff43a12549c046133e0310497d742d3ad9add1755297ba69 -armhf:debian:buster==sha256:2f35b84014a5389e2a940113c51586bc067a05040ba181dee92c5a9fa9b15dcb +armhf:arm32v7/debian:buster==sha256:97247fd48228fc9f8b819051bb4d53ace1e470d33f2efede76f190fe01ab867a +armhf:debian:buster==sha256:604db908f7ce93379b1289c0c7ba73b252002087a3fa64fe904b430083ba5f69 armhf:debian:stretch==sha256:c5c5200ff1e9c73ffbf188b4a67eb1c91531b644856b4aefe86a58d2f0cb05be \ No newline at end of file diff --git a/files/build/versions/default/versions-git b/files/build/versions/default/versions-git index 9a81273588..718cb6e8ea 100644 --- a/files/build/versions/default/versions-git +++ b/files/build/versions/default/versions-git @@ -1,4 +1,4 @@ -https://chromium.googlesource.com/chromium/tools/depot_tools.git==547c88c48e7751fc9f75408751ab6ee344c06d6d +https://chromium.googlesource.com/chromium/tools/depot_tools.git==2c0a8c736a59044e4acc7be9e172343adc5c4310 https://github.com/aristanetworks/swi-tools.git==b5f087e4774168bf536360d43c9c509c8f14ad9f https://github.com/CESNET/libyang.git==0c609c35080f523c9696db48976de8257d174102 https://github.com/daveolson53/libnss-tacplus.git==19008ab68d9d504aa58eb34d5f564755a1613b8b @@ -9,11 +9,11 @@ https://github.com/lguohan/gnxi.git==f2b11e45b16ab13485ae14933f30c18ee6336499 https://github.com/Marvell-switching/mrvl-prestera.git==21a100e01b2ab00229da35dd178d9b294c66303f https://github.com/Mellanox/libpsample.git==62bb27d9a49424e45191eee81df7ce0d8c74e774 https://github.com/p4lang/scapy-vxlan.git==85ffe83da156568ee47a0750f638227e6e1d7479 -https://github.com/sflow/host-sflow==f1ddde6580ae049e53cb9e25822d4c7d98a672cf +https://github.com/sflow/host-sflow==7bac3b923581ef9e8def95ed00c9150dfc19e75c https://github.com/sflow/sflowtool==5307b19399ffb0a1a873c9d09e78cb5011deaf6f https://github.com/thom311/libnl==cbafad9ddf24caef5230fef715d34f0539603be0 https://salsa.debian.org/debian/libteam.git==f8808df228b00873926b5e7b998ad8b61368d4c5 -https://salsa.debian.org/dhcp-team/isc-dhcp.git==70e30ef107fc3bc5a8c8a7c1a48d596e0669f44a +https://salsa.debian.org/dhcp-team/isc-dhcp.git==800b6ea0960c9941ec9088979f9f3256d9f49f6d https://salsa.debian.org/kernel-team/ethtool/==fb77fb17864600d7deb46729c28c677c7da367d5 https://salsa.debian.org/kernel-team/initramfs-tools.git==40e544e13611c1b2690eb99a8096fc16c1b9c74e https://salsa.debian.org/sk-guest/monit.git==c9da7ebb1f35dfba17b50b5969a6e75e29cbec0d diff --git a/files/build/versions/dockers/docker-config-engine-buster/versions-deb-buster b/files/build/versions/dockers/docker-config-engine-buster/versions-deb-buster index 0520eec0c0..75045d4700 100644 --- a/files/build/versions/dockers/docker-config-engine-buster/versions-deb-buster +++ b/files/build/versions/dockers/docker-config-engine-buster/versions-deb-buster @@ -15,7 +15,6 @@ gcc-8==8.3.0-6 libapt-inst2.0==1.8.2.3 libasan5==8.3.0-6 libbinutils==2.31.1-16 -libbz2-1.0==1.0.6-9.2~deb10u2 libc-dev-bin==2.28-10+deb10u1 libc6-dev==2.28-10+deb10u1 libcc1-0==8.3.0-6 diff --git a/files/build/versions/dockers/docker-config-engine-buster/versions-deb-buster-arm64 b/files/build/versions/dockers/docker-config-engine-buster/versions-deb-buster-arm64 index 832fd7a2e3..1d7724fcec 100644 --- a/files/build/versions/dockers/docker-config-engine-buster/versions-deb-buster-arm64 +++ b/files/build/versions/dockers/docker-config-engine-buster/versions-deb-buster-arm64 @@ -8,5 +8,4 @@ libxml2-dev==2.9.4+dfsg1-7+deb10u4 libxslt1-dev==1.1.32-2.2~deb10u2 libxslt1.1==1.1.32-2.2~deb10u2 pkg-config==0.29-6 -zlib1g==1:1.2.11.dfsg-1+deb10u2 zlib1g-dev==1:1.2.11.dfsg-1+deb10u2 \ No newline at end of file diff --git a/files/build/versions/dockers/docker-config-engine-buster/versions-deb-buster-armhf b/files/build/versions/dockers/docker-config-engine-buster/versions-deb-buster-armhf index 869dd61064..bd7943b727 100644 --- a/files/build/versions/dockers/docker-config-engine-buster/versions-deb-buster-armhf +++ b/files/build/versions/dockers/docker-config-engine-buster/versions-deb-buster-armhf @@ -8,5 +8,4 @@ libxml2-dev==2.9.4+dfsg1-7+deb10u4 libxslt1-dev==1.1.32-2.2~deb10u2 libxslt1.1==1.1.32-2.2~deb10u2 pkg-config==0.29-6 -zlib1g==1:1.2.11.dfsg-1+deb10u2 zlib1g-dev==1:1.2.11.dfsg-1+deb10u2 \ No newline at end of file diff --git a/files/build/versions/dockers/docker-syncd-brcm/versions-deb-buster b/files/build/versions/dockers/docker-syncd-brcm/versions-deb-buster index 8e7c373e5f..171a8cee98 100644 --- a/files/build/versions/dockers/docker-syncd-brcm/versions-deb-buster +++ b/files/build/versions/dockers/docker-syncd-brcm/versions-deb-buster @@ -33,5 +33,4 @@ syncd==1.0.0 syncd-dbg==1.0.0 vim==2:8.1.0875-5+deb10u2 vim-runtime==2:8.1.0875-5+deb10u2 -zlib1g==1:1.2.11.dfsg-1+deb10u2 zlib1g-dev==1:1.2.11.dfsg-1+deb10u2 \ No newline at end of file diff --git a/files/build/versions/dockers/sonic-slave-buster/versions-deb-buster b/files/build/versions/dockers/sonic-slave-buster/versions-deb-buster index 30cd9227e2..d1cdf820ff 100644 --- a/files/build/versions/dockers/sonic-slave-buster/versions-deb-buster +++ b/files/build/versions/dockers/sonic-slave-buster/versions-deb-buster @@ -324,7 +324,6 @@ libbs2b0==3.1.0+dfsg-2.2 libbsd-dev==0.9.1-2+deb10u1 libbsd0==0.9.1-2+deb10u1 libbsh-java==2.0b4-19 -libbz2-1.0==1.0.6-9.2~deb10u2 libbz2-dev==1.0.6-9.2~deb10u2 libc-ares-dev==1.14.0-1+deb10u1 libc-ares2==1.14.0-1+deb10u1 @@ -1731,5 +1730,4 @@ xtrans-dev==1.3.5-1 xxd==2:8.1.0875-5+deb10u2 xz-utils==5.2.4-1+deb10u1 zip==3.0-11+b1 -zlib1g==1:1.2.11.dfsg-1+deb10u2 zlib1g-dev==1:1.2.11.dfsg-1+deb10u2 \ No newline at end of file diff --git a/files/build/versions/dockers/sonic-slave-buster/versions-git b/files/build/versions/dockers/sonic-slave-buster/versions-git index 531188e454..a379ebe4d4 100644 --- a/files/build/versions/dockers/sonic-slave-buster/versions-git +++ b/files/build/versions/dockers/sonic-slave-buster/versions-git @@ -1,2 +1,2 @@ -https://chromium.googlesource.com/chromium/tools/depot_tools.git==547c88c48e7751fc9f75408751ab6ee344c06d6d +https://chromium.googlesource.com/chromium/tools/depot_tools.git==2c0a8c736a59044e4acc7be9e172343adc5c4310 https://github.com/aristanetworks/swi-tools.git==b5f087e4774168bf536360d43c9c509c8f14ad9f \ No newline at end of file diff --git a/files/build/versions/dockers/sonic-slave-stretch/versions-git b/files/build/versions/dockers/sonic-slave-stretch/versions-git index 531188e454..a379ebe4d4 100644 --- a/files/build/versions/dockers/sonic-slave-stretch/versions-git +++ b/files/build/versions/dockers/sonic-slave-stretch/versions-git @@ -1,2 +1,2 @@ -https://chromium.googlesource.com/chromium/tools/depot_tools.git==547c88c48e7751fc9f75408751ab6ee344c06d6d +https://chromium.googlesource.com/chromium/tools/depot_tools.git==2c0a8c736a59044e4acc7be9e172343adc5c4310 https://github.com/aristanetworks/swi-tools.git==b5f087e4774168bf536360d43c9c509c8f14ad9f \ No newline at end of file diff --git a/files/build/versions/host-image/versions-py3 b/files/build/versions/host-image/versions-py3 index dc65acb846..c350c528c9 100644 --- a/files/build/versions/host-image/versions-py3 +++ b/files/build/versions/host-image/versions-py3 @@ -6,7 +6,7 @@ certifi==2022.9.24 cffi==1.15.1 charset-normalizer==2.1.1 click==7.0 -cryptography==38.0.2 +cryptography==38.0.1 docker==4.3.1 idna==3.4 ijson==2.6.1