iceweasel-1:35.0.deb1-1: updating version

4 files changed, 78 insertions, 50 deletions

diff --git a/libre/iceweasel/PKGBUILD b/libre/iceweasel/PKGBUILD
index cea378297..bb1c3fa13 100644
--- a/libre/iceweasel/PKGBUILD
+++ b/libre/iceweasel/PKGBUILD
@@ -16,7 +16,7 @@ _pgo=true
 
 # We're getting this from Debian Experimental
 _debname=iceweasel
-_debver=34.0
+_debver=35.0
 _debrel=deb1
 _debrepo=http://ftp.debian.org/debian/pool/main/
 debfile() { echo $@|sed -r 's@(.).*@\1/&/&@'; }
@@ -24,7 +24,7 @@ debfile() { echo $@|sed -r 's@(.).*@\1/&/&@'; }
 pkgname=iceweasel
 epoch=1
 pkgver=$_debver.$_debrel
-pkgrel=2
+pkgrel=1
 
 pkgdesc="A libre version of Debian Iceweasel, the standalone web browser based on Mozilla Firefox."
 arch=(i686 x86_64 mips64el)
@@ -54,17 +54,17 @@ source=("$_debrepo/`debfile $_debname`_$_debver.orig.tar.bz2"
         rhbz-966424.patch
         $pkgname-fixed-loading-icon.png
         devtools-appmanager-webide.patch)
