February 2013 - tor-commits - lists.torproject.org

[torbrowser/master] LIN: update Makefiles and config files with FF17+torbutton changes
by erinn＠torproject.org 19 Feb '13

19 Feb '13

commit e20e6326c240a96b83fbea922df70b6e35c82490 Author: Erinn Clark <erinn(a)torproject.org> Date: Tue Feb 12 18:31:22 2013 +0100 LIN: update Makefiles and config files with FF17+torbutton changes --- build-scripts/config/torrc-linux | 4 +- build-scripts/config/vidalia.conf.ff-linux | 3 +- build-scripts/linux.mk | 87 ++++++++++++++++++++-------- build-scripts/osx.mk | 2 +- 4 files changed, 66 insertions(+), 30 deletions(-) diff --git a/build-scripts/config/torrc-linux b/build-scripts/config/torrc-linux index 05f5345..7d11921 100644 --- a/build-scripts/config/torrc-linux +++ b/build-scripts/config/torrc-linux @@ -8,6 +8,6 @@ GeoIPFile ./Data/Tor/geoip Log notice stdout # Bind to this address to listen to connections from SOCKS-speaking # applications. -SocksPort auto SocksListenAddress 127.0.0.1 -ControlPort auto +SocksPort 9150 +ControlPort 9151 diff --git a/build-scripts/config/vidalia.conf.ff-linux b/build-scripts/config/vidalia.conf.ff-linux index 26c66be..d0274e6 100644 --- a/build-scripts/config/vidalia.conf.ff-linux +++ b/build-scripts/config/vidalia.conf.ff-linux @@ -9,8 +9,7 @@ PluginsDirectory=../../Data/profile/extensions DefaultPluginsDirectory=./extensions [Tor] -ControlPort=9051 +ControlPort=9151 TorExecutable=./tor Torrc=../Data/Tor/torrc -AutoControl=true DataDirectory=../Data/Tor diff --git a/build-scripts/linux.mk b/build-scripts/linux.mk index cda9b7e..29af4a3 100644 --- a/build-scripts/linux.mk +++ b/build-scripts/linux.mk @@ -55,7 +55,7 @@ build-openssl: build-zlib $(OPENSSL_DIR) cd $(OPENSSL_DIR) && make install_sw touch $(STAMP_DIR)/build-openssl -QT_BUILD_PREFS=-system-zlib -confirm-license -opensource -openssl-linked -no-webkit -no-qt3support -fast -release -nomake demos -nomake examples +QT_BUILD_PREFS=-system-zlib -confirm-license -opensource -openssl-linked -no-qt3support -fast -release -nomake demos -nomake examples QT_OPTS=$(QT_BUILD_PREFS) -prefix $(BUILT_DIR) -I $(BUILT_DIR)/include -I $(BUILT_DIR)/include/openssl/ -L$(BUILT_DIR)/lib build-qt: build-zlib build-openssl $(QT_DIR) cd $(QT_DIR) && ./configure $(QT_OPTS) @@ -290,11 +290,32 @@ endif ## Configure Firefox, Vidalia, and Tor configure-apps: - ## Configure Firefox preferences + ## Configure Firefox bookmarks mkdir -p $(DEST)/Data/profile/extensions cp -R config/firefox-profiles.ini $(DEST)/Data/profiles.ini cp config/bookmarks.html $(DEST)/Data/profile - cp config/prefs.js $(DEST)/Data/profile/prefs.js + + ## Override Firefox extension preferences + mkdir -p $(DEST)/Data/profile/preferences + cp config/extension-overrides.js $(DEST)/Data/profile/preferences + + ## Patch Firefox default home page and omnibox + LC="en-US"; \ + PFILE="omni.ja"; \ + FFDIR=$(APPDIR)/Firefox/; \ + CHROMEDIR="$$FFDIR/chrome/"; \ + mkdir -p "$$CHROMEDIR/$$LC/locale/branding"; \ + mkdir -p "$$CHROMEDIR/$$LC/locale/browser-region"; \ + cp config/region.properties \ + "$$CHROMEDIR/$$LC/locale/browser-region/"; \ + sed -e "s/SHPONKA/$$LC/g" config/browserconfig.properties \ + > "$$CHROMEDIR/$$LC/locale/branding/browserconfig.properties"; \ + (cd "$$FFDIR"; \ + zip -u "$$PFILE" "chrome/$$LC/locale/branding/browserconfig.properties" \ + "chrome/$$LC/locale/browser-region/region.properties"); \ + rm -rf "$$CHROMEDIR" + +# Configure Firefox, Vidalia, and Tor ## Configure Pidgin ifeq ($(USE_PIDGIN),1) mkdir -p $(DEST)/PidginPortable/Data/settings/.purple @@ -336,8 +357,7 @@ compressed-bundle_%: LANGCODE=$* make -f linux.mk compressed-bundle-localized bundle-localized_%.stamp: - make -f linux.mk copy-files_$* install-extensions install-torbutton install-lang-extensions patch-vidalia-language patch-firefox-language \ - patch-pidgin-language update-extension-pref write-tbb-version + make -f linux.mk copy-files_$* install-extensions install-torbutton install-lang-extensions patch-vidalia-language patch-firefox-config touch $(STAMP_DIR)/bundle-localized_$*.stamp bundle-localized: bundle-localized_$(LANGCODE).stamp @@ -345,8 +365,8 @@ bundle-localized: bundle-localized_$(LANGCODE).stamp compressed-bundle-localized: bundle-localized_$(LANGCODE).stamp -rm -f $(DISTDIR)/$(COMPRESSED_NAME)_$(LANGCODE).tar.gz -mkdir $(DISTDIR) - tar -cvf - $(NAME)_$(LANGCODE) |tardy -unu 0 -una root -gnu 0 -gna wheel |gzip -c9 >$(DISTDIR)/$(DEFAULT_COMPRESSED_BASENAME)$(LANGCODE).tar.gz - rm *.zip *.xpi + tar -cvf - $(NAME)_$(LANGCODE) |tardy -unu 0 -una root -gnu 0 -gna wheel |gzip -c9 >$(DISTDIR)/$(COMPRESSED_NAME)$(LANGCODE).tar.gz + rm -f *.zip *.xpi copy-files_%: generic-bundle.stamp rm -fr $(NAME)_$* @@ -370,13 +390,28 @@ install-extensions: $(DEFAULT_EXTENSIONS) install-torbutton: torbutton.xpi mkdir -p $(BUNDLE)/Data/profile/extensions/ - cp torbutton.xpi $(BUNDLE)/Data/profile/extensions/{e0204bd5-9d31-402b-a99d-a6aa8ffebdca}.xpi + cp torbutton.xpi $(BUNDLE)/Data/profile/extensions/torbutton(a)torproject.org.xpi ## Language extensions need to be handled differently from other extensions install-lang-extensions: $(filter-out langpack_en-US.xpi,langpack_$(LANGCODE).xpi) ifneq ($(LANGCODE), en-US) mkdir -p $(BUNDLE)/Data/profile/extensions cp langpack_$(LANGCODE).xpi $(BUNDLE)/Data/profile/extensions/langpack-$(LANGCODE)(a)firefox.mozilla.org.xpi + ## Patch Firefox default home page within language pack + LC=$(LANGCODE); \ + PFILE=langpack-$(LANGCODE)(a)firefox.mozilla.org.xpi; \ + FFDIR=$(BUNDLE)/Data/profile/extensions/; \ + CHROMEDIR="$$FFDIR/chrome/"; \ + mkdir -p "$$CHROMEDIR/$$LC/locale/branding"; \ + mkdir -p "$$CHROMEDIR/$$LC/locale/browser-region"; \ + cp config/region.properties \ + "$$CHROMEDIR/$$LC/locale/browser-region/"; \ + sed -e "s/SHPONKA/$$LC/g" config/browserconfig.properties \ + > "$$CHROMEDIR/$$LC/locale/branding/browserconfig.properties"; \ + (cd "$$FFDIR"; \ + zip -u "$$PFILE" "chrome/$$LC/locale/branding/browserconfig.properties" \ + "chrome/$$LC/locale/browser-region/region.properties"); \ + rm -rf "$$CHROMEDIR" endif ## Set the language for Vidalia @@ -393,26 +428,28 @@ ifeq ($(USE_PIDGIN),1) $(BUNDLE)/PidginPortable/App/GTK/share/locale endif -patch-firefox-language: - ## Patch the default Firefox prefs.js +patch-firefox-config: + ## Patch Firefox default preferences by adding a patched #tor.js file: + PREFSDIR=$(BUNDLE)/App/Firefox/defaults/preferences; \ + mkdir -p "$$PREFSDIR"; \ + sed -e "s/SHPONKA/$(LANGCODE)/g" config/pound_tor.js \ + > "$$PREFSDIR/#tor.js"; \ + ./patch-firefox-language.sh "$$PREFSDIR/#tor.js" $(LANGCODE) -e; \ + printf 'pref("torbrowser.version", "%s");\n' \ + "$(RELEASE_VER)-$(BUILD_NUM)-$(PLATFORM)" \ + >> "$$PREFSDIR/#tor.js"; \ + (cd $(BUNDLE)/App/Firefox; zip -u omni.ja defaults/preferences/#tor.js);\ + rm -rf "$$PREFSDIR" + ## + ## Copy other Firefox configuration files into our bundle ## Don't use {} because they aren't always interpreted correctly. Thanks, sh. - mkdir -p $(BUNDLE)/App/Firefox/defaults/profile/ + mkdir -p $(BUNDLE)/App/Firefox/defaults/profile/preferences cp config/bookmarks.html $(BUNDLE)/App/Firefox/defaults/profile/ - cp config/prefs.js $(BUNDLE)/App/Firefox/defaults/profile/prefs.js + cp config/extension-overrides.js \ + $(BUNDLE)/App/Firefox/defaults/profile/preferences + mkdir -p $(BUNDLE)/Data/profile/preferences cp config/bookmarks.html $(BUNDLE)/Data/profile - cp config/prefs.js $(BUNDLE)/Data/profile/prefs.js - ./patch-firefox-language.sh $(BUNDLE)/App/Firefox/defaults/profile/prefs.js $(LANGCODE) -e - ./patch-firefox-language.sh $(BUNDLE)/Data/profile/prefs.js $(LANGCODE) -e - -## Fix prefs.js since extensions.checkCompatibility, false doesn't work -update-extension-pref: - sed -i -e "s/SHPONKA/$(LANGCODE)/g" $(BUNDLE)/Data/profile/prefs.js - sed -i -e "s/SHPONKA/$(LANGCODE)/g" $(BUNDLE)/App/Firefox/defaults/profile/prefs.js + cp config/extension-overrides.js $(BUNDLE)/Data/profile/preferences print-version: @echo $(RELEASE_VER)-$(BUILD_NUM) - -write-tbb-version: - printf 'user_pref("torbrowser.version", "%s");\n' "$(RELEASE_VER)-$(BUILD_NUM)-$(PLATFORM)-$(ARCH_TYPE)" >> $(BUNDLE)/App/Firefox/defaults/profile/prefs.js - printf 'user_pref("torbrowser.version", "%s");\n' "$(RELEASE_VER)-$(BUILD_NUM)-$(PLATFORM)-$(ARCH_TYPE)" >> $(BUNDLE)/Data/profile/prefs.js - diff --git a/build-scripts/osx.mk b/build-scripts/osx.mk index 757b9f3..7f71786 100644 --- a/build-scripts/osx.mk +++ b/build-scripts/osx.mk @@ -67,7 +67,7 @@ endif QT_BUILD_PREFS=-system-zlib -confirm-license -opensource -openssl-linked -no-qt3support \ - -fast -release -no-webkit -no-framework -nomake demos -nomake examples $(SDK) -arch $(ARCH_TYPE) + -fast -release -no-framework -nomake demos -nomake examples $(SDK) -arch $(ARCH_TYPE) QT_OPTS=$(QT_BUILD_PREFS) -prefix $(BUILT_DIR) -I $(BUILT_DIR)/include -I $(BUILT_DIR)/include/openssl/ -L $(BUILT_DIR)/lib build-qt: build-zlib build-openssl $(QT_DIR) cd $(QT_DIR) && ./configure $(QT_OPTS)

