Merge Mainline

2020-09-11 18:08:47 +08:00 · 2020-09-11 18:08:47 +08:00 · c75f41d557
commit c75f41d557
parent b551a0006b f803886385
28 changed files with 133 additions and 141 deletions
--- a/include/package-defaults.mk
+++ b/include/package-defaults.mk
@ -59,6 +59,7 @@ define Package/Default
  ALTERNATIVES:=
  LICENSE:=$(PKG_LICENSE)
  LICENSE_FILES:=$(PKG_LICENSE_FILES)
+  FILE_MODES:=$(PKG_FILE_MODES)
 endef

 Build/Patch:=$(Build/Patch/Default)
--- a/include/package-ipkg.mk
+++ b/include/package-ipkg.mk
@ -260,7 +260,7 @@ $(_endef)
    endif

 	$(INSTALL_DIR) $$(PDIR_$(1))
-	$(FAKEROOT) $(SCRIPT_DIR)/ipkg-build -m "$(PKG_FILE_MODES)" $$(IDIR_$(1)) $$(PDIR_$(1))
+	$(FAKEROOT) $(SCRIPT_DIR)/ipkg-build -m "$(FILE_MODES)" $$(IDIR_$(1)) $$(PDIR_$(1))
 	@[ -f $$(IPKG_$(1)) ]

    $(1)-clean:
--- a/package/ctcgfw/luci-app-ssocks/Makefile
+++ b/package/ctcgfw/luci-app-ssocks/Makefile
@ -8,7 +8,7 @@
 include $(TOPDIR)/rules.mk

 LUCI_TITLE:=LuCI support for sSocks
-LUCI_DEPENDS:=+busybox +iptables +ssocks
+LUCI_DEPENDS:=+busybox +iptables +ssocksd
 LUCI_PKGARCH:=all
 PKG_NAME:=luci-app-ssocks
 PKG_VERSION:=1.0
--- a/package/ctcgfw/openwrt-ssocks/Makefile
+++ b/package/ctcgfw/openwrt-ssocks/Makefile
@ -29,20 +29,36 @@ PKG_BUILD_PARALLEL:=1

 include $(INCLUDE_DIR)/package.mk

-define Package/$(PKG_NAME)
+define Package/ssocks
 	SECTION:=net
 	CATEGORY:=Network
-	TITLE:=sSocks
+	TITLE:=sSocks Relay
 	URL:=https://github.com/david378/ssocks
 endef

-define Package/$(PKG_NAME)/description
-sSocks is a package which contains: a socks5 server implements RFC 1928 (SOCKS V5) and RFC 1929 (Authentication for SOCKS V5), a reverse socks server and client, a netcat like tool and a socks5 relay.
+define Package/ssocks/description
+sSocks is a package which contains: a socks5 server implements RFC 1928 (SOCKS V5) and RFC 1929 (Authentication for SOCKS V5),
+a reverse socks server and client, a netcat like tool and a socks5 relay.
 endef

-define Package/$(PKG_NAME)/install
+define Package/ssocksd
+  $(call Package/ssocks)
+  TITLE:=sSocks Server
+endef
+
+define Package/ssocksd/description
+  $(call Package/ssocks/description)
+endef
+
+define Package/ssocks/install
 	$(INSTALL_DIR) $(1)/usr/bin
-	$(INSTALL_BIN) $(PKG_BUILD_DIR)/src/ssocksd $(1)/usr/bin/ssocks
+	$(INSTALL_BIN) $(PKG_BUILD_DIR)/src/ssocks $(1)/usr/bin/
 endef

-$(eval $(call BuildPackage,$(PKG_NAME)))
+define Package/ssocksd/install
+	$(INSTALL_DIR) $(1)/usr/bin
+	$(INSTALL_BIN) $(PKG_BUILD_DIR)/src/ssocksd $(1)/usr/bin/
+endef
+
+$(eval $(call BuildPackage,ssocks))
+$(eval $(call BuildPackage,ssocksd))
--- a/package/ctcgfw/rclone-ng/Makefile
+++ b/package/ctcgfw/rclone-ng/Makefile
@ -10,7 +10,7 @@
 include $(TOPDIR)/rules.mk

 PKG_NAME:=rclone-ng
-PKG_VERSION:=0.4.0
+PKG_VERSION:=0.5.0
 PKG_RELEASE:=1

 PKG_LICENSE:=GPLv3
