merge Debian changes from 3.0.10 to 3.0.12.
[privoxy.git] / debian / patches / 05_defaut_action.dpatch
1 #! /bin/sh /usr/share/dpatch/dpatch-run
2 ## 05_default_action.dpatch by Roland Rosenfeld <roland@debian.org>
3 ##
4 ## All lines beginning with `## DP:' are a description of the patch.
5 ## DP: Serveral changes/additons to default.action.
6
7 @DPATCH@
8 diff -urNad privoxy~/default.action.master privoxy/default.action.master
9 --- privoxy~/default.action.master
10 +++ privoxy/default.action.master
11 @@ -1594,7 +1594,7 @@
12  # URL = http://kb.adobe.com/selfservice/viewContent.do?externalId=kb402747&sliceId=1
13  .adobe.com
14  # URL = http://qa.debian.org/popcon.php
15 -qa.debian.org/popcon\.php
16 +qa.debian.org/popcon
17  #MASTER# REMARKS: Support Requests item #2432535 2008-12-16
18  # URL = http://www.mta.info/bandt/traffic/advmain.htm
19  .mta.info/.*advmain.htm$
20 @@ -2061,6 +2061,9 @@
21  #MASTER# REMARKS: Exclude per Debian bug report #377843
22  # URL = http://blogs.msdn.com/wga/archive/2006/07/16/667063.aspx
23  blogs.msdn.com
24 +#MASTER# REMARKS: Exclude per Debian bug report #441256
25 +#MASTER# PROBLEM-URL: http://www.memo.de/
26 +www.memo.de
27  
28  {-filter{unsolicited-popups}}
29  # Sticky Actions = -filter{unsolicited-popups}
30 @@ -2102,6 +2105,11 @@
31  {+filter{tiny-textforms}}
32  .sourceforge.net/tracker
33  
34 +{-filter{ie-exploits}}
35 +#MASTER# REMARKS: Allow %01 and %02 in URLs as they are used in Amazon's 
36 +#MASTER# REMARKS: multi-page results see http://bugs.debian.org/243245
37 +.amazon.de
38 +
39  {+downgrade-http-version}
40  #MASTER# COMMENTS: This section not checked 10/17/06 HB
41  #MASTER# REMARKS: This is work-around for CUPS http configuration.