Merge Mainline

package/firmware/ipq-wifi/Makefile

@@ -19,12 +19,18 @@ endef
 # <https://wireless.wiki.kernel.org/en/users/drivers/ath10k/boardfiles>
 
 ALLWIFIBOARDS:= \
+	8dev_habanero-dvk \
 	aruba_ap-303 \
 	asus_rt-acrh17 \
 	avm_fritzrepeater-1200 \
+	buffalo_wtr-m2133hp \
+	cellc_rtl30vw \
 	dlink_dap2610 \
+	engenius_eap2200 \
 	engenius_emd1 \
+	engenius_emr3500 \
 	ezviz_cs-w3-wd1200g-eup \
+	glinet_gl-s1300 \
 	hiwifi_c526a \
 	hugo_ac1200 \
 	linksys_ea8300 \
@@ -38,7 +44,7 @@ define Package/ipq-wifi-default
   SUBMENU:=ath10k Board-Specific Overrides
   SECTION:=firmware
   CATEGORY:=Firmware
-  DEPENDS:=@TARGET_ipq40xx
+  DEPENDS:=@(TARGET_ipq40xx||TARGET_ipq806x)
   TITLE:=Custom Board
 endef
 
@@ -91,12 +97,18 @@ endef
 # Place files in this directory as board-<devicename>.<qca4019|qca9888|qca9984>
 # Add $(eval $(call generate-ipq-wifi-package,<devicename>,<display name>))
 
+$(eval $(call generate-ipq-wifi-package,8dev_habanero-dvk,8devices Habanero DVK))
 $(eval $(call generate-ipq-wifi-package,aruba_ap-303,Aruba AP-303))
 $(eval $(call generate-ipq-wifi-package,asus_rt-acrh17,ASUS RT-ACRH17/RT-AC82U/RT-AC42U))
 $(eval $(call generate-ipq-wifi-package,avm_fritzrepeater-1200,AVM FRITZRepeater 1200))
+$(eval $(call generate-ipq-wifi-package,buffalo_wtr-m2133hp,Buffalo WTR-M2133HP))
+$(eval $(call generate-ipq-wifi-package,cellc_rtl30vw, Cell C RTL30VW))
 $(eval $(call generate-ipq-wifi-package,dlink_dap2610,D-Link DAP-2610))
+$(eval $(call generate-ipq-wifi-package,engenius_eap2200,EnGenius EAP2200))
 $(eval $(call generate-ipq-wifi-package,engenius_emd1,EnGenius EMD1))
+$(eval $(call generate-ipq-wifi-package,engenius_emr3500,EnGenius EMR3500))
 $(eval $(call generate-ipq-wifi-package,ezviz_cs-w3-wd1200g-eup,EZVIZ CS-W3-WD1200G EUP))
+$(eval $(call generate-ipq-wifi-package,glinet_gl-s1300,GL.iNet GL-S1300))
 $(eval $(call generate-ipq-wifi-package,hiwifi_c526a,HiWiFi C526A))
 $(eval $(call generate-ipq-wifi-package,hugo_ac1200,Hugo AC1200))
 $(eval $(call generate-ipq-wifi-package,linksys_ea8300,Linksys EA8300))

package/lean/luci-app-kodexplorer/Makefile

@@ -6,7 +6,7 @@
 include $(TOPDIR)/rules.mk
 
 LUCI_TITLE:=LuCI support for KodExplorer
-LUCI_DEPENDS:=+nginx +nginx-util +zoneinfo-asia +php7 +php7-fpm +php7-mod-curl +php7-mod-gd +php7-mod-iconv +php7-mod-json +php7-mod-mbstring +php7-mod-opcache +php7-mod-session +php7-mod-zip +php7-mod-sqlite3 +php7-mod-pdo +php7-mod-pdo-sqlite +php7-mod-pdo-mysql
+LUCI_DEPENDS:=+nginx +unzip +zoneinfo-asia +php7 +php7-fpm +php7-mod-curl +php7-mod-gd +php7-mod-iconv +php7-mod-json +php7-mod-mbstring +php7-mod-opcache +php7-mod-session +php7-mod-zip +php7-mod-sqlite3 +php7-mod-pdo +php7-mod-pdo-sqlite +php7-mod-pdo-mysql
 LUCI_PKGARCH:=all
 PKG_VERSION:=13
 PKG_DATE:=20200612

package/lean/shadowsocksr-libev/patches/0004-gcc10.patch

@@ -0,0 +1,20 @@
+--- a/src/http.h
++++ b/src/http.h
+@@ -29,6 +29,6 @@
+ #include <stdio.h>
+ #include "protocol.h"
+ 
+-const protocol_t *const http_protocol;
++extern const protocol_t *const http_protocol;
+ 
+ #endif
+--- a/src/tls.h
++++ b/src/tls.h
+@@ -28,6 +28,6 @@
+ 
+ #include "protocol.h"
+ 
+-const protocol_t *const tls_protocol;
++extern const protocol_t *const tls_protocol;
+ 
+ #endif

package/libs/libjson-c/Makefile

@@ -8,12 +8,12 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=json-c
-PKG_VERSION:=0.14
-PKG_RELEASE:=2
+PKG_VERSION:=0.15
+PKG_RELEASE:=1
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-nodoc.tar.gz
 PKG_SOURCE_URL:=https://s3.amazonaws.com/json-c_releases/releases/