@ -21,7 +21,7 @@ include $(INCLUDE_DIR)/package.mk
 PKG_SOURCE:=RcloneNg-v$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=https://github.com/ElonH/RcloneNg/releases/download/v$(PKG_VERSION)/
 PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
-PKG_HASH:=d974d5476b89281dcc14b0081e26f286041dd799898bc6b163d349d504056bd1
+PKG_HASH:=0b4916ddd0bacb5b358dc8d36b64c30f4182c0ace3eb06cda94b6578c419dcd9

 define Package/$(PKG_NAME)
 	SECTION:=net
--- a/package/ctcgfw/rclone/Makefile
+++ b/package/ctcgfw/rclone/Makefile
@ -10,16 +10,16 @@
 include $(TOPDIR)/rules.mk

 PKG_NAME:=rclone
-PKG_VERSION:=1.52.2
+PKG_VERSION:=1.53.0
 PKG_RELEASE:=1

 PKG_SOURCE_PROTO:=git
 PKG_SOURCE_URL:=https://github.com/rclone/rclone.git
-PKG_SOURCE_DATE:=2020-06-24
-PKG_SOURCE_VERSION:=d8144a7e84dc3fb4975adf1bce707a5be672fada
+PKG_SOURCE_DATE:=2020-09-02
+PKG_SOURCE_VERSION:=510ac341e193976171d29b8aeb81a30a37cfd2a1
 PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION)
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz
-PKG_MIRROR_HASH:=8a6f3fd465e57f5f3b9cfe3958eeb020f72b4940bfbf4993b9580659041c3735
+PKG_MIRROR_HASH:=c179138e0e8e5e54d4742622b61a22ec16f393f5a441dad02b8cb8f39de2f5a3

 PKG_LICENSE:=GPLv3
 PKG_MAINTAINER:=ElonH <elonhhuang@gmail.com>
--- a/package/kernel/linux/modules/fs.mk
+++ b/package/kernel/linux/modules/fs.mk
@ -436,7 +436,7 @@ define KernelPackage/fs-nfs-v4
 endef

 define KernelPackage/fs-nfs-v4/description
- Kernel module for NFS v4 support
+ Kernel module for NFS v4 client support
 endef

 $(eval $(call KernelPackage,fs-nfs-v4))
--- a/package/lean/UnblockNeteaseMusic-Go/Makefile
+++ b/package/lean/UnblockNeteaseMusic-Go/Makefile
@ -1,12 +1,12 @@
 include $(TOPDIR)/rules.mk

 PKG_NAME:=UnblockNeteaseMusic-Go
-PKG_VERSION:=0.2.4
+PKG_VERSION:=0.2.5
 PKG_RELEASE:=1

 PKG_SOURCE_PROTO:=git
 PKG_SOURCE_URL:=https://github.com/cnsilvan/UnblockNeteaseMusic.git
-PKG_SOURCE_VERSION:=2db62fe071c9f8fbfa8bad87256f853a78bb76f1
+PKG_SOURCE_VERSION:=aa1eb0186206671de9a6b4fa27d933bb306d4e25
 PKG_MAINTAINER:=Silvan <cnsilvan@gmail.com>

 PKG_SOURCE_SUBDIR:=$(PKG_NAME)
--- a/package/lean/v2ray/Makefile
+++ b/package/lean/v2ray/Makefile
@ -9,13 +9,13 @@
 include $(TOPDIR)/rules.mk

 PKG_NAME:=v2ray
-PKG_VERSION:=4.27.5
+PKG_VERSION:=4.28.0
 PKG_RELEASE:=1
 PKG_BUILD_DIR:=$(BUILD_DIR)/v2ray-core-$(PKG_VERSION)

 PKG_SOURCE:=v2ray-core-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=https://codeload.github.com/v2fly/v2ray-core/tar.gz/v$(PKG_VERSION)?
-PKG_HASH:=f289d8d85ab0851851a6e3c101226e77bed0052fd60f9185df8852b601e657f8
+PKG_HASH:=dbec636c3cd9e904a01da3c3e524213d44eac0a639e32c29b94609b32acddf39

 PKG_LICENSE:=MIT
 PKG_LICENSE_FILES:=LICENSE
--- a/package/lean/verysync/Makefile
+++ b/package/lean/verysync/Makefile
@ -41,7 +41,7 @@ endif
 PKG_RELEASE:=1
 PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
 PKG_SOURCE:=$(PKG_NAME)-linux-$(PKG_ARCH_VERYSYNC)-$(PKG_VERSION).tar.gz
