- tor-commits - lists.torproject.org

[torbrowser/maint-2.2] bump versions in readmes
by erinn＠torproject.org 31 Aug '11

31 Aug '11

commit 698e441c6a91c54c5276c2f33988a727066c20f5 Author: Erinn Clark <erinn(a)torproject.org> Date: Wed Aug 31 20:33:47 2011 +0100 bump versions in readmes --- README.LINUX-2.2 | 4 ++-- README.OSX-2.2 | 4 ++-- README.WIN-2.2 | 6 +++--- build-scripts/linux.mk | 2 +- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/README.LINUX-2.2 b/README.LINUX-2.2 index 176ee30..e4ac63e 100644 --- a/README.LINUX-2.2 +++ b/README.LINUX-2.2 @@ -5,8 +5,8 @@ Included applications --------------------- Vidalia 0.2.14 (with Qt 4.6.2) -Tor 0.2.2.32 (with libevent-2.0.13-stable, zlib-1.2.5 and openssl-1.0.0d) -Firefox (Aurora) 6.0 +Tor 0.2.2.32 (with libevent-2.0.14-stable, zlib-1.2.5 and openssl-1.0.0d) +Firefox (Aurora) 6.0.1 \_ Torbutton 1.4.1 |_ NoScript 2.1.2.6 |_ HTTPS-Everywhere 1.0.0development.5 diff --git a/README.OSX-2.2 b/README.OSX-2.2 index de6e27c..185d11c 100644 --- a/README.OSX-2.2 +++ b/README.OSX-2.2 @@ -5,8 +5,8 @@ Included applications --------------------- Vidalia 0.2.14 (with Qt 4.6.2) -Tor 0.2.2.32 (with libevent-2.0.13-stable, zlib-1.2.5 and openssl-1.0.0d) -Firefox (Aurora) 6.0 +Tor 0.2.2.32 (with libevent-2.0.14-stable, zlib-1.2.5 and openssl-1.0.0d) +Firefox (Aurora) 6.0.1 \_ Torbutton 1.4.1 |_ NoScript 2.1.2.6 |_ HTTPS-Everywhere 1.0.0development.5 diff --git a/README.WIN-2.2 b/README.WIN-2.2 index 5ab55a0..723df9a 100644 --- a/README.WIN-2.2 +++ b/README.WIN-2.2 @@ -5,9 +5,9 @@ Included applications --------------------- Vidalia 0.2.14 (with Qt 4.6.2) -Tor 0.2.2.32 (with libevent-2.0.13-stable, zlib-1.2.5 and openssl-1.0.0d) -FirefoxPortable 6.0 - \_ Firefox (Aurora) 6.0 +Tor 0.2.2.32 (with libevent-2.0.14-stable, zlib-1.2.5 and openssl-1.0.0d) +FirefoxPortable 6.0.1 + \_ Firefox (Aurora) 6.0.1 \_ Torbutton 1.4.1 |_ NoScript 2.1.2.6 |_ HTTPS-Everywhere 1.0.0development.5 diff --git a/build-scripts/linux.mk b/build-scripts/linux.mk index b32b258..616fe6a 100644 --- a/build-scripts/linux.mk +++ b/build-scripts/linux.mk @@ -36,7 +36,7 @@ include $(PWD)/versions.mk ## Architecture ARCH_TYPE=$(shell uname -m) -BUILD_NUM=1 +BUILD_NUM=2 PLATFORM=Linux ## Location of directory for source unpacking

1 0

[torbrowser/maint-2.2] update all changelogs
by erinn＠torproject.org 31 Aug '11

31 Aug '11

