sync (#555)

omr-bypass/files/etc/init.d/omr-bypass-nft

@@ -87,7 +87,7 @@ _bypass_domains() {
 	[ "$enabled" = "0" ] && return
 	[ -z "$domain" ] && return
 	[ -z "$family" ] && family="ipv4ipv6"
-	[ -z "$noipv6" ] && noipv6="0"
+	[ -z "$noipv6" ] && noipv6="1"
 	if [ "$(echo $domain | grep '\.$')" != "" ] || [ "$(echo $domain | grep '\.\*$')" != "" ]; then
 		tlds=`curl --max-time 4 -s -k https://data.iana.org/TLD/tlds-alpha-by-domain.txt`
 		domain="$(echo '"$domain"' | sed 's:*::')"
@@ -128,6 +128,7 @@ _bypass_domain() {
 	intf=$(echo $intf | sed -e 's/\./_/')
 	intf=$(echo $intf | sed -e 's/-/_/')
 	[ -z "$intf" ] && intf="all"
+	[ -z "$noipv6" ] && noipv6="1"
 	if [ -n "$domain" ]; then
 		domain=$(echo $domain | sed 's:^\.::')
 		#logger -t "omr-bypass" "Get IPs of $domain..."
@@ -319,7 +320,7 @@ _bypass_proto() {
 	[ "$vpn" = "1" ] && intf="srv_vpn1"
 
 	[ "$enabled" = "0" ] && return
-	[ -z "$noipv6" ] && noipv6="0"
+	[ -z "$noipv6" ] && noipv6="1"
 	[ -z "$family" ] && family="ipv4ipv6"
 	intf=$(echo $intf | sed -e 's/\./_/')
 	intf=$(echo $intf | sed -e 's/-/_/')
@@ -419,7 +420,7 @@ _bypass_proto_without_ndpi() {
 	[ "$vpn" = "1" ] && intf="srv_vpn1"
 
 	[ "$enabled" = "0" ] && return
-	[ -z "$noipv6" ] && noipv6="0"
+	[ -z "$noipv6" ] && noipv6="1"
 	[ -z "$family" ] && family="ipv4ipv6"
 	intf=$(echo $intf | sed -e 's/\./_/')
 	intf=$(echo $intf | sed -e 's/-/_/')
@@ -945,10 +946,10 @@ start_service() {
 	config_foreach _bypass_dest_port dest_port
 	#echo "bypass src port"
 	config_foreach _bypass_src_port src_port
-	#echo "bypass asn"
-	config_foreach _bypass_asn asns
 	#echo "bypass domains"
 	config_foreach _bypass_domains domains
+	#echo "bypass asn"
+	config_foreach _bypass_asn asns
 
 #	ip rule add prio 1 fwmark 0x4539 lookup 991337 > /dev/null 2>&1
 #	ip -6 rule add prio 1 fwmark 0x6539 lookup 6991337 > /dev/null 2>&1

omr-bypass/files/etc/uci-defaults/41_omr-bypass

@@ -145,11 +145,11 @@ fi
 if [ "$(uci -q get omr-bypass.sky)" = "" ]; then
 	uci -q batch <<-EOF >/dev/null
 		set omr-bypass.sky=proto
-		add_list omr-bypass.orange.url='sky.com'
+		add_list omr-bypass.sky.url='sky.com'
-		add_list omr-bypass.orange.url='skycdp.com'
+		add_list omr-bypass.sky.url='skycdp.com'
-		add_list omr-bypass.orange.url='skyanywhere.com'
+		add_list omr-bypass.sky.url='skyanywhere.com'
-		add_list omr-bypass.orange.url='epgsky.com'
+		add_list omr-bypass.sky.url='epgsky.com'
-		add_list omr-bypass.orange.url='skycdn.it'
+		add_list omr-bypass.sky.url='skycdn.it'
 		commit omr-bypass
 	EOF
 fi

omr-dscp/files/etc/init.d/omr-dscp-nft

@@ -60,6 +60,7 @@ _add_dscp_domains_rules() {
 			set firewall.omr_dscp_rule_${class}_4.ipset="omr_dscp_${class}_4"
 			set firewall.omr_dscp_rule_${class}_4.set_dscp="$(echo ${class} | tr '[a-z'] '[A-Z]')"
 			set firewall.omr_dscp_rule_${class}_4.target='DSCP'
+			set firewall.omr_dscp_rule_${class}_4.enabled='1'
 			set firewall.omr_dscp_rule_${class}_4.src='*'
 			set firewall.omr_dscp_rule_${class}_4.dest='*'
 			commit firewall
@@ -71,6 +72,7 @@ _add_dscp_domains_rules() {
 				set firewall.omr_dscp_rule_${class}_6.ipset="omr_dscp_${class}_6"
 				set firewall.omr_dscp_rule_${class}_6.target='DSCP'
 				set firewall.omr_dscp_rule_${class}_6.set_dscp="$(echo ${class} | tr '[a-z'] '[A-Z]')"
+				set firewall.omr_dscp_rule_${class}_6.enabled='1'
 				set firewall.omr_dscp_rule_${class}_6.src='*'
 				set firewall.omr_dscp_rule_${class}_6.dest='*'
 				commit firewall
@@ -119,6 +121,7 @@ _add_dscp_rules() {
 		set firewall.omr_dscp_rule$count.src_ip="$src_ip"
 		set firewall.omr_dscp_rule$count.dest_ip="$dest_ip"
 		set firewall.omr_dscp_rule$count.proto="$proto"
+		set firewall.omr_dscp_rule$count.enabled='1'
 	EOF
 	src_port="$(echo $src_port | sed 's/,/ /g')"
 	dest_port="$(echo $dest_port | sed 's/,/ /g')"

rust/Makefile

@@ -6,13 +6,13 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=rust
 
-PKG_VERSION:=1.78.0
+PKG_VERSION:=1.81.0
 
 PKG_RELEASE:=2
 
 PKG_SOURCE:=rustc-$(PKG_VERSION)-src.tar.gz
 PKG_SOURCE_URL:=https://static.rust-lang.org/dist/
-PKG_HASH:=ff544823a5cb27f2738128577f1e7e00ee8f4c83f2a348781ae4fc355e91d5a9
+PKG_HASH:=872448febdff32e50c3c90a7e15f9bb2db131d13c588fe9071b0ed88837ccfa7
 HOST_BUILD_DIR:=$(BUILD_DIR)/host/rustc-$(PKG_VERSION)-src
 
 PKG_MAINTAINER:=Luca Barbato <lu_zero@luminem.org>

rust/patches/0002-correct-the-handling-of-bootstrap-cache-path-option.patch

@@ -1,47 +0,0 @@
-From bd479113d38aa453cbad9d9f5ca9c5fc8903b0cf Mon Sep 17 00:00:00 2001
-From: onur-ozkan <work@onurozkan.dev>
-Date: Thu, 11 Apr 2024 14:57:10 +0300
-Subject: [PATCH] correct the handling of `bootstrap-cache-path` option
-
-This change makes `build.bootstrap-cache-path` option to be configurable with
-`./configure` script, so it can be used like `./configure --bootstrap-cache-path=demo`.
-
-Signed-off-by: onur-ozkan <work@onurozkan.dev>
----
- config.example.toml        | 2 +-
- src/bootstrap/configure.py | 4 +++-
- 2 files changed, 4 insertions(+), 2 deletions(-)
-
---- a/config.example.toml
-+++ b/config.example.toml
-@@ -302,7 +302,7 @@
- 
- # Set the bootstrap/download cache path. It is useful when building rust
- # repeatedly in a CI invironment.
--# bootstrap-cache-path = /shared/cache
-+#bootstrap-cache-path = /path/to/shared/cache
- 
- # Enable a build of the extended Rust tool set which is not only the compiler
- # but also tools such as Cargo. This will also produce "combined installers"
---- a/src/bootstrap/configure.py
-+++ b/src/bootstrap/configure.py
-@@ -152,9 +152,9 @@ v("default-linker", "rust.default-linker
- # (others are conditionally saved).
- o("manage-submodules", "build.submodules", "let the build manage the git submodules")
- o("full-bootstrap", "build.full-bootstrap", "build three compilers instead of two (not recommended except for testing reproducible builds)")
--o("bootstrap-cache-path", "build.bootstrap-cache-path", "use provided path for the bootstrap cache")
- o("extended", "build.extended", "build an extended rust tool set")
- 
-+v("bootstrap-cache-path", None, "use provided path for the bootstrap cache")
- v("tools", None, "List of extended tools will be installed")
- v("codegen-backends", None, "List of codegen backends to build")
- v("build", "build.build", "GNUs ./configure syntax LLVM build triple")
-@@ -359,6 +359,8 @@ def apply_args(known_args, option_checki
-             set('target.{}.llvm-filecheck'.format(build_triple), value, config)
-         elif option.name == 'tools':
-             set('build.tools', value.split(','), config)
-+        elif option.name == 'bootstrap-cache-path':
-+            set('build.bootstrap-cache-path', value, config)
-         elif option.name == 'codegen-backends':
-             set('rust.codegen-backends', value.split(','), config)
-         elif option.name == 'host':

rust/patches/0003-bump-libc-deps-to-0.2.146.patch

@@ -1,7 +1,7 @@
 This patch bumps all libc dependencies and checksums to 0.2.147, which includes the fix for musl 1.2.4.
 
---- a/vendor/elasticlunr-rs/Cargo.lock
+--- a/vendor/elasticlunr-rs-3.0.2/Cargo.lock
-+++ b/vendor/elasticlunr-rs/Cargo.lock
++++ b/vendor/elasticlunr-rs-3.0.2/Cargo.lock
 @@ -555,9 +555,9 @@ checksum = "e2abad23fbc42b3700f2f279844d
  
  [[package]]
@@ -14,8 +14,8 @@ This patch bumps all libc dependencies and checksums to 0.2.147, which includes
  
  [[package]]
  name = "lindera"
---- a/vendor/libffi/Cargo.lock
+--- a/vendor/libffi-3.2.0/Cargo.lock
-+++ b/vendor/libffi/Cargo.lock
++++ b/vendor/libffi-3.2.0/Cargo.lock
 @@ -10,9 +10,9 @@ checksum = "50d30906286121d95be3d479533b
  
  [[package]]

rust/patches/0004-Use-an-helper-to-move-the-files.patch

@@ -1,108 +0,0 @@
-From 4db00fe229f08b06feeee552ae53af9f49c25048 Mon Sep 17 00:00:00 2001
-From: Luca Barbato <lu_zero@gentoo.org>
-Date: Fri, 10 May 2024 16:38:19 +0200
-Subject: [PATCH] Use an helper to move the files
-
-In case the source is not in the same filesystem.
----
- src/bootstrap/src/core/build_steps/dist.rs |  6 ++++--
- src/bootstrap/src/core/download.rs         |  6 +++---
- src/bootstrap/src/utils/helpers.rs         | 15 +++++++++++++++
- src/bootstrap/src/utils/tarball.rs         |  4 ++--
- 4 files changed, 24 insertions(+), 7 deletions(-)
-
---- a/src/bootstrap/src/core/build_steps/dist.rs
-+++ b/src/bootstrap/src/core/build_steps/dist.rs
-@@ -26,7 +26,9 @@ use crate::core::build_steps::tool::{sel
- use crate::core::builder::{Builder, Kind, RunConfig, ShouldRun, Step};
- use crate::core::config::TargetSelection;
- use crate::utils::channel;
--use crate::utils::helpers::{exe, is_dylib, output, t, target_supports_cranelift_backend, timeit};
-+use crate::utils::helpers::{
-+    exe, is_dylib, move_file, output, t, target_supports_cranelift_backend, timeit,
-+};
- use crate::utils::tarball::{GeneratedTarball, OverlayKind, Tarball};
- use crate::{Compiler, DependencyType, Mode, LLVM_TOOLS};
- 
-@@ -1993,7 +1995,7 @@ impl Step for Extended {
-             builder.run(&mut cmd);
- 
-             if !builder.config.dry_run() {
--                t!(fs::rename(exe.join(&filename), distdir(builder).join(&filename)));
-+                t!(move_file(exe.join(&filename), distdir(builder).join(&filename)));
-             }
-         }
-     }
---- a/src/bootstrap/src/core/download.rs
-+++ b/src/bootstrap/src/core/download.rs
-@@ -12,7 +12,7 @@ use build_helper::ci::CiEnv;
- use xz2::bufread::XzDecoder;
- 
- use crate::core::config::RustfmtMetadata;
--use crate::utils::helpers::{check_run, exe, program_out_of_date};
-+use crate::utils::helpers::{check_run, exe, move_file, program_out_of_date};
- use crate::{core::build_steps::llvm::detect_llvm_sha, utils::helpers::hex_encode};
- use crate::{t, Config};
- 
-@@ -209,7 +209,7 @@ impl Config {
-             None => panic!("no protocol in {url}"),
-         }
-         t!(
--            std::fs::rename(&tempfile, dest_path),
-+            move_file(&tempfile, dest_path),
-             format!("failed to rename {tempfile:?} to {dest_path:?}")
-         );
-     }
-@@ -313,7 +313,7 @@ impl Config {
-             if src_path.is_dir() && dst_path.exists() {
-                 continue;
-             }
--            t!(fs::rename(src_path, dst_path));
-+            t!(move_file(src_path, dst_path));
-         }
-         let dst_dir = dst.join(directory_prefix);
-         if dst_dir.exists() {
---- a/src/bootstrap/src/utils/helpers.rs
-+++ b/src/bootstrap/src/utils/helpers.rs
-@@ -150,6 +150,21 @@ pub fn symlink_dir(config: &Config, orig
-     }
- }
- 
-+/// Rename a file if from and to are in the same filesystem or
-+/// copy and remove the file otherwise
-+pub fn move_file<P: AsRef<Path>, Q: AsRef<Path>>(from: P, to: Q) -> io::Result<()> {
-+    match fs::rename(&from, &to) {
-+        // FIXME: Once `ErrorKind::CrossesDevices` is stabilized use
-+        // if e.kind() == io::ErrorKind::CrossesDevices {
-+        #[cfg(unix)]
-+        Err(e) if e.raw_os_error() == Some(libc::EXDEV) => {
-+            std::fs::copy(&from, &to)?;
-+            std::fs::remove_file(&from)
-+        }
-+        r => r,
-+    }
-+}
-+
- pub fn forcing_clang_based_tests() -> bool {
-     if let Some(var) = env::var_os("RUSTBUILD_FORCE_CLANG_BASED_TESTS") {
-         match &var.to_string_lossy().to_lowercase()[..] {
---- a/src/bootstrap/src/utils/tarball.rs
-+++ b/src/bootstrap/src/utils/tarball.rs
-@@ -6,7 +6,7 @@ use std::{
- use crate::core::builder::Builder;
- use crate::core::{build_steps::dist::distdir, builder::Kind};
- use crate::utils::channel;
--use crate::utils::helpers::t;
-+use crate::utils::helpers::{move_file, t};
- 
- #[derive(Copy, Clone)]
- pub(crate) enum OverlayKind {
-@@ -269,7 +269,7 @@ impl<'a> Tarball<'a> {
-         // name, not "image". We rename the image directory just before passing
-         // into rust-installer.
-         let dest = self.temp_dir.join(self.package_name());
--        t!(std::fs::rename(&self.image_dir, &dest));
-+        t!(move_file(&self.image_dir, &dest));
- 
-         self.run(|this, cmd| {
-             let distdir = distdir(this.builder);

rust/rust-values.mk

@@ -53,7 +53,9 @@ endif
 
 # ARM Logic
 ifeq ($(ARCH),arm)
-  ifeq ($(CONFIG_arm_v7),y)
+  ifeq ($(CONFIG_arm_v6)$(CONFIG_arm_v7),)
+    RUSTC_TARGET_ARCH:=$(subst arm,armv5te,$(RUSTC_TARGET_ARCH))
+  else ifeq ($(CONFIG_arm_v7),y)
     RUSTC_TARGET_ARCH:=$(subst arm,armv7,$(RUSTC_TARGET_ARCH))
   endif
 
@@ -103,3 +105,5 @@ CARGO_PKG_CONFIG_VARS= \
 	TARGET_CFLAGS="$(TARGET_CFLAGS) $(RUSTC_CFLAGS)"
 
 CARGO_PKG_PROFILE:=$(if $(CONFIG_DEBUG),dev,release)
+
+CARGO_RUSTFLAGS+=-Clink-arg=-fuse-ld=$(TARGET_LINKER)