-PKG_SOURCE_URL:=http://dl.verysync.net/$(PKG_VERSION)/
+PKG_SOURCE_URL:=http://dl.verysync.com/releases/$(PKG_VERSION)/
 PKG_HASH:=skip

 include $(INCLUDE_DIR)/package.mk
--- a/package/lienol/luci-app-passwall/Makefile
+++ b/package/lienol/luci-app-passwall/Makefile
@ -7,8 +7,8 @@ include $(TOPDIR)/rules.mk

 PKG_NAME:=luci-app-passwall
 PKG_VERSION:=3.9
-PKG_RELEASE:=54
-PKG_DATE:=20200905
+PKG_RELEASE:=56
+PKG_DATE:=20200907

 PKG_BUILD_DIR := $(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)

@ -21,6 +21,10 @@ config PACKAGE_$(PKG_NAME)_INCLUDE_Shadowsocks
 	bool "Include Shadowsocks"
 	default y
 	
+config PACKAGE_$(PKG_NAME)_INCLUDE_Shadowsocks_Server
+	bool "Include Shadowsocks Server"
+	default y
+	
 config PACKAGE_$(PKG_NAME)_INCLUDE_ShadowsocksR
 	bool "Include ShadowsocksR"
 	default y
@ -84,9 +88,12 @@ define Package/$(PKG_NAME)
  DEPENDS:=+libmbedtls +iptables-mod-tproxy +ip +ipset +coreutils +coreutils-base64 +coreutils-nohup +luci-lib-jsonc \
  +curl +ca-certificates +resolveip +unzip +dnsmasq-full +tcping +libuci-lua \
  +ipt2socks \
+  +ssocks \
+  +ssocksd \
  +pdnsd-alt \
  +PACKAGE_$(PKG_NAME)_INCLUDE_Shadowsocks:shadowsocks-libev-ss-redir \
  +PACKAGE_$(PKG_NAME)_INCLUDE_Shadowsocks:shadowsocks-libev-ss-local \
+  +PACKAGE_$(PKG_NAME)_INCLUDE_Shadowsocks_Server:shadowsocks-libev-ss-server \
  +PACKAGE_$(PKG_NAME)_INCLUDE_ShadowsocksR:shadowsocksr-libev-alt \
  +PACKAGE_$(PKG_NAME)_INCLUDE_ShadowsocksR:shadowsocksr-libev-ssr-local \
  +PACKAGE_$(PKG_NAME)_INCLUDE_ShadowsocksR_Server:shadowsocksr-libev-server \
--- a/package/lienol/luci-app-passwall/luasrc/model/cbi/passwall/server/api/app.lua
+++ b/package/lienol/luci-app-passwall/luasrc/model/cbi/passwall/server/api/app.lua
@ -68,14 +68,26 @@ local function start()
            local config_file = CONFIG_PATH .. "/" .. id .. ".json"
            local udp_forward = 1
            local type = user.type or ""
-            if type == "SSR" then
-                config = require("luci.model.cbi.passwall.server.api.ssr").gen_config(user)
+            if type == "Socks" then
+                local port = user.port
+                local username = user.username
+                local password = user.password
+                if username and password then
+                    local auth_file = CONFIG_PATH .. "/" .. id .. ".auth"
+                    cmd(string.format('echo %s:%s > %s', username, password, auth_file))
+                    bin = ln_start("/usr/bin/ssocksd", "ssocksd_" .. id, "-p " .. port .. " -a " .. auth_file)
+                else
+                    bin = ln_start("/usr/bin/ssocksd", "ssocksd_" .. id, "-p " .. port)
+                end
+            elseif type == "SS" or type == "SSR" then
+                config = require("luci.model.cbi.passwall.server.api.shadowsocks").gen_config(user)
                local udp_param = ""
                udp_forward = tonumber(user.udp_forward) or 1
                if udp_forward == 1 then
                    udp_param = "-u"
                end
-                bin = ln_start("/usr/bin/ssr-server", "ssr-server", "-c " .. config_file .. " " .. udp_param)
+                type = type:lower()
+                bin = ln_start("/usr/bin/" .. type .. "-server", type .. "-server", "-c " .. config_file .. " " .. udp_param)
            elseif type == "V2ray" then
                config = require("luci.model.cbi.passwall.server.api.v2ray").gen_config(user)
                bin = ln_start(_api.get_v2ray_path(), "v2ray", "-config=" .. config_file)
