October 2011 - tor-commits - lists.torproject.org

[torbrowser/master] update changelog for new release
by erinn＠torproject.org 23 Oct '11

23 Oct '11

commit f9a70aadab4d4a950d55df0f373bb4804ef9e012 Author: Erinn Clark <erinn(a)torproject.org> Date: Tue Mar 29 23:57:20 2011 +0200 update changelog for new release --- changelog.osx-0.2.2 | 8 ++++++++ 1 files changed, 8 insertions(+), 0 deletions(-) diff --git a/changelog.osx-0.2.2 b/changelog.osx-0.2.2 index 51f6026..c4ff5af 100644 --- a/changelog.osx-0.2.2 +++ b/changelog.osx-0.2.2 @@ -1,3 +1,11 @@ +Tor Browser Bundle (2.2.23-2) alpha; suite=osx + + * Update Firefox prefs to show the toggle buttons for NoScript and Torbutton + * Make Vidalia stop linking to an OpenSSL that isn't present on the user's system + in i386 bundle (closes: #2813) + + -- Erinn Clark <erinn(a)torproject.org> Tue Mar 29 23:55:49 CEST 2011 + Tor Browser Bundle (2.2.23-1) alpha; suite=osx * Create new bundles for Firefox 4, both i386 and x86_64 (closes: #2140)

1 0

[torbrowser/master] bump ff4 osx release to 2.2.23-2-alpha
by erinn＠torproject.org 23 Oct '11

23 Oct '11

commit cc9ed8871ceb9a4c89e6c95c1ee87c91096c07df Author: Erinn Clark <erinn(a)torproject.org> Date: Tue Mar 29 23:57:58 2011 +0200 bump ff4 osx release to 2.2.23-2-alpha --- 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 707c0a2..71784b1 100644 --- a/build-scripts/osx.mk +++ b/build-scripts/osx.mk @@ -144,7 +144,7 @@ NAME=TorBrowser DISTDIR=tbbosx-alpha-dist ## Version and name of the compressed bundle (also used for source) -VERSION=2.2.23-1-alpha +VERSION=2.2.23-2-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] update linux makefile with new libevent2 libraries and fix the XAUTHORITY bug
by erinn＠torproject.org 23 Oct '11

23 Oct '11

commit cb101fdce6c7a8b1dc1a58ceef979d316c83b3d8 Author: Erinn Clark <erinn(a)torproject.org> Date: Wed Mar 23 22:01:04 2011 +0100 update linux makefile with new libevent2 libraries and fix the XAUTHORITY bug --- src/RelativeLink/RelativeLink.sh | 5 +++++ 1 files changed, 5 insertions(+), 0 deletions(-) diff --git a/src/RelativeLink/RelativeLink.sh b/src/RelativeLink/RelativeLink.sh index 5b83305..c5b7b28 100755 --- a/src/RelativeLink/RelativeLink.sh +++ b/src/RelativeLink/RelativeLink.sh @@ -14,6 +14,11 @@ if [ $1 ]; then printf "\nDebug enabled.\n\n" fi +if [ -z $XAUTHORITY]; then + XAUTHORITY=~/.Xauthority + export XAUTHORITY +fi + # Try to be agnostic to where we're being started from, chdir to where # the script is. mydir="$(dirname $0)"

1 0

[torbrowser/master] add some more details to the hacking documentation
by erinn＠torproject.org 23 Oct '11

23 Oct '11

commit 4e0a743606f0e2b1f61beb1b78d8e1c9faa10814 Author: Erinn Clark <erinn(a)torproject.org> Date: Wed Mar 30 04:40:04 2011 +0200 add some more details to the hacking documentation --- build-scripts/osx.mk | 2 +- docs/HACKING | 62 +++++++++++++++++++++++++++++++++++++++++++++----- 2 files changed, 57 insertions(+), 7 deletions(-) diff --git a/build-scripts/osx.mk b/build-scripts/osx.mk index 71784b1..2b2de3f 100644 --- a/build-scripts/osx.mk +++ b/build-scripts/osx.mk @@ -35,7 +35,7 @@ include $(PWD)/versions.mk ## Architecture -ARCH_TYPE=i386 +ARCH_TYPE=x86_64 ## Location of directory for source unpacking FETCH_DIR=$(PWD)/build-alpha-$(ARCH_TYPE) diff --git a/docs/HACKING b/docs/HACKING index e27206d..03ad072 100644 --- a/docs/HACKING +++ b/docs/HACKING @@ -25,6 +25,41 @@ Supporting Cast (libraries) It works by having a launch script which opens Vidalia, which then launches Firefox, pre-configured with Torbutton and other privacy-enhancing extensions. +Releases +---------------------- +Official vs. Unofficial releases + +Official releases are regularly maintained and must be updated whenever one of +the main three components is updated (Tor, Vidalia, or Firefox) as well as +whenever there are any important security bugs in any of the components. It is +not necessary for them to be updated whenever the Firefox extensions or +libraries are updated (except as previously mentioned, for security reasons.) + +Unofficial releases are not maintained and are intended either for testing or +favor purposes. + +Modifications +---------------------- + +Some components of TBB are modified and all of the patches are available in the +git repository in src/current-patches. + +- Vidalia: modified on Linux and OS X + * Vidalia has been patched for Linux in order to allow it to quit at the same + time as the browser + * It has been modified on OS X in order to make it conform to the standard OS + X bundle layout + +- Firefox: modified on Linux (3.6 and 4.0), OS X (4.0), Windows (3.6) + * On Linux and OS X, the non-blocking SOCKS proxy has been applied before + being built. See: https://bugzilla.mozilla.org/show_bug.cgi?id=280661 + + * On Windows, a section of nsExtensionManager.js has been commented out to + prevent Firefox from picking up system plugins. See: + https://trac.torproject.org/projects/tor/ticket/2118 + +- Torbutton: 1.2.5 (Linux), 1.3.2-alpha (Linux andOS X Firefox 4 bundles) + * In both versions it has had its use_privoxy option set to false instead of true Git branching strategy ---------------------- @@ -43,8 +78,8 @@ master: The master branch's versions are considered equivalent in spirit to Tor's master branch, which is to say things under heavy and occasionally turbulent development. This branch will use Tor's 'master' as its main Tor build, and all -other components in TBB will be equally alpha, which is to say, they ought to -be the kinds of things that are pulled directly from version control with +other components in TBB will be equally alpha, and most (if not all) components +should be drawn directly from their respective project's version control with absolutely no guarantee that they will work separately or together. maint-2.3: @@ -103,7 +138,9 @@ https://gitweb.torproject.org/torspec.git/blob/HEAD:/version-spec.txt) Based on the blend of TBB's old versioning system and Tor's current versioning system, we end up with: -Tor's MINOR.MICRO.PATCHLEVEL(-status_tag)-tbb_ver(-tbb_status_tag)(-arch) + +Tor's MINOR.MICRO.PATCHLEVEL(-status_tag)-tbb_ver(~tbb_status_tag)(-arch) +Example: 2.2.23-alpha-1~libevent33-s390 If Tor is ever perfect and releases a major version that is non-zero we will have to rethink this strategy. @@ -115,9 +152,22 @@ of the package, beginning with 1. Official TBB releases may have 'tbb_status_tag' if there is a good enough reason. What constitutes a 'good enough reason' is left to the discretion of -the official maintainer and must have a corresponding git branch in the -maintainer's personal repo. Unofficial TBB releases must have 'tbb_status_tag' -as well as a corresponding git branch. +the official maintainer, but this is primarily intended for one-off packages -- +for example, security or architecture-specific fixes that don't comfortably fit +into the existing naming scheme. For official packages the use of +'tbb_status_tag' is discouraged. + +Unofficial TBB releases must have 'tbb_status_tag'. The reasons for making an +unofficial TBB package are more broad and likely to be one-time testing +packages, but could also be special language requests or TBBs that are +specifically modified to appeal to various regions. + +In order to make sure our sources are always available for auditing, any +package that uses 'tbb_status_tag' must also have an accompanying git branch, +preferably in the maintainer's personal (but public) repo. If the changes are +eventually merged back into master or the maint branches, the 'tbb_status_repo' +can be removed. If the changes are not merged back into any of the branches, +whether they should be kept around in perpetuity is undecided at this moment. Official TBB releases for more than one architecture must use 'arch' in the filename.

1 0

[torbrowser/master] update linux makefile with appropriate changes for firefox 4 bundles
by erinn＠torproject.org 23 Oct '11

23 Oct '11

commit b5fecd74e329ac387fc168f19312ca3417a67384 Author: Erinn Clark <erinn(a)dixie.torproject.org> Date: Thu Mar 31 13:48:52 2011 +0000 update linux makefile with appropriate changes for firefox 4 bundles --- build-scripts/linux.mk | 115 +++++++++------------------------------------ build-scripts/versions.mk | 2 +- 2 files changed, 24 insertions(+), 93 deletions(-) diff --git a/build-scripts/linux.mk b/build-scripts/linux.mk index 5a4b2e6..4fc6be8 100644 --- a/build-scripts/linux.mk +++ b/build-scripts/linux.mk @@ -31,80 +31,18 @@ ### Configuration ### ##################### +## Include versions +include $(PWD)/versions.mk + ## Architecture ARCH_TYPE=$(shell uname -m) ## Location of directory for source unpacking -FETCH_DIR=$(HOME)/build-alpha +FETCH_DIR=$(PWD)/build-alpha-$(ARCH_TYPE) ## Location of directory for prefix/destdir/compiles/etc BUILT_DIR=$(FETCH_DIR)/built TBB_FINAL=$(BUILT_DIR)/TBBL -## Versions for our source packages -HTTPSEVERY_VER=0.9.9.development.2 -FIREFOX_VER=4.0b8 -LIBEVENT_VER=2.0.10-stable -LIBPNG_VER=1.5.1beta01 -NOSCRIPT_VER=2.0.7 -OPENSSL_VER=1.0.0c -OTR_VER=3.2.0 -PIDGIN_VER=2.6.4 -POLIPO_VER=1.0.4.1 -QT_VER=4.7.1 -TOR_VER=0.2.3.0-alpha -TORBUTTON_VER=1.3.1-alpha -VIDALIA_VER=0.2.10 -ZLIB_VER=1.2.5 - -## Extension IDs -FF_VENDOR_ID:=\{ec8030f7-c20a-464f-9b0e-13a3a9e97384\} - -## File names for the source packages -FIREFOX_PACKAGE=firefox-$(FIREFOX_VER).source.tar.bz2 -LIBEVENT_PACKAGE=libevent-$(LIBEVENT_VER).tar.gz -LIBPNG_PACKAGE=libpng-$(LIBPNG_VER).tar.gz -OPENSSL_PACKAGE=openssl-$(OPENSSL_VER).tar.gz -PIDGIN_PACKAGE=pidgin-$(PIDGIN_VER).tar.bz2 -POLIPO_PACKAGE=polipo-$(POLIPO_VER).tar.gz -QT_PACKAGE=qt-everywhere-opensource-src-$(QT_VER).tar.gz -TOR_PACKAGE=tor-$(TOR_VER).tar.gz -VIDALIA_PACKAGE=vidalia-$(VIDALIA_VER).tar.gz -ZLIB_PACKAGE=zlib-$(ZLIB_VER).tar.gz - -## Location of files for download -FIREFOX_URL=http://releases.mozilla.org/pub/mozilla.org/firefox/releases/$(FIREFOX_VER)/source/$(FIREFOX_PACKAGE) -LIBEVENT_URL=http://www.monkey.org/~provos/$(LIBEVENT_PACKAGE) -LIBPNG_URL=http://download.sourceforge.net/libpng/$(LIBPNG_PACKAGE).tar.gz -OPENSSL_URL=https://www.openssl.org/source/$(OPENSSL_PACKAGE) -PIDGIN_URL=http://sourceforge.net/projects/pidgin/files/Pidgin/$(PIDGIN_PACKAGE) -POLIPO_URL=http://freehaven.net/~chrisd/polipo/$(POLIPO_PACKAGE) -QT_URL=http://get.qt.nokia.com/qt/source/$(QT_PACKAGE) -TOR_URL=https://www.torproject.org/dist/$(TOR_PACKAGE) -VIDALIA_URL=https://www.torproject.org/vidalia/dist/$(VIDALIA_PACKAGE) -ZLIB_URL=http://www.zlib.net/$(ZLIB_PACKAGE) - -fetch-source: - -mkdir $(FETCH_DIR) - $(WGET) --directory-prefix=$(FETCH_DIR) $(ZLIB_URL) - $(WGET) --directory-prefix=$(FETCH_DIR) $(OPENSSL_URL) - $(WGET) --directory-prefix=$(FETCH_DIR) $(QT_URL) - $(WGET) --directory-prefix=$(FETCH_DIR) $(VIDALIA_URL) - $(WGET) --directory-prefix=$(FETCH_DIR) $(LIBEVENT_URL) - $(WGET) --directory-prefix=$(FETCH_DIR) $(TOR_URL) - $(WGET) --directory-prefix=$(FETCH_DIR) $(POLIPO_URL) - $(WGET) --directory-prefix=$(FETCH_DIR) $(PIDGIN_URL) - $(WGET) --directory-prefix=$(FETCH_DIR) $(FIREFOX_URL) - -unpack-source: - cd $(FETCH_DIR) && tar -xvzf $(ZLIB_PACKAGE) - cd $(FETCH_DIR) && tar -xvzf $(OPENSSL_PACKAGE) - cd $(FETCH_DIR) && tar -xvzf $(QT_PACKAGE) - cd $(FETCH_DIR) && tar -xvzf $(VIDALIA_PACKAGE) - cd $(FETCH_DIR) && tar -xvzf $(LIBEVENT_PACKAGE) - cd $(FETCH_DIR) && tar -xvzf $(TOR_PACKAGE) - cd $(FETCH_DIR) && tar -xvzf $(POLIPO_PACKAGE) - cd $(FETCH_DIR) && tar -xvjf $(FIREFOX_PACKAGE) - source-dance: fetch-source unpack-source echo "We're ready for building now." @@ -116,7 +54,7 @@ build-zlib: cd $(ZLIB_DIR) && make install OPENSSL_DIR=$(FETCH_DIR)/openssl-$(OPENSSL_VER) -OPENSSL_OPTS=-no-idea -no-rc5 -no-md2 shared zlib -Wa,--noexecstack --prefix=$(BUILT_DIR) --openssldir=$(BUILT_DIR) -I$(BUILT_DIR)/include -L$(BUILT_DIR)/lib +OPENSSL_OPTS=-no-idea -no-rc5 -no-md2 shared zlib --prefix=$(BUILT_DIR) --openssldir=$(BUILT_DIR) -I$(BUILT_DIR)/include -L$(BUILT_DIR)/lib build-openssl: cd $(OPENSSL_DIR) && ./config $(OPENSSL_OPTS) cd $(OPENSSL_DIR) && make depend @@ -131,7 +69,7 @@ build-qt: cd $(QT_DIR) && make cd $(QT_DIR) && make install -VIDALIA_DIR=$(FETCH_DIR)/vidalia.trunk +VIDALIA_DIR=$(FETCH_DIR)/vidalia-$(VIDALIA_VER) VIDALIA_OPTS=-DCMAKE_BUILD_TYPE=debug -DQT_QMAKE_EXECUTABLE=$(BUILT_DIR)/bin/qmake .. build-vidalia: -mkdir $(VIDALIA_DIR)/build @@ -152,10 +90,9 @@ build-libpng: cd $(LIBPNG_DIR) && make cd $(LIBPNG_DIR) && make install -TOR_DIR=$(FETCH_DIR)/tor.git +TOR_DIR=$(FETCH_DIR)/tor-$(TOR_VER) TOR_OPTS=--with-openssl-dir=$(BUILT_DIR) --with-zlib-dir=$(BUILT_DIR) --with-libevent-dir=$(BUILT_DIR)/lib --prefix=$(BUILT_DIR) build-tor: - cd $(TOR_DIR) && ./autogen.sh cd $(TOR_DIR) && ./configure $(TOR_OPTS) cd $(TOR_DIR) && make -j2 cd $(TOR_DIR) && make install @@ -217,7 +154,7 @@ NAME=tor-browser DISTDIR=tbbl-dist ## Version and name of the compressed bundle (also used for source) -VERSION=1.1.2-dev +VERSION=2.2.23-1-alpha 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) @@ -316,7 +253,6 @@ directory-structure: mkdir -p $(LIBSDIR)/libz mkdir -p $(DATADIR)/Tor mkdir -p $(DATADIR)/Vidalia - #mkdir -p $(DATADIR)/Polipo mkdir -p $(DATADIR)/profile mkdir -p $(DOCSDIR) mkdir -p $(TB_TMPDIR) @@ -325,11 +261,10 @@ directory-structure: ## Firefox and Pidgin are installed in their own targets install-binaries: # A minimal set of Qt libs and the proper symlinks - cp -d $(QT)/libQtCore.so $(QT)/libQtCore.so.4 $(QT)/libQtCore.so.4.7 $(QT)/libQtCore.so.4.7.1 $(LIBSDIR) - cp -d $(QT)/libQtGui.so $(QT)/libQtGui.so.4 $(QT)/libQtGui.so.4.7 $(QT)/libQtGui.so.4.7.1 $(LIBSDIR) - cp -d $(QT)/libQtNetwork.so $(QT)/libQtNetwork.so.4 $(QT)/libQtNetwork.so.4.7 \ - $(QT)/libQtNetwork.so.4.7.1 $(LIBSDIR) - cp -d $(QT)/libQtXml.so $(QT)/libQtXml.so.4 $(QT)/libQtXml.so.4.7 $(QT)/libQtXml.so.4.7.1 $(LIBSDIR) + cp -d $(QT)/libQtCore.so* $(LIBSDIR) + cp -d $(QT)/libQtGui.so* $(LIBSDIR) + cp -d $(QT)/libQtNetwork.so* $(LIBSDIR) + cp -d $(QT)/libQtXml.so* $(LIBSDIR) # zlib cp -d $(ZLIB)/libz.so $(ZLIB)/libz.so.1 $(ZLIB)/libz.so.1.2.5 $(LIBSDIR)/libz # Libevent @@ -338,14 +273,11 @@ install-binaries: $(LIBEVENT)/libevent_extra-2.0.so.5 $(LIBEVENT)/libevent_extra-2.0.so.5.0.1 \ $(LIBEVENT)/libevent_extra.so $(LIBEVENT)/libevent.so $(LIBSDIR) # libpng - cp -d $(LIBPNG)/libpng15.so* $(LIBSDIR) + cp -d $(LIBPNG)/libpng14.so* $(LIBSDIR) # OpenSSL cp -d $(OPENSSL)/libcrypto.a $(OPENSSL)/libssl.a $(OPENSSL)/libssl.so* $(OPENSSL)/libcrypto.so* $(LIBSDIR) # Vidalia cp $(VIDALIA) $(APPDIR) - # Polipo - #cp $(POLIPO) $(APPDIR) - # Tor (perhaps we want tor-resolve too?) cp $(TOR) $(APPDIR) ## Fixup @@ -354,13 +286,12 @@ install-docs: mkdir -p $(DOCSDIR)/Vidalia mkdir -p $(DOCSDIR)/Tor mkdir -p $(DOCSDIR)/Qt - #mkdir -p $(DOCSDIR)/Polipo cp $(VIDALIA_DIR)/LICENSE* $(VIDALIA_DIR)/CREDITS $(DOCSDIR)/Vidalia cp $(TOR_DIR)/LICENSE $(TOR_DIR)/README $(DOCSDIR)/Tor cp $(QT_DIR)/LICENSE.GPL* $(QT_DIR)/LICENSE.LGPL $(DOCSDIR)/Qt - #cp $(POLIPO_DIR)/COPYING $(POLIPO_DIR)/README $(DOCSDIR)/Polipo + cp ../changelog.linux-0.2.2 $(DOCSDIR)/changelog # This should be updated to be more generic (version-wise) and more Linux specific - cp ../README.Linux $(DOCSDIR)/README-TorBrowserBundle + cp ../README.LINUX-0.2.2 $(DOCSDIR)/README-TorBrowserBundle ## Copy over Firefox install-firefox: @@ -381,7 +312,7 @@ configure-apps: #mkdir -p $(DEST)/.mozilla/Firefox/firefox.default cp -R $(CONFIG_SRC)/firefox-profiles.ini $(DEST)/Data/profiles.ini cp $(CONFIG_SRC)/bookmarks.html $(DEST)/Data/profile - cp $(CONFIG_SRC)/no-polipo.js $(DEST)/Data/profile/prefs.js + cp $(CONFIG_SRC)/no-polipo-4.0.js $(DEST)/Data/profile/prefs.js ## Configure Pidgin ifeq ($(USE_PIDGIN),1) mkdir -p $(DEST)/PidginPortable/Data/settings/.purple @@ -421,12 +352,12 @@ strip-it-stripper: # $(WGET) -O $@ $(TORBUTTON) ## NoScript development version -#noscript.xpi: -# $(WGET) -O $@ $(NOSCRIPT) +noscript.xpi: + $(WGET) -O $@ $(NOSCRIPT) ## BetterPrivacy -#betterprivacy.xpi: -# $(WGET) -O $@ $(BETTERPRIVACY) +betterprivacy.xpi: + $(WGET) -O $@ $(BETTERPRIVACY) ## HTTPS Everywhere httpseverywhere.xpi: @@ -450,7 +381,7 @@ compressed-bundle_%: LANGCODE=$* make -f linux.mk compressed-bundle-localized bundle-localized_%.stamp: - make -f linux.mk copy-files_$* install-lang-extensions patch-vidalia-language patch-firefox-language patch-pidgin-language update-extension-pref + make -f linux.mk copy-files_$* install-extensions install-betterprivacy install-lang-extensions patch-vidalia-language patch-firefox-language patch-pidgin-language update-extension-pref touch bundle-localized_$*.stamp bundle-localized: bundle-localized_$(LANGCODE).stamp @@ -514,9 +445,9 @@ patch-firefox-language: ## Don't use {} because they aren't always interpreted correctly. Thanks, sh. mkdir -p $(BUNDLE)/App/Firefox/defaults/profile/ cp $(CONFIG_SRC)/bookmarks.html $(BUNDLE)/App/Firefox/defaults/profile/ - cp $(CONFIG_SRC)/no-polipo.js $(BUNDLE)/App/Firefox/defaults/profile/prefs.js + cp $(CONFIG_SRC)/no-polipo-4.0.js $(BUNDLE)/App/Firefox/defaults/profile/prefs.js cp $(CONFIG_SRC)/bookmarks.html $(BUNDLE)/Data/profile - cp $(CONFIG_SRC)/no-polipo.js $(BUNDLE)/Data/profile/prefs.js + cp $(CONFIG_SRC)/no-polipo-4.0.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 diff --git a/build-scripts/versions.mk b/build-scripts/versions.mk index f66dbd7..539bc55 100644 --- a/build-scripts/versions.mk +++ b/build-scripts/versions.mk @@ -3,7 +3,7 @@ HTTPSEVERY_VER=0.9.9.development.4 FIREFOX_VER=4.0 LIBEVENT_VER=2.0.10-stable -LIBPNG_VER=1.5.1 +LIBPNG_VER=1.4.3 NOSCRIPT_VER=2.0.9.9 OPENSSL_VER=1.0.0d OTR_VER=3.2.0

1 0

[torbrowser/master] add space to xauthority patch
by erinn＠torproject.org 23 Oct '11

23 Oct '11

commit 6210d3c3ce1877db34f0aedbeb3910b90158f000 Author: Erinn Clark <erinn(a)torproject.org> Date: Thu Mar 31 16:06:49 2011 +0200 add space to xauthority patch --- 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 c5b7b28..99e5255 100755 --- a/src/RelativeLink/RelativeLink.sh +++ b/src/RelativeLink/RelativeLink.sh @@ -14,7 +14,7 @@ if [ $1 ]; then printf "\nDebug enabled.\n\n" fi -if [ -z $XAUTHORITY]; then +if [ -z $XAUTHORITY ]; then XAUTHORITY=~/.Xauthority export XAUTHORITY fi

1 0

[torbrowser/master] add changelog and readme for linux ff4 bundles
by erinn＠torproject.org 23 Oct '11

23 Oct '11

commit 78f1b59a3ce9a28363df66a5c9f9f6d62bd78c76 Author: Erinn Clark <erinn(a)dixie.torproject.org> Date: Thu Mar 31 14:01:08 2011 +0000 add changelog and readme for linux ff4 bundles --- README.LINUX-0.2.2 | 30 ++++++++++++++++++++++++++++++ changelog.linux-0.2.2 | 11 +++++++++++ 2 files changed, 41 insertions(+), 0 deletions(-) diff --git a/README.LINUX-0.2.2 b/README.LINUX-0.2.2 new file mode 100644 index 0000000..060e8d4 --- /dev/null +++ b/README.LINUX-0.2.2 @@ -0,0 +1,30 @@ +Tor Browser Bundle for GNU/Linux +=============== + +Included applications +--------------------- + +Vidalia 0.2.10 (with Qt 4.6.2) +Tor 0.2.2.23-alpha (with libevent-2.0.10-stable, zlib-1.2.5 and openssl-1.0.0d) +Firefox (Minefield) 4.0 + \_ Torbutton 1.3.2-alpha + |_ NoScript 2.0.9.9 + |_ HTTPS-Everywhere 0.9.9.development.4 + |_ BetterPrivacy 1.49 + +Usage +----- + +Extract the bundle with: + +tar -xvzf tor-browser-gnu-linux*.tar.gz + +This will create a directory named tor-browser_LANG. Click on this directory or +cd into it and execute the 'start-tor-browser' script. This will start Vidalia. +Once Tor has successfully opened a circuit, Firefox will automatically be +opened. + +To exit, close Firefox. Vidalia will automatically clean up and exit. + +For more information about bugfixes and other package changes, see the +changelog in tor-browser_LANG/Docs/changelog. diff --git a/changelog.linux-0.2.2 b/changelog.linux-0.2.2 new file mode 100644 index 0000000..60c5212 --- /dev/null +++ b/changelog.linux-0.2.2 @@ -0,0 +1,11 @@ +Tor Browser Bundle (2.2.23-1) alpha; suite=linux + + * Create new bundles for Firefox 4, both i386 and x86_64 + * Update Tor to 0.2.2.23-alpha + * Update Torbutton to 1.3.2-alpha + * Update OpenSSL to 1.0.0d + * Update HTTPS-Everywhere to 0.9.9.development.4 + * Update NoScript to 2.0.9.9 + * Update BetterPrivacy to 1.49 + + -- Erinn Clark <erinn(a)torproject.org> Thu Mar 31 15:49:06 CEST 2011

1 0

[torbrowser/master] add back libssl options for vidalia
by erinn＠torproject.org 23 Oct '11

23 Oct '11

commit c777b38fec397dc11eb257ec54f4b6d163495d10 Author: Erinn Clark <erinn(a)torproject.org> Date: Fri Apr 1 02:12:06 2011 +0200 add back libssl options for vidalia --- 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 4fc6be8..c2e4837 100644 --- a/build-scripts/linux.mk +++ b/build-scripts/linux.mk @@ -70,7 +70,7 @@ build-qt: cd $(QT_DIR) && make install VIDALIA_DIR=$(FETCH_DIR)/vidalia-$(VIDALIA_VER) -VIDALIA_OPTS=-DCMAKE_BUILD_TYPE=debug -DQT_QMAKE_EXECUTABLE=$(BUILT_DIR)/bin/qmake .. +VIDALIA_OPTS=-DOPENSSL_LIBCRYPTO=$(BUILT_DIR)/lib/libcrypto.so.1.0.0 -DOPENSSL_LIBSSL=$(BUILT_DIR)/lib/libssl.so.1.0.0 -DCMAKE_BUILD_TYPE=debug -DQT_QMAKE_EXECUTABLE=$(BUILT_DIR)/bin/qmake .. build-vidalia: -mkdir $(VIDALIA_DIR)/build cd $(VIDALIA_DIR)/build && cmake $(VIDALIA_OPTS) && make

1 0

[torbrowser/master] update the README and the vidalia configuration
by erinn＠torproject.org 23 Oct '11

23 Oct '11

commit 65b7813605746ad5a54e6d95431d5d832462cbec Author: Erinn Clark <erinn(a)torproject.org> Date: Thu Jan 20 05:19:14 2011 +0100 update the README and the vidalia configuration --- README.Linux | 13 +++++++------ build-scripts/config/vidalia.conf.ff-linux | 1 + 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/README.Linux b/README.Linux index c9366ce..6ce2244 100644 --- a/README.Linux +++ b/README.Linux @@ -4,12 +4,10 @@ Tor Browser Bundle for GNU/Linux Included applications --------------------- -Vidalia 0.2.10 (with Qt 4.6.2) -Tor 0.2.2.20-alpha (with libevent-1.4.13, zlib-1.2.3 and openssl-0.9.8p) -Firefox 3.6.13 - \_ Torbutton 1.2.5 - |_ NoScript 2.0.7 - |_ BetterPrivacy 1.48.3 +Vidalia 0.2.11-svn (with Qt 4.7.1) +Tor 0.2.3.0-alpha-dev (with libevent-2.0.10, zlib-1.2.5 and openssl-1.0.0c) +Firefox 4.0b8 + \_ Torbutton 1.3.1-alpha |_ HTTPS Everywhere 0.9.9.development.2 Usage @@ -29,6 +27,9 @@ To exit, close Firefox. Vidalia will automatically clean up and exit. Changelog --------- +x.x.x: NOT FOR PUBLIC RELEASE + THIS IS A TEST BUNDLE + 1.1.2: Released 2011-01-09 Update Firefox preferences to be more secure and disable geolocation to address #2338 diff --git a/build-scripts/config/vidalia.conf.ff-linux b/build-scripts/config/vidalia.conf.ff-linux index 998be98..94c5503 100644 --- a/build-scripts/config/vidalia.conf.ff-linux +++ b/build-scripts/config/vidalia.conf.ff-linux @@ -1,6 +1,7 @@ [General] BrowserDirectory=. BrowserExecutable=firefox +InterfaceStyle=Cleanlooks LanguageCode=en [Tor]

1 0

[torbrowser/master] test Firefox 4's enabledScopes pref
by erinn＠torproject.org 23 Oct '11

23 Oct '11

commit d09e21716a1fba552b2f5bb2fb385fa97bf4a04f Author: Erinn Clark <erinn(a)torproject.org> Date: Thu Jan 20 05:19:38 2011 +0100 test Firefox 4's enabledScopes pref --- build-scripts/config/no-polipo.js | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/build-scripts/config/no-polipo.js b/build-scripts/config/no-polipo.js index 8e1e7b8..2514220 100644 --- a/build-scripts/config/no-polipo.js +++ b/build-scripts/config/no-polipo.js @@ -55,6 +55,7 @@ user_pref("browser.startup.homepage", "https://check.torproject.org/?lang=BUNDLE user_pref("browser.startup.homepage_override.mstone", "rv:1.9.1.11"); user_pref("dom.storage.enabled", false); user_pref("extensions.enabledItems", "SHPONKA,{73a6fe31-595d-460b-a920-fcc0f8843232}:1.9.9.57,{e0204bd5-9d31-402b-a99d-a6aa8ffebdca}:1.2.4,{972ce4c6-7e08-4474-a285-3208198ce6fd}:3.5.8"); +user_pref("extensions.enabledScopes", 5); user_pref("extensions.bprivacy.donotaskforfolder", true); user_pref("extensions.bprivacy.donotaskonexit", true); user_pref("extensions.bprivacy.initiated", true);

1 0