1 0

[torbrowser/master] update torbutton installation process for OSX
by erinn＠torproject.org 19 Feb '13

19 Feb '13

commit c51a9511d7022c2e7ec5ba419d98b62d9365c803 Author: Erinn Clark <erinn(a)torproject.org> Date: Tue Feb 12 20:42:41 2013 +0100 update torbutton installation process for OSX --- build-scripts/osx.mk | 2 +- build-scripts/versions-alpha.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/build-scripts/osx.mk b/build-scripts/osx.mk index 7f71786..6cd84fa 100644 --- a/build-scripts/osx.mk +++ b/build-scripts/osx.mk @@ -390,7 +390,7 @@ endif install-torbutton: torbutton.xpi mkdir -p $(BUNDLE)/Library/Application\ Support/Firefox/Profiles/profile/extensions/ - cp torbutton.xpi $(BUNDLE)/Library/Application\ Support/Firefox/Profiles/profile/extensions/{e0204bd5-9d31-402b-a99d-a6aa8ffebdca}.xpi + cp torbutton.xpi $(BUNDLE)/Library/Application\ Support/Firefox/Profiles/profile/extensions/torbutton(a)torproject.org.xpi install-httpseverywhere: httpseverywhere.xpi mkdir -p $(BUNDLE)/Library/Application\ Support/Firefox/Profiles/profile/extensions/https-everywhere(a)eff.org diff --git a/build-scripts/versions-alpha.mk b/build-scripts/versions-alpha.mk index 8e5423f..159bb07 100644 --- a/build-scripts/versions-alpha.mk +++ b/build-scripts/versions-alpha.mk @@ -3,7 +3,7 @@ RELEASE_VER=2.4.10-alpha ZLIB_VER=1.2.7 -OPENSSL_VER=1.0.1d +OPENSSL_VER=1.0.0k LIBPNG_VER=1.5.13 QT_VER=4.8.1 VIDALIA_VER=0.2.21

1 0

[torbrowser/master] WIN: update stable config files for FF17+torbutton changes
by erinn＠torproject.org 19 Feb '13

19 Feb '13

commit 41b7e1db3340734e36504861f42a7a24e65d922a Author: Erinn Clark <erinn(a)torproject.org> Date: Tue Feb 12 16:51:55 2013 +0100 WIN: update stable config files for FF17+torbutton changes --- build-scripts/config/torrc | 2 ++ build-scripts/config/vidalia.conf.ff | 2 +- 2 files changed, 3 insertions(+), 1 deletions(-) diff --git a/build-scripts/config/torrc b/build-scripts/config/torrc index 2d63da9..16f9486 100644 --- a/build-scripts/config/torrc +++ b/build-scripts/config/torrc @@ -9,3 +9,5 @@ Log notice stdout # Bind to this address to listen to connections from SOCKS-speaking # applications. SocksListenAddress 127.0.0.1 +SocksPort 9150 +ControlPort 9151 diff --git a/build-scripts/config/vidalia.conf.ff b/build-scripts/config/vidalia.conf.ff index 1d9d2fa..d557a0c 100644 --- a/build-scripts/config/vidalia.conf.ff +++ b/build-scripts/config/vidalia.conf.ff @@ -8,7 +8,7 @@ PluginsDirectory=..\\..\\Data\\plugins DefaultPluginsDirectory=..\\DefaultData\\plugins [Tor] -ControlPort=9051 +ControlPort=9151 TorExecutable=.\\tor.exe Torrc=..\\Data\\Tor\\torrc DataDirectory=..\\Data\\Tor

1 0

[torbrowser/master] WIN: begin adding FF17 changes to Makefiles
by erinn＠torproject.org 19 Feb '13

19 Feb '13