commit 44d5ccafed3560985332d448c905f349f813d77d Author: Erinn Clark <erinn(a)torproject.org> Date: Wed Aug 31 20:35:29 2011 +0100 update all changelogs --- changelog.linux-2.2 | 14 ++++++++++++++ changelog.osx-2.2 | 16 ++++++++++++++++ changelog.win-2.2 | 2 +- 3 files changed, 31 insertions(+), 1 deletions(-) diff --git a/changelog.linux-2.2 b/changelog.linux-2.2 index 6d49e4a..020c116 100644 --- a/changelog.linux-2.2 +++ b/changelog.linux-2.2 @@ -1,3 +1,17 @@ +Tor Browser Bundle (2.2.32-2) alpha; suite=linux + + * Update Firefox to 6.0.1, with an additional patch to exclude DigiNotar completely + - https://gitweb.torproject.org/torbrowser.git/commit/0be3b043afa0e54d207f603… + For the full saga, read: + - http://blog.mozilla.com/security/2011/08/29/fraudulent-google-com-certifica… + - http://googleonlinesecurity.blogspot.com/2011/08/update-on-attempted-man-in… + * Update Libevent to 2.0.14-stable + * Update torbrowser.version string in prefs.js to have more information (see #3504) + * Enable internationalized bundles by adding and changing the + general.useragent.locale pref in prefs.js + + -- Erinn Clark <erinn(a)torproject.org> Wed Aug 31 17:43:09 BST 2011 + Tor Browser Bundle (2.2.32-1) alpha; suite=linux * Update Tor to 0.2.2.32 diff --git a/changelog.osx-2.2 b/changelog.osx-2.2 index 2b9edcb..9326450 100644 --- a/changelog.osx-2.2 +++ b/changelog.osx-2.2 @@ -1,3 +1,19 @@ +Tor Browser Bundle (2.2.32-2) alpha; suite=osx + + * Update Firefox to 6.0.1, with an additional patch to exclude DigiNotar completely + - https://gitweb.torproject.org/torbrowser.git/commit/0be3b043afa0e54d207f603… + For the full saga, read: + - http://blog.mozilla.com/security/2011/08/29/fraudulent-google-com-certifica… + - http://googleonlinesecurity.blogspot.com/2011/08/update-on-attempted-man-in… + * Update Libevent to 2.0.14-stable + * Rebuild 32-bit binaries with backwards compatibility options so TBB works + on OSX 10.5 (closes: #3671) + * Update torbrowser.version string in prefs.js to have more information (see #3504) + * Enable internationalized bundles by adding and changing the + general.useragent.locale pref in prefs.js + + -- Erinn Clark <erinn(a)torproject.org> Wed Aug 31 17:43:09 BST 2011 + Tor Browser Bundle (2.2.32-1) alpha; suite=osx * Update Tor to 0.2.2.32 diff --git a/changelog.win-2.2 b/changelog.win-2.2 index 2436006..abfbef2 100644 --- a/changelog.win-2.2 +++ b/changelog.win-2.2 @@ -1,4 +1,4 @@ -Tor Browser Bundle (2.2.32-2) alpha; suite=osx +Tor Browser Bundle (2.2.32-2) alpha; suite=windows * Update Firefox to 6.0.1, with an additional patch to exclude DigiNotar completely - https://gitweb.torproject.org/torbrowser.git/commit/0be3b043afa0e54d207f603…

1 0

[torbrowser/maint-2.2] give linux the ability to have internationalized firefox too
by erinn＠torproject.org 31 Aug '11

31 Aug '11

