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

* build with --enable-pie (FS#45460 -> https://bugs.archlinux.org/task/45460)
* disable Pocket integration

4 files changed, 32 insertions, 25 deletions

diff --git a/libre/iceweasel/PKGBUILD b/libre/iceweasel/PKGBUILD
index 54dd453cf..a93fc8bfa 100644
--- a/libre/iceweasel/PKGBUILD
+++ b/libre/iceweasel/PKGBUILD
@@ -16,15 +16,15 @@ _pgo=true
 
 # We're getting this from Debian Experimental
 _debname=iceweasel
-_debver=38.0.1
-_debrel=deb5
+_debver=39.0
+_debrel=deb1
 _debrepo=http://ftp.debian.org/debian/pool/main/
 debfile() { echo $@|sed -r 's@(.).*@\1/&/&@'; }
 
 pkgname=iceweasel
 epoch=1
 pkgver=$_debver.$_debrel
-pkgrel=4
+pkgrel=1
 
 pkgdesc="A libre version of Debian Iceweasel, the standalone web browser based on Mozilla Firefox."
 arch=(i686 x86_64 mips64el)
@@ -53,15 +53,15 @@ source=("$_debrepo/`debfile $_debname`_$_debver.orig.tar.bz2"
         $pkgname-install-dir.patch
         vendor.js
         $pkgname-fixed-loading-icon.png)
-sha256sums=('a0011a4e9078cc2e50a48f76fef3506360d3ab32507b0eef47404dc6d3bd022c'
-            '9c08a16c2da8070eef76db0789cf893c30365a25d4c92f7f2ac3b912f886d4bb'
-            'aa354e7d4ebe6bc7618dd4bee86c17a55911df27684a7e47b2f4189bb1fc5832'
-            '6b02da204b03eec5cbec9d18d0822b4f0869be4415af5a8b9baf37ecafc270b6'
+sha256sums=('a06fe9e0a25b14faf23c15f51c04b943b509688f3663dff0860528f8f085f378'
+            'c11176225bbebab25ea60e63465304cd603f187625ed14df1c071837213d0d08'
+            'aebbd2a28dc23f6486ef6618025ee9ee93fc7ffca830c802881855e467344dcf'
+            '4d5eb8d65a599ed9a46eda02ee96f62b8bde698d6fb29ab2a62dda9f1f30358f'
             '93e3001ce152e1d142619e215a9ef07dd429943b99d21726c25da9ceb31e31cd'
             '56eba484179c7f498076f8dc603d8795e99dce8c6ea1da9736318c59d666bff6'
             '2257dc69886bd0b72c48675a27c3a88b9cf6b598252c9e9f1c99763180684fc3'
             '3aea6676f1e53a09673b6ae219d281fc28054beb6002b09973611c02f827651d'
-            'f1abfe74f715b33feb8ca00062cc8bf2498c3ebc641eb7b5f231f786b4227c36'
+            '153057101644dc764f9cc502ce1c47c66bd89e3eff09db7e9c86d591d0d6f39d'
             '68e3a5b47c6d175cc95b98b069a15205f027cab83af9e075818d38610feb6213')
 
 prepare() {
diff --git a/libre/iceweasel/libre.patch b/libre/iceweasel/libre.patch
index c21f4b57c..89b5d9421 100644
--- a/libre/iceweasel/libre.patch
+++ b/libre/iceweasel/libre.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	2015-04-01 18:25:46.447764363 -0300
-+++ mozilla-release/browser/app/profile/firefox.js	2015-04-01 18:28:05.967491230 -0300
-@@ -279,11 +279,6 @@
+--- mozilla-release.orig/browser/app/profile/firefox.js	2015-07-05 23:02:37.831899460 -0300
++++ mozilla-release/browser/app/profile/firefox.js	2015-07-05 23:08:31.637567304 -0300
+@@ -284,11 +284,6 @@
  pref("browser.slowStartup.timeThreshold", 40000);
  pref("browser.slowStartup.maxSamples", 5);
  
@@ -739,9 +739,9 @@ diff -Nur mozilla-release.orig/browser/locales/en-US/chrome/browser/devtools/sou
  
  # LOCALIZATION NOTE The correct localization of this file might be to keep it
 diff -Nur mozilla-release.orig/browser/locales/en-US/chrome/browser/devtools/toolbox.dtd mozilla-release/browser/locales/en-US/chrome/browser/devtools/toolbox.dtd
---- mozilla-release.orig/browser/locales/en-US/chrome/browser/devtools/toolbox.dtd	2015-01-09 02:38:16.000000000 -0200
-+++ mozilla-release/browser/locales/en-US/chrome/browser/devtools/toolbox.dtd	2015-01-31 12:34:06.301357174 -0200
-@@ -79,7 +79,7 @@
+--- mozilla-release.orig/browser/locales/en-US/chrome/browser/devtools/toolbox.dtd	2015-06-30 19:57:55.000000000 -0300
++++ mozilla-release/browser/locales/en-US/chrome/browser/devtools/toolbox.dtd	2015-07-05 23:08:31.667565805 -0300
+@@ -83,7 +83,7 @@
    -  checkbox that toggles remote debugging, i.e. devtools.debugger.remote-enabled
    -  boolean preference in about:config, in the options panel. -->
  <!ENTITY options.enableRemote.label3    "Enable remote debugging">
@@ -750,7 +750,7 @@ diff -Nur mozilla-release.orig/browser/locales/en-US/chrome/browser/devtools/too
  
  <!-- LOCALIZATION NOTE (options.disableJavaScript.label,
    -  options.disableJavaScript.tooltip): This is the options panel label and
-@@ -96,7 +96,7 @@
+@@ -106,7 +106,7 @@
  <!-- LOCALIZATION NOTE (options.selectDefaultTools.label): This is the label for
    -  the heading of group of checkboxes corresponding to the default developer
    -  tools. -->
@@ -888,8 +888,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	2015-01-09 02:38:17.000000000 -0200
-+++ mozilla-release/browser/modules/AboutHome.jsm	2015-01-16 15:03:01.408257268 -0200
+--- mozilla-release.orig/browser/modules/AboutHome.jsm	2015-06-30 19:57:56.000000000 -0300
++++ mozilla-release/browser/modules/AboutHome.jsm	2015-07-05 23:14:31.182948763 -0300
 @@ -8,7 +8,7 @@
  let Ci = Components.interfaces;
  let Cu = Components.utils;
@@ -899,7 +899,7 @@ diff -Nur mozilla-release.orig/browser/modules/AboutHome.jsm mozilla-release/bro
  
  Components.utils.import("resource://gre/modules/XPCOMUtils.jsm");
  Components.utils.import("resource://gre/modules/Services.jsm");
-@@ -20,68 +20,6 @@
+@@ -22,68 +22,6 @@
  XPCOMUtils.defineLazyModuleGetter(this, "Promise",
    "resource://gre/modules/Promise.jsm");
  
@@ -933,10 +933,10 @@ diff -Nur mozilla-release.orig/browser/modules/AboutHome.jsm mozilla-release/bro
 -      return !Services.prefs.getBoolPref("browser.EULA.override");
 -    } catch (e) { }
 -
--#ifndef MOZILLA_OFFICIAL
--    // Non-official builds shouldn't show the notification.
--    return false;
--#endif
+-    if (!AppConstants.MOZILLA_OFFICIAL) {
+-      // Non-official builds shouldn't show the notification.
+-      return false;
+-    }
 -
 -    // Look to see if the user has seen the current version or not.
 -    var currentVersion = Services.prefs.getIntPref("browser.rights.version");
@@ -968,7 +968,7 @@ diff -Nur mozilla-release.orig/browser/modules/AboutHome.jsm mozilla-release/bro
  /**
   * This code provides services to the about:home page. Whenever
   * about:home needs to do something chrome-privileged, it sends a
-@@ -246,18 +184,9 @@
+@@ -249,18 +187,9 @@
      }).then(function(engineName) {
        let data = {
          showRestoreLastSession: ss.canRestoreLastSession,
diff --git a/libre/iceweasel/mozconfig b/libre/iceweasel/mozconfig
index 4b6e783a9..395ce7ba9 100644
--- a/libre/iceweasel/mozconfig
+++ b/libre/iceweasel/mozconfig
@@ -2,6 +2,7 @@
 
 ac_add_options --prefix=/usr
 ac_add_options --libdir=/usr/lib
+ac_add_options --enable-pie
 
 # Iceweasel
 ac_add_options --disable-official-branding
diff --git a/libre/iceweasel/vendor.js b/libre/iceweasel/vendor.js
index 2135bf4aa..4f45d6ebb 100644
--- a/libre/iceweasel/vendor.js
+++ b/libre/iceweasel/vendor.js
@@ -46,6 +46,14 @@ pref("loop.soft_start_hostname", "");
 pref("loop.support_url", "");
 pref("loop.throttled2", false);
 
+// Disable Pocket and make sure that the request URLs of the Pocket are empty
+pref("browser.pocket.enabled", false);
+pref("browser.pocket.api", "");
+pref("browser.pocket.site", "");
+pref("browser.pocket.oAuthConsumerKey", "");
+pref("browser.pocket.useLocaleList", false);
+pref("browser.pocket.enabledLocales", "");
+
 // Make sure that the request URL of the Discover Apps is empty
 pref("browser.apps.URL", "");
 
@@ -161,5 +169,3 @@ pref("pfs.filehint.url", "http://gnuzilla.gnu.org/plugins/PluginFinderService.ph
 // https://directory.fsf.org/wiki/Disable_DHE
 pref("security.ssl3.dhe_rsa_aes_128_sha", false);
 pref("security.ssl3.dhe_rsa_aes_256_sha", false);
-pref("security.ssl3.dhe_dss_aes_128_sha", false);
-pref("security.ssl3.dhe_rsa_des_ede3_sha", false);