From a0376a6e5972a7dde8810c6108bd9bf7a4c29e08 Mon Sep 17 00:00:00 2001 From: mssonicbld <79238446+mssonicbld@users.noreply.github.com> Date: Sat, 8 Jan 2022 06:12:12 +0800 Subject: [PATCH] [ci/build]: Upgrade SONiC package versions (#9680) --- .../build/build-sonic-slave-buster/versions-git | 2 +- .../build/build-sonic-slave-buster/versions-py3 | 4 ++-- .../build-sonic-slave-buster/versions-py3-all-arm64 | 2 +- .../build-sonic-slave-buster/versions-py3-all-armhf | 2 +- files/build/versions/default/versions-git | 4 ++-- .../dockers/docker-base-stretch/versions-py2 | 2 +- .../versions/dockers/docker-ptf/versions-deb-stretch | 2 +- files/build/versions/dockers/docker-ptf/versions-py2 | 2 +- .../build/versions/dockers/docker-snmp/versions-py3 | 2 +- .../dockers/docker-sonic-mgmt-framework/versions-py3 | 12 ++++++------ .../versions/dockers/docker-sonic-vs/versions-py2 | 2 +- .../versions/dockers/docker-sonic-vs/versions-py3 | 4 ++-- .../sonic-slave-buster/versions-deb-buster-arm64 | 2 ++ .../sonic-slave-buster/versions-deb-buster-armhf | 2 ++ .../dockers/sonic-slave-stretch/versions-deb-stretch | 8 ++++---- .../sonic-slave-stretch/versions-deb-stretch-arm64 | 4 ++++ .../sonic-slave-stretch/versions-deb-stretch-armhf | 4 ++++ files/build/versions/host-image/versions-deb-buster | 2 +- files/build/versions/host-image/versions-py3 | 6 +++--- .../build/versions/host-image/versions-py3-all-arm64 | 1 + 20 files changed, 41 insertions(+), 28 deletions(-) create mode 100644 files/build/versions/host-image/versions-py3-all-arm64 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 027ff5ccb838..aca0eca7d2b5 100644 --- a/files/build/versions/build/build-sonic-slave-buster/versions-git +++ b/files/build/versions/build/build-sonic-slave-buster/versions-git @@ -11,4 +11,4 @@ https://salsa.debian.org/dhcp-team/isc-dhcp.git==d0d58776805d720029619ea06df5c57 https://salsa.debian.org/kernel-team/ethtool/==d312d98a508935f93120e7f55ebe7c5642b8f2c0 https://salsa.debian.org/kernel-team/initramfs-tools.git==40e544e13611c1b2690eb99a8096fc16c1b9c74e https://salsa.debian.org/sk-guest/monit.git==c9da7ebb1f35dfba17b50b5969a6e75e29cbec0d -https://salsa.debian.org/ssh-team/openssh.git==703df87d44ddf3248fc0ed9f2add56f0e13e2b40 \ No newline at end of file +https://salsa.debian.org/ssh-team/openssh.git==eac38305fc5d8eb8301a106294cf6c79447bdeb3 \ No newline at end of file diff --git a/files/build/versions/build/build-sonic-slave-buster/versions-py3 b/files/build/versions/build/build-sonic-slave-buster/versions-py3 index 39b1179a5eef..364082fcc3a9 100644 --- a/files/build/versions/build/build-sonic-slave-buster/versions-py3 +++ b/files/build/versions/build/build-sonic-slave-buster/versions-py3 @@ -1,4 +1,4 @@ -charset-normalizer==2.0.9 +charset-normalizer==2.0.10 click==7.0 docker==5.0.3 ijson==2.6.1 @@ -8,7 +8,7 @@ jsonschema==2.6.0 natsort==6.2.1 netaddr==0.8.0 netifaces==0.11.0 -psutil==5.8.0 +psutil==5.9.0 python-arptable==0.0.2 tabulate==0.8.9 websocket-client==1.2.3 diff --git a/files/build/versions/build/build-sonic-slave-buster/versions-py3-all-arm64 b/files/build/versions/build/build-sonic-slave-buster/versions-py3-all-arm64 index d4b8a90ceb3c..9a4d403bca40 100644 --- a/files/build/versions/build/build-sonic-slave-buster/versions-py3-all-arm64 +++ b/files/build/versions/build/build-sonic-slave-buster/versions-py3-all-arm64 @@ -1,3 +1,3 @@ bitarray==1.5.3 lxml==4.6.3 -requests==2.26.0 \ No newline at end of file +requests==2.27.1 \ No newline at end of file diff --git a/files/build/versions/build/build-sonic-slave-buster/versions-py3-all-armhf b/files/build/versions/build/build-sonic-slave-buster/versions-py3-all-armhf index d4b8a90ceb3c..9a4d403bca40 100644 --- a/files/build/versions/build/build-sonic-slave-buster/versions-py3-all-armhf +++ b/files/build/versions/build/build-sonic-slave-buster/versions-py3-all-armhf @@ -1,3 +1,3 @@ bitarray==1.5.3 lxml==4.6.3 -requests==2.26.0 \ No newline at end of file +requests==2.27.1 \ No newline at end of file diff --git a/files/build/versions/default/versions-git b/files/build/versions/default/versions-git index 93ef51d31d14..1b6cad1776b7 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==54c265ea2b2fc90ae29fc87366cffc0a5e57f7c4 +https://chromium.googlesource.com/chromium/tools/depot_tools.git==9552069c06705e149b156bcc70b84c1636f22f5e https://github.com/aristanetworks/swi-tools.git==e938746c694e4eaa4cf4126981382c9c8372db24 https://github.com/CESNET/libyang.git==a531aef42741b25b0343b64db5cf9ffd7a823e90 https://github.com/daveolson53/libnss-tacplus.git==19008ab68d9d504aa58eb34d5f564755a1613b8b @@ -16,4 +16,4 @@ https://salsa.debian.org/dhcp-team/isc-dhcp.git==d0d58776805d720029619ea06df5c57 https://salsa.debian.org/kernel-team/ethtool/==d312d98a508935f93120e7f55ebe7c5642b8f2c0 https://salsa.debian.org/kernel-team/initramfs-tools.git==40e544e13611c1b2690eb99a8096fc16c1b9c74e https://salsa.debian.org/sk-guest/monit.git==c9da7ebb1f35dfba17b50b5969a6e75e29cbec0d -https://salsa.debian.org/ssh-team/openssh.git==703df87d44ddf3248fc0ed9f2add56f0e13e2b40 \ No newline at end of file +https://salsa.debian.org/ssh-team/openssh.git==eac38305fc5d8eb8301a106294cf6c79447bdeb3 \ No newline at end of file diff --git a/files/build/versions/dockers/docker-base-stretch/versions-py2 b/files/build/versions/dockers/docker-base-stretch/versions-py2 index 48fd2100defe..4b348d301a65 100644 --- a/files/build/versions/dockers/docker-base-stretch/versions-py2 +++ b/files/build/versions/dockers/docker-base-stretch/versions-py2 @@ -1,6 +1,6 @@ j2cli==0.3.10 jinja2==2.11.3 markupsafe==1.1.1 -supervisor==4.2.2 +supervisor==4.2.4 supervisord-dependent-startup==1.4.0 toposort==1.7 \ No newline at end of file diff --git a/files/build/versions/dockers/docker-ptf/versions-deb-stretch b/files/build/versions/dockers/docker-ptf/versions-deb-stretch index a29a852499da..d5ac4633be9f 100644 --- a/files/build/versions/dockers/docker-ptf/versions-deb-stretch +++ b/files/build/versions/dockers/docker-ptf/versions-deb-stretch @@ -122,7 +122,7 @@ libntlm0==1.4-8+deb9u1 libopts25==1:5.18.12-3 libp11-kit0==0.23.3-2+deb9u1 libpam-systemd==232-25+deb9u13 -libpcap0.8==1.8.1-3 +libpcap0.8==1.8.1-3+deb9u1 libpcre16-3==2:8.39-3 libperl5.24==5.24.1-3+deb9u7 libpopt0==1.16-10+b2 diff --git a/files/build/versions/dockers/docker-ptf/versions-py2 b/files/build/versions/dockers/docker-ptf/versions-py2 index fb71964a73ef..deabed87ffb5 100644 --- a/files/build/versions/dockers/docker-ptf/versions-py2 +++ b/files/build/versions/dockers/docker-ptf/versions-py2 @@ -54,7 +54,7 @@ simplegeneric==0.8.1 singledispatch==3.7.0 six==1.12.0 stevedore==1.32.0 -supervisor==4.2.2 +supervisor==4.2.4 thrift==0.11.0 traitlets==4.3.3 twisted==16.0.0 diff --git a/files/build/versions/dockers/docker-snmp/versions-py3 b/files/build/versions/dockers/docker-snmp/versions-py3 index 69cc94341cbc..d8b86f5af1c0 100644 --- a/files/build/versions/dockers/docker-snmp/versions-py3 +++ b/files/build/versions/dockers/docker-snmp/versions-py3 @@ -1,4 +1,4 @@ hiredis==2.0.0 -psutil==5.8.0 +psutil==5.9.0 python-arptable==0.0.2 smbus==1.1.post2 \ No newline at end of file diff --git a/files/build/versions/dockers/docker-sonic-mgmt-framework/versions-py3 b/files/build/versions/dockers/docker-sonic-mgmt-framework/versions-py3 index 2714bc964d82..de0fab4cca58 100644 --- a/files/build/versions/dockers/docker-sonic-mgmt-framework/versions-py3 +++ b/files/build/versions/dockers/docker-sonic-mgmt-framework/versions-py3 @@ -1,6 +1,6 @@ -attrs==21.2.0 +attrs==21.4.0 certifi==2017.4.17 -charset-normalizer==2.0.9 +charset-normalizer==2.0.10 click==8.0.3 clickclick==20.10.2 connexion==2.7.0 @@ -13,15 +13,15 @@ importlib-resources==5.4.0 inflection==0.5.1 isodate==0.6.1 itsdangerous==2.0.1 -jsonschema==4.3.2 -openapi-schema-validator==0.1.5 +jsonschema==4.3.3 +openapi-schema-validator==0.1.6 openapi-spec-validator==0.3.1 protobuf==3.19.1 pyrsistent==0.18.0 python-dateutil==2.6.0 -requests==2.26.0 +requests==2.27.1 six==1.11.0 typing_extensions==4.0.1 urllib3==1.21.1 werkzeug==2.0.2 -zipp==3.6.0 \ No newline at end of file +zipp==3.7.0 \ No newline at end of file diff --git a/files/build/versions/dockers/docker-sonic-vs/versions-py2 b/files/build/versions/dockers/docker-sonic-vs/versions-py2 index 8bfdf2770e70..7d90a77d7bf1 100644 --- a/files/build/versions/dockers/docker-sonic-vs/versions-py2 +++ b/files/build/versions/dockers/docker-sonic-vs/versions-py2 @@ -7,7 +7,7 @@ netifaces==0.10.7 ply==3.11 py2-ipaddress==3.4.2 pyroute2==0.5.3 -requests==2.26.0 +requests==2.27.1 scapy==2.4.0 six==1.16.0 urllib3==1.26.7 \ No newline at end of file diff --git a/files/build/versions/dockers/docker-sonic-vs/versions-py3 b/files/build/versions/dockers/docker-sonic-vs/versions-py3 index 71dd3c17a748..7ebfe4c0763f 100644 --- a/files/build/versions/dockers/docker-sonic-vs/versions-py3 +++ b/files/build/versions/dockers/docker-sonic-vs/versions-py3 @@ -1,5 +1,5 @@ certifi==2021.10.8 -charset-normalizer==2.0.9 +charset-normalizer==2.0.10 click==7.0 idna==3.3 ijson==2.6.1 @@ -9,7 +9,7 @@ netifaces==0.10.9 pexpect==4.8.0 ptyprocess==0.7.0 pyroute2==0.5.14 -requests==2.26.0 +requests==2.27.1 scapy==2.4.4 tabulate==0.8.9 urllib3==1.26.7 diff --git a/files/build/versions/dockers/sonic-slave-buster/versions-deb-buster-arm64 b/files/build/versions/dockers/sonic-slave-buster/versions-deb-buster-arm64 index a5fecf3be130..2f0da169ee15 100644 --- a/files/build/versions/dockers/sonic-slave-buster/versions-deb-buster-arm64 +++ b/files/build/versions/dockers/sonic-slave-buster/versions-deb-buster-arm64 @@ -1,4 +1,6 @@ binutils-aarch64-linux-gnu==2.31.1-16 +libdjvulibre-text==3.5.27.1-10+deb10u1 +libdjvulibre21==3.5.27.1-10+deb10u1 libdrm-etnaviv1==2.4.97-1 libdrm-freedreno1==2.4.97-1 libdrm-tegra0==2.4.97-1 diff --git a/files/build/versions/dockers/sonic-slave-buster/versions-deb-buster-armhf b/files/build/versions/dockers/sonic-slave-buster/versions-deb-buster-armhf index de53bbddf9a8..69eb102c5cee 100644 --- a/files/build/versions/dockers/sonic-slave-buster/versions-deb-buster-armhf +++ b/files/build/versions/dockers/sonic-slave-buster/versions-deb-buster-armhf @@ -11,6 +11,8 @@ libdevel-caller-perl==2.06-2+b1 libdevel-lexalias-perl==0.05-2+b1 libdevel-stacktrace-perl==2.0300-1 libdist-checkconflicts-perl==0.11-1 +libdjvulibre-text==3.5.27.1-10+deb10u1 +libdjvulibre21==3.5.27.1-10+deb10u1 libdrm-etnaviv1==2.4.97-1 libdrm-exynos1==2.4.97-1 libdrm-freedreno1==2.4.97-1 diff --git a/files/build/versions/dockers/sonic-slave-stretch/versions-deb-stretch b/files/build/versions/dockers/sonic-slave-stretch/versions-deb-stretch index ab6475dc60a4..6f314e77de3d 100644 --- a/files/build/versions/dockers/sonic-slave-stretch/versions-deb-stretch +++ b/files/build/versions/dockers/sonic-slave-stretch/versions-deb-stretch @@ -890,7 +890,7 @@ librrd8==1.6.0-1+b2 librsvg2-2==2.40.21-0+deb9u1 librsvg2-common==2.40.21-0+deb9u1 librtmp1==2.4+20151223.gitfa8646d.1-1+b1 -libruby2.3==2.3.3-1+deb9u10 +libruby2.3==2.3.3-1+deb9u11 libsasl2-2==2.1.27~101-g0780600+dfsg-3+deb9u1 libsasl2-modules==2.1.27~101-g0780600+dfsg-3+deb9u1 libsasl2-modules-db==2.1.27~101-g0780600+dfsg-3+deb9u1 @@ -1280,7 +1280,7 @@ python-jinja2==2.8-1 python-keyring==10.1-1 python-keyrings.alt==1.3-1 python-lazy-object-proxy==1.2.2-1 -python-lxml==3.7.1-1+deb9u4 +python-lxml==3.7.1-1+deb9u5 python-markupsafe==0.23-3 python-minimal==2.7.13-2 python-nose2==0.6.5-2 @@ -1395,8 +1395,8 @@ ruby-net-telnet==0.1.1-2 ruby-power-assert==0.3.0-1 ruby-setup==3.4.1-9 ruby-test-unit==3.1.7-2 -ruby2.3==2.3.3-1+deb9u10 -ruby2.3-dev==2.3.3-1+deb9u10 +ruby2.3==2.3.3-1+deb9u11 +ruby2.3-dev==2.3.3-1+deb9u11 rubygems-integration==1.11 seabios==1.10.2-1 sgml-base==1.29 diff --git a/files/build/versions/dockers/sonic-slave-stretch/versions-deb-stretch-arm64 b/files/build/versions/dockers/sonic-slave-stretch/versions-deb-stretch-arm64 index 00f894c2df08..99864cdeea55 100644 --- a/files/build/versions/dockers/sonic-slave-stretch/versions-deb-stretch-arm64 +++ b/files/build/versions/dockers/sonic-slave-stretch/versions-deb-stretch-arm64 @@ -1,8 +1,12 @@ docker-ce==18.06.3~ce~3-0~debian libdrm-freedreno1==2.4.74-1 libdrm-tegra0==2.4.74-1 +libpcap-dev==1.8.1-3+deb9u1 +libpcap0.8==1.8.1-3+deb9u1 +libpcap0.8-dev==1.8.1-3+deb9u1 libtext-charwidth-perl==0.04-7+b3 libtext-iconv-perl==1.7-5+b3 libunicode-utf8-perl==0.60-1+b2 libxslt1-dev==1.1.29-2.1+deb9u2 +libzzip-0-13==0.13.62-3.2~deb9u2 nodejs==10.24.1-1nodesource1 \ No newline at end of file diff --git a/files/build/versions/dockers/sonic-slave-stretch/versions-deb-stretch-armhf b/files/build/versions/dockers/sonic-slave-stretch/versions-deb-stretch-armhf index 48c98dc20e6e..49b796f3bdf0 100644 --- a/files/build/versions/dockers/sonic-slave-stretch/versions-deb-stretch-armhf +++ b/files/build/versions/dockers/sonic-slave-stretch/versions-deb-stretch-armhf @@ -6,9 +6,13 @@ libdrm-tegra0==2.4.74-1 libegl1-mesa-dev==13.0.6-1+b2 libgles2-mesa==13.0.6-1+b2 libgles2-mesa-dev==13.0.6-1+b2 +libpcap-dev==1.8.1-3+deb9u1 +libpcap0.8==1.8.1-3+deb9u1 +libpcap0.8-dev==1.8.1-3+deb9u1 libtext-charwidth-perl==0.04-7+b6 libwayland-bin==1.12.0-1+deb9u1 libwayland-dev==1.12.0-1+deb9u1 libxslt1-dev==1.1.29-2.1+deb9u2 +libzzip-0-13==0.13.62-3.2~deb9u2 linux-compiler-gcc-6-arm==4.9.290-1 nodejs==10.24.1-1nodesource1 \ No newline at end of file diff --git a/files/build/versions/host-image/versions-deb-buster b/files/build/versions/host-image/versions-deb-buster index ef382d54a031..d8f0ac5ce096 100644 --- a/files/build/versions/host-image/versions-deb-buster +++ b/files/build/versions/host-image/versions-deb-buster @@ -45,7 +45,7 @@ grub2-common==2.02+dfsg1-20+deb10u4 haveged==1.9.1-7 hdparm==9.58+ds-1 hping3==3.a2.ds2-7 -hw-management==1.mlnx.7.0010.2344 +hw-management==1.mlnx.7.0010.2347 i2c-tools==4.1-1 ifmetric==0.3-5 ifupdown2==1.2.8-1 diff --git a/files/build/versions/host-image/versions-py3 b/files/build/versions/host-image/versions-py3 index 76cc2cf4b017..c68c16d48a46 100644 --- a/files/build/versions/host-image/versions-py3 +++ b/files/build/versions/host-image/versions-py3 @@ -4,7 +4,7 @@ azure-storage==0.36.0 bitarray==1.5.3 certifi==2021.10.8 cffi==1.15.0 -charset-normalizer==2.0.9 +charset-normalizer==2.0.10 click==7.0 cryptography==36.0.1 docker==4.3.1 @@ -23,7 +23,7 @@ netaddr==0.8.0 netifaces==0.11.0 pathtools==0.1.2 pexpect==4.8.0 -psutil==5.8.0 +psutil==5.9.0 ptyprocess==0.7.0 pyang==2.5.2 pyangbind==0.8.1 @@ -32,7 +32,7 @@ python-dateutil==2.8.2 pyyaml==5.4.1 redis==3.5.3 regex==2021.11.10 -requests==2.26.0 +requests==2.27.1 scapy==2.4.4 six==1.16.0 tabulate==0.8.9 diff --git a/files/build/versions/host-image/versions-py3-all-arm64 b/files/build/versions/host-image/versions-py3-all-arm64 new file mode 100644 index 000000000000..dcf488fe2aaa --- /dev/null +++ b/files/build/versions/host-image/versions-py3-all-arm64 @@ -0,0 +1 @@ +urllib3==1.26.8 \ No newline at end of file