From fc6da901f7a1f9b52409b9e3e60ca1e17e834f98 Mon Sep 17 00:00:00 2001
From: klever1988 <56048681+klever1988@users.noreply.github.com>
Date: Wed, 19 Feb 2020 18:19:43 +0800
Subject: [PATCH] Update r2s_lean.yml

---
 .github/workflows/r2s_lean.yml | 63 +++++++---------------------------
 1 file changed, 13 insertions(+), 50 deletions(-)

diff --git a/.github/workflows/r2s_lean.yml b/.github/workflows/r2s_lean.yml
index e54b7ea..2291154 100644
--- a/.github/workflows/r2s_lean.yml
+++ b/.github/workflows/r2s_lean.yml
@@ -45,68 +45,31 @@ jobs:
       - name: Mods
         run: |
           cd friendlywrt-rk3328
-          cp ../r2s.config.seed configs/config_rk3328
+          . ../remove_used_config.sh
           sed -i '/iptparser/d' configs/config_rk3328
           echo '
-          CONFIG_LIBSODIUM_MINIMAL=y
+          CONFIG_OPENSSL_ENGINE_BUILTIN=y
           CONFIG_OPENSSL_WITH_DTLS=y
           CONFIG_OPENSSL_WITH_EC2M=y
           CONFIG_OPENSSL_WITH_NPN=y
-          CONFIG_PACKAGE_UnblockNeteaseMusic=y
-          CONFIG_PACKAGE_bash=y
-          CONFIG_PACKAGE_boost=y
-          CONFIG_PACKAGE_boost-date_time=y
-          CONFIG_PACKAGE_boost-program_options=y
-          CONFIG_PACKAGE_boost-system=y
-          CONFIG_PACKAGE_ipt2socks=y
-          # CONFIG_PACKAGE_kmod-gre is not set
-          CONFIG_PACKAGE_libev=y
-          CONFIG_PACKAGE_libgd=y
-          CONFIG_PACKAGE_libhttp-parser=y
-          CONFIG_PACKAGE_libjpeg=y
-          CONFIG_PACKAGE_libmbedtls=y
-          CONFIG_PACKAGE_libncurses=y
-          CONFIG_PACKAGE_libnghttp2=y
-          CONFIG_PACKAGE_libpng=y
-          CONFIG_PACKAGE_libreadline=y
-          CONFIG_PACKAGE_libsodium=y
-          CONFIG_PACKAGE_libstdcpp=y
-          CONFIG_PACKAGE_libuv=y
-          # CONFIG_PACKAGE_luci-app-pptp-server is not set
-          CONFIG_PACKAGE_luci-app-ssr-plus_INCLUDE_Shadowsocks=y
-          CONFIG_PACKAGE_luci-app-ssr-plus_INCLUDE_ShadowsocksR_Server=y
-          CONFIG_PACKAGE_luci-app-ssr-plus_INCLUDE_ShadowsocksR_Socks=y
-          CONFIG_PACKAGE_luci-app-ssr-plus_INCLUDE_Trojan=y
-          CONFIG_PACKAGE_luci-app-ssr-plus_INCLUDE_V2ray=y
-          CONFIG_PACKAGE_luci-app-unblockmusic=y
-          CONFIG_PACKAGE_luci-app-vnstat=y
-          CONFIG_PACKAGE_luci-i18n-vnstat-zh-cn=y
+          # CONFIG_PACKAGE_kmod-cryptodev is not set
+          # CONFIG_PACKAGE_libopenssl-devcrypto is not set
+          CONFIG_PACKAGE_luci-app-smartdns=y
+          CONFIG_PACKAGE_luci-i18n-smartdns-zh-cn=y
           CONFIG_PACKAGE_luci-theme-argon=y
-          CONFIG_PACKAGE_node=y
-          # CONFIG_PACKAGE_pptpd is not set
-          CONFIG_PACKAGE_shadowsocks-libev-ss-redir=y
-          CONFIG_PACKAGE_shadowsocksr-libev-server=y
-          CONFIG_PACKAGE_shadowsocksr-libev-ssr-local=y
-          CONFIG_PACKAGE_terminfo=y
-          CONFIG_PACKAGE_trojan=y
-          CONFIG_PACKAGE_v2ray=y
-          CONFIG_PACKAGE_vnstat=y
-          CONFIG_PACKAGE_vnstati=y
-          CONFIG_V2RAY_DISABLE_NONE=y
-          CONFIG_V2RAY_EXCLUDE_ASSETS=y
-          CONFIG_V2RAY_EXCLUDE_V2CTL=y
-          CONFIG_V2RAY_JSON_INTERNAL=y
-          CONFIG_boost-compile-visibility-hidden=y
-          CONFIG_boost-runtime-shared=y
-          CONFIG_boost-static-and-shared-libs=y
-          CONFIG_boost-variant-release=y' >> configs/config_rk3328
+          CONFIG_PACKAGE_luci-theme-material=y
+          CONFIG_PACKAGE_luci-theme-netgear=y
+          CONFIG_PACKAGE_smartdns=y
+          # CONFIG_OPENSSL_ENGINE_BUILTIN_DEVCRYPTO is not set
+          # CONFIG_PACKAGE_kmod-cryptodev is not set' >> configs/config_rk3328
           # CONFIG_V2RAY_COMPRESS_UPX is not set
           cd friendlywrt
           git config --local user.email "action@github.com" && git config --local user.name "GitHub Action"
           git remote add upstream https://github.com/coolsnowwolf/lede && git fetch upstream
           git rebase 90bb1cf9c33e73de5019686b8bd495f689e675a4^ --onto upstream/master -X theirs
           git checkout upstream/master -- feeds.conf.default
-          git commit -m 'update feeds' && git apply ../../0001-fix-upx.patch
+          git apply ../../0001-fix-upx.patch
+          sed -i '/exit/i\echo "iptables -t nat -I POSTROUTING -j MASQUERADE" >> /etc/firewall.user' package/lean/default-settings/files/zzz-default-settings
           
       - name: Clean Feeds
         run: |