Skip to content

Update to 1.38.0, buildroot 2026.02.2 #247

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.

Sign up for GitHub

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

Merged
yosifkit merged 2 commits into from
May 21, 2026
Merged

Update to 1.38.0, buildroot 2026.02.2 #247

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
3c8912c
Update to 1.38.0, buildroot 2026.02.2
tianon May 20, 2026
f381f4d
Update metadata for amd64 and i386
tianon May 20, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions ...celeration-for-MD5-SHA1-on-x86-1.36.patch → ...celeration-for-MD5-SHA1-on-x86-1.37.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
Description: fix "read-only segment has dynamic relocations" on musl + i386 (1.36-specific patch)
Description: fix "read-only segment has dynamic relocations" on musl + i386
Bug-Gentoo: https://bugs.gentoo.org/933771
Origin: https://git.alpinelinux.org/aports/tree/main/busybox/0023-Hackfix-to-disable-HW-acceleration-for-MD5-SHA1-on-x.patch?id=bfc5ced82296a4bd72e9dde34449b066682bd353
Origin-GitLab: https://gitlab.alpinelinux.org/alpine/aports/-/blob/bfc5ced82296a4bd72e9dde34449b066682bd353/main/busybox/0023-Hackfix-to-disable-HW-acceleration-for-MD5-SHA1-on-x.patch
Expand Down Expand Up @@ -28,7 +28,7 @@ index 57a801459..96e9731c4 100644
#if ENABLE_SHA1_HWACCEL || ENABLE_SHA256_HWACCEL
-# if defined(__GNUC__) && (defined(__i386__) || defined(__x86_64__))
+# if defined(__GNUC__) && defined(__x86_64__)
static void cpuid(unsigned *eax, unsigned *ebx, unsigned *ecx, unsigned *edx)
static void cpuid_eax_ebx_ecx(unsigned *eax, unsigned *ebx, unsigned *ecx, unsigned *edx)
{
asm ("cpuid"
@@ -1191,7 +1191,7 @@ void FAST_FUNC sha1_begin(sha1_ctx_t *ctx)
Expand Down
18 changes: 15 additions & 3 deletions .patches/hackfix-to-disable-HW-acceleration-for-MD5-SHA1-on-x86.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
Refreshed-By: Tianon Gravi <tianon@debian.org> (2026-05-20 - for BusyBox 1.38.0)

Description: fix "read-only segment has dynamic relocations" on musl + i386
Bug-Gentoo: https://bugs.gentoo.org/933771
Origin: https://git.alpinelinux.org/aports/tree/main/busybox/0023-Hackfix-to-disable-HW-acceleration-for-MD5-SHA1-on-x.patch?id=bfc5ced82296a4bd72e9dde34449b066682bd353
Expand All @@ -19,11 +21,11 @@ See: http://lists.busybox.net/pipermail/busybox/2023-January/090078.html
1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/libbb/hash_md5_sha.c b/libbb/hash_md5_sha.c
index 57a801459..96e9731c4 100644
index 9ebda232a..307e08a7f 100644
--- a/libbb/hash_md5_sha.c
+++ b/libbb/hash_md5_sha.c
@@ -14,7 +14,7 @@
#define NEED_SHA512 (ENABLE_SHA512SUM || ENABLE_USE_BB_CRYPT_SHA)
#define NEED_SHA512 (ENABLE_SHA512SUM || ENABLE_SHA384SUM || ENABLE_USE_BB_CRYPT_SHA)

#if ENABLE_SHA1_HWACCEL || ENABLE_SHA256_HWACCEL
-# if defined(__GNUC__) && (defined(__i386__) || defined(__x86_64__))
Expand All @@ -40,7 +42,7 @@ index 57a801459..96e9731c4 100644
{
int ni = shaNI;
if (!ni)
@@ -1243,7 +1243,7 @@ void FAST_FUNC sha256_begin(sha256_ctx_t *ctx)
@@ -1252,7 +1252,7 @@ void FAST_FUNC sha256_begin(sha256_ctx_t *ctx)
/*ctx->total64 = 0; - done by prepending two 32-bit zeros to init256 */
ctx->process_block = sha256_process_block64;
#if ENABLE_SHA256_HWACCEL
Expand All @@ -49,3 +51,13 @@ index 57a801459..96e9731c4 100644
{
int ni = shaNI;
if (!ni)
@@ -1332,7 +1332,7 @@ unsigned FAST_FUNC sha1_end(sha1_ctx_t *ctx, void *resbuf)
hash_size = 8;
if (ctx->process_block == sha1_process_block64
#if ENABLE_SHA1_HWACCEL
-# if defined(__GNUC__) && (defined(__i386__) || defined(__x86_64__))
+# if defined(__GNUC__) && defined(__x86_64__)
|| ctx->process_block == sha1_process_block64_shaNI
# endif
#endif

8 changes: 4 additions & 4 deletions Dockerfile-builder.template
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -266,19 +266,19 @@ WORKDIR /usr/src/busybox
[
"no-cbq.patch",
if env.variant == "musl" then
if .version | startswith("1.36.") then
"hackfix-to-disable-HW-acceleration-for-MD5-SHA1-on-x86-1.36.patch"
if .version | startswith("1.37.") then
"hackfix-to-disable-HW-acceleration-for-MD5-SHA1-on-x86-1.37.patch"
else
"hackfix-to-disable-HW-acceleration-for-MD5-SHA1-on-x86.patch"
end
else empty end,
if .version | startswith("1.36.") then empty else
if .version | startswith("1.37.") then
if env.variant == "musl" then
"sha1_process_block64_shaNI-musl.patch"
else
"sha1_process_block64_shaNI.patch"
end
end,
else empty end,
empty # trailing comma
]
| map("/.patches/" + .)
Expand Down
9 changes: 5 additions & 4 deletions latest-1/glibc/Dockerfile.builder
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

0 ...9be062f0683809ae3a3685bc7b0e17bd1c48c50e8 → ...72724c2827077657189af7a781829d0825d48d2ab
View file
Open in desktop
File renamed without changes.
0 ...cde1450807faa2d56704205c697b4bd5df7b9e29f → ...0c0bb39d44393e9a03fd852c0865b0f540d868df0
View file
Open in desktop
File renamed without changes.
0 ...59433feb4cd2341eb3554b1da1c638c976e56451d → ...2b70908f5d33eb028568b456f78eedff2ff2930e4
View file
Open in desktop
File renamed without changes.
8 changes: 4 additions & 4 deletions latest-1/glibc/amd64/image-config.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,17 +7,17 @@
"PATH=/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin"
]
},
"created": "2023-05-18T22:34:17Z",
"created": "2024-09-26T21:31:42Z",
"history": [
{
"created": "2023-05-18T22:34:17Z",
"created_by": "BusyBox 1.36.1 (glibc), Debian 13"
"created": "2024-09-26T21:31:42Z",
"created_by": "BusyBox 1.37.0 (glibc), Debian 13"
}
],
"rootfs": {
"type": "layers",
"diff_ids": [
"sha256:97e4ece8f8a4d01b66df2c55c1f1e8a2860597b54dffbbc0df2f9942062cb34d"
"sha256:412f8a616e1efb03d4ab94ce18ebddf3f068b637f1c7ae8dbc82306a852de408"
]
},
"architecture": "amd64",
Expand Down
8 changes: 4 additions & 4 deletions latest-1/glibc/amd64/image-manifest.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,18 +3,18 @@
"mediaType": "application/vnd.oci.image.manifest.v1+json",
"config": {
"mediaType": "application/vnd.oci.image.config.v1+json",
"digest": "sha256:b116e155074440ffd9e449559433feb4cd2341eb3554b1da1c638c976e56451d",
"digest": "sha256:db287cb6be81219cd18c1d82b70908f5d33eb028568b456f78eedff2ff2930e4",
"size": 459
},
"layers": [
{
"mediaType": "application/vnd.oci.image.layer.v1.tar+gzip",
"digest": "sha256:034d6572bf287fa79604fee9be062f0683809ae3a3685bc7b0e17bd1c48c50e8",
"size": 2206402
"digest": "sha256:436a1b1fd078ee8e117111472724c2827077657189af7a781829d0825d48d2ab",
"size": 2211507
}
],
"annotations": {
"org.opencontainers.image.url": "https://github.com/docker-library/busybox",
"org.opencontainers.image.version": "1.36.1-glibc"
"org.opencontainers.image.version": "1.37.0-glibc"
}
}
6 changes: 3 additions & 3 deletions latest-1/glibc/amd64/index.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,15 +4,15 @@
"manifests": [
{
"mediaType": "application/vnd.oci.image.manifest.v1+json",
"digest": "sha256:b7f3d86d6e84fc17718c48bcde1450807faa2d56704205c697b4bd5df7b9e29f",
"digest": "sha256:7a3ebe5bfd1a4a19797d20b0c0bb39d44393e9a03fd852c0865b0f540d868df0",
"size": 610,
"platform": {
"architecture": "amd64",
"os": "linux"
},
"annotations": {
"org.opencontainers.image.ref.name": "busybox:1.36.1-glibc",
"io.containerd.image.name": "busybox:1.36.1-glibc"
"org.opencontainers.image.ref.name": "busybox:1.37.0-glibc",
"io.containerd.image.name": "busybox:1.37.0-glibc"
}
}
]
Expand Down
0 ...55ac3ecc6cc81d2ccdcc3ac5e68dd4534740540f9 → ...ed0eababbcb214cc2e1327a8b70c02f96d0c8ef3e
View file
Open in desktop
File renamed without changes.
0 ...66691322abdfeccc6d77a13194c7ab6b3915baaf6 → ...51ca74617f6d94efaf47185b02729d18d2f029762
View file
Open in desktop
File renamed without changes.
0 ...31ab2fc4fc7c2397e82909fd4e3cb140fe9301a9f → ...b36524127ca310cc9edca84e4e14367598d8b515c
View file
Open in desktop
File renamed without changes.
8 changes: 4 additions & 4 deletions latest-1/glibc/i386/image-config.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,17 +7,17 @@
"PATH=/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin"
]
},
"created": "2023-05-18T22:34:17Z",
"created": "2024-09-26T21:31:42Z",
"history": [
{
"created": "2023-05-18T22:34:17Z",
"created_by": "BusyBox 1.36.1 (glibc), Debian 13"
"created": "2024-09-26T21:31:42Z",
"created_by": "BusyBox 1.37.0 (glibc), Debian 13"
}
],
"rootfs": {
"type": "layers",
"diff_ids": [
"sha256:e96bd82defa862a66f4ea80ed674c9f9b5e2c246d9e9a21bc86322201e549f16"
"sha256:f725e577b9235da006d4ff6a34852e60e8aa1b8b7d9f78f38e9125c4ac3710d7"
]
},
"architecture": "386",
Expand Down
8 changes: 4 additions & 4 deletions latest-1/glibc/i386/image-manifest.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,18 +3,18 @@
"mediaType": "application/vnd.oci.image.manifest.v1+json",
"config": {
"mediaType": "application/vnd.oci.image.config.v1+json",
"digest": "sha256:931bca68dc3dfa636e0258631ab2fc4fc7c2397e82909fd4e3cb140fe9301a9f",
"digest": "sha256:ba6fe375dc1702747693ef6b36524127ca310cc9edca84e4e14367598d8b515c",
"size": 457
},
"layers": [
{
"mediaType": "application/vnd.oci.image.layer.v1.tar+gzip",
"digest": "sha256:6c9ce08c41d17c2d12ea5d155ac3ecc6cc81d2ccdcc3ac5e68dd4534740540f9",
"size": 2280961
"digest": "sha256:94a5214ec6a974e0c052f50ed0eababbcb214cc2e1327a8b70c02f96d0c8ef3e",
"size": 2286048
}
],
"annotations": {
"org.opencontainers.image.url": "https://github.com/docker-library/busybox",
"org.opencontainers.image.version": "1.36.1-glibc"
"org.opencontainers.image.version": "1.37.0-glibc"
}
}
6 changes: 3 additions & 3 deletions latest-1/glibc/i386/index.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,15 +4,15 @@
"manifests": [
{
"mediaType": "application/vnd.oci.image.manifest.v1+json",
"digest": "sha256:d5f45b39573a582b66cc64866691322abdfeccc6d77a13194c7ab6b3915baaf6",
"digest": "sha256:997af562a34229174bedf1251ca74617f6d94efaf47185b02729d18d2f029762",
"size": 610,
"platform": {
"architecture": "386",
"os": "linux"
},
"annotations": {
"org.opencontainers.image.ref.name": "busybox:1.36.1-glibc",
"io.containerd.image.name": "busybox:1.36.1-glibc"
"org.opencontainers.image.ref.name": "busybox:1.37.0-glibc",
"io.containerd.image.name": "busybox:1.37.0-glibc"
}
}
]
Expand Down
11 changes: 6 additions & 5 deletions latest-1/musl/Dockerfile.builder
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

