diff --git a/package/distribution-registry/0001-s3-aws-fix-build-for-386.patch b/package/distribution-registry/0001-s3-aws-fix-build-for-386.patch deleted file mode 100644 index a725ab8e92..0000000000 --- a/package/distribution-registry/0001-s3-aws-fix-build-for-386.patch +++ /dev/null @@ -1,45 +0,0 @@ -From 6970080b10a53d858dd444a643a2bd911de12940 Mon Sep 17 00:00:00 2001 -From: Chen Qi -Date: Thu, 29 May 2025 11:28:38 +0800 -Subject: [PATCH] s3-aws: fix build for 386 - -When building for 386, we got the following build error: - - registry/storage/driver/s3-aws/s3.go:312:99: cannot use - maxChunkSize (untyped int constant 5368709120) as int value - in argument to getParameterAsInteger (overflows) - -This is because the s3_64bit.go is used. Adjust the build tag matching -in s3_32bit.go and s3_64bit.go to fix this issue. - -Signed-off-by: Chen Qi -Upstream: https://github.com/distribution/distribution/commit/6970080b10a53d858dd444a643a2bd911de12940 -Signed-off-by: Yann E. MORIN ---- - registry/storage/driver/s3-aws/s3_32bit.go | 2 +- - registry/storage/driver/s3-aws/s3_64bit.go | 2 +- - 2 files changed, 2 insertions(+), 2 deletions(-) - -diff --git a/registry/storage/driver/s3-aws/s3_32bit.go b/registry/storage/driver/s3-aws/s3_32bit.go -index 218e3eab..84161fcb 100644 ---- a/registry/storage/driver/s3-aws/s3_32bit.go -+++ b/registry/storage/driver/s3-aws/s3_32bit.go -@@ -1,4 +1,4 @@ --//go:build arm -+//go:build arm || 386 - - package s3 - -diff --git a/registry/storage/driver/s3-aws/s3_64bit.go b/registry/storage/driver/s3-aws/s3_64bit.go -index 55254e49..2ed1f92f 100644 ---- a/registry/storage/driver/s3-aws/s3_64bit.go -+++ b/registry/storage/driver/s3-aws/s3_64bit.go -@@ -1,4 +1,4 @@ --//go:build !arm -+//go:build !arm && !386 - - package s3 - --- -2.51.1 - diff --git a/package/distribution-registry/distribution-registry.hash b/package/distribution-registry/distribution-registry.hash index 38d7b5a487..9c2fa922ee 100644 --- a/package/distribution-registry/distribution-registry.hash +++ b/package/distribution-registry/distribution-registry.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 6330e6b625c0232b43cee8ea32800a660a7d7a0c79f4f53e4d9a8a6707138d46 distribution-registry-v3.0.0-git4-go2.tar.gz +sha256 5ed3891ed90c7d097304f49aec2e1f16299770309e2f424b5ee9531b1da2429a distribution-registry-v3.1.1-git4-go2.tar.gz sha256 cb5e8e7e5f4a3988e1063c142c60dc2df75605f4c46515e776e3aca6df976e14 LICENSE diff --git a/package/distribution-registry/distribution-registry.mk b/package/distribution-registry/distribution-registry.mk index a01a3c1710..1119132b48 100644 --- a/package/distribution-registry/distribution-registry.mk +++ b/package/distribution-registry/distribution-registry.mk @@ -4,7 +4,7 @@ # ################################################################################ -DISTRIBUTION_REGISTRY_VERSION = v3.0.0 +DISTRIBUTION_REGISTRY_VERSION = v3.1.1 DISTRIBUTION_REGISTRY_SITE = https://github.com/distribution/distribution DISTRIBUTION_REGISTRY_SITE_METHOD = git