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.orange.url='skycdp.com'
-		add_list omr-bypass.orange.url='skyanywhere.com'
-		add_list omr-bypass.orange.url='epgsky.com'
-		add_list omr-bypass.orange.url='skycdn.it'
+		add_list omr-bypass.sky.url='sky.com'
+		add_list omr-bypass.sky.url='skycdp.com'
+		add_list omr-bypass.sky.url='skyanywhere.com'
+		add_list omr-bypass.sky.url='epgsky.com'
+		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 <[email protected]>

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
-+++ b/vendor/elasticlunr-rs/Cargo.lock
+--- a/vendor/elasticlunr-rs-3.0.2/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
-+++ b/vendor/libffi/Cargo.lock
+--- a/vendor/libffi-3.2.0/Cargo.lock
++++ b/vendor/libffi-3.2.0/Cargo.lock
 @@ -10,9 +10,9 @@ checksum = "50d30906286121d95be3d479533b
 
  [[package]]

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)