From 421bb0cc38cefad00ad47b3d777be2440931dc68 Mon Sep 17 00:00:00 2001 From: Teaffanie <70811472+Teaffanie@users.noreply.github.com> Date: Sun, 6 Sep 2020 21:08:00 +0800 Subject: [PATCH 01/12] luci-app-passwall: sync with upstream source --- .../model/cbi/passwall/server/api/v2ray.lua | 2 +- .../luasrc/model/cbi/passwall/server/user.lua | 15 +++++++-------- .../lienol/luci-app-passwall/po/zh-cn/passwall.po | 6 +++--- 3 files changed, 11 insertions(+), 12 deletions(-) diff --git a/package/lienol/luci-app-passwall/luasrc/model/cbi/passwall/server/api/v2ray.lua b/package/lienol/luci-app-passwall/luasrc/model/cbi/passwall/server/api/v2ray.lua index fa149de89d..924512ebfc 100644 --- a/package/lienol/luci-app-passwall/luasrc/model/cbi/passwall/server/api/v2ray.lua +++ b/package/lienol/luci-app-passwall/luasrc/model/cbi/passwall/server/api/v2ray.lua @@ -45,7 +45,7 @@ function gen_config(user) } elseif user.protocol == "shadowsocks" then settings = { - method = user.v_ss_encrypt_method, + method = user.method, password = user.password, level = tonumber(user.level) or 1, network = user.ss_network or "TCP,UDP", diff --git 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 index 1b29fc9471..50aa25f275 100644 --- 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 @@ -113,7 +113,7 @@ username = s:option(Value, "username", translate("Username")) username:depends("protocol", "http") username:depends("protocol", "socks") -password = s:option(Value, "password", translate("Password")) +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.password = true password:depends("type", "SSR") password:depends("type", "Brook") @@ -404,15 +404,14 @@ quic_guise:depends("transport", "quic") fallback = s:option(Flag, "fallback", translate("Fallback")) fallback:depends({ type = "V2ray", protocol = "vless", transport = "tcp", stream_security = "tls" }) -fallback_addr = s:option(Value, "fallback_addr", "Fallback" .. translate("Address (Support Domain Name)")) -fallback_addr:depends("fallback", "1") +fallback_alpn = s:option(Value, "fallback_alpn", "Fallback alpn") +fallback_alpn:depends("fallback", "1") -fallback_port = s:option(Value, "fallback_port", "Fallback" .. translate("Port")) -fallback_port.datatype = "port" -fallback_port:depends("fallback", "1") +fallback_path = s:option(Value, "fallback_path", "Fallback path") +fallback_path:depends("fallback", "1") -fallback_unix = s:option(Value, "fallback_unix", "Fallback UNIX domain socket", translate("UNIX domain socket, absolute path, you can add @ at the beginning to represent abstract, and it is empty by default. If this value is filled in, addr and port will be ignored.")) -fallback_unix:depends("fallback", "1") +fallback_dest = s:option(Value, "fallback_dest", "Fallback dest") +fallback_dest:depends("fallback", "1") fallback_xver = s:option(Value, "fallback_xver", "Fallback xver") fallback_xver.default = 0 diff --git a/package/lienol/luci-app-passwall/po/zh-cn/passwall.po b/package/lienol/luci-app-passwall/po/zh-cn/passwall.po index d5d4cf007f..ccccdbb0ef 100644 --- a/package/lienol/luci-app-passwall/po/zh-cn/passwall.po +++ b/package/lienol/luci-app-passwall/po/zh-cn/passwall.po @@ -949,9 +949,6 @@ msgstr "
none：默认值，不进行伪装，发送的数据是没有特 msgid "A legal file path. This file must not exist before running V2Ray." msgstr "一个合法的文件路径。在运行 V2Ray 之前，这个文件必须不存在。" -msgid "UNIX domain socket, absolute path, you can add @ at the beginning to represent abstract, and it is empty by default. If this value is filled in, addr and port will be ignored." -msgstr "UNIX domain socket，绝对路径，可在开头加 @ 代表 abstract，默认为空。若填写了该值，addr 和 port 将被忽略。" - msgid "TCP Open Socks" msgstr "开启Socks" @@ -997,6 +994,9 @@ msgstr "隐藏菜单方法，地址栏输入例：" msgid "After the hidden to the display, input example in the address bar:" msgstr "当你隐藏后想再次显示，地址栏输入例：" +msgid "The MTProto protocol must be 32 characters and can only contain characters from 0 to 9 and a to f." +msgstr "MTProto 协议必须为 32 个字符，仅可包含 0 到 9 和 a 到 f 之间的字符。" + msgid "When OTA is enabled, a connection that is not OTA enabled is rejected. This option is invalid when using AEAD encryption." msgstr "开启 OTA 后，将拒绝未启用 OTA 的连接。当使用 AEAD 加密时，该选项无效。" From c6d1dc22f6ab8b3a83d9aeab8a2fe75fd4e93435 Mon Sep 17 00:00:00 2001 From: Hauke Mehrtens Date: Mon, 24 Aug 2020 12:04:15 +0200 Subject: [PATCH 02/12] jansson: Update to version 2.13.1 This also sets the ABI_VERSION as this is a versioned shared library. The ipk sizes for mips_24Kc change like this: old: jansson_2.12-1_mips_24kc.ipk 18.692 new: jansson4_2.13.1-1_mips_24kc.ipk 19.171 Signed-off-by: Hauke Mehrtens --- package/libs/jansson/Makefile | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/package/libs/jansson/Makefile b/package/libs/jansson/Makefile index 30278ca02e..247be3401b 100644 --- a/package/libs/jansson/Makefile +++ b/package/libs/jansson/Makefile @@ -8,14 +8,14 @@ include $(TOPDIR)/rules.mk PKG_NAME:=jansson -PKG_VERSION:=2.12 +PKG_VERSION:=2.13.1 PKG_RELEASE:=1 PKG_LICENSE:=MIT PKG_LICENSE_FILES:=LICENSE PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 PKG_SOURCE_URL:=http://www.digip.org/jansson/releases/ -PKG_HASH:=645d72cc5dbebd4df608d33988e55aa42a7661039e19a379fcbe5c79d1aee1d2 +PKG_HASH:=ee90a0f879d2b7b7159124ff22b937a2a9a8c36d3bb65d1da7dd3f04370a10bd include $(INCLUDE_DIR)/package.mk include $(INCLUDE_DIR)/cmake.mk @@ -32,6 +32,7 @@ define Package/jansson CATEGORY:=Libraries TITLE:=Jansson library URL:=http://www.digip.org/jansson/ + ABI_VERSION:=4 endef define Package/jansson/description From 6274bc8f27fefa601918142b539817f2dad73ee5 Mon Sep 17 00:00:00 2001 From: Hauke Mehrtens Date: Mon, 24 Aug 2020 12:04:38 +0200 Subject: [PATCH 03/12] libnftnl: Update to version 1.1.7 The ipk sizes for mips_24Kc change like this: old: libnftnl12_1.1.5-1_mips_24kc.ipk 46.252 new: libnftnl12_1.1.7-1_mips_24kc.ipk 47.459 Signed-off-by: Hauke Mehrtens --- package/libs/libnftnl/Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package/libs/libnftnl/Makefile b/package/libs/libnftnl/Makefile index 74771fe678..3d8d68ad5f 100644 --- a/package/libs/libnftnl/Makefile +++ b/package/libs/libnftnl/Makefile @@ -8,12 +8,12 @@ include $(TOPDIR)/rules.mk PKG_NAME:=libnftnl -PKG_VERSION:=1.1.5 +PKG_VERSION:=1.1.7 PKG_RELEASE:=1 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 PKG_SOURCE_URL:=https://netfilter.org/projects/$(PKG_NAME)/files -PKG_HASH:=66de4d05227c0a1a731c369b193010d18a05b1185c2735211e0ecf658eeb14f3 +PKG_HASH:=20dbc13f11004aea2c9e479cfb90359cb11fe3446c3140811c18e4ec1648ed8f PKG_MAINTAINER:=Steven Barth PKG_LICENSE:=GPL-2.0+ From 56dae733eddbfa609b471013c29d0bcf95c39399 Mon Sep 17 00:00:00 2001 From: Kevin Darbyshire-Bryant Date: Wed, 25 Mar 2020 09:13:46 +0000 Subject: [PATCH 04/12] nftables: implement no/json variants Replace the build time choice of json support with a package based choice. Users requiring a json aware version of 'nft' may now install nftables-json. The default choice to fulfill the 'nftables' package dependency is 'nftables-nojson' Signed-off-by: Kevin Darbyshire-Bryant --- package/network/utils/nftables/Makefile | 40 ++++++++++++++++--------- 1 file changed, 26 insertions(+), 14 deletions(-) diff --git a/package/network/utils/nftables/Makefile b/package/network/utils/nftables/Makefile index 3c9c827a99..67906f8b7d 100644 --- a/package/network/utils/nftables/Makefile +++ b/package/network/utils/nftables/Makefile @@ -13,7 +13,7 @@ PKG_RELEASE:=1 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 PKG_SOURCE_URL:=https://netfilter.org/projects/$(PKG_NAME)/files PKG_HASH:=956b915ce2a7aeaff123e49006be7a0690a0964e96c062703181a36e2e5edb78 -PKG_MAINTAINER:=Steven Barth +PKG_MAINTAINER:= PKG_LICENSE:=GPL-2.0 PKG_FIXUP:=autoreconf @@ -28,33 +28,45 @@ CONFIGURE_ARGS += \ --disable-man-doc \ --with-mini-gmp \ --without-cli \ - --disable-python \ + --disable-python -define Package/nftables +define Package/nftables/Default SECTION:=net CATEGORY:=Network SUBMENU:=Firewall - TITLE:=nftables packet filtering userspace utility - DEPENDS:=+kmod-nft-core +libnftnl +PACKAGE_NFT_WITH_JSON:jansson + TITLE:=nftables userspace utility + DEPENDS:=+kmod-nft-core +libnftnl URL:=http://netfilter.org/projects/nftables/ + PROVIDES:=nftables endef -define Package/nftables/config - config PACKAGE_NFT_WITH_JSON - bool "Build nftables with json support" - depends on PACKAGE_nftables - default n +define Package/nftables-nojson + $(Package/nftables/Default) + TITLE+= no JSON support + VARIANT:=nojson + DEFAULT_VARIANT:=1 endef -ifeq ($(CONFIG_PACKAGE_NFT_WITH_JSON),y) -CONFIGURE_ARGS += --with-json +define Package/nftables-json + $(Package/nftables/Default) + TITLE+= with JSON support + VARIANT:=json + DEPENDS+=+jansson +endef + +ifeq ($(BUILD_VARIANT),json) + CONFIGURE_ARGS += --with-json endif -define Package/nftables/install +define Package/nftables/install/Default $(INSTALL_DIR) $(1)/usr/sbin $(CP) $(PKG_INSTALL_DIR)/usr/sbin/nft $(1)/usr/sbin/ $(INSTALL_DIR) $(1)/usr/lib $(CP) $(PKG_INSTALL_DIR)/usr/lib/*.so* $(1)/usr/lib/ endef -$(eval $(call BuildPackage,nftables)) +Package/nftables-nojson/install = $(Package/nftables/install/Default) +Package/nftables-json/install = $(Package/nftables/install/Default) + +$(eval $(call BuildPackage,nftables-nojson)) +$(eval $(call BuildPackage,nftables-json)) From 9dea3fb5831586536e35a9b7804e6bee68e0183d Mon Sep 17 00:00:00 2001 From: Hauke Mehrtens Date: Mon, 24 Aug 2020 12:04:58 +0200 Subject: [PATCH 05/12] nftables: Update to version 0.9.6 The ipk sizes for mips_24Kc change like this: old: nftables-json_0.9.3-1_mips_24kc.ipk 220.262 nftables-nojson_0.9.3-1_mips_24kc.ipk 192.937 new: nftables-json_0.9.6-1_mips_24kc.ipk 231.968 nftables-nojson_0.9.6-1_mips_24kc.ipk 204.731 Signed-off-by: Hauke Mehrtens --- package/network/utils/nftables/Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package/network/utils/nftables/Makefile b/package/network/utils/nftables/Makefile index 67906f8b7d..8f6e605715 100644 --- a/package/network/utils/nftables/Makefile +++ b/package/network/utils/nftables/Makefile @@ -7,12 +7,12 @@ include $(TOPDIR)/rules.mk PKG_NAME:=nftables -PKG_VERSION:=0.9.3 +PKG_VERSION:=0.9.6 PKG_RELEASE:=1 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 PKG_SOURCE_URL:=https://netfilter.org/projects/$(PKG_NAME)/files -PKG_HASH:=956b915ce2a7aeaff123e49006be7a0690a0964e96c062703181a36e2e5edb78 +PKG_HASH:=68d6fdfe8ab02303e6b1f13968a4022da5b0120110eaee3233d806857937b66e PKG_MAINTAINER:= PKG_LICENSE:=GPL-2.0 From 404f2dbe3889615fa4aac48e8960c9347d265296 Mon Sep 17 00:00:00 2001 From: Hauke Mehrtens Date: Tue, 1 Sep 2020 14:02:47 +0200 Subject: [PATCH 06/12] jansson: Activate link time optimization (LTO) The ipk sizes for mips_24Kc change like this: old: jansson4_2.13.1-1_mips_24kc.ipk 19.171 new: jansson4_2.13.1-2_mips_24kc.ipk 18.936 Signed-off-by: Hauke Mehrtens --- package/libs/jansson/Makefile | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/package/libs/jansson/Makefile b/package/libs/jansson/Makefile index 247be3401b..5799a362dd 100644 --- a/package/libs/jansson/Makefile +++ b/package/libs/jansson/Makefile @@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=jansson PKG_VERSION:=2.13.1 -PKG_RELEASE:=1 +PKG_RELEASE:=2 PKG_LICENSE:=MIT PKG_LICENSE_FILES:=LICENSE @@ -39,6 +39,9 @@ define Package/jansson/description Jansson is a C library for encoding, decoding and manipulating JSON data endef +TARGET_CFLAGS += -flto +TARGET_LDFLAGS += -flto + define Package/jansson/install $(INSTALL_DIR) $(1)/usr/lib $(CP) $(PKG_INSTALL_DIR)/usr/lib/libjansson*so* $(1)/usr/lib/ From 589752e7e1ddd30abc643ef01a98f260a21f8a5d Mon Sep 17 00:00:00 2001 From: Hauke Mehrtens Date: Tue, 1 Sep 2020 14:04:22 +0200 Subject: [PATCH 07/12] libnftnl: Activate link time optimization (LTO) The ipk sizes for mips_24Kc change like this: old: libnftnl12_1.1.7-1_mips_24kc.ipk 47.459 new: libnftnl12_1.1.7-2_mips_24kc.ipk 45.742 Signed-off-by: Hauke Mehrtens --- package/libs/libnftnl/Makefile | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/package/libs/libnftnl/Makefile b/package/libs/libnftnl/Makefile index 3d8d68ad5f..c56fb068ce 100644 --- a/package/libs/libnftnl/Makefile +++ b/package/libs/libnftnl/Makefile @@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=libnftnl PKG_VERSION:=1.1.7 -PKG_RELEASE:=1 +PKG_RELEASE:=2 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 PKG_SOURCE_URL:=https://netfilter.org/projects/$(PKG_NAME)/files @@ -39,7 +39,8 @@ define Package/libnftnl/description programming interface (API) to the in-kernel nf_tables subsystem. endef -TARGET_CFLAGS += $(FPIC) +TARGET_CFLAGS += $(FPIC) -flto +TARGET_LDFLAGS += -flto CONFIGURE_ARGS += \ --enable-static \ From 57d891adfdca5f2415b7714d2ff951a2441663b4 Mon Sep 17 00:00:00 2001 From: Hauke Mehrtens Date: Tue, 1 Sep 2020 14:05:12 +0200 Subject: [PATCH 08/12] nftables: Activate link time optimization (LTO) The ipk sizes for mips_24Kc change like this: old: nftables-json_0.9.6-1_mips_24kc.ipk 231.968 nftables-nojson_0.9.6-1_mips_24kc.ipk 204.731 new: nftables-json_0.9.6-2_mips_24kc.ipk 221.894 nftables-nojson_0.9.6-2_mips_24kc.ipk 193.932 Signed-off-by: Hauke Mehrtens --- package/network/utils/nftables/Makefile | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/package/network/utils/nftables/Makefile b/package/network/utils/nftables/Makefile index 8f6e605715..7830596e84 100644 --- a/package/network/utils/nftables/Makefile +++ b/package/network/utils/nftables/Makefile @@ -8,7 +8,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=nftables PKG_VERSION:=0.9.6 -PKG_RELEASE:=1 +PKG_RELEASE:=2 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 PKG_SOURCE_URL:=https://netfilter.org/projects/$(PKG_NAME)/files @@ -58,6 +58,9 @@ ifeq ($(BUILD_VARIANT),json) CONFIGURE_ARGS += --with-json endif +TARGET_CFLAGS += -flto +TARGET_LDFLAGS += -flto + define Package/nftables/install/Default $(INSTALL_DIR) $(1)/usr/sbin $(CP) $(PKG_INSTALL_DIR)/usr/sbin/nft $(1)/usr/sbin/ From 844db85a1715cb1034cb37ae3b2d02cfde4dc092 Mon Sep 17 00:00:00 2001 From: Hauke Mehrtens Date: Tue, 1 Sep 2020 14:50:52 +0200 Subject: [PATCH 09/12] wolfssl: Activate link time optimization (LTO) The ipk sizes for mips_24Kc change like this: old: libwolfssl24_4.5.0-stable-1_mips_24kc.ipk 391.545 new: libwolfssl24_4.5.0-stable-2_mips_24kc.ipk 387.439 Signed-off-by: Hauke Mehrtens --- package/libs/wolfssl/Makefile | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/package/libs/wolfssl/Makefile b/package/libs/wolfssl/Makefile index 1fcca9fc5f..dc8ca2b262 100644 --- a/package/libs/wolfssl/Makefile +++ b/package/libs/wolfssl/Makefile @@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=wolfssl PKG_VERSION:=4.5.0-stable -PKG_RELEASE:=1 +PKG_RELEASE:=2 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=https://github.com/wolfSSL/wolfssl/archive/v$(PKG_VERSION) @@ -56,7 +56,8 @@ define Package/libwolfssl/config source "$(SOURCE)/Config.in" endef -TARGET_CFLAGS += $(FPIC) -DFP_MAX_BITS=8192 -fomit-frame-pointer +TARGET_CFLAGS += $(FPIC) -DFP_MAX_BITS=8192 -fomit-frame-pointer -flto +TARGET_LDFLAGS += -flto # --enable-stunnel needed for OpenSSL API compatibility bits CONFIGURE_ARGS += \ From 191f776b6ade0ec619a8b812b371891190bf8c2a Mon Sep 17 00:00:00 2001 From: Rosen Penev Date: Tue, 1 Sep 2020 15:37:03 -0700 Subject: [PATCH 10/12] util-linux: Fix build when libmagic is present When the libmagic from the file package in the packages feed was also compiled and provided its libmagic.so file, util-linux tried to link against it. Avoid this by explicitly disable libmagic support. This fixes the following build error: Package more is missing dependencies for the following libraries: libmagic.so.1 Fixes: 36d9ed360a34 ("util-linux: update to 2.36") Acked-by: Sebastian Kemper Signed-off-by: Rosen Penev [Add commit description] Signed-off-by: Hauke Mehrtens --- package/utils/util-linux/Makefile | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/package/utils/util-linux/Makefile b/package/utils/util-linux/Makefile index 0fc9819c58..05ceaa413e 100644 --- a/package/utils/util-linux/Makefile +++ b/package/utils/util-linux/Makefile @@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=util-linux PKG_VERSION:=2.36 -PKG_RELEASE:=1 +PKG_RELEASE:=2 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz PKG_SOURCE_URL:=@KERNEL/linux/utils/$(PKG_NAME)/v2.36 @@ -526,6 +526,7 @@ CONFIGURE_ARGS += \ --without-python \ --without-udev \ --without-readline \ + --without-libmagic \ --with-ncursesw TARGET_CFLAGS += $(FPIC) -std=gnu99 From d49243c54a6f89e813d49935cadb1f712c71fb69 Mon Sep 17 00:00:00 2001 From: Paul Spooren Date: Tue, 1 Sep 2020 09:13:28 -1000 Subject: [PATCH 11/12] dropbear: Enable Ed25519 for normal devices The Ed25519 key pairs are much shorter than RSA pairs and are supported by default in OpenSSH. Looking at websites explaining how to create new SSH keys, many suggest using Ed25519 rather than RSA, however consider the former as not yet widely established. OpenWrt likely has a positive influence on that development. As enabling Ed25519 is a compile time option, it is currently not possible to install the feature via `opkg` nor select that option in an ImageBuilder. Due to the size impact of **12kB** the option should only be enabled for devices with `!SMALL_FLASH`. This approach seems cleaner than splitting `dropbear` into two packages like `dropbear` and `dropbear-ed25519`. Signed-off-by: Paul Spooren --- package/network/services/dropbear/Config.in | 2 +- package/network/services/dropbear/Makefile | 5 +++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/package/network/services/dropbear/Config.in b/package/network/services/dropbear/Config.in index 108b80376b..6aa5a7e4e1 100644 --- a/package/network/services/dropbear/Config.in +++ b/package/network/services/dropbear/Config.in @@ -51,7 +51,7 @@ config DROPBEAR_ECC_FULL config DROPBEAR_ED25519 bool "Ed25519 support" - default n + default y if !SMALL_FLASH help This enables the following public key algorithm: ssh-ed25519 diff --git a/package/network/services/dropbear/Makefile b/package/network/services/dropbear/Makefile index 1cda98bf7e..6c97d3e77b 100644 --- a/package/network/services/dropbear/Makefile +++ b/package/network/services/dropbear/Makefile @@ -1,5 +1,5 @@ # -# Copyright (C) 2006-2016 OpenWrt.org +# Copyright (C) 2006-2020 OpenWrt.org # # This is free software, licensed under the GNU General Public License v2. # See /LICENSE for more information. @@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=dropbear PKG_VERSION:=2020.80 -PKG_RELEASE:=2 +PKG_RELEASE:=3 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 PKG_SOURCE_URL:= \ @@ -25,6 +25,7 @@ PKG_BUILD_PARALLEL:=1 PKG_ASLR_PIE_REGULAR:=1 PKG_USE_MIPS16:=0 PKG_FIXUP:=autoreconf +PKG_FLAGS:=nonshared PKG_CONFIG_DEPENDS:= \ CONFIG_TARGET_INIT_PATH CONFIG_DROPBEAR_ECC CONFIG_DROPBEAR_ECC_FULL \ From 35be30e434a2a5634fa33a76ac946247e9d4b682 Mon Sep 17 00:00:00 2001 From: AmadeusGhost <42570690+AmadeusGhost@users.noreply.github.com> Date: Mon, 24 Aug 2020 17:30:03 +0800 Subject: [PATCH 12/12] nft-qos: adjust dependencies --- package/lean/nft-qos/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/lean/nft-qos/Makefile b/package/lean/nft-qos/Makefile index 78e0ec2b95..996f8bed39 100644 --- a/package/lean/nft-qos/Makefile +++ b/package/lean/nft-qos/Makefile @@ -21,7 +21,7 @@ include $(INCLUDE_DIR)/package.mk define Package/nft-qos SECTION:=utils CATEGORY:=Base system - DEPENDS:=+nftables +kmod-nft-netdev +kmod-nft-bridge + DEPENDS:=+nftables-nojson +kmod-nft-netdev +kmod-nft-bridge TITLE:=QoS scripts over nftables PKGARCH:=all endef