- tor-commits - lists.torproject.org

[torbrowser/master] [Linux] Exit successfully when run with the --help option
by erinn＠torproject.org 24 Oct '11

24 Oct '11

commit 5394b8fca9499711fe0d7c79054a536bfc24c447 Author: Robert Ransom <rransom.8774(a)gmail.com> Date: Fri Aug 26 04:55:19 2011 -0400 [Linux] Exit successfully when run with the --help option (cherry picked from commit 71a997097d59f85d6a02a50e620092f92a684728) --- src/RelativeLink/RelativeLink.sh | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/src/RelativeLink/RelativeLink.sh b/src/RelativeLink/RelativeLink.sh index 04d91fa..248750e 100755 --- a/src/RelativeLink/RelativeLink.sh +++ b/src/RelativeLink/RelativeLink.sh @@ -119,7 +119,7 @@ if [ "$#" -eq 1 -a $ "x$1" = "x--debug" -o "x$1" = "x-debug" $ ]; then printf "\nDebug enabled.\n\n" elif [ "$#" -eq 1 -a $ "x$1" = "x--help" -o "x$1" = "x-help" $ ]; then echo "$usage_message" - exit 1 + exit 0 elif [ "$#" -ne 0 ]; then complain "$usage_message" exit 1

1 0

[torbrowser/master] add missing linux 2.2.31-2 changelog entry
by erinn＠torproject.org 24 Oct '11

24 Oct '11

