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

[torbrowser/master] [Linux] Unbreak the "foozer is already running as PID 31337." message
by erinn＠torproject.org 23 Oct '11

23 Oct '11

commit 45f1a188c0f00d09e32fbe50a1f01fe99f2ea90f Author: Robert Ransom <rransom.8774(a)gmail.com> Date: Wed Aug 24 01:21:17 2011 -0400 [Linux] Unbreak the "foozer is already running as PID 31337." message The $'\n\n' didn't do what I thought it would do. bashism? zshism? I have no idea where I saw that syntax. Still not quite right, because it used to (try to) complain about both Tor and Vidalia at the same time if both were running. (cherry picked … [View More]

1 0

[torbrowser/master] [Linux] Use complain to report all currently detected errors
by erinn＠torproject.org 23 Oct '11

23 Oct '11

commit a373383064afe14adfbe7cbc56253bc217c3d0fd Author: Robert Ransom <rransom.8774(a)gmail.com> Date: Wed Aug 24 00:47:15 2011 -0400 [Linux] Use complain to report all currently detected errors (cherry picked from commit 69bea9b7c46b23662fb0ae456997e482a0ad1222) --- src/RelativeLink/RelativeLink.sh | 16 +++++++++++----- 1 files changed, 11 insertions(+), 5 deletions(-) diff --git a/src/RelativeLink/RelativeLink.sh b/src/RelativeLink/RelativeLink.sh index 0435054..5be1bdc … [View More]

1 0

[torbrowser/master] [2824 Linux] Explicitly refuse to run TBB-Linux as root
by erinn＠torproject.org 23 Oct '11

23 Oct '11

commit 449751d3fb137da992deb481028bb3c16d2bd1df Author: Robert Ransom <rransom.8774(a)gmail.com> Date: Tue Aug 23 02:09:08 2011 -0400 [2824 Linux] Explicitly refuse to run TBB-Linux as root (cherry picked from commit 063c2f62567282c0c3093f35b414ee52ff87aee4) --- 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 e33b1a8..fe00dcd 100755 --- a/src/… [View More]

1 0

[torbrowser/master] bump tor to 0.2.2.30-rc, bump other versions for 2.2.30 release
by erinn＠torproject.org 23 Oct '11

23 Oct '11

commit cd968506fdcf096e0d0950f137f118cff996c9e4 Author: Erinn Clark <erinn(a)torproject.org> Date: Sat Jul 9 02:17:54 2011 -0300 bump tor to 0.2.2.30-rc, bump other versions for 2.2.30 release --- build-scripts/versions.mk | 12 ++++++------ 1 files changed, 6 insertions(+), 6 deletions(-) diff --git a/build-scripts/versions.mk b/build-scripts/versions.mk index ae94848..e7d092a 100644 --- a/build-scripts/versions.mk +++ b/build-scripts/versions.mk @@ -1,19 +1,19 @@ #!/usr/bin/… [View More]

1 0

[torbrowser/master] update changelog and readme for osx tbb 2.2.30
by erinn＠torproject.org 23 Oct '11

23 Oct '11

commit cf28c99e8ef15655b16b2059ab2672f49778b751 Author: Erinn Clark <erinn(a)torproject.org> Date: Sun Jul 10 09:01:28 2011 -0300 update changelog and readme for osx tbb 2.2.30 --- README.OSX-2.2 | 10 +++++----- changelog.osx-2.2 | 10 ++++++++++ 2 files changed, 15 insertions(+), 5 deletions(-) diff --git a/README.OSX-2.2 b/README.OSX-2.2 index 949dd7e..73661e0 100644 --- a/README.OSX-2.2 +++ b/README.OSX-2.2 @@ -5,11 +5,11 @@ Included applications --------------------- … [View More]

1 0

[torbrowser/master] update changelog and readme for tbb linux 2.2.30-1
by erinn＠torproject.org 23 Oct '11

23 Oct '11

