Update Amazon Linux 2022 images

[sktomer]

New Release Update: 2022.0.20220308.1

Thanks,
Sumit

[github-actions]

Diff for 9677444:

diff --git a/_bashbrew-cat b/_bashbrew-cat
index c9d830b..77cec17 100644
--- a/_bashbrew-cat
+++ b/_bashbrew-cat
@@ -1,6 +1,6 @@
 Maintainers: Amazon Linux <[email protected]> (@amazonlinux), Frédérick Lefebvre (@fred-lefebvre), Samuel Karp (@samuelkarp), Stewart Smith (@stewartsmith), Christopher Miller (@mysteriouspants), Sumit Tomer (@sktomer), Sean Kelly (@cbgbt), Tanu Rampal (@trampal), Kyle Gosselin-Harris (@kgharris), Sam Thornton (@boostyc), Preston Carpenter (@timidger), Richard Kelly (@rpkelly), Joseph Howell-Burke (@jhowell-burke)
 GitRepo: https://github.com/amazonlinux/container-images.git
-GitCommit: 3a37136d64befa991ec7a677b43910700c45d59b
+GitCommit: e3e844624affdec30b221d64fca178edbd58fe78
 
 Tags: 2.0.20220218.1, 2, latest
 Architectures: amd64, arm64v8
@@ -24,16 +24,16 @@ Tags: 2018.03.0.20220209.0-with-sources, 2018.03-with-sources, 1-with-sources
 amd64-GitCommit: 771960064937c87c92270a1155bb7eb03294e847
 amd64-GitFetch: refs/heads/2018.03-with-sources
 
-Tags: 2022.0.20220202.0, 2022, devel
+Tags: 2022.0.20220308.1, 2022, devel
 Architectures: amd64, arm64v8
-amd64-GitCommit: 55c055505a7ea0a83e47e66d293ba3631329ea05
+amd64-GitCommit: 6fa4bf1b19c77dfa6c49aed95207c334dcf72380
 amd64-GitFetch: refs/heads/al2022
-arm64v8-GitCommit: 39ebc491f771c17a9a9d49cb605977d351449cc7
+arm64v8-GitCommit: ae590b62c98df7f0960cf60941f60ea7c9eefe2a
 arm64v8-GitFetch: refs/heads/al2022-arm64
 
-Tags: 2022.0.20220202.0-with-sources, 2022-with-sources, devel-with-sources
+Tags: 2022.0.20220308.1-with-sources, 2022-with-sources, devel-with-sources
 Architectures: amd64, arm64v8
-amd64-GitCommit: 644870f2e04d8eb9c7e4e0ca3d7e99a111c98105
+amd64-GitCommit: e3ef4927440fb2902c40ca7ed2c984e64422a19e
 amd64-GitFetch: refs/heads/al2022-with-sources
-arm64v8-GitCommit: 372ba653bf7ddb8f33751a0e13000969a53afc70
+arm64v8-GitCommit: 7f706da12db4c5f7b62f9a9993bc7eece61ed27f
 arm64v8-GitFetch: refs/heads/al2022-arm64-with-sources
diff --git a/_bashbrew-list b/_bashbrew-list
index f5824b8..ce49b4e 100644
--- a/_bashbrew-list
+++ b/_bashbrew-list
@@ -10,8 +10,8 @@ amazonlinux:2018.03.0.20220209.0
 amazonlinux:2018.03.0.20220209.0-with-sources
 amazonlinux:2022
 amazonlinux:2022-with-sources
-amazonlinux:2022.0.20220202.0
-amazonlinux:2022.0.20220202.0-with-sources
+amazonlinux:2022.0.20220308.1
+amazonlinux:2022.0.20220308.1-with-sources
 amazonlinux:devel
 amazonlinux:devel-with-sources
 amazonlinux:latest
diff --git a/amazonlinux_devel-with-sources/Dockerfile b/amazonlinux_devel-with-sources/Dockerfile
index 6bae9a2..4854e19 100644
--- a/amazonlinux_devel-with-sources/Dockerfile
+++ b/amazonlinux_devel-with-sources/Dockerfile
@@ -1,6 +1,6 @@
 FROM scratch
-ADD al2022-container-2022.0.20220202.0-x86_64.tar.xz /
+ADD al2022-container-2022.0.20220308.1-x86_64.tar.xz /
 CMD ["/bin/bash"]
 RUN mkdir /usr/src/srpm \
- && curl -o /usr/src/srpm/srpm-bundle.tar.gz "https://amazon-linux-docker-sources.s3-accelerate.amazonaws.com/srpm-bundle-cc7e5469c58d5d340a4834dfcb1b4f5cd38df8115a8622b945b52156d73005e2.tar.gz" \
- && echo "356327ddb540b40c52a2a4a6392991c4fb8a6b15c8f6a0bca616a7751d776175  /usr/src/srpm/srpm-bundle.tar.gz" | sha256sum -c -
+ && curl -o /usr/src/srpm/srpm-bundle.tar.gz "https://amazon-linux-docker-sources.s3-accelerate.amazonaws.com/srpm-bundle-fa0d04ab17f6ae9cb1de39ab5dad52c2e6d9fb369f43679b2f6a0c9e5d12c284.tar.gz" \
+ && echo "35ebd0b74ac0b0422bf72c99f18fd2a38f226202adf6ee9271c52cf2ea7d3df0  /usr/src/srpm/srpm-bundle.tar.gz" | sha256sum -c -
diff --git a/amazonlinux_devel-with-sources/al2022-container-2022.0.20220202.0-x86_64.tar.xz b/amazonlinux_devel-with-sources/al2022-container-2022.0.20220308.1-x86_64.tar.xz
similarity index 78%
rename from amazonlinux_devel-with-sources/al2022-container-2022.0.20220202.0-x86_64.tar.xz
rename to amazonlinux_devel-with-sources/al2022-container-2022.0.20220308.1-x86_64.tar.xz
index 4cbb2d4..7f051be 100644
Binary files a/amazonlinux_devel-with-sources/al2022-container-2022.0.20220202.0-x86_64.tar.xz and b/amazonlinux_devel-with-sources/al2022-container-2022.0.20220308.1-x86_64.tar.xz differ
diff --git a/amazonlinux_devel-with-sources/al2022-container-2022.0.20220202.0-x86_64.tar.xz  'tar -t' b/amazonlinux_devel-with-sources/al2022-container-2022.0.20220308.1-x86_64.tar.xz  'tar -t'
similarity index 99%
rename from amazonlinux_devel-with-sources/al2022-container-2022.0.20220202.0-x86_64.tar.xz  'tar -t'
rename to amazonlinux_devel-with-sources/al2022-container-2022.0.20220308.1-x86_64.tar.xz  'tar -t'
index a649b3c..a91d930 100644
--- a/amazonlinux_devel-with-sources/al2022-container-2022.0.20220202.0-x86_64.tar.xz  'tar -t'	
+++ b/amazonlinux_devel-with-sources/al2022-container-2022.0.20220308.1-x86_64.tar.xz  'tar -t'	
@@ -115,6 +115,7 @@ etc/mtab
 etc/netconfig
 etc/networks
 etc/nsswitch.conf
+etc/nsswitch.conf.bak
 etc/openldap/
 etc/openldap/certs/
 etc/openldap/ldap.conf
@@ -1058,7 +1059,7 @@ usr/lib64/libdw.so.1
 usr/lib64/libelf-0.185.so
 usr/lib64/libelf.so.1
 usr/lib64/libexpat.so.1
-usr/lib64/libexpat.so.1.8.3
+usr/lib64/libexpat.so.1.8.6
 usr/lib64/libffi.so.6
 usr/lib64/libffi.so.6.0.2
 usr/lib64/libform.so.6
diff --git a/amazonlinux_devel/Dockerfile b/amazonlinux_devel/Dockerfile
index 2916ed6..2f5f2da 100644
--- a/amazonlinux_devel/Dockerfile
+++ b/amazonlinux_devel/Dockerfile
@@ -1,3 +1,3 @@
 FROM scratch
-ADD al2022-container-2022.0.20220202.0-x86_64.tar.xz /
+ADD al2022-container-2022.0.20220308.1-x86_64.tar.xz /
 CMD ["/bin/bash"]
diff --git a/amazonlinux_devel/al2022-container-2022.0.20220202.0-x86_64.tar.xz b/amazonlinux_devel/al2022-container-2022.0.20220308.1-x86_64.tar.xz
similarity index 78%
rename from amazonlinux_devel/al2022-container-2022.0.20220202.0-x86_64.tar.xz
rename to amazonlinux_devel/al2022-container-2022.0.20220308.1-x86_64.tar.xz
index 4cbb2d4..7f051be 100644
Binary files a/amazonlinux_devel/al2022-container-2022.0.20220202.0-x86_64.tar.xz and b/amazonlinux_devel/al2022-container-2022.0.20220308.1-x86_64.tar.xz differ
diff --git a/amazonlinux_devel/al2022-container-2022.0.20220202.0-x86_64.tar.xz  'tar -t' b/amazonlinux_devel/al2022-container-2022.0.20220308.1-x86_64.tar.xz  'tar -t'
similarity index 99%
rename from amazonlinux_devel/al2022-container-2022.0.20220202.0-x86_64.tar.xz  'tar -t'
rename to amazonlinux_devel/al2022-container-2022.0.20220308.1-x86_64.tar.xz  'tar -t'
index a649b3c..a91d930 100644
--- a/amazonlinux_devel/al2022-container-2022.0.20220202.0-x86_64.tar.xz  'tar -t'	
+++ b/amazonlinux_devel/al2022-container-2022.0.20220308.1-x86_64.tar.xz  'tar -t'	
@@ -115,6 +115,7 @@ etc/mtab
 etc/netconfig
 etc/networks
 etc/nsswitch.conf
+etc/nsswitch.conf.bak
 etc/openldap/
 etc/openldap/certs/
 etc/openldap/ldap.conf
@@ -1058,7 +1059,7 @@ usr/lib64/libdw.so.1
 usr/lib64/libelf-0.185.so
 usr/lib64/libelf.so.1
 usr/lib64/libexpat.so.1
-usr/lib64/libexpat.so.1.8.3
+usr/lib64/libexpat.so.1.8.6
 usr/lib64/libffi.so.6
 usr/lib64/libffi.so.6.0.2
 usr/lib64/libform.so.6

Relevant Maintainers:

• amazonlinux: @amazonlinux @fred-lefebvre @samuelkarp @stewartsmith @mysteriouspants @sktomer @cbgbt @trampal @kgharris @boostyc @Timidger @rpkelly @jhowell-burke

[tianon]

This appears to include an OpenSSL library that's still vulnerable to CVE-2022-0778 (openssl-libs-1.1.1l-2 both before and after this update) -- did you intend to include that update in this bump?

[sktomer]

Hello Tianon,

Thanks for bringing this to our notice. I have confirmed that we are actively working on a new version of AL 2022 containing the fix for the mentioned CVE.

That will be another update after this one though.

Thanks,
Sumit