Auto commit.

2025-06-18 03:02:08 +08:00
parent 0300ed8ab5
commit d84b496dae
6 changed files with 89 additions and 29 deletions
--- a/gfwlist-adguard.conf
+++ b/gfwlist-adguard.conf
--- a/gfwlist.conf
+++ b/gfwlist.conf
@@ -1886,8 +1886,6 @@ server=/.cloud.mail.ru/127.0.0.1#5053
 ipset=/.cloud.mail.ru/gfwlist
 server=/.cloudflare-ipfs.com/127.0.0.1#5053
 ipset=/.cloudflare-ipfs.com/gfwlist
-server=/.cloudfront.net/127.0.0.1#5053
-ipset=/.cloudfront.net/gfwlist
 server=/.cloudfunctions.net/127.0.0.1#5053
 ipset=/.cloudfunctions.net/gfwlist
 server=/.club1069.com/127.0.0.1#5053
@@ -2580,6 +2578,8 @@ server=/.dw.com/127.0.0.1#5053
 ipset=/.dw.com/gfwlist
 server=/.dw.de/127.0.0.1#5053
 ipset=/.dw.de/gfwlist
+server=/.dweb.link/127.0.0.1#5053
+ipset=/.dweb.link/gfwlist
 server=/.dwnews.com/127.0.0.1#5053
 ipset=/.dwnews.com/gfwlist
 server=/.dwnews.net/127.0.0.1#5053
@@ -4790,6 +4790,8 @@ server=/.ipdefenseforum.com/127.0.0.1#5053
 ipset=/.ipdefenseforum.com/gfwlist
 server=/.ipfire.org/127.0.0.1#5053
 ipset=/.ipfire.org/gfwlist
+server=/.ipfs.4everland.io/127.0.0.1#5053
+ipset=/.ipfs.4everland.io/gfwlist
 server=/.ipfs.io/127.0.0.1#5053
 ipset=/.ipfs.io/gfwlist
 server=/.iphone4hongkong.com/127.0.0.1#5053
@@ -6386,6 +6388,8 @@ server=/.nflxso.net/127.0.0.1#5053
 ipset=/.nflxso.net/gfwlist
 server=/.nflxvideo.net/127.0.0.1#5053
 ipset=/.nflxvideo.net/gfwlist
+server=/.nftstorage.link/127.0.0.1#5053
+ipset=/.nftstorage.link/gfwlist
 server=/.nga.mil/127.0.0.1#5053
 ipset=/.nga.mil/gfwlist
 server=/.ngensis.com/127.0.0.1#5053
@@ -8386,6 +8390,8 @@ server=/.storm.mg/127.0.0.1#5053
 ipset=/.storm.mg/gfwlist
 server=/.stormmediagroup.com/127.0.0.1#5053
 ipset=/.stormmediagroup.com/gfwlist
+server=/.storry.tv/127.0.0.1#5053
+ipset=/.storry.tv/gfwlist
 server=/.stoweboyd.com/127.0.0.1#5053
 ipset=/.stoweboyd.com/gfwlist
 server=/.straitstimes.com/127.0.0.1#5053
--- a/iptv/GuangdongIPTV.m3u
+++ b/iptv/GuangdongIPTV.m3u
@@ -1,4 +1,6 @@
 #EXTM3U name="广东电信IPTV"
+#EXTINF:-1 tvg-name="广东珠江" group-title="IPTV-广东电视台",广东珠江
+http://192.168.2.1:4022/udp/239.77.0.3:5146
 #EXTINF:-1 tvg-name="广东综艺" group-title="IPTV-广东电视台",广东综艺 4K
 http://192.168.2.1:4022/udp/239.77.1.237:5146
 #EXTINF:-1 tvg-name="广东综艺" group-title="IPTV-广东电视台",广东综艺(4k)
@@ -7,6 +9,8 @@ http://192.168.2.1:4022/udp/239.77.0.244:5146
 http://192.168.2.1:4022/udp/239.77.0.245:5146
 #EXTINF:-1 tvg-name="广东综艺" group-title="IPTV-广东电视台",广东综艺 宽色域AVS2(4k) (AVS2)
 http://192.168.2.1:4022/udp/239.77.0.252:5146
