Merge branch 'develop'

2025-03-09 15:40:03 +00:00 · 2021-04-05 13:57:57 +08:00 · 2021-04-05 13:57:57 +08:00 · 7553518885
commit 7553518885
parent 676eeef761 9974a7f927
598 changed files with 182 additions and 31 deletions
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@ -9,7 +9,7 @@ jobs:
  build:
    strategy:
      matrix:
-        OMR_TARGET: [bpi-r1, bpi-r2, bpi-r64, rpi2, rpi4, x86_64, 4018, 4019]
+        OMR_TARGET: [bpi-r1, bpi-r2, bpi-r64, rpi2, rpi4, x86_64]
    runs-on: ubuntu-latest
    continue-on-error: true

--- a/.github/workflows/workspace.code-workspace
+++ b/.github/workflows/workspace.code-workspace
@ -0,0 +1,10 @@
+{
+	"folders": [
+		{
+			"path": "../../../3grouter"
+		},
+		{
+			"path": "../.."
+		}
+	]
+}
--- a/6in4/Makefile
+++ b/6in4/Makefile
--- a/CLA-entity.md
+++ b/CLA-entity.md
--- a/CLA-individual.md
+++ b/CLA-individual.md
--- a/CODE_OF_CONDUCT.md
+++ b/CODE_OF_CONDUCT.md
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
--- a/0
+++ b/0
--- a/README.md
+++ b/README.md
--- a/bcm27xx-eeprom/Makefile
+++ b/bcm27xx-eeprom/Makefile
--- a/bcm27xx-eeprom/patches/0001-rpi-eeprom-update-OpenWrt-defaults.patch
+++ b/bcm27xx-eeprom/patches/0001-rpi-eeprom-update-OpenWrt-defaults.patch
--- a/bcm27xx-eeprom/patches/0003-rpi-eeprom-update-change-default-include-path.patch
+++ b/bcm27xx-eeprom/patches/0003-rpi-eeprom-update-change-default-include-path.patch
--- a/bcm27xx-eeprom/patches/0004-rpi-eeprom-update-remove-chmod.patch
+++ b/bcm27xx-eeprom/patches/0004-rpi-eeprom-update-remove-chmod.patch
--- a/contributors/cr3ative.md
+++ b/contributors/cr3ative.md
--- a/contributors/example.md
+++ b/contributors/example.md
--- a/dsvpn/Makefile
+++ b/dsvpn/Makefile
--- a/dsvpn/patches/nofirewall.patch
+++ b/dsvpn/patches/nofirewall.patch
--- a/dsvpn/patches/nostrip.patch
+++ b/dsvpn/patches/nostrip.patch
--- a/glorytun-udp/Makefile
+++ b/glorytun-udp/Makefile
--- a/glorytun-udp/patches/aegis-arm.patch
+++ b/glorytun-udp/patches/aegis-arm.patch
--- a/glorytun/Makefile
+++ b/glorytun/Makefile
--- a/glorytun/glorytun.config
+++ b/glorytun/glorytun.config
--- a/golang-protobuf/Makefile
+++ b/golang-protobuf/Makefile
--- a/golang/golang-build.sh
+++ b/golang/golang-build.sh
--- a/golang/golang-compiler.mk
+++ b/golang/golang-compiler.mk
--- a/golang/golang-golang-x-crypto/Makefile
+++ b/golang/golang-golang-x-crypto/Makefile
--- a/golang/golang-golang-x-net/Makefile
+++ b/golang/golang-golang-x-net/Makefile
--- a/golang/golang-golang-x-sys/Makefile
+++ b/golang/golang-golang-x-sys/Makefile
--- a/golang/golang-golang-x-text/Makefile
+++ b/golang/golang-golang-x-text/Makefile
--- a/golang/golang-host-build.mk
+++ b/golang/golang-host-build.mk
--- a/golang/golang-package.mk
+++ b/golang/golang-package.mk
--- a/golang/golang-values.mk
+++ b/golang/golang-values.mk
--- a/golang/golang/Config.in
+++ b/golang/golang/Config.in
--- a/golang/golang/Makefile
+++ b/golang/golang/Makefile
--- a/golang/golang/files/go-gcc-helper
+++ b/golang/golang/files/go-gcc-helper
--- a/https-dns-proxy/Makefile
+++ b/https-dns-proxy/Makefile
--- a/https-dns-proxy/files/README.md
+++ b/https-dns-proxy/files/README.md
--- a/https-dns-proxy/files/https-dns-proxy.config
+++ b/https-dns-proxy/files/https-dns-proxy.config
--- a/ipcalc/Makefile
+++ b/ipcalc/Makefile
--- a/iptables-mod-fullconenat/Makefile
+++ b/iptables-mod-fullconenat/Makefile
--- a/iptables-mod-fullconenat/README.md
+++ b/iptables-mod-fullconenat/README.md
--- a/iptables-mod-fullconenat/files/Makefile
+++ b/iptables-mod-fullconenat/files/Makefile
--- a/iptables-mod-fullconenat/patches/000-printk.patch
+++ b/iptables-mod-fullconenat/patches/000-printk.patch
--- a/lcd4linux/Config.in
+++ b/lcd4linux/Config.in
--- a/lcd4linux/Makefile
+++ b/lcd4linux/Makefile
--- a/lcd4linux/files/lcd4linux.init
+++ b/lcd4linux/files/lcd4linux.init
--- a/lcd4linux/patches/120-remove-as-needed-linker-option.patch
+++ b/lcd4linux/patches/120-remove-as-needed-linker-option.patch
--- a/lcd4linux/patches/140-no_repnop_T6963.patch
+++ b/lcd4linux/patches/140-no_repnop_T6963.patch
--- a/lcd4linux/patches/150-addlibmpdclient.patch
+++ b/lcd4linux/patches/150-addlibmpdclient.patch
--- a/lcd4linux/patches/160-uinput_defs.patch
+++ b/lcd4linux/patches/160-uinput_defs.patch
--- a/lcd4linux/patches/170-add-generic-spidev-driver.patch
+++ b/lcd4linux/patches/170-add-generic-spidev-driver.patch
--- a/lcd4linux/patches/173-glcd2usb-bigendian-fix.patch
+++ b/lcd4linux/patches/173-glcd2usb-bigendian-fix.patch
--- a/libell/Makefile
+++ b/libell/Makefile
--- a/luci-app-dsvpn/Makefile
+++ b/luci-app-dsvpn/Makefile
--- a/luci-app-dsvpn/htdocs/luci-static/resources/view/services/dsvpn.js
+++ b/luci-app-dsvpn/htdocs/luci-static/resources/view/services/dsvpn.js
--- a/luci-app-dsvpn/po/fr/dsvpn.po
+++ b/luci-app-dsvpn/po/fr/dsvpn.po
--- a/luci-app-dsvpn/po/templates/dsvpn.pot
+++ b/luci-app-dsvpn/po/templates/dsvpn.pot
--- a/luci-app-dsvpn/po/zh_Hans/dsvpn.po
+++ b/luci-app-dsvpn/po/zh_Hans/dsvpn.po
--- a/luci-app-dsvpn/root/usr/share/luci/menu.d/luci-app-dsvpn.json
+++ b/luci-app-dsvpn/root/usr/share/luci/menu.d/luci-app-dsvpn.json
--- a/luci-app-dsvpn/root/usr/share/rpcd/acl.d/luci-app-dsvpn.json
+++ b/luci-app-dsvpn/root/usr/share/rpcd/acl.d/luci-app-dsvpn.json
--- a/luci-app-firewall/Makefile
+++ b/luci-app-firewall/Makefile
--- a/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js
+++ b/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js
--- a/luci-app-firewall/htdocs/luci-static/resources/view/firewall/custom.js
+++ b/luci-app-firewall/htdocs/luci-static/resources/view/firewall/custom.js
--- a/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js
+++ b/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js
--- a/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js
+++ b/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js
--- a/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js
+++ b/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js
--- a/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js
+++ b/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js
--- a/luci-app-firewall/po/bg/firewall.po
+++ b/luci-app-firewall/po/bg/firewall.po
--- a/luci-app-firewall/po/ca/firewall.po
+++ b/luci-app-firewall/po/ca/firewall.po
--- a/luci-app-firewall/po/cs/firewall.po
+++ b/luci-app-firewall/po/cs/firewall.po
--- a/luci-app-firewall/po/de/firewall.po
+++ b/luci-app-firewall/po/de/firewall.po
--- a/luci-app-firewall/po/el/firewall.po
+++ b/luci-app-firewall/po/el/firewall.po
--- a/luci-app-firewall/po/en/firewall.po
+++ b/luci-app-firewall/po/en/firewall.po
--- a/luci-app-firewall/po/es/firewall.po
+++ b/luci-app-firewall/po/es/firewall.po
--- a/luci-app-firewall/po/fr/firewall.po
+++ b/luci-app-firewall/po/fr/firewall.po
--- a/luci-app-firewall/po/he/firewall.po
+++ b/luci-app-firewall/po/he/firewall.po
--- a/luci-app-firewall/po/hi/firewall.po
+++ b/luci-app-firewall/po/hi/firewall.po
--- a/luci-app-firewall/po/hu/firewall.po
+++ b/luci-app-firewall/po/hu/firewall.po
--- a/luci-app-firewall/po/it/firewall.po
+++ b/luci-app-firewall/po/it/firewall.po
--- a/luci-app-firewall/po/ja/firewall.po
+++ b/luci-app-firewall/po/ja/firewall.po
--- a/luci-app-firewall/po/ko/firewall.po
+++ b/luci-app-firewall/po/ko/firewall.po
--- a/luci-app-firewall/po/mr/firewall.po
+++ b/luci-app-firewall/po/mr/firewall.po
--- a/luci-app-firewall/po/ms/firewall.po
+++ b/luci-app-firewall/po/ms/firewall.po
--- a/luci-app-firewall/po/nb_NO/firewall.po
+++ b/luci-app-firewall/po/nb_NO/firewall.po
--- a/luci-app-firewall/po/pl/firewall.po
+++ b/luci-app-firewall/po/pl/firewall.po
--- a/luci-app-firewall/po/pt/firewall.po
+++ b/luci-app-firewall/po/pt/firewall.po
--- a/luci-app-firewall/po/pt_BR/firewall.po
+++ b/luci-app-firewall/po/pt_BR/firewall.po
--- a/luci-app-firewall/po/ro/firewall.po
+++ b/luci-app-firewall/po/ro/firewall.po
--- a/luci-app-firewall/po/ru/firewall.po
+++ b/luci-app-firewall/po/ru/firewall.po
--- a/luci-app-firewall/po/sk/firewall.po
+++ b/luci-app-firewall/po/sk/firewall.po
--- a/luci-app-firewall/po/sv/firewall.po
+++ b/luci-app-firewall/po/sv/firewall.po
--- a/luci-app-firewall/po/templates/firewall.pot
+++ b/luci-app-firewall/po/templates/firewall.pot
--- a/luci-app-firewall/po/tr/firewall.po
+++ b/luci-app-firewall/po/tr/firewall.po
--- a/luci-app-firewall/po/uk/firewall.po
+++ b/luci-app-firewall/po/uk/firewall.po
--- a/luci-app-firewall/po/vi/firewall.po
+++ b/luci-app-firewall/po/vi/firewall.po
--- a/luci-app-firewall/po/zh_Hans/firewall.po
+++ b/luci-app-firewall/po/zh_Hans/firewall.po
--- a/luci-app-firewall/po/zh_Hant/firewall.po
+++ b/luci-app-firewall/po/zh_Hant/firewall.po
--- a/luci-app-firewall/root/usr/share/luci/menu.d/luci-app-firewall.json
+++ b/luci-app-firewall/root/usr/share/luci/menu.d/luci-app-firewall.json
--- a/luci-app-firewall/root/usr/share/rpcd/acl.d/luci-app-firewall.json
+++ b/luci-app-firewall/root/usr/share/rpcd/acl.d/luci-app-firewall.json
--- a/luci-app-glorytun-tcp/Makefile
+++ b/luci-app-glorytun-tcp/Makefile
--- a/Show more
+++ b/Show more