Skip to content

Commit 9f1c442

Browse files
smallprogramsmallprogram
committed
Merge remote-tracking branch 'origin/main' into temp-openwrt
2 parents f4101e8 + 2f9a9ac commit 9f1c442

11 files changed

Lines changed: 187 additions & 22 deletions

File tree

‎config/immortalwrt_config/R2S.config‎

Lines changed: 17 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5499,6 +5499,7 @@ CONFIG_PACKAGE_zlib=y
54995499
# 1. Collections
55005500
#
55015501
CONFIG_PACKAGE_luci=y
5502+
# CONFIG_PACKAGE_luci-layer2 is not set
55025503
CONFIG_PACKAGE_luci-light=y
55035504
# CONFIG_PACKAGE_luci-nginx is not set
55045505
CONFIG_PACKAGE_luci-ssl=y
@@ -6698,7 +6699,6 @@ CONFIG_PACKAGE_luci-i18n-zerotier-zh-cn=y
66986699
#
66996700
# CONFIG_PACKAGE_apfree-wifidog is not set
67006701
# CONFIG_PACKAGE_coova-chilli is not set
6701-
# CONFIG_PACKAGE_mesh11sd is not set
67026702
# CONFIG_PACKAGE_nodogsplash is not set
67036703
# CONFIG_PACKAGE_opennds is not set
67046704
# CONFIG_PACKAGE_simple-captive-portal is not set
@@ -7050,6 +7050,12 @@ CONFIG_PACKAGE_v2ray-geosite=y
70507050
# CONFIG_PACKAGE_libloragw-utils is not set
70517051
# end of LoRaWAN
70527052

7053+
#
7054+
# Mesh
7055+
#
7056+
# CONFIG_PACKAGE_mesh11sd is not set
7057+
# end of Mesh
7058+
70537059
#
70547060
# NMAP Suite
70557061
#
@@ -7592,6 +7598,14 @@ CONFIG_PACKAGE_banip=y
75927598
# CONFIG_PACKAGE_bpfcountd is not set
75937599
# CONFIG_PACKAGE_bpftool-full is not set
75947600
# CONFIG_PACKAGE_bpftool-minimal is not set
7601+
# CONFIG_PACKAGE_bsbf-autoconf-cellular is not set
7602+
# CONFIG_PACKAGE_bsbf-autoconf-dhcp is not set
7603+
# CONFIG_PACKAGE_bsbf-bonding is not set
7604+
# CONFIG_PACKAGE_bsbf-mptcp is not set
7605+
# CONFIG_PACKAGE_bsbf-netspeed is not set
7606+
# CONFIG_PACKAGE_bsbf-quectel-usbnet is not set
7607+
# CONFIG_PACKAGE_bsbf-route is not set
7608+
# CONFIG_PACKAGE_bsbf-tcp-in-udp is not set
75957609
# CONFIG_PACKAGE_bwm-ng is not set
75967610
# CONFIG_PACKAGE_bwping is not set
75977611
# CONFIG_PACKAGE_cdnspeedtest is not set
@@ -7743,8 +7757,8 @@ CONFIG_PACKAGE_ookla-speedtest=y
77437757
# CONFIG_PACKAGE_openelp is not set
77447758
# CONFIG_PACKAGE_openlist is not set
77457759
# CONFIG_PACKAGE_openthread-br is not set
7746-
# CONFIG_PACKAGE_oscam is not set
77477760
# CONFIG_PACKAGE_oping is not set
7761+
# CONFIG_PACKAGE_oscam is not set
77487762
# CONFIG_PACKAGE_pagekitec is not set
77497763
# CONFIG_PACKAGE_pcapplusplus is not set
77507764
# CONFIG_PACKAGE_pen is not set
@@ -7824,6 +7838,7 @@ CONFIG_PACKAGE_socat=y
78247838
# CONFIG_PACKAGE_tac_plus is not set
78257839
# CONFIG_PACKAGE_tac_plus-pam is not set
78267840
# CONFIG_PACKAGE_tayga is not set
7841+
# CONFIG_PACKAGE_tcp-in-udp is not set
78277842
CONFIG_PACKAGE_tcpdump=y
78287843
# CONFIG_PACKAGE_tcpdump-mini is not set
78297844
CONFIG_PACKAGE_tcping=y

