From 9aaf013a8af5ae02d32086e5b3b6a96d86431b06 Mon Sep 17 00:00:00 2001
From: Lucas PASCAL <lucas.pascal@ledger.com>
Date: Mon, 28 Oct 2024 17:52:37 +0100
Subject: [PATCH 1/2] [clean] ENV declared with new syntax instead of legacy
 one

---
 CHANGELOG.md      | 5 +++++
 legacy/Dockerfile | 4 ++--
 lite/Dockerfile   | 2 +-
 3 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 8b8694d..c9b2be9 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -5,6 +5,11 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+## [3.XX.X] - 2024-??-??
+
+### Fixed
+    - Cleaned legacy notation for ENV instruction
+
 ## [3.39.0] - 2024-10-18
 
 ### Changed
diff --git a/legacy/Dockerfile b/legacy/Dockerfile
index 2ce5a10..6e7608a 100644
--- a/legacy/Dockerfile
+++ b/legacy/Dockerfile
@@ -1,7 +1,7 @@
 FROM ghcr.io/ledgerhq/ledger-app-builder/ledger-app-builder-lite:latest AS LITE_BUILDER
 
 FROM ubuntu:22.04
-ENV LANG C.UTF-8
+ENV LANG=C.UTF-8
 
 ARG DEBIAN_FRONTEND=noninteractive
 
@@ -39,7 +39,7 @@ RUN cd /usr/bin && \
 
 # ARM Embedded Toolchain
 # Integrity is checked using the MD5 checksum provided by ARM at https://developer.arm.com/tools-and-software/open-source-software/developer-tools/gnu-toolchain/gnu-rm/downloads
-ENV TOOLCHAIN_VERSION 10.3-2021.10
+ENV TOOLCHAIN_VERSION=10.3-2021.10
 RUN case $(uname -m) in \
         x86_64 | amd64) \
             ARCH=x86_64 \
diff --git a/lite/Dockerfile b/lite/Dockerfile
index f4d447b..5138042 100644
--- a/lite/Dockerfile
+++ b/lite/Dockerfile
@@ -1,5 +1,5 @@
 FROM alpine:3.15
-ENV LANG C.UTF-8
+ENV LANG=C.UTF-8
 
 RUN apk update
 RUN apk upgrade

From 202181007c6b2f36d5af63737b73154557f70553 Mon Sep 17 00:00:00 2001
From: tdejoigny-ledger <thibault.de-joigny@ledger.fr>
Date: Tue, 29 Oct 2024 10:27:51 +0100
Subject: [PATCH 2/2] bump stax & flex SDK versions

---
 CHANGELOG.md    | 3 ++-
 lite/Dockerfile | 4 ++--
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index c9b2be9..7057bc5 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -5,10 +5,11 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
-## [3.XX.X] - 2024-??-??
+## [3.40.0] - 2024-10-29
 
 ### Fixed
     - Cleaned legacy notation for ENV instruction
+    - Bump Flex and Stax SDK versions
 
 ## [3.39.0] - 2024-10-18
 
diff --git a/lite/Dockerfile b/lite/Dockerfile
index 5138042..cbaf745 100644
--- a/lite/Dockerfile
+++ b/lite/Dockerfile
@@ -88,12 +88,12 @@ RUN echo nanos2 > $NANOSP_SDK/.target
 
 # Latest Stax SDK (OS stax_1.5.0 => based on API_LEVEL 21)
 ENV STAX_SDK=/opt/stax-secure-sdk
-RUN git -C "$LEDGER_SECURE_SDK" worktree add "$STAX_SDK" v21.3.6
+RUN git -C "$LEDGER_SECURE_SDK" worktree add "$STAX_SDK" v21.3.7
 RUN echo stax > $STAX_SDK/.target
 
 # Latest Flex SDK (OS flex_1.1.1 => based on API_LEVEL 21)
 ENV FLEX_SDK=/opt/flex-secure-sdk
-RUN git -C "$LEDGER_SECURE_SDK" worktree add "$FLEX_SDK" v21.3.6
+RUN git -C "$LEDGER_SECURE_SDK" worktree add "$FLEX_SDK" v21.3.7
 RUN echo flex > $FLEX_SDK/.target
 
 # Default SDK