--- a/package/lienol/luci-app-passwall/luasrc/model/cbi/passwall/server/api/shadowsocks.lua
+++ b/package/lienol/luci-app-passwall/luasrc/model/cbi/passwall/server/api/shadowsocks.lua
@ -1,4 +1,4 @@
-module("luci.model.cbi.passwall.server.api.ssr", package.seeall)
+module("luci.model.cbi.passwall.server.api.shadowsocks", package.seeall)
 function gen_config(user)
    local config = {}
    config.server = {"[::0]", "0.0.0.0"}
@ -7,9 +7,13 @@ function gen_config(user)
    config.timeout = tonumber(user.timeout)
    config.fast_open = (user.tcp_fast_open and user.tcp_fast_open == "true") and true or false
    config.method = user.method
-    config.protocol = user.protocol
-    config.protocol_param = user.protocol_param
-    config.obfs = user.obfs
-    config.obfs_param = user.obfs_param
+
+    if user.type == "SSR" then
+        config.protocol = user.protocol
+        config.protocol_param = user.protocol_param
+        config.obfs = user.obfs
+        config.obfs_param = user.obfs_param
+    end
+
    return config
 end
--- a/package/lienol/luci-app-passwall/luasrc/model/cbi/passwall/server/index.lua
+++ b/package/lienol/luci-app-passwall/luasrc/model/cbi/passwall/server/index.lua
@ -14,6 +14,7 @@ e.rmempty = false
 t = m:section(TypedSection, "user", translate("Users Manager"))
 t.anonymous = true
 t.addremove = true
+t.sortable = true
 t.template = "cbi/tblsection"
 t.extedit = d.build_url("admin", "services", "passwall", "server_user", "%s")
 function t.create(e, t)
--- a/package/lienol/luci-app-passwall/luasrc/model/cbi/passwall/server/user.lua
+++ b/package/lienol/luci-app-passwall/luasrc/model/cbi/passwall/server/user.lua
@ -2,6 +2,15 @@ local d = require "luci.dispatcher"
 local uci = require"luci.model.uci".cursor()
 local api = require "luci.model.cbi.passwall.api.api"

