Skip to content

[pull] master from buildroot:master #833

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
pull merged 3 commits into from
Jan 27, 2026
Merged

[pull] master from buildroot:master #833

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
fdeced6
system/Config.in: do not reference md5 for sha256 option
jacmet Jan 27, 2026
fb523a7
package/busybox: default to BR2_TARGET_GENERIC_PASSWD_* algo
jacmet Jan 27, 2026
22137df
package/go: security bump to version 1.25.6
jacmet Jan 27, 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
13 changes: 13 additions & 0 deletions package/busybox/busybox.mk
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -176,6 +176,18 @@ define BUSYBOX_SET_CRYPT_SHA
endef
endif

ifeq ($(BR2_TARGET_GENERIC_PASSWD_SHA256),y)
define BUSYBOX_SET_DEFAULT_PASSWD_ALGO
$(call KCONFIG_SET_OPT,CONFIG_FEATURE_DEFAULT_PASSWD_ALGO,"sha256")
endef
endif

ifeq ($(BR2_TARGET_GENERIC_PASSWD_SHA512),y)
define BUSYBOX_SET_DEFAULT_PASSWD_ALGO
$(call KCONFIG_SET_OPT,CONFIG_FEATURE_DEFAULT_PASSWD_ALGO,"sha512")
endef
endif

ifeq ($(BR2_USE_MMU),y)
define BUSYBOX_SET_MMU
$(call KCONFIG_DISABLE_OPT,CONFIG_NOMMU)
Expand Down Expand Up @@ -427,6 +439,7 @@ define BUSYBOX_KCONFIG_FIXUP_CMDS
$(BUSYBOX_SET_MDEV)
$(BUSYBOX_SET_CRYPT_SHA)
$(BUSYBOX_LINUX_PAM)
$(BUSYBOX_SET_DEFAULT_PASSWD_ALGO)
$(BUSYBOX_SET_INIT)
$(BUSYBOX_SET_WATCHDOG)
$(BUSYBOX_SET_SELINUX)
Expand Down
14 changes: 7 additions & 7 deletions package/go/go.hash
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
# sha256 checksum from https://go.dev/dl/
sha256 22a5fd0a91efcd28a1b0537106b9959b2804b61f59c3758b51e8e5429c1a954f go1.25.5.src.tar.gz
sha256 db908a86e888574ed3432355ba5372ad3ef2c0821ba9b91ceaa0f6634620c40c go1.25.5.linux-386.tar.gz
sha256 9e9b755d63b36acf30c12a9a3fc379243714c1c6d3dd72861da637f336ebb35b go1.25.5.linux-amd64.tar.gz
sha256 b00b694903d126c588c378e72d3545549935d3982635ba3f7a964c9fa23fe3b9 go1.25.5.linux-arm64.tar.gz
sha256 0b27e3dec8d04899d6941586d2aa2721c3dee67c739c1fc1b528188f3f6e8ab5 go1.25.5.linux-armv6l.tar.gz
sha256 f0904b647b5b8561efc5d48bb59a34f2b7996afab83ccd41c93b1aeb2c0067e4 go1.25.5.linux-ppc64le.tar.gz
sha256 a5d0a72b0dfd57f9c2c0cdd8b7e0f401e0afb9e8c304d3410f9b0982ce0953da go1.25.5.linux-s390x.tar.gz
sha256 58cbf771e44d76de6f56d19e33b77d745a1e489340922875e46585b975c2b059 go1.25.6.src.tar.gz
sha256 59fe62eee3cca65332acef3ebe9b6ff3272467e0a08bf7f68f96334902bf23b9 go1.25.6.linux-386.tar.gz
sha256 f022b6aad78e362bcba9b0b94d09ad58c5a70c6ba3b7582905fababf5fe0181a go1.25.6.linux-amd64.tar.gz
sha256 738ef87d79c34272424ccdf83302b7b0300b8b096ed443896089306117943dd5 go1.25.6.linux-arm64.tar.gz
sha256 679f0e70b27c637116791e3c98afbf8c954deb2cd336364944d014f8e440e2ae go1.25.6.linux-armv6l.tar.gz
sha256 bee02dbe034b12b839ae7807a85a61c13bee09ee38f2eeba2074bd26c0c0ab73 go1.25.6.linux-ppc64le.tar.gz
sha256 3d97cc5670a0da9cb177037782129f0bf499ecb47abc40488248548abd2c2c35 go1.25.6.linux-s390x.tar.gz
sha256 911f8f5782931320f5b8d1160a76365b83aea6447ee6c04fa6d5591467db9dad LICENSE
2 changes: 1 addition & 1 deletion package/go/go.mk
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
#
################################################################################

GO_VERSION = 1.25.5
GO_VERSION = 1.25.6

HOST_GO_GOPATH = $(HOST_DIR)/share/go-path
HOST_GO_HOST_CACHE = $(HOST_DIR)/share/host-go-cache
Expand Down
2 changes: 1 addition & 1 deletion system/Config.in
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@ choice
config BR2_TARGET_GENERIC_PASSWD_SHA256
bool "sha-256"
help
Use SHA256 to encode passwords which is stronger than MD5.
Use SHA256 to encode passwords.

config BR2_TARGET_GENERIC_PASSWD_SHA512
bool "sha-512"
Expand Down