From 50557a44e8257abc03913ed5b0828e9fa509dc85 Mon Sep 17 00:00:00 2001 From: Ruben Rodriguez Date: Thu, 23 Jul 2015 11:57:18 -0500 Subject: Finished v38 initial rebase --- data/branding/icecat/LICENSE | 3 + data/branding/icecat/Makefile.in | 9 - data/branding/icecat/bgplain.bmp | Bin 682144 -> 0 bytes data/branding/icecat/branding.nsi | 15 +- data/branding/icecat/clock.bmp | Bin 124214 -> 8982 bytes data/branding/icecat/content/about-background.png | Bin 122354 -> 0 bytes data/branding/icecat/content/jar.mn | 1 + data/branding/icecat/content/silhouette-40.svg | 58 ++++++ data/branding/icecat/document-os2.ico | Bin 7824 -> 0 bytes data/branding/icecat/icecat-os2.ico | Bin 7824 -> 0 bytes data/branding/icecat/locales/Makefile.in | 5 - data/branding/icecat/locales/en-US/brand.dtd | 5 +- .../branding/icecat/locales/en-US/brand.properties | 5 +- data/branding/icecat/locales/jar.mn | 7 +- data/branding/icecat/locales/moz.build | 2 - data/branding/icecat/moz.build | 5 + data/branding/icecat/particles.bmp | Bin 124216 -> 8982 bytes data/branding/icecat/pencil-rtl.bmp | Bin 124214 -> 8982 bytes data/branding/icecat/pencil.bmp | Bin 124214 -> 8982 bytes data/branding/icecat/pref/icecat-branding.js | 5 + data/branding/icecatmobile/locales/Makefile.in | 5 - .../icecatmobile/res/drawable-hdpi/large_icon.png | 1 + .../res/drawable-hdpi/launcher_widget.png | Bin 0 -> 16525 bytes .../icecatmobile/res/drawable-hdpi/widget_icon.png | Bin 0 -> 6440 bytes .../icecatmobile/res/drawable-mdpi/large_icon.png | 1 + .../res/drawable-mdpi/launcher_widget.png | Bin 0 -> 8223 bytes .../icecatmobile/res/drawable-mdpi/widget_icon.png | Bin 0 -> 3249 bytes .../icecatmobile/res/drawable-xhdpi/large_icon.png | 1 + .../res/drawable-xhdpi/launcher_widget.png | Bin 0 -> 22120 bytes .../res/drawable-xhdpi/widget_icon.png | Bin 0 -> 9300 bytes .../res/drawable-xxhdpi/large_icon.png | Bin 0 -> 13024 bytes .../res/drawable-xxhdpi/launcher_widget.png | Bin 0 -> 33659 bytes .../res/drawable-xxhdpi/widget_icon.png | Bin 0 -> 17803 bytes .../icecatmobile/res/drawable-xxxhdpi/icon.png | Bin 0 -> 36606 bytes data/buildscripts/buildall.sh | 14 +- data/buildscripts/mozconfig-android | 13 +- data/buildscripts/mozconfig-common | 2 +- data/buildscripts/toolchain-android.sh | 14 +- data/extensions/spyblock@gnu.org/lib/utils.js | 12 -- data/patches/gnuzilla-bug-1172632-1.patch | 43 ++++ data/patches/gnuzilla-bug-1172632-2.patch | 223 +++++++++++++++++++++ .../reorder-android-services.mozbuild.patch | 35 ++++ data/settings.js | 45 ++++- data/vendor.js | 171 ++++++++++++++++ makeicecat | 35 +++- 45 files changed, 659 insertions(+), 76 deletions(-) delete mode 100644 data/branding/icecat/bgplain.bmp delete mode 100644 data/branding/icecat/content/about-background.png create mode 100644 data/branding/icecat/content/silhouette-40.svg delete mode 100644 data/branding/icecat/document-os2.ico delete mode 100644 data/branding/icecat/icecat-os2.ico delete mode 100644 data/branding/icecat/locales/Makefile.in delete mode 100644 data/branding/icecatmobile/locales/Makefile.in create mode 120000 data/branding/icecatmobile/res/drawable-hdpi/large_icon.png create mode 100644 data/branding/icecatmobile/res/drawable-hdpi/launcher_widget.png create mode 100644 data/branding/icecatmobile/res/drawable-hdpi/widget_icon.png create mode 120000 data/branding/icecatmobile/res/drawable-mdpi/large_icon.png create mode 100644 data/branding/icecatmobile/res/drawable-mdpi/launcher_widget.png create mode 100644 data/branding/icecatmobile/res/drawable-mdpi/widget_icon.png create mode 120000 data/branding/icecatmobile/res/drawable-xhdpi/large_icon.png create mode 100644 data/branding/icecatmobile/res/drawable-xhdpi/launcher_widget.png create mode 100644 data/branding/icecatmobile/res/drawable-xhdpi/widget_icon.png create mode 100644 data/branding/icecatmobile/res/drawable-xxhdpi/large_icon.png create mode 100644 data/branding/icecatmobile/res/drawable-xxhdpi/launcher_widget.png create mode 100644 data/branding/icecatmobile/res/drawable-xxhdpi/widget_icon.png create mode 100644 data/branding/icecatmobile/res/drawable-xxxhdpi/icon.png create mode 100644 data/patches/gnuzilla-bug-1172632-1.patch create mode 100644 data/patches/gnuzilla-bug-1172632-2.patch create mode 100644 data/patches/reorder-android-services.mozbuild.patch create mode 100644 data/vendor.js diff --git a/data/branding/icecat/LICENSE b/data/branding/icecat/LICENSE index e69de29..41dc232 100644 --- a/data/branding/icecat/LICENSE +++ b/data/branding/icecat/LICENSE @@ -0,0 +1,3 @@ +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/. diff --git a/data/branding/icecat/Makefile.in b/data/branding/icecat/Makefile.in index 3b5c4d5..d858c5b 100644 --- a/data/branding/icecat/Makefile.in +++ b/data/branding/icecat/Makefile.in @@ -12,7 +12,6 @@ BRANDING_FILES := \ branding.nsi \ appname.bmp \ bgintro.bmp \ - bgplain.bmp \ clock.bmp \ particles.bmp \ pencil.bmp \ @@ -45,13 +44,6 @@ BRANDING_FILES := \ $(NULL) endif -ifeq ($(OS_ARCH),OS2) -BRANDING_FILES := \ - icecat-os2.ico \ - document-os2.ico \ - $(NULL) -endif - BRANDING_DEST := $(DIST)/branding BRANDING_TARGET := export INSTALL_TARGETS += BRANDING @@ -62,4 +54,3 @@ VISUALMANIFEST_FLAGS := -Fsubstitution -DMOZ_APP_DISPLAYNAME=${MOZ_APP_DISPLAYNA VISUALMANIFEST_PATH := $(DIST)/bin PP_TARGETS += VISUALMANIFEST endif - diff --git a/data/branding/icecat/bgplain.bmp b/data/branding/icecat/bgplain.bmp deleted file mode 100644 index c82f896..0000000 Binary files a/data/branding/icecat/bgplain.bmp and /dev/null differ diff --git a/data/branding/icecat/branding.nsi b/data/branding/icecat/branding.nsi index 9b6ab6a..57a76b2 100644 --- a/data/branding/icecat/branding.nsi +++ b/data/branding/icecat/branding.nsi @@ -8,13 +8,11 @@ # BrandFullNameInternal is used for some registry and file system values # instead of BrandFullName and typically should not be modified. -!define BrandFullNameInternal "IceCat" +!define BrandFullNameInternal "GNU IceCat" !define CompanyName "GNU" !define URLInfoAbout "http://www.gnu.org/software/gnuzilla/" -!define URLUpdateInfo "http://www.gnu.org/software/gnuzilla/" - -!define URLStubDownload "http://www.gnu.org/software/gnuzilla/" -!define URLManualDownload "http://ftp.gnu.org/gnu/gnuzilla/" +!define URLUpdateInfo "https://savannah.gnu.org/projects/gnuzilla/" +!define HelpLink "http://libreplanet.org/wiki/Group:IceCat/ " ; The OFFICIAL define is a workaround to support different urls for Release and ; Beta since they share the same branding when building with other branches that @@ -42,9 +40,8 @@ !define FOOTER_CONTROL_TEXT_COLOR_FADED 0x666666 !define FOOTER_BKGRD_COLOR 0xFFFFFF !define INTRO_BLURB_TEXT_COLOR 0x666666 -!define OPTIONS_TEXT_COLOR_NORMAL 0x000000 -!define OPTIONS_TEXT_COLOR_FADED 0x666666 -!define OPTIONS_BKGRD_COLOR 0xF0F0F0 !define INSTALL_BLURB_TEXT_COLOR 0x666666 !define INSTALL_PROGRESS_TEXT_COLOR_NORMAL 0x666666 -!define INSTALL_PROGRESS_TEXT_COLOR_FADED 0x999999 +!define COMMON_TEXT_COLOR_NORMAL 0x000000 +!define COMMON_TEXT_COLOR_FADED 0x666666 +!define COMMON_BKGRD_COLOR 0xF0F0F0 diff --git a/data/branding/icecat/clock.bmp b/data/branding/icecat/clock.bmp index c74398e..7da034d 100644 Binary files a/data/branding/icecat/clock.bmp and b/data/branding/icecat/clock.bmp differ diff --git a/data/branding/icecat/content/about-background.png b/data/branding/icecat/content/about-background.png deleted file mode 100644 index f626f74..0000000 Binary files a/data/branding/icecat/content/about-background.png and /dev/null differ diff --git a/data/branding/icecat/content/jar.mn b/data/branding/icecat/content/jar.mn index b692816..fec1857 100644 --- a/data/branding/icecat/content/jar.mn +++ b/data/branding/icecat/content/jar.mn @@ -15,6 +15,7 @@ browser.jar: content/branding/icon128.png (../mozicon128.png) content/branding/identity-icons-brand.png (identity-icons-brand.png) content/branding/identity-icons-brand@2x.png (identity-icons-brand@2x.png) + content/branding/silhouette-40.svg (silhouette-40.svg) content/branding/aboutDialog.css (aboutDialog.css) #ifdef MOZ_METRO content/branding/metro-about.css (metro-about.css) diff --git a/data/branding/icecat/content/silhouette-40.svg b/data/branding/icecat/content/silhouette-40.svg new file mode 100644 index 0000000..72d2291 --- /dev/null +++ b/data/branding/icecat/content/silhouette-40.svg @@ -0,0 +1,58 @@ + + + + + + image/svg+xml + + + + + + + + diff --git a/data/branding/icecat/document-os2.ico b/data/branding/icecat/document-os2.ico deleted file mode 100644 index 214e92c..0000000 Binary files a/data/branding/icecat/document-os2.ico and /dev/null differ diff --git a/data/branding/icecat/icecat-os2.ico b/data/branding/icecat/icecat-os2.ico deleted file mode 100644 index 560d198..0000000 Binary files a/data/branding/icecat/icecat-os2.ico and /dev/null differ diff --git a/data/branding/icecat/locales/Makefile.in b/data/branding/icecat/locales/Makefile.in deleted file mode 100644 index 82f614e..0000000 --- a/data/branding/icecat/locales/Makefile.in +++ /dev/null @@ -1,5 +0,0 @@ -# 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/. - -DEFINES += -DAB_CD=$(AB_CD) diff --git a/data/branding/icecat/locales/en-US/brand.dtd b/data/branding/icecat/locales/en-US/brand.dtd index 519de9b..3788266 100644 --- a/data/branding/icecat/locales/en-US/brand.dtd +++ b/data/branding/icecat/locales/en-US/brand.dtd @@ -2,7 +2,8 @@ - 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/. --> + - + - + diff --git a/data/branding/icecat/locales/en-US/brand.properties b/data/branding/icecat/locales/en-US/brand.properties index 3120429..73ef208 100644 --- a/data/branding/icecat/locales/en-US/brand.properties +++ b/data/branding/icecat/locales/en-US/brand.properties @@ -2,9 +2,10 @@ # 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/. +brandShorterName=IceCat brandShortName=IceCat -brandFullName=IceCat -vendorShortName=GNU +brandFullName=Mozilla IceCat +vendorShortName=Mozilla homePageSingleStartMain=IceCat Start, a fast home page with built-in search homePageImport=Import your home page from %S diff --git a/data/branding/icecat/locales/jar.mn b/data/branding/icecat/locales/jar.mn index ff4e055..ff8c28c 100644 --- a/data/branding/icecat/locales/jar.mn +++ b/data/branding/icecat/locales/jar.mn @@ -6,7 +6,6 @@ @AB_CD@.jar: % locale branding @AB_CD@ %locale/branding/ -# Unofficial branding only exists in en-US - locale/branding/brand.dtd (en-US/brand.dtd) - locale/branding/brand.properties (en-US/brand.properties) - locale/branding/browserconfig.properties (browserconfig.properties) + locale/branding/brand.dtd (%brand.dtd) +* locale/branding/brand.properties (%brand.properties) +* locale/branding/browserconfig.properties (browserconfig.properties) diff --git a/data/branding/icecat/locales/moz.build b/data/branding/icecat/locales/moz.build index 3a54c0c..c97072b 100644 --- a/data/branding/icecat/locales/moz.build +++ b/data/branding/icecat/locales/moz.build @@ -4,6 +4,4 @@ # 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/. -DEFINES['MOZ_DISTRIBUTION_ID_UNQUOTED'] = CONFIG['MOZ_DISTRIBUTION_ID'] - JAR_MANIFESTS += ['jar.mn'] \ No newline at end of file diff --git a/data/branding/icecat/moz.build b/data/branding/icecat/moz.build index 3e2f88f..408c1f0 100644 --- a/data/branding/icecat/moz.build +++ b/data/branding/icecat/moz.build @@ -8,3 +8,8 @@ DIRS += ['content', 'locales'] DIST_SUBDIR = 'browser' export('DIST_SUBDIR') + +JS_PREFERENCE_FILES += [ + 'pref/icecat-branding.js', +] + diff --git a/data/branding/icecat/particles.bmp b/data/branding/icecat/particles.bmp index ab74ce0..d523606 100644 Binary files a/data/branding/icecat/particles.bmp and b/data/branding/icecat/particles.bmp differ diff --git a/data/branding/icecat/pencil-rtl.bmp b/data/branding/icecat/pencil-rtl.bmp index e50d92d..67d2fe5 100644 Binary files a/data/branding/icecat/pencil-rtl.bmp and b/data/branding/icecat/pencil-rtl.bmp differ diff --git a/data/branding/icecat/pencil.bmp b/data/branding/icecat/pencil.bmp index 252c10f..7dd5574 100644 Binary files a/data/branding/icecat/pencil.bmp and b/data/branding/icecat/pencil.bmp differ diff --git a/data/branding/icecat/pref/icecat-branding.js b/data/branding/icecat/pref/icecat-branding.js index 58a869e..4c0eb17 100644 --- a/data/branding/icecat/pref/icecat-branding.js +++ b/data/branding/icecat/pref/icecat-branding.js @@ -1,3 +1,7 @@ +/* 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/. */ + pref("startup.homepage_override_url","http://www.gnu.org"); pref("startup.homepage_welcome_url","http://www.gnu.org/software/gnuzilla/"); // The time interval between checks for a new version (in seconds) @@ -22,3 +26,4 @@ pref("browser.search.param.yahoo-fr", ""); pref("browser.search.param.yahoo-fr-cjkt", ""); // now unused pref("browser.search.param.yahoo-fr-ja", ""); pref("browser.search.param.yahoo-f-CN", ""); + diff --git a/data/branding/icecatmobile/locales/Makefile.in b/data/branding/icecatmobile/locales/Makefile.in deleted file mode 100644 index 82f614e..0000000 --- a/data/branding/icecatmobile/locales/Makefile.in +++ /dev/null @@ -1,5 +0,0 @@ -# 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/. - -DEFINES += -DAB_CD=$(AB_CD) diff --git a/data/branding/icecatmobile/res/drawable-hdpi/large_icon.png b/data/branding/icecatmobile/res/drawable-hdpi/large_icon.png new file mode 120000 index 0000000..fd11ee7 --- /dev/null +++ b/data/branding/icecatmobile/res/drawable-hdpi/large_icon.png @@ -0,0 +1 @@ +../drawable-xxhdpi/icon.png \ No newline at end of file diff --git a/data/branding/icecatmobile/res/drawable-hdpi/launcher_widget.png b/data/branding/icecatmobile/res/drawable-hdpi/launcher_widget.png new file mode 100644 index 0000000..e4abfe6 Binary files /dev/null and b/data/branding/icecatmobile/res/drawable-hdpi/launcher_widget.png differ diff --git a/data/branding/icecatmobile/res/drawable-hdpi/widget_icon.png b/data/branding/icecatmobile/res/drawable-hdpi/widget_icon.png new file mode 100644 index 0000000..26c7ba8 Binary files /dev/null and b/data/branding/icecatmobile/res/drawable-hdpi/widget_icon.png differ diff --git a/data/branding/icecatmobile/res/drawable-mdpi/large_icon.png b/data/branding/icecatmobile/res/drawable-mdpi/large_icon.png new file mode 120000 index 0000000..79362e7 --- /dev/null +++ b/data/branding/icecatmobile/res/drawable-mdpi/large_icon.png @@ -0,0 +1 @@ +../drawable-xhdpi/icon.png \ No newline at end of file diff --git a/data/branding/icecatmobile/res/drawable-mdpi/launcher_widget.png b/data/branding/icecatmobile/res/drawable-mdpi/launcher_widget.png new file mode 100644 index 0000000..f5875b5 Binary files /dev/null and b/data/branding/icecatmobile/res/drawable-mdpi/launcher_widget.png differ diff --git a/data/branding/icecatmobile/res/drawable-mdpi/widget_icon.png b/data/branding/icecatmobile/res/drawable-mdpi/widget_icon.png new file mode 100644 index 0000000..60b338d Binary files /dev/null and b/data/branding/icecatmobile/res/drawable-mdpi/widget_icon.png differ diff --git a/data/branding/icecatmobile/res/drawable-xhdpi/large_icon.png b/data/branding/icecatmobile/res/drawable-xhdpi/large_icon.png new file mode 120000 index 0000000..1752843 --- /dev/null +++ b/data/branding/icecatmobile/res/drawable-xhdpi/large_icon.png @@ -0,0 +1 @@ +../drawable-xxxhdpi/icon.png \ No newline at end of file diff --git a/data/branding/icecatmobile/res/drawable-xhdpi/launcher_widget.png b/data/branding/icecatmobile/res/drawable-xhdpi/launcher_widget.png new file mode 100644 index 0000000..60c09a5 Binary files /dev/null and b/data/branding/icecatmobile/res/drawable-xhdpi/launcher_widget.png differ diff --git a/data/branding/icecatmobile/res/drawable-xhdpi/widget_icon.png b/data/branding/icecatmobile/res/drawable-xhdpi/widget_icon.png new file mode 100644 index 0000000..630b94d Binary files /dev/null and b/data/branding/icecatmobile/res/drawable-xhdpi/widget_icon.png differ diff --git a/data/branding/icecatmobile/res/drawable-xxhdpi/large_icon.png b/data/branding/icecatmobile/res/drawable-xxhdpi/large_icon.png new file mode 100644 index 0000000..9d303fb Binary files /dev/null and b/data/branding/icecatmobile/res/drawable-xxhdpi/large_icon.png differ diff --git a/data/branding/icecatmobile/res/drawable-xxhdpi/launcher_widget.png b/data/branding/icecatmobile/res/drawable-xxhdpi/launcher_widget.png new file mode 100644 index 0000000..28943ed Binary files /dev/null and b/data/branding/icecatmobile/res/drawable-xxhdpi/launcher_widget.png differ diff --git a/data/branding/icecatmobile/res/drawable-xxhdpi/widget_icon.png b/data/branding/icecatmobile/res/drawable-xxhdpi/widget_icon.png new file mode 100644 index 0000000..eb14f91 Binary files /dev/null and b/data/branding/icecatmobile/res/drawable-xxhdpi/widget_icon.png differ diff --git a/data/branding/icecatmobile/res/drawable-xxxhdpi/icon.png b/data/branding/icecatmobile/res/drawable-xxxhdpi/icon.png new file mode 100644 index 0000000..ced8891 Binary files /dev/null and b/data/branding/icecatmobile/res/drawable-xxxhdpi/icon.png differ diff --git a/data/buildscripts/buildall.sh b/data/buildscripts/buildall.sh index 504a95f..a4bb372 100644 --- a/data/buildscripts/buildall.sh +++ b/data/buildscripts/buildall.sh @@ -14,11 +14,17 @@ function buildpackage(){ cat << EOF > $SRCDIR/run.sh set -e set -x + +export LD_PRELOAD="/usr/lib/libeatmydata/libeatmydata.so" + mkdir -p $HOME/ccache/$1-$3 || true export CCACHE_DIR=$HOME/ccache/$1-$3 mkdir $SRCDIR/../../toolchains || true cd $SRCDIR/../../toolchains sh ../data/buildscripts/toolchain-${1}.sh +cd $SRCDIR/python/compare-locales +python setup.py install +cp /usr/local/bin/compare* /usr/bin cd $SRCDIR sh ../../data/buildscripts/build-${1}.sh EOF @@ -30,14 +36,14 @@ env -i TERM=screen eatmydata sudo HOME=/home/ruben BUILDDIST=$2 ARCH=$3 pbuilder #buildpackage mac belenos amd64 |tee mac.log 2>&1 #buildpackage gnulinux belenos i386 |tee gnulinux-i386.log 2>&1 #mv $SRCDIR/obj-gnulinux $SRCDIR/obj-gnulinux-i386 -buildpackage gnulinux belenos amd64 |tee gnulinux-amd64.log 2>&1 +#buildpackage gnulinux belenos amd64 |tee gnulinux-amd64.log 2>&1 #mv $SRCDIR/obj-gnulinux $SRCDIR/obj-gnulinux-amd64 -#buildpackage android belenos i386 |tee android.log 2>&1 +buildpackage android belenos i386 |tee android.log 2>&1 rm binaries -rf mkdir binaries/langpacks -p #cp $1/obj-windows/dist/icecat*.zip binaries #cp $1/obj-mac/dist/icecat/icecat*.dmg binaries -cp $1/obj-gnulinux*/dist/icecat*.bz2 binaries -#cp $1/obj-android/dist/icecat*.apk binaries +#cp $1/obj-gnulinux*/dist/icecat*.bz2 binaries +cp $1/obj-android/dist/icecat*.apk binaries #cp $1/obj-gnulinux-amd64/dist/linux-x86_64/xpi/* binaries/langpacks diff --git a/data/buildscripts/mozconfig-android b/data/buildscripts/mozconfig-android index e1d0b6f..3b21e0e 100644 --- a/data/buildscripts/mozconfig-android +++ b/data/buildscripts/mozconfig-android @@ -2,9 +2,18 @@ ac_add_options --enable-application=mobile/android ac_add_options --target=arm-linux-androideabi mk_add_options MOZ_OBJDIR=./obj-android ac_add_options --with-android-version=9 +ac_add_options --with-android-min-sdk=11 ac_add_options --enable-update-channel=gnuzilla +ac_add_options --disable-tests +ac_add_options --disable-updater +ac_add_options --disable-eme +ac_add_options --disable-mochitest +ac_add_options --disable-crashreporter +ac_add_options --disable-debug + + #ac_add_options --enable-elf-hack #ac_add_options --enable-stdcxx-compat #ac_add_options --with-system-zlib @@ -15,6 +24,6 @@ mk_add_options 'export MOZ_CHROME_MULTILOCALE=en-US cs da de es-ES fi fr ja ko i mk_add_options 'export L10NBASEDIR=$PWD/l10n' ac_add_options --with-l10n-base=$PWD/l10n -ac_add_options --with-android-sdk=$PWD/../../toolchains/android-build/android-sdk-linux/platforms/android-16/ -ac_add_options --with-android-ndk=$PWD/../../toolchains/android-build/android-ndk-r8e +ac_add_options --with-android-sdk=$PWD/../../toolchains/android-build/android-sdk-linux/platforms/android-22/ +ac_add_options --with-android-ndk=$PWD/../../toolchains/android-build/android-ndk-r10e diff --git a/data/buildscripts/mozconfig-common b/data/buildscripts/mozconfig-common index 0de372d..6b49a6f 100644 --- a/data/buildscripts/mozconfig-common +++ b/data/buildscripts/mozconfig-common @@ -5,7 +5,7 @@ mk_add_options MOZ_MAKE_FLAGS=-j7 ac_add_options --with-ccache=/usr/bin/ccache ac_add_options --disable-debug -ac_add_options --disable-optimize +#ac_add_options --disable-optimize ac_add_options --disable-tests ac_add_options --disable-updater ac_add_options --disable-crashreporter diff --git a/data/buildscripts/toolchain-android.sh b/data/buildscripts/toolchain-android.sh index 3583af8..aca5957 100644 --- a/data/buildscripts/toolchain-android.sh +++ b/data/buildscripts/toolchain-android.sh @@ -1,6 +1,7 @@ #!/bin/bash #https://wiki.mozilla.org/Mobile/Fennec/Android/Detailed_build_instructions#Linux set -e +set -x apt-get -q -y --force-yes install openjdk-7-jdk ant mercurial ccache apt-get -q -y --force-yes build-dep firefox @@ -10,11 +11,14 @@ rm -rf $WD mkdir $WD cd $WD -wget https://dl.google.com/android/ndk/android-ndk-r8e-linux-x86.tar.bz2 -tar -xjf android-ndk-r8e-linux-x86.tar.bz2 +#wget https://dl.google.com/android/ndk/android-ndk-r8e-linux-x86.tar.bz2 +#tar -xjf android-ndk-r8e-linux-x86.tar.bz2 +wget http://dl.google.com/android/ndk/android-ndk-r10e-linux-x86.bin +chmod 755 android-ndk-r10e-linux-x86.bin +./android-ndk-r10e-linux-x86.bin -wget http://dl.google.com/android/android-sdk_r24.0.2-linux.tgz -tar -xzf android-sdk_r24.0.2-linux.tgz +wget http://dl.google.com/android/android-sdk_r24.3.3-linux.tgz +tar -xzf android-sdk_r24.3.3-linux.tgz while true; do echo y; sleep 1; done |./android-sdk-linux/tools/android update sdk -u while true; do echo y; sleep 1; done |./android-sdk-linux/tools/android update adb @@ -24,6 +28,6 @@ export PATH=$PATH:$PWD/android-sdk-linux/tools:$PWD/android-sdk-linux/build-tool ln -s $PWD/android-sdk-linux/build_tools $PWD/android-sdk-linux/build-tools -pkill adb +pkill adb || true echo DONE diff --git a/data/extensions/spyblock@gnu.org/lib/utils.js b/data/extensions/spyblock@gnu.org/lib/utils.js index cd69bf9..13f4876 100644 --- a/data/extensions/spyblock@gnu.org/lib/utils.js +++ b/data/extensions/spyblock@gnu.org/lib/utils.js @@ -47,18 +47,6 @@ let Utils = exports.Utils = return addonVersion; }, - /** - * Returns whether we are running in Fennec, for Fennec-specific hacks - * @type Boolean - */ - get isFennec() - { - let {application} = require("info"); - let result = (application == "fennec" || application == "fennec2"); - Object.defineProperty(this, "isFennec", {value: result}); - return result; - }, - /** * Returns whether we are running in Fennec, for Fennec-specific hacks * @type Boolean diff --git a/data/patches/gnuzilla-bug-1172632-1.patch b/data/patches/gnuzilla-bug-1172632-1.patch new file mode 100644 index 0000000..326dc34 --- /dev/null +++ b/data/patches/gnuzilla-bug-1172632-1.patch @@ -0,0 +1,43 @@ +From 24f14fc16f5ef9046987d45019d98523c27c506c Mon Sep 17 00:00:00 2001 +From: Mike Hommey +Date: Tue, 9 Jun 2015 09:54:24 +0900 +Subject: [PATCH] Bug 1172632 - Don't guess malloc_usable_size type of argument + based on ANDROID_VERSION in mozjemalloc, but use the result of the configure + test instead + +--- + memory/mozjemalloc/jemalloc.c | 7 +------ + 1 file changed, 1 insertion(+), 6 deletions(-) + +diff --git a/memory/mozjemalloc/jemalloc.c b/memory/mozjemalloc/jemalloc.c +index f8e36e1..9113d26 100644 +--- a/memory/mozjemalloc/jemalloc.c ++++ b/memory/mozjemalloc/jemalloc.c +@@ -6509,23 +6509,18 @@ malloc_good_size_impl(size_t size) + * malloc_good_size(n). + */ + size = PAGE_CEILING(size); + } + return size; + } + + +-#if defined(MOZ_MEMORY_ANDROID) && (ANDROID_VERSION < 19) + MOZ_MEMORY_API size_t +-malloc_usable_size_impl(void *ptr) +-#else +-MOZ_MEMORY_API size_t +-malloc_usable_size_impl(const void *ptr) +-#endif ++malloc_usable_size_impl(MALLOC_USABLE_SIZE_CONST_PTR void *ptr) + { + DARWIN_ONLY(return (szone->size)(szone, ptr)); + + #ifdef MALLOC_VALIDATE + return (isalloc_validate(ptr)); + #else + assert(ptr != NULL); + +-- +2.4.0.2.g36460d1.dirty + diff --git a/data/patches/gnuzilla-bug-1172632-2.patch b/data/patches/gnuzilla-bug-1172632-2.patch new file mode 100644 index 0000000..a3ff76f --- /dev/null +++ b/data/patches/gnuzilla-bug-1172632-2.patch @@ -0,0 +1,223 @@ +From 23da4b840c9bf0713971f07e659394b6f26b7f9e Mon Sep 17 00:00:00 2001 +From: Mike Hommey +Date: Wed, 10 Jun 2015 09:58:50 +0900 +Subject: [PATCH] bug 1172632 - Move some allocator related configure checks in + a common location for both top-level and js/src to use + +--- + aclocal.m4 | 1 + + build/autoconf/alloc.m4 | 53 +++++++++++++++++++++++++++++++++++++++++++++++++ + configure.in | 46 +----------------------------------------- + js/src/aclocal.m4 | 1 + + js/src/configure.in | 13 ++---------- + 5 files changed, 58 insertions(+), 56 deletions(-) + create mode 100644 build/autoconf/alloc.m4 + +diff --git a/aclocal.m4 b/aclocal.m4 +index 90356f9..5f30651 100644 +--- a/aclocal.m4 ++++ b/aclocal.m4 +@@ -28,16 +28,17 @@ builtin(include, build/autoconf/arch.m4)dnl + builtin(include, build/autoconf/android.m4)dnl + builtin(include, build/autoconf/zlib.m4)dnl + builtin(include, build/autoconf/linux.m4)dnl + builtin(include, build/autoconf/python-virtualenv.m4)dnl + builtin(include, build/autoconf/winsdk.m4)dnl + builtin(include, build/autoconf/icu.m4)dnl + builtin(include, build/autoconf/ffi.m4)dnl + builtin(include, build/autoconf/clang-plugin.m4)dnl ++builtin(include, build/autoconf/alloc.m4)dnl + + MOZ_PROG_CHECKMSYS() + + # Read the user's .mozconfig script. We can't do this in + # configure.in: autoconf puts the argument parsing code above anything + # expanded from configure.in, and we need to get the configure options + # from .mozconfig in place before that argument parsing code. + MOZ_READ_MOZCONFIG(.) +diff --git a/build/autoconf/alloc.m4 b/build/autoconf/alloc.m4 +new file mode 100644 +index 0000000..8234a60 +--- /dev/null ++++ b/build/autoconf/alloc.m4 +@@ -0,0 +1,53 @@ ++dnl This Source Code Form is subject to the terms of the Mozilla Public ++dnl License, v. 2.0. If a copy of the MPL was not distributed with this ++dnl file, You can obtain one at http://mozilla.org/MPL/2.0/. ++ ++dnl Check for the existence of various allocation headers/functions ++AC_DEFUN([MOZ_CHECK_ALLOCATOR],[ ++ ++MALLOC_HEADERS="malloc.h malloc_np.h malloc/malloc.h sys/malloc.h" ++MALLOC_H= ++ ++for file in $MALLOC_HEADERS; do ++ MOZ_CHECK_HEADER($file, [MALLOC_H=$file]) ++ if test "$MALLOC_H" != ""; then ++ AC_DEFINE_UNQUOTED(MALLOC_H, <$MALLOC_H>) ++ break ++ fi ++done ++ ++MOZ_CHECK_HEADERS(alloca.h) ++ ++AC_CHECK_FUNCS(strndup posix_memalign memalign) ++ ++AC_CHECK_FUNCS(malloc_usable_size) ++MALLOC_USABLE_SIZE_CONST_PTR=const ++MOZ_CHECK_HEADERS([malloc.h], [ ++ AC_MSG_CHECKING([whether malloc_usable_size definition can use const argument]) ++ AC_TRY_COMPILE([#include ++ #include ++ size_t malloc_usable_size(const void *ptr);], ++ [return malloc_usable_size(0);], ++ AC_MSG_RESULT([yes]), ++ AC_MSG_RESULT([no]) ++ MALLOC_USABLE_SIZE_CONST_PTR=) ++]) ++AC_DEFINE_UNQUOTED([MALLOC_USABLE_SIZE_CONST_PTR],[$MALLOC_USABLE_SIZE_CONST_PTR]) ++ ++ ++dnl In newer bionic headers, valloc is built but not defined, ++dnl so we check more carefully here. ++AC_MSG_CHECKING([for valloc in malloc.h]) ++AC_EGREP_HEADER(valloc, malloc.h, ++ AC_DEFINE(HAVE_VALLOC) ++ AC_MSG_RESULT([yes]), ++ AC_MSG_RESULT([no])) ++ ++AC_MSG_CHECKING([for valloc in unistd.h]) ++AC_EGREP_HEADER(valloc, unistd.h, ++ AC_DEFINE(HAVE_VALLOC) ++ AC_MSG_RESULT([yes]), ++ AC_MSG_RESULT([no])) ++ ++ ++]) +diff --git a/configure.in b/configure.in +index 0d54167..988797d 100644 +--- a/configure.in ++++ b/configure.in +@@ -3394,61 +3394,17 @@ if test -n "$MOZ_LINKER" -a "$OS_TARGET" = "Android"; then + dnl we need to use LDFLAGS because nspr doesn't inherit DSO_LDOPTS. + dnl Using LDFLAGS in nspr is safe, since we only really build + dnl libraries there. + DSO_LDOPTS="$DSO_LDOPTS -nostartfiles" + NSPR_LDFLAGS="$NSPR_LDFLAGS -nostartfiles" + fi + fi + +-dnl Check for the existence of various allocation headers/functions +- +-MALLOC_HEADERS="malloc.h malloc_np.h malloc/malloc.h sys/malloc.h" +-MALLOC_H= +- +-for file in $MALLOC_HEADERS; do +- MOZ_CHECK_HEADER($file, [MALLOC_H=$file]) +- if test "$MALLOC_H" != ""; then +- AC_DEFINE_UNQUOTED(MALLOC_H, <$MALLOC_H>) +- break +- fi +-done +- +-MOZ_CHECK_HEADERS(alloca.h) +- +-AC_CHECK_FUNCS(strndup posix_memalign memalign) +- +-AC_CHECK_FUNCS(malloc_usable_size) +-MALLOC_USABLE_SIZE_CONST_PTR=const +-MOZ_CHECK_HEADERS([malloc.h], [ +- AC_MSG_CHECKING([whether malloc_usable_size definition can use const argument]) +- AC_TRY_COMPILE([#include +- #include +- size_t malloc_usable_size(const void *ptr);], +- [return malloc_usable_size(0);], +- AC_MSG_RESULT([yes]), +- AC_MSG_RESULT([no]) +- MALLOC_USABLE_SIZE_CONST_PTR=) +-]) +-AC_DEFINE_UNQUOTED([MALLOC_USABLE_SIZE_CONST_PTR],[$MALLOC_USABLE_SIZE_CONST_PTR]) +- +- +-dnl In newer bionic headers, valloc is built but not defined, +-dnl so we check more carefully here. +-AC_MSG_CHECKING([for valloc in malloc.h]) +-AC_EGREP_HEADER(valloc, malloc.h, +- AC_DEFINE(HAVE_VALLOC) +- AC_MSG_RESULT([yes]), +- AC_MSG_RESULT([no])) +- +-AC_MSG_CHECKING([for valloc in unistd.h]) +-AC_EGREP_HEADER(valloc, unistd.h, +- AC_DEFINE(HAVE_VALLOC) +- AC_MSG_RESULT([yes]), +- AC_MSG_RESULT([no])) ++MOZ_CHECK_ALLOCATOR + + dnl See if compiler supports some gcc-style attributes + + AC_CACHE_CHECK(for __attribute__((always_inline)), + ac_cv_attribute_always_inline, + [AC_TRY_COMPILE([inline void f(void) __attribute__((always_inline));], + [], + ac_cv_attribute_always_inline=yes, +diff --git a/js/src/aclocal.m4 b/js/src/aclocal.m4 +index 99c73ac..fc36340 100644 +--- a/js/src/aclocal.m4 ++++ b/js/src/aclocal.m4 +@@ -27,16 +27,17 @@ builtin(include, ../../build/autoconf/arch.m4)dnl + builtin(include, ../../build/autoconf/android.m4)dnl + builtin(include, ../../build/autoconf/zlib.m4)dnl + builtin(include, ../../build/autoconf/linux.m4)dnl + builtin(include, ../../build/autoconf/python-virtualenv.m4)dnl + builtin(include, ../../build/autoconf/winsdk.m4)dnl + builtin(include, ../../build/autoconf/icu.m4)dnl + builtin(include, ../../build/autoconf/ffi.m4)dnl + builtin(include, ../../build/autoconf/clang-plugin.m4)dnl ++builtin(include, ../../build/autoconf/alloc.m4)dnl + + define([__MOZ_AC_INIT_PREPARE], defn([AC_INIT_PREPARE])) + define([AC_INIT_PREPARE], + [if test -z "$srcdir"; then + srcdir=`dirname "[$]0"` + fi + srcdir="$srcdir/../.." + __MOZ_AC_INIT_PREPARE($1) +diff --git a/js/src/configure.in b/js/src/configure.in +index 9c21772..4f72dc3 100644 +--- a/js/src/configure.in ++++ b/js/src/configure.in +@@ -3842,28 +3842,19 @@ _INTL_API=yes + MOZ_CONFIG_ICU() + + MOZ_SUBCONFIGURE_ICU() + + dnl ======================================================== + dnl JavaScript shell + dnl ======================================================== + +-MALLOC_HEADERS="malloc.h malloc_np.h malloc/malloc.h sys/malloc.h" +-MALLOC_H= +- +-for file in $MALLOC_HEADERS; do +- MOZ_CHECK_HEADER($file, [MALLOC_H=$file]) +- if test "$MALLOC_H" != ""; then +- AC_DEFINE_UNQUOTED(MALLOC_H, <$MALLOC_H>) +- break +- fi +-done ++MOZ_CHECK_ALLOCATOR + +-AC_CHECK_FUNCS(setlocale localeconv malloc_size malloc_usable_size) ++AC_CHECK_FUNCS(setlocale localeconv) + + AC_SUBST(MOZILLA_VERSION) + + AC_SUBST(ac_configure_args) + + AC_SUBST(TOOLCHAIN_PREFIX) + + if test -n "$JS_STANDALONE"; then +-- +2.4.0.2.g36460d1.dirty + diff --git a/data/patches/reorder-android-services.mozbuild.patch b/data/patches/reorder-android-services.mozbuild.patch new file mode 100644 index 0000000..0c8b736 --- /dev/null +++ b/data/patches/reorder-android-services.mozbuild.patch @@ -0,0 +1,35 @@ +--- ./mobile/android/base/android-services.mozbuild.orig 2015-07-16 12:27:52.808996807 -0500 ++++ ./mobile/android/base/android-services.mozbuild 2015-07-16 12:28:32.980996043 -0500 +@@ -870,8 +870,8 @@ + 'fxa/authenticator/FxAccountLoginDelegate.java', + 'fxa/authenticator/FxAccountLoginException.java', + 'fxa/authenticator/FxADefaultLoginStateMachineDelegate.java', +- 'fxa/FirefoxAccounts.java', + 'fxa/FxAccountConstants.java', ++ 'fxa/FirefoxAccounts.java', + 'fxa/login/BaseRequestDelegate.java', + 'fxa/login/Cohabiting.java', + 'fxa/login/Doghouse.java', +@@ -1024,8 +1024,8 @@ + 'sync/repositories/android/CachedSQLiteOpenHelper.java', + 'sync/repositories/android/ClientsDatabase.java', + 'sync/repositories/android/ClientsDatabaseAccessor.java', +- 'sync/repositories/android/FennecTabsRepository.java', + 'sync/repositories/android/FormHistoryRepositorySession.java', ++ 'sync/repositories/android/FennecTabsRepository.java', + 'sync/repositories/android/PasswordsRepositorySession.java', + 'sync/repositories/android/RepoUtils.java', + 'sync/repositories/BookmarkNeedsReparentingException.java', +@@ -1117,11 +1117,11 @@ + 'sync/stage/CompletedStage.java', + 'sync/stage/EnsureClusterURLStage.java', + 'sync/stage/EnsureCrypto5KeysStage.java', +- 'sync/stage/FennecTabsServerSyncStage.java', + 'sync/stage/FetchInfoCollectionsStage.java', + 'sync/stage/FetchMetaGlobalStage.java', + 'sync/stage/FormHistoryServerSyncStage.java', + 'sync/stage/GlobalSyncStage.java', ++ 'sync/stage/FennecTabsServerSyncStage.java', + 'sync/stage/NoSuchStageException.java', + 'sync/stage/NoSyncIDException.java', + 'sync/stage/PasswordsServerSyncStage.java', diff --git a/data/settings.js b/data/settings.js index 9a9f3d7..c41320a 100644 --- a/data/settings.js +++ b/data/settings.js @@ -59,9 +59,9 @@ pref ("distribution.version", "1.0"); // Spoof the useragent to a generic one pref("general.useragent.compatMode.firefox",true); // Spoof the useragent to a generic one -pref("general.useragent.override", "Mozilla/5.0 (Windows NT 6.1; rv:31.0) Gecko/20100101 Firefox/31.0"); +pref("general.useragent.override", "Mozilla/5.0 (Windows NT 6.1; rv:38.0) Gecko/20100101 Firefox/38.0"); pref("general.appname.override", "Netscape"); -pref("general.appversion.override", "31.0"); +pref("general.appversion.override", "38.0"); pref("general.buildID.override", "Gecko/20100101"); pref("general.oscpu.override", "Windows NT 6.1"); pref("general.platform.override", "Win32"); @@ -183,6 +183,7 @@ pref("pfs.filehint.url", "http://gnuzilla.gnu.org/plugins/PluginFinderService.ph pref("keyword.URL", "https://duckduckgo.com/html?t=gnu&q=!+"); pref("browser.search.defaultenginename", "DuckDuckGo"); pref("browser.search.order.extra.duckduckgo", "DuckDuckGo"); +pref("browser.search.showOneOffButtons", false); // https://directory.fsf.org/wiki/Disable_DHE pref("security.ssl3.dhe_rsa_aes_128_sha", false); @@ -190,6 +191,42 @@ 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); +// Disable Gecko media plugins: https://wiki.mozilla.org/GeckoMediaPlugins +pref("media.gmp-manager.url", "http://127.0.0.1/"); +pref("media.gmp-manager.url.override", "data:text/plain,"); +pref("media.gmp-provider.enabled", false); +// Don't install openh264 codec +pref("media.gmp-gmpopenh264.enabled", false); + +//Disable heartbeat +pref("browser.selfsupport.url", ""); + +//Disable Link to FireFox Marketplace, currently loaded with non-free "apps" +pref("browser.apps.URL", ""); + +//Disable Firefox Hello +pref("loop.enabled",false); + +// Use old style preferences, that allow javascript to be disabled +pref("browser.preferences.inContent",false); + +// Avoid logjam attack +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); + +// Don't download ads for the newtab page +pref("browser.newtabpage.directory.source", ""); +pref("browser.newtabpage.directory.ping", ""); +pref("browser.newtabpage.introShown", true); + +// Disable home snippets +pref("browser.aboutHomeSnippets.updateUrl", "data:text/html"); + // Disable hardware acceleration and WebGL -pref("layers.acceleration.disabled", true); -pref("webgl.disabled", true); +//pref("layers.acceleration.disabled", false); +//pref("webgl.disabled", false); + +// Disable SSDP +pref("browser.casting.enabled", false); diff --git a/data/vendor.js b/data/vendor.js new file mode 100644 index 0000000..4f45d6e --- /dev/null +++ b/data/vendor.js @@ -0,0 +1,171 @@ +// Use LANG environment variable to choose locale +pref("intl.locale.matchOS", true); + +// Disable default browser checking. +pref("browser.shell.checkDefaultBrowser", false); + +// Don't disable our bundled extensions in the application directory +pref("extensions.autoDisableScopes", 11); +pref("extensions.shownSelectionUI", true); + +// Disable "alt" as a shortcut key to open full menu bar. Conflicts with "alt" as a modifier +pref("ui.key.menuAccessKeyFocuses", false); + +// Make sure that Firefox Social stuff are empty +pref("social.whitelist", ""); +pref("social.directories", ""); +pref("social.shareDirectory", ""); + +// Disable the GeoLocation API for content +pref("geo.enabled", false); + +// Make sure that the request URL of the GeoLocation backend is empty +pref("geo.wifi.uri", ""); + +// 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); + +// Disable Sponsored Tiles +pref("browser.newtabpage.directory.source", "data:application/json,{}"); +pref("browser.newtabpage.directory.ping", ""); + +// Disable Firefox Hello and make sure that the request URLs of the Firefox Hello are empty +pref("loop.enabled", false); +pref("loop.feedback.baseUrl", ""); +pref("loop.gettingStarted.url", ""); +pref("loop.learnMoreUrl", ""); +pref("loop.legal.ToS_url", ""); +pref("loop.legal.privacy_url", ""); +pref("loop.oauth.google.redirect_uri", ""); +pref("loop.oauth.google.scope", ""); +pref("loop.server", ""); +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", ""); + +// Disable Freedom Violating DRM Feature +pref("browser.eme.ui.enabled", false); +pref("media.eme.enabled", false); +pref("media.eme.apiVisible", false); + +// Avoid openh264 being downloaded. +pref("media.gmp-manager.url.override", "data:text/plain,"); + +// Disable openh264. +pref("media.gmp-provider.enabled", false); +pref("media.gmp-gmpopenh264.provider.enabled", false); + +// Default to classic view for about:newtab +pref("browser.newtabpage.enhanced", false); + +// Poodle attack +pref("security.tls.version.min", 1); + +// Disable plugin installer +pref("plugins.hide_infobar_for_missing_plugin", true); +pref("plugins.hide_infobar_for_outdated_plugin", true); +pref("plugins.notifyMissingFlash", false); + +// Speeding it up +pref("network.http.pipelining", true); +pref("network.http.proxy.pipelining", true); +pref("network.http.pipelining.maxrequests", 10); +pref("nglayout.initialpaint.delay", 0); + +// Disable third party cookies +pref("network.cookie.cookieBehavior", 1); + +// Disable app updater URL +pref("app.update.url", "http://127.0.0.1/");" + +// Set useragent to Firefox compatible +//pref("general.useragent.compatMode.firefox", true); +// Spoof the useragent to a generic one +pref("general.useragent.compatMode.firefox", true); +// Spoof the useragent to a generic one +pref("general.useragent.override", "Mozilla/5.0 (Windows NT 6.1; rv:38.0) Gecko/20100101 Firefox/38.0"); +pref("general.appname.override", "Netscape"); +pref("general.appversion.override", "38.0"); +pref("general.buildID.override", "Gecko/20100101"); +pref("general.oscpu.override", "Windows NT 6.1"); +pref("general.platform.override", "Win32"); + +// Privacy & Freedom Issues +// https://webdevelopmentaid.wordpress.com/2013/10/21/customize-privacy-settings-in-mozilla-firefox-part-1-aboutconfig/ +// https://panopticlick.eff.org +// http://ip-check.info +// http://browserspy.dk +// https://wiki.mozilla.org/Fingerprinting +// http://www.browserleaks.com +// http://fingerprint.pet-portal.eu +pref("privacy.donottrackheader.enabled", true); +pref("privacy.donottrackheader.value", 1); +pref("dom.ipc.plugins.flash.subprocess.crashreporter.enabled", false); +pref("browser.safebrowsing.enabled", false); +pref("browser.safebrowsing.malware.enabled", false); +//pref("services.sync.privacyURL", "https://www.gnu.org/software/gnuzilla/"); +pref("social.enabled", false); +pref("social.remote-install.enabled", false); +pref("datareporting.healthreport.uploadEnabled", false); +pref("datareporting.healthreport.about.reportUrl", "127.0.0.1"); +pref("datareporting.healthreport.documentServerURI", "127.0.0.1"); +pref("healthreport.uploadEnabled", false); +pref("social.toast-notifications.enabled", false); +pref("datareporting.policy.dataSubmissionEnabled", false); +pref("datareporting.healthreport.service.enabled", false); +pref("browser.slowStartup.notificationDisabled", true); +pref("network.http.sendRefererHeader", 2); +pref("network.http.referer.spoofSource", true); +//http://grack.com/blog/2010/01/06/3rd-party-cookies-dom-storage-and-privacy/ +//pref("dom.storage.enabled", false); +pref("dom.event.clipboardevents.enabled",false); +pref("network.prefetch-next", false); +pref("network.dns.disablePrefetch", true); +pref("network.http.sendSecureXSiteReferrer", false); +pref("toolkit.telemetry.enabled", false); +// Do not tell what plugins do we have enabled: https://mail.mozilla.org/pipermail/firefox-dev/2013-November/001186.html +pref("plugins.enumerable_names", ""); +pref("plugin.state.flash", 1); +// Do not autoupdate search engines +pref("browser.search.update", false); +// Warn when the page tries to redirect or refresh +//pref("accessibility.blockautorefresh", true); + +// Disable channel updates +pref("app.update.enabled", false); +pref("app.update.auto", false); + +// Mobile +pref("privacy.announcements.enabled", false); +pref("browser.snippets.enabled", false); +pref("browser.snippets.syncPromo.enabled", false); +pref("browser.snippets.geoUrl", "http://127.0.0.1/"); +pref("browser.snippets.updateUrl", "http://127.0.0.1/"); +pref("browser.snippets.statsUrl", "http://127.0.0.1/"); +pref("datareporting.policy.firstRunTime", 0); +pref("datareporting.policy.dataSubmissionPolicyVersion", 2); +pref("browser.webapps.checkForUpdates", 0); +pref("browser.webapps.updateCheckUrl", "http://127.0.0.1/"); +pref("app.faqURL", "http://libreplanet.org/wiki/Group:IceCat/FAQ"); + +// PFS URL +pref("pfs.datasource.url", "http://gnuzilla.gnu.org/plugins/PluginFinderService.php?mimetype=%PLUGIN_MIMETYPE%"); +pref("pfs.filehint.url", "http://gnuzilla.gnu.org/plugins/PluginFinderService.php?mimetype=%PLUGIN_MIMETYPE%"); + +// 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); diff --git a/makeicecat b/makeicecat index 0e3f946..93d5db2 100644 --- a/makeicecat +++ b/makeicecat @@ -20,8 +20,8 @@ set -e FFMAJOR=38 -FFMINOR=0 -FFSUB=1 +FFMINOR=1 +FFSUB=0 GNUVERSION=1 FFVERSION=$FFMAJOR.$FFMINOR.${FFSUB} ICECATVERSION=$FFVERSION-gnu$GNUVERSION @@ -110,10 +110,10 @@ mv l10n $SOURCEDIR cd $SOURCEDIR -#for patch in $DATA/patches/*; do -# echo Patching with file: $patch -# patch -p1 < $patch -#done +for patch in $DATA/patches/*; do + echo Patching with file: $patch + patch -p1 < $patch +done cp $DATA/Changelog.IceCat $DATA/README.IceCat . cp $DATA/Changelog.IceCat $DATA/README.IceCat debian @@ -254,6 +254,11 @@ sed "$LINE,+1 d" debian/build/rules.mk -i sed "s/^MOZ_APP_NAME\t.*/MOZ_APP_NAME\t\t:= icecat/;" debian/build/config.mk -i sed "s/^MOZ_PKG_NAME\t.*/MOZ_PKG_NAME\t\t:= icecat/;" debian/build/config.mk -i +# Hide help buttons in newtab page +for file in toolkit/themes/linux/global/global.css toolkit/themes/windows/global/global.css toolkit/themes/osx/global/global.css; do + echo '#newtab-customize-button, #newtab-intro-what{display:none}' >> $file +done + ############################################################################### # Branding ############################################################################### @@ -397,12 +402,16 @@ cat << EOF >> browser/confvars.sh MOZ_APP_VENDOR=GNU MOZ_APP_VERSION=$FFVERSION MOZ_APP_PROFILE=mozilla/icecat -MOZ_SERVICES_SYNC=0 -MOZ_SERVICES_METRICS=0 -MOZ_SERVICES_FXACCOUNTS=0 +MOZ_PAY=0 MOZ_SERVICES_HEALTHREPORT=0 +MOZ_SERVICES_HEALTHREPORTER=0 +MOZ_SERVICES_FXACCOUNTS=0 +MOZ_SERVICES_METRICS=0 MOZ_DATA_REPORTING=0 -MOZ_PAY=0 +MOZ_SERVICES_SYNC=0 +MOZ_DEVICES=0 +MOZ_NATIVE_DEVICES=0 +MOZ_ANDROID_GOOGLE_PLAY_SERVICES=0 EOF sed 's/mozilla-esr/gnu-esr/' -i browser/confvars.sh @@ -411,12 +420,15 @@ sed 's/mozilla-esr/gnu-esr/' -i browser/confvars.sh # Mobile ############################################################################### +sed '/MOZ_SERVICES_HEALTHREPORT/d; /MOZ_DEVICES/d; /MOZ_ANDROID_RESOURCE_CONSTRAINED/,+2d' -i mobile/android/confvars.sh + cat << EOF >> mobile/android/confvars.sh # IceCat settings MOZ_APP_VENDOR=GNU MOZ_APP_VERSION=$FFVERSION MOZ_PAY=0 MOZ_SERVICES_HEALTHREPORT=0 +MOZ_SERVICES_HEALTHREPORTER=0 MOZ_SERVICES_FXACCOUNTS=0 MOZ_SERVICES_METRICS=0 MOZ_DATA_REPORTING=0 @@ -426,6 +438,9 @@ MOZ_NATIVE_DEVICES=0 MOZ_ANDROID_GOOGLE_PLAY_SERVICES=0 EOF +rm -R mobile/android/gradle/ +sed -i '/gradle/d' mobile/android/base/Makefile.in + cat $DATA/settings.js >> mobile/android/app/mobile.js cat $DATA/settings-android.js >> mobile/android/app/mobile.js -- cgit v1.2.3