‎config/immortalwrt_config/R3S.config‎

Lines changed: 17 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5500,6 +5500,7 @@ CONFIG_PACKAGE_zlib=y
55005500
# 1. Collections
55015501
#
55025502
CONFIG_PACKAGE_luci=y
5503+
# CONFIG_PACKAGE_luci-layer2 is not set
55035504
CONFIG_PACKAGE_luci-light=y
55045505
# CONFIG_PACKAGE_luci-nginx is not set
55055506
CONFIG_PACKAGE_luci-ssl=y
@@ -6699,7 +6700,6 @@ CONFIG_PACKAGE_luci-i18n-zerotier-zh-cn=y
66996700
#
67006701
# CONFIG_PACKAGE_apfree-wifidog is not set
67016702
# CONFIG_PACKAGE_coova-chilli is not set
6702-
# CONFIG_PACKAGE_mesh11sd is not set
67036703
# CONFIG_PACKAGE_nodogsplash is not set
67046704
# CONFIG_PACKAGE_opennds is not set
67056705
# CONFIG_PACKAGE_simple-captive-portal is not set
@@ -7051,6 +7051,12 @@ CONFIG_PACKAGE_v2ray-geosite=y
70517051
# CONFIG_PACKAGE_libloragw-utils is not set
70527052
# end of LoRaWAN
70537053

7054+
#
7055+
# Mesh
7056+
#
7057+
# CONFIG_PACKAGE_mesh11sd is not set
7058+
# end of Mesh
7059+
70547060
#
70557061
# NMAP Suite
70567062
#
@@ -7593,6 +7599,14 @@ CONFIG_PACKAGE_banip=y
75937599
# CONFIG_PACKAGE_bpfcountd is not set
75947600
# CONFIG_PACKAGE_bpftool-full is not set
75957601
# CONFIG_PACKAGE_bpftool-minimal is not set
7602+
# CONFIG_PACKAGE_bsbf-autoconf-cellular is not set
7603+
# CONFIG_PACKAGE_bsbf-autoconf-dhcp is not set
7604+
# CONFIG_PACKAGE_bsbf-bonding is not set
7605+
# CONFIG_PACKAGE_bsbf-mptcp is not set
7606+
# CONFIG_PACKAGE_bsbf-netspeed is not set
7607+
# CONFIG_PACKAGE_bsbf-quectel-usbnet is not set
7608+
# CONFIG_PACKAGE_bsbf-route is not set
7609+
# CONFIG_PACKAGE_bsbf-tcp-in-udp is not set
75967610
# CONFIG_PACKAGE_bwm-ng is not set
75977611
# CONFIG_PACKAGE_bwping is not set
75987612
# CONFIG_PACKAGE_cdnspeedtest is not set
@@ -7744,8 +7758,8 @@ CONFIG_PACKAGE_ookla-speedtest=y
77447758
# CONFIG_PACKAGE_openelp is not set
77457759
# CONFIG_PACKAGE_openlist is not set
77467760
# CONFIG_PACKAGE_openthread-br is not set
7747-
# CONFIG_PACKAGE_oscam is not set
77487761
# CONFIG_PACKAGE_oping is not set
7762+
# CONFIG_PACKAGE_oscam is not set
77497763
# CONFIG_PACKAGE_pagekitec is not set
77507764
# CONFIG_PACKAGE_pcapplusplus is not set
77517765
# CONFIG_PACKAGE_pen is not set
@@ -7825,6 +7839,7 @@ CONFIG_PACKAGE_socat=y
78257839
# CONFIG_PACKAGE_tac_plus is not set
78267840
# CONFIG_PACKAGE_tac_plus-pam is not set
78277841
# CONFIG_PACKAGE_tayga is not set
7842+
# CONFIG_PACKAGE_tcp-in-udp is not set
78287843
CONFIG_PACKAGE_tcpdump=y
78297844
# CONFIG_PACKAGE_tcpdump-mini is not set
78307845
CONFIG_PACKAGE_tcping=y

