Merge pull request #3 from garypang13/master

3

Author: sorasoras

.github/workflows/build-openwrt.yml

@@ -175,10 +175,10 @@ jobs:
       continue-on-error: true
       run: |
         curl -fsSL git.io/file-transfer | sh
-        cowurl=$(./transfer cow --block 2621440 -s -p 64 --no-progress ${FIRMWARE})
+        cowurl=$(./transfer cow --block 2621440 -s --no-progress ${FIRMWARE})
         cowurl=$(echo $cowurl | grep -o -E "https[^ ]*")
         echo "::set-env name=COWURL::$cowurl"
-        echo "Download Link: ${{ env.EMOJI }} ${{ env.COWURL }} ${{ env.EMOJI }}"
+        echo "Download Link: ${{ env.EMOJI }} $cowurl ${{ env.EMOJI }}"
  
     - name: Create release
       id: create_release

diy/feeds/custom/luci/default-settings/Makefile

@@ -0,0 +1,43 @@
+#
+# Copyright (C) 2016-2017 GitHub 
+#
+# This is free software, licensed under the GNU General Public License v3.
+# See /LICENSE for more information.
+
+include $(TOPDIR)/rules.mk
+
+PKG_NAME:=default-settings
+PKG_VERSION:=1.1
+PKG_RELEASE:=57
+PKG_LICENSE:=GPLv3
+PKG_LICENSE_FILES:=LICENSE
+
+PKG_BUILD_DIR := $(BUILD_DIR)/$(PKG_NAME)
+
+include $(TOPDIR)/feeds/luci/luci.mk
+
+define Package/default-settings
+  SECTION:=luci
+  CATEGORY:=LuCI
+  TITLE:=LuCI support for Default Settings
+  PKGARCH:=all
+  DEPENDS:=+luci-base +@LUCI_LANG_zh-cn
+endef
+
+define Package/default-settings/description
+	Language Support Packages.
+endef
+
+define Build/Configure
+endef
+
+define Build/Compile
+endef
+
+define Package/default-settings/install
+	$(INSTALL_DIR) $(1)/etc/uci-defaults
+	$(INSTALL_BIN) ./files/zzz-default-settings $(1)/etc/uci-defaults/99-default-settings
+endef
+
+$(eval $(call BuildPackage,default-settings))
+$(foreach pkg,$(LUCI_BUILD_PACKAGES),$(eval $(call BuildPackage,$(pkg))))

diy/feeds/custom/luci/default-settings/po/zh_Hans/other_zh.po

@@ -0,0 +1,11 @@
+msgid "Disable IPv6 DNS forwards"
+msgstr "禁止解析 IPv6 DNS 记录"
+
+msgid "Filter IPv6(AAAA) DNS Query Name Resolve"
+msgstr "过滤掉 IPv6(AAAA) ，只返回 IPv4 DNS 域名记录"
+
+msgid "Minimum TTL to send to clients"
+msgstr "客户端缓存的最小 DNS TTL"
+
+msgid "Modify DNS entries minimum TTL (max is 86400, 0 is no modify)"
+msgstr "修改发送到客户端的域名记录的 TTL 时间 (最大 86400, 0 表示不修改)"

patches/filter-aaaa.patch

@@ -0,0 +1,10 @@
+--- /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
+@@ -185,2 +185,7 @@
+ 			_('Additional Hosts files')).optional = true;
++			
++		o = s.taboption("advanced", form.Flag, "filter_aaaa",
++			_('Disable IPv6 DNS forwards'),
++			_('Filter IPv6(AAAA) DNS Query Name Resolve'));
++		o.optional = true;
+ 

patches/mini-ttl.patch

@@ -3,10 +3,10 @@
 @@ -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)"))
++			_('Minimum TTL to send to clients'),
++			_('Modify DNS entries minimum TTL (max is 86400, 0 is no modify)'))
 +		o.optional = true
-+		o.datatype = "range(0,3600)"
++		o.datatype = "range(0,86400)"
 +		o.placeholder = 0
 +
  		s.taboption('tftp', form.Flag, 'enable_tftp',