+#EXTINF:-1 tvg-name="南国都市" group-title="IPTV-广州电视台",南国都市 4K
+http://192.168.2.1:4022/udp/239.253.43.99:5146
 #EXTINF:-1 tvg-name="深圳卫视" group-title="IPTV-深圳电视台",深圳卫视 4K
 http://192.168.2.1:4022/udp/239.77.1.14:5146
 #EXTINF:-1 tvg-name="CCTV-4K" group-title="IPTV-央视",CCTV-4K 4K
@@ -19,6 +23,10 @@ http://192.168.2.1:4022/udp/239.77.1.180:5146
 http://192.168.2.1:4022/udp/239.77.0.2:5146
 #EXTINF:-1 tvg-name="北京卫视" group-title="IPTV-卫视",北京卫视 4K
 http://192.168.2.1:4022/udp/239.77.1.13:5146
+#EXTINF:-1 tvg-name="CHC影迷电影" group-title="IPTV-央视网台",CHC影迷电影高清
+http://192.168.2.1:4022/udp/239.77.0.27:5146
+#EXTINF:-1,Unknown@239.77.1.96:5146 (AVS2)
+http://192.168.2.1:4022/udp/239.77.1.96:5146
 #EXTM3U name="广东电信IPTV"
 #EXTINF:-1 tvg-name="广东卫视" group-title="IPTV-广东电视台",广东卫视高清
 http://192.168.2.1:4022/udp/239.77.1.19:5146
--- a/iptv/epg.xml
+++ b/iptv/epg.xml
--- a/uncn4.txt
+++ b/uncn4.txt
@@ -965,6 +965,7 @@
 196.3.67.0/24
 196.3.68.0/22
 202.71.12.0/22
+208.123.184.0/22
 212.8.251.0/24
 212.34.128.0/20
 212.34.144.0/21
@@ -1126,6 +1127,7 @@
 163.223.180.0/23
 163.227.255.0/24
 165.99.188.0/23
+165.101.20.0/23
 175.106.32.0/19
 180.94.64.0/19
 180.222.136.0/21
@@ -3644,6 +3646,7 @@
 89.35.48.0/23
 89.37.88.0/22
 89.37.98.0/23
+89.39.64.0/23
 89.40.104.0/23
 89.41.128.0/21
 89.46.122.0/24
@@ -4849,6 +4852,7 @@
 194.107.228.0/24
 194.107.232.0/21
 194.107.240.0/21
+194.110.61.0/24
 194.110.78.0/24
 194.110.218.0/24
 194.112.128.0/17
@@ -5105,6 +5109,7 @@
 213.47.224.0/19
 213.90.0.0/17
 213.94.64.0/18
+213.111.176.0/20
 213.129.224.0/19
 213.139.252.0/22
 213.142.96.0/19
@@ -14808,7 +14813,8 @@
 94.156.164.0/22
 94.156.170.0/23
 94.156.172.0/22
-94.156.176.0/22
+94.156.177.0/24
+94.156.178.0/23
 94.156.180.0/23
 94.156.185.0/24
 94.156.188.0/24
@@ -23627,6 +23633,7 @@
 185.146.32.0/22
 185.149.232.0/22
 185.152.192.0/22
+185.155.75.0/24
 185.159.196.0/22
 185.170.60.0/22
 185.176.128.0/22
@@ -31661,6 +31668,7 @@
 94.140.14.0/23
 94.156.35.0/24
 94.156.144.0/24
+94.156.176.0/24
 94.156.189.0/24
 94.176.182.0/24
 94.231.205.0/24
@@ -33828,6 +33836,7 @@
 37.49.0.0/17
 37.49.152.0/21
 37.50.0.0/15
+37.58.30.0/23
 37.58.48.0/20
 37.60.0.0/21
 37.60.168.0/21
@@ -36947,6 +36956,7 @@
 185.5.168.0/22
 185.5.184.0/22
 185.5.212.0/24
+185.5.215.0/24
 185.6.68.0/22
 185.6.96.0/22
 185.6.120.0/22
@@ -45761,6 +45771,7 @@
 185.4.244.0/22
 185.5.84.0/22
 185.5.124.0/22
+185.5.214.0/24
 185.5.236.0/22
 185.6.4.0/22
 185.6.32.0/22
@@ -47863,6 +47874,7 @@
 81.20.224.0/20
 81.22.160.0/20
 81.22.240.0/20
+81.27.96.0/20
 81.31.48.0/20
 81.90.64.0/20
 81.175.128.0/17
@@ -52076,6 +52088,7 @@
 193.227.228.0/23
 193.227.248.0/23
 193.228.138.0/24
+193.228.144.0/24
 193.228.147.0/24
 193.228.156.0/24
 193.228.175.0/24
@@ -53132,7 +53145,8 @@
 37.46.200.0/21
 37.48.224.0/21
 37.48.240.0/21
-37.58.24.0/21
+37.58.24.0/22
+37.58.28.0/23
 37.60.64.0/18
 37.61.232.0/21
 37.72.112.0/21
@@ -53615,6 +53629,8 @@
 46.255.72.0/21
 46.255.112.0/21
 46.255.248.0/21
+48.160.0.0/12
+48.184.0.0/13
 48.192.0.0/10
 50.20.0.0/18
 50.20.64.0/19
@@ -56064,7 +56080,8 @@
 148.252.128.0/17
 148.253.0.0/20
 148.253.128.0/18
-148.253.192.0/19
+148.253.192.0/20
+148.253.216.0/21
 149.3.128.0/20
 149.19.176.0/22
 149.20.96.0/19
@@ -59058,6 +59075,7 @@
 193.186.13.0/24
 193.186.162.0/24
 193.186.196.0/22
+193.187.0.0/24
 193.187.55.0/24
 193.187.72.0/24
 193.187.99.0/24
@@ -59148,6 +59166,7 @@
 193.221.94.0/23
 193.221.113.0/24
 193.221.118.0/24
+193.221.121.0/24
 193.221.128.0/19
 193.222.61.0/24
 193.222.108.0/24
@@ -59551,6 +59570,7 @@
 194.107.118.0/24
 194.107.248.0/22
 194.110.0.0/24
+194.110.60.0/24
 194.110.74.0/24
 194.110.117.0/24
 194.110.124.0/23
@@ -60028,6 +60048,7 @@
 195.189.172.0/23
 195.189.177.0/24
 195.190.22.0/24
+195.190.133.0/24
 195.191.40.0/23
 195.191.49.0/24
 195.191.54.0/23
@@ -61729,6 +61750,7 @@
 194.63.192.0/19
 194.63.224.0/20
 194.63.240.0/21
+194.93.123.64/26
 194.110.73.0/24
 194.110.198.0/24
 194.116.146.0/24
@@ -61736,6 +61758,7 @@
 194.126.255.0/24
 194.153.81.0/24
 194.153.82.0/24
+194.153.116.0/24
 194.154.32.0/19
 194.169.232.0/24
 194.176.113.0/24
@@ -69927,7 +69950,8 @@
 165.99.225.0/24
 165.99.238.0/23
 165.99.252.0/24
-165.101.6.0/23
+165.101.7.0/24
+165.101.18.0/24
 167.205.0.0/16
 175.45.184.0/21
 175.103.32.0/19
@@ -71822,7 +71846,6 @@
 78.24.208.0/21
 79.170.32.0/21
 80.65.240.0/20
-81.27.96.0/20
 81.88.160.0/20
 83.218.0.0/19
 84.246.200.0/21
@@ -77992,6 +78015,7 @@
 165.99.244.0/23
 165.99.253.0/24
 165.101.10.0/23
+165.101.19.0/24
 167.160.14.0/24
 167.179.3.0/24
 167.179.23.0/24
@@ -79786,6 +79810,7 @@
 185.4.28.0/22
 185.4.104.0/22
 185.5.156.0/22
+185.5.213.0/24
 185.7.172.0/24
 185.7.212.0/24
 185.8.172.0/22
@@ -90062,6 +90087,7 @@
 199.223.248.0/22
 204.145.147.0/24
 204.152.80.0/23
+205.134.160.0/19
 205.166.35.0/24
 206.126.120.0/21
 207.191.248.0/21
@@ -99533,6 +99559,7 @@
 188.240.224.0/22
 188.240.230.0/24
 188.240.232.0/23
+188.241.52.0/24
 188.241.87.0/24
 188.241.110.0/24
 188.241.148.0/22
@@ -104164,6 +104191,7 @@
 170.246.220.0/22
 170.247.152.0/22
 170.254.48.0/22
+177.21.154.0/23
 179.0.194.0/23
 179.0.200.0/23
 179.43.128.0/18
@@ -107633,6 +107661,7 @@
 146.255.190.0/24
 147.78.232.0/22
 148.81.0.0/16
+148.253.208.0/21
 149.156.0.0/16
 150.254.0.0/16
 151.248.32.0/20
@@ -109648,6 +109677,7 @@
 195.191.248.0/23
 195.192.240.0/22
 195.200.88.0/23
+195.200.192.0/24
 195.200.199.0/24
 195.200.206.0/24
 195.200.212.0/24
@@ -111553,7 +111583,7 @@
 89.38.248.0/21
 89.39.0.0/21
 89.39.12.0/22
-89.39.64.0/22
+89.39.66.0/23
 89.39.68.0/24
 89.39.71.0/24
 89.39.72.0/22
@@ -112746,7 +112776,9 @@
 188.241.32.0/22
 188.241.36.0/23
 188.241.38.0/24
-188.241.48.0/21
+188.241.48.0/22
+188.241.53.0/24
+188.241.54.0/23
 188.241.58.0/24
 188.241.64.0/24
 188.241.69.0/24
@@ -127506,6 +127538,7 @@
 192.109.203.0/24
 192.109.208.0/24
 192.160.15.0/24
+192.207.46.0/24
 193.0.244.0/24
 193.2.0.0/16
 193.3.59.0/24
@@ -134367,7 +134400,6 @@
 213.110.96.0/19
 213.110.128.0/18
 213.111.64.0/18
-213.111.176.0/20
 213.111.192.0/18
 213.130.0.0/19
 213.133.160.0/19
@@ -136062,6 +136094,7 @@
 23.167.152.0/24
 23.167.160.0/24
 23.167.176.0/24
+23.167.184.0/24
 23.167.192.0/24
 23.167.200.0/24
 23.167.208.0/24
@@ -137443,7 +137476,8 @@
 47.246.0.0/16
 47.248.0.0/13
 48.0.0.0/9
-48.128.0.0/10
+48.128.0.0/11
+48.176.0.0/13
 49.0.56.0/21
 49.128.224.0/19
 50.0.0.0/12
@@ -148557,7 +148591,6 @@
 185.153.204.0/22
 185.154.4.0/22
 185.154.244.0/22
-185.155.75.0/24
 185.155.100.0/24
 185.155.136.0/22
 185.155.180.0/22
@@ -152719,7 +152752,8 @@
 192.207.37.0/24
 192.207.38.0/23
 192.207.43.0/24
-192.207.44.0/22
+192.207.44.0/23
+192.207.47.0/24
 192.207.49.0/24
 192.207.50.0/23
 192.207.52.0/22
@@ -158392,7 +158426,10 @@
 205.132.160.0/19
 205.132.192.0/18
 205.133.0.0/16
-205.134.0.0/15
+205.134.0.0/17
+205.134.128.0/19
+205.134.192.0/18
+205.135.0.0/16
 205.136.0.0/16
 205.137.0.0/17
 205.137.128.0/18
@@ -160364,7 +160401,10 @@
 208.122.192.0/19
 208.122.224.0/20
 208.123.0.0/17
-208.123.128.0/18
+208.123.128.0/19
+208.123.160.0/20
+208.123.176.0/21
+208.123.188.0/22
 208.123.192.0/20
 208.123.209.0/24
 208.123.220.0/22
--- a/uncn6.txt
+++ b/uncn6.txt
@@ -1374,6 +1374,7 @@
 2803:70e0::/32
 2803:7100::/32
 2803:7160::/32
+2803:71d0::/32
 2803:7220::/32
 2803:7240::/32
 2803:72a0::/32
@@ -1464,6 +1465,7 @@
 2803:88a0::/32
 2803:8900::/32
 2803:89a0::/32
+2803:89d0::/32
 2803:8a20::/32
 2803:8a40::/32
 2803:8a50::/32
@@ -1613,6 +1615,7 @@
 2803:b010::/32
 2803:b020::/32
 2803:b0a0::/32
+2803:b1d0::/32
 2803:b210::/32
 2803:b220::/32
 2803:b250::/32
@@ -5382,7 +5385,6 @@
 2402:7e40::/32
 2402:8040::/32
 2402:8340::/32
-2402:8440::/32
 2402:8640::/32
 2402:88c0::/32
 2402:8dc0::/32
@@ -15320,6 +15322,8 @@
 2804:9454::/32
 2804:9458::/32
 2804:945c::/32
+2804:9460::/32
+2804:9464::/32
 2a00:aee0::/29
 2a06:b700::/29
 2602:80a:5000::/40
@@ -15884,7 +15888,6 @@
 2604:8dc0::/32
 2604:8ec0::/32
 2604:9380::/32
-2604:9880::/36
 2604:9e80::/32
 2604:a280::/32
 2604:a3c0::/32
