r23218 - in /packages/unstable/epiphany-extensions/debian: changelog control.in patches/adblock.patch

Sun Mar 7 18:21:22 UTC 2010

Author: tao
Date: Sun Mar  7 18:21:21 2010
New Revision: 23218

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=23218
Log:
* Added a patch for Bugzilla: #599562.
  (Fixes some false positives in the adblock plugin)
* debian/control.in:
  - Bump Standards version to 3.8.4 (No changes needed).
  - Added myself to Uploaders.

Added:
    packages/unstable/epiphany-extensions/debian/patches/adblock.patch
Modified:
    packages/unstable/epiphany-extensions/debian/changelog
    packages/unstable/epiphany-extensions/debian/control.in

Modified: packages/unstable/epiphany-extensions/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/epiphany-extensions/debian/changelog?rev=23218&op=diff
==============================================================================

--- packages/unstable/epiphany-extensions/debian/changelog [utf-8] (original)
+++ packages/unstable/epiphany-extensions/debian/changelog [utf-8] Sun Mar  7 18:21:21 2010
@@ -1,3 +1,13 @@
+epiphany-extensions (2.29.91-2) unstable; urgency=low
+
+  * Added a patch for Bugzilla: #599562.
+    (Fixes some false positives in the adblock plugin)
+  * debian/control.in:
+    - Bump Standards version to 3.8.4 (No changes needed).
+    - Added myself to Uploaders.
+
+ -- David Weinehall <tao at debian.org>  Sun, 07 Mar 2010 19:30:30 +0200
+
 epiphany-extensions (2.29.91-1) unstable; urgency=low
 
   * New upstream release:

Modified: packages/unstable/epiphany-extensions/debian/control.in
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/epiphany-extensions/debian/control.in?rev=23218&op=diff
==============================================================================
--- packages/unstable/epiphany-extensions/debian/control.in [utf-8] (original)
+++ packages/unstable/epiphany-extensions/debian/control.in [utf-8] Sun Mar  7 18:21:21 2010
@@ -2,7 +2,7 @@
 Section: gnome
 Priority: optional
 Maintainer: Josselin Mouette <joss at debian.org>
-Uploaders: @GNOME_TEAM@
+Uploaders: @GNOME_TEAM@, David Weinehall <tao at debian.org>
 Build-Depends: cdbs (>= 0.4.17),
                debhelper (>= 5),
                gnome-pkg-tools (>= 0.10),
@@ -19,7 +19,7 @@
                libdbus-glib-1-dev ( >= 0.60),
                libwebkit-dev,
                scrollkeeper
-Standards-Version: 3.8.3
+Standards-Version: 3.8.4
 
 Package: epiphany-extensions
 Architecture: any

