- tor-commits - lists.torproject.org

[torbrowser/master] update build targets for firefox and torbutton on windows
by erinn＠torproject.org 24 Oct '11

24 Oct '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/master] give linux the ability to have internationalized firefox too
by erinn＠torproject.org 24 Oct '11

24 Oct '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

[torbrowser/master] change linux package name to use -dev not -alpha
by erinn＠torproject.org 24 Oct '11

24 Oct '11

commit 2fd5e9a60ef4cdf0df97c7c44992cfbc4f6ff0c5 Author: Erinn Clark <erinn(a)torproject.org> Date: Wed Aug 31 20:51:25 2011 +0100 change linux package name to use -dev not -alpha --- build-scripts/linux.mk | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/build-scripts/linux.mk b/build-scripts/linux.mk index 2b329b0..60dce48 100644 --- a/build-scripts/linux.mk +++ b/build-scripts/linux.mk @@ -168,7 +168,7 @@ NAME=tor-browser DISTDIR=tbbl-alpha-dist ## Version and name of the compressed bundle (also used for source) -VERSION=$(RELEASE_VER)-$(BUILD_NUM)-alpha +VERSION=$(RELEASE_VER)-$(BUILD_NUM)-dev DEFAULT_COMPRESSED_BASENAME=tor-browser-gnu-linux-$(ARCH_TYPE)-$(VERSION)- IM_COMPRESSED_BASENAME=tor-im-browser-gnu-linux-$(VERSION)- DEFAULT_COMPRESSED_NAME=$(DEFAULT_COMPRESSED_BASENAME)$(VERSION)

1 0

[torbrowser/master] bump versions in readmes
by erinn＠torproject.org 24 Oct '11

24 Oct '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/master] update all changelogs
by erinn＠torproject.org 24 Oct '11

24 Oct '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/master] bump windows version to 2.2.32-2
by erinn＠torproject.org 24 Oct '11

24 Oct '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/master] rename osx bundles from -alpha to -dev
by erinn＠torproject.org 24 Oct '11

24 Oct '11

commit da9cf1e9d9f575d1f54fc9e14f845736e9a2efdf Author: Erinn Clark <erinn(a)torproject.org> Date: Wed Aug 31 21:35:53 2011 +0100 rename osx bundles from -alpha to -dev --- build-scripts/osx.mk | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/build-scripts/osx.mk b/build-scripts/osx.mk index 816dd24..bdef4dc 100644 --- a/build-scripts/osx.mk +++ b/build-scripts/osx.mk @@ -157,7 +157,7 @@ NAME=TorBrowser DISTDIR=tbbosx-alpha-dist ## Version and name of the compressed bundle (also used for source) -VERSION=$(RELEASE_VER)-$(BUILD_NUM)-alpha +VERSION=$(RELEASE_VER)-$(BUILD_NUM)-dev DEFAULT_COMPRESSED_BASENAME=TorBrowser-$(VERSION)-osx-$(ARCH_TYPE)- IM_COMPRESSED_BASENAME=TorBrowser-IM-$(VERSION)- DEFAULT_COMPRESSED_NAME=$(DEFAULT_COMPRESSED_BASENAME)

1 0

[torbrowser/master] remove -alpha from windows filename and add the right branch for srcdist
by erinn＠torproject.org 24 Oct '11

24 Oct '11

