[bot] AutoMerging: merge all upstream's changes:

* https://github.com/coolsnowwolf/lede:
  ramips: improve ac2100/dir882 support (coolsnowwolf#5136)
  openvpn: fix bug (coolsnowwolf#5130)
  20200718-忽略文件添加*.log (coolsnowwolf#5128)
  wget: prefer ipv4 than ipv6 (coolsnowwolf#5127)

.gitignore

@@ -25,4 +25,5 @@ key-build*
 .emacs.desktop*
 TAGS*~
 git-src
-.git-credentials
+.git-credentials
+/*.log

package/lean/luci-app-openvpn-server/root/etc/config/openvpn

@@ -21,8 +21,8 @@ config openvpn 'myvpn'
 	option verb '3'
 	option status '/var/log/openvpn_status.log'
 	option log '/tmp/openvpn.log'
-	list push 'route 192.168.0.0 255.255.255.0'
+	list push 'route 192.168.1.0 255.255.255.0'
 	list push 'comp-lzo adaptive'
 	list push 'redirect-gateway def1 bypass-dhcp'
-	list push 'dhcp-option DNS 192.168.0.1'
+	list push 'dhcp-option DNS 192.168.1.1'
 

package/lean/luci-app-openvpn-server/root/etc/genovpn.sh

@@ -2,7 +2,7 @@
 
 ddns=`uci get openvpn.myvpn.ddns`
 port=`uci get openvpn.myvpn.port`
-proto=`uci get openvpn.myvpn.proto`
+proto=`uci get openvpn.myvpn.proto|sed -e 's/server/client/g'`
 
 cat > /tmp/my.ovpn  <<EOF
 client
@@ -13,7 +13,7 @@ resolv-retry infinite
 nobind
 persist-key
 persist-tun
-verb 3"
+verb 3
 EOF
 echo '<ca>' >> /tmp/my.ovpn
 cat /etc/openvpn/ca.crt >> /tmp/my.ovpn

package/lean/luci-app-openvpn-server/root/etc/ovpnadd.conf

@@ -1,9 +1 @@
-http-proxy-option EXT1 "POST http://rd.go.10086.cn"
-http-proxy-option EXT1 "GET http://rd.go.10086.cn"
-http-proxy-option EXT1 "X-Online-Host: rd.go.10086.cn"
-http-proxy-option EXT1 "POST http://rd.go.10086.cn"
-http-proxy-option EXT1 "X-Online-Host: rd.go.10086.cn"
-http-proxy-option EXT1 "POST http://rd.go.10086.cn"
-http-proxy-option EXT1 "Host: rd.go.10086.cn"
-http-proxy-option EXT1 "GET http://rd.go.10086.cn"
-http-proxy-option EXT1 "Host: rd.go.10086.cn"
+comp-lzo

package/lean/wget/Makefile

@@ -0,0 +1,108 @@
+#
+# Copyright (C) 2007-2016 OpenWrt.org
+#
+# This is free software, licensed under the GNU General Public License v2.
+# See /LICENSE for more information.
+#
+
+include $(TOPDIR)/rules.mk
+
+PKG_NAME:=wget
+PKG_VERSION:=1.20.3
+PKG_RELEASE:=4
+
+PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
+PKG_SOURCE_URL:=@GNU/$(PKG_NAME)
+PKG_HASH:=31cccfc6630528db1c8e3a06f6decf2a370060b982841cfab2b8677400a5092e
+PKG_MAINTAINER:=Peter Wagner <[email protected]>
+PKG_LICENSE:=GPL-3.0-or-later
+PKG_LICENSE_FILES:=COPYING
+
+PKG_CPE_ID:=cpe:/a:gnu:wget
+
+include $(INCLUDE_DIR)/package.mk
+
+define Package/wget/Default
+  SECTION:=net
+  CATEGORY:=Network
+  DEPENDS:=+libpcre +zlib
+  SUBMENU:=File Transfer
+  TITLE:=Non-interactive network downloader
+  URL:=https://www.gnu.org/software/wget/index.html
+  PROVIDES:=gnu-wget
+endef
+
+define Package/wget/Default/description
+ Wget is a network utility to retrieve files from the Web using http
+ and ftp, the two most widely used Internet protocols. It works
+ non-interactively, so it will work in the background, after having
+ logged off. The program supports recursive retrieval of web-authoring
+ pages as well as ftp sites -- you can use wget to make mirrors of
+ archives and home pages or to travel the Web like a WWW robot.
+endef
+
+define Package/wget
+$(call Package/wget/Default)
+  DEPENDS+= +libopenssl +librt
+  TITLE+= (with SSL support)
+  VARIANT:=ssl
+  PROVIDES+=wget-ssl
+  ALTERNATIVES:=300:/usr/bin/wget:/usr/bin/wget-ssl
+endef
+
+define Package/wget/description
+$(call Package/wget/Default/description)
+ This package is built with SSL support.
+endef
+
+define Package/wget-nossl
+$(call Package/wget/Default)
+  TITLE+= (without SSL support)
+  VARIANT:=nossl
+  PROVIDES+=wget
+  ALTERNATIVES:=300:/usr/bin/wget:/usr/bin/wget-nossl
+endef
+
+define Package/wget-nossl/description
+$(call Package/wget/Default/description)
+ This package is built without SSL support.
+endef
+
+CONFIGURE_ARGS+= \
+	--disable-rpath \
+	--disable-iri \
+	--disable-pcre2 \
+	--with-included-libunistring \
+	--without-libuuid \
+	--without-libpsl
+
+CONFIGURE_VARS += \
+	ac_cv_header_uuid_uuid_h=no
+
+ifeq ($(BUILD_VARIANT),ssl)
+	CONFIGURE_ARGS+= \
+		--with-ssl=openssl \
+		--with-libssl-prefix="$(STAGING_DIR)/usr"
+
+	CONFIGURE_VARS += \
+		ac_cv_libssl=yes
+endif
+
+ifeq ($(BUILD_VARIANT),nossl)
+	CONFIGURE_ARGS+= \
+		--disable-ntlm \
+		--without-ssl
+endif
+
+define Package/wget/install
+	$(INSTALL_DIR) $(1)/usr/bin
+	$(INSTALL_BIN) $(PKG_BUILD_DIR)/src/wget $(1)/usr/bin/wget-ssl
+endef
+
+define Package/wget-nossl/install
+	$(INSTALL_DIR) $(1)/usr/bin
+	$(INSTALL_BIN) $(PKG_BUILD_DIR)/src/wget $(1)/usr/bin/wget-nossl
+endef
+
+$(eval $(call BuildPackage,wget))
+$(eval $(call BuildPackage,wget-nossl))

package/lean/wget/patches/001-prefer_ipv4.patch

@@ -0,0 +1,11 @@
+--- a/src/init.c	2020-07-11 21:55:28.055428530 +0800
++++ b/src/init.c	2020-07-11 21:58:08.698565761 +0800
+@@ -412,7 +412,7 @@ defaults (void)
+   tmp = getenv ("no_proxy");
+   if (tmp)
+     opt.no_proxy = sepstring (tmp);
+-  opt.prefer_family = prefer_none;
++  opt.prefer_family = prefer_ipv4;
+   opt.allow_cache = true;
+   opt.if_modified_since = true;
+

target/linux/ramips/dts/mt7621_dlink_dir-867-a1.dts

@@ -0,0 +1,40 @@
+// SPDX-License-Identifier: GPL-2.0-or-later OR MIT
+/dts-v1/;
+
+#include "mt7621_dlink_dir-8xx-a1.dtsi"
+
+/ {
+	compatible = "dlink,dir-867-a1", "mediatek,mt7621-soc";
+	model = "D-Link DIR-867 A1";
+
+	aliases {
+		led-boot = &led_power_orange;
+		led-failsafe = &led_power_green;
+		led-running = &led_power_green;
+		led-upgrade = &led_net_orange;
+	};
+
+	leds {
+		compatible = "gpio-leds";
+
+		led_power_orange: power_orange {
+			label = "dir-867-a1:orange:power";
+			gpios = <&gpio 8 GPIO_ACTIVE_LOW>;
+		};
+
+		led_power_green: power_green {
+			label = "dir-867-a1:green:power";
+			gpios = <&gpio 16 GPIO_ACTIVE_LOW>;
+		};
+
+		led_net_orange: net_orange {
+			label = "dir-867-a1:orange:net";
+			gpios = <&gpio 4 GPIO_ACTIVE_LOW>;
+		};
+
+		net_green {
+			label = "dir-867-a1:green:net";
+			gpios = <&gpio 3 GPIO_ACTIVE_LOW>;
+		};
+	};
+};

target/linux/ramips/dts/mt7621_dlink_dir-878-a1.dts

@@ -1,14 +1,18 @@
 // SPDX-License-Identifier: GPL-2.0-or-later OR MIT
 /dts-v1/;
 
-#include "mt7621_dlink_dir.dtsi"
-
-#include <dt-bindings/gpio/gpio.h>
-#include <dt-bindings/input/input.h>
+#include "mt7621_dlink_dir-8xx-a1.dtsi"
 
 / {
-	compatible = "dlink,dlink-dir878-a1", "mediatek,mt7621-soc";
-	model = "D-Link DIR878 A1";
+	compatible = "dlink,dir-878-a1", "mediatek,mt7621-soc";
+	model = "D-Link DIR-878 A1";
+
+	aliases {
+		led-boot = &led_power_orange;
+		led-failsafe = &led_power_green;
+		led-running = &led_power_green;
+		led-upgrade = &led_net_orange;
+	};
 
 	leds {
 		compatible = "gpio-leds";

target/linux/ramips/dts/mt7621_dlink_dir-882-a1.dts

@@ -1,14 +1,18 @@
 // SPDX-License-Identifier: GPL-2.0-or-later OR MIT
 /dts-v1/;
 
-#include "mt7621_dlink_dir.dtsi"
-
-#include <dt-bindings/gpio/gpio.h>
-#include <dt-bindings/input/input.h>
+#include "mt7621_dlink_dir-8xx-a1.dtsi"
 
 / {
-	compatible = "dlink,dlink-dir882-a1", "mediatek,mt7621-soc";
-	model = "D-Link DIR882 A1";
+	compatible = "dlink,dir-882-a1", "mediatek,mt7621-soc";
+	model = "D-Link DIR-882 A1";
+
+	aliases {
+		led-boot = &led_power_orange;
+		led-failsafe = &led_power_green;
+		led-running = &led_power_green;
+		led-upgrade = &led_net_orange;
+	};
 
 	leds {
 		compatible = "gpio-leds";
@@ -33,10 +37,17 @@
 			gpios = <&gpio 3 GPIO_ACTIVE_LOW>;
 		};
 
-		usb {
-			label = "dir-882-a1:green:usb";
+		usb2 {
+			label = "dir-882-a1:green:usb2";
+			gpios = <&gpio 13 GPIO_ACTIVE_LOW>;
+			trigger-sources = <&ehci_port2>;
+			linux,default-trigger = "usbport";
+		};
+
+		usb3 {
+			label = "dir-882-a1:green:usb3";
 			gpios = <&gpio 14 GPIO_ACTIVE_LOW>;
-			trigger-sources = <&xhci_ehci_port1>, <&ehci_port2>;
+			trigger-sources = <&xhci_ehci_port1>;
 			linux,default-trigger = "usbport";
 		};
 	};

target/linux/ramips/dts/mt7621_dlink_dir.dtsi → target/linux/ramips/dts/mt7621_dlink_dir-8xx-a1.dtsi

@@ -1,5 +1,4 @@
 // SPDX-License-Identifier: GPL-2.0-or-later OR MIT
-/dts-v1/;
 
 #include "mt7621.dtsi"
 
@@ -8,10 +7,6 @@
 
 / {
 	aliases {
-		led-boot = &led_power_orange;
-		led-failsafe = &led_power_orange;
-		led-running = &led_power_green;
-		led-upgrade = &led_power_green;
 		label-mac-device = &gmac0;
 	};
 
@@ -48,7 +43,7 @@
 	flash@0 {
 		compatible = "jedec,spi-nor";
 		reg = <0>;
-		spi-max-frequency = <10000000>;
+		spi-max-frequency = <50000000>;
 
 		partitions {
 			compatible = "fixed-partitions";

target/linux/ramips/dts/mt7621_motorola_mr2600.dts

@@ -1,15 +1,19 @@
 // SPDX-License-Identifier: GPL-2.0-or-later OR MIT
 /dts-v1/;
 
-#include "mt7621_dlink_dir.dtsi"
-
-#include <dt-bindings/gpio/gpio.h>
-#include <dt-bindings/input/input.h>
+#include "mt7621_dlink_dir-8xx-a1.dtsi"
 
 / {
 	compatible = "motorola,motorola-mr2600", "mediatek,mt7621-soc";
 	model = "Motorola MR2600";
 
+	aliases {
+		led-boot = &led_power_orange;
+		led-failsafe = &led_power_green;
+		led-running = &led_power_green;
+		led-upgrade = &led_net_orange;
+	};
+
 	leds {
 		compatible = "gpio-leds";
 

target/linux/ramips/dts/mt7621_xiaomi_mir3g.dts

@@ -14,7 +14,7 @@
 		led-failsafe = &led_status_red;
 		led-running = &led_status_blue;
 		led-upgrade = &led_status_yellow;
-		label-mac-device = &gmac0;
+		label-mac-device = &ethernet;
 	};
 
 	chosen {
@@ -190,28 +190,19 @@
 	};
 };
 
-&gmac0 {
+&ethernet {
+	compatible = "mediatek,ralink-mt7621-eth";
+	mediatek,switch = <&gsw>;
 	mtd-mac-address = <&factory 0xe006>;
 };
 
 &switch0 {
-	ports {
-		port@1 {
-			status = "okay";
-			label = "wan";
-			mtd-mac-address = <&factory 0xe000>;
-		};
-
-		port@2 {
-			status = "okay";
-			label = "lan2";
-		};
+	/delete-property/ compatible;
+	phy-mode = "rgmii";
+};
 
-		port@3 {
-			status = "okay";
-			label = "lan1";
-		};
-	};
+&gsw {
+	compatible = "mediatek,ralink-mt7621-gsw";
 };
 
 &state_default {

target/linux/ramips/dts/mt7621_xiaomi_router-ac2100.dtsi

@@ -6,7 +6,6 @@
 #include <dt-bindings/input/input.h>
 
 / {
-
 	chosen {
 		bootargs = "console=ttyS0,115200n8";
 	};
@@ -33,7 +32,6 @@
 		partition@0 {
 			label = "Bootloader";
 			reg = <0x0 0x80000>;
-			read-only;
 		};
 
 		partition@80000 {