+local ss_encrypt_method_list = {
+    "rc4-md5", "aes-128-cfb", "aes-192-cfb", "aes-256-cfb", "aes-128-ctr",
+    "aes-192-ctr", "aes-256-ctr", "bf-cfb", "camellia-128-cfb",
+    "camellia-192-cfb", "camellia-256-cfb", "salsa20", "chacha20",
+    "chacha20-ietf", -- aead
+    "aes-128-gcm", "aes-192-gcm", "aes-256-gcm", "chacha20-ietf-poly1305",
+    "xchacha20-ietf-poly1305"
+}
+
 local ssr_encrypt_method_list = {
    "none", "table", "rc2-cfb", "rc4", "rc4-md5", "rc4-md5-6", "aes-128-cfb",
    "aes-192-cfb", "aes-256-cfb", "aes-128-ctr", "aes-192-ctr", "aes-256-ctr",
@ -60,6 +69,12 @@ remarks.default = translate("Remarks")
 remarks.rmempty = false

 type = s:option(ListValue, "type", translate("Type"))
+if api.is_finded("ssocksd") then
+    type:value("Socks", translate("Socks"))
+end
+if api.is_finded("ss-server") then
+    type:value("SS", translate("Shadowsocks"))
+end
 if api.is_finded("ssr-server") then
    type:value("SSR", translate("ShadowsocksR"))
 end
@ -91,7 +106,7 @@ protocol:value("mtproto", "MTProto")
 protocol:depends("type", "V2ray")

 -- Brook协议
-brook_protocol = s:option(ListValue, "brook_protocol", translate("Brook Protocol"))
+brook_protocol = s:option(ListValue, "brook_protocol", translate("Protocol"))
 brook_protocol:value("server", "Brook")
 brook_protocol:value("wsserver", "WebSocket")
 brook_protocol:depends("type", "Brook")
@ -112,9 +127,12 @@ port.rmempty = false
 username = s:option(Value, "username", translate("Username"))
 username:depends("protocol", "http")
 username:depends("protocol", "socks")
+username:depends("type", "Socks")

-password = s:option(Value, "password", translate("Password"), translate("The MTProto protocol must be 32 characters and can only contain characters from 0 to 9 and a to f."))
+password = s:option(Value, "password", translate("Password"))
 password.password = true
+password:depends("type", "Socks")
+password:depends("type", "SS")
 password:depends("type", "SSR")
 password:depends("type", "Brook")
 password:depends("type", "Trojan")
@ -122,12 +140,31 @@ password:depends("type", "Trojan-Plus")
 password:depends({ type = "V2ray", protocol = "http" })
 password:depends({ type = "V2ray", protocol = "socks" })
 password:depends({ type = "V2ray", protocol = "shadowsocks" })
-password:depends({ type = "V2ray", protocol = "mtproto" })
+
+mtproto_password = s:option(Value, "mtproto_password", translate("Password"), translate("The MTProto protocol must be 32 characters and can only contain characters from 0 to 9 and a to f."))
+mtproto_password:depends({ type = "V2ray", protocol = "mtproto" })
+mtproto_password.default = arg[1]
+function mtproto_password.cfgvalue(self, section)
+	return m:get(section, "password")
+end
+function mtproto_password.write(self, section, value)
+	m:set(section, "password", value)
+end

 decryption = s:option(Value, "decryption", translate("Encrypt Method"))
 decryption.default = "none"
 decryption:depends("protocol", "vless")

+ss_encrypt_method = s:option(ListValue, "ss_encrypt_method", translate("Encrypt Method"))
+for a, t in ipairs(ss_encrypt_method_list) do ss_encrypt_method:value(t) end
+ss_encrypt_method:depends("type", "SS")
+function ss_encrypt_method.cfgvalue(self, section)
+	return m:get(section, "method")
+end
+function ss_encrypt_method.write(self, section, value)
+	m:set(section, "method", value)
+end
+
 ssr_encrypt_method = s:option(ListValue, "ssr_encrypt_method", translate("Encrypt Method"))
 for a, t in ipairs(ssr_encrypt_method_list) do ssr_encrypt_method:value(t) end
 ssr_encrypt_method:depends("type", "SSR")
@ -188,11 +225,13 @@ obfs_param:depends("type", "SSR")
 timeout = s:option(Value, "timeout", translate("Connection Timeout"))
 timeout.datatype = "uinteger"
 timeout.default = 300
+timeout:depends("type", "SS")
 timeout:depends("type", "SSR")

 tcp_fast_open = s:option(ListValue, "tcp_fast_open", translate("TCP Fast Open"), translate("Need node support required"))
 tcp_fast_open:value("false")
 tcp_fast_open:value("true")
+tcp_fast_open:depends("type", "SS")
 tcp_fast_open:depends("type", "SSR")
 tcp_fast_open:depends("type", "Trojan")
 tcp_fast_open:depends("type", "Trojan-Plus")
--- a/package/network/services/openvpn/Makefile
+++ b/package/network/services/openvpn/Makefile
@ -10,7 +10,7 @@ include $(TOPDIR)/rules.mk
 PKG_NAME:=openvpn

 PKG_VERSION:=2.4.9
-PKG_RELEASE:=4
+PKG_RELEASE:=5

 PKG_SOURCE_URL:=\
 	https://build.openvpn.net/downloads/releases/ \
--- a/package/network/services/openvpn/files/openvpn.init
+++ b/package/network/services/openvpn/files/openvpn.init
@ -43,7 +43,7 @@ append_params() {
 		IFS="$LIST_SEP"
 		for v in $v; do
 			[ -n "$v" ] && [ "$p" != "push" ] && append_param "$s" "$p" && echo " $v" >> "/var/etc/openvpn-$s.conf"
-			[ -n "$v" ] && [ "$p" == "push" ] && append_param "$s" "$p" && echo " \"$v\"" >> "/var/etc/openvpn-$s.conf"
+			[ -n "$v" ] && [ "$p" = "push" ] && append_param "$s" "$p" && echo " \"$v\"" >> "/var/etc/openvpn-$s.conf"
 		done
 		unset IFS
 	done
--- a/package/network/services/wireguard/Makefile
+++ b/package/network/services/wireguard/Makefile
@ -11,12 +11,12 @@ include $(INCLUDE_DIR)/kernel.mk

 PKG_NAME:=wireguard

-PKG_VERSION:=1.0.20200729
+PKG_VERSION:=1.0.20200908
 PKG_RELEASE:=1

 PKG_SOURCE:=wireguard-linux-compat-$(PKG_VERSION).tar.xz
 PKG_SOURCE_URL:=https://git.zx2c4.com/wireguard-linux-compat/snapshot/
-PKG_HASH:=690c7d9e115e2ff27386811cb495c9784678f717c8d6fc4cc7469dce373f252e
+PKG_HASH:=ad33b2d2267a37e0f65c97e65e7d4d926d5aef7d530c251b63fbf919048eead9

 PKG_LICENSE:=GPL-2.0
 PKG_LICENSE_FILES:=COPYING
--- a/package/network/utils/rssileds/Makefile
+++ b/package/network/utils/rssileds/Makefile
@ -18,7 +18,7 @@ define Package/rssileds
  CATEGORY:=Network
  TITLE:=RSSI real-time LED indicator
  DEPENDS:=+libiwinfo +libnl-tiny +libubox +libuci
-  MAINTAINER:=Daniel Golle <dgolle@allnet.de>
+  MAINTAINER:=Daniel Golle <daniel@makrotopia.org>
 endef

 define Package/rssileds/description
--- a/package/network/utils/wireguard-tools/Makefile
+++ b/package/network/utils/wireguard-tools/Makefile
@ -11,12 +11,12 @@ include $(INCLUDE_DIR)/kernel.mk

 PKG_NAME:=wireguard-tools

-PKG_VERSION:=1.0.20200820
+PKG_VERSION:=1.0.20200827
 PKG_RELEASE:=2

 PKG_SOURCE:=wireguard-tools-$(PKG_VERSION).tar.xz
 PKG_SOURCE_URL:=https://git.zx2c4.com/wireguard-tools/snapshot/
-PKG_HASH:=7735a04c68fffb101a10a67e3bd97a171f2b8eb47e9ddce2be68eb6538b013d0
+PKG_HASH:=51bc85e33a5b3cf353786ae64b0f1216d7a871447f058b6137f793eb0f53b7fd

 PKG_LICENSE:=GPL-2.0
 PKG_LICENSE_FILES:=COPYING
--- a/package/ntlf9t/luci-app-cifs/Makefile
+++ b/package/ntlf9t/luci-app-cifs/Makefile
@ -5,7 +5,7 @@
 #
 include $(TOPDIR)/rules.mk

-LUCI_TITLE:=luci-app-luci
+LUCI_TITLE:=luci-app-cifs
 LUCI_DEPENDS:=+kmod-fs-cifs +kmod-nls-utf8 +kmod-nls-base +kmod-crypto-hmac +kmod-crypto-md5 +kmod-crypto-misc +cifsmount
 LUCI_PKGARCH:=all
 PKG_VERSION:=1.0
--- a/scripts/bundle-libraries.sh
+++ b/scripts/bundle-libraries.sh
@ -186,7 +186,7 @@ for BIN in "$@"; do
 			#!/usr/bin/env bash
 			dir="\$(dirname "\$0")"
 			export RUNAS_ARG0="\$0"
-			export LD_PRELOAD="\$dir/${REL:+$REL/}runas.so"
+			export LD_PRELOAD="\${LD_PRELOAD:+\$LD_PRELOAD:}\$dir/${REL:+$REL/}runas.so"
 			exec "\$dir/${REL:+$REL/}$LDSO" --library-path "\$dir/${REL:+$REL/}" "\$dir/.${BIN##*/}.bin" "\$@"
 		EOF

--- a/target/linux/generic/hack-4.14/998-usb-serial-option-add-u9300.patch
+++ b/target/linux/generic/hack-4.14/998-usb-serial-option-add-u9300.patch
--- a/target/linux/generic/hack-4.19/998-usb-serial-option-add-u9300.patch
+++ b/target/linux/generic/hack-4.19/998-usb-serial-option-add-u9300.patch
--- a/target/linux/ipq806x/patches-4.14/995-4g-add-u9300-driver.patch
+++ b/target/linux/ipq806x/patches-4.14/995-4g-add-u9300-driver.patch
@ -1,46 +0,0 @@
--- a/drivers/net/usb/qmi_wwan.c
-+++ b/drivers/net/usb/qmi_wwan.c
-@@ -1292,6 +1292,7 @@ static const struct usb_device_id produc
- 	{QMI_FIXED_INTF(0x03f0, 0x9d1d, 1)},	/* HP lt4120 Snapdragon X5 LTE */
- 	{QMI_FIXED_INTF(0x22de, 0x9061, 3)},	/* WeTelecom WPD-600N */
- 	{QMI_QUIRK_SET_DTR(0x1e0e, 0x9001, 5)},	/* SIMCom 7100E, 7230E, 7600E ++ */
-+	{QMI_FIXED_INTF(0x1c9e, 0x9b3c, 4)},	/* LONGSUNG_U9300 */
- 	{QMI_QUIRK_SET_DTR(0x2c7c, 0x0121, 4)},	/* Quectel EC21 Mini PCIe */
- 	{QMI_QUIRK_SET_DTR(0x2c7c, 0x0191, 4)},	/* Quectel EG91 */
- 	{QMI_QUIRK_SET_DTR(0x2c7c, 0x0195, 4)},	/* Quectel EG95 */
--- a/drivers/usb/serial/option.c
-+++ b/drivers/usb/serial/option.c
-@@ -385,6 +385,7 @@ static void option_instat_callback(struc
-  * Mobidata, etc sell under their own brand names.
-  */
- #define LONGCHEER_VENDOR_ID			0x1c9e
-+#define LONGSUNG_U9300_PRODUCT_ID		0x9b3c
- 
- /* 4G Systems products */
- /* This is the 4G XS Stick W14 a.k.a. Mobilcom Debitel Surf-Stick *
-@@ -575,6 +576,16 @@ static void option_instat_callback(struc
- /* Device needs ZLP */
- #define ZLP		BIT(17)
- 
-+struct option_blacklist_info {
-+	/* bitfield of interface numbers for OPTION_BLACKLIST_SENDSETUP */
-+	const unsigned long sendsetup;
-+	/* bitfield of interface numbers for OPTION_BLACKLIST_RESERVED_IF */
-+	const unsigned long reserved;
-+};
-+
-+static const struct option_blacklist_info longsung_u9300_blacklist = {
-+	.reserved = BIT(4),
-+};
- 
- static const struct usb_device_id option_ids[] = {
- 	{ USB_DEVICE(OPTION_VENDOR_ID, OPTION_PRODUCT_COLT) },
-@@ -609,6 +620,8 @@ static const struct usb_device_id option
- 	{ USB_DEVICE(QUANTA_VENDOR_ID, QUANTA_PRODUCT_GLE) },
- 	{ USB_DEVICE(QUANTA_VENDOR_ID, 0xea42),
- 	  .driver_info = RSVD(4) },
-+	{ USB_DEVICE(LONGCHEER_VENDOR_ID,LONGSUNG_U9300_PRODUCT_ID),
-+	  .driver_info = (kernel_ulong_t)&longsung_u9300_blacklist},
- 	{ USB_DEVICE_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, 0x1c05, USB_CLASS_COMM, 0x02, 0xff) },
- 	{ USB_DEVICE_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, 0x1c1f, USB_CLASS_COMM, 0x02, 0xff) },
- 	{ USB_DEVICE_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, 0x1c23, USB_CLASS_COMM, 0x02, 0xff) },
--- a/target/linux/ipq806x/patches-4.19/995-4g-add-u9300-driver.patch
+++ b/target/linux/ipq806x/patches-4.19/995-4g-add-u9300-driver.patch
@ -1,46 +0,0 @@
--- a/drivers/net/usb/qmi_wwan.c
-+++ b/drivers/net/usb/qmi_wwan.c
-@@ -1303,6 +1303,7 @@ static const struct usb_device_id produc
- 	{QMI_FIXED_INTF(0x03f0, 0x9d1d, 1)},	/* HP lt4120 Snapdragon X5 LTE */
- 	{QMI_FIXED_INTF(0x22de, 0x9061, 3)},	/* WeTelecom WPD-600N */
- 	{QMI_QUIRK_SET_DTR(0x1e0e, 0x9001, 5)},	/* SIMCom 7100E, 7230E, 7600E ++ */
-+	{QMI_FIXED_INTF(0x1c9e, 0x9b3c, 4)},	/* LONGSUNG_U9300 */
- 	{QMI_QUIRK_SET_DTR(0x2c7c, 0x0121, 4)},	/* Quectel EC21 Mini PCIe */
- 	{QMI_QUIRK_SET_DTR(0x2c7c, 0x0191, 4)},	/* Quectel EG91 */
- 	{QMI_QUIRK_SET_DTR(0x2c7c, 0x0195, 4)},	/* Quectel EG95 */
--- a/drivers/usb/serial/option.c
-+++ b/drivers/usb/serial/option.c
-@@ -382,6 +382,7 @@ static void option_instat_callback(struc
-  * Mobidata, etc sell under their own brand names.
-  */
- #define LONGCHEER_VENDOR_ID			0x1c9e
-+#define LONGSUNG_U9300_PRODUCT_ID		0x9b3c
- 
- /* 4G Systems products */
- /* This is the 4G XS Stick W14 a.k.a. Mobilcom Debitel Surf-Stick *
-@@ -572,6 +573,16 @@ static void option_instat_callback(struc
- /* Device needs ZLP */
- #define ZLP		BIT(17)
- 
-+struct option_blacklist_info {
-+	/* bitfield of interface numbers for OPTION_BLACKLIST_SENDSETUP */
-+	const unsigned long sendsetup;
-+	/* bitfield of interface numbers for OPTION_BLACKLIST_RESERVED_IF */
-+	const unsigned long reserved;
-+};
-+
-+static const struct option_blacklist_info longsung_u9300_blacklist = {
-+	.reserved = BIT(4),
-+};
- 
- static const struct usb_device_id option_ids[] = {
- 	{ USB_DEVICE(OPTION_VENDOR_ID, OPTION_PRODUCT_COLT) },
-@@ -606,6 +617,8 @@ static const struct usb_device_id option
- 	{ USB_DEVICE(QUANTA_VENDOR_ID, QUANTA_PRODUCT_GLE) },
- 	{ USB_DEVICE(QUANTA_VENDOR_ID, 0xea42),
- 	  .driver_info = RSVD(4) },
-+	{ USB_DEVICE(LONGCHEER_VENDOR_ID,LONGSUNG_U9300_PRODUCT_ID),
-+	  .driver_info = (kernel_ulong_t)&longsung_u9300_blacklist},
- 	{ USB_DEVICE_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, 0x1c05, USB_CLASS_COMM, 0x02, 0xff) },
- 	{ USB_DEVICE_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, 0x1c1f, USB_CLASS_COMM, 0x02, 0xff) },
- 	{ USB_DEVICE_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, 0x1c23, USB_CLASS_COMM, 0x02, 0xff) },
--- a/target/linux/ramips/files/drivers/net/ethernet/ralink/mtk_eth_soc.c
+++ b/target/linux/ramips/files/drivers/net/ethernet/ralink/mtk_eth_soc.c
@ -898,6 +898,8 @@ static int fe_poll_rx(struct napi_struct *napi, int budget,
 	struct fe_rx_dma *rxd, trxd;
 	int done = 0, pad;

+	fe_reg_w32(rx_intr, FE_REG_FE_INT_STATUS);
+
 	if (netdev->features & NETIF_F_RXCSUM)
 		checksum_bit = soc->checksum_bit;
 	else
@ -990,9 +992,6 @@ release_desc:
 		done++;
 	}