commit f8f22b1e5b401690a7021a1f7e9618a1a610c1e2 Author: Erinn Clark <erinn(a)torproject.org> Date: Sun Aug 28 17:31:31 2011 +0100 add missing linux 2.2.31-2 changelog entry --- changelog.linux-2.2 | 8 +++++++- 1 files changed, 7 insertions(+), 1 deletions(-) diff --git a/changelog.linux-2.2 b/changelog.linux-2.2 index dfd7fb8..1d29228 100644 --- a/changelog.linux-2.2 +++ b/changelog.linux-2.2 @@ -1,4 +1,10 @@ -Tor Browser Bundle (2.2.30-1) alpha; suite=linux +Tor Browser Bundle (2.2.31-2) alpha; suite=linux + + * Fix x86_64 bundle to have the right libraries and binaries (closes: #3773) + + -- Erinn Clark <erinn(a)torproject.org> Mon Aug 22 23:47:27 CEST 2011 + +Tor Browser Bundle (2.2.31-1) alpha; suite=linux * Update Tor to 0.2.2.31-rc * Update Firefox to 6.0

1 0

[torbrowser/master] [Linux] Start TBB anyway when the launcher script is run with invalid args
by erinn＠torproject.org 24 Oct '11

24 Oct '11

commit e3452cfec82d23f4a28fac5a8d5a4f0de636d623 Author: Robert Ransom <rransom.8774(a)gmail.com> Date: Fri Aug 26 07:07:05 2011 -0400 [Linux] Start TBB anyway when the launcher script is run with invalid args Suggested by velope, because the most likely cause of oddball command-line arguments is that someone dragged-and-dropped one or more files on the start-tor-browser icon using a GUI file manager. (cherry picked from commit fa3a87a1837b30590f20918c41904e264816bd0e) --- src/RelativeLink/RelativeLink.sh | 7 ++++--- 1 files changed, 4 insertions(+), 3 deletions(-) diff --git a/src/RelativeLink/RelativeLink.sh b/src/RelativeLink/RelativeLink.sh index 248750e..1d2f4e3 100755 --- a/src/RelativeLink/RelativeLink.sh +++ b/src/RelativeLink/RelativeLink.sh @@ -120,9 +120,6 @@ if [ "$#" -eq 1 -a $ "x$1" = "x--debug" -o "x$1" = "x-debug" $ ]; then elif [ "$#" -eq 1 -a $ "x$1" = "x--help" -o "x$1" = "x-help" $ ]; then echo "$usage_message" exit 0 -elif [ "$#" -ne 0 ]; then - complain "$usage_message" - exit 1 fi # If XAUTHORITY is unset, set it to its default value of $HOME/.Xauthority @@ -212,6 +209,8 @@ if [ "${debug}" ]; then printf "\nStarting Vidalia now\n" cd "${HOME}" printf "\nLaunching Vidalia from: `pwd`\n" + # XXX Someday we should pass whatever command-line arguments we got + # (probably filenames or URLs) to Firefox. ./App/vidalia --loglevel debug --logfile vidalia-debug-log \ --datadir Data/Vidalia/ printf "\nVidalia exited with the following return code: $?\n" @@ -221,6 +220,8 @@ fi # not in debug mode, run proceed normally printf "\nLaunching Tor Browser Bundle for Linux in ${HOME}\n" cd "${HOME}" +# XXX Someday we should pass whatever command-line arguments we got +# (probably filenames or URLs) to Firefox. ./App/vidalia --datadir Data/Vidalia/ exitcode="$?" if [ "$exitcode" -ne 0 ]; then

1 0

[torbrowser/master] bump tbb osx to 2.2.32-1, tor to 0.2.2.32, vidalia to 0.2.14, torbutton to 1.4.1
by erinn＠torproject.org 24 Oct '11

24 Oct '11

commit e4fc65d12966f01a7f0550cac8cb94a14b7c1d37 Author: Erinn Clark <erinn(a)torproject.org> Date: Sun Aug 28 17:34:48 2011 +0100 bump tbb osx to 2.2.32-1, tor to 0.2.2.32, vidalia to 0.2.14, torbutton to 1.4.1 --- README.OSX-2.2 | 6 +++--- build-scripts/versions.mk | 8 ++++---- changelog.osx-2.2 | 11 ++++++++++- 3 files changed, 17 insertions(+), 8 deletions(-) diff --git a/README.OSX-2.2 b/README.OSX-2.2 index 750e540..de6e27c 100644 --- a/README.OSX-2.2 +++ b/README.OSX-2.2 @@ -4,10 +4,10 @@ Tor Browser Bundle for Mac OS X Included applications --------------------- -Vidalia 0.2.12 (with Qt 4.6.2) -Tor 0.2.2.31-rc (with libevent-2.0.13-stable, zlib-1.2.5 and openssl-1.0.0d) +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 - \_ Torbutton 1.4.0 + \_ Torbutton 1.4.1 |_ NoScript 2.1.2.6 |_ HTTPS-Everywhere 1.0.0development.5 diff --git a/build-scripts/versions.mk b/build-scripts/versions.mk index 28b7d82..d3fa14b 100644 --- a/build-scripts/versions.mk +++ b/build-scripts/versions.mk @@ -1,6 +1,6 @@ #!/usr/bin/make -RELEASE_VER=2.2.31 +RELEASE_VER=2.2.32 HTTPSEVERY_VER=1.0.0development.5 FIREFOX_VER=6.0 @@ -12,9 +12,9 @@ OTR_VER=3.2.0 PIDGIN_VER=2.6.4 POLIPO_VER=1.0.4.1 QT_VER=4.6.2 -TOR_VER=0.2.2.31-rc -TORBUTTON_VER=1.4.0 -VIDALIA_VER=0.2.12 +TOR_VER=0.2.2.32 +TORBUTTON_VER=1.4.1 +VIDALIA_VER=0.2.14 ZLIB_VER=1.4.0 ## Extension IDs diff --git a/changelog.osx-2.2 b/changelog.osx-2.2 index ff6763d..2b9edcb 100644 --- a/changelog.osx-2.2 +++ b/changelog.osx-2.2 @@ -1,4 +1,13 @@ -Tor Browser Bundle (2.2.30-1) alpha; suite=osx +Tor Browser Bundle (2.2.32-1) alpha; suite=osx + + * Update Tor to 0.2.2.32 + * Update Vidalia to 0.2.14 + * Update Torbutton to 1.4.1 + * Enable automatic port choosing (closes: #2264) + + -- Erinn Clark <erinn(a)torproject.org> Sun Aug 28 17:20:46 BST 2011 + +Tor Browser Bundle (2.2.31-1) alpha; suite=osx * Update Tor to 0.2.2.31-rc * Update Firefox to 6.0

1 0

[torbrowser/master] remove betterprivacy from osx bundles
by erinn＠torproject.org 24 Oct '11

24 Oct '11

commit a0e3aa031694051815911f74d71c37e5f779e48d Author: Erinn Clark <erinn(a)torproject.org> Date: Sat Aug 20 21:36:03 2011 +0200 remove betterprivacy from osx bundles --- 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 1ab3a77..e1f005d 100644 --- a/build-scripts/osx.mk +++ b/build-scripts/osx.mk @@ -351,7 +351,7 @@ bundle_%: compressed-bundle_%: LANGCODE=$* make -f osx.mk compressed-bundle-localized bundle-localized_%.stamp: - make -f osx.mk copy-files_$* install-extensions install-betterprivacy install-httpseverywhere install-noscript install-lang-extensions patch-vidalia-language patch-firefox-language patch-pidgin-language update-extension-pref final + make -f osx.mk copy-files_$* install-extensions install-httpseverywhere install-noscript install-lang-extensions patch-vidalia-language patch-firefox-language patch-pidgin-language update-extension-pref final touch bundle-localized_$*.stamp cp extensions/torbutton.xpi .

1 0

[torbrowser/master] use the right mozconfig for linux
by erinn＠torproject.org 24 Oct '11

24 Oct '11

commit 830a8850ee2a288005c318a4449916c72536cc32 Author: Erinn Clark <erinn(a)torproject.org> Date: Sat Aug 20 21:42:22 2011 +0200 use the right mozconfig for linux --- 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 1a70edb..7d3bab0 100644 --- a/build-scripts/linux.mk +++ b/build-scripts/linux.mk @@ -112,7 +112,7 @@ FIREFOX_DIR=$(FETCH_DIR)/mozilla-release build-firefox: cp ../src/current-patches/*Firefox* $(FIREFOX_DIR) cp patch-firefox-src.sh $(FIREFOX_DIR) - cp $(CONFIG_SRC)/mozconfig-osx-$(ARCH_TYPE) $(FIREFOX_DIR)/mozconfig + cp $(CONFIG_SRC)/dot_mozconfig $(FIREFOX_DIR)/mozconfig cd $(FIREFOX_DIR) && ./patch-firefox-src.sh cd $(FIREFOX_DIR) && make -f client.mk build

1 0

[torbrowser/master] new bundles are version 1, not 2
by erinn＠torproject.org 24 Oct '11

24 Oct '11

commit 50ef43974ea4bfe95835dfedc6719710d9e52d90 Author: Erinn Clark <erinn(a)torproject.org> Date: Sat Aug 20 21:36:21 2011 +0200 new bundles are version 1, not 2 --- 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 e1f005d..ebd265d 100644 --- a/build-scripts/osx.mk +++ b/build-scripts/osx.mk @@ -153,7 +153,7 @@ NAME=TorBrowser DISTDIR=tbbosx-alpha-dist ## Version and name of the compressed bundle (also used for source) -VERSION=$(RELEASE_VER)-2-alpha +VERSION=$(RELEASE_VER)-1-alpha DEFAULT_COMPRESSED_BASENAME=TorBrowser-$(VERSION)-osx-$(ARCH_TYPE)- IM_COMPRESSED_BASENAME=TorBrowser-IM-$(VERSION)- DEFAULT_COMPRESSED_NAME=$(DEFAULT_COMPRESSED_BASENAME)

1 0

[torbrowser/master] add some missing makefile bits for linux
by erinn＠torproject.org 24 Oct '11

24 Oct '11

commit 3df7a8edcb81b222f3fff6303a10865f3d46fd97 Author: Erinn Clark <erinn(a)torproject.org> Date: Sun Aug 21 02:57:16 2011 +0200 add some missing makefile bits for linux --- build-scripts/linux.mk | 18 ++++++++---------- 1 files changed, 8 insertions(+), 10 deletions(-) diff --git a/build-scripts/linux.mk b/build-scripts/linux.mk index 7d3bab0..8859cd0 100644 --- a/build-scripts/linux.mk +++ b/build-scripts/linux.mk @@ -119,9 +119,9 @@ build-firefox: copy-firefox: -rm -rf $(FETCH_DIR)/Firefox ## This is so ugly. Update it to use cool tar --transform soon. - cd $(FIREFOX_DIR) && make -C obj-$(ARCH_TYPE)-pc-linux-gnu/ package - cp $(FIREFOX_DIR)/obj-$(ARCH_TYPE)-pc-linux-gnu/*bz2 $(FETCH_DIR) - cd $(FETCH_DIR) && tar -xvjf firefox-$(FIREFOX_VER).en-US.bz2 && mv firefox Firefox + cd $(FIREFOX_DIR) && make -C obj-$(ARCH_TYPE)-*/ package + cp $(FIREFOX_DIR)/obj-$(ARCH_TYPE)-*/dist/*bz2 $(FETCH_DIR) + cd $(FETCH_DIR) && tar -xvjf firefox-$(FIREFOX_VER).en-US.linux-$(ARCH_TYPE).tar.bz2 && mv firefox Firefox # source-dance unpack-source build-all-binaries: source-dance build-zlib build-openssl build-libpng build-qt build-vidalia build-libevent build-tor build-polipo @@ -233,7 +233,6 @@ all-compressed-bundles: compressed-bundle_ar \ ## clean: - rm -fr $(DISTDIR) rm -fr *.tar.gz rm -fr $(DEST) *.stamp rm -f *~ @@ -280,9 +279,9 @@ install-binaries: # zlib cp -d $(ZLIB)/libz.so $(ZLIB)/libz.so.1 $(ZLIB)/libz.so.1.2.5 $(LIBSDIR)/libz # Libevent - cp -d $(LIBEVENT)/libevent-2.0.so.5 $(LIBEVENT)/libevent-2.0.so.5.0.1 $(LIBEVENT)/libevent_core.so \ - $(LIBEVENT)/libevent_core-2.0.so.5 $(LIBEVENT)/libevent_core-2.0.so.5.0.1 \ - $(LIBEVENT)/libevent_extra-2.0.so.5 $(LIBEVENT)/libevent_extra-2.0.so.5.0.1 \ + cp -d $(LIBEVENT)/libevent-2.0.so.5 $(LIBEVENT)/libevent-2.0.so.5.1.2 $(LIBEVENT)/libevent_core.so \ + $(LIBEVENT)/libevent_core-2.0.so.5 $(LIBEVENT)/libevent_core-2.0.so.5.1.2 \ + $(LIBEVENT)/libevent_extra-2.0.so.5 $(LIBEVENT)/libevent_extra-2.0.so.5.1.2 \ $(LIBEVENT)/libevent_extra.so $(LIBEVENT)/libevent.so $(LIBSDIR) # libpng cp -d $(LIBPNG)/libpng14.so* $(LIBSDIR) @@ -360,8 +359,8 @@ strip-it-stripper: ## ## Torbutton development version -#torbutton.xpi: -# $(WGET) -O $@ $(TORBUTTON) +torbutton.xpi: + $(WGET) -O $@ $(TORBUTTON) ## NoScript development version noscript.xpi: @@ -403,7 +402,6 @@ compressed-bundle-localized: bundle-localized_$(LANGCODE).stamp -mkdir $(DISTDIR) tar -cvzf $(DISTDIR)/$(DEFAULT_COMPRESSED_BASENAME)$(LANGCODE).tar.gz $(NAME)_$(LANGCODE); rm *.zip *.xpi - cp torbutton/torbutton.xpi . copy-files_%: generic-bundle.stamp rm -fr $(NAME)_$*

1 0

[torbrowser/master] put the right OS in the changelogs...
by erinn＠torproject.org 24 Oct '11

24 Oct '11

commit b4e560edf5af143643e525b3ffbe659b4ac2d6b4 Author: Erinn Clark <erinn(a)torproject.org> Date: Sun Aug 21 03:31:47 2011 +0200 put the right OS in the changelogs... --- changelog.linux-2.2 | 2 +- changelog.win-2.2 | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/changelog.linux-2.2 b/changelog.linux-2.2 index 20d8bc5..dfd7fb8 100644 --- a/changelog.linux-2.2 +++ b/changelog.linux-2.2 @@ -1,4 +1,4 @@ -Tor Browser Bundle (2.2.30-1) alpha; suite=osx +Tor Browser Bundle (2.2.30-1) alpha; suite=linux * Update Tor to 0.2.2.31-rc * Update Firefox to 6.0 diff --git a/changelog.win-2.2 b/changelog.win-2.2 index bde8ad4..bc070ec 100644 --- a/changelog.win-2.2 +++ b/changelog.win-2.2 @@ -1,4 +1,4 @@ -Tor Browser Bundle (2.2.30-1) alpha; suite=osx +Tor Browser Bundle (2.2.30-1) alpha; suite=windows * Update Tor to 0.2.2.31-rc * Update Firefox to 6.0

1 0

[torbrowser/master] update build targets for better automatic building
by erinn＠torproject.org 24 Oct '11

24 Oct '11

commit 6b2c454261728e45a8787e7062b7ad19f2338d48 Author: Erinn Clark <erinn(a)torproject.org> Date: Sun Aug 21 03:10:20 2011 +0200 update build targets for better automatic building --- build-scripts/linux.mk | 2 +- build-scripts/osx.mk | 2 +- build-scripts/versions.mk | 3 +++ 3 files changed, 5 insertions(+), 2 deletions(-) diff --git a/build-scripts/linux.mk b/build-scripts/linux.mk index 8859cd0..0bcefb3 100644 --- a/build-scripts/linux.mk +++ b/build-scripts/linux.mk @@ -124,7 +124,7 @@ copy-firefox: cd $(FETCH_DIR) && tar -xvjf firefox-$(FIREFOX_VER).en-US.linux-$(ARCH_TYPE).tar.bz2 && mv firefox Firefox # source-dance unpack-source -build-all-binaries: source-dance build-zlib build-openssl build-libpng build-qt build-vidalia build-libevent build-tor build-polipo +build-all-binaries: source-dance build-zlib build-openssl build-libpng build-qt build-vidalia build-libevent build-tor build-firefox echo "If we're here, we've done something right." ## Location of compiled libraries diff --git a/build-scripts/osx.mk b/build-scripts/osx.mk index ebd265d..0b07e67 100644 --- a/build-scripts/osx.mk +++ b/build-scripts/osx.mk @@ -113,7 +113,7 @@ copy-firefox: -rm -rf $(FETCH_DIR)/Firefox.app cp -r $(FIREFOX_DIR)/obj*/dist/*.app $(FETCH_DIR)/Firefox.app -build-all-binaries: build-zlib build-openssl build-vidalia build-libevent build-tor +build-all-binaries: build-zlib build-openssl build-vidalia build-libevent build-tor build-firefox echo "If we're here, we've done something right." ## Location of compiled libraries diff --git a/build-scripts/versions.mk b/build-scripts/versions.mk index e8991a2..28b7d82 100644 --- a/build-scripts/versions.mk +++ b/build-scripts/versions.mk @@ -46,6 +46,9 @@ fetch-source: fetch-zlib fetch-openssl fetch-vidalia fetch-libevent fetch-tor fe fetch-zlib: $(WGET) --no-check-certificate --directory-prefix=$(FETCH_DIR) $(ZLIB_URL) +fetch-qt: + $(WGET) --no-check-certificate --directory-prefix=$(FETCH_DIR) $(QT_URL) + fetch-openssl: $(WGET) --no-check-certificate --directory-prefix=$(FETCH_DIR) $(OPENSSL_URL)

1 0