Revert "Revert "Merge branch 'develop'""

This reverts commit 1b7bac2e0a.

patches/bbr2.patch

@@ -0,0 +1,27 @@
+--- a/package/kernel/linux/modules/netsupport.mk	2020-11-22 17:39:14.462349527 +0100
++++ b/package/kernel/linux/modules/netsupport.mk	2020-11-22 17:41:37.719620332 +0100
+@@ -948,6 +948,24 @@
+ 
+ $(eval $(call KernelPackage,tcp-bbr))
+ 
++define KernelPackage/tcp-bbr2
++  SUBMENU:=$(NETWORK_SUPPORT_MENU)
++  TITLE:=BBRv2 TCP congestion control
++  KCONFIG:= \
++	CONFIG_TCP_CONG_ADVANCED=y \
++	CONFIG_TCP_CONG_BBR2
++  FILES:=$(LINUX_DIR)/net/ipv4/tcp_bbr2.ko
++  AUTOLOAD:=$(call AutoLoad,74,tcp_bbr2)
++endef
++
++define KernelPackage/tcp-bbr2/description
++ Kernel module for BBRv2 (Bottleneck Bandwidth and RTT) TCP congestion
++ control. It requires the fq ("Fair Queue") pacing packet scheduler.
++ For kernel 4.13+, TCP internal pacing is implemented as fallback.
++endef
++
++$(eval $(call KernelPackage,tcp-bbr2))
++
+ define KernelPackage/tcp-nanqinlang
+   SUBMENU:=$(NETWORK_SUPPORT_MENU)
+   TITLE:=BBR NANQINLANG TCP congestion control

patches/check-rsync.patch

@@ -0,0 +1,14 @@
+diff --git a/include/prereq-build.mk b/include/prereq-build.mk
+index e7314b253b58..5045fabdfbde 100644
+--- a/include/prereq-build.mk
++++ b/include/prereq-build.mk
+@@ -170,9 +170,6 @@ $(eval $(call SetupHostCommand,git,Please install Git (git-core) >= 1.7.12.2, \
+ $(eval $(call SetupHostCommand,file,Please install the 'file' package, \
+ 	file --version 2>&1 | grep file))
+ 
+-$(eval $(call SetupHostCommand,rsync,Please install 'rsync', \
+-	rsync --version </dev/null))
+-
+ $(STAGING_DIR_HOST)/bin/mkhash: $(SCRIPT_DIR)/mkhash.c
+ 	mkdir -p $(dir $@)
+ 	$(CC) -O2 -I$(TOPDIR)/tools/include -o $@ $<

patches/luci-occitan.patch

@@ -1,9 +1,9 @@
 --- a/feeds/luci/luci.mk	2020-10-13 09:58:19.887513368 +0200
 +++ b/feeds/luci/luci.mk	2020-10-13 09:04:51.724277184 +0200
 @@ -34,6 +34,7 @@
- LUCI_LANG.mr=Marāṭhī (Marathi)
  LUCI_LANG.ms=Bahasa Melayu (Malay)
  LUCI_LANG.nb_NO=Norsk (Norwegian)
+ LUCI_LANG.nl=Nederlands (Dutch)
 +LUCI_LANG.oc=Occitan
  LUCI_LANG.pl=Polski (Polish)
  LUCI_LANG.pt_BR=Português do Brasil (Brazilian Portuguese)