Update apple (#3138)

* apple: deduplicate

- swift is included in apple-dev
- `full:certs.apple.com @cn` is added in apple-pki
- `full:crl.apple.com @cn` is added in apple-pki
- `full:ocsp-lb.apple.com.akadns.net @cn` is added in apple-pki
- `full:ocsp.apple.com @cn` is added in apple-pki
- `full:ocsp2-lb.apple.com.akadns.net @cn` is added in apple-pki
- `full:ocsp2.apple.com @cn` is added in apple-pki
- `full:valid.apple.com @cn` is added in apple-pki

* apple: move `valid.origin-apple.com.akadns.net` to apple-pki

keep consistent with valid.apple.com

data/adidas

@@ -1,19 +1,90 @@
+adidas.ae
 adidas.at
 adidas.be
+adidas.bh
+adidas.ca
 adidas.ch
+adidas.cl
+adidas.cn @cn
+adidas.co
+adidas.co.id
 adidas.co.in
+adidas.co.kr
+adidas.co.nz
+adidas.co.th
 adidas.co.uk
+adidas.co.za
 adidas.com
+adidas.com.ar
+adidas.com.au
+adidas.com.br
 adidas.com.cn @cn
+adidas.com.co
+adidas.com.eg
+adidas.com.hk
+adidas.com.my
+adidas.com.pe
+adidas.com.ph
+adidas.com.qa
 adidas.com.sa
+adidas.com.sg
+adidas.com.tr
 adidas.com.tw
+adidas.com.vn
 adidas.cz
 adidas.de
 adidas.dk
+adidas.es
+adidas.fi
+adidas.fr
+adidas.gr
 adidas.hu
 adidas.ie
+adidas.in
 adidas.it
+adidas.jp
+adidas.mx
 adidas.nl
+adidas.no
+adidas.pe
 adidas.pl
+adidas.pt
 adidas.ru
 adidas.se
+adidas.sk
+adidasadmin.com
+adidasarchive.org
+adidas-archive.org
+adidasbadminton.com
+adidasboxing.com
+adidascdn.com
+adidas-group.ca
+adidas-group.com
+adidasgymnastics.com
+adidashockey.com
+adidasmotorsport.com
+adidassailing.com
+adidasspecialtysports.at
+adidasspecialtysports.be
+adidasspecialtysports.cn @cn
+adidasspecialtysports.co.uk
+adidasspecialtysports.cz
+adidasspecialtysports.de
+adidasspecialtysports.dk
+adidasspecialtysports.es
+adidasspecialtysports.fi
+adidasspecialtysports.fr
+adidasspecialtysports.ie
+adidasspecialtysports.it
+adidasspecialtysports.nl
+adidasspecialtysports.pl
+adidasspecialtysports.ru
+adidasspecialtysports.se
+adidasspecialtysports.sk
+adidastabletennis.com
+adidasusnews.com
+miadidas.com
+micoach.com
+miteam.com
+shopadidas.ca
+shopadidas.com

data/apple

@@ -1,5 +1,5 @@
 include:apple-ads
-include:apple-dev
+include:apple-dev # swift inside
 # Not include:apple-intelligence
 include:apple-pki
 include:apple-tvplus
@@ -7,7 +7,6 @@ include:apple-update
 include:beats
 include:icloud
 include:itunes
-include:swift
 
 # All .apple domains
 apple
@@ -856,7 +855,7 @@ full:s4.mzstatic.com @cn
 full:s5.mzstatic.com @cn
 
 # The rules below are from https://github.com/felixonmars/dnsmasq-china-list/blob/master/apple.china.conf
-# Revision: 4d392cc0a822ac5626bb97fef3fe5e04e86b28b0
+# Revision: f6a2093b254a7d2baca959bd16581666ca394303
 # Duplicates removed
 # According to the consensus in #503, do not include the domain name apps.apple.com directly.
 # Use in config file like this: "geosite:apple@cn"
@@ -874,7 +873,6 @@ full:cds-cdn.v.aaplimg.com @cn
 full:cds.apple.com @cn
 full:cds.apple.com.akadns.net @cn
 full:cdsassets.apple.com @cn
-full:certs.apple.com @cn
 full:cl2-cn.apple.com @cn
 full:cl4-cn.apple.com @cn
 full:clientflow.apple.com @cn
@@ -882,7 +880,6 @@ full:clientflow.apple.com.akadns.net @cn
 full:cn-smp-paymentservices.apple.com @cn
 full:configuration.apple.com @cn
 full:configuration.apple.com.akadns.net @cn
-full:crl.apple.com @cn
 full:cstat.apple.com @cn
 full:cstat.cdn-apple.com @cn
 full:dd-cdn.origin-apple.com.akadns.net @cn
@@ -935,10 +932,6 @@ full:mesu-china.apple.com.akadns.net @cn
 full:mesu.apple.com @cn
 full:ml.cdn-apple.com @cn
 full:music.apple.com @cn
-full:ocsp-lb.apple.com.akadns.net @cn
-full:ocsp.apple.com @cn
-full:ocsp2-lb.apple.com.akadns.net @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
@@ -981,8 +974,6 @@ full:tj-pod1-smp-device.apple.com @cn
 full:updates-http.cdn-apple.com @cn
 full:updates-http.cdn-apple.com.akadns.net @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 @cn
 full:weather-data.apple.com.akadns.net @cn
 full:weather-map.apple.com @cn

data/apple-pki

@@ -7,3 +7,4 @@ full:ocsp.apple.com @cn
 full:ocsp2-lb.apple.com.akadns.net @cn
 full:ocsp2.apple.com @cn
 full:valid.apple.com @cn
+full:valid.origin-apple.com.akadns.net @cn

data/category-collaborate-cn

@@ -8,6 +8,7 @@ orayimg.com
 sunlogin.net
 
 ## ToDesk
+todesk.cn
 todesk.com
 
 ## 连连控

data/category-companies

@@ -79,7 +79,6 @@ include:spaceship
 include:st
 include:synology
 include:symantec
-include:tailscale
 include:theboringcompany
 include:tonec
 include:uber

data/category-proxy-tunnels

@@ -0,0 +1,3 @@
+include:ngrok
+include:pinggy
+include:tailscale

data/category-public-tracker

@@ -117,6 +117,7 @@ full:music-torrent.net
 full:mvgforumtracker.mvgroup.org
 full:mvgroup.org
 full:new-line.net
+full:nnmclub.to
 full:nyaa.tracker.wf
 full:odd-hd.fr
 full:oh.fuuuuuck.com

data/category-ru

@@ -23,6 +23,11 @@ include:mailru-group
 include:okko
 include:ozon
 include:rutube
+include:wildberries
 include:wink
 include:x5
 include:yandex
+
+# Anime
+animevost.org
+seasonvar.ru

data/category-social-media-!cn

@@ -10,3 +10,5 @@ include:ok
 include:threads
 include:twitter
 include:vk
+
+truthsocial.com

data/chinaunicom

@@ -14,8 +14,12 @@ chinaunicom.com
 chinaunicom.com.cn
 chinaunicom.com.hk @!cn
 chinaunicomglobal.com @!cn
+cuguplus.com @!cn
 cuniq.com @!cn
+cuniq.sg @!cn
 mychinaunicom.com
 wo.cn
 wo.com.cn
 wo116114.com
+wocloud.com.cn
+woread.com.cn

data/citic

@@ -4,6 +4,7 @@ citic
 # All .中信 domains
 xn--fiq64b
 
+cfc108.com
 chinaamc.com
 citic-prudential.com.cn
 citicbank.com

data/dazn

@@ -1,5 +1,8 @@
-dazn-api.com
 dazn.com
+dazn-api.com
 dazndn.com
+daznfeeds.com
+daznplayer.com
+daznservices.com
 indazn.com
 indaznlab.com

data/geolocation-!cn

@@ -12,6 +12,7 @@ include:taboola
 
 # Anti-censorship & Anti-GFW & Privacy protection & VPN tools
 include:category-anticensorship
+include:category-proxy-tunnels
 
 # Art & Design & Photography
 include:artstation
@@ -284,6 +285,7 @@ include:nyaa
 include:piratebay
 include:rarbg
 dmhy.org
+rutor.info
 
 # User scripts
 greasyfork.org

data/google

@@ -544,11 +544,13 @@ full:google-ohttp-relay-safebrowsing.fastly-edge.com
 
 # Domains and services below are available in China mainland
 # Use in config file like this: "geosite:google@cn"
+gvt1-cn.com @cn
+gvt2-cn.com @cn
 full:www.recaptcha.net @cn
-full:safebrowsing-cache.google.com @cn
 
 # The rules below are from https://github.com/felixonmars/dnsmasq-china-list/blob/master/google.china.conf
-# Revision: 1f28a2d5789f411c13de69837bb354f4b21e58ff
+# Revision: 1c2d107d4e7eaa0b192e08bb0beddde4aab247f6
+# Duplicates removed
 # Use in config file like this: "geosite:google@cn"
 full:265.com @cn
 full:2mdn-cn.net @cn
@@ -578,7 +580,6 @@ full:cnappinstall.googleadapis.com @cn
 full:connectivitycheck.gstatic.com @cn
 full:content.googleadapis.com @cn
 full:crashlyticsreports-pa.googleapis.com @cn
-full:crl.pki.goog @cn
 full:csi.gstatic.com @cn
 full:dartsearch-cn.net @cn
 full:dg-meta.video.google.com @cn
@@ -590,7 +591,6 @@ full:download.mlcc.google.com @cn
 full:download.qatp1.net @cn
 full:download.tensorflow.google.com @cn
 full:emmapplecodevice.googleapis.com @cn
-full:firebase-settings.crashlytics.com @cn
 full:fontfiles.googleapis.com @cn
 full:fonts.googleapis.com @cn
 full:fonts.gstatic.com @cn
@@ -629,10 +629,8 @@ full:logger-dev.corp.google.com @cn
 full:logger.corp.google.com @cn
 full:login.corp.google.com @cn
 full:monitoring.qpdp1.net @cn
-full:ocsp.pki.goog @cn
 full:pagead-googlehosted.l.google.com @cn
 full:performanceparameters.googleapis.com @cn
-full:pki-goog.l.google.com @cn
 full:prod-controlbe.floonet.goog @cn
 full:prod-databe.floonet.goog @cn
 full:prod.databe.floonet.goog @cn
@@ -651,7 +649,6 @@ full:redirector.bdn.dev @cn
 full:redirector.c.chat.google.com @cn
 full:redirector.c.mail.google.com @cn
 full:redirector.c.pack.google.com @cn
-full:redirector.c.play.google.com @cn
 full:redirector.c.youtubeeducation.com @cn
 full:redirector.gcpcdn.gvt1.com @cn
 full:redirector.gvt1.com @cn
@@ -690,6 +687,3 @@ full:www.destinationurl.com @cn
 full:www.gstatic.com @cn
 full:www.pxcc.com @cn
 full:xn--flw351e.com @cn
-
-gvt1-cn.com @cn
-gvt2-cn.com @cn

data/google-deepmind

@@ -16,6 +16,7 @@ full:webchannel-alkalimakersuite-pa.clients6.google.com
 generativeai.google
 makersuite.google.com
 
+ai.studio
 aistudio.google.com
 bard.google.com
 gemini.google

data/hbo

@@ -1,23 +1,61 @@
+beforeigners.com
 brightline.tv
 cinemax.com
 discomax.com
+elpionero.es
 forthethrone.com
+hbo.ba
+hbo.bg
 hbo.com
+hbo.cz
+hbo.eu
+hbo.hr
+hbo.hu
+hbo.me
+hbo.mk
+hbo.pl
+hbo.ro
+hbo.rs
+hbo.sk
+hboaccess.com
+hboarchives.com
 hboasia.com
+hboenterprises.com
+hboespana.com
+hbo-europe.com
 hbogo.co.th
 hbogo.com
+hbogo.cz
 hbogo.eu
+hbogo.hu
+hbogo.sk
 hbogoasia.com
 hbogoasia.hk
 hbogoasia.id
+hbogoasia.my
 hbogoasia.ph
 hbogoasia.sg
 hbogoasia.tw
+hboinflight.com
+hbolacontent.net
+hbolaunchpad.com
+hbomailman.com
 hbomax.com
+hbomax.eu
 hbomaxcdn.com
+hbomediarelations.com
+hbonordic.com
+hbonordic.tv
 hbonow.com
+hboportugal.com
+hboprod.com
+hbospain.com
+hbotvsales.com
+homebox.com
+homeboxoffice.com
 max.com
 maxgo.com
+redbyhbo.com
 
 # CDNs
 hbo.com.c.footprint.net

data/ngrok

@@ -0,0 +1,9 @@
+ngrok-free.app
+ngrok-free.dev
+ngrok-free.pizza
+ngrok.app
+ngrok.com
+ngrok.dev
+ngrok.io
+ngrok.pizza
+ngrok.pro

data/pinggy

@@ -0,0 +1,2 @@
+pinggy.io
+pinggy.link

data/rutracker

@@ -2,7 +2,7 @@ maintracker.org
 rutracker.cc
 rutracker.cr
 rutracker.me
+rutracker.net
 rutracker.nl
 rutracker.org
-rutrecker.net
 rutrk.org

data/wildberries

@@ -0,0 +1,9 @@
+geobasket.ru
+paywb.com
+rwb.ru
+wb-basket.ru
+wb.ru
+wbbasket.ru
+wbpay.ru
+wibes.ru
+wildberries.ru