-	if (done < budget)
-		fe_reg_w32(rx_intr, FE_REG_FE_INT_STATUS);
-
 	return done;
 }

@ -1007,6 +1006,8 @@ static int fe_poll_tx(struct fe_priv *priv, int budget, u32 tx_intr,
 	u32 idx, hwidx;
 	struct fe_tx_ring *ring = &priv->tx_ring;

+	fe_reg_w32(tx_intr, FE_REG_FE_INT_STATUS);
+
 	idx = ring->tx_free_idx;
 	hwidx = fe_reg_r32(FE_REG_TX_DTX_IDX0);

@ -1030,9 +1031,7 @@ static int fe_poll_tx(struct fe_priv *priv, int budget, u32 tx_intr,
 	if (idx == hwidx) {
 		/* read hw index again make sure no new tx packet */
 		hwidx = fe_reg_r32(FE_REG_TX_DTX_IDX0);
-		if (idx == hwidx)
-			fe_reg_w32(tx_intr, FE_REG_FE_INT_STATUS);
-		else
+		if (idx != hwidx)
 			*tx_again = 1;
 	} else {
 		*tx_again = 1;
--- a/tools/fakeroot/Makefile
+++ b/tools/fakeroot/Makefile
@ -10,6 +10,8 @@ PKG_VERSION:=1.24
 PKG_SOURCE:=$(PKG_NAME)_$(PKG_VERSION).orig.tar.gz
 PKG_SOURCE_URL:=http://deb.debian.org/debian/pool/main/f/fakeroot
 PKG_HASH:=2e045b3160370b8ab4d44d1f8d267e5d1d555f1bb522d650e7167b09477266ed
+PKG_LICENSE:=GPL-3.0-or-later
+PKG_LICENSE_FILES:=COPYING

 include $(INCLUDE_DIR)/host-build.mk

@ -17,4 +19,7 @@ HOST_CONFIGURE_VARS += \
 	ac_cv_header_sys_capability_h=no \
 	ac_cv_func_capset=no

+HOST_CONFIGURE_ARGS += \
+	--with-ipc=tcp
+
 $(eval $(call HostBuild))