Merge pull request #2 from garypang13/master

2

Author: sorasoras

X86_64.config

@@ -110,21 +110,6 @@ CONFIG_PACKAGE_luci-app-p910nd=n
 CONFIG_PACKAGE_luci-app-pagekitec=n
 
 CONFIG_PACKAGE_luci-app-passwall=m
-CONFIG_PACKAGE_luci-app-passwall_INCLUDE_ipt2socks=m
-# CONFIG_PACKAGE_luci-app-passwall_INCLUDE_Shadowsocks is not set
-CONFIG_PACKAGE_luci-app-passwall_INCLUDE_ShadowsocksR=m
-# CONFIG_PACKAGE_luci-app-passwall_INCLUDE_Shadowsocks_socks is not set
-CONFIG_PACKAGE_luci-app-passwall_INCLUDE_ShadowsocksR_socks=m
-CONFIG_PACKAGE_luci-app-passwall_INCLUDE_V2ray=m
-# CONFIG_PACKAGE_luci-app-passwall_INCLUDE_Trojan is not set
-# CONFIG_PACKAGE_luci-app-passwall_INCLUDE_Brook is not set
-# CONFIG_PACKAGE_luci-app-passwall_INCLUDE_kcptun is not set
-CONFIG_PACKAGE_luci-app-passwall_INCLUDE_haproxy=m
-CONFIG_PACKAGE_luci-app-passwall_INCLUDE_ChinaDNS_NG=m
-CONFIG_PACKAGE_luci-app-passwall_INCLUDE_pdnsd=m
-CONFIG_PACKAGE_luci-app-passwall_INCLUDE_dns2socks=m
-# CONFIG_PACKAGE_luci-app-passwall_INCLUDE_v2ray-plugin is not set
-# CONFIG_PACKAGE_luci-app-passwall_INCLUDE_simple-obfs is not set
 
 CONFIG_PACKAGE_luci-app-php-kodexplorer=y
 CONFIG_PACKAGE_luci-app-polipo=n

diy.sh

@@ -4,7 +4,7 @@ rm -Rf feeds/custom/luci/*
 cd feeds/custom/luci
 svn co https://github.com/fw876/helloworld/trunk/luci-app-ssr-plus
 git clone https://github.com/rufengsuixing/luci-app-adguardhome
-git clone https://github.com/jerrykuku/luci-theme-argon -b 19.07_stable
+git clone https://github.com/jerrykuku/luci-theme-argon
 svn co https://github.com/openwrt/luci/trunk/applications/luci-app-acme
 svn co https://github.com/apollo-ng/luci-theme-darkmatter/branches/openwrt-19/luci/themes/luci-theme-darkmatter
 git clone https://github.com/pymumu/luci-app-smartdns -b lede

patches/mini-ttl.patch

@@ -0,0 +1,12 @@
+--- /feeds/luci/modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js
++++ /feeds/luci/modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js
+@@ -343,2 +343,9 @@
+ 
++		o = s.taboption("advanced", form.Value, "mini_ttl",
++		_("Minimum TTL to send to clients"),
++		_("Modify DNS entries minimum TTL (max is 3600, 0 is no modify)"))
++		o.optional = true
++		o.datatype = "range(0,3600)"
++		o.placeholder = 0
++
+ 		s.taboption('tftp', form.Flag, 'enable_tftp',

patches/qBittorrent.patch

@@ -3,7 +3,7 @@
 @@ -7,6 +7,5 @@
  PKG_SOURCE:=$(PKG_NAME)-release-$(PKG_VERSION).tar.gz
 -PKG_SOURCE_URL:=https://codeload.github.com/qbittorrent/qBittorrent/tar.gz/release-$(PKG_VERSION)?
--PKG_HASH:=be490e73253c65c439a64afb348e562aaf92eee5c729e51e16a0bac2048166fd
+-PKG_HASH:=skip
 -
 -PKG_BUILD_DIR:=$(BUILD_DIR)/qBittorrent-release-$(PKG_VERSION)
 +PKG_SOURCE_URL:=https://github.com/c0re100/qBittorrent-Enhanced-Edition