diff --git a/package/Config.in b/package/Config.in index 6284bea7f4ad..8346ef1a0e88 100644 --- a/package/Config.in +++ b/package/Config.in @@ -2121,6 +2121,7 @@ menu "Other" source "package/avro-c/Config.in" source "package/basu/Config.in" source "package/bdwgc/Config.in" + source "package/blake3/Config.in" source "package/boost/Config.in" source "package/c-capnproto/Config.in" source "package/capnproto/Config.in" diff --git a/package/blake3/Config.in b/package/blake3/Config.in new file mode 100644 index 000000000000..afad6541d95a --- /dev/null +++ b/package/blake3/Config.in @@ -0,0 +1,8 @@ +config BR2_PACKAGE_BLAKE3 + bool "blake3" + depends on BR2_INSTALL_LIBSTDCPP + depends on BR2_TOOLCHAIN_GCC_AT_LEAST_8 # C++20 + help + BLAKE3 is a cryptographic hash function. + + https://github.com/BLAKE3-team/BLAKE3 diff --git a/package/blake3/blake3.hash b/package/blake3/blake3.hash index 6bcfefb2b846..6e7d02db6c7f 100644 --- a/package/blake3/blake3.hash +++ b/package/blake3/blake3.hash @@ -1,5 +1,5 @@ # sha256 computed locally -sha256 6b51aefe515969785da02e87befafc7fdc7a065cd3458cf1141f29267749e81f blake3-1.8.2.tar.gz +sha256 5a11e3f834719b6c1cae7aced1e848a37013f6f10f97272e7849aa0da769f295 blake3-1.8.3.tar.gz sha256 00fcc7a934ddbc9ece2a7cc063ac788e284b703b1d705ccbba72d462aa97921e LICENSE_A2 sha256 a5695f57ea0c221e0e8b7d784ff774c35e88c3d3270353646a925880bb3492cc LICENSE_A2LLVM sha256 a2010f343487d3f7618affe54f789f5487602331c0a8d03f49e9a7c547cf0499 LICENSE_CC0 diff --git a/package/blake3/blake3.mk b/package/blake3/blake3.mk index 9d1323192c86..9218e5bbbaea 100644 --- a/package/blake3/blake3.mk +++ b/package/blake3/blake3.mk @@ -4,12 +4,21 @@ # ################################################################################ -BLAKE3_VERSION = 1.8.2 +BLAKE3_VERSION = 1.8.3 BLAKE3_SITE = $(call github,BLAKE3-team,BLAKE3,$(BLAKE3_VERSION)) BLAKE3_SUBDIR = c BLAKE3_LICENSE = Apache-2.0 or Apache-2.0 with exceptions or CC0-1.0 BLAKE3_LICENSE_FILES = LICENSE_A2 LICENSE_A2LLVM LICENSE_CC0 +BLAKE3_INSTALL_STAGING = YES + +BLAKE3_CONF_OPTS = \ + -DBLAKE3_USE_TBB=OFF \ + -DBLAKE3_EXAMPLES=OFF +HOST_BLAKE3_CONF_OPTS = \ + -DBLAKE3_USE_TBB=OFF \ + -DBLAKE3_EXAMPLES=OFF + # The package is a dependency to ccache so ccache cannot be a dependency HOST_BLAKE3_ADD_CCACHE_DEPENDENCY = NO @@ -19,4 +28,5 @@ HOST_BLAKE3_CONF_OPTS += \ -UCMAKE_C_COMPILER_LAUNCHER \ -UCMAKE_CXX_COMPILER_LAUNCHER +$(eval $(cmake-package)) $(eval $(host-cmake-package)) diff --git a/package/glibc/glibc.hash b/package/glibc/glibc.hash index a58bb7b9a7e6..0a11cfdb5ef9 100644 --- a/package/glibc/glibc.hash +++ b/package/glibc/glibc.hash @@ -1,5 +1,5 @@ -# Locally calculated (fetched from Github) -sha256 f63ffa06cd17ee8ff891f6de41de6e189b96edc6b2be2807ae597291f4464388 glibc-2.42-51-gcbf39c26b25801e9bc88499b4fd361ac172d4125.tar.gz +# Locally calculated (fetched from git) +sha256 737e3b2bfee2e3e209e514133f4ff7d2bef0d0dc903fd46b4e2244f6c998f7b2 glibc-2.42-51-gcbf39c26b25801e9bc88499b4fd361ac172d4125-git4.tar.gz # Hashes for license files sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING diff --git a/package/glibc/glibc.mk b/package/glibc/glibc.mk index 44bf9c4b06f5..80d21b86ed23 100644 --- a/package/glibc/glibc.mk +++ b/package/glibc/glibc.mk @@ -8,14 +8,8 @@ # git describe --match 'glibc-*' --abbrev=40 origin/release/MAJOR.MINOR/master | cut -d '-' -f 2- # When updating the version, please also update localedef GLIBC_VERSION = 2.42-51-gcbf39c26b25801e9bc88499b4fd361ac172d4125 - -# Upstream doesn't officially provide an https download link. -# There is one (https://sourceware.org/git/glibc.git) but it's not reliable, -# sometimes the connection times out. So use an unofficial github mirror. -# When updating the version, check it on the official repository; -# *NEVER* decide on a version string by looking at the mirror. -# Then check that the mirror has been synced already (happens once a day.) -GLIBC_SITE = $(call github,bminor,glibc,$(GLIBC_VERSION)) +GLIBC_SITE = https://sourceware.org/git/glibc.git +GLIBC_SITE_METHOD = git GLIBC_LICENSE = GPL-2.0+ (programs), LGPL-2.1+, BSD-3-Clause, MIT (library) GLIBC_LICENSE_FILES = COPYING COPYING.LIB LICENSES diff --git a/package/localedef/localedef.mk b/package/localedef/localedef.mk index 254a79026a70..4da110417a69 100644 --- a/package/localedef/localedef.mk +++ b/package/localedef/localedef.mk @@ -8,8 +8,9 @@ # As in glibc.mk, generate version string using: # git describe --match 'glibc-*' --abbrev=40 origin/release/MAJOR.MINOR/master | cut -d '-' -f 2- LOCALEDEF_VERSION = 2.42-51-gcbf39c26b25801e9bc88499b4fd361ac172d4125 -LOCALEDEF_SOURCE = glibc-$(LOCALEDEF_VERSION).tar.gz -LOCALEDEF_SITE = $(call github,bminor,glibc,$(LOCALEDEF_VERSION)) +LOCALEDEF_SOURCE = glibc-$(LOCALEDEF_VERSION)$(BR_FMT_VERSION_git).tar.gz +LOCALEDEF_SITE = https://sourceware.org/git/glibc.git +LOCALEDEF_SITE_METHOD = git HOST_LOCALEDEF_DL_SUBDIR = glibc HOST_LOCALEDEF_DEPENDENCIES = \ diff --git a/package/mesa3d-headers/mesa3d-headers.mk b/package/mesa3d-headers/mesa3d-headers.mk index 933f7ab7315a..263c79ec3896 100644 --- a/package/mesa3d-headers/mesa3d-headers.mk +++ b/package/mesa3d-headers/mesa3d-headers.mk @@ -12,7 +12,7 @@ endif # Not possible to directly refer to mesa3d variables, because of # first/second expansion trickery... -MESA3D_HEADERS_VERSION = 25.3.4 +MESA3D_HEADERS_VERSION = 25.3.5 MESA3D_HEADERS_SOURCE = mesa-$(MESA3D_HEADERS_VERSION).tar.xz MESA3D_HEADERS_SITE = https://archive.mesa3d.org MESA3D_HEADERS_DL_SUBDIR = mesa3d diff --git a/package/mesa3d/mesa3d.hash b/package/mesa3d/mesa3d.hash index f76043488e30..346738458a85 100644 --- a/package/mesa3d/mesa3d.hash +++ b/package/mesa3d/mesa3d.hash @@ -1,6 +1,6 @@ -# From https://lists.freedesktop.org/archives/mesa-announce/2026-January/000834.html -sha256 3a0fc6ec070b45ae25dc2ccb5e52fae1d89141f7c39c4a91fe4eaa80dfff9deb mesa-25.3.4.tar.xz -sha512 3043bebebebc90ba443bbc96d71fbae41c76504d54ff6a44a48ad7c3a132db09e3ad1ae607c49f1d58b724a8b6e4263b68ee5722f8b98328481eb2e82164ac3a mesa-25.3.4.tar.xz +# From https://lists.freedesktop.org/archives/mesa-announce/2026-February/000837.html +sha256 be472413475082df945e0f9be34f5af008baa03eb357e067ce5a611a2d44c44b mesa-25.3.5.tar.xz +sha512 3db3d3c98bf476a5827705b82733d9964ec511b30882ec7e9edaddc65a5dea5e6bfb33bdcd4f97752d7a3ae9e306e8703982686cbd869567b4194decdb2f5a89 mesa-25.3.5.tar.xz # License sha256 0d1a0472ecc81830e75c20d59b0ea02841e3db21255e0ebad97ab682c54d6615 docs/license.rst sha256 323c587d0ccf10e376f8bf9a7f31fb4ca6078105194b42e0b1e0ee2bc9bde71f licenses/MIT diff --git a/package/mesa3d/mesa3d.mk b/package/mesa3d/mesa3d.mk index b5300df2ba38..64b8113e6ff3 100644 --- a/package/mesa3d/mesa3d.mk +++ b/package/mesa3d/mesa3d.mk @@ -5,7 +5,7 @@ ################################################################################ # When updating the version, please also update mesa3d-headers -MESA3D_VERSION = 25.3.4 +MESA3D_VERSION = 25.3.5 MESA3D_SOURCE = mesa-$(MESA3D_VERSION).tar.xz MESA3D_SITE = https://archive.mesa3d.org MESA3D_LICENSE = MIT, SGI, Khronos diff --git a/package/shadow/Config.in b/package/shadow/Config.in index bbbea811ced2..93216bd14c0c 100644 --- a/package/shadow/Config.in +++ b/package/shadow/Config.in @@ -3,6 +3,9 @@ menuconfig BR2_PACKAGE_SHADOW depends on !BR2_STATIC_LIBS depends on BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_14 select BR2_PACKAGE_LIBXCRYPT if BR2_TOOLCHAIN_USES_GLIBC + select BR2_PACKAGE_SHADOW_SHA_CRYPT if \ + (BR2_TARGET_GENERIC_PASSWD_SHA256 || \ + BR2_TARGET_GENERIC_PASSWD_SHA512) help Utilities to deal with user accounts. diff --git a/package/shadow/shadow.mk b/package/shadow/shadow.mk index 2ba7a0e03e10..cf05fc1bdcbe 100644 --- a/package/shadow/shadow.mk +++ b/package/shadow/shadow.mk @@ -140,4 +140,19 @@ define SHADOW_PERMISSIONS $(SHADOW_SUBORDINATE_IDS_PERMISSIONS) endef +ifeq ($(BR2_TARGET_GENERIC_PASSWD_SHA256),y) +SHADOW_ENCRYPT_METHOD = SHA256 +else ifeq ($(BR2_TARGET_GENERIC_PASSWD_SHA512),y) +SHADOW_ENCRYPT_METHOD = SHA512 +endif + +ifneq ($(SHADOW_ENCRYPT_METHOD),) +define SHADOW_SET_ENCRYPT_METHOD + $(SED) 's/^[#]\?ENCRYPT_METHOD .*/ENCRYPT_METHOD $(SHADOW_ENCRYPT_METHOD)/' \ + $(TARGET_DIR)/etc/login.defs +endef + +SHADOW_POST_INSTALL_TARGET_HOOKS += SHADOW_SET_ENCRYPT_METHOD +endif + $(eval $(autotools-package)) diff --git a/package/swig/swig-wrapper.in b/package/swig/swig-wrapper.in index 61c885fc9054..e6cf2df134ea 100644 --- a/package/swig/swig-wrapper.in +++ b/package/swig/swig-wrapper.in @@ -5,4 +5,4 @@ if [ -z "${SWIG_LIB}" ]; then export SWIG_LIB="${0%/*}/../share/swig/@SWIG_VERSION@" fi -exec "${0}.br_real" "$@" +exec "$(realpath "${0}").br_real" "$@"