-md5sums=('67c5ab2f4551c2743e70a3bcb041bf66'
-         '5d72813950fdcf47a38b2f0eb7ebe33d'
-         '5eca2c1dbdd9c043b24de39cd05d6e8f'
-         '747e2db5987302777e9bf7be58dd4c72'
-         'b03a979a78484503ba8dddad4f2c96d1'
-         'fd8f61f2ae44e5b0e0b2c7b433695980'
-         '1c42509891cf6843660a5f3c69896e80'
-         '2e99ba1f020a4bae19260f4c321cf97d'
-         '16a112aaeee34ff3cae1fc1a521448a0'
-         '6e335a517c68488941340ee1c23f97b0'
-         '5e00db4323ee0191a8c0d68b4c6795f6')
+sha256sums=('7702b1873757c8ec2f911680ff63ded124ab7b3610ef5c1456581146451a641e'
+            '0b59e3f72ac50475832fbd64055411bb81264526f06492f2a5801e4d859da7de'
+            '831720c1efd6e67d54e70cf4e2b02f9554aa6c914315be6dd2ca837adbbdcabd'
+            '0eb8ee36d4dedc613000675b6a70e47e8971a51bdbf3d8cd70a56546e8db1959'
+            '93e3001ce152e1d142619e215a9ef07dd429943b99d21726c25da9ceb31e31cd'
+            '84895ff873a89770c62c4568fd111ac92d540b4499b2b77258c6c88a929ef049'
+            '3aea6676f1e53a09673b6ae219d281fc28054beb6002b09973611c02f827651d'
+            'a7605bae8a54dd01bb9fa2365921bea51c54a4cf972f8b2aa2aa181984ae1e90'
+            'd25c6e95d20ec622a51346897d986fdd97074023d6a02bee0533773a195f8233'
+            '68e3a5b47c6d175cc95b98b069a15205f027cab83af9e075818d38610feb6213'
+            'fa8d6f5c51677fe385b990022845312ba879ec2daadde186de08583e07562c01')
 
 prepare() {
   export DEBIAN_BUILD="mozilla-release"
diff --git a/libre/iceweasel/devtools-appmanager-webide.patch b/libre/iceweasel/devtools-appmanager-webide.patch
index 373c34ceb..4dbf43dee 100644
--- a/libre/iceweasel/devtools-appmanager-webide.patch
+++ b/libre/iceweasel/devtools-appmanager-webide.patch
@@ -1,7 +1,7 @@
 diff -Nur mozilla-release.orig/browser/app/profile/firefox.js mozilla-release/browser/app/profile/firefox.js
---- mozilla-release.orig/browser/app/profile/firefox.js	2014-11-26 00:17:06.000000000 -0200
-+++ mozilla-release/browser/app/profile/firefox.js	2014-12-19 13:30:18.447609374 -0200
-@@ -1303,12 +1303,14 @@
+--- mozilla-release.orig/browser/app/profile/firefox.js	2015-01-16 14:43:55.583334174 -0200
++++ mozilla-release/browser/app/profile/firefox.js	2015-01-16 14:46:24.440893562 -0200
+@@ -1344,12 +1344,14 @@
  pref("devtools.commands.dir", "");
  
  // Enable the app manager
@@ -21,9 +21,9 @@ diff -Nur mozilla-release.orig/browser/app/profile/firefox.js mozilla-release/br
  // Toolbox preferences
  pref("devtools.toolbox.footer.height", 250);
 diff -Nur mozilla-release.orig/browser/devtools/webide/webide-prefs.js mozilla-release/browser/devtools/webide/webide-prefs.js
---- mozilla-release.orig/browser/devtools/webide/webide-prefs.js	2014-11-26 00:17:07.000000000 -0200
-+++ mozilla-release/browser/devtools/webide/webide-prefs.js	2014-12-19 13:30:28.444671229 -0200
-@@ -2,16 +2,17 @@
+--- mozilla-release.orig/browser/devtools/webide/webide-prefs.js	2015-01-09 02:38:16.000000000 -0200
++++ mozilla-release/browser/devtools/webide/webide-prefs.js	2015-01-16 14:51:30.686269793 -0200
+@@ -2,32 +2,24 @@
  # This Source Code Form is subject to the terms of the Mozilla Public
  # License, v. 2.0. If a copy of the MPL was not distributed with this
  # file, You can obtain one at http://mozilla.org/MPL/2.0/.
@@ -32,22 +32,41 @@ diff -Nur mozilla-release.orig/browser/devtools/webide/webide-prefs.js mozilla-r
 -pref("devtools.webide.showProjectEditor", true);
 -pref("devtools.webide.templatesURL", "https://code.cdn.mozilla.net/templates/list.json");
 -pref("devtools.webide.autoinstallADBHelper", true);
+-#ifdef MOZ_DEV_EDITION
+-pref("devtools.webide.autoinstallFxdtAdapters", true);
+-#else
 +pref("devtools.webide.showProjectEditor", false);
 +pref("devtools.webide.templatesURL", "");
 +pref("devtools.webide.autoinstallADBHelper", false);
- pref("devtools.webide.lastprojectlocation", "");
+ pref("devtools.webide.autoinstallFxdtAdapters", false);
+-#endif
 -pref("devtools.webide.restoreLastProject", true);
-+pref("devtools.webide.restoreLastProject", false);
- pref("devtools.webide.enableLocalRuntime", false);
 -pref("devtools.webide.addonsURL", "https://ftp.mozilla.org/pub/mozilla.org/labs/fxos-simulator/index.json");
 -pref("devtools.webide.simulatorAddonsURL", "https://ftp.mozilla.org/pub/mozilla.org/labs/fxos-simulator/#VERSION#/#OS#/fxos_#SLASHED_VERSION#_simulator-#OS#-latest.xpi");
 -pref("devtools.webide.simulatorAddonID", "fxos_#SLASHED_VERSION#_simulator@mozilla.org");
 -pref("devtools.webide.adbAddonURL", "https://ftp.mozilla.org/pub/mozilla.org/labs/fxos-simulator/adb-helper/#OS#/adbhelper-#OS#-latest.xpi");
 -pref("devtools.webide.adbAddonID", "adbhelper@mozilla.org");
+-pref("devtools.webide.adaptersAddonURL", "https://ftp.mozilla.org/pub/mozilla.org/labs/fxdt-adapters/#OS#/fxdt-adapters-#OS#-latest.xpi");
+-pref("devtools.webide.adaptersAddonID", "fxdevtools-adapters@mozilla.org");
 -pref("devtools.webide.monitorWebSocketURL", "ws://localhost:9000");
++pref("devtools.webide.restoreLastProject", false);
 +pref("devtools.webide.addonsURL", "");
 +pref("devtools.webide.simulatorAddonsURL", "");
 +pref("devtools.webide.simulatorAddonID", "");
 +pref("devtools.webide.adbAddonURL", "");
 +pref("devtools.webide.adbAddonID", "");
++pref("devtools.webide.adaptersAddonURL", "");
++pref("devtools.webide.adaptersAddonID", "");
 +pref("devtools.webide.monitorWebSocketURL", "");
+ pref("devtools.webide.lastConnectedRuntime", "");
+ pref("devtools.webide.lastSelectedProject", "");
+-pref("devtools.webide.widget.autoinstall", true);
+-#ifdef MOZ_DEV_EDITION
+-pref("devtools.webide.widget.enabled", true);
+-pref("devtools.webide.widget.inNavbarByDefault", true);
+-#else
++pref("devtools.webide.widget.autoinstall", false);
+ pref("devtools.webide.widget.enabled", false);
+ pref("devtools.webide.widget.inNavbarByDefault", false);
+-#endif
+ pref("devtools.webide.busyTimeout", 10000);
diff --git a/libre/iceweasel/libre.patch b/libre/iceweasel/libre.patch
index 331c11b61..5990ee31d 100644
--- a/libre/iceweasel/libre.patch
+++ b/libre/iceweasel/libre.patch
@@ -1,21 +1,21 @@
 diff -Nur mozilla-release.orig/browser/app/profile/firefox.js mozilla-release/browser/app/profile/firefox.js
---- mozilla-release.orig/browser/app/profile/firefox.js	2014-12-04 14:35:08.800256420 -0200
-+++ mozilla-release/browser/app/profile/firefox.js	2014-12-04 14:38:00.315002361 -0200
-@@ -291,11 +291,6 @@
+--- mozilla-release.orig/browser/app/profile/firefox.js	2015-01-16 15:01:27.964161422 -0200
++++ mozilla-release/browser/app/profile/firefox.js	2015-01-16 15:03:50.325327243 -0200
+@@ -290,11 +290,6 @@
  pref("browser.slowStartup.timeThreshold", 40000);
  pref("browser.slowStartup.maxSamples", 5);
  
 -// This url, if changed, MUST continue to point to an https url. Pulling arbitrary content to inject into
 -// this page over http opens us up to a man-in-the-middle attack that we'd rather not face. If you are a downstream
 -// repackager of this code using an alternate snippet url, please keep your users safe
--pref("browser.aboutHomeSnippets.updateUrl", "https://snippets.mozilla.com/%STARTPAGE_VERSION%/%NAME%/%VERSION%/%APPBUILDID%/%BUILD_TARGET%/%LOCALE%/%CHANNEL%/%OS_VERSION%/%DISTRIBUTION%/%DISTRIBUTION_VERSION%/");
+-pref("browser.aboutHomeSnippets.updateUrl", "https://snippets.cdn.mozilla.net/%STARTPAGE_VERSION%/%NAME%/%VERSION%/%APPBUILDID%/%BUILD_TARGET%/%LOCALE%/%CHANNEL%/%OS_VERSION%/%DISTRIBUTION%/%DISTRIBUTION_VERSION%/");
 -
  pref("browser.enable_automatic_image_resizing", true);
  pref("browser.chrome.site_icons", true);
  pref("browser.chrome.favicons", true);
 diff -Nur mozilla-release.orig/browser/base/content/abouthome/aboutHome.css mozilla-release/browser/base/content/abouthome/aboutHome.css
---- mozilla-release.orig/browser/base/content/abouthome/aboutHome.css	2014-11-26 00:17:06.000000000 -0200
-+++ mozilla-release/browser/base/content/abouthome/aboutHome.css	2014-12-04 14:38:00.315002361 -0200
+--- mozilla-release.orig/browser/base/content/abouthome/aboutHome.css	2015-01-09 02:38:12.000000000 -0200
++++ mozilla-release/browser/base/content/abouthome/aboutHome.css	2015-01-16 15:03:01.408257268 -0200
 @@ -49,11 +49,6 @@
    background-repeat: no-repeat;
  }
@@ -38,7 +38,7 @@ diff -Nur mozilla-release.orig/browser/base/content/abouthome/aboutHome.css mozi
  }
  
  #searchIcon {
-@@ -177,48 +171,6 @@
+@@ -175,48 +169,6 @@
    transition-duration: 0ms;
  }
  
@@ -87,7 +87,7 @@ diff -Nur mozilla-release.orig/browser/base/content/abouthome/aboutHome.css mozi
  #launcher {
    display: -moz-box;
    -moz-box-align: center;
-@@ -367,26 +319,25 @@
+@@ -365,26 +317,25 @@
    width: 32px;
  }
  
@@ -120,7 +120,7 @@ diff -Nur mozilla-release.orig/browser/base/content/abouthome/aboutHome.css mozi
  }
  
  /* [HiDPI]
-@@ -402,26 +353,6 @@
+@@ -400,26 +351,6 @@
      background-image: url("chrome://browser/skin/magnifier@2x.png");
    }
  
@@ -147,7 +147,7 @@ diff -Nur mozilla-release.orig/browser/base/content/abouthome/aboutHome.css mozi
    .launchButton:-moz-dir(rtl)::before,
    #aboutMozilla:-moz-dir(rtl)::before {
      transform: scale(.5) translateX(32px);
-@@ -467,9 +398,5 @@
+@@ -465,9 +396,5 @@
      transform: scale(-0.5, 0.5) translateX(24px);
      transform-origin: top center;
    }
@@ -158,8 +158,8 @@ diff -Nur mozilla-release.orig/browser/base/content/abouthome/aboutHome.css mozi
  }
  
 diff -Nur mozilla-release.orig/browser/base/content/abouthome/aboutHome.js mozilla-release/browser/base/content/abouthome/aboutHome.js
---- mozilla-release.orig/browser/base/content/abouthome/aboutHome.js	2014-11-26 00:17:06.000000000 -0200
-+++ mozilla-release/browser/base/content/abouthome/aboutHome.js	2014-12-04 14:40:25.106182469 -0200
+--- mozilla-release.orig/browser/base/content/abouthome/aboutHome.js	2015-01-09 02:38:12.000000000 -0200
++++ mozilla-release/browser/base/content/abouthome/aboutHome.js	2015-01-16 15:03:01.408257268 -0200
 @@ -5,154 +5,44 @@
  "use strict";
  
@@ -475,8 +475,8 @@ diff -Nur mozilla-release.orig/browser/base/content/abouthome/aboutHome.js mozil
 -
  function onSearchSubmit(aEvent)
  {
-   let searchTerms = document.getElementById("searchText").value;
-@@ -366,144 +144,6 @@
+   let searchText = document.getElementById("searchText");
+@@ -378,144 +156,6 @@
    document.dispatchEvent(event);
  }
  
@@ -622,8 +622,8 @@ diff -Nur mozilla-release.orig/browser/base/content/abouthome/aboutHome.js mozil
    if (window.scrollMaxX) {
      document.body.setAttribute("narrow", "true");
 diff -Nur mozilla-release.orig/browser/base/content/abouthome/aboutHome.xhtml mozilla-release/browser/base/content/abouthome/aboutHome.xhtml
---- mozilla-release.orig/browser/base/content/abouthome/aboutHome.xhtml	2014-11-26 00:17:06.000000000 -0200
-+++ mozilla-release/browser/base/content/abouthome/aboutHome.xhtml	2014-12-04 14:38:00.315002361 -0200
+--- mozilla-release.orig/browser/base/content/abouthome/aboutHome.xhtml	2015-01-09 02:38:12.000000000 -0200
++++ mozilla-release/browser/base/content/abouthome/aboutHome.xhtml	2015-01-16 15:03:01.408257268 -0200
 @@ -48,15 +48,6 @@
            <input id="searchSubmit" type="submit" value="&abouthome.searchEngineButton.label;"/>
          </form>
@@ -649,8 +649,8 @@ diff -Nur mozilla-release.orig/browser/base/content/abouthome/aboutHome.xhtml mo
    </body>
  </html>
 diff -Nur mozilla-release.orig/browser/base/jar.mn mozilla-release/browser/base/jar.mn
---- mozilla-release.orig/browser/base/jar.mn	2014-10-11 07:06:16.000000000 -0200
-+++ mozilla-release/browser/base/jar.mn	2014-10-16 03:14:47.990686739 -0200
+--- mozilla-release.orig/browser/base/jar.mn	2015-01-09 02:38:12.000000000 -0200
++++ mozilla-release/browser/base/jar.mn	2015-01-16 15:03:01.408257268 -0200
 @@ -32,7 +32,7 @@
          content/browser/abouthome/settings.png        (content/abouthome/settings.png)
          content/browser/abouthome/restore.png         (content/abouthome/restore.png)
@@ -666,11 +666,11 @@ diff -Nur mozilla-release.orig/browser/base/jar.mn mozilla-release/browser/base/
          content/browser/abouthome/restore-large@2x.png (content/abouthome/restore-large@2x.png)
 -        content/browser/abouthome/mozilla@2x.png       (content/abouthome/mozilla@2x.png)
  
-         content/browser/aboutneterror/netError.xhtml   (content/aboutneterror/netError.xhtml)
-         content/browser/aboutneterror/netError.css     (content/aboutneterror/netError.css)
+         content/browser/aboutNetError.xhtml            (content/aboutNetError.xhtml)
+ 
 diff -Nur mozilla-release.orig/browser/locales/en-US/chrome/browser/aboutHome.dtd mozilla-release/browser/locales/en-US/chrome/browser/aboutHome.dtd
---- mozilla-release.orig/browser/locales/en-US/chrome/browser/aboutHome.dtd	2014-10-11 07:06:17.000000000 -0200
-+++ mozilla-release/browser/locales/en-US/chrome/browser/aboutHome.dtd	2014-10-16 03:14:47.990686739 -0200
+--- mozilla-release.orig/browser/locales/en-US/chrome/browser/aboutHome.dtd	2015-01-09 02:38:16.000000000 -0200
++++ mozilla-release/browser/locales/en-US/chrome/browser/aboutHome.dtd	2015-01-16 15:03:01.408257268 -0200
 @@ -13,17 +13,6 @@
  
  <!ENTITY abouthome.searchEngineButton.label "Search">
@@ -690,8 +690,8 @@ diff -Nur mozilla-release.orig/browser/locales/en-US/chrome/browser/aboutHome.dt
  <!ENTITY abouthome.historyButton.label   "History">
  <!-- LOCALIZATION NOTE (abouthome.preferencesButtonWin.label): The label for the
 diff -Nur mozilla-release.orig/browser/locales/en-US/chrome/browser-region/region.properties mozilla-release/browser/locales/en-US/chrome/browser-region/region.properties
---- mozilla-release.orig/browser/locales/en-US/chrome/browser-region/region.properties	2014-10-11 07:06:17.000000000 -0200
-+++ mozilla-release/browser/locales/en-US/chrome/browser-region/region.properties	2014-10-16 03:14:47.990686739 -0200
+--- mozilla-release.orig/browser/locales/en-US/chrome/browser-region/region.properties	2015-01-09 02:38:16.000000000 -0200
++++ mozilla-release/browser/locales/en-US/chrome/browser-region/region.properties	2015-01-16 15:03:01.408257268 -0200
 @@ -3,17 +3,12 @@
  # file, You can obtain one at http://mozilla.org/MPL/2.0/.
  
@@ -740,8 +740,8 @@ diff -Nur mozilla-release.orig/browser/locales/en-US/chrome/browser-region/regio
 +gecko.handlerService.schemes.ircs.0.name=Freenode Web IRC
 +gecko.handlerService.schemes.ircs.0.uriTemplate=https://webchat.freenode.net
 diff -Nur mozilla-release.orig/browser/locales/generic/profile/bookmarks.html.in mozilla-release/browser/locales/generic/profile/bookmarks.html.in
---- mozilla-release.orig/browser/locales/generic/profile/bookmarks.html.in	2014-10-11 07:06:17.000000000 -0200
-+++ mozilla-release/browser/locales/generic/profile/bookmarks.html.in	2014-10-16 03:14:47.990686739 -0200
+--- mozilla-release.orig/browser/locales/generic/profile/bookmarks.html.in	2015-01-09 02:38:16.000000000 -0200
++++ mozilla-release/browser/locales/generic/profile/bookmarks.html.in	2015-01-16 15:03:01.408257268 -0200
 @@ -15,13 +15,20 @@
      <DT><H3 PERSONAL_TOOLBAR_FOLDER="true" ID="rdf:#$FvPhC3">@bookmarks_toolbarfolder@</H3>
  <DD>@bookmarks_toolbarfolder_description@
@@ -770,8 +770,8 @@ diff -Nur mozilla-release.orig/browser/locales/generic/profile/bookmarks.html.in
      </DL><p>
  </DL><p>
 diff -Nur mozilla-release.orig/browser/modules/AboutHome.jsm mozilla-release/browser/modules/AboutHome.jsm
---- mozilla-release.orig/browser/modules/AboutHome.jsm	2014-11-26 00:17:08.000000000 -0200
-+++ mozilla-release/browser/modules/AboutHome.jsm	2014-12-04 14:38:00.341669245 -0200
+--- mozilla-release.orig/browser/modules/AboutHome.jsm	2015-01-09 02:38:17.000000000 -0200
++++ mozilla-release/browser/modules/AboutHome.jsm	2015-01-16 15:03:01.408257268 -0200
 @@ -8,7 +8,7 @@
  let Ci = Components.interfaces;
  let Cu = Components.utils;
diff --git a/libre/iceweasel/vendor.js b/libre/iceweasel/vendor.js
index fd7a153b5..9809d202a 100644
--- a/libre/iceweasel/vendor.js
+++ b/libre/iceweasel/vendor.js
@@ -44,3 +44,12 @@ pref("media.gmp-manager.url.override", "data:text/plain,");
 
 // Disable openh264.
 pref("media.gmp-gmpopenh264.provider.enabled", false);
+
+// Disable the least secure encryption protocols
+pref("security.ssl3.ecdhe_ecdsa_rc4_128_sha", false);
+pref("security.ssl3.ecdhe_rsa_rc4_128_sha", false);
+pref("security.ssl3.rsa_rc4_128_md5", false);
+pref("security.ssl3.rsa_rc4_128_sha", false);
+pref("security.ssl3.rsa_aes_128_sha", false);
+pref("security.ssl3.rsa_aes_256_sha", false);
+pref("security.ssl3.rsa_des_ede3_sha", false);