From dc371604ca343fb185b031fe5009ee03fcc4e44b Mon Sep 17 00:00:00 2001
From: gently <1243610+gentlyxu@users.noreply.github.com>
Date: Sat, 8 Feb 2020 12:26:58 +0800
Subject: [PATCH] fix regular expression errors

---
 adblock-for-dnsmasq.conf  |  2 +-
 anti-ad-domains.txt       |  2 +-
 anti-ad-easylist.txt      | 13 ++++++-------
 anti-ad-surge.txt         |  2 +-
 tools/easylist-extend.php | 10 +++++-----
 5 files changed, 14 insertions(+), 15 deletions(-)

diff --git a/adblock-for-dnsmasq.conf b/adblock-for-dnsmasq.conf
index 3a01b62b..8342c233 100644
--- a/adblock-for-dnsmasq.conf
+++ b/adblock-for-dnsmasq.conf
@@ -1,4 +1,4 @@
-#VER=20200208035912
+#VER=20200208042322
 #URL=https://github.com/privacy-protection-tools/anti-AD
 address=/0024aaaa.com/
 address=/0026645142c89aeb1.com/
diff --git a/anti-ad-domains.txt b/anti-ad-domains.txt
index 4268c33f..f0adddc5 100644
--- a/anti-ad-domains.txt
+++ b/anti-ad-domains.txt
@@ -1,4 +1,4 @@
-#VER=20200208035912
+#VER=20200208042322
 #URL=https://github.com/privacy-protection-tools/anti-AD
 0024aaaa.com
 0026645142c89aeb1.com
diff --git a/anti-ad-easylist.txt b/anti-ad-easylist.txt
index 7731b9ba..88a644e0 100644
--- a/anti-ad-easylist.txt
+++ b/anti-ad-easylist.txt
@@ -1,5 +1,5 @@
 !AdBlock-style blocklists
-!VER=20200208035912
+!VER=20200208042322
 !URL=https://github.com/privacy-protection-tools/anti-AD
 ||201*.myhard.com^
 ||8*.tianya.cn^
@@ -1203,7 +1203,7 @@
 ||924e60106cd9d0e.com^
 ||927a8dd1afec73.com^
 ||9376ec23d50b1.com^
-/^9377[a-z]{2}\.com$/
+/9377[a-z]{2}\.com$/
 ||939237cdc62078.com^
 ||93c8c9a28e1db445.com^
 ||93manhua.com^
@@ -2857,7 +2857,7 @@
 ||affiliate-b.com^
 ||affiliate-gate.com^
 ||affiliate-robot.com^
-/^affiliat(es|ion|e)\./
+/^([a-z0-9\-\.]+\.)?affiliat(es|ion|e)\./
 ||rss.dtiserv.com^
 ||count.upc.rakuten.co.jp^
 ||rd.rakuten.co.jp^
@@ -2907,7 +2907,7 @@
 ||afftrack.com^
 ||afftrk.online^
 ||affutdmedia.com^
-/^afgr[0-9]{1,2}\.com$/
+/afgr[0-9]{1,2}\.com$/
 ||afj0.com^
 ||afjlb.com^
 ||aflrm.com^
@@ -21689,7 +21689,7 @@
 ||syicirtpxosk.com^
 ||sykc.madeindesign.ch^
 ||sykty.com^
-/^syma[a-z]\.cn$/
+/syma[a-z]\.cn$/
 ||symbiosting.com^
 ||symkashop.ru^
 ||synacast.com^
@@ -22532,7 +22532,6 @@
 ||trackedlink.net^
 ||trackedweb.net^
 ||tracker-id.cdiscount.com^
-||tracker.affiliate.iqoption.com^
 ||tracker.affirm.com^
 ||tracker.anandtech.com^
 ||tracker.azet.sk^
@@ -26426,7 +26425,7 @@
 ||zzyonghao.com^
 ||up.qingdaonews.com^
 ||018520.com^
-/^01daa\.[a-z]+\.com$/
+/01daa\.[a-z]+\.com$/
 ||6a4cc.luytr.com^
 ||e98fe.luytr.com^
 ||0x5.me^
diff --git a/anti-ad-surge.txt b/anti-ad-surge.txt
index 857cb268..fc8fab29 100644
--- a/anti-ad-surge.txt
+++ b/anti-ad-surge.txt
@@ -1,4 +1,4 @@
-#VER=20200208035912
+#VER=20200208042322
 #URL=https://github.com/privacy-protection-tools/anti-AD
 DOMAIN-SUFFIX,0024aaaa.com
 DOMAIN-SUFFIX,0026645142c89aeb1.com
diff --git a/tools/easylist-extend.php b/tools/easylist-extend.php
index 57bfe00d..6ccceae0 100644
--- a/tools/easylist-extend.php
+++ b/tools/easylist-extend.php
@@ -68,17 +68,17 @@ $ARR_MERGED_WILD_LIST = array(
 );
 
 $ARR_REGEX_LIST = array(
-    '/^01daa\.[a-z]+\.com$/' => null,
-    '/^9377[a-z]{2}\.com$/' => null,
+    '/01daa\.[a-z]+\.com$/' => null,
+    '/9377[a-z]{2}\.com$/' => null,
     '/^[1-3]\.[0-9a-z\.\-]+\.(com|cn|net|org|cc|me)$/' => null,
 //    '/^a1\.[0-9a-z\.]+\.(com|cn|org|net|me)$/' => null,
     '/^ad([0-9]|m|s)?\./' => null,
-    '/^affiliat(es|ion|e)\./' => null,
-    '/^afgr[0-9]{1,2}\.com$/' => null,
+    '/^([a-z0-9\-\.]+\.)?affiliat(es|ion|e)\./' => null,
+    '/afgr[0-9]{1,2}\.com$/' => null,
     '/^analytics(\-|\.)/' => null,
     '/^counter(\-|\.)/' => null,
     '/^pixels?\./' => null,
-    '/^syma[a-z]\.cn$/' => null,
+    '/syma[a-z]\.cn$/' => null,
     '/^widgets?\./' => null,
     '/^(web)?stats?\./' => null,
     '/^track(ing)?\./' => null,