commit 846a155671ffc7c94e4590b44f3de468fb511b73 Author: Erinn Clark <erinn(a)torproject.org> Date: Tue Feb 12 16:29:01 2013 +0100 WIN: begin adding FF17 changes to Makefiles --- build-scripts/versions.mk | 22 ++++----- build-scripts/windows-alpha.mk | 32 +++++++------- build-scripts/windows.mk | 90 ++++++++++++++++++++++++++++----------- 3 files changed, 90 insertions(+), 54 deletions(-) diff --git a/build-scripts/versions.mk b/build-scripts/versions.mk index 138b28d..080696b 100644 --- a/build-scripts/versions.mk +++ b/build-scripts/versions.mk @@ -3,17 +3,16 @@ RELEASE_VER=2.3.25 ZLIB_VER=1.2.7 -OPENSSL_VER=1.0.1d +OPENSSL_VER=1.0.0k LIBPNG_VER=1.5.13 QT_VER=4.8.1 VIDALIA_VER=0.2.21 LIBEVENT_VER=2.0.21-stable TOR_VER=0.2.3.25 PIDGIN_VER=2.6.4 -FIREFOX_VER=10.0.12esr +FIREFOX_VER=17.0.2esr MOZBUILD_VER=1.5.1 -PYMAKE_VER=87d436cd8974 -TORBUTTON_VER=1.4.6.3 +TORBUTTON_VER=1.5.0pre6-alpha NOSCRIPT_VER=2.6.4.4 HTTPSEVERYWHERE_VER=3.1.3 OTR_VER=3.2.0 @@ -33,7 +32,6 @@ TOR_PACKAGE=tor-$(TOR_VER).tar.gz PIDGIN_PACKAGE=pidgin-$(PIDGIN_VER).tar.bz2 FIREFOX_PACKAGE=firefox-$(FIREFOX_VER).source.tar.bz2 MOZBUILD_PACKAGE=MozillaBuildSetup-$(MOZBUILD_VER).exe -PYMAKE_PACKAGE=$(PYMAKE_VER).tar.bz2 TORBUTTON_PACKAGE=torbutton-$(TORBUTTON_VER).xpi NOSCRIPT_PACKAGE=addon-722-latest.xpi HTTPSEVERYWHERE_PACKAGE=https-everywhere-$(HTTPSEVERYWHERE_VER).xpi @@ -50,8 +48,8 @@ TOR_URL=https://archive.torproject.org/tor-package-archive/$(TOR_PACKAGE) PIDGIN_URL=http://sourceforge.net/projects/pidgin/files/Pidgin/$(PIDGIN_PAC… FIREFOX_URL=https://ftp.mozilla.org/pub/mozilla.org/firefox/releases/$(FIRE… MOZBUILD_URL=https://ftp.mozilla.org/pub/mozilla.org/mozilla/libraries/win3… -PYMAKE_URL=https://hg.mozilla.org/users/bsmedberg_mozilla.com/pymake/archive/$(PYMAKE_PACKAGE) -TORBUTTON_URL=https://archive.torproject.org/tor-package-archive/torbutton/$(TORBUTTON_PACKAGE) +#TORBUTTON_URL=https://archive.torproject.org/tor-package-archive/torbutton/$(TORBUTTON_PACKAGE) +TORBUTTON_URL=https://people.torproject.org/~mikeperry/$(TORBUTTON_PACKAGE) NOSCRIPT_URL=https://addons.mozilla.org/firefox/downloads/latest/722/$(NOSC… HTTPSEVERYWHERE_URL=https://eff.org/files/$(HTTPSEVERYWHERE_PACKAGE) OBFSPROXY_URL=https://archive.torproject.org/tor-package-archive/obfsproxy/… @@ -82,7 +80,7 @@ LIBEVENT_DIR=$(BUILD_DIR)/libevent-$(LIBEVENT_VER) TOR_DIR=$(BUILD_DIR)/tor-$(TOR_VER) FIREFOX_DIR=$(BUILD_DIR)/firefox-$(FIREFOX_VER) MOZBUILD_DIR=$(BUILD_DIR)/mozilla-build -PYMAKE_DIR=$(BUILD_DIR)/pymake-$(PYMAKE_VER) +PYMAKE_DIR=$(FIREFOX_DIR)/build/pymake OBFSPROXY_DIR=$(BUILD_DIR)/obfsproxy-$(OBFSPROXY_VER) # Empty targets are written in arch-dependent $(BUILD_DIR). Usual @@ -197,9 +195,9 @@ $(TOR_DIR): $(FETCH_DIR)/$(TOR_PACKAGE) | $(BUILD_DIR) cd $(FETCH_DIR) && tar -xmf $(TOR_PACKAGE) -C $(BUILD_DIR)/ $(FIREFOX_DIR): $(FETCH_DIR)/$(FIREFOX_PACKAGE) ../src/current-patches/firefox/* | $(BUILD_DIR) - rm -rf $(FIREFOX_DIR) $(FETCH_DIR)/mozilla-esr10 + rm -rf $(FIREFOX_DIR) $(FETCH_DIR)/mozilla-esr17 cd $(FETCH_DIR) && tar -xmf $(FIREFOX_PACKAGE) -C $(BUILD_DIR)/ - mv $(BUILD_DIR)/mozilla-esr10 $(FIREFOX_DIR) + mv $(BUILD_DIR)/mozilla-esr17 $(FIREFOX_DIR) cp ../src/current-patches/firefox/* $(FIREFOX_DIR) cp patch-any-src.sh $(FIREFOX_DIR) cd $(FIREFOX_DIR) && ./patch-any-src.sh @@ -224,8 +222,8 @@ $(OBFSPROXY_DIR): $(FETCH_DIR)/$(OBFSPROXY_PACKAGE) | $(BUILD_DIR) # Common build functionality. Modified by variables set in OS-specific makefiles build-tor: build-zlib build-openssl build-libevent $(TOR_DIR) - cd $(TOR_DIR) && CFLAGS=$(TOR_CFLAGS) LDFLAGS=$(TOR_LDFLAGS) ./configure $(TOR_OPTS) --enable-gcc-warnings-advisory --prefix=$(BUILT_DIR) - cd $(TOR_DIR) && make -j $(NUM_CORES) + cd $(TOR_DIR) && CFLAGS=$(TOR_CFLAGS) LDFLAGS=$(TOR_LDFLAGS) ./configure $(TOR_OPTS) --enable-gcc-warnings-advisory --prefix=$(BUILT_DIR) --disable-gcc-hardening 2>&1 | tee configuring.log + cd $(TOR_DIR) && make -j $(NUM_CORES) 2>&1 | tee build.log cd $(TOR_DIR) && make install touch $(STAMP_DIR)/build-tor diff --git a/build-scripts/windows-alpha.mk b/build-scripts/windows-alpha.mk index 8131b88..659333a 100644 --- a/build-scripts/windows-alpha.mk +++ b/build-scripts/windows-alpha.mk @@ -320,10 +320,10 @@ configure-apps: ## Override Firefox extension preferences mkdir -p $(DEST)/FirefoxPortable/App/DefaultData/profile/preferences - cp config/extension-overrides.js \ + cp config/extension-overrides.js \ $(DEST)/FirefoxPortable/App/DefaultData/profile/preferences/ mkdir -p $(DEST)/FirefoxPortable/Data/profile/preferences - cp config/extension-overrides.js \ + cp config/extension-overrides.js \ $(DEST)/FirefoxPortable/Data/profile/preferences/ ## Patch Firefox default home page and omnibox @@ -417,17 +417,17 @@ ifneq ($(LANGCODE), en-US) mv langpack_$(LANGCODE).xpi $(BUNDLE)/FirefoxPortable/Data/profile/extensions/langpack-$(LANGCODE)(a)firefox.mozilla.org.xpi ## Patch Firefox default home page within language pack LC=$(LANG); \ - PFILE=langpack-$(LANGCODE)(a)firefox.mozilla.org.xpi; \ + PFILE=langpack-$(LANGCODE)(a)firefox.mozilla.org.xpi; \ FFDIR=$(BUNDLE)/FirefoxPortable/Data/profile/extensions/; \ - CHROMEDIR="$$FFDIR/chrome/"; \ - mkdir -p "$$CHROMEDIR/$$LC/locale/branding"; \ - mkdir -p "$$CHROMEDIR/$$LC/locale/browser-region"; \ - cp config/region.properties \ - "$$CHROMEDIR/$$LC/locale/browser-region/"; \ + CHROMEDIR="$$FFDIR/chrome/"; \ + mkdir -p "$$CHROMEDIR/$$LC/locale/branding"; \ + mkdir -p "$$CHROMEDIR/$$LC/locale/browser-region"; \ + cp config/region.properties \ + "$$CHROMEDIR/$$LC/locale/browser-region/"; \ sed -e "s/SHPONKA/$$LC/g" config/browserconfig.properties \ > "$$CHROMEDIR/$$LC/locale/branding/browserconfig.properties"; \ - (cd "$$FFDIR"; \ - $(SEVENZIP) u -tzip "$$PFILE" \ + (cd "$$FFDIR"; \ + $(SEVENZIP) u -tzip "$$PFILE" \ "chrome/$$LC/locale/branding/browserconfig.properties" \ "chrome/$$LC/locale/browser-region/region.properties"); \ rm -rf "$$CHROMEDIR" @@ -469,14 +469,14 @@ endif patch-firefox-config: ## Patch Firefox default preferences by adding a patched #tor.js file: PREFSDIR=$(BUNDLE)/FirefoxPortable/App/Firefox/defaults/preferences; \ - mkdir -p "$$PREFSDIR"; \ + mkdir -p "$$PREFSDIR"; \ sed -e "s/SHPONKA/$(LANGCODE)/g" config/pound_tor.js \ - > "$$PREFSDIR/#tor.js"; \ + > "$$PREFSDIR/#tor.js"; \ ./patch-firefox-language.sh "$$PREFSDIR/#tor.js" $(LANGCODE) -e; \ - printf 'pref("torbrowser.version", "%s");\n' \ - "$(RELEASE_VER)-$(BUILD_NUM)-$(PLATFORM)" \ - >> "$$PREFSDIR/#tor.js"; \ - (cd $(BUNDLE)/FirefoxPortable/App/Firefox; \ + printf 'pref("torbrowser.version", "%s");\n' \ + "$(RELEASE_VER)-$(BUILD_NUM)-$(PLATFORM)" \ + >> "$$PREFSDIR/#tor.js"; \ + (cd $(BUNDLE)/FirefoxPortable/App/Firefox; \ $(SEVENZIP) u -tzip omni.ja defaults/preferences/#tor.js); \ rm -rf "$$PREFSDIR" diff --git a/build-scripts/windows.mk b/build-scripts/windows.mk index 876973a..c341ff4 100644 --- a/build-scripts/windows.mk +++ b/build-scripts/windows.mk @@ -17,7 +17,7 @@ BUILD_NUM=3 PLATFORM=Windows ## Location of required libraries -MING=/mingw/bin +MING=/c/mingw/bin QT_LIB=/c/Qt/$(QT_VER)/bin OPENSSL_LIB=$(COMPILED_BINS) WIX_LIB="$(MOZBUILD_DIR)/wix-351728" @@ -31,7 +31,7 @@ PIDGIN=$(BUILD_DIR)/PidginPortable-$(PIDGIN_VER) ## Location of utility applications PWD:=$(shell pwd) PYTHON=$(MOZBUILD_DIR)/python/python.exe -PYMAKE=$(PYMAKE_DIR)/make.py +PYMAKE=$(FIREFOX_DIR)/build/pymake/make.py SEVENZIP="$(MOZBUILD_DIR)/7zip/7z.exe" WGET=wget VIRUSSCAN=$(PYTHON) $(PWD)/virus-scan.py @@ -50,7 +50,7 @@ FETCH_DIR=$(PWD)/build-alpha-windows BUILD_DIR=$(FETCH_DIR)/build ## Location of directory for prefix/destdir/compiles/etc BUILT_DIR=$(BUILD_DIR)/built -TBB_FINAL=$(BUILT_DIR)/tbbwin-alpha-dist +TBB_FINAL=$(BUILT_DIR)/tbbwin-dist ## Include versions (must happen after variable definitions above include $(PWD)/versions.mk @@ -135,7 +135,7 @@ DEST="Generic Bundle" NAME="Tor Browser" ## Where shall we put the finished files for distribution? -DISTDIR=tbbwin-alpha-dist +DISTDIR=tbbwin-dist ## Version and name of the compressed bundle (also used for source) VERSION=$(RELEASE_VER)-$(BUILD_NUM) @@ -280,14 +280,36 @@ endif ## Configure Firefox, FirefoxPortable, Vidalia, and Tor configure-apps: - mkdir -p $(DEST)/FirefoxPortable/Data/profile mkdir -p $(DEST)/FirefoxPortable/App/DefaultData/profile - ## Configure Firefox preferences - cp config/prefs.js $(DEST)/FirefoxPortable/App/DefaultData/profile/prefs.js - cp config/prefs.js $(DEST)/FirefoxPortable/Data/profile/prefs.js + ## Configure Firefox bookmarks cp config/bookmarks.html $(DEST)/FirefoxPortable/App/DefaultData/profile/ + ## Override Firefox extension preferences + mkdir -p $(DEST)/FirefoxPortable/App/DefaultData/profile/preferences + cp config/extension-overrides.js \ + $(DEST)/FirefoxPortable/App/DefaultData/profile/preferences/ + mkdir -p $(DEST)/FirefoxPortable/Data/profile/preferences + cp config/extension-overrides.js \ + $(DEST)/FirefoxPortable/Data/profile/preferences/ + + ## Patch Firefox default home page and omnibox + LC="en-US"; \ + PFILE="omni.ja"; \ + FFDIR=$(DEST)/FirefoxPortable/App/Firefox/; \ + CHROMEDIR="$$FFDIR/chrome/"; \ + mkdir -p "$$CHROMEDIR/$$LC/locale/branding"; \ + mkdir -p "$$CHROMEDIR/$$LC/locale/browser-region"; \ + cp config/region.properties \ + "$$CHROMEDIR/$$LC/locale/browser-region/"; \ + sed -e "s/SHPONKA/$$LC/g" config/browserconfig.properties \ + > "$$CHROMEDIR/$$LC/locale/branding/browserconfig.properties"; \ + (cd "$$FFDIR"; \ + $(SEVENZIP) u -tzip "$$PFILE" \ + "chrome/$$LC/locale/branding/browserconfig.properties" \ + "chrome/$$LC/locale/browser-region/region.properties"); \ + rm -rf "$$CHROMEDIR" + ## Set up alternate launcher mv $(DEST)/FirefoxPortable/App/Firefox/firefox.exe $(DEST)/FirefoxPortable/App/Firefox/tbb-firefox.exe @@ -327,7 +349,7 @@ compressed-bundle_%: bundle-localized_%.stamp: make -f windows.mk copy-files_$* install-extensions install-torbutton install-httpseverywhere install-noscript \ - patch-vidalia-language patch-firefox-language patch-pidgin-language write-tbb-version + patch-vidalia-language patch-firefox-config touch $(STAMP_DIR)/bundle-localized_$*.stamp bundle-localized: bundle-localized_$(LANGCODE).stamp @@ -347,16 +369,30 @@ DUMMYPROFILE=$(BUNDLE)/FirefoxPortable/App/DummyProfile install-extensions: $(filter-out langpack_en-US.xpi,langpack_$(LANGCODE).xpi) ## Make a dummy profile to stop Firefox creating some large files cp -r $(BUNDLE)/FirefoxPortable/App/DefaultData $(DUMMYPROFILE) - mkdir -p $(BUNDLE)/FirefoxPortable/Data/profile/extensions ifneq ($(LANGCODE), en-US) mv langpack_$(LANGCODE).xpi $(BUNDLE)/FirefoxPortable/Data/profile/extensions/langpack-$(LANGCODE)(a)firefox.mozilla.org.xpi + ## Patch Firefox default home page within language pack + LC=$(LANG); \ + PFILE=langpack-$(LANGCODE)(a)firefox.mozilla.org.xpi; \ + FFDIR=$(BUNDLE)/FirefoxPortable/Data/profile/extensions/; \ + CHROMEDIR="$$FFDIR/chrome/"; \ + mkdir -p "$$CHROMEDIR/$$LC/locale/branding"; \ + mkdir -p "$$CHROMEDIR/$$LC/locale/browser-region"; \ + cp config/region.properties \ + "$$CHROMEDIR/$$LC/locale/browser-region/"; \ + sed -e "s/SHPONKA/$$LC/g" config/browserconfig.properties \ + > "$$CHROMEDIR/$$LC/locale/branding/browserconfig.properties"; \ + (cd "$$FFDIR"; \ + $(SEVENZIP) u -tzip "$$PFILE" \ + "chrome/$$LC/locale/branding/browserconfig.properties" \ + "chrome/$$LC/locale/browser-region/region.properties"); \ + rm -rf "$$CHROMEDIR" endif rm -fr $(DUMMYPROFILE) install-torbutton: $(SEVENZIP) torbutton.xpi - mkdir -p $(BUNDLE)/FirefoxPortable/Data/profile/extensions/{e0204bd5-9d31-402b-a99d-a6aa8ffebdca} - cp torbutton.xpi $(BUNDLE)/FirefoxPortable/Data/profile/extensions/{e0204bd5-9d31-402b-a99d-a6aa8ffebdca}/torbutton.zip - (cd $(BUNDLE)/FirefoxPortable/Data/profile/extensions/{e0204bd5-9d31-402b-a99d-a6aa8ffebdca} && $(SEVENZIP) x *.zip && rm *.zip) + mkdir -p $(BUNDLE)/FirefoxPortable/Data/profile/extensions/ + cp torbutton.xpi $(BUNDLE)/FirefoxPortable/Data/profile/extensions/torbutton(a)torproject.org.xpi install-httpseverywhere: $(SEVENZIP) httpseverywhere.xpi mkdir -p $(BUNDLE)/FirefoxPortable/Data/profile/extensions/https-everywhere(a)eff.org @@ -383,14 +419,19 @@ ifeq ($(USE_PIDGIN),1) $(BUNDLE)/PidginPortable/App/Pidgin/Gtk/share/locale endif -patch-firefox-language: - ## Patch Firefox prefs.js - ./patch-firefox-language.sh $(BUNDLE)/FirefoxPortable/App/DefaultData/profile/prefs.js $(LANGCODE) - ./patch-firefox-language.sh $(BUNDLE)/FirefoxPortable/Data/profile/prefs.js $(LANGCODE) - sed -i -e "s/SHPONKA/$(LANGCODE)/g" $(BUNDLE)/FirefoxPortable/Data/profile/prefs.js - sed -i -e "s/SHPONKA/$(LANGCODE)/g" $(BUNDLE)/FirefoxPortable/App/DefaultData/profile/prefs.js - chmod u+w $(BUNDLE)/FirefoxPortable/Data/profile/prefs.js - chmod u+w $(BUNDLE)/FirefoxPortable/App/DefaultData/profile/prefs.js +patch-firefox-config: + ## Patch Firefox default preferences by adding a patched #tor.js file: + PREFSDIR=$(BUNDLE)/FirefoxPortable/App/Firefox/defaults/preferences; \ + mkdir -p "$$PREFSDIR"; \ + sed -e "s/SHPONKA/$(LANGCODE)/g" config/pound_tor.js \ + > "$$PREFSDIR/#tor.js"; \ + ./patch-firefox-language.sh "$$PREFSDIR/#tor.js" $(LANGCODE) -e; \ + printf 'pref("torbrowser.version", "%s");\n' \ + "$(RELEASE_VER)-$(BUILD_NUM)-$(PLATFORM)" \ + >> "$$PREFSDIR/#tor.js"; \ + (cd $(BUNDLE)/FirefoxPortable/App/Firefox; \ + $(SEVENZIP) u -tzip omni.ja defaults/preferences/#tor.js); \ + rm -rf "$$PREFSDIR" ### ### Utilities @@ -398,15 +439,12 @@ patch-firefox-language: ## Copy Firefox preferences from a run of FirefoxPortable to be the default apply-prefs: - cp $(DEST)/FirefoxPortable/Data/profile/prefs.js config + sed -e "s/^user_//" $(BUNDLE)/FirefoxPortable/Data/profile/prefs.js \ + > config/pound_tor.js print-version: @echo $(RELEASE_VER)-$(BUILD_NUM) -write-tbb-version: - printf 'user_pref("torbrowser.version", "%s");\n' "$(RELEASE_VER)-$(BUILD_NUM)-$(PLATFORM)" >> $(BUNDLE)/FirefoxPortable/App/DefaultData/profile/prefs.js - printf 'user_pref("torbrowser.version", "%s");\n' "$(RELEASE_VER)-$(BUILD_NUM)-$(PLATFORM)" >> $(BUNDLE)/FirefoxPortable/Data/profile/prefs.js - ## Tag the release releasetag: git tag -s torbrowser-$(VERSION) -m "tagging $(VERSION)"

