Update busybox #15838
Merged
Update busybox #15838
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Changes: - docker-library/busybox@c82d1f7: Merge pull request docker-library/busybox#184 from infosiftr/buildroot-2023.11 - docker-library/busybox@7a5f980: Update buildroot to 2023.11
Diff for 3f1229b:diff --git a/_bashbrew-cat b/_bashbrew-cat
index d8b9f29..27ee829 100644
--- a/_bashbrew-cat
+++ b/_bashbrew-cat
@@ -1,25 +1,25 @@
Maintainers: Tianon Gravi <[email protected]> (@tianon), Joseph Ferguson <[email protected]> (@yosifkit)
GitRepo: https://github.com/docker-library/busybox.git
-GitCommit: d0874f19ca42fc0600e490039aa87877529fd982
-amd64-GitCommit: 089e2f966d5db5cbc2f6ea1b5f7e2a92d15a07b3
+GitCommit: c82d1f70eedcb3eb3aa93b7f3406f3013fb05265
+amd64-GitCommit: fd3de9bdd2a72b59a99e7d1c125e5b3b5729326a
amd64-GitFetch: refs/heads/dist-amd64
-arm32v5-GitCommit: d8159091d0979f96b6b9a05a6f6540fe3512bdc1
+arm32v5-GitCommit: 7bc82537c44617142c244a1074d2ac6f3ddd7c4a
arm32v5-GitFetch: refs/heads/dist-arm32v5
-arm32v6-GitCommit: f7081677dd0cd1d0524a988dd65c0ffb11e49c8f
+arm32v6-GitCommit: 54be82b66da36bb791c0376017cf34c6d492f55d
arm32v6-GitFetch: refs/heads/dist-arm32v6
-arm32v7-GitCommit: e56aee48bd5689c21a2d00f792c11e827e6441a2
+arm32v7-GitCommit: a8e56165783eed4a25789743528a84c2ce13c589
arm32v7-GitFetch: refs/heads/dist-arm32v7
-arm64v8-GitCommit: 62541b1cfc447a3752dcd381366298218cfe4ad6
+arm64v8-GitCommit: d5964852b804d0dabdd027f3e289ca9479c5ac33
arm64v8-GitFetch: refs/heads/dist-arm64v8
-i386-GitCommit: 101cedebd5727c62a29afb4cbf5422e1c8e1bfa7
+i386-GitCommit: 6a9f5d40fe3419d55978b2f384bc13a9893b3cb3
i386-GitFetch: refs/heads/dist-i386
-mips64le-GitCommit: dbabd02cca3beebc93c8cb9b7110acf2d5e58f27
+mips64le-GitCommit: 0b4b2c2ec9a47c94fe2a0b7897b91ebf519c9b12
mips64le-GitFetch: refs/heads/dist-mips64le
-ppc64le-GitCommit: 9a6d19780f408836ce21748fc196559af9c0b1b9
+ppc64le-GitCommit: 587ef8fac17fe44986954db753ad4509283e7e60
ppc64le-GitFetch: refs/heads/dist-ppc64le
-riscv64-GitCommit: bf58161f45bb69186efaf530bcfe14903cac3de0
+riscv64-GitCommit: 30e40709eb773b2ad09fafc433c44dad3afeb51d
riscv64-GitFetch: refs/heads/dist-riscv64
-s390x-GitCommit: 14422e010b735d1a8012bf2d429eab1551e7c527
+s390x-GitCommit: bcaf21792f4ec53981fc77a7d9a82ae82e74e77e
s390x-GitFetch: refs/heads/dist-s390x
Tags: 1.35.0, 1.35
diff --git a/busybox_1.35-glibc/Dockerfile.builder b/busybox_1.35-glibc/Dockerfile.builder
index 93b6d8b..54f7f68 100644
--- a/busybox_1.35-glibc/Dockerfile.builder
+++ b/busybox_1.35-glibc/Dockerfile.builder
@@ -134,7 +134,7 @@ RUN set -eux; \
# install a few extra files from buildroot (/etc/passwd, etc)
RUN set -eux; \
- buildrootVersion='2023.05.1'; \
+ buildrootVersion='2023.11'; \
for file in \
system/device_table.txt \
system/skeleton/etc/group \
diff --git a/busybox_1.35-glibc/busybox.tar.xz b/busybox_1.35-glibc/busybox.tar.xz
index d445c5e..c7260d2 100644
Binary files a/busybox_1.35-glibc/busybox.tar.xz and b/busybox_1.35-glibc/busybox.tar.xz differ
diff --git a/busybox_1.35-musl/Dockerfile.builder b/busybox_1.35-musl/Dockerfile.builder
index d6df3ba..9c73547 100644
--- a/busybox_1.35-musl/Dockerfile.builder
+++ b/busybox_1.35-musl/Dockerfile.builder
@@ -114,7 +114,7 @@ RUN set -eux; \
# install a few extra files from buildroot (/etc/passwd, etc)
RUN set -eux; \
- buildrootVersion='2023.05.1'; \
+ buildrootVersion='2023.11'; \
for file in \
system/device_table.txt \
system/skeleton/etc/group \
diff --git a/busybox_1.35-musl/busybox.tar.xz b/busybox_1.35-musl/busybox.tar.xz
index 23ffbe7..4eab037 100644
Binary files a/busybox_1.35-musl/busybox.tar.xz and b/busybox_1.35-musl/busybox.tar.xz differ
diff --git a/busybox_1.35-uclibc/Dockerfile.builder b/busybox_1.35-uclibc/Dockerfile.builder
index 04dbb52..29ac8db 100644
--- a/busybox_1.35-uclibc/Dockerfile.builder
+++ b/busybox_1.35-uclibc/Dockerfile.builder
@@ -44,7 +44,7 @@ RUN mkdir -p ~/.gnupg && gpg --batch --keyserver keyserver.ubuntu.com --recv-key
# https://buildroot.org/download.html
# https://buildroot.org/downloads/?C=M;O=D
-ENV BUILDROOT_VERSION 2023.05.1
+ENV BUILDROOT_VERSION 2023.11
RUN set -eux; \
tarball="buildroot-${BUILDROOT_VERSION}.tar.xz"; \
diff --git a/busybox_1.35-uclibc/busybox.tar.xz b/busybox_1.35-uclibc/busybox.tar.xz
index b8c8b65..928f7d3 100644
Binary files a/busybox_1.35-uclibc/busybox.tar.xz and b/busybox_1.35-uclibc/busybox.tar.xz differ
diff --git a/busybox_1.35/Dockerfile.builder b/busybox_1.35/Dockerfile.builder
index 93b6d8b..54f7f68 100644
--- a/busybox_1.35/Dockerfile.builder
+++ b/busybox_1.35/Dockerfile.builder
@@ -134,7 +134,7 @@ RUN set -eux; \
# install a few extra files from buildroot (/etc/passwd, etc)
RUN set -eux; \
- buildrootVersion='2023.05.1'; \
+ buildrootVersion='2023.11'; \
for file in \
system/device_table.txt \
system/skeleton/etc/group \
diff --git a/busybox_1.35/busybox.tar.xz b/busybox_1.35/busybox.tar.xz
index d445c5e..c7260d2 100644
Binary files a/busybox_1.35/busybox.tar.xz and b/busybox_1.35/busybox.tar.xz differ
diff --git a/busybox_glibc/Dockerfile.builder b/busybox_glibc/Dockerfile.builder
index fce98de..4a1a3cc 100644
--- a/busybox_glibc/Dockerfile.builder
+++ b/busybox_glibc/Dockerfile.builder
@@ -132,7 +132,7 @@ RUN set -eux; \
# install a few extra files from buildroot (/etc/passwd, etc)
RUN set -eux; \
- buildrootVersion='2023.05.1'; \
+ buildrootVersion='2023.11'; \
for file in \
system/device_table.txt \
system/skeleton/etc/group \
diff --git a/busybox_glibc/busybox.tar.xz b/busybox_glibc/busybox.tar.xz
index 72995a0..323e39c 100644
Binary files a/busybox_glibc/busybox.tar.xz and b/busybox_glibc/busybox.tar.xz differ
diff --git a/busybox_latest/Dockerfile.builder b/busybox_latest/Dockerfile.builder
index fce98de..4a1a3cc 100644
--- a/busybox_latest/Dockerfile.builder
+++ b/busybox_latest/Dockerfile.builder
@@ -132,7 +132,7 @@ RUN set -eux; \
# install a few extra files from buildroot (/etc/passwd, etc)
RUN set -eux; \
- buildrootVersion='2023.05.1'; \
+ buildrootVersion='2023.11'; \
for file in \
system/device_table.txt \
system/skeleton/etc/group \
diff --git a/busybox_latest/busybox.tar.xz b/busybox_latest/busybox.tar.xz
index 72995a0..323e39c 100644
Binary files a/busybox_latest/busybox.tar.xz and b/busybox_latest/busybox.tar.xz differ
diff --git a/busybox_musl/Dockerfile.builder b/busybox_musl/Dockerfile.builder
index 705537a..e43ef2d 100644
--- a/busybox_musl/Dockerfile.builder
+++ b/busybox_musl/Dockerfile.builder
@@ -112,7 +112,7 @@ RUN set -eux; \
# install a few extra files from buildroot (/etc/passwd, etc)
RUN set -eux; \
- buildrootVersion='2023.05.1'; \
+ buildrootVersion='2023.11'; \
for file in \
system/device_table.txt \
system/skeleton/etc/group \
diff --git a/busybox_musl/busybox.tar.xz b/busybox_musl/busybox.tar.xz
index 6ca6e8c..911f2b1 100644
Binary files a/busybox_musl/busybox.tar.xz and b/busybox_musl/busybox.tar.xz differ
diff --git a/busybox_uclibc/Dockerfile.builder b/busybox_uclibc/Dockerfile.builder
index 31b27f6..063b0d1 100644
--- a/busybox_uclibc/Dockerfile.builder
+++ b/busybox_uclibc/Dockerfile.builder
@@ -44,7 +44,7 @@ RUN mkdir -p ~/.gnupg && gpg --batch --keyserver keyserver.ubuntu.com --recv-key
# https://buildroot.org/download.html
# https://buildroot.org/downloads/?C=M;O=D
-ENV BUILDROOT_VERSION 2023.05.1
+ENV BUILDROOT_VERSION 2023.11
RUN set -eux; \
tarball="buildroot-${BUILDROOT_VERSION}.tar.xz"; \
diff --git a/busybox_uclibc/busybox.tar.xz b/busybox_uclibc/busybox.tar.xz
index 00d1a59..d716185 100644
Binary files a/busybox_uclibc/busybox.tar.xz and b/busybox_uclibc/busybox.tar.xz differRelevant Maintainers: |
yosifkit
approved these changes
Dec 5, 2023
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Changes: