From a560911888c9aa23a36b9aacf4c74615cd6ee066 Mon Sep 17 00:00:00 2001 From: CN_SZTL Date: Sun, 10 Jan 2021 00:12:43 +0800 Subject: [PATCH 1/4] kernel: bump to 4.9.250, 4.14.214, 4.19.166 Refreshed all patches. Signed-off-by: CN_SZTL --- include/kernel-version.mk | 12 ++++++------ .../patches-4.9/910-unaligned_access_hacks.patch | 4 ++-- ...nd-Add-initial-support-for-Toshiba-TC58CVG2.patch | 2 +- ...inand-add-support-for-GigaDevice-GD5FxGQ4xA.patch | 2 +- ...spinand-Add-support-for-two-byte-device-IDs.patch | 2 +- ...nd-Add-initial-support-for-Paragon-PN26G0xA.patch | 2 +- .../linux/generic/hack-4.14/204-module_strip.patch | 4 ++-- target/linux/generic/hack-4.9/204-module_strip.patch | 4 ++-- .../0303-mtd-spinand-disable-on-die-ECC.patch | 4 ++-- .../patches-4.14/105-mt7621-memory-detect.patch | 2 +- 10 files changed, 19 insertions(+), 19 deletions(-) diff --git a/include/kernel-version.mk b/include/kernel-version.mk index 0411c6b4ac..7ba9e10c43 100644 --- a/include/kernel-version.mk +++ b/include/kernel-version.mk @@ -6,13 +6,13 @@ ifdef CONFIG_TESTING_KERNEL KERNEL_PATCHVER:=$(KERNEL_TESTING_PATCHVER) endif -LINUX_VERSION-4.9 = .249 -LINUX_VERSION-4.14 = .213 -LINUX_VERSION-4.19 = .165 +LINUX_VERSION-4.9 = .250 +LINUX_VERSION-4.14 = .214 +LINUX_VERSION-4.19 = .166 -LINUX_KERNEL_HASH-4.9.249 = b1f38696ff5bce89e1d8248126aa2a8ce5b19100efdd68f1d335a9f736e04c4e -LINUX_KERNEL_HASH-4.14.213 = fd7bcedb79feb1378b89b257e68bfb86cb0aeb23380808c6a7e84a12e8ec2a1d -LINUX_KERNEL_HASH-4.19.165 = a1c05649b0f28d041c34d09d710d2d18f83d42fea4eb90569320d216d4e4e2d0 +LINUX_KERNEL_HASH-4.9.250 = 9ebdbf45d83efc5ee096e98a9f0b0383ade1ad01645a25a70e6188285aff7197 +LINUX_KERNEL_HASH-4.14.214 = f54296216ace09a1bf81efaa9dbbd4ebbe8631dbf22df9c6f286157db827391e +LINUX_KERNEL_HASH-4.19.166 = b98ef209321a4e39ce98ca6b8745a2268bdd927fd74e4e2c50bc68d9a637880e remove_uri_prefix=$(subst git://,,$(subst http://,,$(subst https://,,$(1)))) sanitize_uri=$(call qstrip,$(subst @,_,$(subst :,_,$(subst .,_,$(subst -,_,$(subst /,_,$(1))))))) diff --git a/target/linux/ar71xx/patches-4.9/910-unaligned_access_hacks.patch b/target/linux/ar71xx/patches-4.9/910-unaligned_access_hacks.patch index bce80441fc..efd7f12a1f 100644 --- a/target/linux/ar71xx/patches-4.9/910-unaligned_access_hacks.patch +++ b/target/linux/ar71xx/patches-4.9/910-unaligned_access_hacks.patch @@ -241,7 +241,7 @@ */ --- a/net/ipv6/datagram.c +++ b/net/ipv6/datagram.c -@@ -472,7 +472,7 @@ int ipv6_recv_error(struct sock *sk, str +@@ -485,7 +485,7 @@ int ipv6_recv_error(struct sock *sk, str ipv6_iface_scope_id(&sin->sin6_addr, IP6CB(skb)->iif); } else { @@ -250,7 +250,7 @@ &sin->sin6_addr); sin->sin6_scope_id = 0; } -@@ -816,12 +816,12 @@ int ip6_datagram_send_ctl(struct net *ne +@@ -829,12 +829,12 @@ int ip6_datagram_send_ctl(struct net *ne } if (fl6->flowlabel&IPV6_FLOWINFO_MASK) { diff --git a/target/linux/generic/backport-4.19/451-v5.0-mtd-spinand-Add-initial-support-for-Toshiba-TC58CVG2.patch b/target/linux/generic/backport-4.19/451-v5.0-mtd-spinand-Add-initial-support-for-Toshiba-TC58CVG2.patch index 6a988ec5b5..288fdbf267 100644 --- a/target/linux/generic/backport-4.19/451-v5.0-mtd-spinand-Add-initial-support-for-Toshiba-TC58CVG2.patch +++ b/target/linux/generic/backport-4.19/451-v5.0-mtd-spinand-Add-initial-support-for-Toshiba-TC58CVG2.patch @@ -28,7 +28,7 @@ Signed-off-by: Miquel Raynal obj-$(CONFIG_MTD_SPI_NAND) += spinand.o --- a/drivers/mtd/nand/spi/core.c +++ b/drivers/mtd/nand/spi/core.c -@@ -766,6 +766,7 @@ static const struct nand_ops spinand_ops +@@ -762,6 +762,7 @@ static const struct nand_ops spinand_ops static const struct spinand_manufacturer *spinand_manufacturers[] = { ¯onix_spinand_manufacturer, µn_spinand_manufacturer, diff --git a/target/linux/generic/backport-4.19/452-v5.0-mtd-spinand-add-support-for-GigaDevice-GD5FxGQ4xA.patch b/target/linux/generic/backport-4.19/452-v5.0-mtd-spinand-add-support-for-GigaDevice-GD5FxGQ4xA.patch index 003ff02711..d3ded95ccb 100644 --- a/target/linux/generic/backport-4.19/452-v5.0-mtd-spinand-add-support-for-GigaDevice-GD5FxGQ4xA.patch +++ b/target/linux/generic/backport-4.19/452-v5.0-mtd-spinand-add-support-for-GigaDevice-GD5FxGQ4xA.patch @@ -25,7 +25,7 @@ Signed-off-by: Miquel Raynal obj-$(CONFIG_MTD_SPI_NAND) += spinand.o --- a/drivers/mtd/nand/spi/core.c +++ b/drivers/mtd/nand/spi/core.c -@@ -764,6 +764,7 @@ static const struct nand_ops spinand_ops +@@ -760,6 +760,7 @@ static const struct nand_ops spinand_ops }; static const struct spinand_manufacturer *spinand_manufacturers[] = { diff --git a/target/linux/generic/backport-4.19/461-v5.3-mtd-spinand-Add-support-for-two-byte-device-IDs.patch b/target/linux/generic/backport-4.19/461-v5.3-mtd-spinand-Add-support-for-two-byte-device-IDs.patch index 209dc1d4a8..ee81f97f4e 100644 --- a/target/linux/generic/backport-4.19/461-v5.3-mtd-spinand-Add-support-for-two-byte-device-IDs.patch +++ b/target/linux/generic/backport-4.19/461-v5.3-mtd-spinand-Add-support-for-two-byte-device-IDs.patch @@ -17,7 +17,7 @@ Signed-off-by: Miquel Raynal --- a/drivers/mtd/nand/spi/core.c +++ b/drivers/mtd/nand/spi/core.c -@@ -855,7 +855,7 @@ spinand_select_op_variant(struct spinand +@@ -851,7 +851,7 @@ spinand_select_op_variant(struct spinand */ int spinand_match_and_init(struct spinand_device *spinand, const struct spinand_info *table, diff --git a/target/linux/generic/backport-4.19/463-v5.3-mtd-spinand-Add-initial-support-for-Paragon-PN26G0xA.patch b/target/linux/generic/backport-4.19/463-v5.3-mtd-spinand-Add-initial-support-for-Paragon-PN26G0xA.patch index 6e3ade3461..d30abdc143 100644 --- a/target/linux/generic/backport-4.19/463-v5.3-mtd-spinand-Add-initial-support-for-Paragon-PN26G0xA.patch +++ b/target/linux/generic/backport-4.19/463-v5.3-mtd-spinand-Add-initial-support-for-Paragon-PN26G0xA.patch @@ -33,7 +33,7 @@ ADOPTED FROM UPSTREAM due to upstream commit 377e517b5fa5 in Linux 5.2 obj-$(CONFIG_MTD_SPI_NAND) += spinand.o --- a/drivers/mtd/nand/spi/core.c +++ b/drivers/mtd/nand/spi/core.c -@@ -767,6 +767,7 @@ static const struct spinand_manufacturer +@@ -763,6 +763,7 @@ static const struct spinand_manufacturer &gigadevice_spinand_manufacturer, ¯onix_spinand_manufacturer, µn_spinand_manufacturer, diff --git a/target/linux/generic/hack-4.14/204-module_strip.patch b/target/linux/generic/hack-4.14/204-module_strip.patch index d93b545b7c..33b90a83fe 100644 --- a/target/linux/generic/hack-4.14/204-module_strip.patch +++ b/target/linux/generic/hack-4.14/204-module_strip.patch @@ -114,7 +114,7 @@ Signed-off-by: Felix Fietkau config MODULES_TREE_LOOKUP --- a/kernel/module.c +++ b/kernel/module.c -@@ -3024,9 +3024,11 @@ static struct module *setup_load_info(st +@@ -3022,9 +3022,11 @@ static struct module *setup_load_info(st static int check_modinfo(struct module *mod, struct load_info *info, int flags) { @@ -127,7 +127,7 @@ Signed-off-by: Felix Fietkau if (flags & MODULE_INIT_IGNORE_VERMAGIC) modmagic = NULL; -@@ -3047,6 +3049,7 @@ static int check_modinfo(struct module * +@@ -3045,6 +3047,7 @@ static int check_modinfo(struct module * mod->name); add_taint_module(mod, TAINT_OOT_MODULE, LOCKDEP_STILL_OK); } diff --git a/target/linux/generic/hack-4.9/204-module_strip.patch b/target/linux/generic/hack-4.9/204-module_strip.patch index 1fbadc766d..7e3dcbfb82 100644 --- a/target/linux/generic/hack-4.9/204-module_strip.patch +++ b/target/linux/generic/hack-4.9/204-module_strip.patch @@ -114,7 +114,7 @@ Signed-off-by: Felix Fietkau config MODULES_TREE_LOOKUP --- a/kernel/module.c +++ b/kernel/module.c -@@ -2970,9 +2970,11 @@ static struct module *setup_load_info(st +@@ -2968,9 +2968,11 @@ static struct module *setup_load_info(st static int check_modinfo(struct module *mod, struct load_info *info, int flags) { @@ -127,7 +127,7 @@ Signed-off-by: Felix Fietkau if (flags & MODULE_INIT_IGNORE_VERMAGIC) modmagic = NULL; -@@ -2993,6 +2995,7 @@ static int check_modinfo(struct module * +@@ -2991,6 +2993,7 @@ static int check_modinfo(struct module * mod->name); add_taint_module(mod, TAINT_OOT_MODULE, LOCKDEP_STILL_OK); } diff --git a/target/linux/mediatek/patches-4.19/0303-mtd-spinand-disable-on-die-ECC.patch b/target/linux/mediatek/patches-4.19/0303-mtd-spinand-disable-on-die-ECC.patch index 9082073ee5..cdf214688c 100644 --- a/target/linux/mediatek/patches-4.19/0303-mtd-spinand-disable-on-die-ECC.patch +++ b/target/linux/mediatek/patches-4.19/0303-mtd-spinand-disable-on-die-ECC.patch @@ -11,7 +11,7 @@ Signed-off-by: Xiangsheng Hou --- a/drivers/mtd/nand/spi/core.c +++ b/drivers/mtd/nand/spi/core.c -@@ -556,7 +556,7 @@ static int spinand_mtd_read(struct mtd_i +@@ -552,7 +552,7 @@ static int spinand_mtd_read(struct mtd_i int ret = 0; if (ops->mode != MTD_OPS_RAW && spinand->eccinfo.ooblayout) @@ -20,7 +20,7 @@ Signed-off-by: Xiangsheng Hou mutex_lock(&spinand->lock); -@@ -604,7 +604,7 @@ static int spinand_mtd_write(struct mtd_ +@@ -600,7 +600,7 @@ static int spinand_mtd_write(struct mtd_ int ret = 0; if (ops->mode != MTD_OPS_RAW && mtd->ooblayout) diff --git a/target/linux/ramips/patches-4.14/105-mt7621-memory-detect.patch b/target/linux/ramips/patches-4.14/105-mt7621-memory-detect.patch index b19b57fd66..f843e514d3 100644 --- a/target/linux/ramips/patches-4.14/105-mt7621-memory-detect.patch +++ b/target/linux/ramips/patches-4.14/105-mt7621-memory-detect.patch @@ -90,7 +90,7 @@ Signed-off-by: Chuanhong Guo void __init ralink_clk_init(void) { u32 syscfg, xtal_sel, clkcfg, clk_sel, curclk, ffiv, ffrac; -@@ -319,10 +344,7 @@ void prom_soc_init(struct ralink_soc_inf +@@ -328,10 +353,7 @@ void prom_soc_init(struct ralink_soc_inf (rev >> CHIP_REV_VER_SHIFT) & CHIP_REV_VER_MASK, (rev & CHIP_REV_ECO_MASK)); From d7c56a425c15025a847803d220cda5d6e1603efb Mon Sep 17 00:00:00 2001 From: CN_SZTL Date: Sun, 10 Jan 2021 01:32:58 +0800 Subject: [PATCH 2/4] trojan-go: cleanup Makefile --- package/lienol/trojan-go/Makefile | 32 +++++++++---------------------- 1 file changed, 9 insertions(+), 23 deletions(-) diff --git a/package/lienol/trojan-go/Makefile b/package/lienol/trojan-go/Makefile index 737e1be0dd..4e28714d19 100644 --- a/package/lienol/trojan-go/Makefile +++ b/package/lienol/trojan-go/Makefile @@ -7,16 +7,13 @@ include $(TOPDIR)/rules.mk PKG_NAME:=trojan-go PKG_VERSION:=0.8.2 -PKG_RELEASE:=1 +PKG_RELEASE:=2 -PKG_SOURCE_PROTO:=git -PKG_SOURCE_URL:=https://github.com/p4gefau1t/trojan-go.git -PKG_MIRROR_HASH:=ccec21f4f2bac17abf41978221a0e5ed16d8c8135ae54a292fdeddce62fa9127 -PKG_SOURCE_VERSION:=d051cf4c8852d708769ca1c4e514306a88da830b -PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz -PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION) +PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz +PKG_SOURCE_URL:=https://codeload.github.com/p4gefau1t/trojan-go/tar.gz/v$(PKG_VERSION)? +PKG_HASH:=a335006813067f70763596c41ddf09454b151899b356661b055eb9113ec3081b -PKG_CONFIG_DEPENDS := \ +PKG_CONFIG_DEPENDS:= \ CONFIG_TROJAN_GO_COMPRESS_GOPROXY \ CONFIG_TROJAN_GO_COMPRESS_UPX @@ -25,11 +22,13 @@ PKG_BUILD_PARALLEL:=1 PKG_USE_MIPS16:=0 GO_PKG:=github.com/p4gefau1t/trojan-go -GO_PKG_TAG:=-tags full +GO_PKG_BUILD_PKG:=$$(GO_PKG) + +GO_PKG_TAGS:=full GO_PKG_LDFLAGS:=-s -w GO_PKG_LDFLAGS_X:= \ $(GO_PKG)/constant.Version=$(PKG_VERSION) \ - $(GO_PKG)/constant.Commit=$(PKG_SOURCE_VERSION) + $(GO_PKG)/constant.Commit=v$(PKG_VERSION) include $(INCLUDE_DIR)/package.mk include $(TOPDIR)/feeds/packages/lang/golang/golang-package.mk @@ -63,27 +62,14 @@ endef ifeq ($(CONFIG_TROJAN_GO_COMPRESS_GOPROXY),y) export GO111MODULE=on export GOPROXY=https://goproxy.io -#export GOPROXY=https://mirrors.aliyun.com/goproxy/ endif -define Build/Prepare - tar -zxvf $(DL_DIR)/$(PKG_SOURCE) -C $(PKG_BUILD_DIR) --strip-components 1 -endef - define Build/Compile - $(eval GO_PKG_BUILD_PKG:=$(GO_PKG)) - $(call GoPackage/Build/Configure) $(call GoPackage/Build/Compile) ifeq ($(CONFIG_TROJAN_GO_COMPRESS_UPX),y) $(STAGING_DIR_HOST)/bin/upx --lzma --best $(GO_PKG_BUILD_BIN_DIR)/$(PKG_NAME) endif endef -define Package/$(PKG_NAME)/install - $(call GoPackage/Package/Install/Bin,$(PKG_INSTALL_DIR)) - $(INSTALL_DIR) $(1)/usr/bin - $(INSTALL_BIN) $(GO_PKG_BUILD_BIN_DIR)/$(PKG_NAME) $(1)/usr/bin/$(PKG_NAME) -endef - $(eval $(call GoBinPackage,$(PKG_NAME))) $(eval $(call BuildPackage,$(PKG_NAME))) From ab480debc9befbbe7a072c41917bf4a07574a3a1 Mon Sep 17 00:00:00 2001 From: CN_SZTL Date: Sun, 10 Jan 2021 01:41:26 +0800 Subject: [PATCH 3/4] trojan: Makefile cleanups --- package/lienol/trojan/Makefile | 18 ++++++++---------- 1 file changed, 8 insertions(+), 10 deletions(-) diff --git a/package/lienol/trojan/Makefile b/package/lienol/trojan/Makefile index 8c96301a29..4c8bddcbd1 100644 --- a/package/lienol/trojan/Makefile +++ b/package/lienol/trojan/Makefile @@ -8,20 +8,17 @@ include $(TOPDIR)/rules.mk PKG_NAME:=trojan PKG_VERSION:=1.16.0 -PKG_RELEASE:=1 +PKG_RELEASE:=2 -PKG_SOURCE_PROTO:=git -PKG_SOURCE_URL:=https://github.com/trojan-gfw/trojan.git -PKG_MIRROR_HASH:=2f7f60ae2ef6e57b9565b984df2e7b9560786ad0a63402e93523804f140e39ca -PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION) -PKG_SOURCE_VERSION:=8606b7110fe79f8ab02d60c897f87ffb0a9b23f0 -PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz +PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz +PKG_SOURCE_URL:=https://codeload.github.com/trojan-gfw/trojan/tar.gz/v$(PKG_VERSION)? +PKG_HASH:=86cdb2685bb03a63b62ce06545c41189952f1ec4a0cd9147450312ed70956cbc -CMAKE_INSTALL:=1 -PKG_BUILD_PARALLEL:=0 +PKG_BUILD_PARALLEL:=1 PKG_BUILD_DEPENDS:=openssl PKG_LICENSE:=GPL-3.0 +PKG_LICENSE_FILE:=LICENSE PKG_MAINTAINER:=GreaterFire include $(INCLUDE_DIR)/package.mk @@ -57,7 +54,8 @@ define Package/trojan CATEGORY:=Network TITLE:=An unidentifiable mechanism that helps you bypass GFW URL:=https://github.com/trojan-gfw/trojan - DEPENDS:=+libpthread +libstdcpp +libopenssl \ + DEPENDS:= \ + +libpthread +libstdcpp +libopenssl \ +boost +boost-system +boost-program_options +boost-date_time endef From b09ca4bd318259cc5aa4f1ea08c38214f9c937d1 Mon Sep 17 00:00:00 2001 From: CN_SZTL Date: Sun, 10 Jan 2021 01:46:12 +0800 Subject: [PATCH 4/4] trojan-plus: Makefile cleanups --- package/lienol/trojan-plus/Makefile | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/package/lienol/trojan-plus/Makefile b/package/lienol/trojan-plus/Makefile index 1f887d349e..63840ffb18 100644 --- a/package/lienol/trojan-plus/Makefile +++ b/package/lienol/trojan-plus/Makefile @@ -8,20 +8,18 @@ include $(TOPDIR)/rules.mk PKG_NAME:=trojan-plus PKG_VERSION:=10.0.3 -PKG_RELEASE:=1 +PKG_RELEASE:=2 PKG_SOURCE_PROTO:=git PKG_SOURCE_URL:=https://github.com/peter-tank/trojan-plus.git -PKG_MIRROR_HASH:=ec9b474a708e9e92715e79d09163777cd539837ea41656190a75cffada91ee7a -PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION) PKG_SOURCE_VERSION:=a6394cdd718669b0c7491493a78e61f6f0f899b3 -PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz +PKG_MIRROR_HASH:=2d37d09fe6d39d7981116ad387706f58f2b30b74a34e27fc5608f267dacc9208 -CMAKE_INSTALL:=1 -PKG_BUILD_PARALLEL:=0 +PKG_BUILD_PARALLEL:=1 PKG_BUILD_DEPENDS:=openssl PKG_LICENSE:=GPL-3.0 +PKG_LICENSE_FILE:=LICENSE PKG_MAINTAINER:=Trojan-Plus-Group include $(INCLUDE_DIR)/package.mk @@ -57,7 +55,8 @@ define Package/trojan-plus CATEGORY:=Network TITLE:=An unidentifiable mechanism that helps you bypass GFW. It's compatible with original trojan with experimental features. URL:=https://github.com/Trojan-Plus-Group/trojan-plus - DEPENDS:=+libpthread +libstdcpp +libopenssl \ + DEPENDS:= \ + +libpthread +libstdcpp +libopenssl \ +boost +boost-system +boost-program_options endef