From b0a8ddf1968657e34fabadfa0c470d7a7cadffc6 Mon Sep 17 00:00:00 2001 From: Michael Heimpold Date: Wed, 27 Dec 2023 13:42:08 +0100 Subject: [PATCH 1/8] php8: update to 8.3.1 Signed-off-by: Michael Heimpold --- lang/php8/Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lang/php8/Makefile b/lang/php8/Makefile index 7f6bb27d6..7a2dd4ba4 100644 --- a/lang/php8/Makefile +++ b/lang/php8/Makefile @@ -6,7 +6,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=php -PKG_VERSION:=8.3.0 +PKG_VERSION:=8.3.1 PKG_RELEASE:=1 PKG_MAINTAINER:=Michael Heimpold @@ -16,7 +16,7 @@ PKG_CPE_ID:=cpe:/a:php:php PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz PKG_SOURCE_URL:=http://www.php.net/distributions/ -PKG_HASH:=1db84fec57125aa93638b51bb2b15103e12ac196e2f960f0d124275b2687ea54 +PKG_HASH:=56445b1771b2ba5b7573453f9e8a9451e2d810b1741a352fa05259733b1e9758 PKG_BUILD_PARALLEL:=1 PKG_BUILD_FLAGS:=no-mips16 From 2cf219c8379e178622b5e302754b4b87b581bc56 Mon Sep 17 00:00:00 2001 From: Anya Lin Date: Sat, 30 Dec 2023 22:44:52 +0800 Subject: [PATCH 2/8] sing-box: Update to 1.7.7 Signed-off-by: Anya Lin --- net/sing-box/Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/net/sing-box/Makefile b/net/sing-box/Makefile index 3bd577e8f..32134356f 100644 --- a/net/sing-box/Makefile +++ b/net/sing-box/Makefile @@ -1,12 +1,12 @@ include $(TOPDIR)/rules.mk PKG_NAME:=sing-box -PKG_VERSION:=1.7.4 +PKG_VERSION:=1.7.7 PKG_RELEASE:=1 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=https://codeload.github.com/SagerNet/sing-box/tar.gz/v$(PKG_VERSION)? -PKG_HASH:=483c7188f054dffc37211a4c6d50edc7473f9cbbe57c5687bb3551aba3919e52 +PKG_HASH:=ce182cb2181e898b56ca9b6ce0d5adeaece8e761ac62ce8cde69b3c7219b8430 PKG_LICENSE:=GPL-3.0-or-later PKG_LICENSE_FILES:=LICENSE From 85cdb88f95f33fed0c1e631bc95cccf6b15dbf8c Mon Sep 17 00:00:00 2001 From: Gerard Ryan Date: Sun, 31 Dec 2023 13:44:26 +1000 Subject: [PATCH 3/8] containerd: Update to 1.7.6 Signed-off-by: Gerard Ryan --- utils/containerd/Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/utils/containerd/Makefile b/utils/containerd/Makefile index 78aee46fa..c573aa9fd 100644 --- a/utils/containerd/Makefile +++ b/utils/containerd/Makefile @@ -1,14 +1,14 @@ include $(TOPDIR)/rules.mk PKG_NAME:=containerd -PKG_VERSION:=1.7.1 +PKG_VERSION:=1.7.6 PKG_RELEASE:=1 PKG_LICENSE:=Apache-2.0 PKG_LICENSE_FILES:=LICENSE PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=https://codeload.github.com/containerd/containerd/tar.gz/v${PKG_VERSION}? -PKG_HASH:=fd844af82afda7242d8eba5e0086c5a0d54ddc3041c1bbdd4d3c62bfee844e3a +PKG_HASH:=084a62f78f96cb5fda02221425f14df09d3e0acd093e4d4b3527900e3ff94677 PKG_MAINTAINER:=Gerard Ryan From 55f838abb0ab1cdebcf4008c26e13aaab2ec6a15 Mon Sep 17 00:00:00 2001 From: Gerard Ryan Date: Sun, 31 Dec 2023 13:45:22 +1000 Subject: [PATCH 4/8] runc: Update to 1.1.9 Signed-off-by: Gerard Ryan --- utils/runc/Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/utils/runc/Makefile b/utils/runc/Makefile index 265a81974..85b2de983 100644 --- a/utils/runc/Makefile +++ b/utils/runc/Makefile @@ -1,14 +1,14 @@ include $(TOPDIR)/rules.mk PKG_NAME:=runc -PKG_VERSION:=1.1.8 +PKG_VERSION:=1.1.9 PKG_RELEASE:=1 PKG_LICENSE:=Apache-2.0 PKG_LICENSE_FILES:=LICENSE PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=https://codeload.github.com/opencontainers/runc/tar.gz/v${PKG_VERSION}? -PKG_HASH:=9076322ded5c7ae30471ea8a6a43e7c62fb357957592f5cb668abc2f7cb5e4bb +PKG_HASH:=509993674481aad7e14aedfb280e0eb160f3a34c0b77e2e98c4b3c0b1df76894 PKG_MAINTAINER:=Gerard Ryan From 394767bb33745edff5e5161703573626bc301c0d Mon Sep 17 00:00:00 2001 From: Gerard Ryan Date: Sun, 31 Dec 2023 13:46:45 +1000 Subject: [PATCH 5/8] dockerd: Update to 24.0.7 Signed-off-by: Gerard Ryan --- utils/dockerd/Makefile | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/utils/dockerd/Makefile b/utils/dockerd/Makefile index d5b455c79..99da8bbc8 100644 --- a/utils/dockerd/Makefile +++ b/utils/dockerd/Makefile @@ -1,7 +1,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=dockerd -PKG_VERSION:=24.0.5 +PKG_VERSION:=24.0.7 PKG_RELEASE:=2 PKG_LICENSE:=Apache-2.0 PKG_LICENSE_FILES:=LICENSE @@ -10,8 +10,8 @@ PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_GIT_URL:=github.com/moby/moby PKG_GIT_REF:=v$(PKG_VERSION) PKG_SOURCE_URL:=https://codeload.$(PKG_GIT_URL)/tar.gz/$(PKG_GIT_REF)? -PKG_HASH:=837d7d667fb64508bf6e53cb5915b4b5ef356599294ffdd5ca8678168230cb38 -PKG_GIT_SHORT_COMMIT:=a61e2b4 # SHA1 used within the docker executables +PKG_HASH:=16a2cb4cf4d314a070085e0df06e3a6bd9ec678d28715b64060af694fc9051d5 +PKG_GIT_SHORT_COMMIT:=311b9ff # SHA1 used within the docker executables PKG_MAINTAINER:=Gerard Ryan From dc39565a5699b4012d7a9ffcd173a5f43d748c4d Mon Sep 17 00:00:00 2001 From: Gerard Ryan Date: Sun, 31 Dec 2023 13:47:14 +1000 Subject: [PATCH 6/8] docker: Update to 24.0.7 Signed-off-by: Gerard Ryan --- utils/docker/Makefile | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/utils/docker/Makefile b/utils/docker/Makefile index fda077e52..d8848218a 100644 --- a/utils/docker/Makefile +++ b/utils/docker/Makefile @@ -1,7 +1,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=docker -PKG_VERSION:=24.0.5 +PKG_VERSION:=24.0.7 PKG_RELEASE:=1 PKG_LICENSE:=Apache-2.0 PKG_LICENSE_FILES:=LICENSE @@ -10,8 +10,8 @@ PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_GIT_URL:=github.com/docker/cli PKG_GIT_REF:=v$(PKG_VERSION) PKG_SOURCE_URL:=https://codeload.$(PKG_GIT_URL)/tar.gz/$(PKG_GIT_REF)? -PKG_HASH:=fa32b5f3c2f85fba9ef6e1b5099a4b608fa20af45ba71b3da2194e8728037eec -PKG_GIT_SHORT_COMMIT:=ced0996 # SHA1 used within the docker executables +PKG_HASH:=72a54d131c28938221c81bd08364459fed9c71c093d4d615d324aaf31de6db1d +PKG_GIT_SHORT_COMMIT:=afdd53b # SHA1 used within the docker executables PKG_MAINTAINER:=Gerard Ryan From 9f01010958b9f57ef51903f69c7223eaefabf139 Mon Sep 17 00:00:00 2001 From: Tianling Shen Date: Sun, 31 Dec 2023 13:36:26 +0800 Subject: [PATCH 7/8] rust: unexport host sccache env variable Users might configure their own env variables on the host, and sometimes it can lead build failure or unexpected behavior. Fixes: #22889 Signed-off-by: Tianling Shen --- lang/rust/Makefile | 2 +- lang/rust/rust-values.mk | 6 ++++++ 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/lang/rust/Makefile b/lang/rust/Makefile index ba322cf1d..b8f03ae94 100644 --- a/lang/rust/Makefile +++ b/lang/rust/Makefile @@ -6,7 +6,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=rust PKG_VERSION:=1.74.0 -PKG_RELEASE:=1 +PKG_RELEASE:=2 PKG_SOURCE:=rustc-$(PKG_VERSION)-src.tar.gz PKG_SOURCE_URL:=https://static.rust-lang.org/dist/ diff --git a/lang/rust/rust-values.mk b/lang/rust/rust-values.mk index 7a4d1fcf8..534aaa02a 100644 --- a/lang/rust/rust-values.mk +++ b/lang/rust/rust-values.mk @@ -2,6 +2,12 @@ # # Copyright (C) 2023 Luca Barbato and Donald Hoskins +# Clear environment variables which should be handled internally, +# as users might configure their own env on the host + +# CCache +unexport RUSTC_WRAPPER + # Rust Environmental Vars RUSTC_HOST_SUFFIX:=$(word 4, $(subst -, ,$(GNU_HOST_NAME))) RUSTC_HOST_ARCH:=$(HOST_ARCH)-unknown-linux-$(RUSTC_HOST_SUFFIX) From 546e6eba4fd14607e8068787cea8e3d7f9f49e42 Mon Sep 17 00:00:00 2001 From: Tianling Shen Date: Sun, 31 Dec 2023 13:24:03 +0800 Subject: [PATCH 8/8] rust: Update to 1.75.0 Changelog: https://blog.rust-lang.org/2023/12/28/Rust-1.75.0.html Refreshed patches. Signed-off-by: Tianling Shen --- lang/rust/Makefile | 6 ++-- .../0001-Update-xz2-and-use-it-static.patch | 14 +++++----- .../patches/0002-rustc-bootstrap-cache.patch | 10 +++---- .../0003-bump-libc-deps-to-0.2.146.patch | 28 ------------------- 4 files changed, 15 insertions(+), 43 deletions(-) diff --git a/lang/rust/Makefile b/lang/rust/Makefile index b8f03ae94..46ee84e9d 100644 --- a/lang/rust/Makefile +++ b/lang/rust/Makefile @@ -5,12 +5,12 @@ include $(TOPDIR)/rules.mk PKG_NAME:=rust -PKG_VERSION:=1.74.0 -PKG_RELEASE:=2 +PKG_VERSION:=1.75.0 +PKG_RELEASE:=1 PKG_SOURCE:=rustc-$(PKG_VERSION)-src.tar.gz PKG_SOURCE_URL:=https://static.rust-lang.org/dist/ -PKG_HASH:=882b584bc321c5dcfe77cdaa69f277906b936255ef7808fcd5c7492925cf1049 +PKG_HASH:=5b739f45bc9d341e2d1c570d65d2375591e22c2d23ef5b8a37711a0386abc088 HOST_BUILD_DIR:=$(BUILD_DIR)/host/rustc-$(PKG_VERSION)-src PKG_MAINTAINER:=Luca Barbato diff --git a/lang/rust/patches/0001-Update-xz2-and-use-it-static.patch b/lang/rust/patches/0001-Update-xz2-and-use-it-static.patch index a700a007d..2360136a7 100644 --- a/lang/rust/patches/0001-Update-xz2-and-use-it-static.patch +++ b/lang/rust/patches/0001-Update-xz2-and-use-it-static.patch @@ -11,7 +11,7 @@ Subject: [PATCH] Update xz2 and use it static --- a/src/bootstrap/Cargo.lock +++ b/src/bootstrap/Cargo.lock -@@ -424,9 +424,9 @@ dependencies = [ +@@ -391,9 +391,9 @@ dependencies = [ [[package]] name = "lzma-sys" @@ -23,7 +23,7 @@ Subject: [PATCH] Update xz2 and use it static dependencies = [ "cc", "libc", -@@ -871,9 +871,9 @@ dependencies = [ +@@ -834,9 +834,9 @@ dependencies = [ [[package]] name = "xz2" @@ -37,12 +37,12 @@ Subject: [PATCH] Update xz2 and use it static ] --- a/src/bootstrap/Cargo.toml +++ b/src/bootstrap/Cargo.toml -@@ -49,7 +49,7 @@ toml = "0.5" - ignore = "0.4.10" - opener = "0.5" - once_cell = "1.7.2" +@@ -57,7 +57,7 @@ tar = "0.4" + termcolor = "1.2.0" + toml = "0.5" + walkdir = "2" -xz2 = "0.1" +xz2 = { version = "0.1", features = ["static"] } - walkdir = "2" # Dependencies needed by the build-metrics feature + sysinfo = { version = "0.26.0", optional = true } diff --git a/lang/rust/patches/0002-rustc-bootstrap-cache.patch b/lang/rust/patches/0002-rustc-bootstrap-cache.patch index d678a6dd8..959e23487 100644 --- a/lang/rust/patches/0002-rustc-bootstrap-cache.patch +++ b/lang/rust/patches/0002-rustc-bootstrap-cache.patch @@ -9,9 +9,9 @@ rustc_cache = os.path.join(cache_dst, key) if not os.path.exists(rustc_cache): os.makedirs(rustc_cache) ---- a/src/bootstrap/download.rs -+++ b/src/bootstrap/download.rs -@@ -211,7 +211,13 @@ impl Config { +--- a/src/bootstrap/src/core/download.rs ++++ b/src/bootstrap/src/core/download.rs +@@ -208,7 +208,13 @@ impl Config { Some(other) => panic!("unsupported protocol {other} in {url}"), None => panic!("no protocol in {url}"), } @@ -26,7 +26,7 @@ } fn download_http_with_retries(&self, tempfile: &Path, url: &str, help_on_error: &str) { -@@ -529,7 +535,10 @@ impl Config { +@@ -544,7 +550,10 @@ impl Config { key: &str, destination: &str, ) { @@ -38,7 +38,7 @@ let cache_dir = cache_dst.join(key); if !cache_dir.exists() { t!(fs::create_dir_all(&cache_dir)); -@@ -656,7 +665,10 @@ download-rustc = false +@@ -671,7 +680,10 @@ download-rustc = false let llvm_assertions = self.llvm_assertions; let cache_prefix = format!("llvm-{llvm_sha}-{llvm_assertions}"); diff --git a/lang/rust/patches/0003-bump-libc-deps-to-0.2.146.patch b/lang/rust/patches/0003-bump-libc-deps-to-0.2.146.patch index 7d0291674..bb131d23f 100644 --- a/lang/rust/patches/0003-bump-libc-deps-to-0.2.146.patch +++ b/lang/rust/patches/0003-bump-libc-deps-to-0.2.146.patch @@ -28,20 +28,6 @@ This patch bumps all libc dependencies and checksums to 0.2.147, which includes [[package]] name = "libloading" ---- a/vendor/cranelift-jit/Cargo.lock -+++ b/vendor/cranelift-jit/Cargo.lock -@@ -224,9 +224,9 @@ dependencies = [ - - [[package]] - name = "libc" --version = "0.2.141" -+version = "0.2.147" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "3304a64d199bb964be99741b7a14d26972741915b3649639149b2479bb46f4b5" -+checksum = "b4668fb0ea861c1df094127ac5f1da3409a82116a4ba74fca2e58ef927159bb3" - - [[package]] - name = "log" --- a/vendor/crossbeam-channel/Cargo.lock +++ b/vendor/crossbeam-channel/Cargo.lock @@ -50,9 +50,9 @@ dependencies = [ @@ -84,20 +70,6 @@ This patch bumps all libc dependencies and checksums to 0.2.147, which includes [[package]] name = "lock_api" ---- a/vendor/icu_locid/Cargo.lock -+++ b/vendor/icu_locid/Cargo.lock -@@ -318,9 +318,9 @@ checksum = "e2abad23fbc42b3700f2f279844d - - [[package]] - name = "libc" --version = "0.2.141" -+version = "0.2.147" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "3304a64d199bb964be99741b7a14d26972741915b3649639149b2479bb46f4b5" -+checksum = "b4668fb0ea861c1df094127ac5f1da3409a82116a4ba74fca2e58ef927159bb3" - - [[package]] - name = "litemap" --- a/vendor/libffi/Cargo.lock +++ b/vendor/libffi/Cargo.lock @@ -10,9 +10,9 @@ checksum = "50d30906286121d95be3d479533b