1 0

[torbrowser/master] OSX: update Makefiles and config files with FF17+torbutton changes
by erinn＠torproject.org 19 Feb '13

19 Feb '13

commit 8c70e93c181e06d3f1dbc64853399dfbb7dc9595 Author: Erinn Clark <erinn(a)torproject.org> Date: Tue Feb 12 17:28:02 2013 +0100 OSX: update Makefiles and config files with FF17+torbutton changes --- build-scripts/config/torrc-osx | 4 +- build-scripts/config/vidalia.conf.ff-osx | 3 +- build-scripts/osx-alpha.mk | 2 +- build-scripts/osx.mk | 75 ++++++++++++++++++++++------- 4 files changed, 61 insertions(+), 23 deletions(-) diff --git a/build-scripts/config/torrc-osx b/build-scripts/config/torrc-osx index 4c7f0d9..22c9953 100644 --- a/build-scripts/config/torrc-osx +++ b/build-scripts/config/torrc-osx @@ -8,6 +8,6 @@ GeoIPFile ../../Contents/Resources/Data/Tor/geoip Log notice stdout # Bind to this address to listen to connections from SOCKS-speaking # applications. -SocksPort auto SocksListenAddress 127.0.0.1 -ControlPort auto +SocksPort 9150 +ControlPort 9151 diff --git a/build-scripts/config/vidalia.conf.ff-osx b/build-scripts/config/vidalia.conf.ff-osx index f698d2b..8b00cc2 100644 --- a/build-scripts/config/vidalia.conf.ff-osx +++ b/build-scripts/config/vidalia.conf.ff-osx @@ -8,8 +8,7 @@ DefaultPluginsDirectory=../../MacOS/Data/plugins LanguageCode=en [Tor] -ControlPort=9051 +ControlPort=9151 TorExecutable=../../../tor Torrc=../../../../../Library/Vidalia/torrc -AutoControl=true DataDirectory=../../../../Resources/Data/Tor/ diff --git a/build-scripts/osx-alpha.mk b/build-scripts/osx-alpha.mk index 6d12ae4..bd4fa27 100644 --- a/build-scripts/osx-alpha.mk +++ b/build-scripts/osx-alpha.mk @@ -197,7 +197,7 @@ endif DEFAULT_EXTENSIONS=torbutton.xpi ## Where to download Mozilla language packs -MOZILLA_LANGUAGE=http://releases.mozilla.org/pub/mozilla.org/firefox/releases/latest/mac/xpi +MOZILLA_LANGUAGE=https://ftp.mozilla.org/pub/mozilla.org/firefox/releases/$(FIREFOX_VER)/mac/xpi ## Put more extensions here EXTENSIONS_DIR=extensions diff --git a/build-scripts/osx.mk b/build-scripts/osx.mk index f420e46..757b9f3 100644 --- a/build-scripts/osx.mk +++ b/build-scripts/osx.mk @@ -103,11 +103,12 @@ build-firefox: $(FIREFOX_DIR) config/mozconfig-osx-$(ARCH_TYPE) cp config/mozconfig-osx-$(ARCH_TYPE) $(FIREFOX_DIR)/mozconfig cp branding/* $(FIREFOX_DIR)/browser/branding/official cd $(FIREFOX_DIR) && make -f client.mk build + cd $(FIREFOX_DIR) && make -C obj* package touch $(STAMP_DIR)/build-firefox copy-firefox: -rm -rf $(BUILD_DIR)/TorBrowser.app - cp -r $(FIREFOX_DIR)/obj*/dist/*.app $(BUILD_DIR)/TorBrowser.app + cp -r $(FIREFOX_DIR)/obj*/dist/firefox/*.app $(BUILD_DIR)/TorBrowser.app build-all-binaries: build-zlib build-openssl build-vidalia build-libevent build-tor build-firefox copy-firefox echo "If we're here, we've done something right." @@ -270,13 +271,31 @@ install-docs: install-firefox: cp -R $(FIREFOX) $(APPDIR) -## Configure Firefox, Vidalia, and Tor +# Configure Firefox, Vidalia, and Tor configure-apps: ## Configure Firefox preferences #mkdir -p $(DEST)/.mozilla/Firefox/firefox.default cp -R config/firefox-profiles.ini $(DEST)/Contents/MacOS/TorBrowser.app/Contents/MacOS/Data/profiles.ini cp config/bookmarks.html $(DEST)/Contents/MacOS/TorBrowser.app/Contents/MacOS/Data/profile - cp config/prefs.js $(DEST)/Contents/MacOS/TorBrowser.app/Contents/MacOS/Data/profile/prefs.js + ## Override Firefox extension preferences + mkdir -p $(DEST)/Contents/MacOS/TorBrowser.app/Contents/MacOS/Data/profile/preferences + cp config/extension-overrides.js $(DEST)/Contents/MacOS/TorBrowser.app/Contents/MacOS/Data/profile/preferences/ + ## Patch Firefox default home page and omnibox + LC="en-US"; \ + PFILE="omni.ja"; \ + FFDIR=$(DEST)/Contents/MacOS/TorBrowser.app/Contents/MacOS/; \ + CHROMEDIR="$$FFDIR/chrome/"; \ + mkdir -p "$$CHROMEDIR/$$LC/locale/branding"; \ + mkdir -p "$$CHROMEDIR/$$LC/locale/browser-region"; \ + cp config/region.properties \ + "$$CHROMEDIR/$$LC/locale/browser-region/"; \ + sed -e "s/SHPONKA/$$LC/g" config/browserconfig.properties \ + > "$$CHROMEDIR/$$LC/locale/branding/browserconfig.properties"; \ + (cd "$$FFDIR"; \ + zip -u "$$PFILE" "chrome/$$LC/locale/branding/browserconfig.properties" \ + "chrome/$$LC/locale/browser-region/region.properties"); \ + rm -rf "$$CHROMEDIR" + cp config/Info.plist $(DEST)/Contents cp config/PkgInfo $(DEST)/Contents cp config/qt.conf $(DEST)/Contents/MacOS/Vidalia.app/Contents/Resources @@ -313,7 +332,7 @@ bundle_%: compressed-bundle_%: LANGCODE=$* make -f osx.mk compressed-bundle-localized bundle-localized_%.stamp: - make -f osx.mk copy-files_$* install-torbutton install-httpseverywhere install-noscript install-lang-extensions patch-vidalia-language patch-firefox-language patch-pidgin-language update-extension-pref write-tbb-version final + make -f osx.mk copy-files_$* install-torbutton install-httpseverywhere install-noscript install-lang-extensions patch-vidalia-language patch-firefox-config final touch $(STAMP_DIR)/bundle-localized_$*.stamp bundle-localized: bundle-localized_$(LANGCODE).stamp @@ -322,7 +341,7 @@ compressed-bundle-localized: bundle-localized_$(LANGCODE).stamp -rm -f $(DISTDIR)/$(COMPRESSED_NAME)_$(LANGCODE).zip -mkdir $(DISTDIR) #hdiutil create -volname "Tor Browser Bundle for OS X" -format UDBZ -imagekey zlib-level=9 -srcfolder $(DISTDIR)/tmp/ $(DISTDIR)/$(DEFAULT_COMPRESSED_BASENAME)$(LANGCODE).dmg - zip -r $(DISTDIR)/$(DEFAULT_COMPRESSED_BASENAME)$(LANGCODE).zip $(NAME)_$(LANGCODE).app + zip -r $(DISTDIR)/$(COMPRESSED_NAME)$(LANGCODE).zip $(NAME)_$(LANGCODE).app rm -f *.zip *.xpi copy-files_%: generic-bundle.stamp @@ -351,6 +370,22 @@ install-lang-extensions: $(filter-out langpack_en-US.xpi,langpack_$(LANGCODE).xp ifneq ($(LANGCODE), en-US) mkdir -p $(BUNDLE)/Library/Application\ Support/Firefox/Profiles/profile/extensions/ cp langpack_$(LANGCODE).xpi $(BUNDLE)/Library/Application\ Support/Firefox/Profiles/profile/extensions/langpack-$(LANGCODE)(a)firefox.mozilla.org.xpi + ## Patch Firefox default home page within language pack + LC=$(LANGCODE); \ + PFILE=langpack-$(LANGCODE)(a)firefox.mozilla.org.xpi; \ + FFDIR=$(BUNDLE)/Library/Application\ Support/Firefox/Profiles/profile/extensions/; \ + CHROMEDIR="$$FFDIR/chrome/"; \ + mkdir -p "$$CHROMEDIR/$$LC/locale/branding"; \ + mkdir -p "$$CHROMEDIR/$$LC/locale/browser-region"; \ + cp config/region.properties \ + "$$CHROMEDIR/$$LC/locale/browser-region/"; \ + sed -e "s/SHPONKA/$$LC/g" config/browserconfig.properties \ + > "$$CHROMEDIR/$$LC/locale/branding/browserconfig.properties"; \ + (cd "$$FFDIR"; \ + zip -u "$$PFILE" "chrome/$$LC/locale/branding/browserconfig.properties" \ + "chrome/$$LC/locale/browser-region/region.properties"); \ + rm -rf "$$CHROMEDIR" + endif install-torbutton: torbutton.xpi @@ -381,23 +416,27 @@ ifeq ($(USE_PIDGIN),1) $(BUNDLE)/PidginPortable/App/GTK/share/locale endif -patch-firefox-language: - ## Patch the default Firefox prefs.js - ## Don't use {} because they aren't always interpreted correctly. Thanks, sh. - cp config/prefs.js $(BUNDLE)/Library/Application\ Support/Firefox/Profiles/profile/prefs.js +patch-firefox-config: + ## Patch Firefox default preferences by adding a patched #tor.js file: + PREFSDIR=$(BUNDLE)/Contents/MacOS/TorBrowser.app/Contents/MacOS/defaults/preferences; \ + mkdir -p "$$PREFSDIR"; \ + sed -e "s/SHPONKA/$(LANGCODE)/g" config/pound_tor.js \ + > "$$PREFSDIR/#tor.js"; \ + ./patch-firefox-language.sh "$$PREFSDIR/#tor.js" $(LANGCODE) -e; \ + printf 'pref("torbrowser.version", "%s");\n' \ + "$(RELEASE_VER)-$(BUILD_NUM)-$(PLATFORM)" \ + >> "$$PREFSDIR/#tor.js"; \ + (cd $(BUNDLE)/Contents/MacOS/TorBrowser.app/Contents/MacOS; \ + zip -u omni.ja defaults/preferences/#tor.js); \ + rm -rf "$$PREFSDIR" + ## Copy bookmarks and extension pref. overrides into profile cp config/bookmarks.html $(BUNDLE)/Library/Application\ Support/Firefox/Profiles/profile - ./patch-firefox-language.sh $(BUNDLE)/Library/Application\ Support/Firefox/Profiles/profile/prefs.js $(LANGCODE) -e - -## Fix prefs.js since extensions.checkCompatibility, false doesn't work -update-extension-pref: - sed -i -e "s/SHPONKA/$(LANGCODE)/g" $(BUNDLE)/Library/Application\ Support/Firefox/Profiles/profile/prefs.js - sed -i -e "s/SHPONKA/$(LANGCODE)/g" $(BUNDLE)/Contents/MacOS/TorBrowser.app/Contents/MacOS/Data/profile/prefs.js + OVERRIDEDIR=$(BUNDLE)/Library/Application\ Support/Firefox/Profiles/profile/preferences; \ + mkdir "$$OVERRIDEDIR"; \ + cp config/extension-overrides.js "$$OVERRIDEDIR" print-version: @echo $(RELEASE_VER)-$(BUILD_NUM) -write-tbb-version: - printf 'user_pref("torbrowser.version", "%s");\n' "$(RELEASE_VER)-$(BUILD_NUM)-$(PLATFORM)-$(ARCH_TYPE)" >> $(BUNDLE)/Library/Application\ Support/Firefox/Profiles/profile/prefs.js - final: mv $(BUNDLE) $(BUNDLE).app

