Update to 1:53.0.deb1-4

* disable more iceweasel components

3 files changed, 131 insertions, 17 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 4aaa87f4b452..49164b6f8fc0 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,9 +1,9 @@
 # Generated by mksrcinfo v8
-# Wed May 10 18:47:45 UTC 2017
+# Mon May 15 01:32:49 UTC 2017
 pkgbase = iceweasel
 	pkgdesc = A libre version of Debian Iceweasel, the standalone web browser based on Mozilla Firefox.
 	pkgver = 53.0.deb1
-	pkgrel = 3
+	pkgrel = 4
 	epoch = 1
 	url = https://wiki.parabola.nu/iceweasel
 	arch = i686
@@ -49,9 +49,6 @@ pkgbase = iceweasel
 	optdepends = networkmanager: Location detection via available WiFi networks
 	optdepends = libnotify: Notification integration
 	optdepends = speech-dispatcher: Text-to-Speech
-	conflicts = iceweasel-libre
-	replaces = iceweasel-libre
-	replaces = firefox
 	options = !emptydirs
 	options = !makeflags
 	options = !strip
@@ -72,6 +69,7 @@ pkgbase = iceweasel
 	source = fix-wifi-scanner.diff
 	source = enable-object-directory-paths.patch
 	source = mozilla-1335250.patch
+	source = iceweasel-disabled-components.patch
 	sha512sums = 54bdb53f65c10e43db5df12aaf1302926e2b66997c0aeeeac0834a0943ca244ec9d847900e90fd75bee4474b97988cb87d0b51e745299db8160a22ca45ffedc6
 	sha512sums = ba68ee4c2846d52d7d223d57c815db0b81e41f2e1c1f3cb3b6f74fd523826be8848f630f53179b9d5d7eb1b312a07bcd3d3df7d2c462bb85d4cb31c60182be0a
 	sha512sums = 08d5980b532cdbef651355baf5e971df6d641e5b6a74fd2ad4f84837b00f2fa0732069af74c76cd635cf9437fd139b8572ff7b0c86911be7c8a251b4f57a2a25
@@ -88,6 +86,7 @@ pkgbase = iceweasel
 	sha512sums = 1bd2804bea1fe8c85b602f8c5f8777f4ba470c9e767ad284cb3d0287c6d6e1b126e760738d7c671f38933ee3ec6b8931186df8e978995b5109797ae86dfdd85a
 	sha512sums = f60f59b5d11b9ce5ad4c01eedae78f27131f17b07720e5ac35441d43e95987d81b9b2680e7258d73b1a8092fe3ae554072d07a41d6b337af82742886196bc375
 	sha512sums = 3ea15f1c2e0146388687cfbb100e5d8c553fa4276c9c2c61eaccb4fe88e4dbd6697f6266eb0255546997997ca34085d0cf211701fa63d8ab2df94f5291131d7e
+	sha512sums = 89849831a9bc2b912baf15ca930055b31232c7bd9941aaf0605403e3a80474368c578c6244c9656bcf854cfabf87a73ebb9af5256bb52fdd5fdfe3b9dbc3e35c
 	makedepends_i686 = cargo
 	makedepends_x86_64 = cargo
 
diff --git a/PKGBUILD b/PKGBUILD
index 54597ea0ebbc..283e8a7e0fd9 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -30,7 +30,7 @@ _pkgname=firefox
 pkgname=iceweasel
 epoch=1
 pkgver=$_debver.$_debrel
-pkgrel=3
+pkgrel=4
 pkgdesc="A libre version of Debian Iceweasel, the standalone web browser based on Mozilla Firefox."
 arch=(i686 x86_64 armv7h)
 license=(MPL GPL LGPL)
@@ -47,8 +47,6 @@ optdepends=('networkmanager: Location detection via available WiFi networks'
             'libnotify: Notification integration'
             'speech-dispatcher: Text-to-Speech')
 url="https://wiki.parabola.nu/$pkgname"
