diff --git a/lang/perl-cgi/Makefile b/lang/perl-cgi/Makefile index c6481f3bd53778..420ead9dcc9510 100644 --- a/lang/perl-cgi/Makefile +++ b/lang/perl-cgi/Makefile @@ -8,12 +8,12 @@ include $(TOPDIR)/rules.mk PKG_NAME:=perl-cgi -PKG_VERSION:=4.57 +PKG_VERSION:=4.64 PKG_RELEASE:=1 PKG_SOURCE_URL:=https://www.cpan.org/authors/id/L/LE/LEEJO PKG_SOURCE:=CGI-$(PKG_VERSION).tar.gz -PKG_HASH:=4e6ca634fe0d5621bb55b0fce5c1d08e6f643c65eecdfffbb4b344fd51b963ac +PKG_HASH:=39bd8e40ce00cdab39e0a2bc71abd2bbe451d1d97bc7e54e41a2e199eb6226e7 PKG_BUILD_DIR:=$(BUILD_DIR)/perl/CGI-$(PKG_VERSION) PKG_MAINTAINER:=Marcel Denia , \ diff --git a/lang/rust/Makefile b/lang/rust/Makefile index 9e1d38c83b1768..53f9aa389114af 100644 --- a/lang/rust/Makefile +++ b/lang/rust/Makefile @@ -5,12 +5,12 @@ include $(TOPDIR)/rules.mk PKG_NAME:=rust -PKG_VERSION:=1.76.0 +PKG_VERSION:=1.77.0 PKG_RELEASE:=1 PKG_SOURCE:=rustc-$(PKG_VERSION)-src.tar.xz PKG_SOURCE_URL:=https://static.rust-lang.org/dist/ -PKG_HASH:=805482b436442a6786d270cacbab8f00529e06141b27b7fb01909b97ce4f3464 +PKG_HASH:=66126989782cbf77fa3aff121bbb108429f2d46fe19328c3de231553de711b90 HOST_BUILD_DIR:=$(BUILD_DIR)/host/rustc-$(PKG_VERSION)-src PKG_MAINTAINER:=Luca Barbato @@ -71,7 +71,6 @@ HOST_CONFIGURE_ARGS = \ --datadir=$(STAGING_DIR)/host/share \ --mandir=$(STAGING_DIR)/host/man \ --dist-compression-formats=gz \ - --enable-missing-tools \ --disable-sanitizers \ --release-channel=stable \ --enable-cargo-native-static \ 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 971ddac493832c..fe10529bc61e00 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 @@ -4,45 +4,17 @@ Date: Sun, 4 Jun 2023 19:32:28 +0000 Subject: [PATCH] Update xz2 and use it static --- - Cargo.lock | 8 ++++---- - src/bootstrap/Cargo.lock | 8 ++++---- src/bootstrap/Cargo.toml | 2 +- 3 files changed, 9 insertions(+), 9 deletions(-) ---- a/src/bootstrap/Cargo.lock -+++ b/src/bootstrap/Cargo.lock -@@ -384,9 +384,9 @@ dependencies = [ - - [[package]] - name = "lzma-sys" --version = "0.1.17" -+version = "0.1.20" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "bdb4b7c3eddad11d3af9e86c487607d2d2442d185d848575365c4856ba96d619" -+checksum = "5fda04ab3764e6cde78b9974eec4f779acaba7c4e84b36eca3cf77c581b85d27" - dependencies = [ - "cc", - "libc", -@@ -827,9 +827,9 @@ dependencies = [ - - [[package]] - name = "xz2" --version = "0.1.6" -+version = "0.1.7" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "c179869f34fc7c01830d3ce7ea2086bc3a07e0d35289b667d0a8bf910258926c" -+checksum = "388c44dc09d76f1536602ead6d325eb532f5c122f17782bd57fb47baeeb767e2" - dependencies = [ - "lzma-sys", - ] --- a/src/bootstrap/Cargo.toml +++ b/src/bootstrap/Cargo.toml -@@ -56,7 +56,7 @@ tar = "0.4" - termcolor = "1.2.0" +@@ -61,7 +61,7 @@ tar = "0.4" + termcolor = "1.4" toml = "0.5" - walkdir = "2" + walkdir = "2.4" -xz2 = "0.1" +xz2 = { version = "0.1", features = ["static"] } # Dependencies needed by the build-metrics feature - sysinfo = { version = "0.26.0", optional = true } + sysinfo = { version = "0.30", optional = true } diff --git a/lang/rust/patches/0002-rustc-bootstrap-cache.patch b/lang/rust/patches/0002-rustc-bootstrap-cache.patch index a83e7aa80d2307..61cd00931bc453 100644 --- a/lang/rust/patches/0002-rustc-bootstrap-cache.patch +++ b/lang/rust/patches/0002-rustc-bootstrap-cache.patch @@ -41,3 +41,15 @@ let cache_dir = cache_dst.join(key); if !cache_dir.exists() { t!(fs::create_dir_all(&cache_dir)); +@@ -704,7 +710,10 @@ download-rustc = false + let llvm_assertions = self.llvm_assertions; + + let cache_prefix = format!("llvm-{llvm_sha}-{llvm_assertions}"); +- let cache_dst = self.out.join("cache"); ++ let cache_dst = match env::var_os("OPENWRT_RUSTC_BOOTSTRAP_CACHE") { ++ Some(v) => PathBuf::from(v), ++ None => self.out.join("cache"), ++ }; + let rustc_cache = cache_dst.join(cache_prefix); + if !rustc_cache.exists() { + t!(fs::create_dir_all(&rustc_cache)); 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 809107d7c3f3d7..d2589d8552f90b 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 @@ -1,47 +1,5 @@ This patch bumps all libc dependencies and checksums to 0.2.147, which includes the fix for musl 1.2.4. ---- a/vendor/addr2line-0.19.0/Cargo.lock -+++ b/vendor/addr2line-0.19.0/Cargo.lock -@@ -235,9 +235,9 @@ checksum = "e2abad23fbc42b3700f2f279844d - - [[package]] - name = "libc" --version = "0.2.126" -+version = "0.2.147" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "349d5a591cd28b49e1d1037471617a32ddcda5731b99419008085f72d5a53836" -+checksum = "b4668fb0ea861c1df094127ac5f1da3409a82116a4ba74fca2e58ef927159bb3" - - [[package]] - name = "memchr" ---- a/vendor/backtrace-0.3.67/Cargo.lock -+++ b/vendor/backtrace-0.3.67/Cargo.lock -@@ -64,9 +64,9 @@ checksum = "dec7af912d60cdbd3677c1af9352 - - [[package]] - name = "libc" --version = "0.2.138" -+version = "0.2.147" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "db6d7e329c562c5dfab7a46a2afabc8b987ab9a4834c9d1ca04dc54c1546cef8" -+checksum = "b4668fb0ea861c1df094127ac5f1da3409a82116a4ba74fca2e58ef927159bb3" - - [[package]] - name = "libloading" ---- a/vendor/crossbeam-channel/Cargo.lock -+++ b/vendor/crossbeam-channel/Cargo.lock -@@ -50,9 +50,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 = "num_cpus" --- a/vendor/elasticlunr-rs/Cargo.lock +++ b/vendor/elasticlunr-rs/Cargo.lock @@ -555,9 +555,9 @@ checksum = "e2abad23fbc42b3700f2f279844d @@ -56,20 +14,6 @@ This patch bumps all libc dependencies and checksums to 0.2.147, which includes [[package]] name = "lindera" ---- a/vendor/handlebars/Cargo.lock -+++ b/vendor/handlebars/Cargo.lock -@@ -550,9 +550,9 @@ checksum = "e2abad23fbc42b3700f2f279844d - - [[package]] - name = "libc" --version = "0.2.140" -+version = "0.2.147" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "99227334921fae1a979cf0bfdfcc6b3e5ce376ef57e16fb6fb3ea2ed6095f80c" -+checksum = "b4668fb0ea861c1df094127ac5f1da3409a82116a4ba74fca2e58ef927159bb3" - - [[package]] - name = "lock_api" --- a/vendor/libffi/Cargo.lock +++ b/vendor/libffi/Cargo.lock @@ -10,9 +10,9 @@ checksum = "50d30906286121d95be3d479533b diff --git a/net/nginx/Makefile b/net/nginx/Makefile index f34422e35659e8..06f119d5fa4258 100644 --- a/net/nginx/Makefile +++ b/net/nginx/Makefile @@ -8,12 +8,12 @@ include $(TOPDIR)/rules.mk PKG_NAME:=nginx -PKG_VERSION:=1.25.3 -PKG_RELEASE:=3 +PKG_VERSION:=1.25.4 +PKG_RELEASE:=2 PKG_SOURCE:=nginx-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=https://nginx.org/download/ -PKG_HASH:=64c5b975ca287939e828303fa857d22f142b251f17808dfe41733512d9cded86 +PKG_HASH:=760729901acbaa517996e681ee6ea259032985e37c2768beef80df3a877deed9 PKG_MAINTAINER:=Thomas Heil \ Christian Marangi diff --git a/net/p910nd/Makefile b/net/p910nd/Makefile index 062a90bd19fd50..c8934779a05f95 100644 --- a/net/p910nd/Makefile +++ b/net/p910nd/Makefile @@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=p910nd PKG_VERSION:=0.97 -PKG_RELEASE:=12 +PKG_RELEASE:=13 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 PKG_SOURCE_URL:=@SF/p910nd diff --git a/net/p910nd/files/p910nd.init b/net/p910nd/files/p910nd.init index a15e8d1dc739b2..cfb3bbd956e7ab 100644 --- a/net/p910nd/files/p910nd.init +++ b/net/p910nd/files/p910nd.init @@ -41,7 +41,7 @@ start_p910nd() { append_string "$section" device "-f " append_string "$section" bind "-i " append_string "$section" port "" - procd_open_instance $DAEMON_NAME + procd_open_instance procd_set_param command /usr/sbin/$DAEMON_NAME $args procd_set_param respawn diff --git a/net/sing-box/Makefile b/net/sing-box/Makefile index 9f6207186b6fad..27bea3116eea26 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.8.7 +PKG_VERSION:=1.8.10 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:=35db2a6953c04ea6301f242ba2d6c7ca7f6d52bae0b4927beca5255ee958b218 +PKG_HASH:=a959f9a40148ed4166b8161072672f3ce1532957adef7717132c7277bb96dcf6 PKG_LICENSE:=GPL-3.0-or-later PKG_LICENSE_FILES:=LICENSE diff --git a/net/sing-box/files/sing-box.conf b/net/sing-box/files/sing-box.conf index c776790e8d13f4..68ff82975eaa91 100644 --- a/net/sing-box/files/sing-box.conf +++ b/net/sing-box/files/sing-box.conf @@ -4,4 +4,5 @@ config sing-box 'main' option user 'sing-box' option conffile '/etc/sing-box/config.json' option workdir '/usr/share/sing-box' - +# list ifaces 'wan' +# list ifaces 'wan6' diff --git a/net/sing-box/files/sing-box.init b/net/sing-box/files/sing-box.init index 277c9f2eef1879..113e38aeec31a3 100755 --- a/net/sing-box/files/sing-box.init +++ b/net/sing-box/files/sing-box.init @@ -3,18 +3,20 @@ USE_PROCD=1 START=99 -NAME="sing-box" +script=$(readlink "$initscript") +NAME="$(basename ${script:-$initscript})" PROG="/usr/bin/sing-box" start_service() { config_load "$NAME" - local enabled user group conffile workdir + local enabled user group conffile workdir ifaces config_get_bool enabled "main" "enabled" "0" [ "$enabled" -eq "1" ] || return 0 config_get user "main" "user" "root" config_get conffile "main" "conffile" + config_get ifaces "main" "ifaces" config_get workdir "main" "workdir" "/usr/share/sing-box" mkdir -p "$workdir" @@ -27,6 +29,7 @@ start_service() { # Use root user if you want to use the TUN mode. procd_set_param user "$user" procd_set_param file "$conffile" + [ -z "$ifaces" ] || procd_set_param netdev $ifaces procd_set_param stdout 1 procd_set_param stderr 1 procd_set_param respawn @@ -35,5 +38,13 @@ start_service() { } service_triggers() { + local ifaces + config_load "$NAME" + config_get ifaces "main" "ifaces" + procd_open_trigger + for iface in $ifaces; do + procd_add_interface_trigger "interface.*.up" $iface /etc/init.d/$NAME restart + done + procd_close_trigger procd_add_reload_trigger "$NAME" } diff --git a/net/uspot/Makefile b/net/uspot/Makefile index 9207c77b9a4d31..b721ae7c1f6358 100644 --- a/net/uspot/Makefile +++ b/net/uspot/Makefile @@ -8,9 +8,9 @@ PKG_MAINTAINER:=Thibaut VARÈNE PKG_SOURCE_PROTO:=git PKG_SOURCE_URL:=https://github.com/f00b4r0/uspot.git -PKG_SOURCE_DATE:=2024-01-09 -PKG_SOURCE_VERSION:=c4b6f2f0bb1e9d2da4adc8cb3523cd7e440d7584 -PKG_MIRROR_HASH:=fa6be10e0479a9dc71b8c21e57b07aac09c8938e8e7120045816a5cd4b949343 +PKG_SOURCE_DATE:=2024-03-25 +PKG_SOURCE_VERSION:=094f0df88150ff2c351cfca4fabf76a7edcac79d +PKG_MIRROR_HASH:=2ffc723e6560e76f53496b444568724d3c52a45ac143ca259096c3d20522de0f CMAKE_SOURCE_SUBDIR:=src @@ -22,6 +22,7 @@ define Package/uspot SECTION:=net CATEGORY:=Network TITLE:=uspot hotspot daemon + EXTRA_DEPENDS:=ucode (>= 2023-11-07) DEPENDS:=+conntrack \ +libblobmsg-json +liblucihttp-ucode +libradcli +libubox +libubus +libuci \ +spotfilter \ @@ -63,6 +64,7 @@ define Package/uspotfilter TITLE:=uspot implementation of spotfilter PROVIDES:=spotfilter CONFLICTS:=spotfilter + EXTRA_DEPENDS:=ucode (>= 2023-11-07) DEPENDS:=+conntrack +nftables-json +ucode +ucode-mod-rtnl +ucode-mod-uloop PKGARCH:=all endef diff --git a/utils/cligen/Makefile b/utils/cligen/Makefile index f15d9cd4eff646..bd96a6c6663e72 100644 --- a/utils/cligen/Makefile +++ b/utils/cligen/Makefile @@ -7,12 +7,12 @@ include $(TOPDIR)/rules.mk PKG_NAME:=cligen -PKG_VERSION:=6.5.0 -PKG_RELEASE:=2 +PKG_VERSION:=7.0.0 +PKG_RELEASE:=1 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=https://codeload.github.com/clicon/$(PKG_NAME)/tar.gz/$(PKG_VERSION)? -PKG_HASH:=8b3943430f7aa9eea6a5f7cf1ace5b68eb382380cf68f41ae3ef5e032e08816f +PKG_HASH:=61cbfbc60ded80d9293d340fadffa30258ca753d08f588ce61bb9707511f9ae9 PKG_MAINTAINER:=Olof Hagsand , Philip Prindeville PKG_LICENSE:=Apache-2.0 diff --git a/utils/clixon/Makefile b/utils/clixon/Makefile index 44209b81a67bc8..394ad8b73318b0 100644 --- a/utils/clixon/Makefile +++ b/utils/clixon/Makefile @@ -7,12 +7,12 @@ include $(TOPDIR)/rules.mk PKG_NAME:=clixon -PKG_VERSION:=6.5.0 +PKG_VERSION:=7.0.0 PKG_RELEASE:=1 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=https://codeload.github.com/clicon/$(PKG_NAME)/tar.gz/$(PKG_VERSION)? -PKG_HASH:=c85bf3112ddd9dcc00965780c21bf1589095c8b67f741ef7059c805feccf3bfc +PKG_HASH:=d0713aba3e9d4e036c9b0d6141046c782b9306bb4a40b5a7c4ed43520d5fc50a PKG_MAINTAINER:=Olof Hagsand , Philip Prindeville PKG_LICENSE:=Apache-2.0 diff --git a/utils/lsd/Makefile b/utils/lsd/Makefile index 9b0705019cfef0..74a64f33be9493 100644 --- a/utils/lsd/Makefile +++ b/utils/lsd/Makefile @@ -1,12 +1,12 @@ include $(TOPDIR)/rules.mk PKG_NAME:=lsd -PKG_VERSION:=1.0.0 +PKG_VERSION:=1.1.1 PKG_RELEASE:=1 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=https://codeload.github.com/lsd-rs/lsd/tar.gz/v$(PKG_VERSION)? -PKG_HASH:=ab34e9c85bc77cfa42b43bfb54414200433a37419f3b1947d0e8cfbb4b7a6325 +PKG_HASH:=7933e196bf7b164ea8879078f8a8e87381e0c49f71867e0036c82916199aba61 PKG_MAINTAINER:=Oskari Rauta PKG_LICENSE:=Apache-2.0 diff --git a/utils/podman/Makefile b/utils/podman/Makefile index dfa5cebb5d5731..b8b4c571b04a36 100644 --- a/utils/podman/Makefile +++ b/utils/podman/Makefile @@ -1,12 +1,12 @@ include $(TOPDIR)/rules.mk PKG_NAME:=podman -PKG_VERSION:=4.9.3 +PKG_VERSION:=5.0.0 PKG_RELEASE:=1 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=https://github.com/containers/podman/archive/v$(PKG_VERSION) -PKG_HASH:=37afc5bba2738c68dc24400893b99226c658cc9a2b22309f4d7abe7225d8c437 +PKG_HASH:=818db636955a1eeec4dcb586d18783ab86a8afd07e3f4adaf25920b3697316c9 PKG_LICENSE:=Apache-2.0 PKG_LICENSE_FILES:=LICENSE diff --git a/utils/podman/patches/010-do-not-build-docs.patch b/utils/podman/patches/010-do-not-build-docs.patch index 4ff46a3fd412cd..ab9a51a26d1ad3 100644 --- a/utils/podman/patches/010-do-not-build-docs.patch +++ b/utils/podman/patches/010-do-not-build-docs.patch @@ -1,6 +1,6 @@ --- a/Makefile +++ b/Makefile -@@ -224,7 +224,7 @@ GV_VERSION=v0.7.2 +@@ -227,7 +227,7 @@ GV_VERSION=v0.7.3 default: all .PHONY: all @@ -9,7 +9,7 @@ .PHONY: binaries ifeq ($(shell uname -s),FreeBSD) -@@ -803,7 +803,7 @@ rpm-install: package ## Install rpm pac +@@ -810,7 +810,7 @@ rpm-install: package ## Install rpm pac /usr/bin/podman info # will catch a broken conmon .PHONY: install diff --git a/utils/podman/patches/020-fix-build-with-musl-1.2.4.patch b/utils/podman/patches/020-fix-build-with-musl-1.2.4.patch deleted file mode 100644 index 9d56ca780bded9..00000000000000 --- a/utils/podman/patches/020-fix-build-with-musl-1.2.4.patch +++ /dev/null @@ -1,16 +0,0 @@ -From https://github.com/mattn/go-sqlite3/pull/1177/commits/65d6085c5d87280c0d6883c884ddb25f9273942f Mon Sep 17 00:00:00 2001 -From: leso-kn -Date: Mon, 10 Jul 2023 14:58:52 +0200 -Subject: [PATCH] Fix musl build (#1164) - ---- a/vendor/github.com/mattn/go-sqlite3/sqlite3.go -+++ b/vendor/github.com/mattn/go-sqlite3/sqlite3.go -@@ -21,7 +21,7 @@ package sqlite3 - #cgo CFLAGS: -DSQLITE_DEFAULT_WAL_SYNCHRONOUS=1 - #cgo CFLAGS: -DSQLITE_ENABLE_UPDATE_DELETE_LIMIT - #cgo CFLAGS: -Wno-deprecated-declarations --#cgo linux,!android CFLAGS: -DHAVE_PREAD64=1 -DHAVE_PWRITE64=1 -+#cgo linux,!android CFLAGS: -DHAVE_PREAD=1 -DHAVE_PWRITE=1 - #cgo openbsd CFLAGS: -I/usr/local/include - #cgo openbsd LDFLAGS: -L/usr/local/lib - #ifndef USE_LIBSQLITE3