1 0

[torbrowser/master] Update font limiting patch to exempt @font-face.
by erinn＠torproject.org 19 Feb '13

19 Feb '13

commit 11c13307994168e97e95ac3a5d92cbd768cd12c6 Author: Mike Perry <mikeperry-git(a)fscked.org> Date: Tue Feb 12 22:44:08 2013 -0800 Update font limiting patch to exempt @font-face. This provides substantial rendering improvements, and probably will also make non-latin script users much happier. --- ...11-Limit-the-number-of-fonts-per-document.patch | 81 +++++++++++++++++--- 1 files changed, 71 insertions(+), 10 deletions(-) diff --git a/src/current-patches/firefox/0011-Limit-the-number-of-fonts-per-document.patch b/src/current-patches/firefox/0011-Limit-the-number-of-fonts-per-document.patch index 80660db..dbf34a9 100644 --- a/src/current-patches/firefox/0011-Limit-the-number-of-fonts-per-document.patch +++ b/src/current-patches/firefox/0011-Limit-the-number-of-fonts-per-document.patch @@ -1,4 +1,4 @@ -From 2786933e3a395e1058da8850a3710f01ca416463 Mon Sep 17 00:00:00 2001 +From 6b7306a50a304bcf12b04784115f21f34b71864a Mon Sep 17 00:00:00 2001 From: Mike Perry <mikeperry-git(a)torproject.org> Date: Wed, 5 Dec 2012 12:25:21 -0800 Subject: [PATCH 11/26] Limit the number of fonts per document. @@ -14,6 +14,11 @@ browser.display.use_document_fonts was set to 0 for subsequent font queries. If a pref is not set or is negative, that limit does not apply. +The use of "User Fonts" (aka WebFonts, aka @font-face fonts) are exempt from +both of these limits. The patch also makes such fonts take precedence over +local fonts. This vastly improves typography on many sites that would +otherwise hit these limits. + This is done to address: https://www.torproject.org/projects/torbrowser/design/#fingerprinting-linka… --- @@ -21,8 +26,8 @@ https://www.torproject.org/projects/torbrowser/design/#fingerprinting-linka… layout/base/nsPresContext.cpp | 100 +++++++++++++++++++++++++++++++++++++++++ layout/base/nsPresContext.h | 9 ++++ layout/style/nsCSSParser.cpp | 1 + - layout/style/nsRuleNode.cpp | 14 +++++- - 5 files changed, 122 insertions(+), 3 deletions(-) + layout/style/nsRuleNode.cpp | 56 ++++++++++++++++++++++- + 5 files changed, 164 insertions(+), 3 deletions(-) diff --git a/gfx/thebes/gfxPangoFonts.cpp b/gfx/thebes/gfxPangoFonts.cpp index c94a299..88c8b8e 100644 @@ -201,10 +206,18 @@ index 37a19c4..30fd021 100644 // because it's only being used to call EnumerateFamilies nsFont font(family, 0, 0, 0, 0, 0, 0); diff --git a/layout/style/nsRuleNode.cpp b/layout/style/nsRuleNode.cpp -index 64504fb..33ce21e 100644 +index 64504fb..86eff1f 100644 --- a/layout/style/nsRuleNode.cpp +++ b/layout/style/nsRuleNode.cpp -@@ -2954,6 +2954,7 @@ nsRuleNode::SetFont(nsPresContext* aPresContext, nsStyleContext* aContext, +@@ -42,6 +42,7 @@ + #include "mozilla/dom/Element.h" + #include "mozilla/LookAndFeel.h" + #include "mozilla/Util.h" ++#include "gfxUserFontSet.h" + + #if defined(_MSC_VER) || defined(__MINGW32__) + #include <malloc.h> +@@ -2954,6 +2955,7 @@ nsRuleNode::SetFont(nsPresContext* aPresContext, nsStyleContext* aContext, aPresContext->GetDefaultFont(kPresContext_DefaultVariableFont_ID, aFont->mLanguage); @@ -212,11 +225,44 @@ index 64504fb..33ce21e 100644 // -moz-system-font: enum (never inherit!) MOZ_STATIC_ASSERT( NS_STYLE_FONT_CAPTION == LookAndFeel::eFont_Caption && -@@ -3439,14 +3440,15 @@ nsRuleNode::ComputeFontData(void* aStartStruct, +@@ -3416,6 +3418,31 @@ static bool ExtractGeneric(const nsString& aFamily, bool aGeneric, + return true; + } + ++struct smugglerStruct { ++ nsStyleFont *font; ++ gfxUserFontSet *userFonts; ++}; ++ ++/* This function forces the use of the first @font-face font we find */ ++static bool ForceFirstWebFont(const nsString& aFamily, bool aGeneric, ++ void *smuggled) ++{ ++ smugglerStruct *sm = static_cast<smugglerStruct*>(smuggled); ++ ++ if (aGeneric) { ++ return true; ++ } ++ ++ if (sm->userFonts->HasFamily(aFamily)) { ++ // Force use of this exact @font-face font since we have it. ++ sm->font->mFont.name = aFamily; ++ ++ return false; // Stop enumeration. ++ } ++ ++ return true; ++} ++ + const void* + nsRuleNode::ComputeFontData(void* aStartStruct, + const nsRuleData* aRuleData, +@@ -3439,14 +3466,16 @@ nsRuleNode::ComputeFontData(void* aStartStruct, bool useDocumentFonts = mPresContext->GetCachedBoolPref(kPresContext_UseDocumentFonts); + bool isXUL = PR_FALSE; ++ bool forcedWebFont = false; // See if we are in the chrome // We only need to know this to determine if we have to use the @@ -230,11 +276,26 @@ index 64504fb..33ce21e 100644 } // Figure out if we are a generic font -@@ -3460,9 +3462,13 @@ nsRuleNode::ComputeFontData(void* aStartStruct, +@@ -3460,9 +3489,28 @@ nsRuleNode::ComputeFontData(void* aStartStruct, // generic? nsFont::GetGenericID(font->mFont.name, &generic); -+ mPresContext->AddFontAttempt(font->mFont); ++ if (!isXUL) { ++ gfxUserFontSet *userFonts = mPresContext->GetUserFontSet(); ++ if (userFonts) { ++ smugglerStruct sm; ++ sm.userFonts = userFonts; ++ sm.font = font; ++ ++ if (!sm.font->mFont.EnumerateFamilies(ForceFirstWebFont, &sm)) { ++ isXUL = true; // Always allow WebFont use. ++ forcedWebFont = true; ++ } ++ } ++ } ++ ++ if (!forcedWebFont && generic == kGenericFont_NONE) ++ mPresContext->AddFontAttempt(font->mFont); + // If we aren't allowed to use document fonts, then we are only entitled // to use the user's default variable-width font and fixed-width font @@ -245,11 +306,11 @@ index 64504fb..33ce21e 100644 // Extract the generic from the specified font family... nsAutoString genericName; if (!font->mFont.EnumerateFamilies(ExtractGeneric, &genericName)) { -@@ -3498,6 +3504,8 @@ nsRuleNode::ComputeFontData(void* aStartStruct, +@@ -3498,6 +3546,8 @@ nsRuleNode::ComputeFontData(void* aStartStruct, font); } -+ if (font->mGenericID == kGenericFont_NONE) ++ if (!forcedWebFont && font->mGenericID == kGenericFont_NONE) + mPresContext->AddFontUse(font->mFont); COMPUTE_END_INHERITED(Font, font) }

