diff --git a/include/kernel-version.mk b/include/kernel-version.mk index 0efab9e5ff..27908e9937 100644 --- a/include/kernel-version.mk +++ b/include/kernel-version.mk @@ -8,12 +8,12 @@ endif LINUX_VERSION-4.9 = .223 LINUX_VERSION-4.14 = .180 -LINUX_VERSION-4.19 = .122 +LINUX_VERSION-4.19 = .123 LINUX_VERSION-5.4 = .41 LINUX_KERNEL_HASH-4.9.223 = cf5300e6f5d8c66c2bed8f00d53f9c58103731809862427012e4010f5d782ae5 LINUX_KERNEL_HASH-4.14.180 = 444ef973d9b6a6ea174e4a9086f0aea980d8575d13302e431ad688f22e27ed0e -LINUX_KERNEL_HASH-4.19.122 = 5050268ec5cf003d96366d1611ecfa4ab6974125d6fa26cea1ccb81dd4df00a5 +LINUX_KERNEL_HASH-4.19.123 = a79914d31a8d8c6b0e2bb0f2b143d615fe8a6c4dd2e0f36e97aa20efd69a993f LINUX_KERNEL_HASH-5.4.41 = 1e64e7c247d7440b0dd9fa63135cf7078c3e09b933ae66dfb3e07b05dcf8b057 remove_uri_prefix=$(subst git://,,$(subst http://,,$(subst https://,,$(1)))) diff --git a/package/ctcgfw/luci-app-openclash/files/usr/share/openclash/openclash_core.sh b/package/ctcgfw/luci-app-openclash/files/usr/share/openclash/openclash_core.sh index 7160429322..b4d93869d3 100755 --- a/package/ctcgfw/luci-app-openclash/files/usr/share/openclash/openclash_core.sh +++ b/package/ctcgfw/luci-app-openclash/files/usr/share/openclash/openclash_core.sh @@ -64,7 +64,7 @@ if [ "$CORE_CV" != "$CORE_LV" ] || [ -z "$CORE_CV" ]; then case $CORE_TYPE in "Tun") echo "正在下载【Tun】版本内核，如下载失败请尝试手动下载并上传..." >$START_LOG - curl -sL -m 30 --retry 2 https://github.com/Dreamacro/clash/releases/download/TUN/clash-"$CPU_MODEL"-"$CORE_LV".gz -o /tmp/clash.gz >/dev/null 2>&1 + curl -sL -m 30 --retry 2 https://github.com/vernesong/OpenClash/releases/download/TUN-Premium/clash-"$CPU_MODEL"-"$CORE_LV".gz -o /tmp/clash.gz >/dev/null 2>&1 ;; "Game") echo "正在下载【Game】版本内核，如下载失败请尝试手动下载并上传..." >$START_LOG diff --git a/package/ctcgfw/luci-app-openclash/files/usr/share/openclash/openclash_fake_filter.sh b/package/ctcgfw/luci-app-openclash/files/usr/share/openclash/openclash_fake_filter.sh index be72f9079e..5b9e1dce01 100755 --- a/package/ctcgfw/luci-app-openclash/files/usr/share/openclash/openclash_fake_filter.sh +++ b/package/ctcgfw/luci-app-openclash/files/usr/share/openclash/openclash_fake_filter.sh @@ -10,7 +10,7 @@ echo "正在设置Fake-IP黑名单..." >$START_LOG rm -rf "$FAKE_FILTER_FILE" 2>/dev/null if [ -s "$CUSTOM_FILE" ]; then - cat "$CUSTOM_FILE" |while read -r line + cat "$CUSTOM_FILE" |while read -r line || [[ -n ${line} ]]; do if [ -z "$(echo $line |grep '^ \{0,\}#' 2>/dev/null)" ]; then echo " - '$line'" >> "$FAKE_FILTER_FILE" diff --git a/package/ctcgfw/oaf/src/app_filter.c b/package/ctcgfw/oaf/src/app_filter.c index 76b8162eef..1e2a1cdcb0 100644 --- a/package/ctcgfw/oaf/src/app_filter.c +++ b/package/ctcgfw/oaf/src/app_filter.c @@ -835,6 +835,7 @@ static u_int32_t app_filter_hook(unsigned int hook, } #endif +#if 0 // 3.12.74-->3.13-rc1 #if LINUX_VERSION_CODE >= KERNEL_VERSION(3,13,0) struct nf_conn_acct *acct; @@ -858,7 +859,7 @@ static u_int32_t app_filter_hook(unsigned int hook, if(total_packets > MAX_PARSE_PKT_NUM){ return NF_ACCEPT; } - +#endif memset((char *)&flow, 0x0, sizeof(flow_info_t)); if(parse_flow_base(skb, &flow) < 0) return NF_ACCEPT; diff --git a/package/ctcgfw/open-app-filter/files/feature.cfg b/package/ctcgfw/open-app-filter/files/feature.cfg index 09faf0b49b..6554724615 100644 --- a/package/ctcgfw/open-app-filter/files/feature.cfg +++ b/package/ctcgfw/open-app-filter/files/feature.cfg @@ -20,6 +20,7 @@ 2011 狂野飙车:[tcp;;;asphalt9;;] 2012 率土之滨:[tcp;;10001;;;00:00|01:00,tcp;;8001;;;00:00|01:00] 2013 一刀传世:[tcp;;8040;;;00:47|01:45] +2014 第五人格:[tcp;;4010;;;,tcp;;4010;;;,tcp;;4020;;;,tcp;;4030;;;,tcp;;4040;;;,tcp;;4050;;;,tcp;;4060;;;,tcp;;4070;;;,tcp;;4080;;;,tcp;;4090;;;] #class video 3001 抖音短视频:[tcp;;80;-dy-;;,tcp;;;-dy.;;] @@ -34,8 +35,7 @@ 3011 花椒直播:[tcp;;;huajiao;;] 3012 映客直播:[tcp;;;;.inke.cn;] 3013 YY:[udp;;;;;02:00|03:00|04:08,udp;;;;;00:4f|01:00|02:00] -3014 妩媚直播:[tcp;;;guojiang.tv;;] -3015 菠萝直播:[tcp;;;;;00:03|01:00|02:00|03:00] +3014 哔哩哔哩:[tcp;;;bilivideo;;,tcp;;480;;upgcxcode;] 3016 芒果tv:[tcp;;443;mgtv;;,tcp;;80;mgtv;;,tcp;;443;hitv;;] 3017 西瓜视频:[tcp;;;xg.ixigua;;,tcp;;443;snsdk;;,tcp;;;xg-p.ixigua;;] diff --git a/package/ntlf9t/luci-app-speederv2/root/etc/init.d/speederv2 b/package/ntlf9t/luci-app-speederv2/root/etc/init.d/speederv2 index 801700c374..a8f1098273 100755 --- a/package/ntlf9t/luci-app-speederv2/root/etc/init.d/speederv2 +++ b/package/ntlf9t/luci-app-speederv2/root/etc/init.d/speederv2 @@ -70,6 +70,9 @@ start_instance() { return 1 fi + /sbin/validate_data "ip6addr" "$server_ip" >/dev/null 2>&1 + [ $? -eq 0 ] && server_ip="[$server_ip]" + procd_open_instance procd_set_param command /usr/bin/speederv2 procd_append_param command -c diff --git a/target/linux/ath79/dts/qca9558_tplink_tl-wr1043nd.dtsi b/target/linux/ath79/dts/qca9558_tplink_tl-wr1043nd.dtsi index 72062e5d1e..bfa29fece3 100644 --- a/target/linux/ath79/dts/qca9558_tplink_tl-wr1043nd.dtsi +++ b/target/linux/ath79/dts/qca9558_tplink_tl-wr1043nd.dtsi @@ -106,7 +106,7 @@ flash@0 { compatible = "jedec,spi-nor"; reg = <0>; - spi-max-frequency = <25000000>; + spi-max-frequency = <33400000>; partitions { compatible = "fixed-partitions"; diff --git a/target/linux/bcm27xx/patches-4.19/950-0029-mm-Remove-the-PFN-busy-warning.patch b/target/linux/bcm27xx/patches-4.19/950-0029-mm-Remove-the-PFN-busy-warning.patch index ada81969b0..5cc53be0be 100644 --- a/target/linux/bcm27xx/patches-4.19/950-0029-mm-Remove-the-PFN-busy-warning.patch +++ b/target/linux/bcm27xx/patches-4.19/950-0029-mm-Remove-the-PFN-busy-warning.patch @@ -14,7 +14,7 @@ Signed-off-by: Eric Anholt --- a/mm/page_alloc.c +++ b/mm/page_alloc.c -@@ -8007,8 +8007,6 @@ int alloc_contig_range(unsigned long sta +@@ -8008,8 +8008,6 @@ int alloc_contig_range(unsigned long sta /* Make sure the range is really isolated. */ if (test_pages_isolated(outer_start, end, false)) { diff --git a/target/linux/bcm27xx/patches-4.19/950-0121-hid-Reduce-default-mouse-polling-interval-to-60Hz.patch b/target/linux/bcm27xx/patches-4.19/950-0121-hid-Reduce-default-mouse-polling-interval-to-60Hz.patch index 4851e066ac..794b209d29 100644 --- a/target/linux/bcm27xx/patches-4.19/950-0121-hid-Reduce-default-mouse-polling-interval-to-60Hz.patch +++ b/target/linux/bcm27xx/patches-4.19/950-0121-hid-Reduce-default-mouse-polling-interval-to-60Hz.patch @@ -19,7 +19,7 @@ Reduces overhead when using X module_param_named(mousepoll, hid_mousepoll_interval, uint, 0644); MODULE_PARM_DESC(mousepoll, "Polling interval of mice"); -@@ -1104,7 +1104,9 @@ static int usbhid_start(struct hid_devic +@@ -1117,7 +1117,9 @@ static int usbhid_start(struct hid_devic */ switch (hid->collection->usage) { case HID_GD_MOUSE: diff --git a/target/linux/bcm27xx/patches-4.19/950-0574-usbhid-call-usb_fixup_endpoint-after-mangling-interv.patch b/target/linux/bcm27xx/patches-4.19/950-0574-usbhid-call-usb_fixup_endpoint-after-mangling-interv.patch index 59263196c8..71adfaf9b6 100644 --- a/target/linux/bcm27xx/patches-4.19/950-0574-usbhid-call-usb_fixup_endpoint-after-mangling-interv.patch +++ b/target/linux/bcm27xx/patches-4.19/950-0574-usbhid-call-usb_fixup_endpoint-after-mangling-interv.patch @@ -13,7 +13,7 @@ Signed-off-by: Jonathan Bell --- a/drivers/hid/usbhid/hid-core.c +++ b/drivers/hid/usbhid/hid-core.c -@@ -1118,6 +1118,7 @@ static int usbhid_start(struct hid_devic +@@ -1131,6 +1131,7 @@ static int usbhid_start(struct hid_devic interval = hid_kbpoll_interval; break; } diff --git a/target/linux/generic/pending-4.19/120-Fix-alloc_node_mem_map-with-ARCH_PFN_OFFSET-calcu.patch b/target/linux/generic/pending-4.19/120-Fix-alloc_node_mem_map-with-ARCH_PFN_OFFSET-calcu.patch index ec541a865c..54ae1829ee 100644 --- a/target/linux/generic/pending-4.19/120-Fix-alloc_node_mem_map-with-ARCH_PFN_OFFSET-calcu.patch +++ b/target/linux/generic/pending-4.19/120-Fix-alloc_node_mem_map-with-ARCH_PFN_OFFSET-calcu.patch @@ -71,7 +71,7 @@ Signed-off-by: Tobias Wolf --- a/mm/page_alloc.c +++ b/mm/page_alloc.c -@@ -6400,7 +6400,7 @@ static void __ref alloc_node_mem_map(str +@@ -6401,7 +6401,7 @@ static void __ref alloc_node_mem_map(str mem_map = NODE_DATA(0)->node_mem_map; #if defined(CONFIG_HAVE_MEMBLOCK_NODE_MAP) || defined(CONFIG_FLATMEM) if (page_to_pfn(mem_map) != pgdat->node_start_pfn)