-replaces=("$pkgname-libre" "$_pkgname")
-conflicts=("$pkgname-libre")
 source=("$_debrepo/`debfile $_debname`_$_debver.is.$_debver.orig.tar.xz"
         "$_debrepo/`debfile $_debname`_$_debver.is.$_debver-${_debrel#deb}.debian.tar.xz"
         "$_coadderepo/${pkgname}_$_brandingver-$_brandingrel.branding.tar.xz"
@@ -64,7 +62,8 @@ source=("$_debrepo/`debfile $_debname`_$_debver.is.$_debver.orig.tar.xz"
         0001-Bug-1338655-Don-t-try-to-build-mp4parse-bindings.-r-.patch
         fix-wifi-scanner.diff
         enable-object-directory-paths.patch
-        mozilla-1335250.patch)
+        mozilla-1335250.patch
+        $pkgname-disabled-components.patch)
 sha512sums=('54bdb53f65c10e43db5df12aaf1302926e2b66997c0aeeeac0834a0943ca244ec9d847900e90fd75bee4474b97988cb87d0b51e745299db8160a22ca45ffedc6'
             'ba68ee4c2846d52d7d223d57c815db0b81e41f2e1c1f3cb3b6f74fd523826be8848f630f53179b9d5d7eb1b312a07bcd3d3df7d2c462bb85d4cb31c60182be0a'
             '08d5980b532cdbef651355baf5e971df6d641e5b6a74fd2ad4f84837b00f2fa0732069af74c76cd635cf9437fd139b8572ff7b0c86911be7c8a251b4f57a2a25'
@@ -80,7 +79,8 @@ sha512sums=('54bdb53f65c10e43db5df12aaf1302926e2b66997c0aeeeac0834a0943ca244ec9d
             '9a02d89603ad2928e38d7350d5d71ec904815958c65cc13323f5d4cd9392b823264fae812ea658d83728839372b412fd185653ef65b7ab8dd0595158b3bdc2e2'
             '1bd2804bea1fe8c85b602f8c5f8777f4ba470c9e767ad284cb3d0287c6d6e1b126e760738d7c671f38933ee3ec6b8931186df8e978995b5109797ae86dfdd85a'
             'f60f59b5d11b9ce5ad4c01eedae78f27131f17b07720e5ac35441d43e95987d81b9b2680e7258d73b1a8092fe3ae554072d07a41d6b337af82742886196bc375'
-            '3ea15f1c2e0146388687cfbb100e5d8c553fa4276c9c2c61eaccb4fe88e4dbd6697f6266eb0255546997997ca34085d0cf211701fa63d8ab2df94f5291131d7e')
+            '3ea15f1c2e0146388687cfbb100e5d8c553fa4276c9c2c61eaccb4fe88e4dbd6697f6266eb0255546997997ca34085d0cf211701fa63d8ab2df94f5291131d7e'
+            '89849831a9bc2b912baf15ca930055b31232c7bd9941aaf0605403e3a80474368c578c6244c9656bcf854cfabf87a73ebb9af5256bb52fdd5fdfe3b9dbc3e35c')
 validpgpkeys=(
               'C92BAA713B8D53D3CAE63FC9E6974752F9704456' # André Silva
               '684D54A189305A9CC95446D36B888913DDB59515' # Márcio Silva
@@ -140,6 +140,7 @@ prepare() {
   cp -av /usr/lib/mozilla/searchplugins browser/locales
 
   # Disable various components at the source level
+  patch -Np1 -i "$srcdir/$pkgname-disabled-components.patch"
   sed -i 's|1|0|' toolkit/components/telemetry/TelemetryStartup.manifest || die "failed break telemetry startup"
   sed -i 's|1|0|' toolkit/components/remotebrowserutils/remotebrowserutils.manifest || die "failed break remotebrowsing at startup"
   sed -i 's|1|0|' toolkit/components/captivedetect/CaptivePortalDetectComponents.manifest || die "failed to break captiveportaldetection at startup"
@@ -147,27 +148,24 @@ prepare() {
   sed -i 's|1|0|' toolkit/components/securityreporter/SecurityReporter.manifest || die "failed to break securityReporter"
   sed -i 's|1|0|' toolkit/components/crashes/CrashService.manifest || die "failed to break CrashService"
   sed -i 's|1|0|' toolkit/components/crashmonitor/crashmonitor.manifest || die "failed to break CrashMonitor"
+  sed -i '/gmp-clearkey/d' toolkit/toolkit.mozbuild || die "failed to remove ClearKey DRM"
   sed -i 's|1|0|' browser/experiments/Experiments.manifest || die "failed to break ExperimentsService"
   #echo "" > dom/flyweb/moz.build || die "failed to break FlyWeb"
   echo "" > toolkit/crashreporter/moz.build || die "Failed to dsiable CrashReporter"
   echo "Disabling intrusive Balrog backdoor... please wait."
   echo "" > testing/moz.build || die "failed to disable testing directory (contains Balrog/WebRTC/etc)"
-  #grep -rl "aus4.mozilla.org"  | xargs sed -i 's/aus4.mozilla.org/0.0.0.0/' || die "Failed to delete aus4 Barlog servers"
-  #grep -rl "aus5.mozilla.org"  | xargs sed -i 's/aus5.mozilla.org/0.0.0.0/' || die "Failed to delete aus5 Barlog servers"
+  grep -rl "aus4.mozilla.org"  | xargs sed -i 's/aus4.mozilla.org/0.0.0.0/' || die "Failed to delete aus4 Barlog servers"
+  grep -rl "aus5.mozilla.org"  | xargs sed -i 's/aus5.mozilla.org/0.0.0.0/' || die "Failed to delete aus5 Barlog servers"
   echo "" > browser/extensions/moz.build || die "failed to disable bundled extensions"
   echo "" > browser/app/blocklist.xml || die "failed to clear pre-loaded blocklist"
-  #echo "" > services/common/moz.build || die "failed to disable KintoStorage/Blocklist updater"
   echo "" > services/cloudsync/moz.build || die "failed to disable CloudSync"
   echo "" > services/fxaccounts/moz.build || die "failed to disable FxAccounts"
   echo "" > modules/libmar/moz.build || die "failed to disable libmar (custom file format used for unattended mozilla updates)"
   echo "" > netwerk/wifi/moz.build || die "failed to disable wifi"
   echo "" > media/sphinxbase/moz.build || die "failed to disable SphinxBase voice recognition"
   echo "" > media/pocketsphinx/moz.build || die "failed to disable PocketSpinx voice recognition"
-  echo "" > b2g/moz.build || die "failed to disable B2G"
-  #echo "" > ipc/chromium/moz.build || die "failed to disable IPC"
-  #sed -i -e '/marketplace-/d' -e '/manifest-/d' -e '/xpcshell/d' -e '/privileged/d' -e '/stage/d' security/apps/moz.build || die "failed to disable unused certs"
+  #echo "" > b2g/moz.build || die "failed to disable B2G"
   echo "origin	install	1	https://addons.mozilla.org" > browser/app/permissions  || die "failed disable remote login whitelist"
-  sed -i -e '/FxAccountsComponents/d' -e '/FxAccountsPush/d' -e '/pdfjs/d' -e '/features/d' browser/installer/package-manifest.in || die "failed to remove references in package-manifest"
 
   # ARM-specific changes:
   if [[ "$CARCH" == arm* ]]; then
diff --git a/iceweasel-disabled-components.patch b/iceweasel-disabled-components.patch
new file mode 100644
index 000000000000..759180ed1b83
--- /dev/null
+++ b/iceweasel-disabled-components.patch
@@ -0,0 +1,117 @@
+--- browser/installer/package-manifest.in	2017-04-11 00:15:16.000000000 -0400
++++ browser/installer/package-manifest.in3	2017-05-14 20:17:52.661752482 -0400
+@@ -279,16 +279,10 @@
+ @RESPATH@/components/necko_strconv.xpt
+ @RESPATH@/components/necko_viewsource.xpt
+ @RESPATH@/components/necko_websocket.xpt
+-#ifdef NECKO_WIFI
+-@RESPATH@/components/necko_wifi.xpt
+-#endif
+ @RESPATH@/components/necko_wyciwyg.xpt
+ @RESPATH@/components/necko.xpt
+ @RESPATH@/components/loginmgr.xpt
+ @RESPATH@/components/parentalcontrols.xpt
+-#ifdef MOZ_WEBRTC
+-@RESPATH@/components/peerconnection.xpt
+-#endif
+ @RESPATH@/components/places.xpt
+ @RESPATH@/components/plugin.xpt
+ @RESPATH@/components/pref.xpt
+@@ -301,7 +295,6 @@
+ @RESPATH@/components/saxparser.xpt
+ @RESPATH@/browser/components/sessionstore.xpt
+ @RESPATH@/components/services-crypto-component.xpt
+-@RESPATH@/components/captivedetect.xpt
+ @RESPATH@/browser/components/shellservice.xpt
+ @RESPATH@/components/shistory.xpt
+ @RESPATH@/components/spellchecker.xpt
+@@ -315,9 +308,6 @@
+ @RESPATH@/components/toolkit_perfmonitoring.xpt
+ @RESPATH@/components/toolkit_xulstore.xpt
+ @RESPATH@/components/toolkitprofile.xpt
+-#ifdef MOZ_ENABLE_XREMOTE
+-@RESPATH@/components/toolkitremote.xpt
+-#endif
+ @RESPATH@/components/txtsvc.xpt
+ @RESPATH@/components/txmgr.xpt
+ @RESPATH@/components/uconv.xpt
+@@ -375,8 +365,6 @@
+ @RESPATH@/browser/components/devtools-startup.js
+ @RESPATH@/browser/components/webideCli.js
+ @RESPATH@/browser/components/webideComponents.manifest
+-@RESPATH@/browser/components/Experiments.manifest
+-@RESPATH@/browser/components/ExperimentsService.js
+ @RESPATH@/browser/components/browser-newtab.xpt
+ @RESPATH@/browser/components/aboutNewTabService.js
+ @RESPATH@/browser/components/NewTabComponents.manifest
+@@ -408,8 +396,6 @@
+ #endif
+ @RESPATH@/components/nsHelperAppDlg.manifest
+ @RESPATH@/components/nsHelperAppDlg.js
+-@RESPATH@/components/NetworkGeolocationProvider.manifest
+-@RESPATH@/components/NetworkGeolocationProvider.js
+ @RESPATH@/components/extensions.manifest
+ @RESPATH@/components/EditorUtils.manifest
+ @RESPATH@/components/EditorUtils.js
+@@ -420,9 +406,6 @@
+ @RESPATH@/components/nsBlocklistService.js
+ @RESPATH@/components/nsBlocklistServiceContent.js
+ #ifdef MOZ_UPDATER
+-@RESPATH@/components/nsUpdateService.manifest
+-@RESPATH@/components/nsUpdateService.js
+-@RESPATH@/components/nsUpdateServiceStub.js
+ #endif
+ @RESPATH@/components/nsUpdateTimerManager.manifest
+ @RESPATH@/components/nsUpdateTimerManager.js
+@@ -495,12 +478,6 @@
+ @RESPATH@/browser/components/SelfSupportService.manifest
+ @RESPATH@/browser/components/SelfSupportService.js
+ #endif
+-@RESPATH@/components/SyncComponents.manifest
+-@RESPATH@/components/Weave.js
+-@RESPATH@/components/FxAccountsComponents.manifest
+-@RESPATH@/components/FxAccountsPush.js
+-@RESPATH@/components/CaptivePortalDetectComponents.manifest
+-@RESPATH@/components/captivedetect.js
+ @RESPATH@/components/servicesComponents.manifest
+ @RESPATH@/components/cryptoComponents.manifest
+ @RESPATH@/components/TelemetryStartup.js
+@@ -520,26 +497,10 @@
+ @RESPATH@/components/Push.manifest
+ @RESPATH@/components/PushComponents.js
+ 
+-@RESPATH@/components/remotebrowserutils.manifest
+-@RESPATH@/components/RemoteWebNavigation.js
+ 
+ @RESPATH@/components/SlowScriptDebug.manifest
+ @RESPATH@/components/SlowScriptDebug.js
+ 
+-#ifdef MOZ_WEBRTC
+-@RESPATH@/components/PeerConnection.js
+-@RESPATH@/components/PeerConnection.manifest
+-#endif
+-
+-@RESPATH@/chrome/marionette@JAREXT@
+-@RESPATH@/chrome/marionette.manifest
+-@RESPATH@/components/marionette.manifest
+-@RESPATH@/components/marionette.js
+-
+-#ifdef MOZ_WEBSPEECH
+-@RESPATH@/components/dom_webspeechsynth.xpt
+-#endif
+-
+ @RESPATH@/components/nsAsyncShutdown.manifest
+ @RESPATH@/components/nsAsyncShutdown.js
+ 
+@@ -800,11 +761,6 @@
+ @BINPATH@/clang_rt.asan_dynamic-*.dll
+ #endif
+ 
+-
+-; media
+-@RESPATH@/gmp-clearkey/0.1/@DLL_PREFIX@clearkey@DLL_SUFFIX@
+-@RESPATH@/gmp-clearkey/0.1/manifest.json
+-
+ ; gfx
+ #ifdef XP_WIN
+ @RESPATH@/components/GfxSanityTest.manifest