1 0

[torbrowser/master] WIN: mkdir the extensions directory before trying to move things into it
by erinn＠torproject.org 19 Feb '13

19 Feb '13

commit fea4369ec207959872a0d866ffa6ab79e886bed0 Author: Erinn Clark <erinn(a)torproject.org> Date: Tue Feb 12 22:09:20 2013 +0100 WIN: mkdir the extensions directory before trying to move things into it --- build-scripts/windows.mk | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/build-scripts/windows.mk b/build-scripts/windows.mk index 793bf36..3695cd9 100644 --- a/build-scripts/windows.mk +++ b/build-scripts/windows.mk @@ -370,6 +370,7 @@ install-extensions: $(filter-out langpack_en-US.xpi,langpack_$(LANGCODE).xpi) ## Make a dummy profile to stop Firefox creating some large files cp -r $(BUNDLE)/FirefoxPortable/App/DefaultData $(DUMMYPROFILE) ifneq ($(LANGCODE), en-US) + mkdir -p $(BUNDLE)/FirefoxPortable/Data/profile/extensions/ mv langpack_$(LANGCODE).xpi $(BUNDLE)/FirefoxPortable/Data/profile/extensions/langpack-$(LANGCODE)(a)firefox.mozilla.org.xpi ## Patch Firefox default home page within language pack LC=$(LANG); \

