Update busybox #14697
Merged
Update busybox #14697
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@dc7921f: Fix "unstable" alias to only apply to "latest" (never "latest-1") - docker-library/busybox@cab016a: Merge pull request docker-library/busybox#175 from infosiftr/1.36.1 - docker-library/busybox@ce868b8: Update to 1.36.1
Diff for db6df5b:diff --git a/_bashbrew-cat b/_bashbrew-cat
index 62ed54e..1f1e76e 100644
--- a/_bashbrew-cat
+++ b/_bashbrew-cat
@@ -1,25 +1,25 @@
Maintainers: Tianon Gravi <admwiggin@gmail.com> (@tianon), Joseph Ferguson <yosifkit@gmail.com> (@yosifkit)
GitRepo: https://github.com/docker-library/busybox.git
-GitCommit: 7a3eb469d62296f2b1c56336d828593c2fefa228
-amd64-GitCommit: 66a290439cf51713829aa9e2ec76981ff047b1e2
+GitCommit: dc7921f78f42254fe927a4ca92af3e0f1428a42d
+amd64-GitCommit: 7386447a19b39efc3d3dab5a05a7bef806ce274e
amd64-GitFetch: refs/heads/dist-amd64
-arm32v5-GitCommit: f128c22c601285facf0e792e94bd025e7de6c3e5
+arm32v5-GitCommit: eb244bed13491039a5e602cfe5deb8bd235bdd1f
arm32v5-GitFetch: refs/heads/dist-arm32v5
-arm32v6-GitCommit: d8c21dfbfc9fbf1362b7eb04a036290501557909
+arm32v6-GitCommit: fe41315f62468f9b11a577a57d2a42de6219b99f
arm32v6-GitFetch: refs/heads/dist-arm32v6
-arm32v7-GitCommit: c4ff331c266ecc95b22bd2b6fb8ab5b5b07801c5
+arm32v7-GitCommit: 62869cab5467e0744c3bab50bb0547937523c65a
arm32v7-GitFetch: refs/heads/dist-arm32v7
-arm64v8-GitCommit: b50e2b5970e532251186dc294ffa3ee2f133b4b1
+arm64v8-GitCommit: 5df32dbd40bb2d20a82eaf2297435e37f6c70334
arm64v8-GitFetch: refs/heads/dist-arm64v8
-i386-GitCommit: 68ca863fe49053e52fc119a4c8e819575f195ddc
+i386-GitCommit: 06084369b7bb427c94d7d0c5b8769fda7f8b4162
i386-GitFetch: refs/heads/dist-i386
-mips64le-GitCommit: cc2b7ca771871de62c8ff0f681729899620049fe
+mips64le-GitCommit: a007f348418bba405c893b4520093e69a9f2534f
mips64le-GitFetch: refs/heads/dist-mips64le
-ppc64le-GitCommit: 62046cedf65bc0ebdffae16965a1ded746f731fa
+ppc64le-GitCommit: 4e1ae38e9ffbbe8b4c9e9c51cc1ebceb62de8503
ppc64le-GitFetch: refs/heads/dist-ppc64le
-riscv64-GitCommit: 026022de16cd90089a9273e5767869ee4d3842fb
+riscv64-GitCommit: e4aa467ab1886945309a168d7d76ce20224b3245
riscv64-GitFetch: refs/heads/dist-riscv64
-s390x-GitCommit: 208ada6a40cdd292959738235e805ce814bde85a
+s390x-GitCommit: 7506b58cff792af0c5f56841aefe305ff89144b6
s390x-GitFetch: refs/heads/dist-s390x
Tags: 1.35.0, 1.35
@@ -47,7 +47,7 @@ Tags: 1.35.0-uclibc, 1.35-uclibc
Architectures: amd64, arm32v5, arm32v7, arm64v8, i386, mips64le, riscv64
Directory: latest-1/uclibc
-Tags: 1.36.0, 1.36, 1, unstable, latest
+Tags: 1.36.1, 1.36, 1, stable, latest
Architectures: amd64, arm32v5, arm32v6, arm32v7, arm64v8, i386, mips64le, ppc64le, riscv64, s390x
amd64-Directory: latest/glibc
arm32v5-Directory: latest/glibc
@@ -60,14 +60,14 @@ ppc64le-Directory: latest/glibc
riscv64-Directory: latest/uclibc
s390x-Directory: latest/glibc
-Tags: 1.36.0-glibc, 1.36-glibc, 1-glibc, unstable-glibc, glibc
+Tags: 1.36.1-glibc, 1.36-glibc, 1-glibc, stable-glibc, glibc
Architectures: amd64, arm32v5, arm32v7, arm64v8, i386, mips64le, ppc64le, s390x
Directory: latest/glibc
-Tags: 1.36.0-musl, 1.36-musl, 1-musl, unstable-musl, musl
+Tags: 1.36.1-musl, 1.36-musl, 1-musl, stable-musl, musl
Architectures: amd64, arm32v6, arm32v7, arm64v8, i386, ppc64le, s390x
Directory: latest/musl
-Tags: 1.36.0-uclibc, 1.36-uclibc, 1-uclibc, unstable-uclibc, uclibc
+Tags: 1.36.1-uclibc, 1.36-uclibc, 1-uclibc, stable-uclibc, uclibc
Architectures: amd64, arm32v5, arm32v7, arm64v8, i386, mips64le, riscv64
Directory: latest/uclibc
diff --git a/_bashbrew-list b/_bashbrew-list
index f4b52a1..5708359 100644
--- a/_bashbrew-list
+++ b/_bashbrew-list
@@ -14,15 +14,15 @@ busybox:1.36
busybox:1.36-glibc
busybox:1.36-musl
busybox:1.36-uclibc
-busybox:1.36.0
-busybox:1.36.0-glibc
-busybox:1.36.0-musl
-busybox:1.36.0-uclibc
+busybox:1.36.1
+busybox:1.36.1-glibc
+busybox:1.36.1-musl
+busybox:1.36.1-uclibc
busybox:glibc
busybox:latest
busybox:musl
+busybox:stable
+busybox:stable-glibc
+busybox:stable-musl
+busybox:stable-uclibc
busybox:uclibc
-busybox:unstable
-busybox:unstable-glibc
-busybox:unstable-musl
-busybox:unstable-uclibc
diff --git a/busybox_glibc/Dockerfile.builder b/busybox_glibc/Dockerfile.builder
index ec21c50..90ad0cf 100644
--- a/busybox_glibc/Dockerfile.builder
+++ b/busybox_glibc/Dockerfile.builder
@@ -24,9 +24,9 @@ RUN set -eux; \
# sub 1024g/2C766641 2006-12-12
RUN mkdir -p ~/.gnupg && gpg --batch --keyserver keyserver.ubuntu.com --recv-keys C9E9416F76E610DBD09D040F47B70C55ACC9965B
-# https://busybox.net: 3 January 2023
-ENV BUSYBOX_VERSION 1.36.0
-ENV BUSYBOX_SHA256 542750c8af7cb2630e201780b4f99f3dcceeb06f505b479ec68241c1e6af61a5
+# https://busybox.net: 19 May 2023
+ENV BUSYBOX_VERSION 1.36.1
+ENV BUSYBOX_SHA256 b8cc24c9574d809e7279c3be349795c5d5ceb6fdf19ca709f80cde50e47de314
RUN set -eux; \
tarball="busybox-${BUSYBOX_VERSION}.tar.bz2"; \
@@ -53,8 +53,6 @@ RUN set -eux; \
\
unsetConfs=' \
CONFIG_FEATURE_SYNC_FANCY \
-# disable SHA hardware acceleration (temporarily), as it fails with SIGILL on some of GitHub's common CI systems; https://bugs.busybox.net/show_bug.cgi?id=15236
- CONFIG_SHA256_HWACCEL CONFIG_SHA1_HWACCEL \
'; \
\
make defconfig; \
diff --git a/busybox_glibc/busybox.tar.xz b/busybox_glibc/busybox.tar.xz
index bcc7086..66af43a 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 ec21c50..90ad0cf 100644
--- a/busybox_latest/Dockerfile.builder
+++ b/busybox_latest/Dockerfile.builder
@@ -24,9 +24,9 @@ RUN set -eux; \
# sub 1024g/2C766641 2006-12-12
RUN mkdir -p ~/.gnupg && gpg --batch --keyserver keyserver.ubuntu.com --recv-keys C9E9416F76E610DBD09D040F47B70C55ACC9965B
-# https://busybox.net: 3 January 2023
-ENV BUSYBOX_VERSION 1.36.0
-ENV BUSYBOX_SHA256 542750c8af7cb2630e201780b4f99f3dcceeb06f505b479ec68241c1e6af61a5
+# https://busybox.net: 19 May 2023
+ENV BUSYBOX_VERSION 1.36.1
+ENV BUSYBOX_SHA256 b8cc24c9574d809e7279c3be349795c5d5ceb6fdf19ca709f80cde50e47de314
RUN set -eux; \
tarball="busybox-${BUSYBOX_VERSION}.tar.bz2"; \
@@ -53,8 +53,6 @@ RUN set -eux; \
\
unsetConfs=' \
CONFIG_FEATURE_SYNC_FANCY \
-# disable SHA hardware acceleration (temporarily), as it fails with SIGILL on some of GitHub's common CI systems; https://bugs.busybox.net/show_bug.cgi?id=15236
- CONFIG_SHA256_HWACCEL CONFIG_SHA1_HWACCEL \
'; \
\
make defconfig; \
diff --git a/busybox_latest/busybox.tar.xz b/busybox_latest/busybox.tar.xz
index bcc7086..66af43a 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 06bcc45..c0c4a8f 100644
--- a/busybox_musl/Dockerfile.builder
+++ b/busybox_musl/Dockerfile.builder
@@ -26,9 +26,9 @@ RUN set -eux; \
# sub 1024g/2C766641 2006-12-12
RUN mkdir -p ~/.gnupg && gpg --batch --keyserver keyserver.ubuntu.com --recv-keys C9E9416F76E610DBD09D040F47B70C55ACC9965B
-# https://busybox.net: 3 January 2023
-ENV BUSYBOX_VERSION 1.36.0
-ENV BUSYBOX_SHA256 542750c8af7cb2630e201780b4f99f3dcceeb06f505b479ec68241c1e6af61a5
+# https://busybox.net: 19 May 2023
+ENV BUSYBOX_VERSION 1.36.1
+ENV BUSYBOX_SHA256 b8cc24c9574d809e7279c3be349795c5d5ceb6fdf19ca709f80cde50e47de314
RUN set -eux; \
tarball="busybox-${BUSYBOX_VERSION}.tar.bz2"; \
@@ -61,8 +61,6 @@ RUN set -eux; \
CONFIG_FEATURE_INETD_RPC \
CONFIG_FEATURE_UTMP \
CONFIG_FEATURE_WTMP \
-# disable SHA hardware acceleration (temporarily), as it fails with SIGILL on some of GitHub's common CI systems; https://bugs.busybox.net/show_bug.cgi?id=15236
- CONFIG_SHA256_HWACCEL CONFIG_SHA1_HWACCEL \
'; \
\
make defconfig; \
diff --git a/busybox_musl/busybox.tar.xz b/busybox_musl/busybox.tar.xz
index 4c9968a..5274129 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 7f2f26b..1b9d26b 100644
--- a/busybox_uclibc/Dockerfile.builder
+++ b/busybox_uclibc/Dockerfile.builder
@@ -210,9 +210,9 @@ ENV PATH /usr/src/buildroot/output/host/usr/bin:$PATH
# sub 1024g/2C766641 2006-12-12
RUN mkdir -p ~/.gnupg && gpg --batch --keyserver keyserver.ubuntu.com --recv-keys C9E9416F76E610DBD09D040F47B70C55ACC9965B
-# https://busybox.net: 3 January 2023
-ENV BUSYBOX_VERSION 1.36.0
-ENV BUSYBOX_SHA256 542750c8af7cb2630e201780b4f99f3dcceeb06f505b479ec68241c1e6af61a5
+# https://busybox.net: 19 May 2023
+ENV BUSYBOX_VERSION 1.36.1
+ENV BUSYBOX_SHA256 b8cc24c9574d809e7279c3be349795c5d5ceb6fdf19ca709f80cde50e47de314
RUN set -eux; \
tarball="busybox-${BUSYBOX_VERSION}.tar.bz2"; \
@@ -239,8 +239,6 @@ RUN set -eux; \
\
unsetConfs=' \
CONFIG_FEATURE_SYNC_FANCY \
-# disable SHA hardware acceleration (temporarily), as it fails with SIGILL on some of GitHub's common CI systems; https://bugs.busybox.net/show_bug.cgi?id=15236
- CONFIG_SHA256_HWACCEL CONFIG_SHA1_HWACCEL \
'; \
\
make defconfig; \
diff --git a/busybox_uclibc/busybox.tar.xz b/busybox_uclibc/busybox.tar.xz
index 7701e1f..39faf45 100644
Binary files a/busybox_uclibc/busybox.tar.xz and b/busybox_uclibc/busybox.tar.xz differRelevant Maintainers: |
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: