diff --git a/AdGuard Home Compilation List/AGHtest.py b/AdGuard Home Compilation List/AGHtest.py index 8dff15e41..764bea0c5 100644 --- a/AdGuard Home Compilation List/AGHtest.py +++ b/AdGuard Home Compilation List/AGHtest.py @@ -216,12 +216,6 @@ def prepare_agh(lines) -> str: line ) - line = re.sub( - r"^[/\\].*", - r"", - line - ) - line = re.sub( r"@?@?\|\|.*/.*", r"", @@ -289,7 +283,37 @@ def prepare_agh(lines) -> str: ) line = re.sub( - r"^[,=^/?~].*", + r"^[,=^?~_].*", + r"", + line + ) + + line = re.sub( + r"^/[a-zA-Z0-9_!?~].*", + r"", + line + ) + + line = re.sub( + r"https\?:\\/\\/", + r"", + line + ) + + line = re.sub( + r"\\//$", + r"/", + line + ) + + line = re.sub( + r"^[./*|-]$", + r"", + line + ) + + line = re.sub( + r"^/\*.*$", r"", line ) @@ -565,12 +589,6 @@ def prepare_ip(lines) -> str: line ) - line = re.sub( - r"^[/\\].*", - r"", - line - ) - line = re.sub( r"^@@.*[a-z].*", r"", @@ -579,7 +597,7 @@ def prepare_ip(lines) -> str: line = re.sub( r"\[Adblock Plus 3\.4\]", - "! Title: IP Entries from Adblock Lists\n! Contains transformated entries from: EasyList, uBlock Filters, uBlock Filters - Badware Risks, Nano Defender Integration, Liste FR, I Don't Care About Cookies, EasyList Germany, ABP Anti-Circumvention Filters\n! Expires: 14 days\n! Licence: In accordance with the Dandelicence, the borrowed entries are considered to have been changed and reduced enough from their original lists, that they're counted as transformative work, meaning that creditation and seperate paragraphs are not necessary unless one of the lists' makers were to ask for such.\n! Description: This was made as a proof-of-concept to see if the IP-based entries of major adblock lists, could be used to create an IP adblocker list for IP blockers, despite how IP lists are normally only meant to block malware, E-mail spam, or port scanners.", + "! Title: IP Entries from Adblock Lists\n! Contains transformated entries from: EasyList, uBlock Filters, uBlock Filters - Badware Risks, Nano Defender Integration, Liste FR, I Don't Care About Cookies, EasyList Germany, and ABP Anti-Circumvention Filters\n! Expires: 14 days\n! Licence: In accordance with the Dandelicence, the borrowed entries are considered to have been changed and reduced enough from their original lists, that they're counted as transformative work, meaning that creditation and seperate paragraphs are not necessary unless one of the lists' makers were to ask for such.\n! Description: This was made as a proof-of-concept to see if the IP-based entries of major adblock lists, could be used to create an IP adblocker list for IP blockers, despite how IP lists are normally only meant to block malware, E-mail spam, or port scanners.", line ) @@ -595,6 +613,30 @@ def prepare_ip(lines) -> str: line ) + line = re.sub( + r"\\.\(\\d\)\{1,3\}\\.\(\\d\)\{1,3\}\\.\(\\d\)\{1,3\}\\//", + r".0.0.0/8", + line + ) + + line = re.sub( + r"/\^https\?:\\/\\/", + r"", + line + ) + + line = re.sub( + r"\(([0-9][0-9]?[0-9]?)\|([0-9][0-9]?[0-9]?)\)(.0.0.0/8)", + r"\1\3\n\2\3", + line + ) + + line = re.sub( + r"^[/a-z.([]..*", + r"", + line + ) + if is_supported_ip(line) and not line == '': text += line + '\r\n' diff --git a/AdGuard Home Compilation List/AdGuardHomeCompilationList.txt b/AdGuard Home Compilation List/AdGuardHomeCompilationList.txt index cd0e78356..97727e49f 100644 --- a/AdGuard Home Compilation List/AdGuardHomeCompilationList.txt +++ b/AdGuard Home Compilation List/AdGuardHomeCompilationList.txt @@ -1,7 +1,7 @@ [Adblock Plus 3.4] ! Title: Dandelion Sprout's AdGuard Home Compilation List ! Contains modified entries from: EasyList, uBlock Filters, uBlock Filters - Badware Risks, Nano Defender Integration, Liste FR, I Don't Care About Cookies, EasyList Germany, ABP Anti-Circumvention Filters, Adblock Warning Removal List, AdGuard Annoyances Web Push -! Version: 26December2019v1-Beta +! Version: 29December2019v1-Beta ! Expires: 14 days ! Licence: In accordance with the Dandelicence, all of the borrowed lists' contents are to be treated as GPL-3.0 (https://www.gnu.org/licenses/gpl-3.0.html), except for Liste FR's entries which are to be treated as CC BY-NC-SA 3.0 (https://creativecommons.org/licenses/by-nc-sa/3.0/). Known credits in accordance with attribution requirements, are The EasyList Authors (EasyList^², Adblock Warning Removal List), Raymond Hill (uBlock Filters^²), Hugo Xu (Nano Defender Integration), smed79 (Liste FR), Daniel Kladnik (I Don't Care About Cookies), monztA & friends (ABP Anti-Circumvention Filters), and Adguard Software Limited (AdGuard Annoyances Web Push) ! Description: AdGuard Home is one of the tools for the future, or at least it is for those who know how to set up and use a Raspberry Pi. However, its current internal structure discards virtually every $-using block rule (e.g. EasyList), which makes EasyList and similar lists virtually useless in AdGuard Home, despite how many of the entries would be ≥90% as functional without them. So until the AdGuard Home team implements a better way to deal with $ values, here's my intermissional list to work around it. @@ -10,10 +10,10 @@ @@||9anime.*^ ! —————————————————————————————————————————————— [Adblock Plus 2.0] -! Checksum: Pwvlmw6daud3hbmw1WNcUg -! Version: 201912260351 +! Checksum: zQm3r94otw36iWrhGwWuEA +! Version: 201912292001 ! Title: EasyList without element hiding rules -! Last modified: 26 Dec 2019 03:51 UTC +! Last modified: 29 Dec 2019 20:01 UTC ! Expires: 4 days (update frequency) ! Homepage: https://easylist.to/ ! Licence: https://easylist.to/pages/licence.html @@ -558,6 +558,7 @@ ||adonly.com^ ||adonnews.com^ ||adonweb.ru^ +||adop.pw^ ||adoperator.com^ ||adopshost.me^ ||adoptim.com^ @@ -1056,6 +1057,7 @@ ||animits.com^ ||aniview.com^ ||anonymousads.com^ +||antburape.club^ ||antdivisitlodg.info^ ||antivirustoolext.com^ ||anwufkjjja.com^ @@ -1121,6 +1123,7 @@ ||aso1.net^ ||asooda.com^ ||aspampbrr.online^ +||aspartbus.site^ ||asperencium.com^ ||aspignitean.com^ ||asrety.com^ @@ -1395,6 +1398,7 @@ ||bnrslks.com^ ||bnserving.com^ ||boashesu.net^ +||bobarmale.online^ ||bodaimen.com^ ||bodelen.com^ ||bogads.com^ @@ -2174,6 +2178,7 @@ ||effectivemeasure.net^ ||egamingonline.com^ ||egamiplatform.tv^ +||ehu96t2p.com^ ||ejoonsoo.net^ ||ek8k5dst5c.com^ ||ekansovi.com^ @@ -2943,6 +2948,7 @@ ||indicate.to^ ||indieclick.com^ ||indisancal.com^ +||indlzxgptf.com^ ||indofad.com^ ||industrybrains.com^ ||inentasky.com^ @@ -3071,6 +3077,7 @@ ||jeekeglu.net^ ||jeetyetmedia.com^ ||jemmgroup.com^ +||jerredsite.pro^ ||jettags.rocks^ ||jewhaulr.com^ ||jewishcontentnetwork.com^ @@ -3200,7 +3207,9 @@ ||ladbrokesaffiliates.com.au^ ||ladsbrown.com^ ||ladsinfo.com^ +||ladskiz.com^ ||ladslims.com^ +||ladsokz.com^ ||laim.tv^ ||lakequincy.com^ ||lakidar.net^ @@ -4058,6 +4067,7 @@ ||partypartners.com^ ||partypoker.com^ ||pas-rahav.com^ +||passeura.com^ ||passionfruitads.com^ ||passive-earner.com^ ||patecrafts.com^ @@ -4697,6 +4707,7 @@ ||s2blosh.com^ ||s2d6.com^ ||s7c66wkh8k.com^ +||s99i.org^ ||sa.entireweb.com^ ||sa2eoqu.bid^ ||saboopiz.net^ @@ -4769,6 +4780,7 @@ ||sellhealth.com^ ||sellously.info^ ||selloweb.com^ +||selltrafficfor.me^ ||selsin.net^ ||semanticrep.com^ ||semi-cod.com^ @@ -5600,6 +5612,7 @@ ||vizaiced.net^ ||vkaofq64zz.com^ ||vkoad.com^ +||vnrherdsxr.com^ ||vntsm.com^ ||voagapti.com^ ||voajewhe.net^ @@ -5886,6 +5899,7 @@ ||yourquickads.com^ ||youwatchtools.com^ ||ypreferred.com^ +||yqezqofkb1nnmz.com^ ||yr9n47004g.com^ ||ysnj74ed.com^ ||ytsa.net^ @@ -6021,6 +6035,7 @@ ! Document blocks ||7dp6g2rqzn.com^ ||7lyonline.com^ +||andbaybay.club^ ||arrlnk.com^ ||bemobpath.com^ ||bidverdrd.com^ @@ -8127,6 +8142,7 @@ ||bddaxoaaco.bid^ ||bddfeltry.bid^ ||bdggxjonzbmq.com^ +||bdhbtrizb.com^ ||bdhxpxohwssdfd.com^ ||bdisnqwfcq.com^ ||bdkduogsu.bid^ @@ -9133,6 +9149,7 @@ ||derpqpyvym.bid^ ||derqboxqca.com^ ||deuqpxrht.com^ +||devjbzfd.com^ ||dewltdgzgtt.com^ ||dexxxrggi.com^ ||deyzjaiggwz.com^ @@ -9172,6 +9189,7 @@ ||dgowzelhoaqqb.com^ ||dgqktjmxtlp.com^ ||dgrvnlhz.com^ +||dgtmyxfuzwtr.com^ ||dgtnoyoud.com^ ||dgucunmuibx.com^ ||dgufzszbsk.bid^ @@ -10089,6 +10107,7 @@ ||ffvghouburgijz.bid^ ||ffvvapasfcoha.bid^ ||ffwbpadvkcyi.com^ +||ffwlbiabff.com^ ||ffwnxfezobeoi.com^ ||ffxobftzaiogcg.com^ ||fgbmbyqmdgr.com^ @@ -11557,6 +11576,7 @@ ||iewsaprgerkjny.com^ ||ifaklabnhplb.com^ ||ifbhceoxx.com^ +||ifbubmsr.com^ ||ifbwyogrfjo.com^ ||ifdmdfqysaacqa.com^ ||ifecuwzjajkiq.com^ @@ -12028,6 +12048,7 @@ ||jdouzzxkyukv.com^ ||jdpqtgvzsoy.com^ ||jdrckkbpb.com^ +||jdrftaau.com^ ||jdrlnicvn.com^ ||jdskyjntuhea.com^ ||jdtufqcyumvb.com^ @@ -12744,6 +12765,7 @@ ||kpsdnlprwclz.com^ ||kpucctqryjdvx.bid^ ||kpwhkeehpsp.bid^ +||kpwjczeaajnhsc.com^ ||kpwjtpgvowifq.com^ ||kpzsyqhje.com^ ||kpzvcvclybfa.com^ @@ -13399,6 +13421,7 @@ ||lvlotqtrygwi.com^ ||lvlvpdztdnro.com^ ||lvmnxohz.com^ +||lvnsxvdrwyv.com^ ||lvpcqndtdk.bid^ ||lvpdchbxgoral.bid^ ||lvrvufurxhgp.com^ @@ -13981,6 +14004,7 @@ ||mzzouiciajems.com^ ||naaifqdqsnxtsp.com^ ||naavxddd.com^ +||nafgiaui.com^ ||nahixtmnmpcz.com^ ||nahpewniig.com^ ||nahvyfyfpffm.com^ @@ -14161,6 +14185,7 @@ ||nkxdyorwbt.com^ ||nkyafqufx.com^ ||nkyngrtleloc.com^ +||nlbnegea.com^ ||nlcfowfz.com^ ||nlcriuncacyys.com^ ||nlduyricoemfc.bid^ @@ -14908,6 +14933,7 @@ ||paruvaubxwwz.bid^ ||patlgfvxkto.com^ ||patuarioahzaen.bid^ +||paupbxxmhh.com^ ||pawxrbexeylzn.com^ ||paxshqxkamhkh.com^ ||payrfnvfofeq.com^ @@ -16648,6 +16674,7 @@ ||srhovuokux.com^ ||sriaqmzx.com^ ||srizwhcdjruf.com^ +||srjbxbkwn.com^ ||srkdunvxun.com^ ||srksyzqzcetq.com^ ||srlmbvfmvl.com^ @@ -17357,6 +17384,7 @@ ||udbtmvuoncdtrg.com^ ||udbwpgvnalth.com^ ||udcufwvt.com^ +||udmdtdjna.com^ ||udrwyjpwjfeg.com^ ||udvbtgkxwnap.com^ ||udvxwimgqr.com^ @@ -17510,6 +17538,7 @@ ||umboffikfkoc.com^ ||umffsefd.bid^ ||umgbvaurcx.com^ +||umhpzzloestt.com^ ||umjdbaog.bid^ ||umlrvgjkexv.com^ ||umnsvtykkptl.com^ @@ -18054,6 +18083,7 @@ ||vnadjbcsxfyt.com^ ||vncvownr.bid^ ||vndfakned.com^ +||vndgfycu.com^ ||vndrcewnard.com^ ||vnekbyzxamo.bid^ ||vnfdwoljzoaer.com^ @@ -18069,6 +18099,7 @@ ||vnrapyiaxxj.com^ ||vntcxqxuqki.com^ ||vnufxjwndhsfbj.com^ +||vnwqrcvud.com^ ||vnyginzinvmq.com^ ||vnzlgmfd.com^ ||voaalhaobdl.com^ @@ -18084,6 +18115,7 @@ ||voqkuiowjtkwgc.com^ ||vouekcjmiu.com^ ||vouzgwau.com^ +||vowqesvqjwxc.com^ ||voxnrvzwy.com^ ||voxucaldgpicqh.com^ ||vpfadnueru.com^ @@ -18685,6 +18717,7 @@ ||wubdkryfkr.com^ ||wucbuvitibyiy.com^ ||wuekfshqhydg.bid^ +||wufcygryt.com^ ||wufpseev.bid^ ||wugwwcqjdfa.com^ ||wuldvrdfie.com^ @@ -18873,6 +18906,7 @@ ||xdjefibopixf.com^ ||xdlmsvhhsvsp.com^ ||xdltrwavzxn.com^ +||xdnpghwspxnift.com^ ||xdonzpjglqxi.com^ ||xdoygumiams.com^ ||xdqjeggqm.com^ @@ -18882,6 +18916,7 @@ ||xdsydkgkbvwq.com^ ||xdtliokpaiej.com^ ||xdurrrklybny.com^ +||xdvbhfkeib.com^ ||xdwqixeyhvqd.com^ ||xdxzfqxudc.com^ ||xdzccbxbmja.bid^ @@ -19006,6 +19041,7 @@ ||xkzzkxntmryst.com^ ||xlauvkqs.bid^ ||xlavzhffzwgb.com^ +||xlbbhdarc.com^ ||xlbosrttvas.bid^ ||xlcnavkhn.bid^ ||xlhhbtve.com^ @@ -19711,6 +19747,7 @@ ||yxngmwzubbaa.com^ ||yxoorrcfamz.bid^ ||yxpkzxyajjan.com^ +||yxsrshkmgiyn.com^ ||yxsyvsqrkbdqym.com^ ||yxtdupqc.bid^ ||yxvuvzrz.com^ @@ -19918,6 +19955,7 @@ ||ziuxkdcgsjhq.com^ ||ziyuakulwtwn.bid^ ||zizmvnytmdto.com^ +||ziznjduvyqygtk.com^ ||zjdnwisfiin.bid^ ||zjefjxjukiasd.com^ ||zjejoxqte.com^ @@ -21203,6 +21241,7 @@ ||angege.com^ ||annualinternetsurvey.com^ ||answered-questions.com^ +||anyinstalldealtheclicks.icu^ ||aocular.com^ ||apendit.com^ ||approp.pro^ @@ -21638,6 +21677,7 @@ ||mk-ads.com^ ||mktmobi.com^ ||mmo123.co^ +||mob1ledev1ces.com^ ||mobileraffles.com^ ||mobilevq.com^ ||mobsterbird.info^ @@ -22044,6 +22084,7 @@ ||voluumtrk.com^ ||voluumtrk3.com^ ||voxfind.com^ +||vpnfortorrents.cc^ ||vpnfortorrents.com^ ||vq40567.com^ ||vzoozv.com^ @@ -22103,6 +22144,7 @@ ||216.21.13. ||5.45.79.15^ ! IP Regex (commonly used, hax'd IP addresses) +/^(35|104)\.(\d){1,3}\.(\d){1,3}\.(\d){1,3}/ ! *** easylist:easylist_adult/adult_adservers.txt *** ||0gw7e6s3wrao9y3q.pro^ ||0llii0g6.com^ @@ -24490,6 +24532,7 @@ ! streamp1ay.me ||yontent.powvideo.net^ ! mangareader +/^.*mangareader\.net\/.{12,}/ ! moviesweb ! 4downfiles.org ! bayfiles.com @@ -24652,6 +24695,8 @@ ! mac-torrent-download.net ! linkshrink.net ! Filenuke/sharesix +/\.filenuke\.com/.*[a-zA-Z0-9]{4}/ +/\.sharesix\.com/.*[a-zA-Z0-9]{4}/ ! Game Empire Enterprises ! Zippyshare ! vidzi.tv @@ -24787,6 +24832,7 @@ ! tbib.org ! txxx network ! motherless +/^motherless\.com\/[a-z0-9A-Z]{3,}\.[a-z0-9A-Z]{2,}\_/ ! (/sw.js) ! pornhive.tv ! wetplace.com @@ -25483,7 +25529,9 @@ ! https://github.com/jspenguin2017/uBlockProtector/issues/871 ||aidalbark.site^ ||class2deal.com^ +||psitchie.com^ ||sadsoks.com^ +! https://github.com/uBlockOrigin/uAssets/issues/6738 ! https://github.com/uBlockOrigin/uAssets/issues/605 ! https://forums.lanik.us/viewtopic.php?f=62&t=38997 ! https://github.com/jspenguin2017/uBlockProtector/issues/781 @@ -26305,6 +26353,7 @@ ! https://github.com/NanoMeow/QuickReports/issues/363 ! https://github.com/uBlockOrigin/uAssets/issues/1632 ! https://github.com/uBlockOrigin/uAssets/issues/1634 +! https://github.com/uBlockOrigin/uAssets/issues/6749 ! https://github.com/uBlockOrigin/uAssets/issues/1637 ! https://github.com/uBlockOrigin/uAssets/issues/4039 ! https://github.com/NanoMeow/QuickReports/issues/911 @@ -28357,6 +28406,8 @@ ! https://github.com/uBlockOrigin/uAssets/issues/4268#issuecomment-446770321 ! https://github.com/uBlockOrigin/uAssets/issues/4308 ! https://github.com/gorhill/uBO-Extra/issues/111 +/^https://www\.narcity\.com/assets/[0-9a-f]{24,}\.js/ +/^https://www\.mtlblog\.com/assets/[0-9a-f]{24,}\.js/ ! https://github.com/uBlockOrigin/uAssets/issues/4310 ! https://github.com/uBlockOrigin/uAssets/issues/4313 ! https://github.com/uBlockOrigin/uAssets/issues/4312 @@ -29353,6 +29404,7 @@ ||afletedly.info^ ! torrentsave .live popups ! https://github.com/uBlockOrigin/uAssets/issues/5243 +||mavq.net^ ! https://github.com/uBlockOrigin/uAssets/issues/5245 ! https://github.com/uBlockOrigin/uAssets/issues/5247 ! schwarzwaelder-bote.de anti adb @@ -29742,6 +29794,8 @@ ! https://github.com/uBlockOrigin/uAssets/issues/5525 ! https://www.reddit.com/r/uBlockOrigin/comments/bktgby/how_i_can_get_rid_of_blockadblock/ ! https://github.com/uBlockOrigin/uAssets/issues/5527 +! https://github.com/NanoMeow/QuickReports/issues/2585 +||cadspmz.com^ ! https://github.com/NanoMeow/QuickReports/issues/1151 ! https://github.com/uBlockOrigin/uAssets/issues/5528 ! https://github.com/NanoMeow/QuickReports/issues/1152 @@ -31416,6 +31470,7 @@ ! https://forums.lanik.us/viewtopic.php?f=114&t=44101#p151985 ! https://github.com/NanoMeow/QuickReports/issues/2517 ! https://old.reddit.com/r/uBlockOrigin/comments/ecd6id/removing_scrollblock_on_tagesanzeigerch/ +! https://github.com/uBlockOrigin/uAssets/issues/6755 ! https://github.com/NanoMeow/QuickReports/issues/2518 ! https://github.com/NanoMeow/QuickReports/issues/2521 ! https://github.com/NanoMeow/QuickReports/issues/2524 @@ -31461,10 +31516,28 @@ ! https://github.com/uBlockOrigin/uAssets/issues/6728 ! https://github.com/AdguardTeam/AdguardFilters/issues/46560 ! https://github.com/uBlockOrigin/uAssets/issues/6732 +! https://github.com/uBlockOrigin/uAssets/issues/6747 +||albado.xyz^ +! https://github.com/NanoMeow/QuickReports/issues/2572 +! https://github.com/NanoMeow/QuickReports/issues/2573 +! https://github.com/uBlockOrigin/uAssets/issues/6736 +! https://github.com/NanoMeow/QuickReports/issues/2575 +! https://github.com/uBlockOrigin/uAssets/issues/6750 +! https://github.com/AdguardTeam/AdguardFilters/issues/46676 +! https://github.com/NanoMeow/QuickReports/issues/2579 +! https://github.com/NanoMeow/QuickReports/issues/2582 +||myopenads.com^ +||roda.site^ +! https://github.com/NanoMeow/QuickReports/issues/2570 +! https://github.com/NanoMeow/QuickReports/issues/2570#issuecomment-569387628 +! https://github.com/uBlockOrigin/uAssets/issues/6754 +! plytv.me popups +! https://github.com/NanoMeow/QuickReports/issues/2589 +! https://github.com/uBlockOrigin/uAssets/issues/6761 [Nano Adblocker] ! Title: Nano Defender Integration ! Expires: 3 days -! Cached: Sat, 09 Nov 2019 04:37:50 GMT +! Cached: Sat, 28 Dec 2019 22:37:17 GMT ! License: See source for license and credits ! Source: https://github.com/jspenguin2017/uBlockProtector/tree/master/list ! This file is a compiled binary, do not modify @@ -31719,13 +31792,16 @@ MoatFreeWheelJSPEM.js* ! https://www.2-spyware.com/remove-redirector-gvt1-com.html ! https://github.com/uBlockOrigin/uAssets/issues/5187 ||check-prizes-now2.life^ -! Lapsed domain that once hosted adblock lists, several of whom are now used for bad purposes +! Lapsed domains that once hosted adblock lists, several of whom are now used for bad purposes ! https://github.com/uBlockOrigin/uAssets/issues/5307 ||adblock.gjtech.net^ ||spam404bl.com^ ||securemecca.com^ ||hufilter.hu^ ||fredfiber.no^ +! https://github.com/uBlockOrigin/uAssets/pull/6757 +||1hos.cf^ +||1hosts.cf^ ! Badware ||kuhoot.it^ ||getawesome6.com^ @@ -31853,9 +31929,13 @@ MoatFreeWheelJSPEM.js* ! https://howtoremove.guide/redirector-gvt1-com-virus-malware-chrome-removal/ ! https://howtoremove.guide/redirector-gvt1-com-virus-malware-chrome-removal/ (German version only) ! https://www.2-spyware.com/remove-redirector-gvt1-com.html +! https://github.com/NanoMeow/QuickReports/issues/2522 +||browser-update.*.top^ +! https://github.com/uBlockOrigin/uAssets/pull/6757 +||katie.tncrun.net^ [Adblock Plus 2.0] -! Checksum: zebVCnOHoTNJiebe0yJwdA -! Version: 201912260343 +! Checksum: EqesHtVIbMBO4Ud/wg6msw +! Version: 201912291953 ! Title: Liste FR ! Expires: 1 days ! Description: Filtres francophones complémentaires à EasyList @@ -31865,11 +31945,14 @@ MoatFreeWheelJSPEM.js* ! dans le forum : https://forums.lanik.us/viewforum.php?f=91 ! ou via e-mail : listefr.adblock at gmail point com !----------------------- Filtres génériques ----------------------! +/#ads| +/.s/flash/bnr/* +//adsconfig. +//ylx-aff. +-partenaire- .php? ://aclick. ://ad-start. -. -. ://adlik. ://adlik2. ://ads-js. @@ -31891,11 +31974,9 @@ MoatFreeWheelJSPEM.js* ://banners3. ://bannieres. ://be.ads. -- ://ca.ads. ://cdn.ad. ://cdn.ads. -_camp. ://crm4d. ://dc.ads. .php? @@ -31915,9 +31996,6 @@ _camp. ://regiepub. ://report-ads-to. ://rotator. -. -. -. ://soads. ://sync.adaptv. ://syndication. @@ -31930,13 +32008,26 @@ _camp. ! prisjakt ads widgets ||widgets.prisjakt.nu^ ! exads +/\.(com|fr|net|org|tv|xxx)\/floader\.js$/ ! omsnative ! nsfw ! Siropu ads manager ! regex +/\.(asia|club|co|com|net|pro)\/[0-9a-zA-Z]{64}$/ +/\.(club|com|es|fr|net|org|xxx|xyz)\/data\/[0-9a-f]{32}\/[0-9a-f]{32}\.(gif|jpg)$/ +/\.canal-plus\.net\.s0\.frz\.io\/image\/[\d]{2}\/[\d]{1}\/[\d]{6}\.jpg/ +/\.com\/[0-9a-z]{8}\.js#spot\=[0-9]{5}$/ +/\/(license|script)\.\d{1,5}\.js/ +/\/[a-z]{1,3}\?zoneId\=\d{7}\-\d{7}$/ +/\/cpanel\/b\.php\?t\=[0-9a-zA-Z]{24,}&index=[0-9]{1,6}/ +/^[0-9a-z]{8,14}\.com\/([0-9a-z]{8})\?key\=([0-9a-f]{32})$/ +/^www\.[a-z]{8,14}\.(bid|club|co|me|pro|xyz)\/[a-z]{1,12}\.js$/ ! CDN filters +Serve/* ! TLD !------------------------ Génériques popup -----------------------! +Redirect. +&hosted= ://aclick. ://ads2. ://adv-mybankai. @@ -31947,10 +32038,12 @@ _camp. ://pdv. ://pop. ://pops. -- ://syndication. -. ! regex popups +/\.cloudfront\.net\/[a-z]{4,6}\.[a-z]{3,4}\?u\=\-?[0-9]{15,22}\&[a-z]{1}\=[0-9a-z]{32}/ +/\/watch\?key\=([0-9a-f]{32})$/ +/^http:\/\/[0-9a-z\-]+\.[a-z]{6,8}\.ru\/js\/[0-9a-zA-Z%]{450,}$/ +/^http:\/\/[0-9a-z]+\.ru\/go\/[0-9a-f]{22}\?.*\&vid\=/ ||debugger: ! TLD popups !----------------------- Annonceurs -----------------------! @@ -33763,6 +33856,9 @@ _camp. ||pblv-scoop.cf^$~image ||pblv-scoop.tk^ ! propellerads +/^[0-9a-z\-]+\.(click|com|cricket|bid|date|download|link|men|network|online|party|racing|review|site|space|stream|top|trade|uk|webcam|website|win|xyz)\/[0-9]{1}\/[0-9]{7}\/\?var\=[0-9]{7}$/ +/^[0-9a-z\-]+\.(com|net)\/[0-9]{1}\/[0-9]{7}$/ +/^[0-9a-z\-]+\.(com|net)\/[0-9]{5,8}\.html\?q$/ ||059e025e7484.com^ ||0879dbbeb31e0c83d.com^ ||09fee6914d1b6450885.com^ @@ -34419,8 +34515,10 @@ _camp. ||trourted.pro^ ||wiresurequezer.pro^ ! MJPops +/^[0-9a-z]{5,25}\.(click|com|bid|date|download|men|network|online|party|racing|review|site|space|stream|top|trade|webcam|website|win|xyz)\/[a-z]\/[0-9a-f]{32}\.js\?id=[0-9]{6}$/ ||s85n4btydl.online^ ! admaven +/^[0-9a-z]{5,18}\.(click|club|info|one|online|pro|space|top)\/([0-9a-zA-Z\.\+\/%]){130,180}/,other ||abarrange.info^ ||abourself.com^ ||achiname.info^ @@ -34682,6 +34780,9 @@ _camp. ||yoursinfo.info^ ||zeliteral.info^ ! admeasures.com +/^[a-z0-9]{5,15}\.(click|com|bid|net|online|top|club)\/[0-9a-f]{32}\.js$/ +/^[a-z0-9]{5,15}\.(click|com|bid|net|online|top|club)\/[0-9a-z]{8,12}\?key\=[0-9a-f]{32}$/ +/^[a-z]{6,9}\.(online|pw|xyz)\/[0-9a-zA-Z]{12,16}\/[0-9]{4,6}$/ ||01jud3v55z.com^ ||080jxrab.top^ ||0azx1.com^ @@ -35587,6 +35688,7 @@ _camp. ||wpognfds.xyz^ ||zrefmeee.xyz^ ! TeaserNet +/^[a-z]{5,7}\.com\/[0-9a-z]{36}\/[0-9a-z]{15}\.js\?[0-9]{6}\&[0-9]{6}&[a-z]{5,7}\.com$/ ! daisycon.com ||ds1.nl^ ||dt51.net^ @@ -35623,6 +35725,7 @@ _camp. ||lalapul2.com^ ||5081.site^ ||kirkir.xyz^ +/^[a-zA-Z0-9\-]{10,18}\.pro\/v(1|2)\/a\/pop\/js\/[0-9]{5}$/ ||0gw7e6s3wrao9y3q.pro^ ||1b9cvfi0nwxqelxu.pro^ ||1zlyetcck7klyuy9.pro^ @@ -37657,6 +37760,7 @@ _camp. ! tf1.fr ! orange.fr ! jacquieetmichel.fr +/^(www\.desinhibition\.com|www\.jacquieetmichel\.net|www\.jacquieetmicheltv\.net|www\.jacquieetmicheltv2\.net|www\.lavideodujourjetm\.net|www\.pornovoisines\.com|www\.tonpornodujour\.com|www\.voyeurfrance\.net)\/[0-9a-z]+(.html)?$/ ! Auto short link scripts ||123lnk.com^ ||4top.in^ @@ -37895,6 +37999,8 @@ _camp. ! Filtres de réécriture de ressources internes pour Adblock Plus ! amazonaws.com ! cloudfront.net +/^[a-z0-9]+\.cloudfront\.net\/.*[a-zA-Z0-9+\-\/]{200,}/ +/^[a-z0-9]+\.cloudfront\.net\/\?[a-z]{5}\=\d{6}$/ ||d10hxp21ljytsr.cloudfront.net^ ||d10psrq44igbex.cloudfront.net^ ||d10zqflh5ol9cq.cloudfront.net^ @@ -38228,6 +38334,7 @@ _camp. ! facebook.com ! heures.be ! bebi script +/^([0-9a-z]+\.)?(animeland\.us|animenova\.org|animeplus\.tv|animewow\.org|gogoanime1\.com|gogoanime\.in|gogoanime\.to|gogoanime\.tv|gogoanimes\.co|goodanime\.co|igg-games\.com|kimcartoon\.to|kimcartoon\.tv|kiss-anime\.ws|mangareader\.net|readcomiconline\.to|thewatchcartoononline\.tv|toonget\.net|toonova\.net|watchcartoononline\.io)\/[a-z]+\/[0-9a-zA-Z\-\_]{15,50}$/ !----------------------- Exceptions -----------------------! ! Note : le but des exceptions de la Liste FR n'est en aucun cas de laisser passer des publicités, ! mais d'empêcher les possibles dysfonctionnements liés aux filtres bloquants présents ci-dessus. @@ -38469,10 +38576,10 @@ _camp. ||sdk.privacy-center.org ||cookies.algo.at ! FILTERLIST ONLY -! Checksum: bxo3U7h5VfwBRsIKn+cCyg -! Version: 201912260351 +! Checksum: D1gQZ7gAx7v/DIbj/mp4Eg +! Version: 201912292001 ! Title: EasyList Germany -! Last modified: 26 Dec 2019 03:51 UTC +! Last modified: 29 Dec 2019 20:01 UTC ! Expires: 1 days (update frequency) ! Homepage: https://easylist.github.io/ ! Licence: https://easylist.github.io/pages/licence.html @@ -39150,10 +39257,10 @@ _camp. ! Necessary for AdBlock for Safari to fix blocked slider on shop.rewe.de ! *** easylistgermany:easylistgermany/easylistgermany_whitelist_dimensions.txt *** ! *** easylistgermany:easylistgermany/easylistgermany_whitelist_popup.txt *** -! Checksum: NCLyze/cpZUPP83tOyN11Q -! Version: 201912260350 +! Checksum: rtqanEncMOuyQKq0KLenBQ +! Version: 201912292000 ! Title: ABP filters -! Last modified: 26 Dec 2019 03:50 UTC +! Last modified: 29 Dec 2019 20:00 UTC ! Expires: 1 hours (update frequency) ! Homepage: https://github.com/abp-filters/abp-filters-anti-cv ! Filter list designed to fight circumvention ads in Adblock Plus @@ -39309,10 +39416,10 @@ _camp. ! #10531 ! *** Fetched from: https://raw.githubusercontent.com/abp-filters/abp-filters-anti-cv/master/tamil.txt *** ! #9274 -! Checksum: 3CSJMo5vyRwM4szehfaxew -! Version: 201912260350 +! Checksum: enuw6S27yGeaKHMCAmyCyg +! Version: 201912292000 ! Title: Adblock Warning Removal List -! Last modified: 26 Dec 2019 03:50 UTC +! Last modified: 29 Dec 2019 20:00 UTC ! Expires: 1 days (update frequency) ! Homepage: https://easylist.to/ ! Licence: https://easylist.to/pages/licence.html diff --git a/AdGuard Home Compilation List/AdGuardHomeCompilationListIPs.txt b/AdGuard Home Compilation List/AdGuardHomeCompilationListIPs.txt index 07521a60e..b734cf815 100644 --- a/AdGuard Home Compilation List/AdGuardHomeCompilationListIPs.txt +++ b/AdGuard Home Compilation List/AdGuardHomeCompilationListIPs.txt @@ -1,9 +1,9 @@ ! Title: IP Entries from Adblock Lists -! Contains transformated entries from: EasyList, uBlock Filters, uBlock Filters - Badware Risks, Nano Defender Integration, Liste FR, I Don't Care About Cookies, EasyList Germany, ABP Anti-Circumvention Filters +! Contains transformated entries from: EasyList, uBlock Filters, uBlock Filters - Badware Risks, Nano Defender Integration, Liste FR, I Don't Care About Cookies, EasyList Germany, and ABP Anti-Circumvention Filters ! Expires: 14 days ! Licence: In accordance with the Dandelicence, the borrowed entries are considered to have been changed and reduced enough from their original lists, that they're counted as transformative work, meaning that creditation and seperate paragraphs are not necessary unless one of the lists' makers were to ask for such. ! Description: This was made as a proof-of-concept to see if the IP-based entries of major adblock lists, could be used to create an IP adblocker list for IP blockers, despite how IP lists are normally only meant to block malware, E-mail spam, or port scanners. -! Version: 26December2019v1-Alpha +! Version: 29December2019v1-Alpha 104.154.237.93 174.142.194.177 194.71.107.25 @@ -31,6 +31,8 @@ 185.147.34.126 216.21.13.0/24 5.45.79.15 +35.0.0.0/8 +104.0.0.0/8 195.228.74.26 206.217.206.137 212.150.34.117