Update category-public-tracker (#3151)

Strict comparison by www removed

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-ecommerce

@@ -1,3 +1,5 @@
+include:category-ecommerce-ru
+
 include:adidas
 include:bestbuy
 include:booking
@@ -19,7 +21,6 @@ include:momo
 include:muji
 include:nike
 include:nordstrom
-include:ozon
 include:pchome
 include:rakuten
 include:ruten

data/category-ecommerce-ru

@@ -0,0 +1,2 @@
+include:ozon
+include:wildberries

data/category-entertainment

@@ -1,5 +1,6 @@
 # This list contains services related to entertainment & games & music & podcasts & videos outside China mainland.
 
+include:category-entertainment-ru
 include:category-games-!cn
 include:category-novel
 
@@ -46,7 +47,6 @@ include:mytvsuper
 include:netflix
 include:niconico
 include:now
-include:okko
 include:olevod
 include:pbs
 include:pixiv
@@ -54,7 +54,6 @@ include:plutotv
 include:pocketcasts
 include:primevideo
 include:roku
-include:rutube
 include:showtimeanytime
 include:sling
 include:sonypictures

data/category-entertainment-ru

@@ -0,0 +1,3 @@
+include:okko
+include:rutube
+include:wink

data/category-public-tracker

@@ -411,34 +411,6 @@ full:udp.tracker.projectk.org
 full:wepzone.net
 full:wg.mortis.me
 full:ws.peer.ooo
-full:www.all4nothin.net
-full:www.bit-hdtv.com
-full:www.bitseduce.com
-full:www.biztorrents.com
-full:www.blackcats-games.net
-full:www.elitezones.ro
-full:www.freerainbowtables.com
-full:www.genesis-sp.org
-full:www.learnbits.me
-full:www.legittorrents.info
-full:www.megatorrents.kg
-full:www.mvgroup.org
-full:www.peckservers.com
-full:www.shnflac.net
-full:www.siambt.com
-full:www.thegeeks.bz
-full:www.theoccult.bz
-full:www.theplace.bz
-full:www.thetradersden.org
-full:www.thevault.bz
-full:www.torrent.eu.org
-full:www.torrentsnipe.info
-full:www.tribalmixes.com
-full:www.tvnihon.com
-full:www.worldboxingvideoarchive.com
-full:www.xwt-classics.net
-full:www.yuwabits.net
-full:www.zone-torrent.net
 full:xbtrutor.com
 full:xtremewrestlingtorrents.net
 full:y.paranoid.agency
@@ -447,3 +419,32 @@ full:yggtracker.i2p.rocks
 full:yolo.liberbear.com
 full:z.paranoid.agency
 full:zupix.online
+
+all4nothin.net
+bit-hdtv.com
+bitseduce.com
+biztorrents.com
+blackcats-games.net
+elitezones.ro
+freerainbowtables.com
+genesis-sp.org
+learnbits.me
+legittorrents.info
+megatorrents.kg
+mvgroup.org
+peckservers.com
+shnflac.net
+siambt.com
+thegeeks.bz
+theoccult.bz
+theplace.bz
+thetradersden.org
+thevault.bz
+torrent.eu.org
+torrentsnipe.info
+tribalmixes.com
+tvnihon.com
+worldboxingvideoarchive.com
+xwt-classics.net
+yuwabits.net
+zone-torrent.net

data/category-ru

@@ -16,18 +16,14 @@ xn--p1ai
 ru.com
 ru.net
 
+include:category-ecommerce-ru
+include:category-entertainment-ru
 include:category-gov-ru
 
+# Public transportation
+include:mosmetro
+
 include:avito
 include:mailru-group
-include:okko
-include:ozon
-include:rutube
-include:wildberries
-include:wink
 include:x5
 include:yandex
-
-# Anime
-animevost.org
-seasonvar.ru

data/mailru-group

@@ -6,3 +6,4 @@ include:vk
 boosty.to
 donationalerts.com
 memealerts.com
+tamtam.chat

data/mosmetro

@@ -0,0 +1,2 @@
+mosmetro.ru
+mosmetro.tech

data/taptap

@@ -1,3 +1,4 @@
+tapapks.com
 tapimg.com
 tapimg.net
 taptap.cn

data/wildberries

@@ -6,4 +6,4 @@ wb.ru
 wbbasket.ru
 wbpay.ru
 wibes.ru
-wildberries.ru
+wildberries.ru