Skip to content

Commit

Permalink
[bot] AutoMerging: merge all upstream's changes:
Browse files Browse the repository at this point in the history
* https://github.com/v2fly/domain-list-community:
  Bump github.com/v2fly/v2ray-core/v5 from 5.7.0 to 5.10.1 (v2fly#1890)
  Added bluepoch (v2fly#1892)
  Update apple (v2fly#1889)
  • Loading branch information
github-actions[bot] committed Oct 30, 2023
2 parents 021e1ef + 7bda8da commit 582f90c
Show file tree
Hide file tree
Showing 7 changed files with 34 additions and 12 deletions.
17 changes: 16 additions & 1 deletion data/apple
Original file line number Diff line number Diff line change
Expand Up @@ -745,6 +745,9 @@ full:push-apple.com.akadns.net

# Domains and services below are available in China mainland
# Use in config file like this: "geosite:apple@cn"
full:amp-api-edge-lb-cn.itunes-apple.com.akadns.net @cn
full:amp-api-edge-lb.itunes-apple.com.akadns.net @cn
full:amp-api-edge.apps.apple.com @cn
full:amp-api-search-edge.apps.apple.com @cn
full:amp-api.apps.apple.com @cn
full:aod.itunes.apple.com @cn
Expand All @@ -761,7 +764,12 @@ full:fides-pol.apple.com @cn
full:gspe11-2-cn-ssl.ls.apple.com @cn
full:gspe12-cn-ssl.ls.apple.com @cn
full:gspe85-cn-ssl.ls.apple.com @cn
full:inappcheck-cn.itunes-apple.com.akadns.net @cn
full:inappcheck-lb.itunes-apple.com.akadns.net @cn
full:inappcheck.itunes.apple.com @cn
full:init.itunes.apple.com @cn
full:init.gc-lb.apple.com.akadns.net @cn
full:init.gc.apple.com @cn
full:iosapps.itunes.apple.com @cn
full:js-cdn.music.apple.com @cn
full:km.support.apple.com @cn
Expand All @@ -787,8 +795,9 @@ regexp:^is[1-5](-ssl)?\.mzstatic\.com$ @cn
regexp:^s[1-5]?\.mzstatic\.com$ @cn

# The rules below are from https://github.com/felixonmars/dnsmasq-china-list/blob/master/apple.china.conf
# Revision: 3cc8d6f907bffde4dea0ed0d434e0200c8c28ffe
# Revision: db49c15abc364a7a041aa95a8f763cf1a957b0de
# Use in config file like this: "geosite:apple@cn"
# According to the consensus in #503, do not include the domain name apps.apple.com directly.
full:a1.mzstatic.com @cn
full:a2.mzstatic.com @cn
full:a3.mzstatic.com @cn
Expand Down Expand Up @@ -865,6 +874,7 @@ full:init-s01st.push.apple.com @cn
full:iosapps.itunes.g.aaplimg.com @cn
full:ipcdn.apple.com @cn
full:iphone-ld.apple.com @cn
full:iphone-ld.origin-apple.com.akadns.net @cn
full:is1-ssl.mzstatic.com @cn
full:is1.mzstatic.com @cn
full:is2-ssl.mzstatic.com @cn
Expand All @@ -887,6 +897,7 @@ full:ocsp.apple.com @cn
full:ocsp2.apple.com @cn
full:oscdn.apple.com @cn
full:oscdn.origin-apple.com.akadns.net @cn
full:osxapps.itunes.g.aaplimg.com @cn
full:pancake.apple.com @cn
full:pancake.cdn-apple.com.akadns.net @cn
full:prod-support.apple-support.akadns.net @cn
Expand All @@ -904,6 +915,7 @@ full:store.storeimages.cdn-apple.com @cn
full:support-china.apple-support.akadns.net @cn
full:support.apple.com @cn
full:swallow.apple.com @cn
full:swallow-apple-com.v.aaplimg.com @cn
full:swcatalog-cdn.apple.com.akadns.net @cn
full:swcatalog.apple.com @cn
full:swcdn.apple.com @cn
Expand All @@ -917,7 +929,10 @@ full:updates-http.cdn-apple.com @cn
full:updates.cdn-apple.com @cn
full:valid.apple.com @cn
full:valid.origin-apple.com.akadns.net @cn
full:weather-data.apple.com.akadns.net @cn
full:weather-data.apple.com @cn
full:weather-map.apple.com @cn
full:weather-map2.apple.com @cn
full:www.apple.com.edgekey.net.globalredir.akadns.net @cn
full:www.apple.com.edgekey.net @cn
full:www.apple.com @cn
Expand Down
3 changes: 3 additions & 0 deletions data/bluepoch
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
include:bluepoch-games

bluepoch.com @cn
2 changes: 2 additions & 0 deletions data/bluepoch-games
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
# From reverse 1999
sl916.com @cn
1 change: 1 addition & 0 deletions data/category-games
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ include:2kgames
include:bilibili-game
include:blizzard
include:bluearchive
include:bluepoch-games
include:curseforge
include:cygames
include:ea
Expand Down
1 change: 1 addition & 0 deletions data/geolocation-cn
Original file line number Diff line number Diff line change
Expand Up @@ -264,6 +264,7 @@ include:category-dev-cn
include:alibaba
include:b3log
include:baidu
include:bluepoch
include:bytedance
include:didi
include:huawei
Expand Down
6 changes: 3 additions & 3 deletions go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -3,12 +3,12 @@ module github.com/v2fly/domain-list-community
go 1.19

require (
github.com/v2fly/v2ray-core/v5 v5.7.0
github.com/v2fly/v2ray-core/v5 v5.10.1
google.golang.org/protobuf v1.31.0
)

require (
github.com/adrg/xdg v0.4.0 // indirect
github.com/golang/protobuf v1.5.2 // indirect
golang.org/x/sys v0.5.0 // indirect
github.com/golang/protobuf v1.5.3 // indirect
golang.org/x/sys v0.13.0 // indirect
)
16 changes: 8 additions & 8 deletions go.sum
Original file line number Diff line number Diff line change
Expand Up @@ -3,20 +3,20 @@ github.com/adrg/xdg v0.4.0/go.mod h1:N6ag73EX4wyxeaoeHctc1mas01KZgsj5tYiAIwqJE/E
github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
github.com/golang/protobuf v1.5.0/go.mod h1:FsONVRAS9T7sI+LIUmWTfcYkHO4aIWwzhcaSAoJOfIk=
github.com/golang/protobuf v1.5.2 h1:ROPKBNFfQgOUMifHyP+KYbvpjbdoFNs+aK7DXlji0Tw=
github.com/golang/protobuf v1.5.2/go.mod h1:XVQd3VNwM+JqD3oG2Ue2ip4fOMUkwXdXDdiuN0vRsmY=
github.com/golang/protobuf v1.5.3 h1:KhyjKVUg7Usr/dYsdSqoFveMYd5ko72D+zANwlG1mmg=
github.com/golang/protobuf v1.5.3/go.mod h1:XVQd3VNwM+JqD3oG2Ue2ip4fOMUkwXdXDdiuN0vRsmY=
github.com/google/go-cmp v0.5.5/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
github.com/google/go-cmp v0.5.9 h1:O2Tfq5qg4qc4AmwVlvv0oLiVAGB7enBSJ2x2DqQFi38=
github.com/google/go-cmp v0.6.0 h1:ofyhxvXcZhMsU5ulbFiLKl/XBFqE1GSq7atu8tAmTRI=
github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
github.com/stretchr/testify v1.8.2 h1:+h33VjcLVPDHtOdpUCuF+7gSuG3yGIftsP1YvFihtJ8=
github.com/v2fly/v2ray-core/v5 v5.7.0 h1:84h2KMfs195EwIdj0DLStS2GhZMa65U0malDmteo3Nw=
github.com/v2fly/v2ray-core/v5 v5.7.0/go.mod h1:iFLyTcrioq55DA7Q2BdRxvYrLx4m2pKzVukmoS33aTU=
github.com/stretchr/testify v1.8.4 h1:CcVxjf3Q8PM0mHUKJCdn+eZZtm5yQwehR5yeSVQQcUk=
github.com/v2fly/v2ray-core/v5 v5.10.1 h1:n6qbRZHdhtsU98MVsSTsPwJvwBem0e9TahGgymSMxQc=
github.com/v2fly/v2ray-core/v5 v5.10.1/go.mod h1:DCfPM8UCvTzw5KEBfHuW7feBxmWTmpxOho2SSUp66rk=
golang.org/x/sys v0.0.0-20211025201205-69cdffdb9359/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
golang.org/x/sys v0.5.0 h1:MUK/U/4lj1t1oPg0HfuXDN/Z1wv31ZJ/YcPiGccS4DU=
golang.org/x/sys v0.5.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
golang.org/x/sys v0.13.0 h1:Af8nKPmuFypiUBjVoU9V20FiaFXOcuZI21p0ycVYYGE=
golang.org/x/sys v0.13.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
google.golang.org/protobuf v1.26.0-rc.1/go.mod h1:jlhhOSvTdKEhbULTjvd4ARK9grFBp09yW+WbY/TyQbw=
google.golang.org/protobuf v1.26.0/go.mod h1:9q0QmTI4eRPtz6boOQmLYwt+qCgq0jsYwAQnmE0givc=
Expand Down

0 comments on commit 582f90c

Please sign in to comment.