1 0

[torbrowser/master] remove extraneous pymake build stuff
by erinn＠torproject.org 19 Feb '13

19 Feb '13

commit a3d91bf76c16e0e8e3eb0beff961b6de0d813ba9 Author: Erinn Clark <erinn(a)torproject.org> Date: Tue Feb 12 20:07:29 2013 +0100 remove extraneous pymake build stuff --- build-scripts/versions-alpha.mk | 8 -------- build-scripts/versions.mk | 8 -------- build-scripts/windows.mk | 2 +- 3 files changed, 1 insertions(+), 17 deletions(-) diff --git a/build-scripts/versions-alpha.mk b/build-scripts/versions-alpha.mk index e974167..8e5423f 100644 --- a/build-scripts/versions-alpha.mk +++ b/build-scripts/versions-alpha.mk @@ -83,7 +83,6 @@ LIBEVENT_DIR=$(BUILD_DIR)/libevent-$(LIBEVENT_VER) TOR_DIR=$(BUILD_DIR)/tor-$(TOR_VER) FIREFOX_DIR=$(BUILD_DIR)/firefox-$(FIREFOX_VER) MOZBUILD_DIR=$(BUILD_DIR)/mozilla-build -PYMAKE_DIR=$(FIREFOX_DIR)/build/pymake OBFSPROXY_DIR=$(BUILD_DIR)/obfsproxy-$(OBFSPROXY_VER) # Empty targets are written in arch-dependent $(BUILD_DIR). Usual @@ -139,9 +138,6 @@ $(FETCH_DIR)/$(FIREFOX_PACKAGE): | $(FETCH_DIR) $(FETCH_DIR)/$(MOZBUILD_PACKAGE): | $(FETCH_DIR) $(WGET) --no-check-certificate --directory-prefix=$(FETCH_DIR) $(MOZBUILD_URL) -$(FETCH_DIR)/$(PYMAKE_PACKAGE): | $(FETCH_DIR) - $(WGET) --no-check-certificate --directory-prefix=$(FETCH_DIR) $(PYMAKE_URL) - torbutton.xpi: $(WGET) --no-check-certificate -O $@ $(TORBUTTON_URL) @@ -217,10 +213,6 @@ $(MOZBUILD_DIR): $(FETCH_DIR)/$(MOZBUILD_PACKAGE) ../src/current-patches/mozilla cp patch-mozilla-build.sh $(MOZBUILD_DIR) cd $(MOZBUILD_DIR) && ./patch-mozilla-build.sh $(MSVC_VER) -$(PYMAKE_DIR): $(FETCH_DIR)/$(PYMAKE_PACKAGE) | $(BUILD_DIR) - rm -rf $(PYMAKE_DIR) - cd $(FETCH_DIR) && tar -xmf $(PYMAKE_PACKAGE) -C $(BUILD_DIR)/ - $(OBFSPROXY_DIR): $(FETCH_DIR)/$(OBFSPROXY_PACKAGE) | $(BUILD_DIR) rm -rf $(OBFSPROXY_DIR) cd $(FETCH_DIR) && tar -xmf $(OBFSPROXY_PACKAGE) -C $(BUILD_DIR)/ diff --git a/build-scripts/versions.mk b/build-scripts/versions.mk index 080696b..ff646e1 100644 --- a/build-scripts/versions.mk +++ b/build-scripts/versions.mk @@ -80,7 +80,6 @@ LIBEVENT_DIR=$(BUILD_DIR)/libevent-$(LIBEVENT_VER) TOR_DIR=$(BUILD_DIR)/tor-$(TOR_VER) FIREFOX_DIR=$(BUILD_DIR)/firefox-$(FIREFOX_VER) MOZBUILD_DIR=$(BUILD_DIR)/mozilla-build -PYMAKE_DIR=$(FIREFOX_DIR)/build/pymake OBFSPROXY_DIR=$(BUILD_DIR)/obfsproxy-$(OBFSPROXY_VER) # Empty targets are written in arch-dependent $(BUILD_DIR). Usual @@ -136,9 +135,6 @@ $(FETCH_DIR)/$(FIREFOX_PACKAGE): | $(FETCH_DIR) $(FETCH_DIR)/$(MOZBUILD_PACKAGE): | $(FETCH_DIR) $(WGET) --no-check-certificate --directory-prefix=$(FETCH_DIR) $(MOZBUILD_URL) -$(FETCH_DIR)/$(PYMAKE_PACKAGE): | $(FETCH_DIR) - $(WGET) --no-check-certificate --directory-prefix=$(FETCH_DIR) $(PYMAKE_URL) - torbutton.xpi: $(WGET) --no-check-certificate -O $@ $(TORBUTTON_URL) @@ -211,10 +207,6 @@ $(MOZBUILD_DIR): $(FETCH_DIR)/$(MOZBUILD_PACKAGE) ../src/current-patches/mozilla cp patch-mozilla-build.sh $(MOZBUILD_DIR) cd $(MOZBUILD_DIR) && ./patch-mozilla-build.sh $(MSVC_VER) -$(PYMAKE_DIR): $(FETCH_DIR)/$(PYMAKE_PACKAGE) | $(BUILD_DIR) - rm -rf $(PYMAKE_DIR) - cd $(FETCH_DIR) && tar -xmf $(PYMAKE_PACKAGE) -C $(BUILD_DIR)/ - $(OBFSPROXY_DIR): $(FETCH_DIR)/$(OBFSPROXY_PACKAGE) | $(BUILD_DIR) rm -rf $(OBFSPROXY_DIR) cd $(FETCH_DIR) && tar -xmf $(OBFSPROXY_PACKAGE) -C $(BUILD_DIR)/ diff --git a/build-scripts/windows.mk b/build-scripts/windows.mk index c341ff4..793bf36 100644 --- a/build-scripts/windows.mk +++ b/build-scripts/windows.mk @@ -100,7 +100,7 @@ TOR_LDFLAGS="-L$(BUILT_DIR)/lib -L$(BUILT_DIR)/bin" TOR_OPTS=--enable-static-libevent --with-libevent-dir=$(BUILT_DIR)/lib --disable-asciidoc build-tor:PATH+=:$(BUILT_DIR)/bin -build-firefox: $(FIREFOX_DIR) config/dot_mozconfig $(MOZBUILD_DIR) $(MOZBUILD_DIR)/start-msvc$(MSVC_VER).bat | $(PYTHON) $(PYMAKE_DIR) +build-firefox: $(FIREFOX_DIR) config/dot_mozconfig $(MOZBUILD_DIR) cp config/dot_mozconfig $(FIREFOX_DIR)/mozconfig cp branding/* $(FIREFOX_DIR)/browser/branding/official cd $(MOZBUILD_DIR) && cmd.exe /c "start-msvc$(MSVC_VER).bat $(FIREFOX_DIR) $(PYTHON) $(PYMAKE)"

