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 7, 7-slim and 7-slim-fips for ELBA-2024-8805. #17972

Merged
merged 1 commit into from
Nov 26, 2024

Conversation

amsteinb-orcl
Copy link
Contributor

@amsteinb-orcl amsteinb-orcl commented Nov 26, 2024

This update incorporates fixes for tzdata-2024b.

See the following for details:
https://linux.oracle.com/errata/ELBA-2024-8805.html

Signed-off-by: Alan Steinberg [email protected]

This update incorporates fixes for rebase to tzdata-2024b.

* <https://linux.oracle.com/errata/ELBA-2024-8805.html>

Signed-off-by: Alan Steinberg <[email protected]>
Copy link

Diff for 3a0ea06:
diff --git a/_bashbrew-cat b/_bashbrew-cat
index fa98aaa..23671da 100644
--- a/_bashbrew-cat
+++ b/_bashbrew-cat
@@ -1,9 +1,9 @@
 Maintainers: Oracle Linux Product Team <[email protected]> (@Oracle)
 GitRepo: https://github.com/oracle/container-images.git
 GitCommit: 5c8a1c296acd6e90487cd261d16cf85fd6bcb73f
-amd64-GitCommit: 26aae444213a50facdad312acc0d183085090164
+amd64-GitCommit: ed973527055cb65676f3b274410b9ed8b7dd5c15
 amd64-GitFetch: refs/heads/dist-amd64
-arm64v8-GitCommit: 0e738960d8e95b132aea1ca8f34a376fff144dc0
+arm64v8-GitCommit: 7799b16ddb5834d6f52c61b745d86d7486170f72
 arm64v8-GitFetch: refs/heads/dist-arm64v8
 
 Tags: 7-slim
diff --git a/oraclelinux_7-slim-fips/oraclelinux-7-slim-fips-amd64-rootfs.tar.xz b/oraclelinux_7-slim-fips/oraclelinux-7-slim-fips-amd64-rootfs.tar.xz
index 309007d..f1e5dbd 100644
Binary files a/oraclelinux_7-slim-fips/oraclelinux-7-slim-fips-amd64-rootfs.tar.xz and b/oraclelinux_7-slim-fips/oraclelinux-7-slim-fips-amd64-rootfs.tar.xz differ
diff --git a/oraclelinux_7-slim-fips/oraclelinux-7-slim-fips-amd64-rootfs.tar.xz  'tar -t' b/oraclelinux_7-slim-fips/oraclelinux-7-slim-fips-amd64-rootfs.tar.xz  'tar -t'
index d1f86e1..9624262 100644
--- a/oraclelinux_7-slim-fips/oraclelinux-7-slim-fips-amd64-rootfs.tar.xz  'tar -t'	
+++ b/oraclelinux_7-slim-fips/oraclelinux-7-slim-fips-amd64-rootfs.tar.xz  'tar -t'	
@@ -6080,11 +6080,11 @@ usr/share/doc/tar-1.26/NEWS
 usr/share/doc/tar-1.26/README
 usr/share/doc/tar-1.26/THANKS
 usr/share/doc/tar-1.26/TODO
-usr/share/doc/tzdata-2024a/
-usr/share/doc/tzdata-2024a/README
-usr/share/doc/tzdata-2024a/theory.html
-usr/share/doc/tzdata-2024a/tz-art.html
-usr/share/doc/tzdata-2024a/tz-link.html
+usr/share/doc/tzdata-2024b/
+usr/share/doc/tzdata-2024b/README
+usr/share/doc/tzdata-2024b/theory.html
+usr/share/doc/tzdata-2024b/tz-art.html
+usr/share/doc/tzdata-2024b/tz-link.html
 usr/share/doc/ustr-1.0.4/
 usr/share/doc/ustr-1.0.4/ChangeLog
 usr/share/doc/ustr-1.0.4/LICENSE
@@ -6269,6 +6269,8 @@ usr/share/licenses/systemd-219/
 usr/share/licenses/systemd-219/LICENSE.GPL2
 usr/share/licenses/systemd-219/LICENSE.LGPL2.1
 usr/share/licenses/systemd-219/LICENSE.MIT
+usr/share/licenses/tzdata-2024b/
+usr/share/licenses/tzdata-2024b/LICENSE
 usr/share/locale/
 usr/share/locale/be/
 usr/share/locale/bg/
@@ -7816,6 +7818,7 @@ usr/share/zoneinfo/Europe/Warsaw
 usr/share/zoneinfo/Europe/Zagreb
 usr/share/zoneinfo/Europe/Zaporozhye
 usr/share/zoneinfo/Europe/Zurich
+usr/share/zoneinfo/Factory
 usr/share/zoneinfo/GB
 usr/share/zoneinfo/GB-Eire
 usr/share/zoneinfo/GMT
@@ -7927,6 +7930,7 @@ usr/share/zoneinfo/W-SU
 usr/share/zoneinfo/WET
 usr/share/zoneinfo/Zulu
 usr/share/zoneinfo/iso3166.tab
