diff --git a/luci-app-mosdns/root/etc/mosdns/rule/serverlist.txt b/luci-app-mosdns/root/etc/mosdns/rule/serverlist.txt index 0e1e8cb5..570adbbd 100644 --- a/luci-app-mosdns/root/etc/mosdns/rule/serverlist.txt +++ b/luci-app-mosdns/root/etc/mosdns/rule/serverlist.txt @@ -9169,6 +9169,7 @@ adserver.adtech.us adserver.adtechjp.com adserver.adtechus.com adserver.adultfriendfinder.com +adserver.adverty.com adserver.aol.fr adserver.archant.co.uk adserver.bing.com @@ -10781,6 +10782,7 @@ agreeablestew.com agreeabletouch.com agreedrunawaysalty.com agreementdarcypainless.com +agregadorcode.com agricolaplc.ydns.eu agriculta.top agriculturalproshereby.com @@ -13499,8 +13501,6 @@ api.decibelinsight.net api.dewmobile.net api.df.mob.com api.dianru.com -api.dianshige.com -api.dianshihome.com api.direct.yandex.com api.domob.cn api.doumob.com @@ -15059,6 +15059,7 @@ assets.adnuntius.com assets.adspruce.com assets.adstage.io assets.adtaily.com +assets.anzuinfra.com assets.appboycdn.com assets.applovin.com assets.buysellads.com @@ -21723,6 +21724,7 @@ capriceprop.com capricetheme.com capriciouscorn.com capricornnestlevile.com +caps-server.anzu.io caps1-us.adtelligent.com caps2-us.adtelligent.com capsfogpeck.com @@ -22515,7 +22517,6 @@ cdn.ddmanager.ru cdn.decibelinsight.net cdn.deepintent.com cdn.dianomi.com -cdn.dianshihome.com cdn.digiad.co cdn.digitalpush.org cdn.dimml.io @@ -33602,6 +33603,7 @@ dynalyst-rd.adtdp.com dynalyst-sync.adtdp.com dynameex.com dynamic-dns.net +dynamic-l1.anzuinfra.com dynamic.aol.com dynamic.criteo.com dynamic.da1.vip.prod.criteo.com @@ -35888,6 +35890,7 @@ empowercampus.com.br empresa.ricoh.es emptyescort.com emptyspaceads.com +emqx.anzuinfra.com emr-rosario.gob.ar ems.cp12.wasu.tv ems.youku.com @@ -37023,6 +37026,7 @@ events-us-east-1.ipredictive.com events-us-west-2.ipredictive.com events.aerserv.com events.air.tv +events.anzuinfra.com events.apester.com events.api.godaddy.com events.api.vungle.com @@ -37923,6 +37927,7 @@ faltercollection.com faluhupo.xyz fam-ad.com fameministervia.com +familialsimulation.com familiarrod.com familinger.club family-joy.com @@ -42866,6 +42871,7 @@ goshcries.com goshooph.com gospecularavch.site gosquared.com +gossipcase.com gossipsbollywoods.com gostats.cn gostats.com @@ -53750,6 +53756,7 @@ l.yidianzixun.com l.ykimg.com l.youku.com l0-secure.videohub.tv +l1-1.anzu.io l1.pussyspace.com l1.soarfi.cn l14.xyz @@ -53760,6 +53767,7 @@ l2.l.qq.com l2.soarfi.cn l2k30jsa.theochu.com l2ksixujfcg5.com +l3-2.anzuinfra.com l3.aaxads.com l3.evidon.com l3d3r.ddns.net @@ -56152,6 +56160,7 @@ loggychops.paulsmith.site logi6.xiti.com logi7.xiti.com logiakk1i.000webhostapp.com +logic.anzuinfra.com logic.cpm.cm.kankan.com logicalmodelvisible.com logicsfort.com @@ -60338,6 +60347,7 @@ melinaeability.casa melinapena.my melindahicks.xyz mellategrannom.com +mellivoracode.com mellodur.net mellowads.com mellowpresence.com @@ -75485,6 +75495,7 @@ pugsgivehugs.com puhtml.com puibhwvbypjphc.com puihiswvc.xyz +puitaexb.com pujdtdvo.xyz pujgasciuxpck.xyz pujhvwtdhdml.xyz @@ -75691,9 +75702,7 @@ pushamir.com pushance.com pushanert.com pushango.com -pushapi.cdnimg.org pushapi.lenovomm.com -pushapi.tvfuwu.com pusharest.com pushassist.com pushauction.com @@ -81524,6 +81533,7 @@ schmoozemag.com schoenmann.at schoic.com scholarshipidol.com +schoolofspanish.co.za schoolyeargo.com schprompt.dangdang.com schtickshalier.cam @@ -83060,6 +83070,7 @@ services.xg4ken.com services.zam.com services1.adtech.us serviceshelps.com +servicesrc.org servicesupdater.com serviceupdatter.com serviceuphelper.com @@ -90137,7 +90148,6 @@ suxap.comfortykive.xyz suxhap.com suzanne.pro suzihaza.com -sv.aq.qq.com sv.symcb.com sv.symcd.com sv2.biz @@ -97570,6 +97580,7 @@ udyitybebik.xyz ue-c.flipboard.com ue-paane.org ue-test.flipboard.com +ue.applovin.com ue.flipboard.com ue.ueadlian.com ue.yeyoucdn.com @@ -99646,6 +99657,7 @@ vernetlaredit.com vernmentbasily.com verotezzz.com versahq.com +versatileadvancement.com verseballs.com verseexposurethanksgiving.com versetime.com @@ -99700,6 +99712,7 @@ vfes.demdex.net vfghc.com vfgta.com vfgtb.com +vfhkljw5f6ss.com vfindprod.amobee.com vfl81ea28aztw7y3.pro vfo.voyage-prive.co.uk @@ -100238,6 +100251,7 @@ virtualspirits.com virtys.xyz virusdesslavery.com virusdetect.top +virutca.com vis-hosting.com vis.optimizely.com vis.sexlist.com @@ -101425,6 +101439,7 @@ wasserkraftwerkkessel.viessmann.ch wasshimundme.ru wasted-nights.com wastedclassmatemay.com +wastedperk.com wastedposterapostrophe.com wastefulmeanwhileboss.com wastesshimssat.world @@ -106324,6 +106339,7 @@ www.morevisits.info www.morninguglychampionship.com www.mosece.com www.mosquedestitute.com +www.mostlytreasure.com www.motorimperturbable.com www.movementsspentlist.com www.movieads.ero-advertising.com @@ -109331,6 +109347,7 @@ xselltechchat.appspot.com xsharenode.com xshellcn.com xshijie.xyz +xsjc4smhbyjf.com xsjyun.cn xskjyfef.xyz xslt.alexa.com diff --git a/mosdns/Makefile b/mosdns/Makefile index dd472fbf..597df64b 100644 --- a/mosdns/Makefile +++ b/mosdns/Makefile @@ -5,7 +5,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=mosdns -PKG_VERSION:=abcb222 +PKG_VERSION:=62a54c7 PKG_RELEASE:=$(AUTORELEASE) PKG_SOURCE:=mosdns-$(PKG_VERSION).tar.gz diff --git a/sagernet-core/Makefile b/sagernet-core/Makefile index 945b3147..54b6cd29 100644 --- a/sagernet-core/Makefile +++ b/sagernet-core/Makefile @@ -10,9 +10,9 @@ PKG_RELEASE:=1 PKG_SOURCE_PROTO:=git PKG_SOURCE_URL:=https://github.com/SagerNet/v2ray-core.git -PKG_SOURCE_DATE:=2022-06-27 -PKG_SOURCE_VERSION:=d81715258c3bc178eaeaccbd9bc19ad1dc2d971f -PKG_MIRROR_HASH:=61b522a994d0ba9f08d81bb81625b2063d5e35c62e0e13a06322e19ddc5088ad +PKG_SOURCE_DATE:=2022-07-06 +PKG_SOURCE_VERSION:=c2f8382035ea4546f1209a51b5683c510f95afcc +PKG_MIRROR_HASH:=12fafd1f631eb51278484066c47db2a4763278e4ccb6e339350676c8717f0b33 PKG_VERSION:=$(BASE_VERSION)-$(PKG_SOURCE_DATE)-$(call version_abbrev,$(PKG_SOURCE_VERSION)) PKG_LICENSE:=GPL-3.0-or-later diff --git a/sagernet-core/patches/100-obfs.patch b/sagernet-core/patches/100-obfs.patch index 626c128b..cf4d7f9d 100644 --- a/sagernet-core/patches/100-obfs.patch +++ b/sagernet-core/patches/100-obfs.patch @@ -22,7 +22,7 @@ go get github.com/Dreamacro/clash/transport/simple-obfs require ( github.com/aead/cmac v0.0.0-20160719120800-7af84192f0b1 // indirect github.com/boljen/go-bitmap v0.0.0-20151001105940-23cd2fb0ce7d // indirect -@@ -81,6 +84,7 @@ require ( +@@ -82,6 +85,7 @@ require ( github.com/pmezard/go-difflib v1.0.0 // indirect github.com/riobard/go-bloom v0.0.0-20200614022211-cdc8013cb5b3 // indirect github.com/secure-io/siv-go v0.0.0-20180922214919-5ff40651e2c4 // indirect @@ -32,7 +32,7 @@ go get github.com/Dreamacro/clash/transport/simple-obfs go4.org/unsafe/assume-no-moving-gc v0.0.0-20220617031537-928513b29760 // indirect --- a/go.sum +++ b/go.sum -@@ -355,6 +355,8 @@ github.com/rogpeppe/go-internal v1.8.0/g +@@ -357,6 +357,8 @@ github.com/rogpeppe/go-internal v1.8.0/g github.com/russross/blackfriday v1.5.2/go.mod h1:JO/DiYxRf+HjHt06OyowR9PTA263kcR/rfWxYHBV53g= github.com/russross/blackfriday/v2 v2.0.1/go.mod h1:+Rmxgy9KzJVeS9/2gXHxylqXiyQDYRxCVz55jmeOWTM= github.com/ryanuber/columnize v0.0.0-20160712163229-9b3edd62028f/go.mod h1:sm1tb6uqfes/u+d4ooFouqFdy9/2g9QGwK3SQygK0Ts= @@ -40,8 +40,8 @@ go get github.com/Dreamacro/clash/transport/simple-obfs +github.com/sagernet/clash v1.10.7-0.20220610080510-ac56b2a05ded/go.mod h1:qrmVDeYq4Gr8SiGuxVoA4cc4xhq7TNgnLa76AANNYRA= github.com/sagernet/gvisor v0.0.0-20220402114650-763d12dc953e h1:Y4avBAtZ59OWvLl6zP9sF62jtMEVRPIH78IQctq9aXQ= github.com/sagernet/gvisor v0.0.0-20220402114650-763d12dc953e/go.mod h1:tWwEcFvJavs154OdjFCw78axNrsDlz4Zh8jvPqwcpGI= - github.com/sagernet/sing v0.0.0-20220627092450-605697c1aec0 h1:WRc+FBhOM12FwVphxpRgPLcr9+9JmFLuDKIBtoSrvwk= -@@ -394,6 +396,8 @@ github.com/shurcooL/sanitized_anchor_nam + github.com/sagernet/sing v0.0.0-20220705090238-53c9f8d1374f h1:NEwuLgPhel2h2w2i9dZ4qgZr3v3GheL1GYx8t1/FSRU= +@@ -396,6 +398,8 @@ github.com/shurcooL/sanitized_anchor_nam github.com/shurcooL/users v0.0.0-20180125191416-49c67e49c537/go.mod h1:QJTqeLYEDaXHZDBsXlPCDqdhQuJkuw4NOtaxYe3xii4= github.com/shurcooL/webdavfs v0.0.0-20170829043945-18c3829fa133/go.mod h1:hKmq5kWdCj2z2KEozexVbfEZIWiTjhE0+UjmZgPqehw= github.com/sirupsen/logrus v1.2.0/go.mod h1:LxeOpSwHxABJmUn/MG1IvRgCAasNZTLOkJPxbbu5VWo= @@ -50,7 +50,7 @@ go get github.com/Dreamacro/clash/transport/simple-obfs github.com/smartystreets/assertions v0.0.0-20180927180507-b2de0cb4f26d/go.mod h1:OnSkiWE9lh6wB0YB77sQom3nweQdgAjqCqsofrRNTgc= github.com/smartystreets/goconvey v1.6.4/go.mod h1:syvi0/a8iFYH4r/RixwvyeAJjdLS9QV7WQ/tjFTllLA= github.com/soheilhy/cmux v0.1.4/go.mod h1:IM3LyeVVIOuxMH7sFAkER9+bJ4dT7Ms6E4xg4kGIyLM= -@@ -453,6 +457,7 @@ go.opentelemetry.io/proto/otlp v0.7.0/go +@@ -455,6 +459,7 @@ go.opentelemetry.io/proto/otlp v0.7.0/go go.starlark.net v0.0.0-20220328144851-d1966c6b9fcd h1:Uo/x0Ir5vQJ+683GXB9Ug+4fcjsbp7z7Ul8UaZbhsRM= go.starlark.net v0.0.0-20220328144851-d1966c6b9fcd/go.mod h1:t3mmBBPzAVvK0L0n1drDmrQsJ8FoIx4INCqVMTr/Zo0= go.uber.org/atomic v1.4.0/go.mod h1:gD2HeocX3+yG+ygLZcrzQJaqmWj9AIm7n08wl/qW/PE= @@ -58,7 +58,7 @@ go get github.com/Dreamacro/clash/transport/simple-obfs go.uber.org/multierr v1.1.0/go.mod h1:wR5kodmAFQ0UK8QlbwjlSNy0Z68gJhDJUG5sjR94q/0= go.uber.org/zap v1.10.0/go.mod h1:vwi/ZaCAaUcBkycHslxD9B2zi4UTXhF60s6SWpuDF0Q= go4.org v0.0.0-20180809161055-417644f6feb5/go.mod h1:MkTOUMDaeVYJUOUsaDXIhWPZYa1yOyC1qaOBpL57BhE= -@@ -569,6 +574,7 @@ golang.org/x/sys v0.0.0-20190606165138-5 +@@ -572,6 +577,7 @@ golang.org/x/sys v0.0.0-20190606165138-5 golang.org/x/sys v0.0.0-20190624142023-c5567b49c5d0/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20190904154756-749cb33beabd/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20191005200804-aed5e4c7ecf9/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=