From 96796895e0d1dddff82529c1d8a2c27fcefbeee4 Mon Sep 17 00:00:00 2001 From: jc_gargma Date: Sat, 17 Mar 2018 21:46:39 -0700 Subject: Updated to 59.0 --- PKGBUILD | 313 +- distribution.ini | 9 - drm-free.png | Bin 3213 -> 0 bytes enable-object-directory-paths.patch | 13 - gnu_headshadow.png | Bin 6785 -> 0 bytes iceweasel-install-dir.patch | 11 - iceweasel.desktop | 7 +- libre.patch | 39 +- mozconfig | 46 - mozilla-1253216.patch | 12 - mozilla-build-arm.patch | 24 - no-crmf.diff | 15 + no-crmf.patch | 16 - parabola-banner.png | Bin 7768 -> 0 bytes ...ult-and-shell-icons-in-packaging-manifest.patch | 34 - vendor.js | 121 +- watermark.svg | 4095 -------------------- wifi-disentangle.patch | 245 -- wifi-fix-interface.patch | 26 - 19 files changed, 253 insertions(+), 4773 deletions(-) delete mode 100644 distribution.ini delete mode 100644 drm-free.png delete mode 100644 enable-object-directory-paths.patch delete mode 100644 gnu_headshadow.png delete mode 100644 iceweasel-install-dir.patch delete mode 100644 mozconfig delete mode 100644 mozilla-1253216.patch delete mode 100644 mozilla-build-arm.patch create mode 100644 no-crmf.diff delete mode 100644 no-crmf.patch delete mode 100644 parabola-banner.png delete mode 100644 remove-default-and-shell-icons-in-packaging-manifest.patch delete mode 100644 watermark.svg delete mode 100644 wifi-disentangle.patch delete mode 100644 wifi-fix-interface.patch diff --git a/PKGBUILD b/PKGBUILD index 89392f7..673e283 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -1,3 +1,7 @@ +# $Id$ +# Maintainer (Arch): Jan Alexander Steffens (heftig) +# Contributor (Arch): Ionut Biru +# Contributor (Arch): Jakub Schmidtke # Maintainer: Andreas Grapentin # Contributor: André Silva # Contributor: Márcio Silva @@ -5,124 +9,150 @@ # Contributor: Luke Shumaker # Contributor: fauno # Contributor: vando -# Contributor (Arch): Jakub Schmidtke # Contributor: Figue # Contributor: taro-k # Contributor: Michał Masłowski # Contributor: Luke R. # Contributor: Isaac David # Contributor: bill-auger -# Thank you very much to the older contributors: # Contributor: evr # Contributor: Muhammad 'MJ' Jassim -_oldname=firefox -pkgname=iceweasel +# parabola changes and rationale: +# - rebranded to iceweasel +# - removed google api keys and usage +# - removed use of firefox-symbolic.svg +# - added makedepends: mozilla-searchplugins, quilt, libxslt, imagemagick +# - added replaces, conflicts: firefox +_pkgname=firefox +pkgname=iceweasel epoch=1 -pkgver=57.0.4 -pkgrel=1.arcfour1 -_brandingver=57.0 -_brandingrel=1 -_parabolarepo=https://repo.parabola.nu/other/iceweasel -arch=(i686 x86_64 armv7h) - -pkgdesc="Iceweasel, the libre web browser based on Mozilla Firefox." -url="https://wiki.parabola.nu/$pkgname" +pkgver=59.0 +pkgrel=2 +_bver=59.0 +_brel=1 +pkgdesc="Libre standalone web browser based on Mozilla Firefox" +arch=(x86_64) +arch+=(i686 armv7h) license=(MPL GPL LGPL) - -depends=(alsa-lib dbus-glib ffmpeg gtk2 gtk3 hunspell libvpx libxt mime-types mozilla-common nss sqlite startup-notification ttf-font) -depends_x86_64=("icu>=60" "icu<61") -depends_i686=("icu>=60" "icu<61") -depends_armv7h=("icu>=60" "icu<61") -makedepends=(autoconf2.13 diffutils gconf imagemagick imake inetutils libidl2 librsvg libxslt mesa mozilla-searchplugins pkg-config python2 quilt unzip yasm zip) -makedepends_i686=(rust clang llvm) -makedepends_x86_64=("${makedepends_i686[@]}") +url="https://wiki.parabola.nu/$pkgname" +depends=(gtk3 mozilla-common libxt startup-notification mime-types dbus-glib ffmpeg + nss hunspell sqlite ttf-font libpulse libvpx icu) +makedepends=(unzip zip diffutils python2 yasm mesa imake gconf inetutils xorg-server-xvfb + autoconf2.13 rust mercurial clang llvm jack gtk2) +makedepends+=(mozilla-searchplugins quilt libxslt imagemagick) optdepends=('networkmanager: Location detection via available WiFi networks' 'libnotify: Notification integration' + 'pulseaudio: Audio support' 'speech-dispatcher: Text-to-Speech') - -replaces=("$_oldname-libre" "$pkgname-libre" "$_oldname") -conflicts=("$_oldname-libre" "$pkgname-libre" "$_oldname") - -options=(!emptydirs !makeflags !strip debug) - -source=("https://ftp.mozilla.org/pub/$_oldname/releases/$pkgver/source/$_oldname-$pkgver.source.tar.xz" - "$_parabolarepo/${pkgname}_$_brandingver-$_brandingrel.branding.tar.xz" - "$_parabolarepo/${pkgname}_$_brandingver-$_brandingrel.branding.tar.xz.sig" - mozconfig - libre.patch - remove-default-and-shell-icons-in-packaging-manifest.patch - drm-free.png - gnu_headshadow.png - parabola-banner.png - watermark.svg +options=(!emptydirs !makeflags !strip) +replaces=("$_pkgname") +conflicts=("$_pkgname") +# https://archive.mozilla.org/pub/firefox/releases/$pkgver/SOURCE +_commit=c61f5f5ead48c78a80c80db5c489bdc7cfaf8175 +source=(firefox-$pkgver.tar.bz::https://hg.mozilla.org/releases/mozilla-release/archive/$_commit.tar.bz2 $pkgname.desktop - $pkgname-install-dir.patch - vendor.js - distribution.ini - enable-object-directory-paths.patch - mozilla-1253216.patch - no-crmf.patch - mozilla-build-arm.patch - wifi-disentangle.patch - wifi-fix-interface.patch) -sha256sums=('97cced69abfd5c57d968f0095631f86beff4f7b61883edd5a4f207e7f9c43b33' - 'e93f2363d7b414d207250eb1c63d955681f158c8d5678ef3d2e9232cdb0382c7' + no-crmf.diff) +source+=(https://repo.parabola.nu/other/iceweasel/${pkgname}_$_bver-$_brel.branding.tar.xz{,.sig} + libre.patch + vendor.js) +sha256sums=('fb5ff29e2bc68fa5ebb8bd8c800b597fcb2dd5820899aef3372380c99a0acec6' + 'ed350ef2f528b999a621f7080fa80948be6b351e67ce32529fb32bcf47bb21fa' + 'fb85a538044c15471c12cf561d6aa74570f8de7b054a7063ef88ee1bdfc1ccbb' + '7ee098251254cbfbcdf78463d3af95089e38d7942a5c7936dacbcf0c5fb1c5b8' 'SKIP' - '8656d1314eda65f81a2b536f7dd1274f6d82ef1aee6573dc14b024749a6f1df4' - '7b7d608f738d0f48be923b6b61281918cfb35f372d7b9fc7b1b7133efa2dd17f' - '6e23fe534394bbab0041f5935cd23c2590285f7541b0a10f3042905676b1561e' - '56eba484179c7f498076f8dc603d8795e99dce8c6ea1da9736318c59d666bff6' - '93e3001ce152e1d142619e215a9ef07dd429943b99d21726c25da9ceb31e31cd' - '3ba321484226e4cbd9b139d584339a51613b1d27c5c290f07a97e2a54facf16f' - '642b214b219e3c7668abed7119c3fadaeee9da80e98aba93a42ea8128eccd73c' - '250f7aaa3c1362f9d2bb2211cd605eab93a5e806e8540f184979d41acf46142a' - '46e588300797bda599c8f5157437fd79f88b6e1179f2fde49e0405e435e03efa' - '2788719e3f619e509aa50c0facf98fb5dd24d71220b096e698adeaeee492b929' - 'd28b14a870aa100273243039d08ab9e64d325c28b6291413441146ebdf5d38ee' - 'ce1765c7812da53dc555103d54998d57890def127aa034b37f21dbfab65dde65' - 'fbb6011501a74a8ea6d01c041870fcefb7ef2859c134aedc676e5f6452833f65' - 'c0ceaaa83a0c79035cdb39b6c130064409dffa546ae2d576fa061b52e4a0392f' - '56eecee8162c138c442773d66483886f1242c8dd2b16eed5711ae5e63d9b0e3a' - 'f068b84ad31556095145d8fefc012dd3d1458948533ed3fff6cbc7250b6e73ed' - 'e98a3453d803cc7ddcb81a7dc83f883230dd8591bdf936fc5a868428979ed1f1') -validpgpkeys=( - 'BFA8008A8265677063B11BF47171986E4B745536' # Andreas Grapentin -) + '12170e0539997396f83c511317377cf4cc5af74177c6c1db14275ebf0b932bb9' + 'a3d82a2b4a61637c3813957c48e8ed0e16afc0138b198d2ec0c61f3dbb8977d2') +validpgpkeys=('BFA8008A8265677063B11BF47171986E4B745536') # Andreas Grapentin prepare() { - cd "$srcdir/$_oldname-$pkgver" + mkdir path + ln -s /usr/bin/python2 path/python - local brandingdir="$srcdir/$pkgname-$_brandingver" + cd mozilla-release-$_commit - # Prepare branding for the Iceweasel packages - mkdir -v browser/branding/$pkgname + # https://bugzilla.mozilla.org/show_bug.cgi?id=1371991 + patch -Np1 -i ../no-crmf.diff + + cat >.mozconfig <> .mozconfig << END +ac_add_options --disable-webrtc +ac_add_options --disable-elf-hack +ac_add_options --disable-stylo +ac_add_options --enable-optimize="-g -O2 -fno-schedule-insns" +END + fi - # copy the branding files + # perform rebranding + local brandingdir="$srcdir/$pkgname-$_bver" + mkdir -v browser/branding/$pkgname cp -va $brandingdir/branding/* browser/branding/$pkgname - # patch export QUILT_PATCHES=$brandingdir/patches export QUILT_REFRESH_ARGS='-p ab --no-timestamps --no-index' export QUILT_DIFF_ARGS='--no-timestamps' - quilt push -av # Put "Start Page" branding images in the source code - install -m644 "$srcdir/"{drm-free,gnu_headshadow,parabola-banner}.png \ + install -m644 "$brandingdir/branding/"{drm-free,gnu_headshadow,parabola-banner}.png \ browser/base/content/abouthome - install -m644 "$srcdir/watermark.svg" \ + install -m644 "$brandingdir/branding/watermark.svg" \ browser/extensions/onboarding/content/img - # Useless since we are doing it ourselves - patch -Np1 -i "$srcdir/remove-default-and-shell-icons-in-packaging-manifest.patch" - - # Enable object directory paths for Iceweasel rebranding - patch -Np1 -i "$srcdir/enable-object-directory-paths.patch" - - # Install to /usr/lib/iceweasel - patch -Np1 -i "$srcdir/$pkgname-install-dir.patch" + # produce icons + for i in 128; do + rsvg-convert -w $i -h $i "$srcdir/$pkgname-$_bver/branding/${pkgname}_icon.svg" \ + -o "browser/branding/iceweasel/default$i.png" + done # Patch and remove anything that's left patch -Np1 -i "$srcdir/libre.patch" @@ -135,21 +165,8 @@ prepare() { \|installLinux| s|true|false| ' browser/base/content/browser-plugins.js - # Load our build config, disable SafeSearch - cp "$srcdir/mozconfig" .mozconfig - - # override the new newtab obscenity with the abouthome stuff - cat browser/base/content/abouthome/aboutHome.xhtml > browser/base/content/newtab/newTab.xhtml - - # https://bugzilla.mozilla.org/show_bug.cgi?id=1314968 - patch -Np1 -i ../wifi-disentangle.patch - patch -Np1 -i ../wifi-fix-interface.patch - - # https://bugzilla.mozilla.org/show_bug.cgi?id=1371991 - patch -Np1 -i "$srcdir/no-crmf.patch" - - mkdir "$srcdir/path" - ln -s /usr/bin/python2 "$srcdir/path/python" + # replace newtab page with abouthome + #cat browser/base/content/abouthome/aboutHome.xhtml > browser/base/content/newtab/newTab.xhtml # Load our searchplugins rm -rv browser/locales/searchplugins @@ -160,82 +177,72 @@ prepare() { sed -i 's|[;]1|;0|' browser/experiments/Experiments.manifest || die "failed to break ExperimentsService" sed -i '/pocket/d' browser/extensions/moz.build || die "failed to wipe pocket" sed -i '/activity-stream/d' browser/extensions/moz.build || die "failed to wipe activity-stream" - - # ARM-specific changes: - if [[ "$CARCH" == arm* ]]; then - sed -i '/ac_add_options --enable-rust/d' .mozconfig - echo "ac_add_options --disable-ion" >> .mozconfig - echo "ac_add_options --disable-elf-hack" >> .mozconfig - echo "ac_add_options --disable-webrtc" >> .mozconfig - - # Disable gold linker, reduce memory consumption at link time - sed -i '/ac_add_options --enable-gold/d' .mozconfig - LDFLAGS+=" -Wl,--no-keep-memory -Wl,--reduce-memory-overheads" - echo "ac_add_options --disable-tests" >> .mozconfig - echo "ac_add_options --disable-debug" >> .mozconfig - - patch -p1 -i ../mozilla-1253216.patch - patch -p1 -i ../mozilla-build-arm.patch - fi } build() { - cd "$srcdir/$_oldname-$pkgver" + cd mozilla-release-$_commit # _FORTIFY_SOURCE causes configure failures CPPFLAGS+=" -O2" - # Hardening - LDFLAGS+=" -Wl,-z,now" - - # GCC 6 - CFLAGS+=" -fno-delete-null-pointer-checks -fno-lifetime-dse -fno-schedule-insns2" - CXXFLAGS+=" -fno-delete-null-pointer-checks -fno-lifetime-dse -fno-schedule-insns2" - export PATH="$srcdir/path:$PATH" - export PYTHON="/usr/bin/python2" + export MOZ_SOURCE_REPO="$_repo" - make -f client.mk build + # Do PGO + #xvfb-run -a -n 95 -s "-extension GLX -screen 0 1280x1024x24" \ + # MOZ_PGO=1 ./mach build + ./mach build + ./mach buildsymbols } package() { - cd "$srcdir/$_oldname-$pkgver" - - make -f client.mk DESTDIR="$pkgdir" INSTALL_SDK= install + cd mozilla-release-$_commit + DESTDIR="$pkgdir" ./mach install + find . -name '*crashreporter-symbols-full.zip' -exec cp -fvt "$startdir" {} + install -Dm644 "$srcdir/vendor.js" "$pkgdir/usr/lib/$pkgname/browser/defaults/preferences/vendor.js" local shortver=$(echo $pkgver | cut -d'.' -f1,2) sed -i "s/@PKGVER@/$shortver/g" "$pkgdir/usr/lib/$pkgname/browser/defaults/preferences/vendor.js" + + _distini="$pkgdir/usr/lib/$pkgname/distribution/distribution.ini" + install -Dm644 /dev/stdin "$_distini" <=7', { -- 'defines': ['WEBRTC_ARCH_ARM_V7', -- 'WEBRTC_BUILD_NEON_LIBS'], -- 'conditions': [ -- ['arm_neon==1', { -- 'defines': ['WEBRTC_ARCH_ARM_NEON',], -- }], -- ['arm_neon==0 and arm_neon_optional==1', { -- 'defines': ['WEBRTC_DETECT_ARM_NEON',], -- }], -- ], -- }], -- ], - }], - ['os_bsd==1', { - 'defines': [ diff --git a/no-crmf.diff b/no-crmf.diff new file mode 100644 index 0000000..242304e --- /dev/null +++ b/no-crmf.diff @@ -0,0 +1,15 @@ +diff --git i/old-configure.in w/old-configure.in +index 0a06e470d2085922..d41c8e9d5dd2dbfb 100644 +--- i/old-configure.in ++++ w/old-configure.in +@@ -2020,9 +2020,7 @@ if test -n "$_USE_SYSTEM_NSS"; then + AM_PATH_NSS(3.31, [MOZ_SYSTEM_NSS=1], [AC_MSG_ERROR([you don't have NSS installed or your version is too old])]) + fi + +-if test -n "$MOZ_SYSTEM_NSS"; then +- NSS_LIBS="$NSS_LIBS -lcrmf" +-else ++if test -z "$MOZ_SYSTEM_NSS"; then + NSS_CFLAGS="-I${DIST}/include/nss" + case "${OS_ARCH}" in + # Only few platforms have been tested with GYP diff --git a/no-crmf.patch b/no-crmf.patch deleted file mode 100644 index 9d4e5f1..0000000 --- a/no-crmf.patch +++ /dev/null @@ -1,16 +0,0 @@ -diff --git i/old-configure.in w/old-configure.in -index 0a06e470d2085922..d41c8e9d5dd2dbfb 100644 ---- i/old-configure.in -+++ w/old-configure.in -@@ -1906,9 +1906,7 @@ if test -n "$_USE_SYSTEM_NSS"; then - AM_PATH_NSS(3.33, [MOZ_SYSTEM_NSS=1], [AC_MSG_ERROR([you don't have NSS installed or your version is too old])]) - fi - --if test -n "$MOZ_SYSTEM_NSS"; then -- NSS_LIBS="$NSS_LIBS -lcrmf" --else -+if test -z "$MOZ_SYSTEM_NSS"; then - NSS_CFLAGS="-I${DIST}/include/nss" - case "${OS_ARCH}" in - # Only few platforms have been tested with GYP - diff --git a/parabola-banner.png b/parabola-banner.png deleted file mode 100644 index 621ee4e..0000000 Binary files a/parabola-banner.png and /dev/null differ diff --git a/remove-default-and-shell-icons-in-packaging-manifest.patch b/remove-default-and-shell-icons-in-packaging-manifest.patch deleted file mode 100644 index f46f46d..0000000 --- a/remove-default-and-shell-icons-in-packaging-manifest.patch +++ /dev/null @@ -1,34 +0,0 @@ -diff --git a/browser/installer/package-manifest.in b/browser/installer/package-manifest.in -index cffcff1..85d28cc 100644 ---- a/browser/installer/package-manifest.in -+++ b/browser/installer/package-manifest.in -@@ -621,11 +621,6 @@ - @RESPATH@/chrome/toolkit.manifest - @RESPATH@/chrome/recording.manifest - @RESPATH@/chrome/recording/* --#ifdef MOZ_GTK --@RESPATH@/browser/chrome/icons/default/default16.png --@RESPATH@/browser/chrome/icons/default/default32.png --@RESPATH@/browser/chrome/icons/default/default48.png --#endif - @RESPATH@/browser/features/* - - ; [Webide Files] -@@ -644,17 +639,10 @@ - @RESPATH@/browser/@PREF_DIR@/devtools.js - @RESPATH@/browser/@PREF_DIR@/debugger.js - --; shell icons --#ifdef XP_UNIX --#ifndef XP_MACOSX --; shell icons --@RESPATH@/browser/icons/*.png - #ifdef MOZ_UPDATER - ; updater icon - @RESPATH@/icons/updater.png - #endif --#endif --#endif - - ; [Default Preferences] - ; All the pref files must be part of base to prevent migration bugs diff --git a/vendor.js b/vendor.js index a36c5d3..5e28e5a 100644 --- a/vendor.js +++ b/vendor.js @@ -22,7 +22,7 @@ pref("beacon.enabled", false); //Conflict pref("breakpad.reportURL", ""); //Conflict //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.aboutHomeSnippets.updateUrl", "https://127.0.0.1"); //Conflict +pref("browser.aboutHomeSnippets.updateUrl", "data:,"); //Conflict pref("browser.backspace_action", 2); //pref("browser.bookmarks.max_backups", 15); pref("browser.bookmarks.max_backups", 0); //Conflict @@ -34,11 +34,10 @@ pref("browser.cache.disk.smart_size.enabled", false); //Conflict pref("browser.cache.disk.smart_size.first_run", false); //pref("browser.cache.disk_cache_ssl", true); pref("browser.cache.disk_cache_ssl", false); //Conflict -//pref("browser.cache.frecency_experiment", 0); -pref("browser.cache.frecency_experiment", -1); //Conflict +pref("browser.cache.frecency_experiment", -1); pref("browser.cache.memory.capacity", 1048576); //Hidden pref("browser.cache.offline.enable", false); -pref("browser.crashReports.unsubmittedCheck.autoSubmit", false); +\pref("browser.crashReports.unsubmittedCheck.autoSubmit2", false); pref("browser.crashReports.unsubmittedCheck.enabled", false); pref("browser.customizemode.tip0.learnMoreUrl", "https://support.mozilla.org/1/firefox/%VERSION%/%OS%/%LOCALE%/customize"); pref("browser.disableResetPrompt", true); @@ -61,6 +60,7 @@ pref("browser.formfill.enable", false); pref("browser.helperApps.deleteTempFileOnExit", true); pref("browser.laterrun.enabled", false); pref("browser.library.activity-stream.enabled", false); +pref("browser.link.open_newwindow", 3); pref("browser.link.open_newwindow.restriction", 0); pref("browser.migrate.automigrate.enabled", false); //pref("browser.newtab.preload", true); @@ -78,8 +78,7 @@ pref("browser.newtabpage.preload", false); pref("browser.newtabpage.remote", false); pref("browser.offline-apps.notify", true); pref("browser.onboarding.enabled", false); -//pref("browser.pagethumbnails.capturing_disabled", true); //Breaks page thumbnails -pref("browser.pagethumbnails.capturing_disabled", false); //Breaks page thumbnails if true +pref("browser.pagethumbnails.capturing_disabled", true); //Breaks page thumbnails pref("browser.ping-centre.telemetry", false); pref("browser.ping-centre.production.endpoint", "https://127.0.0.1"); //Conflict pref("browser.ping-centre.staging.endpoint", "https://127.0.0.1"); //Conflict @@ -105,6 +104,8 @@ pref("browser.safebrowsing.provider.google.reportURL", ""); pref("browser.safebrowsing.provider.google.updateURL", ""); pref("browser.safebrowsing.provider.google.reportMalwareMistakeURL", ""); pref("browser.safebrowsing.provider.google.reportPhishMistakeURL", ""); +pref("browser.safebrowsing.provider.google4.dataSharing.enabled", false); +pref("browser.safebrowsing.provider.google4.dataSharingURL", ""); pref("browser.safebrowsing.provider.google4.gethashURL", ""); pref("browser.safebrowsing.provider.google4.reportURL", ""); pref("browser.safebrowsing.provider.google4.reportMalwareMistakeURL", ""); @@ -113,30 +114,20 @@ pref("browser.safebrowsing.provider.google4.updateURL", ""); //pref("browser.safebrowsing.reportPhishURL", "https://%LOCALE%.phish-report.mozilla.com/?hl=%LOCALE%&url="); pref("browser.safebrowsing.reportPhishURL", ""); //Conflict pref("browser.search.countryCode", "US"); -//pref("browser.search.defaultenginename", "data:text/plain,browser.search.defaultenginename=DuckDuckGo"); -pref("browser.search.defaultenginename", "data:text/plain,browser.search.defaultenginename=DuckDuckGo Lite"); //Conflict -//pref("browser.search.defaultenginename.US", "data:text/plain,browser.search.defaultenginename.US=Yahoo"); -pref("browser.search.defaultenginename.US", "data:text/plain,browser.search.defaultenginename=DuckDuckGo Lite"); //Conflict +pref("browser.search.defaultenginename", "data:text/plain,browser.search.defaultenginename=DuckDuckGo"); +pref("browser.search.defaultenginename.US", "data:text/plain,browser.search.defaultenginename.US=Yahoo"); pref("browser.search.geoSpecificDefaults", false); //pref("browser.search.geoSpecificDefaults.url", "https://search.services.mozilla.com/1/%APP%/%VERSION%/%CHANNEL%/%LOCALE%/%REGION%/%DISTRIBUTION%/%DISTRIBUTION_VERSION%"); pref("browser.search.geoSpecificDefaults.url", ""); //Conflict pref("browser.search.geoip.url", ""); -//pref("browser.search.order.1", "Google"); -pref("browser.search.order.1", "DuckDuckGo Lite"); //Conflict -//pref("browser.search.order.2", "Yahoo"); -pref("browser.search.order.2", "Parabola Packages"); //Conflict -//pref("browser.search.order.3", "Bing"); -pref("browser.search.order.3", "ParabolaWiki"); //Conflict -//pref("browser.search.order.extra.1", "DuckDuckGo"); -pref("browser.search.order.extra.1", "DuckDuckGo Lite"); //Conflict -//pref("browser.search.order.extra.2", "YouTube"); -pref("browser.search.order.extra.2", "Parabola Packages"); //Conflict -//pref("browser.search.order.US.1", "data:text/plain,browser.search.order.US.1=Yahoo"); -pref("browser.search.order.US.1", "data:text/plain,browser.search.order.US.1=DuckDuckGo Lite"); //Conflict -//pref("browser.search.order.US.2", "data:text/plain,browser.search.order.US.2=Google"); -pref("browser.search.order.US.2", "data:text/plain,browser.search.order.US.2=Parabola Packages"); //Conflict -//pref("browser.search.order.US.3", "data:text/plain,browser.search.order.US.3=Bing"); -pref("browser.search.order.US.3", "data:text/plain,browser.search.order.US.3=ParabolaWiki"); //Conflict +pref("browser.search.order.1", "Google"); +pref("browser.search.order.2", "Yahoo"); +pref("browser.search.order.3", "Bing"); +pref("browser.search.order.extra.1", "DuckDuckGo"); +pref("browser.search.order.extra.2", "YouTube"); +pref("browser.search.order.US.1", "data:text/plain,browser.search.order.US.1=Yahoo"); +pref("browser.search.order.US.2", "data:text/plain,browser.search.order.US.2=Google"); +pref("browser.search.order.US.3", "data:text/plain,browser.search.order.US.3=Bing"); pref("browser.search.region", "US"); pref("browser.search.suggest.enabled", false); pref("browser.search.update", false); @@ -158,11 +149,9 @@ pref("browser.storageManager.enabled", false); pref("browser.syncPromoViewsLeftMap", "{\"addons\":0, \"passwords\":0, \"bookmarks\":0}"); //pref("browser.tabs.crashReporting.sendReport", true); pref("browser.tabs.crashReporting.sendReport", false); //Conflict +pref("browser.tabs.insertRelatedAfterCurrent", true); pref("browser.tabs.remote.allowLinkedWebInFileUriProcess", false); -pref("browser.tabs.remote.autostart", true); //If you want e10 -//pref("browser.tabs.remote.autostart.2", true); //Control Group e10, ignore -//pref("browser.tabs.remote.force-enable", true); //If you really want e10 //Hidden -pref("browser.tabs.remote.separateFileUriProcess", true); //If you want e10 +pref("browser.tabs.selectOwnerOnClose", true); pref("browser.taskbar.lists.enabled", false); pref("browser.taskbar.lists.frequent.enabled", false); pref("browser.taskbar.lists.recent.enabled", false); @@ -187,6 +176,10 @@ pref("browser.urlbar.suggest.bookmark", false); //Conflict pref("browser.urlbar.suggest.history", false); //Conflict //pref("browser.urlbar.suggest.openpage", false); pref("browser.urlbar.suggest.openpage", false); //Conflict +pref("browser.urlbar.suggest.searches", false); +pref("browser.urlbar.searchSuggestionsChoice", false); + + //pref("browser.urlbar.trimURLs", true); pref("browser.urlbar.trimURLs", false); //Conflict //pref("browser.urlbar.userMadeSearchSuggestionsChoice", false); @@ -196,9 +189,6 @@ pref("browser.usedOnWindows10", true); //pref("browser.xul.error_pages.expert_bad_cert", false); pref("browser.xul.error_pages.expert_bad_cert", true); //Conflict -//pref("camera.control.face_detection.enabled", true); -pref("camera.control.face_detection.enabled", false); //Conflict - pref("captivedetect.canonicalURL", ""); //pref("canvas.capturestream.enabled", true); @@ -206,7 +196,6 @@ pref("canvas.capturestream.enabled", false); //Conflict pref("clipboard.autocopy", false); -pref("datareporting.healthreport.about.reportUrl", "data:text/plain,"); pref("datareporting.healthreport.uploadEnabled", false); pref("datareporting.policy.dataSubmissionEnabled", false); pref("datareporting.policy.firstRunURL", ""); @@ -228,39 +217,21 @@ pref("dom.caches.enabled", false); //pref("dom.event.clipboardevents.enabled", true); pref("dom.event.clipboardevents.enabled", false); //Conflict pref("dom.event.highrestimestamp.enabled", true); -pref("dom.flyweb.enabled", false); pref("dom.forms.autocomplete.experimental", false); pref("dom.gamepad.extensions.enabled", false); pref("dom.gamepad.non_standard_events.enabled", false); pref("dom.gamepad.test.enabled", false); pref("dom.keyboardevent.dispatch_during_composition", false); -//pref("dom.idle-observers-api.enabled", true); -pref("dom.idle-observers-api.enabled", false); //Conflict pref("dom.imagecapture.enabled", false); -pref("dom.indexedDB.enabled", true); //required by noscript -//pref("dom.indexedDB.enabled", false); //Conflict +pref("dom.indexedDB.enabled", true); pref("dom.input.dirpicker", false); pref("dom.IntersectionObserver.enabled", false); //pref("dom.ipc.plugins.flash.subprocess.crashreporter.enabled", true); pref("dom.ipc.plugins.flash.subprocess.crashreporter.enabled", false); //Conflict //pref("dom.ipc.plugins.reportCrashURL", true); pref("dom.ipc.plugins.reportCrashURL", false); //Conflict -//pref("dom.ipc.plugins.sandbox-level.default", "donotuse"); -//pref("dom.ipc.plugins.sandbox-level.flash", "donotuse"); -pref("dom.ipc.processCount", 1); //If you want e10 -//pref("dom.ipc.processCount.extension", 1); //If you want e10 -//pref("dom.ipc.processCount.file", 1); //If you want e10 -pref("dom.ipc.shims.enabledWarnings", true); pref("dom.mozTCPSocket.enabled", false); pref("dom.performance.enable_user_timing_logging", false); -pref("dom.presentation.enabled", false); -pref("dom.presentation.controller.enabled", false); -pref("dom.presentation.discoverable", false); -pref("dom.presentation.discovery.enabled", false); -pref("dom.presentation.discovery.legacy.enabled", false); -pref("dom.presentation.receiver.enabled", false); -pref("dom.presentation.tcp_server.debug", false); -pref("dom.presentation.session_transport.data_channel.enable", false); pref("dom.popup_allowed_events", "change click dblclick mouseup notificationclick reset submit touchend"); //pref("dom.popup_maximum", 20); pref("dom.popup_maximum", 3); //Conflict @@ -280,10 +251,13 @@ pref("dom.vr.cardboard.enabled", false); pref("dom.vr.openvr.enabled", false); pref("dom.vr.osvr.enabled", false); pref("dom.vr.poseprediction.enabled", false); +pref("dom.w3c_pointer_events.enabled", false); pref("dom.webaudio.enabled", false); //pref("dom.webnotifications.enabled", true); pref("dom.webnotifications.enabled", false); //Conflict pref("dom.webnotifications.requireinteraction.enabled", false); +//pref("dom.webnotifications.serviceworker.enabled", true); +pref("dom.webnotifications.serviceworker.enabled", false); //Conflict //pref("dom.workers.enabled", true); pref("dom.workers.enabled", false); //Conflict @@ -335,7 +309,6 @@ pref("extensions.webcompat-reporter.enabled", false); pref("extensions.webcompat-reporter.newIssueEndpoint", ""); pref("extensions.webextensions.keepStorageOnUninstall", false); pref("extensions.webextensions.keepUuidOnUninstall", false); -//pref("extensions.webextensions.remote", true); //If you want e10 //Breaks alot of WebExt currently pref("extensions.webservice.discoverURL", "https://discovery.addons.mozilla.org/%LOCALE%/firefox/discovery/pane/%VERSION%/%OS%/%COMPATIBILITY_MODE%"); //pref("full-screen-api.warning.timeout", 3000); @@ -343,9 +316,11 @@ pref("full-screen-api.warning.timeout", 0); //Conflict pref("font.blacklist.underline_offset", "FangSong,Gulim,GulimChe,MingLiU,MingLiU-ExtB,MingLiU_HKSCS,MingLiU-HKSCS-ExtB,MS Gothic,MS Mincho,MS PGothic,MS PMincho,MS UI Gothic,PMingLiU,PMingLiU-ExtB,SimHei,SimSun,SimSun-ExtB,Hei,Kai,Apple LiGothic,Apple LiSung,Osaka"); +pref("general.useragent.compatMode.firefox", false); //pref("general.warnOnAboutConfig", true); pref("general.warnOnAboutConfig", false); //Conflict +pref("geo.enabled", false); pref("geo.wifi.logging.enabled", false); pref("geo.wifi.uri", ""); pref("geo.wifi.xhr.timeout", 1); @@ -359,18 +334,22 @@ pref("gfx.font_rendering.opentype_svg.enabled", false); pref("gfx.layerscope.enabled", false); pref("gfx.offscreencanvas.enabled", false); +pref("identity.fxaccounts.enabled", false); //Added in Firefox 60 +pref("identity.fxaccounts.remote.email.uri", ""); +pref("identity.fxaccounts.remote.force_auth.uri", ""); pref("identity.mobilepromo.android", "https://www.mozilla.org/firefox/android/"); pref("identity.mobilepromo.ios", ""); pref("intl.charset.default", "windows-1252"); -pref("intl.locale.matchOS", false); +pref("intl.locale.requested", "en-US"); pref("intl.accept_languages", "en-US, en"); pref("intl.regional_prefs.use_os_locales", false); pref("javascript.options.asmjs", false); -pref("javascript.options.baselinejit.content", false); +pref("javascript.options.baselinejit", false); pref("javascript.options.ion", false); pref("javascript.options.native_regexp", false); +pref("javascript.options.shared_memory", false); pref("javascript.options.wasm", false); pref("javascript.options.wasm_baselinejit", false); pref("javascript.use_us_english_locale", true); @@ -394,6 +373,7 @@ pref("media.audio_data.enabled", false); //pref("media.autoplay.enabled", true); pref("media.autoplay.enabled", false); //Conflict //pref("media.block-autoplay-until-in-foreground", false); +pref("media.benchmark.vp9.threshold", 0); pref("media.block-autoplay-until-in-foreground", true); //Conflict pref("media.cache_size", 0); pref("media.decoder-doctor.new-issue-endpoint", ""); @@ -401,8 +381,6 @@ pref("media.eme.enabled", false); pref("media.getusermedia.audiocapture.enabled", false); pref("media.getusermedia.browser.enabled", false); pref("media.getusermedia.noise_enabled", false); -//pref("media.getusermedia.screensharing.allowed_domains", "webex.com,*.webex.com,ciscospark.com,*.ciscospark.com,projectsquared.com,*.projectsquared.com,*.room.co,room.co,beta.talky.io,talky.io,*.clearslide.com,appear.in,*.appear.in,tokbox.com,*.tokbox.com,*.sso.francetelecom.fr,*.si.francetelecom.fr,*.sso.infra.ftgroup,*.multimedia-conference.orange-business.com,*.espacecollaboration.orange-business.com,free.gotomeeting.com,g2m.me,*.g2m.me,*.mypurecloud.com,*.mypurecloud.com.au,spreed.me,*.spreed.me,*.spreed.com,air.mozilla.org,*.circuit.com,*.yourcircuit.com,circuit.siemens.com,yourcircuit.siemens.com,circuitsandbox.net,*.unify.com,tandi.circuitsandbox.net,*.ericsson.net,*.cct.ericsson.net,*.opentok.com,*.conf.meetecho.com,meet.jit.si,*.meet.jit.si,web.stage.speakeasyapp.net,web.speakeasyapp.net,*.hipchat.me,*.beta-wspbx.com,*.wspbx.com,*.unifiedcloudit.com,*.smartboxuc.com,*.smartbox-uc.com,*.panterranetworks.com,pexipdemo.com,*.pexipdemo.com,pex.me,*.pex.me,*.rd.pexip.com,1click.io,*.1click.io,*.fuze.com,*.fuzemeeting.com,*.thinkingphones.com,gotomeeting.com,*.gotomeeting.com,gotowebinar.com,*.gotowebinar.com,gototraining.com,*.gototraining.com,citrix.com,*.citrix.com,expertcity.com,*.expertcity.com,citrixonline.com,*.citrixonline.com,g2m.me,*.g2m.me,gotomeet.me,*.gotomeet.me,gotomeet.at,*.gotomeet.at,miriadaxdes.miriadax.net,certificacion.miriadax.net,miriadax.net,*.wire.com,sylaps.com,*.sylaps.com,bluejeans.com,*.bluejeans.com,*.a.bluejeans.com,*.bbcollab.com"); -pref("media.getusermedia.screensharing.allowed_domains", ""); //Conflict //pref("media.getusermedia.screensharing.enabled", true); pref("media.getusermedia.screensharing.enabled", false); //Conflict pref("media.gmp-gmpopenh264.autoupdate", false); @@ -419,8 +397,6 @@ pref("media.gmp-widevinecdm.enabled", false); pref("media.gmp-widevinecdm.visible", false); pref("media.navigator.enabled", false); pref("media.navigator.video.enabled", false); -//pref("media.ondevicechange.enabled", true); -pref("media.ondevicechange.enabled", false); //Conflict pref("media.ondevicechange.fakeDeviceChangeEvent.enabled", false); pref("media.peerconnection.enabled", false); pref("media.peerconnection.ice.no_host", true); @@ -442,6 +418,7 @@ pref("network.cookie.cookieBehavior", 2); pref("network.cookie.leave-secure-alone", true); //pref("network.cookie.lifetimePolicy", 2); pref("network.cookie.lifetimePolicy", 0); //Conflict //required by ublock origin +pref("network.cookie.thirdparty.nonsecureSessionOnly", true); pref("network.cookie.thirdparty.sessionOnly", true); pref("network.dnsCacheEntries", 0); pref("network.dnsCacheExpiration", 0); @@ -463,11 +440,12 @@ pref("network.http.referer.spoofSource", false); //pref("network.http.referer.trimmingPolicy", 2); //Breaks many sites //pref("network.http.referer.XOriginPolicy", 2); //Breaks many sites //pref("network.http.referer.XOriginTrimmingPolicy", 0); //Breaks many sites -//pref("network.http.referer.userControlPolicy", 0); //Breaks many sites -pref("network.http.referer.userControlPolicy", 1); //A better default +pref("network.http.referer.defaultPolicy", 1); //A better default +pref("network.http.referer.defaultPolicy.pbmode", 1); //A better default pref("network.http.spdy.enabled", false); pref("network.http.spdy.enabled.deps", false); pref("network.http.spdy.enabled.http2", false); +pref("network.http.spdy.enabled.http2draft", false); //pref("network.http.speculative-parallel-limit", 6); pref("network.http.speculative-parallel-limit", 0); //Conflict pref("network.http.tailing.enabled", false); @@ -506,6 +484,11 @@ pref("offline-apps.allow_by_default", false); //Conflict pref("pdfjs.disabled", true); //Conflict pref("pdfjs.enableWebGL", false); +pref("permissions.default.camera", 2); +pref("permissions.default.desktop-notification", 2); +pref("permissions.default.geo", 2); +pref("permissions.default.microphone", 2); +//pref("permissions.default.shortcuts", 2); //pref("permissions.manager.defaultsUrl", "resource://app/defaults/permissions"); pref("permissions.manager.defaultsUrl", ""); //Conflict //pref("permissions.memory_only", true); @@ -557,7 +540,8 @@ pref("privacy.cpd.passwords", true); //Conflict pref("privacy.cpd.sessions", true); //pref("privacy.cpd.siteSettings", false); //Also clears HSTS logs //Conflict pref("privacy.cpd.siteSettings", true); //Also clears HSTS logs -pref("privacy.donottrackheader.enabled", false); +//pref("privacy.donottrackheader.enabled", false); +pref("privacy.donottrackheader.enabled", true); //Conflict pref("privacy.firstparty.isolate", true); pref("privacy.firstparty.isolate.restrict_opener_access", true); pref("privacy.resistFingerprinting", true); @@ -587,6 +571,7 @@ pref("reader.parse-on-load.enabled", false); pref("security.block_script_with_wrong_mime", true); pref("security.cert_pinning.enforcement_level", 2); pref("security.csp.enable", true); +pref("security.csp.enable_violation_events", false); pref("security.csp.experimentalEnabled", true); pref("security.data_uri.block_toplevel_data_uri_navigations", true); pref("security.dialog_enable_delay", 1000); @@ -600,8 +585,6 @@ pref("security.insecure_password.ui.enabled", true); pref("security.mixed_content.block_active_content", true); //pref("security.mixed_content.block_display_content", false); pref("security.mixed_content.block_display_content", true); //Conflict -pref("security.mixed_content.send_hsts_priming", false); -pref("security.mixed_content.use_hsts", false); pref("security.nocertdb", true); //pref("security.OCSP.enabled", 1); pref("security.OCSP.enabled", 0); //Conflict @@ -609,8 +592,6 @@ pref("security.OCSP.enabled", 0); //Conflict pref("security.OCSP.require", true); //Conflict //pref("security.pki.sha1_enforcement_level", 2); pref("security.pki.sha1_enforcement_level", 1); //Conflict -//pref("security.sandbox.content.level", "donotuse; -//pref("security.sandbox.logging.enabled", true); pref("security.sri.enable", true); pref("security.ssl.disable_session_identifiers", true); pref("security.ssl.enable_false_start", true); @@ -638,8 +619,6 @@ pref("security.tls.version.fallback-limit", 3); pref("security.tls.version.min", 3); //Conflict //pref("security.tls.version.max", 3); pref("security.tls.version.max", 4); //Conflict -//pref("security.xpconnect.plugin.unrestricted", true); -pref("security.xpconnect.plugin.unrestricted", false); //Conflict pref("services.blocklist.signing.enforced", true); pref("services.blocklist.update_enabled", false); @@ -655,7 +634,6 @@ pref("signon.formlessCapture.enabled", false); //Conflict pref("signon.rememberSignons", false); pref("signon.storeWhenAutocompleteOff", true); -//pref("startup.homepage_override_url", "https://www.gnu.org/"); pref("startup.homepage_override_url", ""); pref("startup.homepage_welcome_url", ""); pref("startup.homepage_welcome_url.additional", ""); @@ -668,8 +646,9 @@ pref("toolkit.telemetry.bhrPing.enabled", false); pref("toolkit.telemetry.cachedClientID", ""); pref("toolkit.telemetry.enabled", false); pref("toolkit.telemetry.firstShutdownPing.enabled", false); +pref("toolkit.telemetry.hybridContent.enabled", false); pref("toolkit.telemetry.newProfilePing.enabled", false); -pref("toolkit.telemetry.server", ""); +pref("toolkit.telemetry.server", "data:,"); pref("toolkit.telemetry.shutdownPingSender.enabled", false); pref("toolkit.telemetry.updatePing.enabled", false); pref("toolkit.telemetry.unified", false); diff --git a/watermark.svg b/watermark.svg deleted file mode 100644 index 78898e1..0000000 --- a/watermark.svg +++ /dev/null @@ -1,4095 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - image/svg+xml - - - - - - Ricardo Fernández Fuentes - - - - - Ricardo Fernández Fuentes - - - iceweasel icon - - - - iceweasel - ico - icon - - - - - inkscape - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/wifi-disentangle.patch b/wifi-disentangle.patch deleted file mode 100644 index 8f474b9..0000000 --- a/wifi-disentangle.patch +++ /dev/null @@ -1,245 +0,0 @@ -# HG changeset patch -# Parent 2edd69b245fbc493c3a1cf17c40c63b0280ead12 -Bug 1314968 - Disentangle nsWifiScannerDBus::SendMessage. r?kanru - -Make a copy of the function and specialize it for each message sent. -Avoids the mess of comparing the method name to figure out what to do. - -diff --git a/netwerk/wifi/nsWifiScannerDBus.cpp b/netwerk/wifi/nsWifiScannerDBus.cpp ---- a/netwerk/wifi/nsWifiScannerDBus.cpp -+++ b/netwerk/wifi/nsWifiScannerDBus.cpp -@@ -34,19 +34,47 @@ nsWifiScannerDBus::Scan() - if (!mConnection) { - return NS_ERROR_NOT_AVAILABLE; - } -- return SendMessage("org.freedesktop.NetworkManager", -- "/org/freedesktop/NetworkManager", -- "GetDevices"); -+ return SendGetDevices(); - } - -+// http://dbus.freedesktop.org/doc/api/html/group__DBusConnection.html -+// Refer to function dbus_connection_send_with_reply_and_block. -+static const uint32_t DBUS_DEFAULT_TIMEOUT = -1; -+ - nsresult --nsWifiScannerDBus::SendMessage(const char* aInterface, -- const char* aPath, -- const char* aFuncCall) --{ -- RefPtr msg = already_AddRefed( -- dbus_message_new_method_call("org.freedesktop.NetworkManager", -- aPath, aInterface, aFuncCall)); -+nsWifiScannerDBus::SendGetDevices() -+{ -+ RefPtr msg = already_AddRefed( -+ dbus_message_new_method_call("org.freedesktop.NetworkManager", -+ "/org/freedesktop/NetworkManager", -+ "org.freedesktop.NetworkManager", -+ "GetDevices")); -+ if (!msg) { -+ return NS_ERROR_FAILURE; -+ } -+ -+ DBusError err; -+ dbus_error_init(&err); -+ -+ RefPtr reply = already_AddRefed( -+ dbus_connection_send_with_reply_and_block(mConnection, msg, -+ DBUS_DEFAULT_TIMEOUT, &err)); -+ if (dbus_error_is_set(&err)) { -+ dbus_error_free(&err); -+ return NS_ERROR_FAILURE; -+ } -+ -+ return IdentifyDevices(reply); -+} -+ -+nsresult -+nsWifiScannerDBus::SendGetDeviceType(const char* aPath) -+{ -+ RefPtr msg = already_AddRefed( -+ dbus_message_new_method_call("org.freedesktop.NetworkManager", -+ aPath, -+ "org.freedesktop.DBus.Properties", -+ "Get")); - if (!msg) { - return NS_ERROR_FAILURE; - } -@@ -54,58 +82,92 @@ nsWifiScannerDBus::SendMessage(const cha - DBusMessageIter argsIter; - dbus_message_iter_init_append(msg, &argsIter); - -- if (!strcmp(aFuncCall, "Get")) { -- const char* paramInterface = "org.freedesktop.NetworkManager.Device"; -- if (!dbus_message_iter_append_basic(&argsIter, DBUS_TYPE_STRING, -- ¶mInterface)) { -- return NS_ERROR_FAILURE; -- } -- -- const char* paramDeviceType = "DeviceType"; -- if (!dbus_message_iter_append_basic(&argsIter, DBUS_TYPE_STRING, -- ¶mDeviceType)) { -- return NS_ERROR_FAILURE; -- } -- } else if (!strcmp(aFuncCall, "GetAll")) { -- const char* param = ""; -- if (!dbus_message_iter_append_basic(&argsIter, DBUS_TYPE_STRING, ¶m)) { -- return NS_ERROR_FAILURE; -- } -- } -+ const char* paramInterface = "org.freedesktop.NetworkManager.Device"; -+ if (!dbus_message_iter_append_basic(&argsIter, DBUS_TYPE_STRING, -+ ¶mInterface)) { -+ return NS_ERROR_FAILURE; -+ } -+ -+ const char* paramDeviceType = "DeviceType"; -+ if (!dbus_message_iter_append_basic(&argsIter, DBUS_TYPE_STRING, -+ ¶mDeviceType)) { -+ return NS_ERROR_FAILURE; -+ } -+ -+ DBusError err; -+ dbus_error_init(&err); -+ -+ RefPtr reply = already_AddRefed( -+ dbus_connection_send_with_reply_and_block(mConnection, msg, -+ DBUS_DEFAULT_TIMEOUT, &err)); -+ if (dbus_error_is_set(&err)) { -+ dbus_error_free(&err); -+ return NS_ERROR_FAILURE; -+ } -+ -+ return IdentifyDeviceType(reply, aPath); -+} -+ -+nsresult -+nsWifiScannerDBus::SendGetAccessPoints(const char* aPath) -+{ -+ RefPtr msg = already_AddRefed( -+ dbus_message_new_method_call("org.freedesktop.NetworkManager", -+ aPath, -+ "org.freedesktop.NetworkManager.Device.Wireless", -+ "GetAccessPoints")); -+ if (!msg) { -+ return NS_ERROR_FAILURE; -+ } - - DBusError err; - dbus_error_init(&err); - -- // http://dbus.freedesktop.org/doc/api/html/group__DBusConnection.html -- // Refer to function dbus_connection_send_with_reply_and_block. -- const uint32_t DBUS_DEFAULT_TIMEOUT = -1; - RefPtr reply = already_AddRefed( - dbus_connection_send_with_reply_and_block(mConnection, msg, - DBUS_DEFAULT_TIMEOUT, &err)); - if (dbus_error_is_set(&err)) { - dbus_error_free(&err); -- - // In the GetAccessPoints case, if there are no access points, error is set. - // We don't want to error out here. -- if (!strcmp(aFuncCall, "GetAccessPoints")) { -- return NS_OK; -- } -- return NS_ERROR_FAILURE; -+ return NS_OK; - } - -- nsresult rv; -- if (!strcmp(aFuncCall, "GetDevices")) { -- rv = IdentifyDevices(reply); -- } else if (!strcmp(aFuncCall, "Get")) { -- rv = IdentifyDeviceType(reply, aPath); -- } else if (!strcmp(aFuncCall, "GetAccessPoints")) { -- rv = IdentifyAccessPoints(reply); -- } else if (!strcmp(aFuncCall, "GetAll")) { -- rv = IdentifyAPProperties(reply); -- } else { -- rv = NS_ERROR_FAILURE; -- } -- return rv; -+ return IdentifyAccessPoints(reply); -+} -+ -+nsresult -+nsWifiScannerDBus::SendGetAPProperties(const char* aPath) -+{ -+ RefPtr msg = already_AddRefed( -+ dbus_message_new_method_call("org.freedesktop.NetworkManager", -+ aPath, -+ "org.freedesktop.DBus.Properties", -+ "GetAll")); -+ if (!msg) { -+ return NS_ERROR_FAILURE; -+ } -+ -+ DBusMessageIter argsIter; -+ dbus_message_iter_init_append(msg, &argsIter); -+ -+ const char* param = ""; -+ if (!dbus_message_iter_append_basic(&argsIter, DBUS_TYPE_STRING, ¶m)) { -+ return NS_ERROR_FAILURE; -+ } -+ -+ DBusError err; -+ dbus_error_init(&err); -+ -+ RefPtr reply = already_AddRefed( -+ dbus_connection_send_with_reply_and_block(mConnection, msg, -+ DBUS_DEFAULT_TIMEOUT, &err)); -+ if (dbus_error_is_set(&err)) { -+ dbus_error_free(&err); -+ return NS_ERROR_FAILURE; -+ } -+ -+ return IdentifyAPProperties(reply); - } - - nsresult -@@ -126,7 +188,7 @@ nsWifiScannerDBus::IdentifyDevices(DBusM - return NS_ERROR_FAILURE; - } - -- rv = SendMessage("org.freedesktop.DBus.Properties", devicePath, "Get"); -+ rv = SendGetDeviceType(devicePath); - NS_ENSURE_SUCCESS(rv, rv); - } while (dbus_message_iter_next(&iter)); - -@@ -159,8 +221,7 @@ nsWifiScannerDBus::IdentifyDeviceType(DB - const uint32_t NM_DEVICE_TYPE_WIFI = 2; - nsresult rv = NS_OK; - if (deviceType == NM_DEVICE_TYPE_WIFI) { -- rv = SendMessage("org.freedesktop.NetworkManager.Device.Wireless", -- aDevicePath, "GetAccessPoints"); -+ rv = SendGetAccessPoints(aDevicePath); - } - - return rv; -@@ -183,7 +244,7 @@ nsWifiScannerDBus::IdentifyAccessPoints( - return NS_ERROR_FAILURE; - } - -- rv = SendMessage("org.freedesktop.DBus.Properties", path, "GetAll"); -+ rv = SendGetAPProperties(path); - NS_ENSURE_SUCCESS(rv, rv); - } while (dbus_message_iter_next(&iter)); - -diff --git a/netwerk/wifi/nsWifiScannerDBus.h b/netwerk/wifi/nsWifiScannerDBus.h ---- a/netwerk/wifi/nsWifiScannerDBus.h -+++ b/netwerk/wifi/nsWifiScannerDBus.h -@@ -25,9 +25,10 @@ public: - nsresult Scan(); - - private: -- nsresult SendMessage(const char* aInterface, -- const char* aPath, -- const char* aFuncCall); -+ nsresult SendGetDevices(); -+ nsresult SendGetDeviceType(const char* aPath); -+ nsresult SendGetAccessPoints(const char* aPath); -+ nsresult SendGetAPProperties(const char* aPath); - nsresult IdentifyDevices(DBusMessage* aMsg); - nsresult IdentifyDeviceType(DBusMessage* aMsg, const char* aDevicePath); - nsresult IdentifyAccessPoints(DBusMessage* aMsg); diff --git a/wifi-fix-interface.patch b/wifi-fix-interface.patch deleted file mode 100644 index 1980db1..0000000 --- a/wifi-fix-interface.patch +++ /dev/null @@ -1,26 +0,0 @@ -# HG changeset patch -# Parent 7a6d836b62779aa61988981c6ca646495574a505 -Bug 1314968 - Explicitly specify the AccessPoint interface name. r?kanru - -The DBus specification allows passing an empty string as the interface to the -org.freedesktop.DBus.Properties.GetAll call to get all properties, throwing away the namespace -(interface) information. - -However, GDBus does not allow this. When NetworkManager moved to using GDBus, Firefox lost the -ability to retrieve access points from NetworkManager. - -Since we're only interested in properties from the org.freedesktop.NetworkManager.AccessPoint -interface, name it explicitly. This works with both the old and the new NetworkManager. - -diff --git a/netwerk/wifi/nsWifiScannerDBus.cpp b/netwerk/wifi/nsWifiScannerDBus.cpp ---- a/netwerk/wifi/nsWifiScannerDBus.cpp -+++ b/netwerk/wifi/nsWifiScannerDBus.cpp -@@ -151,7 +151,7 @@ nsWifiScannerDBus::SendGetAll(const char - DBusMessageIter argsIter; - dbus_message_iter_init_append(msg, &argsIter); - -- const char* param = ""; -+ const char* param = "org.freedesktop.NetworkManager.AccessPoint"; - if (!dbus_message_iter_append_basic(&argsIter, DBUS_TYPE_STRING, ¶m)) { - return NS_ERROR_FAILURE; - } -- cgit v1.2.1