tor-commits June 2012

tor-commits@lists.torproject.org

17 participants
880 discussions

[torbrowser/maint-2.3] Merge branch 'maint-2.2' into maint-2.3
by erinn＠torproject.org 06 Jun '12

06 Jun '12

commit 127a3cd2bdf9131048238d0c5526fdf74b2b8ffa Merge: fe48788 07dc532 Author: Erinn Clark <erinn(a)torproject.org> Date: Wed Jun 6 18:31:35 2012 -0300 Merge branch 'maint-2.2' into maint-2.3 build-scripts/versions.mk | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-)

1 0

[torbrowser/master] firefox's stable release uses a different directory name
by erinn＠torproject.org 06 Jun '12

06 Jun '12

commit 07dc53251bf87fb975c2ae935a1e8743f94b716e Author: Erinn Clark <erinn(a)torproject.org> Date: Wed Jun 6 18:31:09 2012 -0300 firefox's stable release uses a different directory name --- build-scripts/versions.mk | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/build-scripts/versions.mk b/build-scripts/versions.mk index 56cbac2..67fab5e 100644 --- a/build-scripts/versions.mk +++ b/build-scripts/versions.mk @@ -197,9 +197,9 @@ $(TOR_DIR): $(FETCH_DIR)/$(TOR_PACKAGE) | $(BUILD_DIR) cd $(FETCH_DIR) && tar -xmf $(TOR_PACKAGE) -C $(BUILD_DIR)/ $(FIREFOX_DIR): $(FETCH_DIR)/$(FIREFOX_PACKAGE) ../src/current-patches/firefox/* | $(BUILD_DIR) - rm -rf $(FIREFOX_DIR) $(FETCH_DIR)/mozilla-release + rm -rf $(FIREFOX_DIR) $(FETCH_DIR)/mozilla-esr10 cd $(FETCH_DIR) && tar -xmf $(FIREFOX_PACKAGE) -C $(BUILD_DIR)/ - mv $(BUILD_DIR)/mozilla-release $(FIREFOX_DIR) + mv $(BUILD_DIR)/mozilla-esr10 $(FIREFOX_DIR) cp ../src/current-patches/firefox/* $(FIREFOX_DIR) cp patch-any-src.sh $(FIREFOX_DIR) cd $(FIREFOX_DIR) && ./patch-any-src.sh

1 0

[torbrowser/master] Merge branch 'maint-2.2' into maint-2.3
by erinn＠torproject.org 06 Jun '12

06 Jun '12

1 0

[torbrowser/maint-2.3] firefox's stable release uses a different directory name
by erinn＠torproject.org 06 Jun '12

06 Jun '12

1 0

[torbrowser/maint-2.2] firefox's stable release uses a different directory name
by erinn＠torproject.org 06 Jun '12

06 Jun '12

1 0

[torbrowser/maint-2.2] Move dependencies to mozbuild so we don't have to download them ourselves.
by erinn＠torproject.org 06 Jun '12

06 Jun '12

