From 0a4c10fa8635341dd9095e82e259c8b7c5013abc Mon Sep 17 00:00:00 2001 From: "Austin (Thang Pham)" Date: Thu, 6 Aug 2026 09:33:22 +1000 Subject: [PATCH 1/3] fix(docker-ptf): update grpc-go to 1.82.1 (#28853) Update grpcurl to use the first grpc-go release that fixes GHSA-hrxh-6v49-42gf. Signed-off-by: Austin (Ngoc Thang) Pham Copilot-Session: e838b61b-d284-4649-9a41-38824c1a742a --- dockers/docker-ptf/Dockerfile.j2 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dockers/docker-ptf/Dockerfile.j2 b/dockers/docker-ptf/Dockerfile.j2 index 2459e28589..29ce9542f6 100644 --- a/dockers/docker-ptf/Dockerfile.j2 +++ b/dockers/docker-ptf/Dockerfile.j2 @@ -159,7 +159,7 @@ ENV PATH="/usr/local/go/bin:$HOME/go/bin:$PATH" RUN GRPCURL_VERSION=v1.9.3 \ && git clone --depth 1 --branch "${GRPCURL_VERSION}" https://github.com/fullstorydev/grpcurl.git /tmp/grpcurl \ && cd /tmp/grpcurl \ - && go get google.golang.org/grpc@v1.79.3 \ + && go get google.golang.org/grpc@v1.82.1 \ && go get github.com/go-jose/go-jose/v4@latest \ && go get golang.org/x/crypto@latest golang.org/x/net@latest golang.org/x/text@latest golang.org/x/sys@latest golang.org/x/oauth2@latest \ && go mod tidy \ From 0b2faef94668aef37278566e8d6277200de7a807 Mon Sep 17 00:00:00 2001 From: mssonicbld <79238446+mssonicbld@users.noreply.github.com> Date: Thu, 6 Aug 2026 12:53:47 +1000 Subject: [PATCH 2/3] [build] upgrade p4lang-p4c package version (#28851) #### Why I did it The build was failing while fetching the `p4lang-p4c` source package: `get_url_version http://download.opensuse.org/repositories/home:/p4lang/Debian_11/p4lang-p4c_1.2.4.2-2.dsc failed` The OpenSUSE OBS repository (`home:/p4lang/Debian_11`) only keeps the latest revision of each package. Once `p4lang-p4c` was republished, the `1.2.4.2-2` revision stopped resolving and the build broke. The currently published revision is `1.2.4.2-3`. ##### Work item tracking - Microsoft ADO **(number only)**: #### How I did it Bumped the pinned `p4lang-p4c` version to the published revision `1.2.4.2-3`: - `rules/p4lang.mk`: `P4LANG_P4C_VERSION_FULL` -> `$(P4LANG_P4C_VERSION)-3`. - `dockers/docker-ptf/Dockerfile.j2`: `apt install` reference -> `p4lang-p4c_1.2.4.2-3_amd64.deb`. #### How to verify it Build the docker-ptf image / `target/sonic-vs.img.gz`; the `p4lang-p4c` deb fetch and build succeed. #### Which release branch to backport (provide reason below if selected) This is a build fix; it can be backported to active release branches that still pin `p4lang-p4c 1.2.4.2-2` and hit the same OpenSUSE fetch failure. - [ ] 202305 - [ ] 202311 - [ ] 202405 - [ ] 202411 - [ ] 202505 - [ ] 202511 - [ ] 202512 - [ ] 202605 - [ ] 202608 #### Tested branch - [x] master - [x] 202605 - [ ] 202611 #### Test result Validated by the PR `Azure.sonic-buildimage` CI on this commit: all build jobs (`BuildVS vs` / `vpp` / `alpinevs`, `broadcom`, `mellanox`, `marvell_prestera`, `nvidia_bluefield`, `aspeed_arm64`) and the Elastictest KVM test suites (t0, t0-2vlans, t1-lag, t1-lag-vpp, t2, multi-asic-t1, dualtor, dpu) passed. Verified on 202511, 202605 branches. #### Description for the changelog Bump p4lang-p4c to 1.2.4.2-3 #### Link to config_db schema for YANG module changes N/A. No YANG or config_db schema changes. Signed-off-by: Sonic Build Admin --- dockers/docker-ptf/Dockerfile.j2 | 2 +- rules/p4lang.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dockers/docker-ptf/Dockerfile.j2 b/dockers/docker-ptf/Dockerfile.j2 index 29ce9542f6..45b210d1ee 100644 --- a/dockers/docker-ptf/Dockerfile.j2 +++ b/dockers/docker-ptf/Dockerfile.j2 @@ -218,7 +218,7 @@ debs/{{ deb }}{{' '}} {% else %} RUN apt-get update # Install p4lang packages for DASH SAI support first and python-saithrift -RUN apt install -y --reinstall ./debs/p4lang-pi_0.1.1-1_amd64.deb ./debs/p4lang-bmv2_1.15.0-9_amd64.deb ./debs/p4lang-p4c_1.2.4.2-2_amd64.deb ./debs/python-saithrift_0.9.4_amd64.deb +RUN apt install -y --reinstall ./debs/p4lang-pi_0.1.1-1_amd64.deb ./debs/p4lang-bmv2_1.15.0-9_amd64.deb ./debs/p4lang-p4c_1.2.4.2-3_amd64.deb ./debs/python-saithrift_0.9.4_amd64.deb {% endif %} diff --git a/rules/p4lang.mk b/rules/p4lang.mk index e5ad612710..3fb59fbcda 100644 --- a/rules/p4lang.mk +++ b/rules/p4lang.mk @@ -30,7 +30,7 @@ SONIC_MAKE_DEBS += $(P4LANG_BMV2) # p4lang-p4c P4LANG_P4C_VERSION = 1.2.4.2 -P4LANG_P4C_VERSION_FULL = $(P4LANG_P4C_VERSION)-2 +P4LANG_P4C_VERSION_FULL = $(P4LANG_P4C_VERSION)-3 export P4LANG_P4C_VERSION export P4LANG_P4C_VERSION_FULL From 769e3d816ab3820948ed014602000306fb8e6d69 Mon Sep 17 00:00:00 2001 From: mssonicbld <79238446+mssonicbld@users.noreply.github.com> Date: Thu, 6 Aug 2026 23:12:34 +1000 Subject: [PATCH 3/3] [submodule] Update submodule sonic-host-services to the latest HEAD automatically (#28869) #### Why I did it src/sonic-host-services ``` * c3bf111 - (HEAD -> 202605, origin/202605) [gnoi-shutdown]: Use Wants= for gnmi.service so ExecCondition runs when gnmi is masked (#420) (49 minutes ago) [mssonicbld] ``` #### How I did it #### How to verify it #### Description for the changelog --- src/sonic-host-services | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/sonic-host-services b/src/sonic-host-services index 99190e163e..c3bf111179 160000 --- a/src/sonic-host-services +++ b/src/sonic-host-services @@ -1 +1 @@ -Subproject commit 99190e163e28a5e55aa782c961f59e1fcc51888c +Subproject commit c3bf11117921af474cfc5381fb1a8bffb519026f