0 ...7f200a3e7f8584884f9d4aad5185aed0d9033b5e1 → ...b87469b9c289f631c45427bf3b2221109551f547d
View file
Open in desktop
File renamed without changes.
0 ...08703910fe543b3a948ae74a32a10ca3789dc13ab → ...cfd2ad6ec2790cae25d519d8df255ba24819d96f0
View file
Open in desktop
File renamed without changes.
0 ...0b1cd54f4c62495b38d2451accbe5ef3b60da7955 → ...24f2972e1ad162354163517d2bf202005a1c3c906
View file
Open in desktop
File renamed without changes.
8 changes: 4 additions & 4 deletions latest-1/musl/amd64/image-config.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,17 +7,17 @@
"PATH=/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin"
]
},
"created": "2023-05-18T22:34:17Z",
"created": "2024-09-26T21:31:42Z",
"history": [
{
"created": "2023-05-18T22:34:17Z",
"created_by": "BusyBox 1.36.1 (musl), Alpine 3.23.3"
"created": "2024-09-26T21:31:42Z",
"created_by": "BusyBox 1.37.0 (musl), Alpine 3.23.4"
}
],
"rootfs": {
"type": "layers",
"diff_ids": [
"sha256:1fae88c40899925fe139162282d9cf0ea219ddc16deb9c6707722af53fccbe8a"
"sha256:cdb90b3acfad4e427a5bb3dc46cef97d9b63942f7c572d385ac61eb545a7cef2"
]
},
"architecture": "amd64",
Expand Down
8 changes: 4 additions & 4 deletions latest-1/musl/amd64/image-manifest.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,18 +3,18 @@
"mediaType": "application/vnd.oci.image.manifest.v1+json",
"config": {
"mediaType": "application/vnd.oci.image.config.v1+json",
"digest": "sha256:31ff19244746e3472cb1f177f200a3e7f8584884f9d4aad5185aed0d9033b5e1",
"digest": "sha256:38b54fd486623cf83b967f8b87469b9c289f631c45427bf3b2221109551f547d",
"size": 462
},
"layers": [
{
"mediaType": "application/vnd.oci.image.layer.v1.tar+gzip",
"digest": "sha256:05938142326af7d798d22440b1cd54f4c62495b38d2451accbe5ef3b60da7955",
"size": 867906
"digest": "sha256:f4255029a25bc97fe31c78724f2972e1ad162354163517d2bf202005a1c3c906",
"size": 871090
}
],
"annotations": {
"org.opencontainers.image.url": "https://github.com/docker-library/busybox",
"org.opencontainers.image.version": "1.36.1-musl"
"org.opencontainers.image.version": "1.37.0-musl"
}
}
6 changes: 3 additions & 3 deletions latest-1/musl/amd64/index.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,15 +4,15 @@
"manifests": [
{
"mediaType": "application/vnd.oci.image.manifest.v1+json",
"digest": "sha256:cbf412bcf1379481c80f65208703910fe543b3a948ae74a32a10ca3789dc13ab",
"digest": "sha256:6be969a074d06073a62ad8ccfd2ad6ec2790cae25d519d8df255ba24819d96f0",
"size": 608,
"platform": {
"architecture": "amd64",
"os": "linux"
},
"annotations": {
"org.opencontainers.image.ref.name": "busybox:1.36.1-musl",
"io.containerd.image.name": "busybox:1.36.1-musl"
"org.opencontainers.image.ref.name": "busybox:1.37.0-musl",
"io.containerd.image.name": "busybox:1.37.0-musl"
}
}
]
Expand Down
0 ...f31bfc87a83751c9254518a7048c46324113c5e8a → ...ae7c57bfc840e05a8fc5d4d69054a1ef5e713c468
View file
Open in desktop
File renamed without changes.
0 ...93ec46091159f80070822f2c1cd88ecbcb0a07e2c → ...840ff6fce13b9d9552a02a4c0ccff43c13706520c
View file
Open in desktop
File renamed without changes.
0 ...8b5b7b4101e388bc8fde7f0138fc36716fce6fc0f → ...ad00951819f25e9a8dc2a9475644d3deb71516f04
View file
Open in desktop
File renamed without changes.
8 changes: 4 additions & 4 deletions latest-1/musl/i386/image-config.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,17 +7,17 @@
"PATH=/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin"
]
},
"created": "2023-05-18T22:34:17Z",
"created": "2024-09-26T21:31:42Z",
"history": [
{
"created": "2023-05-18T22:34:17Z",
"created_by": "BusyBox 1.36.1 (musl), Alpine 3.23.3"
"created": "2024-09-26T21:31:42Z",
"created_by": "BusyBox 1.37.0 (musl), Alpine 3.23.4"
}
],
"rootfs": {
"type": "layers",
"diff_ids": [
"sha256:1d273ce5855799d0382e0b27f791f6bb946934af721c8ddaa34d8abb4eb637fc"
"sha256:d2e130f8dbf4424fffe6f7d68ac058246b4ba2b099722419b33d21559f32d534"
]
},
"architecture": "386",
Expand Down
8 changes: 4 additions & 4 deletions latest-1/musl/i386/image-manifest.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,18 +3,18 @@
"mediaType": "application/vnd.oci.image.manifest.v1+json",
"config": {
"mediaType": "application/vnd.oci.image.config.v1+json",
"digest": "sha256:7a6b71a4f05e5a03e8a7ca7f31bfc87a83751c9254518a7048c46324113c5e8a",
"digest": "sha256:3aa8c7af419e248ce1cc728ae7c57bfc840e05a8fc5d4d69054a1ef5e713c468",
"size": 460
},
"layers": [
{
"mediaType": "application/vnd.oci.image.layer.v1.tar+gzip",
"digest": "sha256:50d90be1c956225a90830e293ec46091159f80070822f2c1cd88ecbcb0a07e2c",
"size": 854574
"digest": "sha256:b94a795c1dd61d6d35ed137840ff6fce13b9d9552a02a4c0ccff43c13706520c",
"size": 858611
}
],
"annotations": {
"org.opencontainers.image.url": "https://github.com/docker-library/busybox",
"org.opencontainers.image.version": "1.36.1-musl"
"org.opencontainers.image.version": "1.37.0-musl"
}
}
6 changes: 3 additions & 3 deletions latest-1/musl/i386/index.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,15 +4,15 @@
"manifests": [
{
"mediaType": "application/vnd.oci.image.manifest.v1+json",
"digest": "sha256:0d296163ffb076a731c137d8b5b7b4101e388bc8fde7f0138fc36716fce6fc0f",
"digest": "sha256:e22a5a0972c275b2a005fd6ad00951819f25e9a8dc2a9475644d3deb71516f04",
"size": 608,
"platform": {
"architecture": "386",
"os": "linux"
},
"annotations": {
"org.opencontainers.image.ref.name": "busybox:1.36.1-musl",
"io.containerd.image.name": "busybox:1.36.1-musl"
"org.opencontainers.image.ref.name": "busybox:1.37.0-musl",
"io.containerd.image.name": "busybox:1.37.0-musl"
}
}
]
Expand Down
Loading
Loading