Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[oraclelinux] Updating 9, 9-slim and 9-slim-fips for ELSA-2024-1879 #16660

Merged
merged 1 commit into from
Apr 24, 2024
Merged

[oraclelinux] Updating 9, 9-slim and 9-slim-fips for ELSA-2024-1879 #16660

merged 1 commit into from
Apr 24, 2024

Conversation

amsteinb-orcl
Copy link
Contributor

This update incorporates fixes for CVE-2024-28834, CVE-2024-28835

See the following for details:

https://linux.oracle.com/errata/ELSA-2024-1879.html

Signed-off-by: Alan Steinberg alan.steinberg@oracle.com

@amsteinb-orcl amsteinb-orcl requested a review from a team as a code owner April 24, 2024 21:06
Copy link

Diff for 6693210:
diff --git a/_bashbrew-cat b/_bashbrew-cat
index 7d400f2..46b7422 100644
--- a/_bashbrew-cat
+++ b/_bashbrew-cat
@@ -1,9 +1,9 @@
 Maintainers: Oracle Linux Product Team <ol-ovm-info_ww@oracle.com> (@Oracle)
 GitRepo: https://github.com/oracle/container-images.git
 GitCommit: 5c8a1c296acd6e90487cd261d16cf85fd6bcb73f
-amd64-GitCommit: d9cafbbc05ea9a812a86d0c6c1d2dbb03cdc0b4f
+amd64-GitCommit: 25b69e893143e2aa810c4bd2906e66ae6f5be75b
 amd64-GitFetch: refs/heads/dist-amd64
-arm64v8-GitCommit: 4642f4418df0fc64cc54734b171c76e575fc07f8
+arm64v8-GitCommit: 69c8d724936548aa03583706f7178c265170516d
 arm64v8-GitFetch: refs/heads/dist-arm64v8
 
 Tags: 7-slim
@@ -37,3 +37,7 @@ Directory: 9
 Tags: 9-slim
 Architectures: amd64, arm64v8
 Directory: 9-slim
+
+Tags: 9-slim-fips
+Architectures: amd64, arm64v8
+Directory: 9-slim-fips
diff --git a/_bashbrew-list b/_bashbrew-list
index 24b6584..787f984 100644
--- a/_bashbrew-list
+++ b/_bashbrew-list
@@ -8,3 +8,4 @@ oraclelinux:8-slim-fips
 oraclelinux:8.9
 oraclelinux:9
 oraclelinux:9-slim
+oraclelinux:9-slim-fips
diff --git a/oraclelinux_7-slim-fips/Dockerfile b/oraclelinux_9-slim-fips/Dockerfile
similarity index 64%
copy from oraclelinux_7-slim-fips/Dockerfile
copy to oraclelinux_9-slim-fips/Dockerfile
index bd3354b..2ec150c 100644
--- a/oraclelinux_7-slim-fips/Dockerfile
+++ b/oraclelinux_9-slim-fips/Dockerfile
@@ -1,6 +1,6 @@
 FROM scratch
 
-ADD oraclelinux-7-slim-fips-amd64-rootfs.tar.xz /
+ADD oraclelinux-9-slim-fips-amd64-rootfs.tar.xz /
 
 # overwrite this with 'CMD []' in a dependent Dockerfile
 CMD ["/bin/bash"]