+usr/share/zoneinfo/leap-seconds.list
 usr/share/zoneinfo/leapseconds
 usr/share/zoneinfo/posix/
 usr/share/zoneinfo/posix/Africa/
@@ -8435,6 +8439,7 @@ usr/share/zoneinfo/posix/Europe/Warsaw
 usr/share/zoneinfo/posix/Europe/Zagreb
 usr/share/zoneinfo/posix/Europe/Zaporozhye
 usr/share/zoneinfo/posix/Europe/Zurich
+usr/share/zoneinfo/posix/Factory
 usr/share/zoneinfo/posix/GB
 usr/share/zoneinfo/posix/GB-Eire
 usr/share/zoneinfo/posix/GMT
@@ -9053,6 +9058,7 @@ usr/share/zoneinfo/right/Europe/Warsaw
 usr/share/zoneinfo/right/Europe/Zagreb
 usr/share/zoneinfo/right/Europe/Zaporozhye
 usr/share/zoneinfo/right/Europe/Zurich
+usr/share/zoneinfo/right/Factory
 usr/share/zoneinfo/right/GB
 usr/share/zoneinfo/right/GB-Eire
 usr/share/zoneinfo/right/GMT
diff --git a/oraclelinux_7-slim/oraclelinux-7-slim-amd64-rootfs.tar.xz b/oraclelinux_7-slim/oraclelinux-7-slim-amd64-rootfs.tar.xz
index a6a2218..b79bb76 100644
Binary files a/oraclelinux_7-slim/oraclelinux-7-slim-amd64-rootfs.tar.xz and b/oraclelinux_7-slim/oraclelinux-7-slim-amd64-rootfs.tar.xz differ
diff --git a/oraclelinux_7-slim/oraclelinux-7-slim-amd64-rootfs.tar.xz  'tar -t' b/oraclelinux_7-slim/oraclelinux-7-slim-amd64-rootfs.tar.xz  'tar -t'
index 52377a2..67b6640 100644
--- a/oraclelinux_7-slim/oraclelinux-7-slim-amd64-rootfs.tar.xz  'tar -t'	
+++ b/oraclelinux_7-slim/oraclelinux-7-slim-amd64-rootfs.tar.xz  'tar -t'	
@@ -4488,11 +4488,11 @@ usr/share/doc/tar-1.26/NEWS
 usr/share/doc/tar-1.26/README
 usr/share/doc/tar-1.26/THANKS
 usr/share/doc/tar-1.26/TODO
-usr/share/doc/tzdata-2024a/
-usr/share/doc/tzdata-2024a/README
-usr/share/doc/tzdata-2024a/theory.html
-usr/share/doc/tzdata-2024a/tz-art.html
-usr/share/doc/tzdata-2024a/tz-link.html
+usr/share/doc/tzdata-2024b/
+usr/share/doc/tzdata-2024b/README
+usr/share/doc/tzdata-2024b/theory.html
+usr/share/doc/tzdata-2024b/tz-art.html
+usr/share/doc/tzdata-2024b/tz-link.html
 usr/share/doc/ustr-1.0.4/
 usr/share/doc/ustr-1.0.4/ChangeLog
 usr/share/doc/ustr-1.0.4/LICENSE
@@ -4625,6 +4625,8 @@ usr/share/licenses/shadow-utils-4.6/gpl-2.0.txt
 usr/share/licenses/shadow-utils-4.6/shadow-bsd.txt
 usr/share/licenses/shared-mime-info-1.8/
 usr/share/licenses/shared-mime-info-1.8/COPYING
+usr/share/licenses/tzdata-2024b/
+usr/share/licenses/tzdata-2024b/LICENSE
 usr/share/locale/
 usr/share/locale/be/
 usr/share/locale/bg/
@@ -6156,6 +6158,7 @@ usr/share/zoneinfo/Europe/Warsaw
 usr/share/zoneinfo/Europe/Zagreb
 usr/share/zoneinfo/Europe/Zaporozhye
 usr/share/zoneinfo/Europe/Zurich
+usr/share/zoneinfo/Factory
 usr/share/zoneinfo/GB
 usr/share/zoneinfo/GB-Eire
 usr/share/zoneinfo/GMT
@@ -6267,6 +6270,7 @@ usr/share/zoneinfo/W-SU
 usr/share/zoneinfo/WET
 usr/share/zoneinfo/Zulu
 usr/share/zoneinfo/iso3166.tab
+usr/share/zoneinfo/leap-seconds.list
 usr/share/zoneinfo/leapseconds
 usr/share/zoneinfo/posix/
 usr/share/zoneinfo/posix/Africa/
@@ -6775,6 +6779,7 @@ usr/share/zoneinfo/posix/Europe/Warsaw
 usr/share/zoneinfo/posix/Europe/Zagreb
 usr/share/zoneinfo/posix/Europe/Zaporozhye
 usr/share/zoneinfo/posix/Europe/Zurich
+usr/share/zoneinfo/posix/Factory
 usr/share/zoneinfo/posix/GB
 usr/share/zoneinfo/posix/GB-Eire
 usr/share/zoneinfo/posix/GMT