Added: packages/unstable/epiphany-extensions/debian/patches/adblock.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/epiphany-extensions/debian/patches/adblock.patch?rev=23218&op=file
==============================================================================
--- packages/unstable/epiphany-extensions/debian/patches/adblock.patch (added)
+++ packages/unstable/epiphany-extensions/debian/patches/adblock.patch [utf-8] Sun Mar  7 18:21:21 2010
@@ -1,0 +1,44 @@
+From 2ca1aabe80a33f843e183dd3a7fa76e3d395de8a Mon Sep 17 00:00:00 2001
+From: Matthew Draper <matthew at trebex.net>
+Date: Sun, 21 Feb 2010 14:46:02 +1030
+Subject: [PATCH] adblock: adblock-patterns is case-insensitive
+
+Treating it as such obviates the need for recent changes to the patterns
+file itself, so undo those too.
+
+Bug #599562
+---
+ extensions/adblock/adblock-pattern.c |    2 +-
+ extensions/adblock/adblock-patterns  |    3 +--
+ 2 files changed, 2 insertions(+), 3 deletions(-)
+
+diff --git a/extensions/adblock/adblock-pattern.c b/extensions/adblock/adblock-pattern.c
+index ffba122..5630153 100644
+--- a/extensions/adblock/adblock-pattern.c
++++ b/extensions/adblock/adblock-pattern.c
+@@ -71,7 +71,7 @@ adblock_pattern_load_from_file (GHashTable *patterns,
+ 
+ 		if (*line == '\0') continue; /* empty line */
+ 
+-		regex = g_regex_new (line, G_REGEX_OPTIMIZE, 0, &error);
++		regex = g_regex_new (line, G_REGEX_CASELESS | G_REGEX_OPTIMIZE, 0, &error);
+ 
+ 		if (regex == NULL)
+ 		{
+diff --git a/extensions/adblock/adblock-patterns b/extensions/adblock/adblock-patterns
+index a455f55..f9096ec 100644
+--- a/extensions/adblock/adblock-patterns
++++ b/extensions/adblock/adblock-patterns
+@@ -29,8 +29,7 @@
+ [/&](affiliates?|revenue)((.*\d+x)?\d+|\.pl|\.swf|fuel|pilot|/(banner|script)s?/)
+ [/.]overture(/|.*?.*=|\w*\.js|\.com)
+ [^\w=+]promo(\w*\.js|banner|box)(?!(\.js)?\?)(\W|_|$)
+-/ad_default.html
+-[^a-z\d=+%@](?!\d{5,})(\w*\d+x\d)?\d*(show)?(\w{3,}%20|alligator|avs|barter|blog|box|central|context|crystal|d?html|exchange|external|forum|front|fuse|gen|get|house|hover|http|i?frame|inline|instant|live|main|mspace|net|partner|php|popin|primary|provider|realtext|redir\W.*\W|rotated?|secure|side|smart|sponsor|story|text|view|web)?_?[^/]ads?(v?(bot|brite|broker|bureau|butler|cent(er|ric)|click|client|content|coun(cil|t(er)?)|creative|cycle|data(id)?|engage|entry|er(tis\w+|t(pro)?|ve?r?)|farm|feelgood|force|form|frame(generator)?|gen|gif|groupid|head|ima?ge?|index|info|js|juggler|layer|legend|link|log|man(ager)?|max|mentor(serve)?|meta\.com|mosaic|net|optimi[sz]er|parser|peeps|pic|po(ol|pup|sition)|proof|q\.nextag|re(dire?c?t?|mote|volver)|rom\.net|rotator|sale|script|search|sdk|sfac|size|so(lution|nar|urce)|stream|space|srv|stat.*\.asp|sys|(tag)?track|trix|type|view|vt|x\.nu|zone))?s?\d*(status)?\d*(?!\.org)[\W_](?!\w+\.(ac\.|edu)|astra|aware|adurl=|block|login|nl/|sears/|.*(&sbc|\.(wmv|rm)))
++[^a-z\d=+%@](?!\d{5,})(\w*\d+x\d)?\d*(show)?(\w{3,}%20|alligator|avs|barter|blog|box|central|context|crystal|d?html|exchange|external|forum|front|fuse|gen|get|house|hover|http|i?frame|inline|instant|live|main|mspace|net|partner|php|popin|primary|provider|realtext|redir\W.*\W|rotated?|secure|side|smart|sponsor|story|text|view|web)?_?ads?(v?(bot|brite|broker|bureau|butler|cent(er|ric)|click|client|content|coun(cil|t(er)?)|creative|cycle|data(id)?|engage|entry|er(tis\w+|t(pro)?|ve?r?)|farm|feelgood|force|form|frame(generator)?|gen|gif|groupid|head|ima?ge?|index|info|js|juggler|layer|legend|link|log|man(ager)?|max|mentor(serve)?|meta\.com|mosaic|net|optimi[sz]er|parser|peeps|pic|po(ol|pup|sition)|proof|q\.nextag|re(dire?c?t?|mote|volver)|rom\.net|rotator|sale|script|search|sdk|sfac|size|so(lution|nar|urce)|stream|space|srv|stat.*\.asp|sys|(tag)?track|trix|type|view|vt|x\.nu|zone))?s?\d*(status)?\d*(?!\.org)[\W_](?!\w+\.(ac\.|edu)|astra|aware|adurl=|block|login|nl/|sears/|.*(&sbc|\.(wmv|rm)))
+ [^a-z\d=+](get|web)?_?spons?(or(ed|s))?_?(links?)?(pots?)?(\W|_|$)(?!.*sigalert)
+ [^a-z\d=+]\d*((cible|com|context|double|euro(s4)?|fast|fine|pay-by-|precision|smart|specific|value)_?clicks?|clicks?(2net|adhere|ban\.php|bank\.net|over|sor\.com|tag|thrutraffic|trade|xchange))(\W|$)(?!but)
+ [^a-z]banners?[/._-]?(.*(\d+x\d+\.swf|\.f?pl|_hits\.asp\?|redir|siteid=)|\.(cgi|js|php)|ad|affiliate|central|click|connect|count|current|exchange|file|grocery|id|man(age(ment|r)|ia)|newsletter|/_?promo|/rotat|/?script|serve|skyscraper|space\.|swap|tausch|trust)
+-- 
+1.7.0
+