commit bfcebf3f6e1bdfe3950bab680bec72396ad16960 Author: Erinn Clark <erinn(a)torproject.org> Date: Tue Jul 12 19:29:44 2011 -0300 update changelog and readme for tbb linux 2.2.30-1 --- README.LINUX-2.2 | 10 +++++----- changelog.linux-2.2 | 10 ++++++++++ 2 files changed, 15 insertions(+), 5 deletions(-) diff --git a/README.LINUX-2.2 b/README.LINUX-2.2 index 8455d06..ffb5a3a 100644 --- a/README.LINUX-2.2 +++ b/README.LINUX-2.2 @@ -5,11 +5,11 @@ Included applications ------… [View More]

1 0

[torbrowser/master] update changelog and readme for tbb windows 2.2.30-1
by erinn＠torproject.org 23 Oct '11

23 Oct '11

commit 941430c279674d8c8a02d93b618a1ab95d3003a5 Author: Erinn Clark <erinn(a)torproject.org> Date: Tue Jul 12 19:30:32 2011 -0300 update changelog and readme for tbb windows 2.2.30-1 --- README.WIN-2.2 | 13 ++++++------- changelog.win-2.2 | 10 ++++++++++ 2 files changed, 16 insertions(+), 7 deletions(-) diff --git a/README.WIN-2.2 b/README.WIN-2.2 index cf382c8..0c16957 100644 --- a/README.WIN-2.2 +++ b/README.WIN-2.2 @@ -5,13 +5,12 @@ Included applications -------------… [View More]

1 0

[torbrowser/master] eradicate polipo from the windows bundle
by erinn＠torproject.org 23 Oct '11

23 Oct '11