@@ -16522,6 +16525,7 @@
 2a11:840::/29
 2a12:ea40::/29
 2a13:b780::/29
+2a13:c000::/29
 2a14:d280::/29
 2001:43f8:3c0::/47
 2001:43f8:1460::/48
@@ -21180,7 +21184,6 @@
 2a04:3b80::/29
 2a04:44c0::/29
 2a04:4540::/29
-2a04:4580::/29
 2a04:4680::/29
 2a04:4b00::/29
 2a04:4cc0::/29
@@ -23507,6 +23510,7 @@
 2803:efc0::/32
 2803:f060::/32
 2803:f0a0::/32
+2803:f1d0::/32
 2803:f2d0::/32
 2803:f510::/32
 2803:f6a0::/32
@@ -26719,7 +26723,6 @@
 2400:efc0::/32
 2401:a780::/32
 2401:e4e0::/32
-2402:28c0::/32
 2405:8c0::/32
 2405:fb80::/32
 2407:1880::/32
@@ -28694,6 +28697,7 @@
 2001:67c:1960::/48
 2001:67c:2748::/48
 2001:67c:2cd4::/48
+2001:7f8:37::/48
 2001:7f8:6e::/48
 2001:7f8:8a::/48
 2001:7f8:ce::/48
@@ -31553,6 +31557,7 @@
 2001:df5:b780::/48
 2001:df5:b8c0::/48
 2001:df5:b940::/48
+2001:df5:be40::/48
 2001:df5:bf00::/48
 2001:df5:c900::/48
 2001:df5:cd00::/48
@@ -34950,6 +34955,7 @@
 2402:fe0::/32
 2402:1020::/32
 2402:1080::/32
+2402:11a0::/32
 2402:1640::/32
 2402:2480::/32
 2402:2600::/32
@@ -35874,7 +35880,6 @@
 2a05:efc0::/29
 2a06:1640::/29
 2a06:1cc0::/29
-2a06:2ac0::/29
 2a06:32c0::/29
 2a06:3940::/29
 2a06:4b40::/29
@@ -38708,6 +38713,7 @@
 2602:f85f::/40
 2606:3c80::/32
 2606:5dc0::/32
+2607:f308::/32
 2001:678:bbc::/48
 2001:67c:18dc::/48
 2001:67c:2570::/48
@@ -43698,6 +43704,7 @@
 2803:4300::/32
 2803:4590::/32
 2803:4710::/32
+2803:49d0::/32
 2803:4be0::/32
 2803:5120::/32
 2803:5550::/32
@@ -43769,6 +43776,7 @@
 2803:350::/32
 2803:500::/32
 2803:650::/32
+2803:9d0::/32
 2803:d50::/32
 2803:f00::/32
 2803:f50::/32
@@ -44570,7 +44578,6 @@
 2404:6f40::/32
 2404:7000::/32
 2404:8300::/32
-2404:abc0::/32
 2404:c040::/32
 2404:d400::/32
 2404:e2c0::/32
@@ -45235,6 +45242,7 @@
 2a07:f6c0::/29
 2a07:f700::/29
 2a07:fa80::/29
+2a07:ff40::/29
 2a09:23c0::/29
 2a09:2d40::/29
 2a09:5740::/29
@@ -54109,6 +54117,7 @@
 2602:81b:a000::/44
 2602:81b:b000::/40
 2602:81b:c000::/44
+2602:f614::/40
 2602:f616::/40
 2602:f617::/40
 2602:f618::/40
@@ -54962,6 +54971,7 @@
 2602:f9c7::/36
 2602:f9c8::/40
 2602:f9c9::/40
+2602:f9ca::/36
 2602:f9cb::/40
 2602:f9cc::/40
 2602:f9cd::/40
@@ -56242,7 +56252,9 @@
 2604:1380::/32
 2604:13a0::/32
 2604:13e0::/32
+2604:1420::/32
 2604:1440::/32
+2604:1460::/32
 2604:1480::/32
 2604:14c0::/32
 2604:1540::/32
@@ -59379,7 +59391,6 @@
 2607:f2d0::/32
 2607:f2d8::/32
 2607:f2f8::/32
-2607:f308::/32
 2607:f310::/32
 2607:f318::/32
 2607:f330::/32
@@ -62880,7 +62891,6 @@
 2a13:8340::/29
 2a13:9740::/29
 2a13:b480::/29
-2a13:c000::/29
 2a13:d080::/29
 2a13:d8c0::/29
 2a13:e380::/29