‎config/immortalwrt_config/R4S.config‎

Lines changed: 17 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5500,6 +5500,7 @@ CONFIG_PACKAGE_zlib=y
55005500
# 1. Collections
55015501
#
55025502
CONFIG_PACKAGE_luci=y
5503+
# CONFIG_PACKAGE_luci-layer2 is not set
55035504
CONFIG_PACKAGE_luci-light=y
55045505
# CONFIG_PACKAGE_luci-nginx is not set
55055506
CONFIG_PACKAGE_luci-ssl=y
@@ -6699,7 +6700,6 @@ CONFIG_PACKAGE_luci-i18n-zerotier-zh-cn=y
66996700
#
67006701
# CONFIG_PACKAGE_apfree-wifidog is not set
67016702
# CONFIG_PACKAGE_coova-chilli is not set
6702-
# CONFIG_PACKAGE_mesh11sd is not set
67036703
# CONFIG_PACKAGE_nodogsplash is not set
67046704
# CONFIG_PACKAGE_opennds is not set
67056705
# CONFIG_PACKAGE_simple-captive-portal is not set
@@ -7051,6 +7051,12 @@ CONFIG_PACKAGE_v2ray-geosite=y
70517051
# CONFIG_PACKAGE_libloragw-utils is not set
70527052
# end of LoRaWAN
70537053

7054+
#
7055+
# Mesh
7056+
#
7057+
# CONFIG_PACKAGE_mesh11sd is not set
7058+
# end of Mesh
7059+
70547060
#
70557061
# NMAP Suite
70567062
#
@@ -7593,6 +7599,14 @@ CONFIG_PACKAGE_banip=y
75937599
# CONFIG_PACKAGE_bpfcountd is not set
75947600
# CONFIG_PACKAGE_bpftool-full is not set
75957601
# CONFIG_PACKAGE_bpftool-minimal is not set
7602+
# CONFIG_PACKAGE_bsbf-autoconf-cellular is not set
7603+
# CONFIG_PACKAGE_bsbf-autoconf-dhcp is not set
7604+
# CONFIG_PACKAGE_bsbf-bonding is not set
7605+
# CONFIG_PACKAGE_bsbf-mptcp is not set
7606+
# CONFIG_PACKAGE_bsbf-netspeed is not set
7607+
# CONFIG_PACKAGE_bsbf-quectel-usbnet is not set
7608+
# CONFIG_PACKAGE_bsbf-route is not set
7609+
# CONFIG_PACKAGE_bsbf-tcp-in-udp is not set
75967610
# CONFIG_PACKAGE_bwm-ng is not set
75977611
# CONFIG_PACKAGE_bwping is not set
75987612
# CONFIG_PACKAGE_cdnspeedtest is not set
@@ -7744,8 +7758,8 @@ CONFIG_PACKAGE_ookla-speedtest=y
77447758
# CONFIG_PACKAGE_openelp is not set
77457759
# CONFIG_PACKAGE_openlist is not set
77467760
# CONFIG_PACKAGE_openthread-br is not set
7747-
# CONFIG_PACKAGE_oscam is not set
77487761
# CONFIG_PACKAGE_oping is not set
7762+
# CONFIG_PACKAGE_oscam is not set
77497763
# CONFIG_PACKAGE_pagekitec is not set
77507764
# CONFIG_PACKAGE_pcapplusplus is not set
77517765
# CONFIG_PACKAGE_pen is not set
@@ -7825,6 +7839,7 @@ CONFIG_PACKAGE_socat=y
78257839
# CONFIG_PACKAGE_tac_plus is not set
78267840
# CONFIG_PACKAGE_tac_plus-pam is not set
78277841
# CONFIG_PACKAGE_tayga is not set
7842+
# CONFIG_PACKAGE_tcp-in-udp is not set
78287843
CONFIG_PACKAGE_tcpdump=y
78297844
# CONFIG_PACKAGE_tcpdump-mini is not set
78307845
CONFIG_PACKAGE_tcping=y

‎config/immortalwrt_config/R4SE.config‎

Lines changed: 17 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5500,6 +5500,7 @@ CONFIG_PACKAGE_zlib=y
55005500
# 1. Collections
55015501
#
55025502
CONFIG_PACKAGE_luci=y
5503+
# CONFIG_PACKAGE_luci-layer2 is not set
55035504
CONFIG_PACKAGE_luci-light=y
55045505
# CONFIG_PACKAGE_luci-nginx is not set
55055506
CONFIG_PACKAGE_luci-ssl=y
@@ -6699,7 +6700,6 @@ CONFIG_PACKAGE_luci-i18n-zerotier-zh-cn=y
66996700
#
67006701
# CONFIG_PACKAGE_apfree-wifidog is not set
67016702
# CONFIG_PACKAGE_coova-chilli is not set
6702-
# CONFIG_PACKAGE_mesh11sd is not set
67036703
# CONFIG_PACKAGE_nodogsplash is not set
67046704
# CONFIG_PACKAGE_opennds is not set
67056705
# CONFIG_PACKAGE_simple-captive-portal is not set
@@ -7051,6 +7051,12 @@ CONFIG_PACKAGE_v2ray-geosite=y
70517051
# CONFIG_PACKAGE_libloragw-utils is not set
70527052
# end of LoRaWAN
70537053

7054+
#
7055+
# Mesh
7056+
#
7057+
# CONFIG_PACKAGE_mesh11sd is not set
7058+
# end of Mesh
7059+
70547060
#
70557061
# NMAP Suite
70567062
#
@@ -7593,6 +7599,14 @@ CONFIG_PACKAGE_banip=y
75937599
# CONFIG_PACKAGE_bpfcountd is not set
75947600
# CONFIG_PACKAGE_bpftool-full is not set
75957601
# CONFIG_PACKAGE_bpftool-minimal is not set
7602+
# CONFIG_PACKAGE_bsbf-autoconf-cellular is not set
7603+
# CONFIG_PACKAGE_bsbf-autoconf-dhcp is not set
7604+
# CONFIG_PACKAGE_bsbf-bonding is not set
7605+
# CONFIG_PACKAGE_bsbf-mptcp is not set
7606+
# CONFIG_PACKAGE_bsbf-netspeed is not set
7607+
# CONFIG_PACKAGE_bsbf-quectel-usbnet is not set
7608+
# CONFIG_PACKAGE_bsbf-route is not set
7609+
# CONFIG_PACKAGE_bsbf-tcp-in-udp is not set
75967610
# CONFIG_PACKAGE_bwm-ng is not set
75977611
# CONFIG_PACKAGE_bwping is not set
75987612
# CONFIG_PACKAGE_cdnspeedtest is not set
@@ -7744,8 +7758,8 @@ CONFIG_PACKAGE_ookla-speedtest=y
77447758
# CONFIG_PACKAGE_openelp is not set
77457759
# CONFIG_PACKAGE_openlist is not set
77467760
# CONFIG_PACKAGE_openthread-br is not set
7747-
# CONFIG_PACKAGE_oscam is not set
77487761
# CONFIG_PACKAGE_oping is not set
7762+
# CONFIG_PACKAGE_oscam is not set
77497763
# CONFIG_PACKAGE_pagekitec is not set
77507764
# CONFIG_PACKAGE_pcapplusplus is not set
77517765
# CONFIG_PACKAGE_pen is not set
@@ -7825,6 +7839,7 @@ CONFIG_PACKAGE_socat=y
78257839
# CONFIG_PACKAGE_tac_plus is not set
78267840
# CONFIG_PACKAGE_tac_plus-pam is not set
78277841
# CONFIG_PACKAGE_tayga is not set
7842+
# CONFIG_PACKAGE_tcp-in-udp is not set
78287843
CONFIG_PACKAGE_tcpdump=y
78297844
# CONFIG_PACKAGE_tcpdump-mini is not set
78307845
CONFIG_PACKAGE_tcping=y

‎config/immortalwrt_config/R5C.config‎

Lines changed: 17 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5512,6 +5512,7 @@ CONFIG_PACKAGE_zlib=y
55125512
# 1. Collections
55135513
#
55145514
CONFIG_PACKAGE_luci=y
5515+
# CONFIG_PACKAGE_luci-layer2 is not set
55155516
CONFIG_PACKAGE_luci-light=y
55165517
# CONFIG_PACKAGE_luci-nginx is not set
55175518
CONFIG_PACKAGE_luci-ssl=y
@@ -6711,7 +6712,6 @@ CONFIG_PACKAGE_luci-i18n-zerotier-zh-cn=y
67116712
#
67126713
# CONFIG_PACKAGE_apfree-wifidog is not set
67136714
# CONFIG_PACKAGE_coova-chilli is not set
6714-
# CONFIG_PACKAGE_mesh11sd is not set
67156715
# CONFIG_PACKAGE_nodogsplash is not set
67166716
# CONFIG_PACKAGE_opennds is not set
67176717
# CONFIG_PACKAGE_simple-captive-portal is not set
@@ -7063,6 +7063,12 @@ CONFIG_PACKAGE_v2ray-geosite=y
70637063
# CONFIG_PACKAGE_libloragw-utils is not set
70647064
# end of LoRaWAN
70657065

7066+
#
7067+
# Mesh
7068+
#
7069+
# CONFIG_PACKAGE_mesh11sd is not set
7070+
# end of Mesh
7071+
70667072
#
70677073
# NMAP Suite
70687074
#
@@ -7611,6 +7617,14 @@ CONFIG_PACKAGE_banip=y
76117617
# CONFIG_PACKAGE_bpfcountd is not set
76127618
# CONFIG_PACKAGE_bpftool-full is not set
76137619
# CONFIG_PACKAGE_bpftool-minimal is not set
7620+
# CONFIG_PACKAGE_bsbf-autoconf-cellular is not set
7621+
# CONFIG_PACKAGE_bsbf-autoconf-dhcp is not set
7622+
# CONFIG_PACKAGE_bsbf-bonding is not set
7623+
# CONFIG_PACKAGE_bsbf-mptcp is not set
7624+
# CONFIG_PACKAGE_bsbf-netspeed is not set
7625+
# CONFIG_PACKAGE_bsbf-quectel-usbnet is not set
7626+
# CONFIG_PACKAGE_bsbf-route is not set
7627+
# CONFIG_PACKAGE_bsbf-tcp-in-udp is not set
76147628
# CONFIG_PACKAGE_bwm-ng is not set
76157629
# CONFIG_PACKAGE_bwping is not set
76167630
# CONFIG_PACKAGE_cdnspeedtest is not set
@@ -7762,8 +7776,8 @@ CONFIG_PACKAGE_ookla-speedtest=y
77627776
# CONFIG_PACKAGE_openelp is not set
77637777
# CONFIG_PACKAGE_openlist is not set
77647778
# CONFIG_PACKAGE_openthread-br is not set
7765-
# CONFIG_PACKAGE_oscam is not set
77667779
# CONFIG_PACKAGE_oping is not set
7780+
# CONFIG_PACKAGE_oscam is not set
77677781
# CONFIG_PACKAGE_pagekitec is not set
77687782
# CONFIG_PACKAGE_pcapplusplus is not set
77697783
# CONFIG_PACKAGE_pen is not set
@@ -7843,6 +7857,7 @@ CONFIG_PACKAGE_socat=y
78437857
# CONFIG_PACKAGE_tac_plus is not set
78447858
# CONFIG_PACKAGE_tac_plus-pam is not set
78457859
# CONFIG_PACKAGE_tayga is not set
7860+
# CONFIG_PACKAGE_tcp-in-udp is not set
78467861
CONFIG_PACKAGE_tcpdump=y
78477862
# CONFIG_PACKAGE_tcpdump-mini is not set
78487863
CONFIG_PACKAGE_tcping=y

‎config/immortalwrt_config/R5S.config‎

Lines changed: 17 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5499,6 +5499,7 @@ CONFIG_PACKAGE_zlib=y
54995499
# 1. Collections
55005500
#
55015501
CONFIG_PACKAGE_luci=y
5502+
# CONFIG_PACKAGE_luci-layer2 is not set
55025503
CONFIG_PACKAGE_luci-light=y
55035504
# CONFIG_PACKAGE_luci-nginx is not set
55045505
CONFIG_PACKAGE_luci-ssl=y
@@ -6698,7 +6699,6 @@ CONFIG_PACKAGE_luci-i18n-zerotier-zh-cn=y
66986699
#
66996700
# CONFIG_PACKAGE_apfree-wifidog is not set
67006701
# CONFIG_PACKAGE_coova-chilli is not set
6701-
# CONFIG_PACKAGE_mesh11sd is not set
67026702
# CONFIG_PACKAGE_nodogsplash is not set
67036703
# CONFIG_PACKAGE_opennds is not set
67046704
# CONFIG_PACKAGE_simple-captive-portal is not set
@@ -7050,6 +7050,12 @@ CONFIG_PACKAGE_v2ray-geosite=y
70507050
# CONFIG_PACKAGE_libloragw-utils is not set
70517051
# end of LoRaWAN
70527052

7053+
#
7054+
# Mesh
7055+
#
7056+
# CONFIG_PACKAGE_mesh11sd is not set
7057+
# end of Mesh
7058+
70537059
#
70547060
# NMAP Suite
70557061
#
@@ -7592,6 +7598,14 @@ CONFIG_PACKAGE_banip=y
75927598
# CONFIG_PACKAGE_bpfcountd is not set
75937599
# CONFIG_PACKAGE_bpftool-full is not set
75947600
# CONFIG_PACKAGE_bpftool-minimal is not set
7601+
# CONFIG_PACKAGE_bsbf-autoconf-cellular is not set
7602+
# CONFIG_PACKAGE_bsbf-autoconf-dhcp is not set
7603+
# CONFIG_PACKAGE_bsbf-bonding is not set
7604+
# CONFIG_PACKAGE_bsbf-mptcp is not set
7605+
# CONFIG_PACKAGE_bsbf-netspeed is not set
7606+
# CONFIG_PACKAGE_bsbf-quectel-usbnet is not set
7607+
# CONFIG_PACKAGE_bsbf-route is not set
7608+
# CONFIG_PACKAGE_bsbf-tcp-in-udp is not set
75957609
# CONFIG_PACKAGE_bwm-ng is not set
75967610
# CONFIG_PACKAGE_bwping is not set
75977611
# CONFIG_PACKAGE_cdnspeedtest is not set
@@ -7743,8 +7757,8 @@ CONFIG_PACKAGE_ookla-speedtest=y
77437757
# CONFIG_PACKAGE_openelp is not set
77447758
# CONFIG_PACKAGE_openlist is not set
77457759
# CONFIG_PACKAGE_openthread-br is not set
7746-
# CONFIG_PACKAGE_oscam is not set
77477760
# CONFIG_PACKAGE_oping is not set
7761+
# CONFIG_PACKAGE_oscam is not set
77487762
# CONFIG_PACKAGE_pagekitec is not set
77497763
# CONFIG_PACKAGE_pcapplusplus is not set
77507764
# CONFIG_PACKAGE_pen is not set
@@ -7824,6 +7838,7 @@ CONFIG_PACKAGE_socat=y
78247838
# CONFIG_PACKAGE_tac_plus is not set
78257839
# CONFIG_PACKAGE_tac_plus-pam is not set
78267840
# CONFIG_PACKAGE_tayga is not set
7841+
# CONFIG_PACKAGE_tcp-in-udp is not set
78277842
CONFIG_PACKAGE_tcpdump=y
78287843
# CONFIG_PACKAGE_tcpdump-mini is not set
78297844
CONFIG_PACKAGE_tcping=y

0 commit comments

Comments
 (0)