diff --git a/dat/serverlist.txt b/dat/serverlist.txt index ee465444b..14475a760 100644 --- a/dat/serverlist.txt +++ b/dat/serverlist.txt @@ -1045,6 +1045,7 @@ 833761.com 833e4c13ecc.com 835551.com +8456.xyz 8547459af5da02.com 8563p.cn 8574b6a733f1de.com @@ -2729,6 +2730,7 @@ adtrade.net adtrgt.com adtrieval.com adtriplex.com +adtrk18.com adtrue.fun adtrue24.com adtruism.com @@ -2985,6 +2987,7 @@ affplanet.com affrontworkman.com afftrack.com afftracking.justanswer.com +afftrackr.com afftrk.online afgr1.com afgr10.com @@ -3819,6 +3822,7 @@ assetshortestinherited.com assigned.cn assignedlikecrawford.com assimilatesmartlyawfully.com +assistantrok.club assisteggs.com assiumwor.com assoc-amazon.com @@ -5399,6 +5403,7 @@ brownfox.top broworker7.com browser-http-intake.logs.datadoghq.com browser-http-intake.logs.datadoghq.eu +browserdownloadz.com browserr.top browsers.support browsiprod.com @@ -6229,6 +6234,7 @@ ciksolre.net cildsotoatunbm.xyz cilxili.top cima-club.club +cimm.top cinglecitrals.com ciphuptace.com cir-smart.baidu.com @@ -6442,6 +6448,7 @@ clnk.me clodsplit.com clogrecord.com cloisteredhydrant.com +clonger.cn closedcows.com closestfantasticpoll.com closiner.com @@ -6651,6 +6658,7 @@ combycopita.com comclick.com comeadvertisewithus.com comedianconvictionchosen.com +comekang.xyz comfortablecheese.com comfortclick.co.uk comfortlesswastefulcinnamon.com @@ -6814,6 +6822,7 @@ contributorshaveangry.com contried.com contrivancespannercooperate.com contriveddrunkenwry.com +controversialseen.com conventionforgetful.com converge-digital.com convers.link @@ -8048,6 +8057,7 @@ dhkwxpzgvqgr.com dhlmy.com dhrhzii89gpwo.cloudfront.net dhsuiat.xyz +dhtmesmxjblb.com dhundora.com dhxuiho.cn dhxyzx.cn @@ -8600,6 +8610,7 @@ dstillery.com dsultra.com dszan.com dt02kc9.cn +dt243100.com dtakdb1z5gq7e.cloudfront.net dtcpdvnojquf.com dtcstcltwzuno.com @@ -8916,6 +8927,7 @@ ecleneue.com eclick.vn eclkmpbn.com eclkspbn.com +eclogicmeows.com ecma.bdimg.com ecmb.bdimg.com ecmjckvcqiceia.xyz @@ -9334,6 +9346,7 @@ erorib.com erosyndc.com erovation.com erovinmo.com +erringcrambly.com erscdf.com ersfyt.xyz ersoncur.info @@ -10328,6 +10341,7 @@ fsxzbs.cn fsyzcs.com fszhxd.com fsznrodyocq.com +ftblltrck.com ftcpvpgdga.xyz ftd.agency fthkmwrkqg.com @@ -11820,6 +11834,7 @@ hgbasics.com hgbn.rocks hgbvtax.cn hgcmnews.pro +hgdgdsgh.cn hgdnd.cc hgglguotkgfo.com hghit.com @@ -12792,6 +12807,7 @@ infercapture.com infesthazardous.com infinite-ads.com infinityads.com +infinitytrk.com infirmaryglare.com inflamesplittingmotel.com inflationbreedinghoax.com @@ -15317,6 +15333,7 @@ maiaim.cn maicaoren.cn maicv.cn maidagu.com +maidenseadescription.com maihaimo.com maikashu.net maikuque.net @@ -17487,6 +17504,7 @@ online-protection-now.com online.miarroba.com onlinecash.com onlinecashmethod.com +onlinepromousa.com onlinerewardcenter.com onlineuserprotector.com onlyjugpub.com @@ -17608,6 +17626,7 @@ oq68.com oqbktsug.xyz oqhedrmfet.com oqqtvgm.cn +oqrwpru.cn oqsujyxbsl.xyz oqurycnm.top oqwhzgimuvxpd.com @@ -19591,6 +19610,7 @@ quandarydisadvantage.com quanin.xyz quanjiao10.top quanjiapp.cn +quanmindi.com quansj.cn quanta-wave.com quantao8.top @@ -20369,6 +20389,7 @@ rmkflouh.com rmpnhfu.cn rmwdn.com rmxads.com +rmzbfum.cn rnakkaybh.com rnalismmin.biz rndhaunteran.com @@ -20404,6 +20425,7 @@ rocexovo.com rockabox.co rockcoke.cn rocketyield.com +rockstorageplace.com rockynoderearrange.com rockyou.net rocm0c.site @@ -22205,6 +22227,7 @@ stirprovidence.com stitchkidney.com stizoaph.net stizoolr.com +stkexcy.cn stkx888.cn stm65i8.com stmixrkwbp.com @@ -25949,6 +25972,7 @@ xingchenweb.top xinghao89.com xinghualinghang.com xinghuolm.top +xingjiankangfu.xyz xingjuhe.com xingnu.site xingpingmaoyi.cn @@ -26935,7 +26959,6 @@ zelllwrite.com zelrasty.net zemanta.com zemqvlylmtu.com -zenaps.com zencu.com.cn zencudo.co.uk zengwx.cn @@ -27115,6 +27138,7 @@ zijuejueta.com zikroarg.com zim-zim-zam.com zimank.com +zimeijk.cn zimingdh.com zincdatawipe.com zinhavnpak.com diff --git a/luci-app-mosdns/root/etc/mosdns/serverlist.txt b/luci-app-mosdns/root/etc/mosdns/serverlist.txt index e5ef7c25d..7da4bb310 100644 --- a/luci-app-mosdns/root/etc/mosdns/serverlist.txt +++ b/luci-app-mosdns/root/etc/mosdns/serverlist.txt @@ -1044,6 +1044,7 @@ 833761.com 833e4c13ecc.com 835551.com +8456.xyz 8547459af5da02.com 8563p.cn 8574b6a733f1de.com @@ -2728,6 +2729,7 @@ adtrade.net adtrgt.com adtrieval.com adtriplex.com +adtrk18.com adtrue.fun adtrue24.com adtruism.com @@ -2984,6 +2986,7 @@ affplanet.com affrontworkman.com afftrack.com afftracking.justanswer.com +afftrackr.com afftrk.online afgr1.com afgr10.com @@ -3818,6 +3821,7 @@ assetshortestinherited.com assigned.cn assignedlikecrawford.com assimilatesmartlyawfully.com +assistantrok.club assisteggs.com assiumwor.com assoc-amazon.com @@ -5398,6 +5402,7 @@ brownfox.top broworker7.com browser-http-intake.logs.datadoghq.com browser-http-intake.logs.datadoghq.eu +browserdownloadz.com browserr.top browsers.support browsiprod.com @@ -6228,6 +6233,7 @@ ciksolre.net cildsotoatunbm.xyz cilxili.top cima-club.club +cimm.top cinglecitrals.com ciphuptace.com cir-smart.baidu.com @@ -6441,6 +6447,7 @@ clnk.me clodsplit.com clogrecord.com cloisteredhydrant.com +clonger.cn closedcows.com closestfantasticpoll.com closiner.com @@ -6650,6 +6657,7 @@ combycopita.com comclick.com comeadvertisewithus.com comedianconvictionchosen.com +comekang.xyz comfortablecheese.com comfortclick.co.uk comfortlesswastefulcinnamon.com @@ -6813,6 +6821,7 @@ contributorshaveangry.com contried.com contrivancespannercooperate.com contriveddrunkenwry.com +controversialseen.com conventionforgetful.com converge-digital.com convers.link @@ -8047,6 +8056,7 @@ dhkwxpzgvqgr.com dhlmy.com dhrhzii89gpwo.cloudfront.net dhsuiat.xyz +dhtmesmxjblb.com dhundora.com dhxuiho.cn dhxyzx.cn @@ -8599,6 +8609,7 @@ dstillery.com dsultra.com dszan.com dt02kc9.cn +dt243100.com dtakdb1z5gq7e.cloudfront.net dtcpdvnojquf.com dtcstcltwzuno.com @@ -8915,6 +8926,7 @@ ecleneue.com eclick.vn eclkmpbn.com eclkspbn.com +eclogicmeows.com ecma.bdimg.com ecmb.bdimg.com ecmjckvcqiceia.xyz @@ -9333,6 +9345,7 @@ erorib.com erosyndc.com erovation.com erovinmo.com +erringcrambly.com erscdf.com ersfyt.xyz ersoncur.info @@ -10327,6 +10340,7 @@ fsxzbs.cn fsyzcs.com fszhxd.com fsznrodyocq.com +ftblltrck.com ftcpvpgdga.xyz ftd.agency fthkmwrkqg.com @@ -11819,6 +11833,7 @@ hgbasics.com hgbn.rocks hgbvtax.cn hgcmnews.pro +hgdgdsgh.cn hgdnd.cc hgglguotkgfo.com hghit.com @@ -12791,6 +12806,7 @@ infercapture.com infesthazardous.com infinite-ads.com infinityads.com +infinitytrk.com infirmaryglare.com inflamesplittingmotel.com inflationbreedinghoax.com @@ -15316,6 +15332,7 @@ maiaim.cn maicaoren.cn maicv.cn maidagu.com +maidenseadescription.com maihaimo.com maikashu.net maikuque.net @@ -17486,6 +17503,7 @@ online-protection-now.com online.miarroba.com onlinecash.com onlinecashmethod.com +onlinepromousa.com onlinerewardcenter.com onlineuserprotector.com onlyjugpub.com @@ -17607,6 +17625,7 @@ oq68.com oqbktsug.xyz oqhedrmfet.com oqqtvgm.cn +oqrwpru.cn oqsujyxbsl.xyz oqurycnm.top oqwhzgimuvxpd.com @@ -19590,6 +19609,7 @@ quandarydisadvantage.com quanin.xyz quanjiao10.top quanjiapp.cn +quanmindi.com quansj.cn quanta-wave.com quantao8.top @@ -20368,6 +20388,7 @@ rmkflouh.com rmpnhfu.cn rmwdn.com rmxads.com +rmzbfum.cn rnakkaybh.com rnalismmin.biz rndhaunteran.com @@ -20403,6 +20424,7 @@ rocexovo.com rockabox.co rockcoke.cn rocketyield.com +rockstorageplace.com rockynoderearrange.com rockyou.net rocm0c.site @@ -22204,6 +22226,7 @@ stirprovidence.com stitchkidney.com stizoaph.net stizoolr.com +stkexcy.cn stkx888.cn stm65i8.com stmixrkwbp.com @@ -25948,6 +25971,7 @@ xingchenweb.top xinghao89.com xinghualinghang.com xinghuolm.top +xingjiankangfu.xyz xingjuhe.com xingnu.site xingpingmaoyi.cn @@ -26934,7 +26958,6 @@ zelllwrite.com zelrasty.net zemanta.com zemqvlylmtu.com -zenaps.com zencu.com.cn zencudo.co.uk zengwx.cn @@ -27114,6 +27137,7 @@ zijuejueta.com zikroarg.com zim-zim-zam.com zimank.com +zimeijk.cn zimingdh.com zincdatawipe.com zinhavnpak.com diff --git a/luci-app-netspeedtest/root/etc/init.d/speedtest b/luci-app-netspeedtest/root/etc/init.d/speedtest index 186b52929..a33296d3a 100644 --- a/luci-app-netspeedtest/root/etc/init.d/speedtest +++ b/luci-app-netspeedtest/root/etc/init.d/speedtest @@ -15,18 +15,18 @@ # License for the specific language governing permissions and limitations # under the License. -import csv -import datetime -import errno -import math import os -import platform import re +import csv +import sys +import math +import errno import signal import socket -import sys -import threading import timeit +import datetime +import platform +import threading import xml.parsers.expat try: @@ -36,7 +36,7 @@ except ImportError: gzip = None GZIP_BASE = object -__version__ = '2.1.4b1' +__version__ = '2.1.3' class FakeShutdownEvent(object): @@ -49,8 +49,6 @@ class FakeShutdownEvent(object): "Dummy method to always return false""" return False - is_set = isSet - # Some global variables we use DEBUG = False @@ -58,7 +56,6 @@ _GLOBAL_DEFAULT_TIMEOUT = object() PY25PLUS = sys.version_info[:2] >= (2, 5) PY26PLUS = sys.version_info[:2] >= (2, 6) PY32PLUS = sys.version_info[:2] >= (3, 2) -PY310PLUS = sys.version_info[:2] >= (3, 10) # Begin import game to handle Python 2 and Python 3 try: @@ -269,6 +266,17 @@ else: write(arg) write(end) +if PY32PLUS: + etree_iter = ET.Element.iter +elif PY25PLUS: + etree_iter = ET_Element.getiterator + +if PY26PLUS: + thread_is_alive = threading.Thread.is_alive +else: + thread_is_alive = threading.Thread.isAlive + + # Exception "constants" to support Python 2 through Python 3 try: import ssl @@ -285,23 +293,6 @@ except ImportError: ssl = None HTTP_ERRORS = (HTTPError, URLError, socket.error, BadStatusLine) -if PY32PLUS: - etree_iter = ET.Element.iter -elif PY25PLUS: - etree_iter = ET_Element.getiterator - -if PY26PLUS: - thread_is_alive = threading.Thread.is_alive -else: - thread_is_alive = threading.Thread.isAlive - - -def event_is_set(event): - try: - return event.is_set() - except AttributeError: - return event.isSet() - class SpeedtestException(Exception): """Base exception for this module""" @@ -778,7 +769,7 @@ def print_dots(shutdown_event): status """ def inner(current, total, start=False, end=False): - if event_is_set(shutdown_event): + if shutdown_event.isSet(): return sys.stdout.write('.') @@ -817,7 +808,7 @@ class HTTPDownloader(threading.Thread): try: if (timeit.default_timer() - self.starttime) <= self.timeout: f = self._opener(self.request) - while (not event_is_set(self._shutdown_event) and + while (not self._shutdown_event.isSet() and (timeit.default_timer() - self.starttime) <= self.timeout): self.result.append(len(f.read(10240))) @@ -873,7 +864,7 @@ class HTTPUploaderData(object): def read(self, n=10240): if ((timeit.default_timer() - self.start) <= self.timeout and - not event_is_set(self._shutdown_event)): + not self._shutdown_event.isSet()): chunk = self.data.read(n) self.total.append(len(chunk)) return chunk @@ -911,7 +902,7 @@ class HTTPUploader(threading.Thread): request = self.request try: if ((timeit.default_timer() - self.starttime) <= self.timeout and - not event_is_set(self._shutdown_event)): + not self._shutdown_event.isSet()): try: f = self._opener(request) except TypeError: diff --git a/naiveproxy/Makefile b/naiveproxy/Makefile index d70d212aa..95b0d7746 100644 --- a/naiveproxy/Makefile +++ b/naiveproxy/Makefile @@ -5,7 +5,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=naiveproxy -PKG_VERSION:=98.0.4758.80-2 +PKG_VERSION:=99.0.4844.51-1 PKG_RELEASE:=$(AUTORELEASE) PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz @@ -58,32 +58,31 @@ ifneq ($(CONFIG_CCACHE),) export naive_ccache_flags=cc_wrapper="$(CCACHE)" endif -CLANG_VER:=14-init-11564-g37fbf238-3 +CLANG_VER:=14-init-12719-gc4b45eeb-3 CLANG_FILE:=clang-llvmorg-$(CLANG_VER).tgz define Download/CLANG URL:=https://commondatastorage.googleapis.com/chromium-browser-clang/Linux_x64 URL_FILE:=$(CLANG_FILE) FILE:=$(CLANG_FILE) - HASH:=e79cb8f1e65b44b932b9fd98365b3771e913e7275d9e92e59eca4334c5689a28 + HASH:=f691d2e11a83cd9beed85f6792d16b9688a2dbd7e57eb9b5b6d12565f44d403f endef -GN_VER:=fc295f3ac7ca4fe7acc6cb5fb052d22909ef3a8f +GN_VER:=80a40b07305373617eba2d5878d353532af77da3 GN_FILE:=gn-git_revision-$(GN_VER).zip define Download/GN_TOOL URL:=https://chrome-infra-packages.appspot.com/dl/gn/gn/linux-amd64/+ URL_FILE:=git_revision:$(GN_VER) FILE:=$(GN_FILE) - HASH:=cedac495348379e73a53d1a875cbe7eb0b07b358bdbcc9f9169866a0c7473d86 + HASH:=46184d633a2b5e659572cbab7da2b66e82aa7642abe47290954b8e5e0d9c7443 endef -PGO_VER:=4758-1643195016-f5cfe4c93eff056f51290a33e603a214804dbd80 +PGO_VER:=4844-1645865283-f109af6d624d1eac542865359a5743a7256bac10 PGO_FILE:=chrome-linux-$(PGO_VER).profdata define Download/PGO_PROF - URL:=https://storage.googleapis.com.cnpmjs.org/chromium-optimization-profiles/pgo_profiles \ - https://storage.googleapis.com/chromium-optimization-profiles/pgo_profiles + URL:=https://storage.googleapis.com/chromium-optimization-profiles/pgo_profiles URL_FILE:=$(PGO_FILE) FILE:=$(PGO_FILE) - HASH:=41a0a5550852919751e885252d163b2b490a330598c64d9f721482fa928bb691 + HASH:=1ab36777082237f59b2b1be2f66279cd58767539393059644c0ec2968373c619 endef define Build/Prepare diff --git a/naiveproxy/patches/100-macros.patch b/naiveproxy/patches/100-macros.patch new file mode 100644 index 000000000..560267499 --- /dev/null +++ b/naiveproxy/patches/100-macros.patch @@ -0,0 +1,38 @@ +--- a/src/base/memory/tagging.cc ++++ b/src/base/memory/tagging.cc +@@ -17,22 +17,25 @@ + #define PR_GET_TAGGED_ADDR_CTRL 56 + #define PR_TAGGED_ADDR_ENABLE (1UL << 0) + +-#if BUILDFLAG(IS_LINUX) +-#include +- +-// Linux headers already provide these since v5.10. +-#if LINUX_VERSION_CODE >= KERNEL_VERSION(5, 10, 0) +-#define HAS_PR_MTE_MACROS +-#endif +-#endif +- +-#ifndef HAS_PR_MTE_MACROS ++#ifndef PR_MTE_TCF_SHIFT + #define PR_MTE_TCF_SHIFT 1 ++#endif ++#ifndef PR_MTE_TCF_NONE + #define PR_MTE_TCF_NONE (0UL << PR_MTE_TCF_SHIFT) ++#endif ++#ifndef PR_MTE_TCF_SYNC + #define PR_MTE_TCF_SYNC (1UL << PR_MTE_TCF_SHIFT) ++#endif ++#ifndef PR_MTE_TCF_ASYNC + #define PR_MTE_TCF_ASYNC (2UL << PR_MTE_TCF_SHIFT) ++#endif ++#ifndef PR_MTE_TCF_MASK + #define PR_MTE_TCF_MASK (3UL << PR_MTE_TCF_SHIFT) ++#endif ++#ifndef PR_MTE_TAG_SHIFT + #define PR_MTE_TAG_SHIFT 3 ++#endif ++#ifndef PR_MTE_TAG_MASK + #define PR_MTE_TAG_MASK (0xffffUL << PR_MTE_TAG_SHIFT) + #endif + #endif diff --git a/naiveproxy/src/init_env.sh b/naiveproxy/src/init_env.sh index 64cd3bfbb..7fc3ad50b 100755 --- a/naiveproxy/src/init_env.sh +++ b/naiveproxy/src/init_env.sh @@ -65,6 +65,7 @@ use_kerberos=false enable_mdns=false enable_reporting=false include_transport_security_state_preload_list=false +use_nss_certs=false target_os=\"openwrt\" target_cpu=\"${naive_arch}\"