commit aee3d6e71cdd367b845b39aae851af3a4270f263 Author: Erinn Clark <erinn(a)torproject.org> Date: Wed Jul 13 10:02:58 2011 -0300 eradicate polipo from the windows bundle --- build-scripts/config/torrc | 1 + build-scripts/config/vidalia.conf.ff | 3 --- build-scripts/windows.mk | 16 +--------------- 3 files changed, 2 insertions(+), 18 deletions(-) diff --git a/build-scripts/config/torrc b/build-scripts/config/torrc index 2d63da9..29154fb 100644 ---… [View More] a/build-scripts/config/torrc +++ b/build-scripts/config/torrc @@ -8,4 +8,5 @@ GeoIPFile .\Data\Tor\geoip Log notice stdout # Bind to this address to listen to connections from SOCKS-speaking # applications. +SocksPort 9050 SocksListenAddress 127.0.0.1 diff --git a/build-scripts/config/vidalia.conf.ff b/build-scripts/config/vidalia.conf.ff index ef312a8..03ed00a 100644 --- a/build-scripts/config/vidalia.conf.ff +++ b/build-scripts/config/vidalia.conf.ff @@ -2,9 +2,6 @@ BrowserDirectory=FirefoxPortable BrowserExecutable=tbb-firefox.exe LanguageCode=en -ProxyExecutable=.\\App\\polipo.exe -ProxyExecutableArguments=-c .\\Data\\Polipo\\polipo.conf -RunProxyAtStart=true [Tor] ControlPort=9051 diff --git a/build-scripts/windows.mk b/build-scripts/windows.mk index bf15a48..1836741 100644 --- a/build-scripts/windows.mk +++ b/build-scripts/windows.mk @@ -41,7 +41,6 @@ WIX_LIB="/c/Program Files (x86)/Windows Installer XML v3.5/bin" ## Location of bundle components VIDALIA=$(FETCH_DIR)/vidalia-$(VIDALIA_VER) TOR=$(FETCH_DIR)/tor-$(TOR_VER) -POLIPO=$(FETCH_DIR)/polipo-$(POLIPO_VER) FIREFOX=$(FETCH_DIR)/FirefoxPortable-$(FIREFOX_VER) PIDGIN=$(FETCH_DIR)/PidginPortable-$(PIDGIN_VER) @@ -95,12 +94,6 @@ build-libevent: cd $(LIBEVENT_DIR) && make -j2 cd $(LIBEVENT_DIR) && make install -POLIPO_DIR=$(FETCH_DIR)/polipo-$(POLIPO_VER) -POLIPO_MAKEFILE=$(CONFIG_SRC)/polipo-Makefile -POLIPO_LDFLAGS="-Wl,--nxcompat -Wl,--dynamicbase" -build-polipo: - cd $(POLIPO_DIR) && LDFLAGS=$(POLIPO_LDFLAGS) make && PREFIX=$(FETCH_DIR)/built/ make install.binary - TOR_DIR=$(FETCH_DIR)/tor-$(TOR_VER) TOR_CFLAGS="-O -g -I$(BUILT_DIR)/include" TOR_LDFLAGS="-L$(BUILT_DIR)/lib" @@ -230,7 +223,6 @@ reallyclean: clean virus-scan: $(VIRUSSCAN) $(VIDALIA)/build/src/vidalia/vidalia.exe - $(VIRUSSCAN) $(COMPILED_BINS)/polipo.exe $(VIRUSSCAN) $(TOR)/src/or/tor.exe $(VIRUSSCAN) $(TOR)/src/tools/tor-resolve.exe @@ -253,7 +245,6 @@ directory-structure: mkdir -p $(APPDIR) mkdir -p $(DATADIR)/Tor mkdir -p $(DATADIR)/Vidalia - mkdir -p $(DATADIR)/Polipo mkdir -p $(DOCSDIR) ## Package up all the Vidalia and Tor pre-requisites @@ -265,7 +256,6 @@ install-binaries: cp $(OPENSSL_LIB)/ssleay32.dll $(APPDIR) cp $(OPENSSL_LIB)/libeay32.dll $(APPDIR) cp $(VIDALIA)/build/src/vidalia/vidalia.exe $(APPDIR) - cp $(COMPILED_BINS)/polipo.exe $(APPDIR) cp $(TOR)/src/or/tor.exe $(TOR)/src/tools/tor-resolve.exe $(APPDIR) ## Fixup @@ -275,12 +265,10 @@ install-docs: mkdir -p $(DOCSDIR)/Tor mkdir -p $(DOCSDIR)/Qt mkdir -p $(DOCSDIR)/MinGW - mkdir -p $(DOCSDIR)/Polipo cp $(VIDALIA)/LICENSE* $(VIDALIA)/CREDITS $(DOCSDIR)/Vidalia cp $(TOR)/LICENSE $(TOR)/README $(DOCSDIR)/Tor cp $(QT_LIB)/../LICENSE.GPL* $(QT_LIB)/../LICENSE.LGPL $(DOCSDIR)/Qt cp $(MING)/../msys/1.0/share/doc/MSYS/COPYING $(DOCSDIR)/MinGW - cp $(POLIPO)/COPYING $(POLIPO)/README.Windows $(DOCSDIR)/Polipo cp ../changelog.win-2.2 $(DOCSDIR)/changelog cp ../README.WIN-2.2 $(DOCSDIR)/README-TorBrowserBundle @@ -294,7 +282,7 @@ ifeq ($(USE_PIDGIN),1) cp -r $(PIDGIN) $(DEST)/PidginPortable endif -## Configure Firefox, FirefoxPortable, Vidalia, Polipo and Tor +## Configure Firefox, FirefoxPortable, Vidalia, and Tor configure-apps: mkdir -p $(DEST)/FirefoxPortable/Data/profile @@ -323,8 +311,6 @@ ifeq ($(USE_PIDGIN),1) else cp $(CONFIG_SRC)/vidalia.conf.ff $(DEST)/Data/Vidalia/vidalia.conf endif - ## Configure Polipo - cp $(CONFIG_SRC)/polipo.conf $(DEST)/Data/Polipo ## Configure Tor cp $(CONFIG_SRC)/torrc $(DEST)/Data/Tor cp $(TOR)/src/config/geoip $(DEST)/Data/Tor [View Less]

1 0