diff --git a/oraclelinux_9-slim/oraclelinux-9-slim-amd64-rootfs.tar.xz b/oraclelinux_9-slim-fips/oraclelinux-9-slim-fips-amd64-rootfs.tar.xz
similarity index 76%
copy from oraclelinux_9-slim/oraclelinux-9-slim-amd64-rootfs.tar.xz
copy to oraclelinux_9-slim-fips/oraclelinux-9-slim-fips-amd64-rootfs.tar.xz
index 300bfd0..176a5fe 100644
Binary files a/oraclelinux_9-slim/oraclelinux-9-slim-amd64-rootfs.tar.xz and b/oraclelinux_9-slim-fips/oraclelinux-9-slim-fips-amd64-rootfs.tar.xz differ
diff --git a/oraclelinux_9-slim/oraclelinux-9-slim-amd64-rootfs.tar.xz  'tar -t' b/oraclelinux_9-slim-fips/oraclelinux-9-slim-fips-amd64-rootfs.tar.xz  'tar -t'
similarity index 99%
copy from oraclelinux_9-slim/oraclelinux-9-slim-amd64-rootfs.tar.xz  'tar -t'
copy to oraclelinux_9-slim-fips/oraclelinux-9-slim-fips-amd64-rootfs.tar.xz  'tar -t'
index 26d4336..086b4e6 100644
--- a/oraclelinux_9-slim/oraclelinux-9-slim-amd64-rootfs.tar.xz  'tar -t'	
+++ b/oraclelinux_9-slim-fips/oraclelinux-9-slim-fips-amd64-rootfs.tar.xz  'tar -t'	
@@ -200,6 +200,7 @@ etc/swid/swidtags.d/oracle.com
 etc/sysconfig/
 etc/sysconfig/64bit_strstr_via_64bit_strstr_sse2_unaligned
 etc/sysconfig/network
+etc/system-fips
 etc/system-release
 etc/system-release-cpe
 etc/terminfo/
@@ -611,6 +612,24 @@ usr/lib/swidtag/oracle.com/com.oracle.OL-9.3-x86_64.swidtag
 usr/lib/sysctl.d/
 usr/lib/sysctl.d/50-redhat.conf
 usr/lib/sysimage/
+usr/lib/systemd/
+usr/lib/systemd/system-preset/
+usr/lib/systemd/system-preset/85-display-manager.preset
+usr/lib/systemd/system-preset/90-default.preset
+usr/lib/systemd/system-preset/99-default-disable.preset
+usr/lib/systemd/system/
+usr/lib/systemd/system/rpmdb-rebuild.service
+usr/lib/systemd/user-preset/
+usr/lib/systemd/user-preset/90-default-user.preset
+usr/lib/systemd/user-preset/99-default-disable.preset
+usr/lib/systemd/user/
+usr/lib/systemd/user/dirmngr.service
+usr/lib/systemd/user/dirmngr.socket
+usr/lib/systemd/user/gpg-agent-browser.socket
+usr/lib/systemd/user/gpg-agent-extra.socket
+usr/lib/systemd/user/gpg-agent-ssh.socket
+usr/lib/systemd/user/gpg-agent.service
+usr/lib/systemd/user/gpg-agent.socket
 usr/lib/tmpfiles.d/
 usr/lib/tmpfiles.d/dnf.conf
 usr/lib/tmpfiles.d/libselinux.conf
@@ -1701,7 +1720,7 @@ usr/share/licenses/nettle/COPYING.LESSERv3
 usr/share/licenses/nettle/COPYINGv2
 usr/share/licenses/npth/
 usr/share/licenses/npth/COPYING.LIB
-usr/share/licenses/ol9-container-slim.lium.html
+usr/share/licenses/ol9-container-fips.lium.html
 usr/share/licenses/openldap/
 usr/share/licenses/openldap/COPYRIGHT
 usr/share/licenses/openldap/LICENSE
diff --git a/oraclelinux_9-slim/oraclelinux-9-slim-amd64-rootfs.tar.xz b/oraclelinux_9-slim/oraclelinux-9-slim-amd64-rootfs.tar.xz
index 300bfd0..f8452da 100644
Binary files a/oraclelinux_9-slim/oraclelinux-9-slim-amd64-rootfs.tar.xz and b/oraclelinux_9-slim/oraclelinux-9-slim-amd64-rootfs.tar.xz differ
diff --git a/oraclelinux_9/oraclelinux-9-amd64-rootfs.tar.xz b/oraclelinux_9/oraclelinux-9-amd64-rootfs.tar.xz
index 9e86aea..fe05504 100644
Binary files a/oraclelinux_9/oraclelinux-9-amd64-rootfs.tar.xz and b/oraclelinux_9/oraclelinux-9-amd64-rootfs.tar.xz differ

Relevant Maintainers:

@tianon tianon merged commit 3dfd022 into docker-library:master Apr 24, 2024
14 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants