From 00ca57c591618078104ae671278bc80e863ba8bd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=B2=89=E9=BB=98=E3=81=AE=E9=87=91?= <110812055+chenmozhijin@users.noreply.github.com> Date: Mon, 20 Nov 2023 23:14:04 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E7=BC=96=E8=AF=91=E9=94=99?= =?UTF-8?q?=E8=AF=AF&=E6=9B=B4=E6=96=B0=E9=85=8D=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- config/rpi4b/OpenWrt-K/extpackages.config | 4 ++++ config/rpi4b/kmod.config | 2 ++ config/rpi4b/luci.config | 7 ++++--- config/rpi4b/network.config | 11 +++++++++-- config/rpi4b/utilities.config | 1 + config/x86_64/OpenWrt-K/extpackages.config | 4 ++++ config/x86_64/kmod.config | 2 ++ config/x86_64/luci.config | 7 ++++--- config/x86_64/network.config | 11 +++++++++-- config/x86_64/other.config | 1 + config/x86_64/utilities.config | 1 + scripts/fix_problem.sh | 6 ++++++ 12 files changed, 47 insertions(+), 10 deletions(-) diff --git a/config/rpi4b/OpenWrt-K/extpackages.config b/config/rpi4b/OpenWrt-K/extpackages.config index 1db18f98..126f9c6e 100644 --- a/config/rpi4b/OpenWrt-K/extpackages.config +++ b/config/rpi4b/OpenWrt-K/extpackages.config @@ -114,3 +114,7 @@ EXT_PACKAGES_NAME[29]="luci-app-openclash" EXT_PACKAGES_PATH[29]="luci-app-openclash" EXT_PACKAGES_REPOSITORIE[29]="https://github.com/vernesong/OpenClash" EXT_PACKAGES_BRANCH[29]="" +EXT_PACKAGES_NAME[30]="wrtbwmon" +EXT_PACKAGES_PATH[30]="wrtbwmon" +EXT_PACKAGES_REPOSITORIE[30]="https://github.com/brvphoenix/wrtbwmon" +EXT_PACKAGES_BRANCH[30]="" diff --git a/config/rpi4b/kmod.config b/config/rpi4b/kmod.config index 5dd46daf..84df613f 100644 --- a/config/rpi4b/kmod.config +++ b/config/rpi4b/kmod.config @@ -16,6 +16,7 @@ CONFIG_PACKAGE_kmod-scsi-core=y # # Cryptographic API modules # +CONFIG_PACKAGE_kmod-crypto-acompress=y CONFIG_PACKAGE_kmod-crypto-aead=y CONFIG_PACKAGE_kmod-crypto-arc4=y CONFIG_PACKAGE_kmod-crypto-authenc=y @@ -82,6 +83,7 @@ CONFIG_PACKAGE_kmod-asn1-decoder=y CONFIG_PACKAGE_kmod-lib-cordic=y CONFIG_PACKAGE_kmod-lib-crc16=y CONFIG_PACKAGE_kmod-lib-crc8=y +CONFIG_PACKAGE_kmod-lib-lzo=y CONFIG_PACKAGE_kmod-lib-raid6=y CONFIG_PACKAGE_kmod-lib-textsearch=y CONFIG_PACKAGE_kmod-lib-xor=y diff --git a/config/rpi4b/luci.config b/config/rpi4b/luci.config index 4be99509..d60731c6 100644 --- a/config/rpi4b/luci.config +++ b/config/rpi4b/luci.config @@ -60,8 +60,8 @@ CONFIG_PACKAGE_luci-app-passwall_INCLUDE_Shadowsocks_Rust_Server=y CONFIG_PACKAGE_luci-app-passwall_INCLUDE_ShadowsocksR_Libev_Server=y CONFIG_PACKAGE_luci-app-passwall_INCLUDE_Trojan_GO=y CONFIG_PACKAGE_luci-app-passwall_INCLUDE_tuic_client=y -CONFIG_PACKAGE_luci-app-passwall_INCLUDE_V2ray_Plugin=n -CONFIG_PACKAGE_luci-app-passwall_INCLUDE_Xray_Plugin=n +CONFIG_PACKAGE_luci-app-passwall_INCLUDE_V2ray_Geodata=y +CONFIG_PACKAGE_luci-app-passwall_INCLUDE_Xray_Plugin=y # end of Configuration CONFIG_PACKAGE_luci-app-passwall2=y # @@ -75,7 +75,6 @@ CONFIG_PACKAGE_luci-app-passwall2_INCLUDE_Shadowsocks_Libev_Server=y CONFIG_PACKAGE_luci-app-passwall2_INCLUDE_Shadowsocks_Rust_Server=y CONFIG_PACKAGE_luci-app-passwall2_INCLUDE_ShadowsocksR_Libev_Server=y CONFIG_PACKAGE_luci-app-passwall2_INCLUDE_tuic_client=y -CONFIG_PACKAGE_luci-app-passwall2_INCLUDE_V2ray_Plugin=n # end of Configuration CONFIG_PACKAGE_luci-app-rclone=y CONFIG_PACKAGE_luci-app-samba4=y @@ -88,6 +87,8 @@ CONFIG_PACKAGE_luci-app-usb-printer=y CONFIG_PACKAGE_luci-app-vlmcsd=y CONFIG_PACKAGE_luci-app-webadmin=y CONFIG_PACKAGE_luci-app-wechatpush=y +CONFIG_PACKAGE_luci-app-wechatpush_Local_Disk_Information_Detection=y +CONFIG_PACKAGE_luci-app-wechatpush_Host_Information_Detection=y CONFIG_PACKAGE_luci-app-wol=y CONFIG_PACKAGE_luci-app-zerotier=y # end of 3. Applications diff --git a/config/rpi4b/network.config b/config/rpi4b/network.config index 5feb1017..2e07c36f 100644 --- a/config/rpi4b/network.config +++ b/config/rpi4b/network.config @@ -69,6 +69,12 @@ CONFIG_PACKAGE_p910nd=y CONFIG_PACKAGE_ip-full=y # end of Routing and Redirection # +# SSH +# +CONFIG_PACKAGE_openssh-client=y +CONFIG_PACKAGE_openssh-keygen=y +# end of SSH +# # VPN # CONFIG_PACKAGE_zerotier=y @@ -114,7 +120,8 @@ CONFIG_PACKAGE_trojan-go=y CONFIG_PACKAGE_tuic-client=y CONFIG_PACKAGE_uhttpd=y CONFIG_PACKAGE_uhttpd-mod-ubus=y -CONFIG_PACKAGE_xray-plugin=n +CONFIG_PACKAGE_v2ray-plugin=y +CONFIG_PACKAGE_xray-plugin=y # end of Web Servers/Proxies CONFIG_PACKAGE_6in4=y CONFIG_PACKAGE_chat=y @@ -155,5 +162,5 @@ CONFIG_PACKAGE_tcping=y CONFIG_PACKAGE_trojan-plus=y CONFIG_PACKAGE_vlmcsd=y CONFIG_PACKAGE_wwan=y -CONFIG_PACKAGE_xray-core=n +CONFIG_PACKAGE_xray-core=y # end of Network diff --git a/config/rpi4b/utilities.config b/config/rpi4b/utilities.config index 6ff1d47e..0024839f 100644 --- a/config/rpi4b/utilities.config +++ b/config/rpi4b/utilities.config @@ -68,6 +68,7 @@ CONFIG_PACKAGE_pciids=y CONFIG_PACKAGE_pciutils=y CONFIG_PACKAGE_qmi-utils=y CONFIG_PACKAGE_smartmontools=y +CONFIG_PACKAGE_smartmontools-drivedb=y CONFIG_PACKAGE_ucode-mod-html=y CONFIG_PACKAGE_ucode-mod-lua=y CONFIG_PACKAGE_usb-modeswitch=y diff --git a/config/x86_64/OpenWrt-K/extpackages.config b/config/x86_64/OpenWrt-K/extpackages.config index 1db18f98..126f9c6e 100644 --- a/config/x86_64/OpenWrt-K/extpackages.config +++ b/config/x86_64/OpenWrt-K/extpackages.config @@ -114,3 +114,7 @@ EXT_PACKAGES_NAME[29]="luci-app-openclash" EXT_PACKAGES_PATH[29]="luci-app-openclash" EXT_PACKAGES_REPOSITORIE[29]="https://github.com/vernesong/OpenClash" EXT_PACKAGES_BRANCH[29]="" +EXT_PACKAGES_NAME[30]="wrtbwmon" +EXT_PACKAGES_PATH[30]="wrtbwmon" +EXT_PACKAGES_REPOSITORIE[30]="https://github.com/brvphoenix/wrtbwmon" +EXT_PACKAGES_BRANCH[30]="" diff --git a/config/x86_64/kmod.config b/config/x86_64/kmod.config index c22d1c14..04fb6bb0 100644 --- a/config/x86_64/kmod.config +++ b/config/x86_64/kmod.config @@ -16,6 +16,7 @@ CONFIG_PACKAGE_kmod-scsi-core=y # # Cryptographic API modules # +CONFIG_PACKAGE_kmod-crypto-acompress=y CONFIG_PACKAGE_kmod-crypto-aead=y CONFIG_PACKAGE_kmod-crypto-arc4=y CONFIG_PACKAGE_kmod-crypto-authenc=y @@ -77,6 +78,7 @@ CONFIG_PACKAGE_kmod-input-evdev=y # CONFIG_PACKAGE_kmod-asn1-decoder=y CONFIG_PACKAGE_kmod-lib-crc16=y +CONFIG_PACKAGE_kmod-lib-lzo=y CONFIG_PACKAGE_kmod-lib-raid6=y CONFIG_PACKAGE_kmod-lib-textsearch=y CONFIG_PACKAGE_kmod-lib-xor=y diff --git a/config/x86_64/luci.config b/config/x86_64/luci.config index ea82b2a1..2b9a2b5a 100644 --- a/config/x86_64/luci.config +++ b/config/x86_64/luci.config @@ -61,8 +61,8 @@ CONFIG_PACKAGE_luci-app-passwall_INCLUDE_Shadowsocks_Rust_Server=y CONFIG_PACKAGE_luci-app-passwall_INCLUDE_ShadowsocksR_Libev_Server=y CONFIG_PACKAGE_luci-app-passwall_INCLUDE_Trojan_GO=y CONFIG_PACKAGE_luci-app-passwall_INCLUDE_tuic_client=y -CONFIG_PACKAGE_luci-app-passwall_INCLUDE_V2ray_Plugin=n -CONFIG_PACKAGE_luci-app-passwall_INCLUDE_Xray_Plugin=n +CONFIG_PACKAGE_luci-app-passwall_INCLUDE_V2ray_Geodata=y +CONFIG_PACKAGE_luci-app-passwall_INCLUDE_Xray_Plugin=y # end of Configuration CONFIG_PACKAGE_luci-app-passwall2=y # @@ -77,7 +77,6 @@ CONFIG_PACKAGE_luci-app-passwall2_INCLUDE_Shadowsocks_Rust_Client=y CONFIG_PACKAGE_luci-app-passwall2_INCLUDE_Shadowsocks_Rust_Server=y CONFIG_PACKAGE_luci-app-passwall2_INCLUDE_ShadowsocksR_Libev_Server=y CONFIG_PACKAGE_luci-app-passwall2_INCLUDE_tuic_client=y -CONFIG_PACKAGE_luci-app-passwall2_INCLUDE_V2ray_Plugin=n # end of Configuration CONFIG_PACKAGE_luci-app-rclone=y CONFIG_PACKAGE_luci-app-samba4=y @@ -90,6 +89,8 @@ CONFIG_PACKAGE_luci-app-usb-printer=y CONFIG_PACKAGE_luci-app-vlmcsd=y CONFIG_PACKAGE_luci-app-webadmin=y CONFIG_PACKAGE_luci-app-wechatpush=y +CONFIG_PACKAGE_luci-app-wechatpush_Local_Disk_Information_Detection=y +CONFIG_PACKAGE_luci-app-wechatpush_Host_Information_Detection=y CONFIG_PACKAGE_luci-app-wol=y CONFIG_PACKAGE_luci-app-zerotier=y # end of 3. Applications diff --git a/config/x86_64/network.config b/config/x86_64/network.config index 19a21639..7d1a3fe2 100644 --- a/config/x86_64/network.config +++ b/config/x86_64/network.config @@ -69,6 +69,12 @@ CONFIG_PACKAGE_p910nd=y CONFIG_PACKAGE_ip-full=y # end of Routing and Redirection # +# SSH +# +CONFIG_PACKAGE_openssh-client=y +CONFIG_PACKAGE_openssh-keygen=y +# end of SSH +# # VPN # CONFIG_PACKAGE_zerotier=y @@ -114,7 +120,8 @@ CONFIG_PACKAGE_trojan-go=y CONFIG_PACKAGE_tuic-client=y CONFIG_PACKAGE_uhttpd=y CONFIG_PACKAGE_uhttpd-mod-ubus=y -CONFIG_PACKAGE_xray-plugin=n +CONFIG_PACKAGE_v2ray-plugin=y +CONFIG_PACKAGE_xray-plugin=y # end of Web Servers/Proxies # # WirelessAPD @@ -162,5 +169,5 @@ CONFIG_PACKAGE_tcping=y CONFIG_PACKAGE_trojan-plus=y CONFIG_PACKAGE_vlmcsd=y CONFIG_PACKAGE_wwan=y -CONFIG_PACKAGE_xray-core=n +CONFIG_PACKAGE_xray-core=y # end of Network diff --git a/config/x86_64/other.config b/config/x86_64/other.config index 3b72f661..e9164d73 100644 --- a/config/x86_64/other.config +++ b/config/x86_64/other.config @@ -208,6 +208,7 @@ CONFIG_GNUTLS_ANON=y # # Curves - unselect old or less-used curves to reduce binary size # +CONFIG_MBEDTLS_ECP_DP_SECP521R1_ENABLED=n # # Build Options - unselect features to reduce binary size # diff --git a/config/x86_64/utilities.config b/config/x86_64/utilities.config index 4bb8f6f6..eeb70da6 100644 --- a/config/x86_64/utilities.config +++ b/config/x86_64/utilities.config @@ -69,6 +69,7 @@ CONFIG_PACKAGE_pciids=y CONFIG_PACKAGE_pciutils=y CONFIG_PACKAGE_qmi-utils=y CONFIG_PACKAGE_smartmontools=y +CONFIG_PACKAGE_smartmontools-drivedb=y CONFIG_PACKAGE_ucode-mod-html=y CONFIG_PACKAGE_ucode-mod-lua=y CONFIG_PACKAGE_usb-modeswitch=y diff --git a/scripts/fix_problem.sh b/scripts/fix_problem.sh index 4a0b9bf0..65852245 100755 --- a/scripts/fix_problem.sh +++ b/scripts/fix_problem.sh @@ -10,4 +10,10 @@ if [[ "$openwrt_tag_branch" == "v23.05.0-rc4" ]] ; then echo "修复https://github.com/openwrt/packages/pull/22251" curl -s -L --retry 6 https://github.com/openwrt/packages/commit/361b360d2bbf7abe93241f6eaa12320d8d83475a.patch | patch -p1 -d feeds/packages 2>/dev/null fi +fi +if [[ "$openwrt_tag_branch" == "v23.05.2" ]] ; then + if grep -q "^GO_VERSION_MAJOR_MINOR:=1.21$" "feeds/packages/lang/golang/golang/Makefile" && grep -q "^GO_VERSION_PATCH:=3$" "feeds/packages/lang/golang/golang/Makefile"; then + echo "更新golang" + curl -s -L --retry 6 https://github.com/openwrt/packages/commit/413260559e7b830dedb47919f2b9e428cf11eb78.patch | patch -p1 -d feeds/packages 2>/dev/null + fi fi \ No newline at end of file