commit d9acd18d1d5903b495287f886256bf827094fcc5 Author: Shondoit Walker <shondoit(a)gmail.com> Date: Thu May 3 21:25:23 2012 +0200 Move dependencies to mozbuild so we don't have to download them ourselves. --- build-scripts/windows.mk | 17 +++++++++-------- 1 files changed, 9 insertions(+), 8 deletions(-) diff --git a/build-scripts/windows.mk b/build-scripts/windows.mk index 213d3e5..e3afbc0 100644 --- a/build-scripts/windows.mk +++ b/build-scripts/windows.mk @@ -20,7 +20,7 @@ PLATFORM=Windows MING=/mingw/bin QT_LIB=/c/Qt/$(QT_VER)/bin OPENSSL_LIB=$(COMPILED_BINS) -WIX_LIB="/c/Program Files (x86)/Windows Installer XML v3.5/bin" +WIX_LIB="$(MOZBUILD_DIR)/wix-351728" ## Location of bundle components VIDALIA=$(BUILD_DIR)/vidalia-$(VIDALIA_VER) @@ -32,10 +32,9 @@ PIDGIN=$(BUILD_DIR)/PidginPortable-$(PIDGIN_VER) PWD:=$(shell pwd) PYTHON=$(MOZBUILD_DIR)/python/python.exe PYMAKE=$(PYMAKE_DIR)/make.py -SEVENZIP="/c/Program Files/7-Zip/7z.exe" +SEVENZIP="$(MOZBUILD_DIR)/7zip/7z.exe" WGET=wget VIRUSSCAN=$(PYTHON) $(PWD)/virus-scan.py -WINRAR="/c/Program Files (x86)/WinRAR/WinRAR.exe" CC=gcc MSVC_VER=9 @@ -81,7 +80,7 @@ build-qt: build-zlib build-openssl $(QT_DIR) VIDALIA_OPTS=-DCMAKE_EXE_LINKER_FLAGS="-static-libstdc++ -Wl,--nxcompat -Wl,--dynamicbase" -DWIN2K=1 -DQT_QMAKE_EXECUTABLE=$(QT_LIB)/qmake -DCMAKE_BUILD_TYPE=minsizerel -DMINGW_BINARY_DIR=$(MING) -DWIX_BINARY_DIR=$(WIX_LIB) # XXX Once we build qt on windows, we'll want to add build-qt here build-vidalia: PATH+=:$(QT_LIB) -build-vidalia: $(VIDALIA_DIR) +build-vidalia: $(VIDALIA_DIR) $(WIX_LIB) -mkdir $(VIDALIA_DIR)/build cd $(VIDALIA_DIR)/build && cmake -G "MSYS Makefiles" $(VIDALIA_OPTS) .. cd $(VIDALIA_DIR)/build && make -j $(NUM_CORES) @@ -332,7 +331,7 @@ bundle-localized_%.stamp: bundle-localized: bundle-localized_$(LANGCODE).stamp -compressed-bundle-localized: bundle-localized_$(LANGCODE).stamp +compressed-bundle-localized: $(SEVENZIP) bundle-localized_$(LANGCODE).stamp rm -f $(COMPRESSED_NAME)_$(LANGCODE).exe cd $(NAME)_$(LANGCODE); $(SEVENZIP) a -mx9 -sfx7z.sfx ../$(COMPRESSED_NAME)_$(LANGCODE).exe $(NAME) @@ -353,17 +352,17 @@ ifneq ($(LANGCODE), en-US) endif rm -fr $(DUMMYPROFILE) -install-torbutton: torbutton.xpi +install-torbutton: $(SEVENZIP) torbutton.xpi mkdir -p $(BUNDLE)/FirefoxPortable/Data/profile/extensions/{e0204bd5-9d31-402b-a99d-a6aa8ffebdca} 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 +install-httpseverywhere: $(SEVENZIP) httpseverywhere.xpi mkdir -p $(BUNDLE)/FirefoxPortable/Data/profile/extensions/https-everywhere(a)eff.org cp httpseverywhere.xpi $(BUNDLE)/FirefoxPortable/Data/profile/extensions/https-everywhere(a)eff.org/httpseverywhere.zip (cd $(BUNDLE)/FirefoxPortable/Data/profile/extensions/https-everywhere(a)eff.org && $(SEVENZIP) x *.zip && rm *.zip) -install-noscript: noscript.xpi +install-noscript: $(SEVENZIP) noscript.xpi mkdir -p $(BUNDLE)/FirefoxPortable/Data/profile/extensions/\{73a6fe31-595d-460b-a920-fcc0f8843232\} cp noscript.xpi $(BUNDLE)/FirefoxPortable/Data/profile/extensions/\{73a6fe31-595d-460b-a920-fcc0f8843232\}/noscript.zip (cd $(BUNDLE)/FirefoxPortable/Data/profile/extensions/\{73a6fe31-595d-460b-a920-fcc0f8843232\} && $(SEVENZIP) x *.zip && rm *.zip) @@ -419,3 +418,5 @@ srcdist: cd .. && git archive --format=tar --prefix=tor-browser-$(VERSION)-src/ torbrowser-$(VERSION) | gzip -9 > $(PWD)/tor-browser-$(VERSION)-src.tar.gz $(PYTHON): | $(MOZBUILD_DIR) ; +$(SEVENZIP): | $(MOZBUILD_DIR) ; +$(WIX_LIB): | $(MOZBUILD_DIR) ;

1 0

[torbrowser/maint-2.2] bump tbbs for tor 0.2.2.37 and firefox 10.0.5esr
by erinn＠torproject.org 06 Jun '12

06 Jun '12