@@ -7393,6 +7398,7 @@ usr/share/zoneinfo/right/Europe/Warsaw
 usr/share/zoneinfo/right/Europe/Zagreb
 usr/share/zoneinfo/right/Europe/Zaporozhye
 usr/share/zoneinfo/right/Europe/Zurich
+usr/share/zoneinfo/right/Factory
 usr/share/zoneinfo/right/GB
 usr/share/zoneinfo/right/GB-Eire
 usr/share/zoneinfo/right/GMT
diff --git a/oraclelinux_7/oraclelinux-7-amd64-rootfs.tar.xz b/oraclelinux_7/oraclelinux-7-amd64-rootfs.tar.xz
index c773801..ca7b133 100644
Binary files a/oraclelinux_7/oraclelinux-7-amd64-rootfs.tar.xz and b/oraclelinux_7/oraclelinux-7-amd64-rootfs.tar.xz differ
diff --git a/oraclelinux_7/oraclelinux-7-amd64-rootfs.tar.xz  'tar -t' b/oraclelinux_7/oraclelinux-7-amd64-rootfs.tar.xz  'tar -t'
index 5412534..8133f97 100644
--- a/oraclelinux_7/oraclelinux-7-amd64-rootfs.tar.xz  'tar -t'	
+++ b/oraclelinux_7/oraclelinux-7-amd64-rootfs.tar.xz  'tar -t'	
@@ -7254,11 +7254,11 @@ usr/share/doc/tcp_wrappers-libs-7.6/README.IRIX
 usr/share/doc/tcp_wrappers-libs-7.6/README.NIS
 usr/share/doc/tcp_wrappers-libs-7.6/README.ipv6
 usr/share/doc/tcp_wrappers-libs-7.6/README.ipv6.2
-usr/share/doc/tzdata-2024a/
-usr/share/doc/tzdata-2024a/README
-usr/share/doc/tzdata-2024a/theory.html
-usr/share/doc/tzdata-2024a/tz-art.html
-usr/share/doc/tzdata-2024a/tz-link.html
+usr/share/doc/tzdata-2024b/
+usr/share/doc/tzdata-2024b/README
+usr/share/doc/tzdata-2024b/theory.html
+usr/share/doc/tzdata-2024b/tz-art.html
+usr/share/doc/tzdata-2024b/tz-link.html
 usr/share/doc/usermode-1.111/
 usr/share/doc/usermode-1.111/COPYING
 usr/share/doc/usermode-1.111/ChangeLog
@@ -7628,6 +7628,8 @@ usr/share/licenses/systemd-219/
 usr/share/licenses/systemd-219/LICENSE.GPL2
 usr/share/licenses/systemd-219/LICENSE.LGPL2.1
 usr/share/licenses/systemd-219/LICENSE.MIT
+usr/share/licenses/tzdata-2024b/
+usr/share/licenses/tzdata-2024b/LICENSE
 usr/share/locale/
 usr/share/locale/be/
 usr/share/locale/bg/
@@ -9380,6 +9382,7 @@ usr/share/zoneinfo/Europe/Warsaw
 usr/share/zoneinfo/Europe/Zagreb
 usr/share/zoneinfo/Europe/Zaporozhye
 usr/share/zoneinfo/Europe/Zurich
+usr/share/zoneinfo/Factory
 usr/share/zoneinfo/GB
 usr/share/zoneinfo/GB-Eire
 usr/share/zoneinfo/GMT
@@ -9491,6 +9494,7 @@ usr/share/zoneinfo/W-SU
 usr/share/zoneinfo/WET
 usr/share/zoneinfo/Zulu
 usr/share/zoneinfo/iso3166.tab
+usr/share/zoneinfo/leap-seconds.list
 usr/share/zoneinfo/leapseconds
 usr/share/zoneinfo/posix/
 usr/share/zoneinfo/posix/Africa/
@@ -9999,6 +10003,7 @@ usr/share/zoneinfo/posix/Europe/Warsaw
 usr/share/zoneinfo/posix/Europe/Zagreb
 usr/share/zoneinfo/posix/Europe/Zaporozhye
 usr/share/zoneinfo/posix/Europe/Zurich
+usr/share/zoneinfo/posix/Factory
 usr/share/zoneinfo/posix/GB
 usr/share/zoneinfo/posix/GB-Eire
 usr/share/zoneinfo/posix/GMT
@@ -10617,6 +10622,7 @@ usr/share/zoneinfo/right/Europe/Warsaw
 usr/share/zoneinfo/right/Europe/Zagreb
 usr/share/zoneinfo/right/Europe/Zaporozhye
 usr/share/zoneinfo/right/Europe/Zurich
+usr/share/zoneinfo/right/Factory
 usr/share/zoneinfo/right/GB
 usr/share/zoneinfo/right/GB-Eire
 usr/share/zoneinfo/right/GMT

Relevant Maintainers:

@yosifkit yosifkit merged commit ccb664b into docker-library:master Nov 26, 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