[torbrowser/master] bump all firefox versions to 5.0.1
by erinn＠torproject.org 23 Oct '11

23 Oct '11

commit 57cd4944d034a04a413c0394b8a11329e9d3d989 Author: Erinn Clark <erinn(a)torproject.org> Date: Wed Jul 13 09:59:37 2011 -0300 bump all firefox versions to 5.0.1 --- README.LINUX-2.2 | 2 +- README.OSX-2.2 | 2 +- README.WIN-2.2 | 4 ++-- build-scripts/osx.mk | 4 ++-- build-scripts/versions.mk | 2 +- build-scripts/windows.mk | 2 +- changelog.linux-2.2 | 4 ++-- changelog.osx-2.2 | 6 ++++++ changelog.… [View More]win-2.2 | 6 ++++++ 9 files changed, 22 insertions(+), 10 deletions(-) diff --git a/README.LINUX-2.2 b/README.LINUX-2.2 index ffb5a3a..c871c74 100644 --- a/README.LINUX-2.2 +++ b/README.LINUX-2.2 @@ -6,7 +6,7 @@ Included applications Vidalia 0.2.12 (with Qt 4.6.2) Tor 0.2.2.30-rc (with libevent-2.0.12-stable, zlib-1.2.5 and openssl-1.0.0d) -Firefox (Aurora) 5.0 +Firefox (Aurora) 5.0.1 \_ Torbutton 1.4.0 |_ NoScript 2.1.1.2 |_ HTTPS-Everywhere 1.0.0development.4 diff --git a/README.OSX-2.2 b/README.OSX-2.2 index 73661e0..88564a6 100644 --- a/README.OSX-2.2 +++ b/README.OSX-2.2 @@ -6,7 +6,7 @@ Included applications Vidalia 0.2.12 (with Qt 4.6.2) Tor 0.2.2.30-rc (with libevent-2.0.12-stable, zlib-1.2.5 and openssl-1.0.0d) -Firefox (Aurora) 5.0 +Firefox (Aurora) 5.0.1 \_ Torbutton 1.4.0 |_ NoScript 2.1.1.2 |_ HTTPS-Everywhere 1.0.0development.4 diff --git a/README.WIN-2.2 b/README.WIN-2.2 index 0c16957..dbe8ffb 100644 --- a/README.WIN-2.2 +++ b/README.WIN-2.2 @@ -6,8 +6,8 @@ Included applications Vidalia 0.2.12 (with Qt 4.6.2) Tor 0.2.2.30-rc (with libevent-2.0.12-stable, zlib-1.2.5 and openssl-1.0.0d) -FirefoxPortable 5.0 - \_ Firefox (Aurora) 5.0 +FirefoxPortable 5.0.1 + \_ Firefox (Aurora) 5.0.1 \_ Torbutton 1.4.0 |_ NoScript 2.1.1.2 |_ HTTPS-Everywhere 1.0.0development.4 diff --git a/build-scripts/osx.mk b/build-scripts/osx.mk index e8303f1..1a59db4 100644 --- a/build-scripts/osx.mk +++ b/build-scripts/osx.mk @@ -35,7 +35,7 @@ include $(PWD)/versions.mk ## Architecture -ARCH_TYPE=x86_64 +ARCH_TYPE=i386 ## Location of directory for source unpacking FETCH_DIR=$(PWD)/build-alpha-$(ARCH_TYPE) @@ -149,7 +149,7 @@ NAME=TorBrowser DISTDIR=tbbosx-alpha-dist ## Version and name of the compressed bundle (also used for source) -VERSION=$(RELEASE_VER)-1-alpha +VERSION=$(RELEASE_VER)-2-alpha DEFAULT_COMPRESSED_BASENAME=TorBrowser-$(VERSION)-osx-$(ARCH_TYPE)- IM_COMPRESSED_BASENAME=TorBrowser-IM-$(VERSION)- DEFAULT_COMPRESSED_NAME=$(DEFAULT_COMPRESSED_BASENAME) diff --git a/build-scripts/versions.mk b/build-scripts/versions.mk index 4dc8589..af23c30 100644 --- a/build-scripts/versions.mk +++ b/build-scripts/versions.mk @@ -3,7 +3,7 @@ RELEASE_VER=2.2.30 HTTPSEVERY_VER=1.0.0development.4 -FIREFOX_VER=5.0 +FIREFOX_VER=5.0.1 LIBEVENT_VER=2.0.12-stable LIBPNG_VER=1.4.3 NOSCRIPT_VER=2.1.1.2 diff --git a/build-scripts/windows.mk b/build-scripts/windows.mk index 4100940..bf15a48 100644 --- a/build-scripts/windows.mk +++ b/build-scripts/windows.mk @@ -144,7 +144,7 @@ NAME="Tor Browser" DISTDIR=tbbwin-alpha-dist ## Version and name of the compressed bundle (also used for source) -VERSION=$(RELEASE_VER)-1-alpha +VERSION=$(RELEASE_VER)-2-alpha DEFAULT_COMPRESSED_BASENAME=tor-browser-$(VERSION) IM_COMPRESSED_BASENAME=tor-im-browser-$(VERSION) DEFAULT_COMPRESSED_NAME=$(DEFAULT_COMPRESSED_BASENAME) diff --git a/changelog.linux-2.2 b/changelog.linux-2.2 index ab000f5..f9119c5 100644 --- a/changelog.linux-2.2 +++ b/changelog.linux-2.2 @@ -1,12 +1,12 @@ Tor Browser Bundle (2.2.30-1) alpha; suite=linux * Update Tor to 0.2.2.30-rc - * Update Firefox to 5.0 + * Update Firefox to 5.0.1 * Update Torbutton to 1.4.0 * Update HTTPS Everywhere to 1.0.0development.4 * Update NoScript to 2.1.1.2 - -- Erinn Clark <erinn(a)torproject.org> Tue Jul 12 19:26:17 ART 2011 + -- Erinn Clark <erinn(a)torproject.org> Wed Jul 13 09:07:41 ART 2011 Tor Browser Bundle (2.2.29-1) alpha; suite=linux diff --git a/changelog.osx-2.2 b/changelog.osx-2.2 index b5452de..888aaf5 100644 --- a/changelog.osx-2.2 +++ b/changelog.osx-2.2 @@ -1,3 +1,9 @@ +Tor Browser Bundle (2.2.30-2) alpha; suite=osx + + * Update Firefox to 5.0.1 + + - Erinn Clark <erinn(a)torproject.org> Wed Jul 13 09:07:41 ART 2011 + Tor Browser Bundle (2.2.30-1) alpha; suite=osx * Update Tor to 0.2.2.30-rc diff --git a/changelog.win-2.2 b/changelog.win-2.2 index ba6ce71..ee916bc 100644 --- a/changelog.win-2.2 +++ b/changelog.win-2.2 @@ -1,3 +1,9 @@ +Tor Browser Bundle (2.2.30-2) alpha; suite=windows + + * Update Firefox to 5.0.1 + + - Erinn Clark <erinn(a)torproject.org> Wed Jul 13 09:07:41 ART 2011 + Tor Browser Bundle (2.2.30-1) alpha; suite=windows * Update Tor to 0.2.2.30-rc [View Less]

1 0

[torbrowser/master] enable addon update checking for windows tbb
by erinn＠torproject.org 23 Oct '11

23 Oct '11

commit efe17a37d519fd544c22ac534a5bbbccfc9d5a7e Author: Erinn Clark <erinn(a)torproject.org> Date: Wed Jul 13 10:05:07 2011 -0300 enable addon update checking for windows tbb --- build-scripts/config/windows-4.0.js | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/build-scripts/config/windows-4.0.js b/build-scripts/config/windows-4.0.js index fc73c6c..13fda1f 100644 --- a/build-scripts/config/windows-4.0.js +++ b/build-scripts/config/windows-4.0.js @@ -… [View More]

1 0