commit c4b20e92d7253d450ff70ec28861a786aa7bdb7f Author: Erinn Clark <erinn(a)torproject.org> Date: Wed Aug 31 20:35:48 2011 +0100 give linux the ability to have internationalized firefox too --- build-scripts/linux.mk | 11 ++++++----- 1 files changed, 6 insertions(+), 5 deletions(-) diff --git a/build-scripts/linux.mk b/build-scripts/linux.mk index 616fe6a..2b329b0 100644 --- a/build-scripts/linux.mk +++ b/build-scripts/linux.mk @@ -112,7 +112,7 @@ build-pidgin: FIREFOX_DIR=$(FETCH_DIR)/mozilla-release build-firefox: - cp ../src/current-patches/*Firefox* $(FIREFOX_DIR) + cp ../src/current-patches/000* $(FIREFOX_DIR) cp patch-firefox-src.sh $(FIREFOX_DIR) cp $(CONFIG_SRC)/dot_mozconfig $(FIREFOX_DIR)/mozconfig cd $(FIREFOX_DIR) && ./patch-firefox-src.sh @@ -434,9 +434,8 @@ install-betterprivacy: betterprivacy.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/langpack-$(LANGCODE)(a)firefox.mozilla.org - cp langpack_$(LANGCODE).xpi $(BUNDLE)/Data/profile/extensions/langpack-$(LANGCODE)(a)firefox.mozilla.org/langpack_$(LANGCODE).zip - (cd $(BUNDLE)/Data/profile/extensions/langpack-$(LANGCODE)(a)firefox.mozilla.org && unzip *.zip && rm *.zip) + mkdir -p $(BUNDLE)/Data/profile/extensions + cp langpack_$(LANGCODE).xpi $(BUNDLE)/Data/profile/extensions/langpack-$(LANGCODE)(a)firefox.mozilla.org.xpi endif ## Set the language for Vidalia @@ -466,8 +465,10 @@ patch-firefox-language: ## Fix prefs.js since extensions.checkCompatibility, false doesn't work update-extension-pref: - ext_ver=$$(sed -n '/em:version/{s,.*="$.*$".*,\1,p;q}' $(BUNDLE)/Data/profile/extensions/langpack-$(LANGCODE)(a)firefox.mozilla.org/install.rdf) \ + #ext_ver=$$(sed -n '/em:version/{s,.*="$.*$".*,\1,p;q}' $(BUNDLE)/Data/profile/extensions/langpack-$(LANGCODE)(a)firefox.mozilla.org/install.rdf) \ sed -i -e "s/SHPONKA/langpack-$(LANGCODE)@firefox.mozilla.org:$$ext_ver/g" $(BUNDLE)/Data/profile/prefs.js + 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 write-tbb-version: printf 'user_pref("torbrowser.version", "%s");\n' "$(RELEASE_VER)-$(BUILD_NUM)-$(PLATFORM)-$(ARCH_TYPE)" >> $(BUNDLE)/App/Firefox/defaults/profile/prefs.js

1 0

r25000: {website} update vidalia bundle version so users can have their libgnu (website/trunk/include)
by Erinn Clark 31 Aug '11

31 Aug '11

Author: erinn Date: 2011-08-31 19:06:55 +0000 (Wed, 31 Aug 2011) New Revision: 25000 Modified: website/trunk/include/versions.wmi Log: update vidalia bundle version so users can have their libgnurx dll Modified: website/trunk/include/versions.wmi =================================================================== --- website/trunk/include/versions.wmi 2011-08-31 14:15:01 UTC (rev 24999) +++ website/trunk/include/versions.wmi 2011-08-31 19:06:55 UTC (rev 25000) @@ -62,7 +62,7 @@ <define-tag package-win32-stable whitespace=delete>/dist/win32/tor-<version-win32-stable>-win32.exe</define-tag> <define-tag package-win32-alpha whitespace=delete>/dist/win32/tor-<version-win32-alpha>-win32.exe</define-tag> -<define-tag file-win32-bundle-stable whitespace=delete>vidalia-bundle-<version-win32-bundle-stable>-0.2.14.exe</define-tag> +<define-tag file-win32-bundle-stable whitespace=delete>vidalia-bundle-<version-win32-bundle-stable>-0.2.14-1.exe</define-tag> <define-tag package-win32-bundle-stable whitespace=delete>/dist/vidalia-bundles/<file-win32-bundle-stable></define-tag> <define-tag file-win32-bundle-alpha whitespace=delete>vidalia-bundle-<version-win32-bundle-alpha>-0.2.14.exe</define-tag> <define-tag package-win32-bundle-alpha whitespace=delete>/dist/vidalia-bundles/<file-win32-bundle-alpha></define-tag>

1 0

[torbrowser/maint-2.2] add split bundles to the windows makefile
by erinn＠torproject.org 31 Aug '11

31 Aug '11

commit 0c82f6463f4a7e2d9325500840bc250597f09d6b Author: Erinn Clark <erinn(a)torproject.org> Date: Wed Aug 31 18:42:15 2011 +0100 add split bundles to the windows makefile --- build-scripts/windows.mk | 15 ++++++++++++++- 1 files changed, 14 insertions(+), 1 deletions(-) diff --git a/build-scripts/windows.mk b/build-scripts/windows.mk index cdaf403..d4d4665 100644 --- a/build-scripts/windows.mk +++ b/build-scripts/windows.mk @@ -190,7 +190,7 @@ all-bundles-both: USE_PIDGIN=0 make -f windows.mk all-bundles make -f windows.mk clean -all-bundles: all-compressed-bundles +all-bundles: all-compressed-bundles all-split-bundles all-compressed-bundles: compressed-bundle_ar \ compressed-bundle_de \ @@ -205,6 +205,19 @@ all-compressed-bundles: compressed-bundle_ar \ compressed-bundle_zh-CN \ compressed-bundle_it +all-split-bundles: split-bundle_ar \ + split-bundle_de \ + split-bundle_en-US \ + split-bundle_es-ES \ + split-bundle_fa \ + split-bundle_fr \ + split-bundle_nl \ + split-bundle_pl \ + split-bundle_pt-PT \ + split-bundle_ru \ + split-bundle_zh-CN \ + split-bundle_it + ## ## Cleanup ##

1 0

[torbrowser/maint-2.2] bump windows version to 2.2.32-2
by erinn＠torproject.org 31 Aug '11

31 Aug '11

commit ced0a8b6b68f9d8047ecc4004d99f24b405823de Author: Erinn Clark <erinn(a)torproject.org> Date: Wed Aug 31 18:28:46 2011 +0100 bump windows version to 2.2.32-2 --- changelog.win-2.2 | 14 ++++++++++++++ 1 files changed, 14 insertions(+), 0 deletions(-) diff --git a/changelog.win-2.2 b/changelog.win-2.2 index 96eae99..2436006 100644 --- a/changelog.win-2.2 +++ b/changelog.win-2.2 @@ -1,3 +1,17 @@ +Tor Browser Bundle (2.2.32-2) alpha; suite=osx + + * Update Firefox to 6.0.1, with an additional patch to exclude DigiNotar completely + - https://gitweb.torproject.org/torbrowser.git/commit/0be3b043afa0e54d207f603… + For the full saga, read: + - http://blog.mozilla.com/security/2011/08/29/fraudulent-google-com-certifica… + - http://googleonlinesecurity.blogspot.com/2011/08/update-on-attempted-man-in… + * Update Libevent to 2.0.14-stable + * Update torbrowser.version string in prefs.js to have more information (see #3504) + * Enable internationalized bundles by adding and changing the + general.useragent.locale pref in prefs.js + + -- Erinn Clark <erinn(a)torproject.org> Wed Aug 31 17:43:09 BST 2011 + Tor Browser Bundle (2.2.32-1) alpha; suite=windows * Update Tor to 0.2.2.32

1 0

[torbrowser/maint-2.2] bump libevent and firefox versions
by erinn＠torproject.org 31 Aug '11

31 Aug '11

commit e66f7de37e74b84040162e23ba69d02f3632da3b Author: Erinn Clark <erinn(a)torproject.org> Date: Wed Aug 31 18:19:39 2011 +0100 bump libevent and firefox versions --- build-scripts/osx.mk | 2 +- build-scripts/versions.mk | 4 ++-- build-scripts/windows.mk | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/build-scripts/osx.mk b/build-scripts/osx.mk index e54f5bb..816dd24 100644 --- a/build-scripts/osx.mk +++ b/build-scripts/osx.mk @@ -36,7 +36,7 @@ include $(PWD)/versions.mk ## Architecture ARCH_TYPE=i386 -BUILD_NUM=1 +BUILD_NUM=2 PLATFORM=MacOS ## Location of directory for source unpacking diff --git a/build-scripts/versions.mk b/build-scripts/versions.mk index d3fa14b..60ee138 100644 --- a/build-scripts/versions.mk +++ b/build-scripts/versions.mk @@ -3,8 +3,8 @@ RELEASE_VER=2.2.32 HTTPSEVERY_VER=1.0.0development.5 -FIREFOX_VER=6.0 -LIBEVENT_VER=2.0.13-stable +FIREFOX_VER=6.0.1 +LIBEVENT_VER=2.0.14-stable LIBPNG_VER=1.4.3 NOSCRIPT_VER=2.1.2.6 OPENSSL_VER=1.0.0d diff --git a/build-scripts/windows.mk b/build-scripts/windows.mk index cd39c0b..3bc3c2e 100644 --- a/build-scripts/windows.mk +++ b/build-scripts/windows.mk @@ -31,7 +31,7 @@ ## Include versions include $(PWD)/versions.mk -BUILD_NUM=1 +BUILD_NUM=2 PLATFORM=Windows ## Location of required libraries

1 0

[torbrowser/maint-2.2] update libevent url
by erinn＠torproject.org 31 Aug '11

31 Aug '11

commit fbf4dc8d5a6f239db60074ca05ee705d115ebffd Author: Erinn Clark <erinn(a)torproject.org> Date: Wed Aug 31 18:20:07 2011 +0100 update libevent url --- build-scripts/versions.mk | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/build-scripts/versions.mk b/build-scripts/versions.mk index 60ee138..666b28a 100644 --- a/build-scripts/versions.mk +++ b/build-scripts/versions.mk @@ -35,7 +35,7 @@ ZLIB_URL=http://www.zlib.net/$(ZLIB_PACKAGE) OPENSSL_URL=http://www.openssl.org/source/$(OPENSSL_PACKAGE) QT_URL=ftp://ftp.qt.nokia.com/qt/source/$(QT_PACKAGE) VIDALIA_URL=http://www.torproject.org/dist/vidalia/$(VIDALIA_PACKAGE) -LIBEVENT_URL=http://archive.torproject.org/tor-package-archive/libevent/$(LIBEVENT_PACKAGE) +LIBEVENT_URL=https://github.com/downloads/libevent/libevent/$(LIBEVENT_PACKAGE) TOR_URL=http://www.torproject.org/dist/$(TOR_PACKAGE) PIDGIN_URL=http://sourceforge.net/projects/pidgin/files/Pidgin/$(PIDGIN_PAC… FIREFOX_URL=http://releases.mozilla.org/pub/mozilla.org/firefox/releases/$(…

1 0

[torbrowser/maint-2.2] update build targets for firefox and torbutton on windows
by erinn＠torproject.org 31 Aug '11

31 Aug '11

commit d438a95c22723007122bd4a2638790f40d34dd21 Author: Erinn Clark <erinn(a)torproject.org> Date: Wed Aug 31 18:20:25 2011 +0100 update build targets for firefox and torbutton on windows --- build-scripts/windows.mk | 18 +++++++++++------- 1 files changed, 11 insertions(+), 7 deletions(-) diff --git a/build-scripts/windows.mk b/build-scripts/windows.mk index 3bc3c2e..cdaf403 100644 --- a/build-scripts/windows.mk +++ b/build-scripts/windows.mk @@ -106,8 +106,13 @@ build-tor: cd $(TOR_DIR) && make cd $(TOR_DIR) && make install +FIREFOX_DIR=/c/mozilla-build/mozilla-release build-firefox: - echo "We're using a prebuilt firefox. Fix this someday!" + cp ../src/current-patches/000* $(FIREFOX_DIR) + cp patch-firefox-src.sh $(FIREFOX_DIR) + cp $(CONFIG_SRC)/dot_mozconfig $(FIREFOX_DIR)/mozconfig + cd $(FIREFOX_DIR) && ./patch-firefox-src.sh +# cmd /c C:/mozilla-build/start-msvc9 build-all-binaries: build-zlib build-openssl build-vidalia build-libevent build-tor echo "If we're here, we've done something right." @@ -153,7 +158,7 @@ COMPRESSED_NAME=$(DEFAULT_COMPRESSED_NAME) endif ## Extensions to install by default -DEFAULT_EXTENSIONS=torbutton-alpha.xpi +DEFAULT_EXTENSIONS=torbutton.xpi ## Where to download Torbutton from TORBUTTON=https://www.torproject.org/dist/torbutton/torbutton-$(TORBUTTON_V… @@ -327,7 +332,7 @@ launcher: ## ## Torbutton development version -torbutton-alpha.xpi: +torbutton.xpi: $(WGET) -O $@ $(TORBUTTON) ## English comes as default @@ -389,14 +394,13 @@ install-extensions: $(filter-out langpack_en-US.xpi,langpack_$(LANGCODE).xpi) 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.zip - $(SEVENZIP) x -o$(BUNDLE)/FirefoxPortable/Data/profile/extensions/langpack-$(LANGCODE)\(a)firefox.mozilla.org $(BUNDLE)/FirefoxPortable/Data/profile/extensions/langpack-$(LANGCODE)\(a)firefox.mozilla.org.zip + mv langpack_$(LANGCODE).xpi $(BUNDLE)/FirefoxPortable/Data/profile/extensions/langpack-$(LANGCODE)(a)firefox.mozilla.org.xpi endif rm -fr $(DUMMYPROFILE) -install-torbutton: torbutton-alpha.xpi +install-torbutton: torbutton.xpi mkdir -p $(BUNDLE)/FirefoxPortable/Data/profile/extensions/{e0204bd5-9d31-402b-a99d-a6aa8ffebdca} - cp torbutton-alpha.xpi $(BUNDLE)/FirefoxPortable/Data/profile/extensions/{e0204bd5-9d31-402b-a99d-a6aa8ffebdca}/torbutton.zip + 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) install-httpseverywhere: httpseverywhere.xpi

1 0

[torbrowser/maint-2.2] add internationalization support to windows
by erinn＠torproject.org 31 Aug '11

31 Aug '11

commit 4e7420502b7701c49871dfcb25b84780fb3e516f Author: Erinn Clark <erinn(a)torproject.org> Date: Wed Aug 31 18:18:47 2011 +0100 add internationalization support to windows --- build-scripts/config/windows-4.0.js | 1 + build-scripts/osx.mk | 6 +++--- build-scripts/windows.mk | 2 ++ 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/build-scripts/config/windows-4.0.js b/build-scripts/config/windows-4.0.js index a9cbdc8..6330c6f 100644 --- a/build-scripts/config/windows-4.0.js +++ b/build-scripts/config/windows-4.0.js @@ -96,6 +96,7 @@ user_pref("general.buildID.override", "0"); user_pref("general.oscpu.override", "Windows NT 6.1"); user_pref("general.platform.override", "Win32"); user_pref("general.productSub.override", "20100401"); +user_pref("general.useragent.locale", "SHPONKA"); user_pref("general.useragent.override", "Mozilla/5.0 (Windows; U; Windows NT 6.1; en-US; rv:1.9.2.3) Gecko/20100401 Firefox/3.6.3"); user_pref("general.useragent.vendor", ""); user_pref("general.useragent.vendorSub", ""); diff --git a/build-scripts/osx.mk b/build-scripts/osx.mk index fbb1f5e..e54f5bb 100644 --- a/build-scripts/osx.mk +++ b/build-scripts/osx.mk @@ -390,9 +390,8 @@ install-extensions: $(DEFAULT_EXTENSIONS) ## 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)/Library/Application\ Support/Firefox/Profiles/profile/extensions/langpack-$(LANGCODE)(a)firefox.mozilla.org - cp langpack_$(LANGCODE).xpi $(BUNDLE)/Library/Application\ Support/Firefox/Profiles/profile/extensions/langpack-$(LANGCODE)(a)firefox.mozilla.org/langpack_$(LANGCODE).zip - (cd $(BUNDLE)/Library/Application\ Support/Firefox/Profiles/profile/extensions/langpack-$(LANGCODE)(a)firefox.mozilla.org && unzip *.zip && rm *.zip) + 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 endif install-betterprivacy: betterprivacy.xpi @@ -434,6 +433,7 @@ patch-firefox-language: ## 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/Firefox.app/Contents/MacOS/Data/profile/prefs.js 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 diff --git a/build-scripts/windows.mk b/build-scripts/windows.mk index be4d957..cd39c0b 100644 --- a/build-scripts/windows.mk +++ b/build-scripts/windows.mk @@ -433,6 +433,8 @@ 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 ### ### Utilities

1 0