commit db595acd86c2e0bf77e186c4bcd937282c770a96 Author: Erinn Clark <erinn(a)torproject.org> Date: Wed Jun 6 17:20:40 2012 -0300 bump tbbs for tor 0.2.2.37 and firefox 10.0.5esr --- README.LINUX-2.2 | 10 +++++----- README.OSX-2.2 | 10 +++++----- README.WIN-2.2 | 10 +++++----- build-scripts/versions.mk | 10 +++++----- 4 files changed, 20 insertions(+), 20 deletions(-) diff --git a/README.LINUX-2.2 b/README.LINUX-2.2 index 98b6863..5a07687 100644 --- a/README.LINUX-2.2 +++ b/README.LINUX-2.2 @@ -4,11 +4,11 @@ Tor Browser Bundle for GNU/Linux Included applications --------------------- -Vidalia 0.2.17 (with Qt 4.8.1) -Tor 0.2.2.36 (with libevent-2.0.19-stable, zlib-1.2.7 and openssl-1.0.1c) -Firefox 12.0 - \_ Torbutton 1.4.5.1 - |_ NoScript 2.4.3 +Vidalia 0.2.19 (with Qt 4.8.1) +Tor 0.2.2.37 (with libevent-2.0.19-stable, zlib-1.2.7 and openssl-1.0.1c) +Firefox 10.0.5esr + \_ Torbutton 1.4.6 + |_ NoScript 2.4.4 |_ HTTPS-Everywhere 2.0.5 Usage diff --git a/README.OSX-2.2 b/README.OSX-2.2 index 8609d47..e3562fa 100644 --- a/README.OSX-2.2 +++ b/README.OSX-2.2 @@ -4,11 +4,11 @@ Tor Browser Bundle for Mac OS X Included applications --------------------- -Vidalia 0.2.17 (with Qt 4.8.1) -Tor 0.2.2.36 (with libevent-2.0.19-stable, zlib-1.2.7 and openssl-1.0.1c) -Firefox 12.0 - \_ Torbutton 1.4.5.1 - |_ NoScript 2.4.3 +Vidalia 0.2.19 (with Qt 4.8.1) +Tor 0.2.2.37 (with libevent-2.0.19-stable, zlib-1.2.7 and openssl-1.0.1c) +Firefox 10.0.5esr + \_ Torbutton 1.4.6 + |_ NoScript 2.4.4 |_ HTTPS-Everywhere 2.0.5 Usage diff --git a/README.WIN-2.2 b/README.WIN-2.2 index cd5c811..450ac84 100644 --- a/README.WIN-2.2 +++ b/README.WIN-2.2 @@ -4,11 +4,11 @@ Tor Browser Bundle for Windows Included applications --------------------- -Vidalia 0.2.17 (with Qt 4.8.1) -Tor 0.2.2.36 (with libevent-2.0.19-stable, zlib-1.2.7 and openssl-1.0.1c) -Firefox 12.0 - \_ Torbutton 1.4.5.1 - |_ NoScript 2.4.3 +Vidalia 0.2.19 (with Qt 4.8.1) +Tor 0.2.2.37 (with libevent-2.0.19-stable, zlib-1.2.7 and openssl-1.0.1c) +Firefox 10.0.5esr + \_ Torbutton 1.4.6 + |_ NoScript 2.4.4 |_ HTTPS-Everywhere 2.0.5 Usage diff --git a/build-scripts/versions.mk b/build-scripts/versions.mk index a1a940c..56cbac2 100644 --- a/build-scripts/versions.mk +++ b/build-scripts/versions.mk @@ -1,6 +1,6 @@ #!/usr/bin/make -RELEASE_VER=2.2.36 +RELEASE_VER=2.2.37 ZLIB_VER=1.2.7 OPENSSL_VER=1.0.1c @@ -8,13 +8,13 @@ LIBPNG_VER=1.5.10 QT_VER=4.8.1 VIDALIA_VER=0.2.19 LIBEVENT_VER=2.0.19-stable -TOR_VER=0.2.2.36 +TOR_VER=0.2.2.37 PIDGIN_VER=2.6.4 -FIREFOX_VER=12.0 +FIREFOX_VER=10.0.5esr MOZBUILD_VER=1.5.1 PYMAKE_VER=87d436cd8974 -TORBUTTON_VER=1.4.5.1 -NOSCRIPT_VER=2.4.3 +TORBUTTON_VER=1.4.6 +NOSCRIPT_VER=2.4.4 HTTPSEVERYWHERE_VER=2.0.5 OTR_VER=3.2.0 OBFSPROXY_VER=0.1.4

1 0

[torbrowser/maint-2.3] Move dependencies to mozbuild so we don't have to download them ourselves.
by erinn＠torproject.org 06 Jun '12

06 Jun '12

1 0

[torbrowser/maint-2.3] Merge branch 'maint-2.2' into maint-2.3
by erinn＠torproject.org 06 Jun '12

06 Jun '12

commit fe48788c30de59f30125443f92655d54874bed56 Merge: 25e0792 db595ac Author: Erinn Clark <erinn(a)torproject.org> Date: Wed Jun 6 17:21:06 2012 -0300 Merge branch 'maint-2.2' into maint-2.3 README.LINUX-2.2 | 10 +++++----- README.OSX-2.2 | 10 +++++----- README.WIN-2.2 | 10 +++++----- build-scripts/versions.mk | 10 +++++----- build-scripts/windows.mk | 17 +++++++++-------- 5 files changed, 29 insertions(+), 28 deletions(-)

1 0

[torbrowser/maint-2.3] bump tbbs for tor 0.2.2.37 and firefox 10.0.5esr
by erinn＠torproject.org 06 Jun '12

06 Jun '12

1 0

← Newer
1
...
69
70
71
72
73
74
75
...
88
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

tor-commits June 2012