diff --git a/_addons.config b/_addons.config index 6e21656..eeedd34 100644 --- a/_addons.config +++ b/_addons.config @@ -13,7 +13,7 @@ CONFIG_FEED__alpine_fan_control=m #GIT_PACKAGE luci-app-diskman=https://github.com/openwrt-xiaomi/luci-app-diskman.git master ### luci-theme-argon -#GIT_PACKAGE luci-theme-argon=https://github.com/openwrt-xiaomi/luci-theme-argon.git master +#GIT_PACKAGE luci-theme-argon=https://github.com/openwrt-xiaomi/luci-theme-argon.git v2.3.1 ### luci-app-argon-config #GIT_PACKAGE luci-app-argon-config=https://github.com/openwrt-xiaomi/luci-app-argon-config.git master @@ -27,9 +27,6 @@ CONFIG_FEED__alpine_fan_control=m ### luci-app-cpufreq #GIT_PACKAGE luci-app-cpufreq=https://github.com/openwrt-xiaomi/luci-app-cpufreq.git master -### qBittorrent -#GIT_PACKAGE qBittorrent=https://github.com/openwrt-xiaomi/qBittorrent-openwrt-package.git master - ### luci-app-qbittorrent #GIT_PACKAGE luci-app-qbittorrent=https://github.com/openwrt-xiaomi/luci-app-qbittorrent.git master diff --git a/_base.config b/_base.config index 7a669ce..8d10430 100644 --- a/_base.config +++ b/_base.config @@ -27,6 +27,7 @@ CONFIG_BUSYBOX_CONFIG_FEATURE_LESS_REGEXP=y CONFIG_BUSYBOX_CONFIG_FEATURE_LESS_WINCH=y ### System utils +CONFIG_DROPBEAR_ECC=y CONFIG_PACKAGE_dropbear=y CONFIG_PACKAGE_uboot-envtools=y CONFIG_PACKAGE_mtd-utils=y @@ -40,17 +41,16 @@ CONFIG_PACKAGE_iperf3=y CONFIG_PACKAGE_htop=y CONFIG_PACKAGE_nano=y CONFIG_PACKAGE_ccrypt=y +CONFIG_LIBCURL_PROXY=y CONFIG_PACKAGE_curl=y CONFIG_PACKAGE_wget=y CONFIG_PACKAGE_patch=y CONFIG_PACKAGE_diffutils=y CONFIG_PACKAGE_tree=y CONFIG_PACKAGE_irqbalance=y -CONFIG_DROPBEAR_ECC=y CONFIG_PACKAGE_terminfo=y CONFIG_PACKAGE_zlib=y CONFIG_PACKAGE_ethtool=y -CONFIG_PACKAGE_openssl-util=y ### USB device mount & file systems support CONFIG_PACKAGE_gdisk=y @@ -109,6 +109,19 @@ CONFIG_PACKAGE_6rd=y ### IPv6 NAT support (ip6tables NAT extensions, ipt-nat6 and nf-nat6 kmods) ##CONFIG_PACKAGE_ip6tables-mod-nat=y +### hostap +CONFIG_PACKAGE_hostapd-openssl=y +CONFIG_PACKAGE_hostapd-utils=y + +### OpenSSL +CONFIG_LIBCURL_OPENSSL=y +CONFIG_PACKAGE_openssl-util=y +CONFIG_PACKAGE_libwebsockets-full=y +CONFIG_PACKAGE_libuhttpd-openssl=y + +### LuCI with HTTPS support (OpenSSL as SSL backend) +CONFIG_PACKAGE_luci-ssl-openssl=y + ### SSL certificates CONFIG_PACKAGE_ca-certificates=y @@ -142,9 +155,6 @@ CONFIG_PACKAGE_luci-theme-material=y CONFIG_PACKAGE_luci-theme-openwrt=y CONFIG_PACKAGE_luci-theme-openwrt-2020=y -### LuCI with HTTPS support (WolfSSL as SSL backend) -CONFIG_PACKAGE_luci-ssl=y - ### Luci statistics CONFIG_PACKAGE_luci-app-statistics=y CONFIG_PACKAGE_luci-i18n-statistics-ru=y @@ -156,7 +166,8 @@ CONFIG_PACKAGE_collectd-mod-thermal=y CONFIG_PACKAGE_collectd-mod-uptime=y ### WLAN/WPS support -CONFIG_PACKAGE_wpad-wolfssl=y +CONFIG_PACKAGE_wpa-supplicant-openssl=y +CONFIG_PACKAGE_wpad-openssl=y CONFIG_WPA_SUPPLICANT_INTERNAL=y CONFIG_WPA_RFKILL_SUPPORT=y ## CONFIG_WPA_MSG_MIN_PRIORITY=2 diff --git a/_vpn.config b/_vpn.config new file mode 100644 index 0000000..365fa5b --- /dev/null +++ b/_vpn.config @@ -0,0 +1,11 @@ + +CONFIG_PACKAGE_openvpn-openssl=y +CONFIG_PACKAGE_luci-app-openvpn=y +CONFIG_PACKAGE_luci-i18n-openvpn-ru=y + +CONFIG_PACKAGE_kmod-wireguard=y +CONFIG_PACKAGE_wireguard-tools=y +CONFIG_PACKAGE_luci-proto-wireguard=y + +CONFIG_PACKAGE_luci-app-shadowsocks-libev=y +CONFIG_PACKAGE_luci-i18n-shadowsocks-libev-ru=y diff --git a/kng_re.config b/kng_re.config index 8e0d9fc..5a55104 100644 --- a/kng_re.config +++ b/kng_re.config @@ -10,6 +10,7 @@ CONFIG_TARGET_ramips_mt7621_DEVICE_zyxel_keenetic-giga-iii=y #include _torrents.config #include _proxy.config #include _argon.config +#include _vpn.config ### Luci dashboard CONFIG_PACKAGE_luci-mod-dashboard=y diff --git a/kng_re_menu.json b/kng_re_menu.json index 9a98217..3f617f4 100644 --- a/kng_re_menu.json +++ b/kng_re_menu.json @@ -12,5 +12,15 @@ [ "services", "hd_idle" ], [ "services", "minidlna" ] ] + }, + "vpn": { + "title": "VPN", + "order": 70, + "items": [ + [ "vpn", "openvpn" ], + [ "status", "wireguard" ], + [ "services", "shadowsocks-libev" ], + [ "services", "shadowsocks" ] + ] } } diff --git a/r3d.config b/r3d.config index 95c1688..b65f037 100644 --- a/r3d.config +++ b/r3d.config @@ -10,6 +10,7 @@ CONFIG_TARGET_ipq806x_generic_DEVICE_xiaomi_r3d=y #include _torrents.config #include _proxy.config #include _argon.config +#include _vpn.config ### Temp and sensors CONFIG_PACKAGE_lm-sensors=y @@ -43,8 +44,6 @@ CONFIG_PACKAGE_luci-app-timecontrol=m ### qBittorrent CONFIG_PACKAGE_boost=y CONFIG_PACKAGE_boost-system=y -#CONFIG_PACKAGE_rblibtorrent=y -#CONFIG_PACKAGE_qbittorrent=y CONFIG_PACKAGE_luci-app-qbittorrent=y ### FileBrowser diff --git a/r3d_menu.json b/r3d_menu.json index 7534913..a54617c 100644 --- a/r3d_menu.json +++ b/r3d_menu.json @@ -13,5 +13,15 @@ [ "services", "hd_idle" ], [ "services", "minidlna" ] ] + }, + "vpn": { + "title": "VPN", + "order": 70, + "items": [ + [ "vpn", "openvpn" ], + [ "status", "wireguard" ], + [ "services", "shadowsocks-libev" ], + [ "services", "shadowsocks" ] + ] } } diff --git a/r3g.config b/r3g.config index 56a4bdb..7ee5e56 100644 --- a/r3g.config +++ b/r3g.config @@ -10,6 +10,7 @@ CONFIG_TARGET_ramips_mt7621_DEVICE_xiaomi_mi-router-3g=y #include _torrents.config #include _proxy.config #include _argon.config +#include _vpn.config ### Luci dashboard CONFIG_PACKAGE_luci-mod-dashboard=y diff --git a/r3g_menu.json b/r3g_menu.json index d6bab23..3f4a00e 100644 --- a/r3g_menu.json +++ b/r3g_menu.json @@ -12,5 +12,15 @@ [ "services", "hd_idle" ], [ "services", "minidlna" ] ] + }, + "vpn": { + "title": "VPN", + "order": 70, + "items": [ + [ "vpn", "openvpn" ], + [ "status", "wireguard" ], + [ "services", "shadowsocks-libev" ], + [ "services", "shadowsocks" ] + ] } } diff --git a/rb03.config b/rb03.config index 6bd9154..809eb5f 100644 --- a/rb03.config +++ b/rb03.config @@ -5,11 +5,9 @@ CONFIG_TARGET_mediatek_mt7622_DEVICE_xiaomi_redmi-router-ax6s=y #include _addons.config #include _base.config #include _wifi_en.config -###include _printer.config -###include _samba.config -###include _torrents.config #include _proxy.config #include _argon.config +#include _vpn.config ### Luci dashboard CONFIG_PACKAGE_luci-mod-dashboard=y @@ -23,6 +21,11 @@ CONFIG_PACKAGE_luci-i18n-tn-netports-ru=y CONFIG_PACKAGE_luci-app-sqm=y CONFIG_PACKAGE_luci-i18n-sqm-ru=y +### qBittorrent +CONFIG_PACKAGE_boost=y +CONFIG_PACKAGE_boost-system=y +CONFIG_PACKAGE_luci-app-qbittorrent=m + ### TimeControl #CONFIG_PACKAGE_luci-app-timecontrol=m diff --git a/rb03_menu.json b/rb03_menu.json index d6bab23..3f4a00e 100644 --- a/rb03_menu.json +++ b/rb03_menu.json @@ -12,5 +12,15 @@ [ "services", "hd_idle" ], [ "services", "minidlna" ] ] + }, + "vpn": { + "title": "VPN", + "order": 70, + "items": [ + [ "vpn", "openvpn" ], + [ "status", "wireguard" ], + [ "services", "shadowsocks-libev" ], + [ "services", "shadowsocks" ] + ] } } diff --git a/xmake.sh b/xmake.sh index 8dfac1a..30d5771 100755 --- a/xmake.sh +++ b/xmake.sh @@ -23,9 +23,11 @@ CFG=$XDIR/$XTARGET.config if [ "$OPT_FULL_REBUILD" = "true" ]; then [ -f .config ] && make clean rm -rf tmp - #rm -rf feeds/luci.tmp - #rm -rf feeds/packages.tmp - #rm -rf staging_dir/packages + rm -rf feeds/luci.tmp + rm -rf feeds/packages.tmp + rm -rf staging_dir/packages + rm -rf staging_dir + rm -rf build_dir fi rm -f .config @@ -61,6 +63,11 @@ if [ -d "$NETPORTSDIR" ]; then fi fi +DASHBRDPO=$XDIR/feeds/luci/modules/luci-mod-dashboard/po/ru/dashboard.po +if [ -f "$DASHBRDPO" ]; then + sed -i 's/msgid "Dashboard"/msgid "__dash_board__"/g' $DASHBRDPO +fi + if [ -z "$MAKE_JOBS" ]; then MAKE_JOBS=$( grep processor /proc/cpuinfo | tail -n 1 | awk '{print $3}' ) fi