X-Git-Url: http://www.privoxy.org/gitweb/?p=privoxy.git;a=blobdiff_plain;f=debian%2Fpatches%2F05_defaut_action.dpatch;h=941baac95664aba26229c77876a04d330d99bfd4;hp=f49dda5b6e07ec24bf971d06af3efb897bbbd304;hb=f4464cf737ef3de89c27a86c20595bebc802b29a;hpb=bc29e5b24b19ff1bd9f939c29c943632260e5bee

diff --git a/debian/patches/05_defaut_action.dpatch b/debian/patches/05_defaut_action.dpatch
index f49dda5b..941baac9 100644
--- a/debian/patches/05_defaut_action.dpatch
+++ b/debian/patches/05_defaut_action.dpatch
@@ -8,17 +8,29 @@
 diff -urNad privoxy~/default.action.master privoxy/default.action.master
 --- privoxy~/default.action.master
 +++ privoxy/default.action.master
-@@ -613,6 +613,8 @@
- .*[epu]ad*.
- county*.
- countr*.
-+#MASTER# Do not block Andorra ccTLD:
-+.ad
+@@ -1490,6 +1490,10 @@
+ #MASTER# REMARKS: Actionsfile feedback item #2043327 2008-08-08
+ # URL = http://kb.adobe.com/selfservice/viewContent.do?externalId=kb402747&sliceId=1
+ .adobe.com
++#MASTER# REMARKS: Debian Bug report #479525
++# URL = http://qa.debian.org/popcon.php
++qa.debian.org/popcon.php
++
  
  #############################################################################
- # Generic block patterns by path:
-@@ -1854,6 +1856,11 @@
- {+filter{tiny-textforms} +prevent-compression}
+ # Site-specific special rules:
+@@ -1917,6 +1921,9 @@
+ #MASTER# REMARKS: Exclude per Debian bug report #377843
+ # URL = http://blogs.msdn.com/wga/archive/2006/07/16/667063.aspx
+ blogs.msdn.com
++#MASTER# REMARKS: Exclude per Debian bug report #441256
++#MASTER# PROBLEM-URL: http://www.memo.de/
++www.memo.de
+ 
+ {-filter{unsolicited-popups}}
+ # Sticky Actions = -filter{unsolicited-popups}
+@@ -1958,6 +1965,11 @@
+ {+filter{tiny-textforms}}
  .sourceforge.net/tracker
  
 +{-filter{ie-exploits}}