-PKG_HASH:=99914e644a25201d82ccefa20430f7515c110923360f9ef46755527c02412afa
+PKG_HASH:=99bca4f944b8ced8ae0bbc6310d6a3528ca715e69541793a1ef51f8c5b4b0878
 
 PKG_MAINTAINER:=Felix Fietkau <nbd@nbd.name>
 PKG_LICENSE:=MIT

package/libs/libjson-c/patches/000-libm.patch

@@ -1,6 +1,6 @@
 --- a/math_compat.h
 +++ b/math_compat.h
-@@ -6,31 +6,9 @@
+@@ -6,38 +6,9 @@
   * @brief Do not use, json-c internal, may be changed or removed at any time.
   */
  
@@ -10,6 +10,9 @@
 -#ifdef HAVE_DECL__ISNAN
 -#include <float.h>
 -#define isnan(x) _isnan(x)
+-#else
+-/* On platforms like AIX and "IBM i" we need to provide our own isnan */
+-#define isnan(x) ((x) != (x))
 -#endif
 -#endif
 -
@@ -17,6 +20,10 @@
 -#ifdef HAVE_DECL__FINITE
 -#include <float.h>
 -#define isinf(x) (!_finite(x))
+-#else
+-#include <float.h>
+-/* On platforms like AIX and "IBM i" we need to provide our own isinf */
+-#define isinf(x) ((x) < -DBL_MAX || (x) > DBL_MAX)
 -#endif
 -#endif
 -

package/libs/libjson-c/patches/001-dont-build-docs.patch

@@ -0,0 +1,11 @@
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -401,8 +401,6 @@ set(JSON_C_SOURCES
+ include_directories(${PROJECT_SOURCE_DIR})
+ include_directories(${PROJECT_BINARY_DIR})
+ 
+-add_subdirectory(doc)
+-
+ # uninstall
+ add_custom_target(uninstall
+   COMMAND cat ${PROJECT_BINARY_DIR}/install_manifest.txt | xargs rm

package/network/services/uhttpd/Makefile

@@ -12,9 +12,9 @@ PKG_RELEASE:=1
 
 PKG_SOURCE_PROTO:=git
 PKG_SOURCE_URL=$(PROJECT_GIT)/project/uhttpd.git
-PKG_SOURCE_DATE:=2020-09-15
-PKG_SOURCE_VERSION:=11723570af9cb7bd87842e79c85ee99530be9902
-PKG_MIRROR_HASH:=39aa6d700689419db8e8f9bf59a4b9c9539c3ee636e0befebf38476bc883cc18
+PKG_SOURCE_DATE:=2020-09-18
+PKG_SOURCE_VERSION:=47c34bd6ad49cae408b8d7c150c6f9f324aaddf5
+PKG_MIRROR_HASH:=31ee0eca69577380842588abc442526c23b2c20df13e79738843b8b417f99d17
 PKG_MAINTAINER:=Felix Fietkau <nbd@nbd.name>
 PKG_LICENSE:=ISC
 

package/utils/usbutils/Makefile

@@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=usbutils
 PKG_VERSION:=007
-PKG_RELEASE:=10
+PKG_RELEASE:=11
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz
 PKG_SOURCE_URL:=@KERNEL/linux/utils/usb/usbutils
@@ -32,13 +32,13 @@ define Package/usbutils
   URL:=http://www.linux-usb.org/
 endef
 
-USB_IDS_VER:=0.321
+USB_IDS_VER:=0.339
 USB_IDS_FILE:=usb.ids.$(USB_IDS_VER)
 define Download/usb_ids
   FILE:=$(USB_IDS_FILE)
   URL_FILE:=usb.ids
   URL:=@GITHUB/vcrhonek/hwdata/v$(USB_IDS_VER)
-  HASH:=00aa21766bb078186d2bc2cca9a2ae910aa2b787a810e97019b1b3f94c9453f2
+  HASH:=5ab6b663d3119217aa4117e95063c9b82646107344f2ae1d22248c6c29389fd7
 endef
 $(eval $(call Download,usb_ids))
 

target/linux/ipq40xx/base-files/etc/board.d/01_leds

@@ -88,8 +88,6 @@ zyxel,wre6606)
 	ucidef_set_led_wlan "wlan2g" "WLAN2G" "${boardname}:green:wlan2g" "phy0tpt"
 	ucidef_set_led_wlan "wlan5g" "WLAN5G" "${boardname}:green:wlan5g" "phy1tpt"
 	;;
-*)
-	;;
 esac
 
 board_config_flush

target/linux/ipq40xx/base-files/lib/preinit/06_set_preinit_iface_ipq40xx.sh

@@ -12,8 +12,6 @@ set_preinit_iface() {
 	zyxel,nbg6617)
 		ifname=eth0
 		;;
-	*)
-		;;
 	esac
 }
 

target/linux/ipq806x/base-files/etc/board.d/01_leds

@@ -49,8 +49,6 @@ tplink,vr2600v)
 zyxel,nbg6817)
 	ucidef_set_led_netdev "wan" "WAN" "${boardname}:white:internet" "eth1"
 	;;
-*)
-	;;
 esac
 
 board_config_flush

tools/missing-macros/Makefile

@@ -8,7 +8,7 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=missing-macros
-PKG_RELEASE:=10
+PKG_RELEASE:=11
 
 include $(INCLUDE_DIR)/host-build.mk
 

tools/missing-macros/src/m4/mfx_limits.m4

@@ -147,8 +147,6 @@ case $host_os in
 cygwin* | mingw* | pw32*)
      test "X$LIBS" != "X" && LIBS="$LIBS "
      LIBS="${LIBS}-lwinmm" ;;
-*)
-     ;;
 esac
 fi
 ])#