commit b3452f96ff6a45d329fd55d11406e5d5b7cce29a Author: Erinn Clark <erinn(a)torproject.org> Date: Thu Sep 1 04:32:46 2011 +0100 remove -alpha from windows filename and add the right branch for srcdist --- build-scripts/windows.mk | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/build-scripts/windows.mk b/build-scripts/windows.mk index d4d4665..72909dd 100644 --- a/build-scripts/windows.mk +++ b/build-scripts/windows.mk @@ -145,7 +145,7 @@ NAME="Tor Browser" DISTDIR=tbbwin-alpha-dist ## Version and name of the compressed bundle (also used for source) -VERSION=$(RELEASE_VER)-$(BUILD_NUM)-alpha +VERSION=$(RELEASE_VER)-$(BUILD_NUM) DEFAULT_COMPRESSED_BASENAME=tor-browser-$(VERSION) IM_COMPRESSED_BASENAME=tor-im-browser-$(VERSION) DEFAULT_COMPRESSED_NAME=$(DEFAULT_COMPRESSED_BASENAME) @@ -471,7 +471,7 @@ SRCDEST=/tmp SRCDESTPATH=$(SRCDEST)/$(SRCNAME) srcdist: rm -fr $(SRCDESTPATH) - git clone git://git.torproject.org/torbrowser.git \ + git clone -b maint-2.2 git://git.torproject.org/torbrowser.git \ $(SRCDESTPATH) cd $(SRCDEST); tar --exclude src/archived-patches \ --exclude src/current-patches --exclude src/processtest \

1 0

[torbrowser/master] remove unnecessary sed from linux makefile
by erinn＠torproject.org 24 Oct '11

24 Oct '11

commit fb0ff547d07a40d7121e4360d26efb9640cff301 Author: Erinn Clark <erinn(a)torproject.org> Date: Thu Sep 1 04:28:54 2011 +0100 remove unnecessary sed from linux makefile --- build-scripts/linux.mk | 2 -- 1 files changed, 0 insertions(+), 2 deletions(-) diff --git a/build-scripts/linux.mk b/build-scripts/linux.mk index e7eaf94..1df7377 100644 --- a/build-scripts/linux.mk +++ b/build-scripts/linux.mk @@ -465,8 +465,6 @@ 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) \ - 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

1 0

[torbrowser/master] [2525 Linux] Make RelativeLink.sh work when run using a relative symlink
by erinn＠torproject.org 24 Oct '11

24 Oct '11

commit c9742f2ed77b02d8240d66dc1d4660891386eb11 Author: Robert Ransom <rransom.8774(a)gmail.com> Date: Fri Sep 2 03:25:11 2011 -0400 [2525 Linux] Make RelativeLink.sh work when run using a relative symlink --- src/RelativeLink/RelativeLink.sh | 31 +++++++++++++++++++++++-------- 1 files changed, 23 insertions(+), 8 deletions(-) diff --git a/src/RelativeLink/RelativeLink.sh b/src/RelativeLink/RelativeLink.sh index 579612c..222bb6d 100755 --- a/src/RelativeLink/RelativeLink.sh +++ b/src/RelativeLink/RelativeLink.sh @@ -133,17 +133,32 @@ fi # If this script is being run through a symlink, we need to know where # in the filesystem the script itself is, not where the symlink is. myname="$0" -while [ -L "$myname" ]; do +if [ -L "$myname" ]; then # XXX readlink is not POSIX, but is present in GNU coreutils # and on FreeBSD. Unfortunately, the -f option (which follows # a whole chain of symlinks until it reaches a non-symlink - # path name) is a GNUism, so we can't safely use it. (Using - # it would be rude to FreeBSD users who currently have no - # other officially supported choice than TBB for Linux, and - # might even break compatibility with older versions of the - # GNU utility.) - myname="`readlink -n "$myname"`" -done + # path name) is a GNUism, so we have to have a fallback for + # FreeBSD. Fortunately, FreeBSD has realpath instead; + # unfortunately, that's also non-POSIX and is not present in + # GNU coreutils. + # + # If this launcher were a C program, we could just use the + # realpath function, which *is* POSIX. Too bad POSIX didn't + # make that function accessible to shell scripts. + + # If realpath is available, use it; it Does The Right Thing. + possibly_my_real_name="`realpath "$myname" 2>/dev/null`" + if [ "$?" -eq 0 ]; then + myname="$possibly_my_real_name" + else + # realpath is not available; hopefully readlink -f works. + myname="`readlink -f "$myname" 2>/dev/null`" + if [ "$?" -ne 0 ]; then + # Ugh. + complain "start-tor-browser cannot be run using a symlink on this operating system." + fi + fi +fi # Try to be agnostic to where we're being started from, chdir to where # the script is.

1 0