1 0

[torbrowser/master] Bump Torbutton version to 1.5.0.
by erinn＠torproject.org 19 Feb '13

19 Feb '13

commit 3bf11130c5054c75af29849db81433ca402f0e7c Author: Mike Perry <mikeperry-git(a)fscked.org> Date: Tue Feb 19 00:07:14 2013 -0800 Bump Torbutton version to 1.5.0. --- build-scripts/versions-alpha.mk | 2 +- build-scripts/versions.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/build-scripts/versions-alpha.mk b/build-scripts/versions-alpha.mk index a2b58ec..8d0fb62 100644 --- a/build-scripts/versions-alpha.mk +++ b/build-scripts/versions-alpha.mk @@ -12,7 +12,7 @@ TOR_VER=0.2.4.10-alpha PIDGIN_VER=2.6.4 FIREFOX_VER=17.0.2esr MOZBUILD_VER=1.5.1 -TORBUTTON_VER=1.5.0pre7-alpha +TORBUTTON_VER=1.5.0 NOSCRIPT_VER=2.6.4.4 HTTPSEVERYWHERE_VER=4.0development.5 PDFJS_VER=0.7.1 diff --git a/build-scripts/versions.mk b/build-scripts/versions.mk index 4f9eafb..a9d61f8 100644 --- a/build-scripts/versions.mk +++ b/build-scripts/versions.mk @@ -12,7 +12,7 @@ TOR_VER=0.2.3.25 PIDGIN_VER=2.6.4 FIREFOX_VER=17.0.2esr MOZBUILD_VER=1.5.1 -TORBUTTON_VER=1.5.0pre7-alpha +TORBUTTON_VER=1.5.0 NOSCRIPT_VER=2.6.4.4 HTTPSEVERYWHERE_VER=3.1.3 OTR_VER=3.2.0

1 0

[torbrowser/master] Fix Windows properties updates (homepage and omnibox).
by erinn＠torproject.org 19 Feb '13

19 Feb '13

commit c35584acd82c0ed59a5f6cc4e8162b5a8fa0b3e7 Author: Mike Perry <mikeperry-git(a)fscked.org> Date: Wed Feb 13 01:01:40 2013 -0800 Fix Windows properties updates (homepage and omnibox). --- build-scripts/windows-alpha.mk | 2 +- build-scripts/windows.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/build-scripts/windows-alpha.mk b/build-scripts/windows-alpha.mk index 659333a..8d68ab0 100644 --- a/build-scripts/windows-alpha.mk +++ b/build-scripts/windows-alpha.mk @@ -416,7 +416,7 @@ install-extensions: $(filter-out langpack_en-US.xpi,langpack_$(LANGCODE).xpi) ifneq ($(LANGCODE), en-US) mv langpack_$(LANGCODE).xpi $(BUNDLE)/FirefoxPortable/Data/profile/extensions/langpack-$(LANGCODE)(a)firefox.mozilla.org.xpi ## Patch Firefox default home page within language pack - LC=$(LANG); \ + LC=$(LANGCODE); \ PFILE=langpack-$(LANGCODE)(a)firefox.mozilla.org.xpi; \ FFDIR=$(BUNDLE)/FirefoxPortable/Data/profile/extensions/; \ CHROMEDIR="$$FFDIR/chrome/"; \ diff --git a/build-scripts/windows.mk b/build-scripts/windows.mk index 3695cd9..8146693 100644 --- a/build-scripts/windows.mk +++ b/build-scripts/windows.mk @@ -373,7 +373,7 @@ ifneq ($(LANGCODE), en-US) mkdir -p $(BUNDLE)/FirefoxPortable/Data/profile/extensions/ mv langpack_$(LANGCODE).xpi $(BUNDLE)/FirefoxPortable/Data/profile/extensions/langpack-$(LANGCODE)(a)firefox.mozilla.org.xpi ## Patch Firefox default home page within language pack - LC=$(LANG); \ + LC=$(LANGCODE); \ PFILE=langpack-$(LANGCODE)(a)firefox.mozilla.org.xpi; \ FFDIR=$(BUNDLE)/FirefoxPortable/Data/profile/extensions/; \ CHROMEDIR="$$FFDIR/chrome/"; \

1 0