From b471c585ca14ca19ee4ce2e7eaf5cbcf2d024718 Mon Sep 17 00:00:00 2001
From: "coadde [Márcio Alexandre Silva Delgado]" <coadde@parabola.nu>
Date: Sat, 15 Aug 2015 16:29:45 -0300
Subject: libre/icedove: Remove Phishing Protection with
 '--disable-url-classifier' (mozconfig option flag)

---
 libre/icedove/PKGBUILD  | 7 +------
 libre/icedove/mozconfig | 3 ++-
 2 files changed, 3 insertions(+), 7 deletions(-)

(limited to 'libre')

diff --git a/libre/icedove/PKGBUILD b/libre/icedove/PKGBUILD
index e641775a9..80c804537 100644
--- a/libre/icedove/PKGBUILD
+++ b/libre/icedove/PKGBUILD
@@ -35,7 +35,7 @@ source=("${_debrepo}/`debfile ${_debname}`_${_debver}.orig.tar.xz"
 options=(!emptydirs !makeflags)
 sha256sums=('b59c74f67d2f9684d9cf0db62b5c60d3ef155807e17a91ebf0899dd55670f6a0'
             '29de44253624814ae3ce3e0a6a786ba229c62e78d8c97e36257f730d38d542f7'
-            '4b798835ff3c76c436b5ea753cb002fd17c37675b9c87fdc1522019101e426fe'
+            'e3d0f5f78fede687dfc38a2787c2c8f33c8213be286abeb9176e3dcebabb0b74'
             '0b0d25067c64c6b829c84e5259ffca978e3971f85acc8483f47bdbed5b0b5b6a'
             'b2ecbeec986ba8ba66ac8f98faf30dabec49213cc35979d17d39cd699f41ba83'
             '798d5bff1e6025e9a803b67f629afac740f16e537b714ee7c7e829b2345fb6a2')
@@ -68,11 +68,6 @@ prepare() {
 
   quilt push -av
 
-  # Fix package-manifest.in
-  sed -i '\|; Phishing Protection| s|$|\n#ifdef MOZ_SAFE_BROWSING|;
-          \|@BINPATH@/components/url-classifier[.]xpt| s|$|\n#endif|
-         ' mail/installer/package-manifest.in
-
   # Fix branding
   sed -i 's|Icedove Mail/News|Icedove|' mail/branding/icedove/locales/en-US/brand.{dtd,properties}
 
diff --git a/libre/icedove/mozconfig b/libre/icedove/mozconfig
index 1445636a1..20cb08590 100644
--- a/libre/icedove/mozconfig
+++ b/libre/icedove/mozconfig
@@ -26,7 +26,6 @@ ac_add_options --enable-system-cairo
 ac_add_options --enable-system-pixman
 
 # Features
-ac_add_options --enable-safe-browsing
 ac_add_options --enable-startup-notification
 ac_add_options --enable-gio
 
@@ -47,3 +46,5 @@ mk_add_options MOZILLA_OFFICIAL=1
 
 # Parabola features
 ac_add_options --disable-official-branding
+ac_add_options --disable-safe-browsing
+ac_add_options --disable-url-classifier
-- 
cgit v1.2.3