diff --git a/dockers/docker-config-engine-bullseye/Dockerfile.j2 b/dockers/docker-config-engine-bullseye/Dockerfile.j2 index 125a6a5ef17c..92786ae7f94b 100644 --- a/dockers/docker-config-engine-bullseye/Dockerfile.j2 +++ b/dockers/docker-config-engine-bullseye/Dockerfile.j2 @@ -41,6 +41,7 @@ RUN pip3 uninstall -y enum34 # Copy files COPY ["files/swss_vars.j2", "/usr/share/sonic/templates/"] +COPY ["files/container_startup.py", "/usr/share/sonic/scripts/"] ## Clean up RUN apt-get purge -y \ diff --git a/dockers/docker-config-engine-buster/Dockerfile.j2 b/dockers/docker-config-engine-buster/Dockerfile.j2 index eb4cc4687236..197cd903b468 100644 --- a/dockers/docker-config-engine-buster/Dockerfile.j2 +++ b/dockers/docker-config-engine-buster/Dockerfile.j2 @@ -41,6 +41,7 @@ RUN pip3 uninstall -y enum34 # Copy files COPY ["files/swss_vars.j2", "/usr/share/sonic/templates/"] +COPY ["files/container_startup.py", "/usr/share/sonic/scripts/"] ## Clean up RUN apt-get purge -y \ diff --git a/files/build/versions/build/build-sonic-slave-bullseye/versions-deb-bullseye b/files/build/versions/build/build-sonic-slave-bullseye/versions-deb-bullseye index 5e4f4808cf8d..65a467943547 100644 --- a/files/build/versions/build/build-sonic-slave-bullseye/versions-deb-bullseye +++ b/files/build/versions/build/build-sonic-slave-bullseye/versions-deb-bullseye @@ -3,8 +3,8 @@ applibs-dev==1.mlnx.4.5.4206 iproute2-dev==1.mlnx.4.5.4206 isc-dhcp-relay==4.4.1-2.3+deb11u2 kernel-mft-dkms==4.22.1-15 -libhiredis-dev==0.14.0-3~bpo9+1 -libhiredis0.14==0.14.0-3~bpo9+1 +libhiredis-dev==0.14.1-1 +libhiredis0.14==0.14.1-1 libnl-3-dev==3.5.0-1 libnl-cli-3-200==3.5.0-1 libnl-cli-3-dev==3.5.0-1 @@ -13,8 +13,8 @@ libnl-genl-3-dev==3.5.0-1 libnl-nf-3-200==3.5.0-1 libnl-nf-3-dev==3.5.0-1 libnl-route-3-dev==3.5.0-1 -libsaibcm==7.1.50.4 -libsaibcm-dev==7.1.50.4 +libsaibcm==7.1.36.4 +libsaibcm-dev==7.1.36.4 libsaimetadata==1.0.0 libsaimetadata-dev==1.0.0 libsairedis==1.0.0 diff --git a/files/build/versions/build/build-sonic-slave-bullseye/versions-deb-bullseye-armhf b/files/build/versions/build/build-sonic-slave-bullseye/versions-deb-bullseye-armhf index 670752a16504..4f2874e341f9 100644 --- a/files/build/versions/build/build-sonic-slave-bullseye/versions-deb-bullseye-armhf +++ b/files/build/versions/build/build-sonic-slave-bullseye/versions-deb-bullseye-armhf @@ -1,2 +1,4 @@ +libnl-3-200==3.5.0-1 +libnl-route-3-200==3.5.0-1 linux-headers-5.10.0-18-2-armmp==5.10.140-1 mrvllibsai==1.10.2-4 \ No newline at end of file diff --git a/files/build/versions/build/build-sonic-slave-bullseye/versions-py3-all-armhf b/files/build/versions/build/build-sonic-slave-bullseye/versions-py3-all-armhf new file mode 100644 index 000000000000..91b7ebfeb13b --- /dev/null +++ b/files/build/versions/build/build-sonic-slave-bullseye/versions-py3-all-armhf @@ -0,0 +1,3 @@ +bitarray==1.5.3 +click==7.0 +requests==2.31.0 \ No newline at end of file diff --git a/files/build/versions/build/build-sonic-slave-buster/versions-deb-buster b/files/build/versions/build/build-sonic-slave-buster/versions-deb-buster index 9127ee9bd50f..cab0d30ac799 100644 --- a/files/build/versions/build/build-sonic-slave-buster/versions-deb-buster +++ b/files/build/versions/build/build-sonic-slave-buster/versions-deb-buster @@ -1,6 +1,6 @@ bfnplatform==1.0.0 -libhiredis-dev==0.14.0-3~bpo9+1 -libhiredis0.14==0.14.0-3~bpo9+1 +libhiredis-dev==0.14.1-1 +libhiredis0.14==0.14.1-1 libnl-cli-3-200==3.5.0-1 libnl-cli-3-dev==3.5.0-1 libnl-genl-3-200==3.5.0-1 diff --git a/files/build/versions/default/versions-git b/files/build/versions/default/versions-git index 9684bca005de..ab870048e84b 100644 --- a/files/build/versions/default/versions-git +++ b/files/build/versions/default/versions-git @@ -1,18 +1,18 @@ -https://chromium.googlesource.com/chromium/tools/depot_tools.git==c5305b39f473d64ddcb313a22584e22666b1da3b +https://chromium.googlesource.com/chromium/tools/depot_tools.git==60c4b8810bdc3107a9a0c7046b79ee3a95df47fb 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==1ee04cd5ac8bb636182d9d7c259110638b83c8b1 -https://github.com/FreeRADIUS/freeradius-server.git==185121a256d0304c296bb8d26fb5b0df55f4dedf +https://github.com/flashrom/flashrom.git==b66f4766b5d7dc614ad609f27dd2794e06b5e2a4 +https://github.com/FreeRADIUS/freeradius-server.git==dfd71b9085ec4dd5c89b8930f8ea1a9a951730bb https://github.com/FreeRADIUS/pam_radius.git==8d373539bb9f13b0abfe8bcae0095a930a00fad0 https://github.com/jeroennijhof/pam_tacplus.git==4284d9016e64def2bb81d5f50f96dc3b59bfdc39 https://github.com/jpirko/libteam.git==7cb5de8b01be132bd4150eff460bfd83296414b6 https://github.com/lguohan/gnxi.git==b85e4ab565df4472fdcfcded2a53e6bf57aa493f https://github.com/Marvell-switching/mrvl-prestera.git==179c08b0544db0b3a95a843e31266e00a68fb4b0 https://github.com/Mellanox/libpsample.git==62bb27d9a49424e45191eee81df7ce0d8c74e774 -https://github.com/opencomputeproject/SAI.git==d626d562a690424ab78b3c51a532ff74c5bf53f6 +https://github.com/opencomputeproject/SAI.git==ba8ccba11d2e69310148736af1024785192010e7 https://github.com/p4lang/scapy-vxlan.git==85ffe83da156568ee47a0750f638227e6e1d7479 https://github.com/sflow/host-sflow==4dc68a95fa57758119d76e42965b32493ffd7094 https://github.com/sflow/sflowtool==4ce1223bb4c2cd0cbb1dd688dc0914561fcbb6c4 diff --git a/files/build/versions/default/versions-mirror b/files/build/versions/default/versions-mirror index ec773734ed35..956b334f4bc2 100644 --- a/files/build/versions/default/versions-mirror +++ b/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==20230627T000209Z -debian-security==20230627T000210Z +debian==20230702T000215Z +debian-security==20230702T000635Z 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_20230627T000210Z_dists_bullseye-security==2023-06-26T15:52:30Z -packages.trafficmanager.net_snapshot_debian-security_20230627T000210Z_dists_buster_updates==2023-06-26T15:52:30Z -packages.trafficmanager.net_snapshot_debian_20230627T000209Z_dists_bullseye==2023-06-10T08:52:21Z -packages.trafficmanager.net_snapshot_debian_20230627T000209Z_dists_bullseye-backports==2023-06-26T20:30:29Z -packages.trafficmanager.net_snapshot_debian_20230627T000209Z_dists_bullseye-updates==2023-06-26T20:30:29Z -packages.trafficmanager.net_snapshot_debian_20230627T000209Z_dists_buster==2023-06-10T08:53:33Z -packages.trafficmanager.net_snapshot_debian_20230627T000209Z_dists_buster-backports==2023-06-26T20:30:29Z -packages.trafficmanager.net_snapshot_debian_20230627T000209Z_dists_buster-updates==2023-06-10T08:55:10Z \ No newline at end of file +packages.trafficmanager.net_snapshot_debian-security_20230702T000635Z_dists_bullseye-security==2023-06-30T18:02:52Z +packages.trafficmanager.net_snapshot_debian-security_20230702T000635Z_dists_buster_updates==2023-06-30T18:02:52Z +packages.trafficmanager.net_snapshot_debian_20230702T000215Z_dists_bullseye==2023-06-10T08:52:21Z +packages.trafficmanager.net_snapshot_debian_20230702T000215Z_dists_bullseye-backports==2023-07-01T20:27:39Z +packages.trafficmanager.net_snapshot_debian_20230702T000215Z_dists_bullseye-updates==2023-07-01T20:27:39Z +packages.trafficmanager.net_snapshot_debian_20230702T000215Z_dists_buster==2023-06-10T08:53:33Z +packages.trafficmanager.net_snapshot_debian_20230702T000215Z_dists_buster-backports==2023-07-01T20:27:39Z +packages.trafficmanager.net_snapshot_debian_20230702T000215Z_dists_buster-updates==2023-06-10T08:55:10Z \ No newline at end of file diff --git a/files/build/versions/default/versions-web b/files/build/versions/default/versions-web index 8c4960cfaf64..c263a08f379f 100644 --- a/files/build/versions/default/versions-web +++ b/files/build/versions/default/versions-web @@ -19,9 +19,9 @@ http://deb.debian.org/debian/pool/main/l/lm-sensors/lm-sensors_3.6.0.orig.tar.gz http://deb.debian.org/debian/pool/main/n/ntp/ntp_4.2.8p15+dfsg-1.debian.tar.xz==896c9b6679f379d8967b012a0cc792c2 http://deb.debian.org/debian/pool/main/n/ntp/ntp_4.2.8p15+dfsg.orig.tar.xz==c1c557036197188a22ec285fa53149d8 http://ftp.us.debian.org/debian/pool/main/s/scapy/python-scapy_2.4.0-2_all.deb==d87d7b22de51937b1e706e4751b86251 -http://http.debian.net/debian/pool/main/h/hiredis/hiredis_0.14.0-3~bpo9+1.debian.tar.xz==ef340aedc6fd42c549cd503bffb498b2 -http://http.debian.net/debian/pool/main/h/hiredis/hiredis_0.14.0-3~bpo9+1.dsc==be4ce11ef67268e59e4b6be587327c40 -http://http.debian.net/debian/pool/main/h/hiredis/hiredis_0.14.0.orig.tar.gz==6d565680a4af0d2e261abbc3e3431b2b +http://http.debian.net/debian/pool/main/h/hiredis/hiredis_0.14.1-1.debian.tar.xz==d0ef92c6f301ac5023f7953cf7816ff0 +http://http.debian.net/debian/pool/main/h/hiredis/hiredis_0.14.1-1.dsc==ef9e33d036c6dbb74a4ed12fefe2de8a +http://http.debian.net/debian/pool/main/h/hiredis/hiredis_0.14.1.orig.tar.gz==3e1c541f9df28becb82a611e63e3e939 http://www.mellanox.com/downloads/MFT/mft-4.22.1-15-x86_64-deb.tgz==fb58cd1a7dafef062a7c3ec8a398b5fd https://archive.apache.org/dist/thrift/0.14.1/thrift-0.14.1.tar.gz==c64434548438df2cb1e53fb27c600e85 https://bootstrap.pypa.io/pip/2.7/get-pip.py==60e8267eb1b7bc71dc4843eb7bd294d3 @@ -147,9 +147,9 @@ https://sonicstorage.blob.core.windows.net/public/fips/bullseye/0.7/arm64/python https://sonicstorage.blob.core.windows.net/public/fips/bullseye/0.7/arm64/python3.9_3.9.2-1+fips_arm64.deb==4d6307dabcd3060235d6188cfa0346b8 https://sonicstorage.blob.core.windows.net/public/fips/bullseye/0.7/arm64/symcrypt-openssl_0.7_arm64.deb==f25f73823a0f22805b8e0be43bef190f https://sonicstorage.blob.core.windows.net/public/sai/bcmpai/REL_3.8/3.8/libsaibroncos_3.8_amd64.deb==f7c3f0ed8c97c2572e3c2e59faaae4a8 -https://sonicstorage.blob.core.windows.net/public/sai/bcmsai/REL_7.0_202205/7.1.50.4/libsaibcm-dev_7.1.50.4_amd64.deb==5b4c10f3df645d05a6bb876b0d5fd61c -https://sonicstorage.blob.core.windows.net/public/sai/bcmsai/REL_7.0_202205/7.1.50.4/libsaibcm_7.1.50.4_amd64.deb==51506d41880592a7b9ae2f0b13b2c14f -https://sonicstorage.blob.core.windows.net/public/sai/bcmsai/REL_7.0_202205/7.1.50.4/libsaibcm_dnx_7.1.50.4_amd64.deb==147113a4e1d6ef70cc6079779687dd59 +https://sonicstorage.blob.core.windows.net/public/sai/bcmsai/REL_7.0_202205/7.1.36.4/libsaibcm-dev_7.1.36.4_amd64.deb==9bc69f9e35c2ff72e681af4d0b7d2606 +https://sonicstorage.blob.core.windows.net/public/sai/bcmsai/REL_7.0_202205/7.1.36.4/libsaibcm_7.1.36.4_amd64.deb==cb86b76aa2fa44fcfc37a64c1b93f2ad +https://sonicstorage.blob.core.windows.net/public/sai/bcmsai/REL_7.0_202205/7.1.42.4/libsaibcm_dnx_7.1.42.4_amd64.deb==bd8126337938bfd96befbb72838f8d8f https://storage.googleapis.com/golang/go1.14.2.linux-amd64.tar.gz==856d248e3ea8a287d13e5f6afd086282 https://storage.googleapis.com/golang/go1.14.2.linux-arm64.tar.gz==e5f79b403701e00f20d13f0ea561b064 https://storage.googleapis.com/golang/go1.14.2.linux-armv6l.tar.gz==04467414e783b18de4278e9f24baf4be \ No newline at end of file diff --git a/files/build/versions/dockers/docker-base-buster/versions-deb-buster b/files/build/versions/dockers/docker-base-buster/versions-deb-buster index feec57dce2c3..4df8f29acfe8 100644 --- a/files/build/versions/dockers/docker-base-buster/versions-deb-buster +++ b/files/build/versions/dockers/docker-base-buster/versions-deb-buster @@ -33,8 +33,8 @@ libpgm-5.2-0==5.2.122~dfsg-3 libprocps7==2:3.3.15-2 libpsl5==0.20.2-2 libpython3-stdlib==3.7.3-1 -libpython3.7-minimal==3.7.3-2+deb10u4 -libpython3.7-stdlib==3.7.3-2+deb10u4 +libpython3.7-minimal==3.7.3-2+deb10u5 +libpython3.7-stdlib==3.7.3-2+deb10u5 libreadline7==7.0-5 librtmp1==2.4+20151223.gitfa8646d.1-2 libsasl2-2==2.1.27+dfsg-1+deb10u2 @@ -60,8 +60,8 @@ python3-distutils==3.7.3-1 python3-lib2to3==3.7.3-1 python3-minimal==3.7.3-1 python3-pip==18.1-5 -python3.7==3.7.3-2+deb10u4 -python3.7-minimal==3.7.3-2+deb10u4 +python3.7==3.7.3-2+deb10u5 +python3.7-minimal==3.7.3-2+deb10u5 readline-common==7.0-5 redis-tools==5:6.0.6-1~bpo10+1 rsyslog==8.1901.0-1+deb10u2 diff --git a/files/build/versions/dockers/docker-config-engine-bullseye/versions-deb-bullseye b/files/build/versions/dockers/docker-config-engine-bullseye/versions-deb-bullseye index efd26e8f6ea0..9dcb04793c4e 100644 --- a/files/build/versions/dockers/docker-config-engine-bullseye/versions-deb-bullseye +++ b/files/build/versions/dockers/docker-config-engine-bullseye/versions-deb-bullseye @@ -23,7 +23,7 @@ libdpkg-perl==1.20.12 libexpat1-dev==2.2.10-2+deb11u5 libgcc-10-dev==10.2.1-6 libgomp1==10.2.1-6 -libhiredis0.14==0.14.0-3~bpo9+1 +libhiredis0.14==0.14.1-1 libisl23==0.23-1 libitm1==10.2.1-6 libjs-jquery==3.5.1+dfsg+~3.5.5-7 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 5086f7c7e5ad..21e03a8eacde 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 @@ -22,7 +22,7 @@ libdpkg-perl==1.19.8 libexpat1-dev==2.2.6-2+deb10u6 libgcc-8-dev==8.3.0-6 libgomp1==8.3.0-6 -libhiredis0.14==0.14.0-3~bpo9+1 +libhiredis0.14==0.14.1-1 libisl19==0.20-2 libitm1==8.3.0-6 liblsan0==8.3.0-6 @@ -35,8 +35,8 @@ libnl-genl-3-200==3.5.0-1 libnl-nf-3-200==3.5.0-1 libnl-route-3-200==3.5.0-1 libpython3-dev==3.7.3-1 -libpython3.7==3.7.3-2+deb10u4 -libpython3.7-dev==3.7.3-2+deb10u4 +libpython3.7==3.7.3-2+deb10u5 +libpython3.7-dev==3.7.3-2+deb10u5 libquadmath0==8.3.0-6 libstdc++-8-dev==8.3.0-6 libswsscommon==1.0.0 @@ -50,6 +50,6 @@ patch==2.7.6-3+deb10u1 python3-dev==3.7.3-1 python3-swsscommon==1.0.0 python3-yang==1.0.73 -python3.7-dev==3.7.3-2+deb10u4 +python3.7-dev==3.7.3-2+deb10u5 sonic-db-cli==1.0.0 xz-utils==5.2.4-1+deb10u1 \ No newline at end of file diff --git a/files/build/versions/dockers/docker-database/versions-deb-bullseye b/files/build/versions/dockers/docker-database/versions-deb-bullseye index 2e7379318da8..6862396b03d0 100644 --- a/files/build/versions/dockers/docker-database/versions-deb-bullseye +++ b/files/build/versions/dockers/docker-database/versions-deb-bullseye @@ -10,7 +10,7 @@ libedit2==3.1-20191231-2+b1 libfido2-1==1.6.0-2 libglib2.0-0==2.66.8-1 libgpm2==1.20.7-8 -libhiredis0.14-dbgsym==0.14.0-3~bpo9+1 +libhiredis0.14-dbgsym==0.14.1-1 libicu67==67.1-7 libipt2==2.0.3-1 libmpfr6==4.1.0-3 diff --git a/files/build/versions/dockers/docker-dhcp-relay/versions-deb-bullseye b/files/build/versions/dockers/docker-dhcp-relay/versions-deb-bullseye index 741ce7a732e7..4ab117da8b59 100644 --- a/files/build/versions/dockers/docker-dhcp-relay/versions-deb-bullseye +++ b/files/build/versions/dockers/docker-dhcp-relay/versions-deb-bullseye @@ -16,7 +16,7 @@ libexplain51==1.4.D001-11+deb11u1 libfido2-1==1.6.0-2 libglib2.0-0==2.66.8-1 libgpm2==1.20.7-8 -libhiredis0.14-dbgsym==0.14.0-3~bpo9+1 +libhiredis0.14-dbgsym==0.14.1-1 libicu67==67.1-7 libipt2==2.0.3-1 libirs-export161==1:9.11.19+dfsg-2.1 diff --git a/files/build/versions/dockers/docker-fpm-frr/versions-deb-bullseye b/files/build/versions/dockers/docker-fpm-frr/versions-deb-bullseye index 9e6777c12bf6..3ff04f1db4df 100644 --- a/files/build/versions/dockers/docker-fpm-frr/versions-deb-bullseye +++ b/files/build/versions/dockers/docker-fpm-frr/versions-deb-bullseye @@ -16,7 +16,7 @@ libedit2==3.1-20191231-2+b1 libfido2-1==1.6.0-2 libglib2.0-0==2.66.8-1 libgpm2==1.20.7-8 -libhiredis0.14-dbgsym==0.14.0-3~bpo9+1 +libhiredis0.14-dbgsym==0.14.1-1 libicu67==67.1-7 libipt2==2.0.3-1 libjson-c5==0.15-2 diff --git a/files/build/versions/dockers/docker-gbsyncd-broncos/versions-deb-bullseye b/files/build/versions/dockers/docker-gbsyncd-broncos/versions-deb-bullseye index 3f9319d30b8b..0399806aad06 100644 --- a/files/build/versions/dockers/docker-gbsyncd-broncos/versions-deb-bullseye +++ b/files/build/versions/dockers/docker-gbsyncd-broncos/versions-deb-bullseye @@ -13,7 +13,7 @@ libedit2==3.1-20191231-2+b1 libfido2-1==1.6.0-2 libglib2.0-0==2.66.8-1 libgpm2==1.20.7-8 -libhiredis0.14-dbgsym==0.14.0-3~bpo9+1 +libhiredis0.14-dbgsym==0.14.1-1 libicu67==67.1-7 libipt2==2.0.3-1 libmpfr6==4.1.0-3 diff --git a/files/build/versions/dockers/docker-gbsyncd-credo/versions-deb-bullseye b/files/build/versions/dockers/docker-gbsyncd-credo/versions-deb-bullseye index 50bbb06d9dc4..30b120cd3203 100644 --- a/files/build/versions/dockers/docker-gbsyncd-credo/versions-deb-bullseye +++ b/files/build/versions/dockers/docker-gbsyncd-credo/versions-deb-bullseye @@ -10,7 +10,7 @@ libedit2==3.1-20191231-2+b1 libfido2-1==1.6.0-2 libglib2.0-0==2.66.8-1 libgpm2==1.20.7-8 -libhiredis0.14-dbgsym==0.14.0-3~bpo9+1 +libhiredis0.14-dbgsym==0.14.1-1 libicu67==67.1-7 libipt2==2.0.3-1 libmpfr6==4.1.0-3 diff --git a/files/build/versions/dockers/docker-gbsyncd-vs/versions-deb-bullseye b/files/build/versions/dockers/docker-gbsyncd-vs/versions-deb-bullseye index 597f07e60f6d..c00b39fb7b9f 100644 --- a/files/build/versions/dockers/docker-gbsyncd-vs/versions-deb-bullseye +++ b/files/build/versions/dockers/docker-gbsyncd-vs/versions-deb-bullseye @@ -10,7 +10,7 @@ libedit2==3.1-20191231-2+b1 libfido2-1==1.6.0-2 libglib2.0-0==2.66.8-1 libgpm2==1.20.7-8 -libhiredis0.14-dbgsym==0.14.0-3~bpo9+1 +libhiredis0.14-dbgsym==0.14.1-1 libicu67==67.1-7 libipt2==2.0.3-1 libmpfr6==4.1.0-3 diff --git a/files/build/versions/dockers/docker-lldp/versions-deb-bullseye b/files/build/versions/dockers/docker-lldp/versions-deb-bullseye index 8d2c5ac5e81f..942523275bc5 100644 --- a/files/build/versions/dockers/docker-lldp/versions-deb-bullseye +++ b/files/build/versions/dockers/docker-lldp/versions-deb-bullseye @@ -11,7 +11,7 @@ libevent-2.1-7==2.1.12-stable-1 libfido2-1==1.6.0-2 libglib2.0-0==2.66.8-1 libgpm2==1.20.7-8 -libhiredis0.14-dbgsym==0.14.0-3~bpo9+1 +libhiredis0.14-dbgsym==0.14.1-1 libicu67==67.1-7 libipt2==2.0.3-1 libmpfr6==4.1.0-3 diff --git a/files/build/versions/dockers/docker-macsec/versions-deb-bullseye b/files/build/versions/dockers/docker-macsec/versions-deb-bullseye index 433e9d5d0311..d98be9dd73be 100644 --- a/files/build/versions/dockers/docker-macsec/versions-deb-bullseye +++ b/files/build/versions/dockers/docker-macsec/versions-deb-bullseye @@ -10,7 +10,7 @@ libedit2==3.1-20191231-2+b1 libfido2-1==1.6.0-2 libglib2.0-0==2.66.8-1 libgpm2==1.20.7-8 -libhiredis0.14-dbgsym==0.14.0-3~bpo9+1 +libhiredis0.14-dbgsym==0.14.1-1 libicu67==67.1-7 libipt2==2.0.3-1 libmpfr6==4.1.0-3 diff --git a/files/build/versions/dockers/docker-mux/versions-deb-bullseye b/files/build/versions/dockers/docker-mux/versions-deb-bullseye index d2fb85eba4f3..d5f60891fbb7 100644 --- a/files/build/versions/dockers/docker-mux/versions-deb-bullseye +++ b/files/build/versions/dockers/docker-mux/versions-deb-bullseye @@ -14,7 +14,7 @@ libedit2==3.1-20191231-2+b1 libfido2-1==1.6.0-2 libglib2.0-0==2.66.8-1 libgpm2==1.20.7-8 -libhiredis0.14-dbgsym==0.14.0-3~bpo9+1 +libhiredis0.14-dbgsym==0.14.1-1 libicu67==67.1-7 libipt2==2.0.3-1 libmpfr6==4.1.0-3 diff --git a/files/build/versions/dockers/docker-nat/versions-deb-buster b/files/build/versions/dockers/docker-nat/versions-deb-buster index 04302e824a47..2ce8dd9512de 100644 --- a/files/build/versions/dockers/docker-nat/versions-deb-buster +++ b/files/build/versions/dockers/docker-nat/versions-deb-buster @@ -9,7 +9,7 @@ libdw1==0.176-1.1 libedit2==3.1-20181209-1 libglib2.0-0==2.58.3-2+deb10u4 libgpm2==1.20.7-5 -libhiredis0.14-dbgsym==0.14.0-3~bpo9+1 +libhiredis0.14-dbgsym==0.14.1-1 libip4tc0==1.8.2-4 libip6tc0==1.8.2-4 libipt2==2.0-2 diff --git a/files/build/versions/dockers/docker-orchagent/versions-deb-bullseye b/files/build/versions/dockers/docker-orchagent/versions-deb-bullseye index e27fe5135232..baac4a37f1ae 100644 --- a/files/build/versions/dockers/docker-orchagent/versions-deb-bullseye +++ b/files/build/versions/dockers/docker-orchagent/versions-deb-bullseye @@ -37,7 +37,7 @@ libgcc-10-dev==10.2.1-6 libglib2.0-0==2.66.8-1 libgomp1==10.2.1-6 libgpm2==1.20.7-8 -libhiredis0.14-dbgsym==0.14.0-3~bpo9+1 +libhiredis0.14-dbgsym==0.14.1-1 libicu67==67.1-7 libipt2==2.0.3-1 libisl23==0.23-1 diff --git a/files/build/versions/dockers/docker-platform-monitor/versions-deb-bullseye b/files/build/versions/dockers/docker-platform-monitor/versions-deb-bullseye index 028b1283abec..d73b371834ed 100644 --- a/files/build/versions/dockers/docker-platform-monitor/versions-deb-bullseye +++ b/files/build/versions/dockers/docker-platform-monitor/versions-deb-bullseye @@ -54,7 +54,7 @@ libgomp1==10.2.1-6 libgpm2==1.20.7-8 libgraphite2-3==1.3.14-1 libharfbuzz0b==2.7.4-1 -libhiredis0.14-dbgsym==0.14.0-3~bpo9+1 +libhiredis0.14-dbgsym==0.14.1-1 libi2c0==4.2-1+b1 libicu67==67.1-7 libipt2==2.0.3-1 diff --git a/files/build/versions/dockers/docker-ptf/versions-deb-buster b/files/build/versions/dockers/docker-ptf/versions-deb-buster index 47a3e73b4944..5606fff3d0dc 100644 --- a/files/build/versions/dockers/docker-ptf/versions-deb-buster +++ b/files/build/versions/dockers/docker-ptf/versions-deb-buster @@ -89,9 +89,9 @@ libcc1-0==8.3.0-6 libcdt5==2.40.1-6+deb10u1 libcgraph6==2.40.1-6+deb10u1 libcryptsetup12==2:2.1.0-5+deb10u2 -libcups2==2.2.10-6+deb10u7 +libcups2==2.2.10-6+deb10u8 libcupsfilters1==1.21.6-5+deb10u1 -libcupsimage2==2.2.10-6+deb10u7 +libcupsimage2==2.2.10-6+deb10u8 libcurl3-gnutls==7.64.0-4+deb10u6 libcurl4==7.64.0-4+deb10u6 libdaemon0==0.14-7 @@ -231,10 +231,10 @@ libnl-genl-3-200==3.4.0-1 libnl-nf-3-200==3.4.0-1 libnl-route-3-200==3.4.0-1 libnpth0==1.6-1 -libnss-systemd==241-7~deb10u9 +libnss-systemd==241-7~deb10u10 libopenjp2-7==2.3.0-2+deb10u2 libopts25==1:5.18.12-4 -libpam-systemd==241-7~deb10u9 +libpam-systemd==241-7~deb10u10 libpango-1.0-0==1.42.4-8~deb10u1 libpangocairo-1.0-0==1.42.4-8~deb10u1 libpangoft2-1.0-0==1.42.4-8~deb10u1 @@ -265,10 +265,10 @@ libpython2.7-minimal==2.7.16-2+deb10u2 libpython2.7-stdlib==2.7.16-2+deb10u2 libpython3-dev==3.7.3-1 libpython3-stdlib==3.7.3-1 -libpython3.7==3.7.3-2+deb10u4 -libpython3.7-dev==3.7.3-2+deb10u4 -libpython3.7-minimal==3.7.3-2+deb10u4 -libpython3.7-stdlib==3.7.3-2+deb10u4 +libpython3.7==3.7.3-2+deb10u5 +libpython3.7-dev==3.7.3-2+deb10u5 +libpython3.7-minimal==3.7.3-2+deb10u5 +libpython3.7-stdlib==3.7.3-2+deb10u5 libqt5core5a==5.11.3+dfsg1-1+deb10u5 libqt5dbus5==5.11.3+dfsg1-1+deb10u5 libqt5network5==5.11.3+dfsg1-1+deb10u5 @@ -289,7 +289,7 @@ 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 +libsystemd0==241-7~deb10u10 libtacacs+1==4.0.4.27a-3 libtasn1-6==4.13-3+deb10u1 libtcl8.6==8.6.9+dfsg-2 @@ -312,7 +312,7 @@ libtk8.6==8.6.9-2 libtry-tiny-perl==0.30-1 libtsan0==8.3.0-6 libubsan1==8.3.0-6 -libudev1==241-7~deb10u9 +libudev1==241-7~deb10u10 libunbound8==1.9.0-2+deb10u3 liburi-perl==1.76-1 libutempter0==1.1.6-3 @@ -460,18 +460,18 @@ python3-venv==3.7.3-1 python3-wcwidth==0.1.7+dfsg1-3 python3-wheel==0.32.3-2 python3-xdg==0.25-5 -python3.7==3.7.3-2+deb10u4 -python3.7-dev==3.7.3-2+deb10u4 -python3.7-minimal==3.7.3-2+deb10u4 -python3.7-venv==3.7.3-2+deb10u4 +python3.7==3.7.3-2+deb10u5 +python3.7-dev==3.7.3-2+deb10u5 +python3.7-minimal==3.7.3-2+deb10u5 +python3.7-venv==3.7.3-2+deb10u5 qttranslations5-l10n==5.11.3-2 readline-common==7.0-5 rsyslog==8.1901.0-1+deb10u2 sensible-utils==0.0.12 shared-mime-info==1.10-1 sntp==1:4.2.8p12+dfsg-4 -systemd==241-7~deb10u9 -systemd-sysv==241-7~deb10u9 +systemd==241-7~deb10u10 +systemd-sysv==241-7~deb10u10 t1utils==1.41-3 tacacs+==4.0.4.27a-3 tcpdump==4.9.3-1~deb10u2 diff --git a/files/build/versions/dockers/docker-router-advertiser/versions-deb-bullseye b/files/build/versions/dockers/docker-router-advertiser/versions-deb-bullseye index 1740ef17a275..8c19e7de1f30 100644 --- a/files/build/versions/dockers/docker-router-advertiser/versions-deb-bullseye +++ b/files/build/versions/dockers/docker-router-advertiser/versions-deb-bullseye @@ -10,7 +10,7 @@ libedit2==3.1-20191231-2+b1 libfido2-1==1.6.0-2 libglib2.0-0==2.66.8-1 libgpm2==1.20.7-8 -libhiredis0.14-dbgsym==0.14.0-3~bpo9+1 +libhiredis0.14-dbgsym==0.14.1-1 libicu67==67.1-7 libipt2==2.0.3-1 libmpfr6==4.1.0-3 diff --git a/files/build/versions/dockers/docker-saiserverv2-brcm/versions-deb-bullseye b/files/build/versions/dockers/docker-saiserverv2-brcm/versions-deb-bullseye index 8f69720ba03e..c4d3441e84ff 100644 --- a/files/build/versions/dockers/docker-saiserverv2-brcm/versions-deb-bullseye +++ b/files/build/versions/dockers/docker-saiserverv2-brcm/versions-deb-bullseye @@ -11,7 +11,7 @@ libicu67==67.1-7 libipt2==2.0.3-1 libkmod2==28-1 libmpfr6==4.1.0-3 -libsaibcm==7.1.50.4 +libsaibcm==7.1.36.4 libsaithrift-dev==0.9.4 libsource-highlight-common==3.1.9-3 libsource-highlight4v5==3.1.9-3+b1 diff --git a/files/build/versions/dockers/docker-sflow/versions-deb-buster b/files/build/versions/dockers/docker-sflow/versions-deb-buster index 506cd2be984d..7bfc01119acd 100644 --- a/files/build/versions/dockers/docker-sflow/versions-deb-buster +++ b/files/build/versions/dockers/docker-sflow/versions-deb-buster @@ -8,7 +8,7 @@ libdw1==0.176-1.1 libedit2==3.1-20181209-1 libglib2.0-0==2.58.3-2+deb10u4 libgpm2==1.20.7-5 -libhiredis0.14-dbgsym==0.14.0-3~bpo9+1 +libhiredis0.14-dbgsym==0.14.1-1 libipt2==2.0-2 libpopt0==1.16-12 libswsscommon-dbgsym==1.0.0 diff --git a/files/build/versions/dockers/docker-snmp/versions-deb-bullseye b/files/build/versions/dockers/docker-snmp/versions-deb-bullseye index 02bac1bd2f63..64f74a5a9a50 100644 --- a/files/build/versions/dockers/docker-snmp/versions-deb-bullseye +++ b/files/build/versions/dockers/docker-snmp/versions-deb-bullseye @@ -32,7 +32,7 @@ libgcc-10-dev==10.2.1-6 libglib2.0-0==2.66.8-1 libgomp1==10.2.1-6 libgpm2==1.20.7-8 -libhiredis0.14-dbgsym==0.14.0-3~bpo9+1 +libhiredis0.14-dbgsym==0.14.1-1 libicu67==67.1-7 libipt2==2.0.3-1 libisl23==0.23-1 diff --git a/files/build/versions/dockers/docker-sonic-mgmt-framework/versions-deb-buster b/files/build/versions/dockers/docker-sonic-mgmt-framework/versions-deb-buster index 193eec79d8cf..6a2af41854fc 100644 --- a/files/build/versions/dockers/docker-sonic-mgmt-framework/versions-deb-buster +++ b/files/build/versions/dockers/docker-sonic-mgmt-framework/versions-deb-buster @@ -27,7 +27,7 @@ libgcc-8-dev==8.3.0-6 libglib2.0-0==2.58.3-2+deb10u4 libgomp1==8.3.0-6 libgpm2==1.20.7-5 -libhiredis0.14-dbgsym==0.14.0-3~bpo9+1 +libhiredis0.14-dbgsym==0.14.1-1 libicu63==63.1-6+deb10u3 libipt2==2.0-2 libisl19==0.20-2 @@ -38,7 +38,7 @@ libmpfr6==4.0.2-1 libmpx2==8.3.0-6 libpopt0==1.16-12 libpython3-dev==3.7.3-1 -libpython3.7-dev==3.7.3-2+deb10u4 +libpython3.7-dev==3.7.3-2+deb10u5 libquadmath0==8.3.0-6 libstdc++-8-dev==8.3.0-6 libswsscommon-dbgsym==1.0.0 @@ -49,7 +49,7 @@ libxml2==2.9.4+dfsg1-7+deb10u6 linux-libc-dev==4.19.282-1 openssh-client==1:7.9p1-10+deb10u2 python3-dev==3.7.3-1 -python3.7-dev==3.7.3-2+deb10u4 +python3.7-dev==3.7.3-2+deb10u5 sonic-mgmt-common==1.0.0 sonic-mgmt-framework==1.0-01 sonic-mgmt-framework-dbg==1.0-01 diff --git a/files/build/versions/dockers/docker-sonic-telemetry/versions-deb-bullseye b/files/build/versions/dockers/docker-sonic-telemetry/versions-deb-bullseye index eddeb70ec8af..48f8fde2337a 100644 --- a/files/build/versions/dockers/docker-sonic-telemetry/versions-deb-bullseye +++ b/files/build/versions/dockers/docker-sonic-telemetry/versions-deb-bullseye @@ -10,7 +10,7 @@ libedit2==3.1-20191231-2+b1 libfido2-1==1.6.0-2 libglib2.0-0==2.66.8-1 libgpm2==1.20.7-8 -libhiredis0.14-dbgsym==0.14.0-3~bpo9+1 +libhiredis0.14-dbgsym==0.14.1-1 libicu67==67.1-7 libipt2==2.0.3-1 libmpfr6==4.1.0-3 diff --git a/files/build/versions/dockers/docker-sonic-vs/versions-deb-buster b/files/build/versions/dockers/docker-sonic-vs/versions-deb-buster index 9d41b62502da..b27ae2613d3e 100644 --- a/files/build/versions/dockers/docker-sonic-vs/versions-deb-buster +++ b/files/build/versions/dockers/docker-sonic-vs/versions-deb-buster @@ -126,7 +126,7 @@ libpython2.7-dev==2.7.16-2+deb10u2 libpython2.7-minimal==2.7.16-2+deb10u2 libpython2.7-stdlib==2.7.16-2+deb10u2 libpython3-dev==3.7.3-1 -libpython3.7-dev==3.7.3-2+deb10u4 +libpython3.7-dev==3.7.3-2+deb10u5 libqt5core5a==5.11.3+dfsg1-1+deb10u5 libqt5dbus5==5.11.3+dfsg1-1+deb10u5 libqt5network5==5.11.3+dfsg1-1+deb10u5 @@ -140,8 +140,8 @@ libsm-dev==2:1.2.3-1 libsm6==2:1.2.3-1 libssl-dev==1.1.1n-0+deb10u5 libstdc++-8-dev==8.3.0-6 -libsystemd-dev==241-7~deb10u9 -libsystemd0==241-7~deb10u9 +libsystemd-dev==241-7~deb10u10 +libsystemd0==241-7~deb10u10 libteam-utils==1.30-1 libteam5==1.30-1 libteamdctl0==1.30-1 @@ -197,7 +197,7 @@ python3-mako==1.0.7+ds1-1+deb10u1 python3-markdown==3.0.1-3 python3-markupsafe==1.1.0-1 python3-pkg-resources==40.8.0-1 -python3.7-dev==3.7.3-2+deb10u4 +python3.7-dev==3.7.3-2+deb10u5 redis-server==5:6.0.6-1~bpo10+1 sensible-utils==0.0.12 sonic-device-data==1.0-1 diff --git a/files/build/versions/dockers/docker-syncd-brcm-dnx/versions-deb-bullseye b/files/build/versions/dockers/docker-syncd-brcm-dnx/versions-deb-bullseye index 3cf64b81b893..665822a59e16 100644 --- a/files/build/versions/dockers/docker-syncd-brcm-dnx/versions-deb-bullseye +++ b/files/build/versions/dockers/docker-syncd-brcm-dnx/versions-deb-bullseye @@ -12,12 +12,12 @@ libedit2==3.1-20191231-2+b1 libfido2-1==1.6.0-2 libglib2.0-0==2.66.8-1 libgpm2==1.20.7-8 -libhiredis0.14-dbgsym==0.14.0-3~bpo9+1 +libhiredis0.14-dbgsym==0.14.1-1 libicu67==67.1-7 libipt2==2.0.3-1 libkmod2==28-1 libmpfr6==4.1.0-3 -libsaibcm==7.1.50.4 +libsaibcm==7.1.42.4 libsaimetadata==1.0.0 libsaimetadata-dbg==1.0.0 libsairedis==1.0.0 diff --git a/files/build/versions/dockers/docker-syncd-brcm/versions-deb-bullseye b/files/build/versions/dockers/docker-syncd-brcm/versions-deb-bullseye index c3772ebe0c79..0ee7edf0605c 100644 --- a/files/build/versions/dockers/docker-syncd-brcm/versions-deb-bullseye +++ b/files/build/versions/dockers/docker-syncd-brcm/versions-deb-bullseye @@ -12,12 +12,12 @@ libedit2==3.1-20191231-2+b1 libfido2-1==1.6.0-2 libglib2.0-0==2.66.8-1 libgpm2==1.20.7-8 -libhiredis0.14-dbgsym==0.14.0-3~bpo9+1 +libhiredis0.14-dbgsym==0.14.1-1 libicu67==67.1-7 libipt2==2.0.3-1 libkmod2==28-1 libmpfr6==4.1.0-3 -libsaibcm==7.1.50.4 +libsaibcm==7.1.36.4 libsaimetadata==1.0.0 libsaimetadata-dbg==1.0.0 libsairedis==1.0.0 diff --git a/files/build/versions/dockers/docker-syncd-centec/versions-deb-buster b/files/build/versions/dockers/docker-syncd-centec/versions-deb-buster index 0521833afde1..b1fe7a375225 100644 --- a/files/build/versions/dockers/docker-syncd-centec/versions-deb-buster +++ b/files/build/versions/dockers/docker-syncd-centec/versions-deb-buster @@ -7,7 +7,7 @@ libdw1==0.176-1.1 libedit2==3.1-20181209-1 libglib2.0-0==2.58.3-2+deb10u4 libgpm2==1.20.7-5 -libhiredis0.14-dbgsym==0.14.0-3~bpo9+1 +libhiredis0.14-dbgsym==0.14.1-1 libipt2==2.0-2 libkmod2==26-1 libpopt0==1.16-12 diff --git a/files/build/versions/dockers/docker-syncd-mlnx/versions-deb-bullseye b/files/build/versions/dockers/docker-syncd-mlnx/versions-deb-bullseye index 1adbeae520aa..a34b0b9fb12c 100644 --- a/files/build/versions/dockers/docker-syncd-mlnx/versions-deb-bullseye +++ b/files/build/versions/dockers/docker-syncd-mlnx/versions-deb-bullseye @@ -18,7 +18,7 @@ libexpat1-dev==2.2.10-2+deb11u5 libfido2-1==1.6.0-2 libglib2.0-0==2.66.8-1 libgpm2==1.20.7-8 -libhiredis0.14-dbgsym==0.14.0-3~bpo9+1 +libhiredis0.14-dbgsym==0.14.1-1 libicu67==67.1-7 libipt2==2.0.3-1 libjs-sphinxdoc==3.4.3-2 diff --git a/files/build/versions/dockers/docker-syncd-vs/versions-deb-buster b/files/build/versions/dockers/docker-syncd-vs/versions-deb-buster index d190a6829961..1de156fb4167 100644 --- a/files/build/versions/dockers/docker-syncd-vs/versions-deb-buster +++ b/files/build/versions/dockers/docker-syncd-vs/versions-deb-buster @@ -8,7 +8,7 @@ libdw1==0.176-1.1 libedit2==3.1-20181209-1 libglib2.0-0==2.58.3-2+deb10u4 libgpm2==1.20.7-5 -libhiredis0.14-dbgsym==0.14.0-3~bpo9+1 +libhiredis0.14-dbgsym==0.14.1-1 libipt2==2.0-2 libpopt0==1.16-12 libsaimetadata==1.0.0 diff --git a/files/build/versions/dockers/docker-teamd/versions-deb-bullseye b/files/build/versions/dockers/docker-teamd/versions-deb-bullseye index 6d8a7109877c..a8367b0f3b4c 100644 --- a/files/build/versions/dockers/docker-teamd/versions-deb-bullseye +++ b/files/build/versions/dockers/docker-teamd/versions-deb-bullseye @@ -10,7 +10,7 @@ libedit2==3.1-20191231-2+b1 libfido2-1==1.6.0-2 libglib2.0-0==2.66.8-1 libgpm2==1.20.7-8 -libhiredis0.14-dbgsym==0.14.0-3~bpo9+1 +libhiredis0.14-dbgsym==0.14.1-1 libicu67==67.1-7 libipt2==2.0.3-1 libmpfr6==4.1.0-3 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 ccb1d9948fae..2b5fb8db836d 100644 --- a/files/build/versions/dockers/sonic-slave-buster/versions-deb-buster +++ b/files/build/versions/dockers/sonic-slave-buster/versions-deb-buster @@ -413,9 +413,9 @@ libcryptsetup12==2:2.1.0-5+deb10u2 libcrystalhd3==1:0.0~git20110715.fdd2f19-13 libcunit1==2.1-3-dfsg-2+b12 libcunit1-dev==2.1-3-dfsg-2+b12 -libcups2==2.2.10-6+deb10u7 +libcups2==2.2.10-6+deb10u8 libcupsfilters1==1.21.6-5+deb10u1 -libcupsimage2==2.2.10-6+deb10u7 +libcupsimage2==2.2.10-6+deb10u8 libcurl3-gnutls==7.64.0-4+deb10u6 libcurl4==7.64.0-4+deb10u6 libcurl4-openssl-dev==7.64.0-4+deb10u6 @@ -839,7 +839,7 @@ libnorm-dev==1.5.8+dfsg2-1 libnorm1==1.5.8+dfsg2-1 libnpth0==1.6-1 libnspr4==2:4.20-1 -libnss-systemd==241-7~deb10u9 +libnss-systemd==241-7~deb10u10 libnss3==2:3.42.1-1+deb10u6 libnuma-dev==2.0.12-1 libnuma1==2.0.12-1 @@ -876,7 +876,7 @@ libpackage-stash-perl==0.38-1 libpackage-stash-xs-perl==0.29-1 libpackagekit-glib2-18==1.1.12-5 libpadwalker-perl==2.3-1+b1 -libpam-systemd==241-7~deb10u9 +libpam-systemd==241-7~deb10u10 libpam0g-dev==1.3.1-5 libpango-1.0-0==1.42.4-8~deb10u1 libpango1.0-dev==1.42.4-8~deb10u1 @@ -974,11 +974,11 @@ libpython3-all-dev==3.7.3-1 libpython3-dbg==3.7.3-1 libpython3-dev==3.7.3-1 libpython3-stdlib==3.7.3-1 -libpython3.7==3.7.3-2+deb10u4 -libpython3.7-dbg==3.7.3-2+deb10u4 -libpython3.7-dev==3.7.3-2+deb10u4 -libpython3.7-minimal==3.7.3-2+deb10u4 -libpython3.7-stdlib==3.7.3-2+deb10u4 +libpython3.7==3.7.3-2+deb10u5 +libpython3.7-dbg==3.7.3-2+deb10u5 +libpython3.7-dev==3.7.3-2+deb10u5 +libpython3.7-minimal==3.7.3-2+deb10u5 +libpython3.7-stdlib==3.7.3-2+deb10u5 libqdox-java==1.12.1-3 libqdox2-java==2.0~M10-1 libqt4-dbus==4:4.8.7+dfsg-18+deb10u1 @@ -1112,7 +1112,8 @@ libswresample3==7:4.1.11-0+deb10u1 libswscale5==7:4.1.11-0+deb10u1 libsynctex2==2018.20181218.49446-1+deb10u2 libsys-hostname-long-perl==1.5-1 -libsystemd-dev==241-7~deb10u9 +libsystemd-dev==241-7~deb10u10 +libsystemd0==241-7~deb10u10 libtag1v5==1.11.1+dfsg.1-0.3+deb10u1 libtag1v5-vanilla==1.11.1+dfsg.1-0.3+deb10u1 libtask-weaken-perl==1.06-1 @@ -1153,7 +1154,8 @@ libtype-tiny-xs-perl==0.014-1+b1 libtypes-serialiser-perl==1.0-1 libubsan1==8.3.0-6 libuchardet0==0.0.6-3 -libudev-dev==241-7~deb10u9 +libudev-dev==241-7~deb10u10 +libudev1==241-7~deb10u10 libunbound8==1.9.0-2+deb10u3 libunicode-utf8-perl==0.62-1 libunwind-dev==1.2.1-10~deb10u1 @@ -1644,10 +1646,10 @@ python3-urllib3==1.24.1-1 python3-wheel==0.32.3-2 python3-xdg==0.25-5 python3-yaml==3.13-2 -python3.7==3.7.3-2+deb10u4 -python3.7-dbg==3.7.3-2+deb10u4 -python3.7-dev==3.7.3-2+deb10u4 -python3.7-minimal==3.7.3-2+deb10u4 +python3.7==3.7.3-2+deb10u5 +python3.7-dbg==3.7.3-2+deb10u5 +python3.7-dev==3.7.3-2+deb10u5 +python3.7-minimal==3.7.3-2+deb10u5 qdbus==4:4.8.7+dfsg-18+deb10u1 qemu-kvm==1:3.1+dfsg-8+deb10u10 qemu-system-common==1:3.1+dfsg-8+deb10u10 @@ -1705,8 +1707,8 @@ strace==4.26-0.2 sudo==1.8.27-1+deb10u5 swig==3.0.12-2 swig3.0==3.0.12-2 -systemd==241-7~deb10u9 -systemd-sysv==241-7~deb10u9 +systemd==241-7~deb10u10 +systemd-sysv==241-7~deb10u10 t1utils==1.41-3 tcl==8.6.9+1 tcl8.6==8.6.9+dfsg-2 diff --git a/files/build/versions/host-image/versions-deb-bullseye b/files/build/versions/host-image/versions-deb-bullseye index 37e146757b35..698510b90905 100644 --- a/files/build/versions/host-image/versions-deb-bullseye +++ b/files/build/versions/host-image/versions-deb-bullseye @@ -170,7 +170,7 @@ libgpm2==1.20.7-8 libgrpc++1==1.30.2-3 libgrpc10==1.30.2-3 libhavege2==1.9.14-1 -libhiredis0.14==0.14.0-3~bpo9+1 +libhiredis0.14==0.14.1-1 libi2c0==4.2-1+b1 libice-dev==2:1.0.10-1 libice6==2:1.0.10-1 diff --git a/files/build_templates/docker_image_ctl.j2 b/files/build_templates/docker_image_ctl.j2 index 6879aeb703f7..ab13a03ca35a 100644 --- a/files/build_templates/docker_image_ctl.j2 +++ b/files/build_templates/docker_image_ctl.j2 @@ -246,10 +246,18 @@ function postStartAction() $SONIC_DB_CLI CONFIG_DB SET "CONFIG_DB_INITIALIZED" "1" fi - if [[ -x /usr/local/bin/db_migrator.py ]]; then - # Migrate the DB to the latest schema version if needed - if [ -z "$DEV" ]; then - /usr/local/bin/db_migrator.py -o migrate + if [ -e /tmp/pending_config_migration ]; then + # this is first boot to a new image, config-setup execution is pending. + # For fast/cold reboot case, DB contains nothing at this point + # Call db_migrator after config-setup loads the config (from old config or minigraph) + echo "Delaying db_migrator until config migration is over" + else + # this is not a first time boot to a new image. Datbase container starts w/ old pre-existing config + if [[ -x /usr/local/bin/db_migrator.py ]]; then + # Migrate the DB to the latest schema version if needed + if [ -z "$DEV" ]; then + /usr/local/bin/db_migrator.py -o migrate + fi fi fi # Add redis UDS to the redis group and give read/write access to the group diff --git a/files/build_templates/sonic_debian_extension.j2 b/files/build_templates/sonic_debian_extension.j2 index ab3a5c58a22a..2f31b5ded06d 100644 --- a/files/build_templates/sonic_debian_extension.j2 +++ b/files/build_templates/sonic_debian_extension.j2 @@ -475,12 +475,6 @@ sudo cp {{sonic_ctrmgmt_py3_wheel_path}} $FILESYSTEM_ROOT/$SONIC_CTRMGMT_WHEEL_N sudo https_proxy=$https_proxy LANG=C chroot $FILESYSTEM_ROOT pip3 install $SONIC_CTRMGMT_WHEEL_NAME sudo rm -rf $FILESYSTEM_ROOT/$SONIC_CTRMGMT_WHEEL_NAME -# Copy remote container mangement files -# File called from each container upon start/stop to record the state -sudo mkdir -p ${FILESYSTEM_ROOT_USR_SHARE_SONIC_SCRIPTS} -sudo cp ${files_path}/container_startup.py ${FILESYSTEM_ROOT_USR_SHARE_SONIC_SCRIPTS}/ -sudo chmod a+x ${FILESYSTEM_ROOT_USR_SHARE_SONIC_SCRIPTS}/container_startup.py - # Config file used by container mgmt scripts/service fl="${files_path}/remote_ctr.config.json" use_k8s_as_http_proxy=$(python3 -c 'import json diff --git a/files/image_config/config-setup/config-setup b/files/image_config/config-setup/config-setup index 0f5a248b05f8..28a3a4373a42 100755 --- a/files/image_config/config-setup/config-setup +++ b/files/image_config/config-setup/config-setup @@ -304,6 +304,16 @@ check_all_config_db_present() return 0 } +# DB schema is subject to change between two images +# Perform DB schema migration after loading backup config from previous image +do_db_migration() +{ + if [[ -x /usr/local/bin/db_migrator.py ]]; then + # Migrate the DB to the latest schema version if needed + /usr/local/bin/db_migrator.py -o migrate + fi +} + # Perform configuration migration from backup copy. # - This step is performed when a new image is installed and SONiC switch boots into it do_config_migration() @@ -326,16 +336,19 @@ do_config_migration() if [ x"${WARM_BOOT}" == x"true" ]; then echo "Warm reboot detected..." disable_updategraph + do_db_migration rm -f /tmp/pending_config_migration exit 0 elif check_all_config_db_present; then echo "Use config_db.json from old system..." reload_configdb + do_db_migration # Disable updategraph disable_updategraph elif [ -r ${MINGRAPH_FILE} ]; then echo "Use minigraph.xml from old system..." reload_minigraph + do_db_migration # Disable updategraph disable_updategraph else diff --git a/platform/components/docker-gbsyncd-credo.mk b/platform/components/docker-gbsyncd-credo.mk index d1961afe9a12..34f7101759eb 100644 --- a/platform/components/docker-gbsyncd-credo.mk +++ b/platform/components/docker-gbsyncd-credo.mk @@ -1,9 +1,9 @@ DOCKER_GBSYNCD_PLATFORM_CODE = credo -LIBSAI_CREDO = libsaicredo_0.9.0_amd64.deb -$(LIBSAI_CREDO)_URL = "https://sonicstorage.blob.core.windows.net/packages/credosai/libsaicredo_0.9.0_amd64.deb?sv=2021-04-10&st=2023-03-08T02%3A10%3A11Z&se=2100-03-09T02%3A10%3A00Z&sr=b&sp=r&sig=mxOWttgAuOXVjvDI3zF5KHcrTHBgg6mv%2FOpTOxlCoVM%3D" -LIBSAI_CREDO_OWL = libsaicredo-owl_0.9.0_amd64.deb -$(LIBSAI_CREDO_OWL)_URL = "https://sonicstorage.blob.core.windows.net/packages/credosai/libsaicredo-owl_0.9.0_amd64.deb?sv=2021-04-10&st=2023-03-08T02%3A12%3A02Z&se=2100-03-09T02%3A12%3A00Z&sr=b&sp=r&sig=n4mqMVnZxC3u14EWRehfl6bqqUAi1VP1uUdHGg3%2B7H4%3D" +LIBSAI_CREDO = libsaicredo_0.8.2_amd64.deb +$(LIBSAI_CREDO)_URL = "https://sonicstorage.blob.core.windows.net/packages/credosai/libsaicredo_0.8.2_amd64.deb?sv=2021-04-10&st=2023-01-31T04%3A24%3A23Z&se=2100-01-31T04%3A24%3A00Z&sr=b&sp=r&sig=RZPbmaIetvDRtwifrVT4s%2FaQxB%2FBTOyCqXtMtoNRjmY%3D" +LIBSAI_CREDO_OWL = libsaicredo-owl_0.8.2_amd64.deb +$(LIBSAI_CREDO_OWL)_URL = "https://sonicstorage.blob.core.windows.net/packages/credosai/libsaicredo-owl_0.8.2_amd64.deb?sv=2021-04-10&st=2023-01-31T04%3A25%3A43Z&se=2100-01-31T04%3A25%3A00Z&sr=b&sp=r&sig=%2BdSFujwy0gY%2FiH50Ffi%2FsqZOAHBOFPUcBdR06fHEZkI%3D" ifneq ($($(LIBSAI_CREDO)_URL),) include $(PLATFORM_PATH)/../template/docker-gbsyncd-base.mk diff --git a/rules/docker-config-engine-bullseye.mk b/rules/docker-config-engine-bullseye.mk index 0c4aad67a8d7..470f2463a5fd 100644 --- a/rules/docker-config-engine-bullseye.mk +++ b/rules/docker-config-engine-bullseye.mk @@ -17,6 +17,7 @@ $(DOCKER_CONFIG_ENGINE_BULLSEYE)_PYTHON_WHEELS += $(SONIC_CONFIG_ENGINE_PY3) $(DOCKER_CONFIG_ENGINE_BULLSEYE)_LOAD_DOCKERS += $(DOCKER_BASE_BULLSEYE) $(DOCKER_CONFIG_ENGINE_BULLSEYE)_FILES += $(SWSS_VARS_TEMPLATE) $(DOCKER_CONFIG_ENGINE_BULLSEYE)_FILES += $($(SONIC_CTRMGRD)_CONTAINER_SCRIPT) +$(DOCKER_CONFIG_ENGINE_BULLSEYE)_FILES += $($(SONIC_CTRMGRD)_STARTUP_SCRIPT) $(DOCKER_CONFIG_ENGINE_BULLSEYE)_DBG_DEPENDS = $($(DOCKER_BASE_BULLSEYE)_DBG_DEPENDS) \ $(LIBSWSSCOMMON_DBG) \ diff --git a/rules/docker-config-engine-buster.mk b/rules/docker-config-engine-buster.mk index 079fc6dd074c..ef43fb66f081 100644 --- a/rules/docker-config-engine-buster.mk +++ b/rules/docker-config-engine-buster.mk @@ -17,6 +17,7 @@ $(DOCKER_CONFIG_ENGINE_BUSTER)_PYTHON_WHEELS += $(SONIC_CONFIG_ENGINE_PY3) $(DOCKER_CONFIG_ENGINE_BUSTER)_LOAD_DOCKERS += $(DOCKER_BASE_BUSTER) $(DOCKER_CONFIG_ENGINE_BUSTER)_FILES += $(SWSS_VARS_TEMPLATE) $(DOCKER_CONFIG_ENGINE_BUSTER)_FILES += $($(SONIC_CTRMGRD)_CONTAINER_SCRIPT) +$(DOCKER_CONFIG_ENGINE_BUSTER)_FILES += $($(SONIC_CTRMGRD)_STARTUP_SCRIPT) $(DOCKER_CONFIG_ENGINE_BUSTER)_DBG_DEPENDS = $($(DOCKER_BASE_BUSTER)_DBG_DEPENDS) \ $(LIBSWSSCOMMON_DBG) \ diff --git a/rules/docker-dhcp-relay.mk b/rules/docker-dhcp-relay.mk index c2db8d7ba538..747e00cc1e37 100644 --- a/rules/docker-dhcp-relay.mk +++ b/rules/docker-dhcp-relay.mk @@ -47,7 +47,6 @@ endif $(DOCKER_DHCP_RELAY)_CONTAINER_NAME = dhcp_relay $(DOCKER_DHCP_RELAY)_CONTAINER_PRIVILEGED = true $(DOCKER_DHCP_RELAY)_CONTAINER_VOLUMES += /etc/sonic:/etc/sonic:ro -$(DOCKER_DHCP_RELAY)_CONTAINER_VOLUMES += /usr/share/sonic/scripts:/usr/share/sonic/scripts:ro $(DOCKER_DHCP_RELAY)_CONTAINER_TMPFS += /tmp/ $(DOCKER_DHCP_RELAY)_CONTAINER_TMPFS += /var/tmp/ diff --git a/rules/docker-lldp.mk b/rules/docker-lldp.mk index b2e7b350f3bb..f0d16e3f5f17 100644 --- a/rules/docker-lldp.mk +++ b/rules/docker-lldp.mk @@ -30,7 +30,6 @@ SONIC_INSTALL_DOCKER_DBG_IMAGES += $(DOCKER_LLDP_DBG) $(DOCKER_LLDP)_CONTAINER_NAME = lldp $(DOCKER_LLDP)_RUN_OPT += --privileged -t $(DOCKER_LLDP)_RUN_OPT += -v /etc/sonic:/etc/sonic:ro -$(DOCKER_LLDP)_RUN_OPT += -v /usr/share/sonic/scripts:/usr/share/sonic/scripts:ro $(DOCKER_LLDP)_BASE_IMAGE_FILES += lldpctl:/usr/bin/lldpctl $(DOCKER_LLDP)_BASE_IMAGE_FILES += lldpcli:/usr/bin/lldpcli diff --git a/rules/docker-platform-monitor.mk b/rules/docker-platform-monitor.mk index cb9be990e61b..356d3e0488b5 100644 --- a/rules/docker-platform-monitor.mk +++ b/rules/docker-platform-monitor.mk @@ -51,7 +51,6 @@ SONIC_INSTALL_DOCKER_DBG_IMAGES += $(DOCKER_PLATFORM_MONITOR_DBG) $(DOCKER_PLATFORM_MONITOR)_CONTAINER_NAME = pmon $(DOCKER_PLATFORM_MONITOR)_RUN_OPT += --privileged -t $(DOCKER_PLATFORM_MONITOR)_RUN_OPT += -v /etc/sonic:/etc/sonic:ro -$(DOCKER_PLATFORM_MONITOR)_RUN_OPT += -v /usr/share/sonic/scripts:/usr/share/sonic/scripts:ro $(DOCKER_PLATFORM_MONITOR)_RUN_OPT += -v /var/run/platform_cache:/var/run/platform_cache:ro $(DOCKER_PLATFORM_MONITOR)_RUN_OPT += -v /usr/share/sonic/device/pddf:/usr/share/sonic/device/pddf:ro diff --git a/rules/docker-router-advertiser.mk b/rules/docker-router-advertiser.mk index 6d5b9e4717bd..6d36bfa7f40c 100644 --- a/rules/docker-router-advertiser.mk +++ b/rules/docker-router-advertiser.mk @@ -27,5 +27,4 @@ SONIC_INSTALL_DOCKER_DBG_IMAGES += $(DOCKER_ROUTER_ADVERTISER_DBG) $(DOCKER_ROUTER_ADVERTISER)_CONTAINER_NAME = radv $(DOCKER_ROUTER_ADVERTISER)_RUN_OPT += --privileged -t $(DOCKER_ROUTER_ADVERTISER)_RUN_OPT += -v /etc/sonic:/etc/sonic:ro -$(DOCKER_ROUTER_ADVERTISER)_RUN_OPT += -v /usr/share/sonic/scripts:/usr/share/sonic/scripts:ro $(DOCKER_ROUTER_ADVERTISER)_FILES += $(SUPERVISOR_PROC_EXIT_LISTENER_SCRIPT) diff --git a/rules/docker-snmp.mk b/rules/docker-snmp.mk index 047c8c59925e..f40f2c392735 100644 --- a/rules/docker-snmp.mk +++ b/rules/docker-snmp.mk @@ -29,7 +29,6 @@ SONIC_INSTALL_DOCKER_DBG_IMAGES += $(DOCKER_SNMP_DBG) $(DOCKER_SNMP)_CONTAINER_NAME = snmp $(DOCKER_SNMP)_RUN_OPT += --privileged -t $(DOCKER_SNMP)_RUN_OPT += -v /etc/sonic:/etc/sonic:ro -$(DOCKER_SNMP)_RUN_OPT += -v /usr/share/sonic/scripts:/usr/share/sonic/scripts:ro $(DOCKER_SNMP)_FILES += $(SUPERVISOR_PROC_EXIT_LISTENER_SCRIPT) $(DOCKER_SNMP)_BASE_IMAGE_FILES += monit_snmp:/etc/monit/conf.d diff --git a/rules/docker-telemetry.mk b/rules/docker-telemetry.mk index 4a2d3fd64e28..a3db04d4f5df 100644 --- a/rules/docker-telemetry.mk +++ b/rules/docker-telemetry.mk @@ -30,7 +30,6 @@ endif $(DOCKER_TELEMETRY)_CONTAINER_NAME = telemetry $(DOCKER_TELEMETRY)_RUN_OPT += --privileged -t $(DOCKER_TELEMETRY)_RUN_OPT += -v /etc/sonic:/etc/sonic:ro -$(DOCKER_TELEMETRY)_RUN_OPT += -v /usr/share/sonic/scripts:/usr/share/sonic/scripts:ro $(DOCKER_TELEMETRY)_RUN_OPT += -v /var/run/dbus:/var/run/dbus:rw $(DOCKER_TELEMETRY)_FILES += $(SUPERVISOR_PROC_EXIT_LISTENER_SCRIPT) diff --git a/rules/sonic-fips.mk b/rules/sonic-fips.mk index 9eb2d86bfb4d..e53f8e5c4c82 100644 --- a/rules/sonic-fips.mk +++ b/rules/sonic-fips.mk @@ -1,6 +1,6 @@ # fips packages -FIPS_VERSION = 0.7 +FIPS_VERSION = 0.8 FIPS_OPENSSL_VERSION = 1.1.1n-0+deb11u4+fips FIPS_OPENSSH_VERSION = 8.4p1-5+deb11u1+fips FIPS_PYTHON_MAIN_VERSION = 3.9 diff --git a/src/sonic-ctrmgrd/ctrmgr/container b/src/sonic-ctrmgrd/ctrmgr/container index 9be2a5b3fe3b..46af96ac3dd8 100755 --- a/src/sonic-ctrmgrd/ctrmgr/container +++ b/src/sonic-ctrmgrd/ctrmgr/container @@ -11,7 +11,7 @@ import datetime import docker from swsscommon import swsscommon -CTR_STATE_SCR_PATH = '/usr/share/sonic/scripts/container_startup.py' +CTRMGRD_SERVICE_PATH = '/lib/systemd/system/ctrmgrd.service' state_db = None @@ -62,7 +62,7 @@ def init(): cfg_db = swsscommon.DBConnector("CONFIG_DB", 0) state_db = swsscommon.DBConnector("STATE_DB", 0) - remote_ctr_enabled = os.path.exists(CTR_STATE_SCR_PATH) + remote_ctr_enabled = os.path.exists(CTRMGRD_SERVICE_PATH) def get_config_data(fld, dflt): diff --git a/src/sonic-ctrmgrd/ctrmgr/container_startup.py b/src/sonic-ctrmgrd/ctrmgr/container_startup.py index d94b4ef97bc2..92b6910cc98d 100755 --- a/src/sonic-ctrmgrd/ctrmgr/container_startup.py +++ b/src/sonic-ctrmgrd/ctrmgr/container_startup.py @@ -218,6 +218,9 @@ def container_up(feature, owner, version): debug_msg("args: feature={}, owner={}, version={} DB: set_owner={} state_data={}".format( feature, owner, version, set_owner, json.dumps(state_data, indent=4))) + if state_data[SYSTEM_STATE] == '': + return + if owner == "local": update_state(state_db, feature, owner, version) else: diff --git a/src/sonic-ctrmgrd/tests/container_startup_test.py b/src/sonic-ctrmgrd/tests/container_startup_test.py index 23523f66b106..98901a4c6095 100755 --- a/src/sonic-ctrmgrd/tests/container_startup_test.py +++ b/src/sonic-ctrmgrd/tests/container_startup_test.py @@ -23,6 +23,13 @@ "set_owner": "local" } } + }, + common_test.STATE_DB_NO: { + common_test.FEATURE_TABLE: { + "snmp": { + "system_state": "up" + } + } } }, common_test.POST: { diff --git a/src/sonic-ctrmgrd/tests/container_test.py b/src/sonic-ctrmgrd/tests/container_test.py index 8d1534f8b03d..ad4a3a2f00b6 100755 --- a/src/sonic-ctrmgrd/tests/container_test.py +++ b/src/sonic-ctrmgrd/tests/container_test.py @@ -468,7 +468,7 @@ class TestContainer(object): def init(self): - container.CTR_STATE_SCR_PATH = __file__ + container.CTRMGRD_SERVICE_PATH = __file__ container.SONIC_CTR_CONFIG = ( common_test.create_remote_ctr_config_json()) diff --git a/src/sonic-platform-common b/src/sonic-platform-common index 4969f70897fc..56f227aa6dcf 160000 --- a/src/sonic-platform-common +++ b/src/sonic-platform-common @@ -1 +1 @@ -Subproject commit 4969f70897fc45d1e30ca6315508e03bf1805beb +Subproject commit 56f227aa6dcf3ecb71e3dec07bd236d7030f7bb2 diff --git a/src/sonic-platform-daemons b/src/sonic-platform-daemons index d24cca451bab..112656c3bbef 160000 --- a/src/sonic-platform-daemons +++ b/src/sonic-platform-daemons @@ -1 +1 @@ -Subproject commit d24cca451babe3757174cd46e9d4d5387e9f5c6f +Subproject commit 112656c3bbef0c41a47a90418df4b615789fe89d