- tor-commits - lists.torproject.org

[torbrowser/maint-2.2] commit tbb linux 1.1.4 makefile version changes
by erinn＠torproject.org 23 Oct '11

23 Oct '11

commit f34d9020a24d910c1171600a7b111e28a2305208 Author: Erinn Clark <erinn(a)torproject.org> Date: Fri Feb 4 02:06:35 2011 -0800 commit tbb linux 1.1.4 makefile version changes --- build-scripts/linux.mk | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/build-scripts/linux.mk b/build-scripts/linux.mk index acbf68c..fe2a788 100644 --- a/build-scripts/linux.mk +++ b/build-scripts/linux.mk @@ -45,7 +45,7 @@ HTTPSEVERY_VER=0.9.9.development.2 FIREFOX_VER=3.6.13 LIBEVENT_VER=1.4.13-stable LIBPNG_VER=1.4.3 -NOSCRIPT_VER=2.0.7 +NOSCRIPT_VER=2.0.9.3 OPENSSL_VER=0.9.8p OTR_VER=3.2.0 PIDGIN_VER=2.6.4 @@ -216,7 +216,7 @@ NAME=tor-browser DISTDIR=tbbl-dist ## Version and name of the compressed bundle (also used for source) -VERSION=1.1.3-1-dev +VERSION=1.1.4-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/maint-2.2] bump tbb osx tor version to 0.2.2.22-alpha
by erinn＠torproject.org 23 Oct '11

23 Oct '11

commit 42174fe7ec7af73dacd8ab69a5a20d04f0f7d478 Author: Erinn Clark <erinn(a)torproject.org> Date: Tue Jan 25 08:21:13 2011 +0100 bump tbb osx tor version to 0.2.2.22-alpha --- README.OSX | 5 ++++- 1 files changed, 4 insertions(+), 1 deletions(-) diff --git a/README.OSX b/README.OSX index d643844..95802b6 100644 --- a/README.OSX +++ b/README.OSX @@ -5,7 +5,7 @@ Included applications --------------------- Vidalia 0.2.10 (with Qt 4.6.2) -Tor 0.2.2.21-alpha (with libevent-1.4.13, zlib-1.2.3 and openssl-0.9.8p) +Tor 0.2.2.22-alpha (with libevent-1.4.13, zlib-1.2.3 and openssl-0.9.8p) Polipo 1.0.4.1 Firefox (Namoroka) 3.6.13 \_ Torbutton 1.2.5 @@ -24,6 +24,9 @@ To exit, close Firefox and Vidalia. Changelog --------- +1.0.12: Released 2011-01-27 + Update Tor to 0.2.2.22-alpha + 1.0.11: Released 2011-01-17 Update the OS X Makefile to make sure that tor links zlib, libevent and openssl statically. Fixes bug #2406.

1 0

[torbrowser/maint-2.2] add the osx .12/.22-alpha release
by erinn＠torproject.org 23 Oct '11

23 Oct '11

commit 8b13bbf7e16c4f89b8a8acd6f195547a1baa1a0f Author: Erinn Clark <erinn(a)torproject.org> Date: Thu Feb 3 14:12:54 2011 +0100 add the osx .12/.22-alpha release --- build-scripts/osx.mk | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/build-scripts/osx.mk b/build-scripts/osx.mk index 32a0a31..cbf3f59 100644 --- a/build-scripts/osx.mk +++ b/build-scripts/osx.mk @@ -51,7 +51,7 @@ 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.21-alpha +TOR_VER=0.2.2.22-alpha TORBUTTON_VER=1.2.5 VIDALIA_VER=0.2.10 ZLIB_VER=1.2.3 @@ -208,7 +208,7 @@ NAME=TorBrowser DISTDIR=tbbosx-dist ## Version and name of the compressed bundle (also used for source) -VERSION=1.0.11-dev +VERSION=1.0.12-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] add target to tag releases
by erinn＠torproject.org 23 Oct '11

23 Oct '11

commit 98e786ba3b1274809557b2f83c236d9f9dff32c5 Author: Erinn Clark <erinn(a)torproject.org> Date: Tue Oct 11 17:17:17 2011 +0100 add target to tag releases --- build-scripts/windows.mk | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) diff --git a/build-scripts/windows.mk b/build-scripts/windows.mk index aec0239..302c631 100644 --- a/build-scripts/windows.mk +++ b/build-scripts/windows.mk @@ -472,6 +472,10 @@ write-tbb-version: printf 'user_pref("torbrowser.version", "%s");\n' "$(RELEASE_VER)-$(BUILD_NUM)-$(PLATFORM)" >> $(BUNDLE)/FirefoxPortable/App/DefaultData/profile/prefs.js printf 'user_pref("torbrowser.version", "%s");\n' "$(RELEASE_VER)-$(BUILD_NUM)-$(PLATFORM)" >> $(BUNDLE)/FirefoxPortable/Data/profile/prefs.js +## Tag the release +releasetag: + git tag -s torbrowser-$(VERSION) -m "tagging $(VERSION)" + ## Export the source code of the bundle SRCNAME=$(COMPRESSED_NAME) SRCDEST=/tmp

1 0

[torbrowser/master] add --enable-strip to windows and osx x86_64 mozconfigs, and remove --enable-update-channel=nightly from osx i386 mozconfig
by erinn＠torproject.org 23 Oct '11

23 Oct '11

commit e6f79a5dad3bdfe037673e44ba43e18ec1026a50 Author: Erinn Clark <erinn(a)torproject.org> Date: Tue Oct 11 16:16:07 2011 +0100 add --enable-strip to windows and osx x86_64 mozconfigs, and remove --enable-update-channel=nightly from osx i386 mozconfig --- build-scripts/config/dot_mozconfig | 1 + build-scripts/config/mozconfig-osx-i386 | 2 -- build-scripts/config/mozconfig-osx-x86_64 | 1 + 3 files changed, 2 insertions(+), 2 deletions(-) diff --git a/build-scripts/config/dot_mozconfig b/build-scripts/config/dot_mozconfig index 934e4f4..9333a6f 100755 --- a/build-scripts/config/dot_mozconfig +++ b/build-scripts/config/dot_mozconfig @@ -4,5 +4,6 @@ mk_add_options MOZ_OBJDIR=@TOPSRCDIR@/obj-@CONFIG_GUESS@ mk_add_options MOZ_APP_DISPLAYNAME=TorBrowser ac_add_options --enable-optimize +ac_add_options --enable-strip ac_add_options --disable-tests ac_add_options --disable-debug diff --git a/build-scripts/config/mozconfig-osx-i386 b/build-scripts/config/mozconfig-osx-i386 index 231bb9e..ffc90c5 100644 --- a/build-scripts/config/mozconfig-osx-i386 +++ b/build-scripts/config/mozconfig-osx-i386 @@ -23,8 +23,6 @@ ac_add_options --target=i386-apple-darwin$DARWIN_VERSION ac_add_options --with-macos-sdk=/Developer/SDKs/MacOSX10.5.sdk ac_add_options --enable-macos-target=10.5 ac_add_options --enable-application=browser -ac_add_options --enable-update-packaging -ac_add_options --enable-update-channel=nightly ac_add_options --enable-optimize ac_add_options --enable-strip ac_add_options --disable-debug diff --git a/build-scripts/config/mozconfig-osx-x86_64 b/build-scripts/config/mozconfig-osx-x86_64 index f62f68b..febba50 100755 --- a/build-scripts/config/mozconfig-osx-x86_64 +++ b/build-scripts/config/mozconfig-osx-x86_64 @@ -23,5 +23,6 @@ ac_add_options --disable-crashreporter ac_add_options --enable-application=browser ac_add_options --enable-libzul ac_add_options --enable-optimize +ac_add_options --enable-strip ac_add_options --disable-tests ac_add_options --disable-debug

1 0

[torbrowser/master] update winrar path in windows makefile
by erinn＠torproject.org 23 Oct '11

23 Oct '11

commit d535ee8f812ba769830d6fc203fe9654cbeaefc0 Author: Erinn Clark <erinn(a)torproject.org> Date: Tue Oct 11 16:21:30 2011 +0100 update winrar path in windows makefile --- build-scripts/windows.mk | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/build-scripts/windows.mk b/build-scripts/windows.mk index 19c433f..aec0239 100644 --- a/build-scripts/windows.mk +++ b/build-scripts/windows.mk @@ -53,7 +53,7 @@ SEVENZIP="/c/Program Files/7-Zip/7z.exe" PYGET=$(PYTHON) $(PWD)/pyget.py WGET=wget VIRUSSCAN=$(PYTHON) $(PWD)/virus-scan.py -WINRAR="/c/Program Files/WinRAR/WinRAR.exe" +WINRAR="/c/Program Files/WinRAR (x86)/WinRAR.exe" CC=gcc

1 0

[torbrowser/master] bump torbutton version for hotfix so windows tbbs will go to check.tpo again
by erinn＠torproject.org 23 Oct '11

23 Oct '11

commit 63f75dbc502c29cd7361d5eabd59df7244f0f5a2 Author: Erinn Clark <erinn(a)torproject.org> Date: Wed Oct 12 03:21:15 2011 +0100 bump torbutton version for hotfix so windows tbbs will go to check.tpo again --- README.WIN-2.2 | 2 +- build-scripts/versions.mk | 2 +- changelog.windows-2.2 | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/README.WIN-2.2 b/README.WIN-2.2 index 8faa57c..0bc485b 100644 --- a/README.WIN-2.2 +++ b/README.WIN-2.2 @@ -8,7 +8,7 @@ Vidalia 0.2.15 (with Qt 4.6.2) Tor 0.2.2.33 (with libevent-2.0.14-stable, zlib-1.2.5 and openssl-1.0.0e) FirefoxPortable 7.0.1 \_ Firefox (Aurora) 7.0.1 - \_ Torbutton 1.4.4 + \_ Torbutton 1.4.4.1 |_ NoScript 2.1.4 |_ HTTPS-Everywhere 1.0.3 diff --git a/build-scripts/versions.mk b/build-scripts/versions.mk index 035566b..9582dc0 100644 --- a/build-scripts/versions.mk +++ b/build-scripts/versions.mk @@ -12,7 +12,7 @@ OTR_VER=3.2.0 PIDGIN_VER=2.6.4 QT_VER=4.6.2 TOR_VER=0.2.2.33 -TORBUTTON_VER=1.4.4 +TORBUTTON_VER=1.4.4.1 VIDALIA_VER=0.2.15 ZLIB_VER=1.2.5 diff --git a/changelog.windows-2.2 b/changelog.windows-2.2 index 4ccd526..d4a0bc8 100644 --- a/changelog.windows-2.2 +++ b/changelog.windows-2.2 @@ -1,13 +1,13 @@ Tor Browser Bundle (2.2.33-3); suite=windows * Update Vidalia to 0.2.15 - * Update Torbutton to 1.4.4 + * Update Torbutton to 1.4.4.1 * Update NoScript to 2.1.4 * Remove trailing dash from Windows version number (closes: #4160) * Make Tor Browser (Aurora) fail closed when not launched with a TBB profile (closes: #4192) - -- Erinn Clark <erinn(a)torproject.org> Tue Oct 11 16:00:57 BST 2011 + -- Erinn Clark <erinn(a)torproject.org> Wed Oct 12 03:20:01 BST 2011 Tor Browser Bundle (2.2.33-2); suite=windows

1 0

[torbrowser/master] fix winrar path
by erinn＠torproject.org 23 Oct '11

23 Oct '11

commit 3bb184e4f8de7bdc19d61c04062de94bcd02ca5b Author: Erinn Clark <erinn(a)torproject.org> Date: Wed Oct 12 03:21:55 2011 +0100 fix winrar path --- build-scripts/windows.mk | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/build-scripts/windows.mk b/build-scripts/windows.mk index 302c631..4a2de3d 100644 --- a/build-scripts/windows.mk +++ b/build-scripts/windows.mk @@ -53,7 +53,7 @@ SEVENZIP="/c/Program Files/7-Zip/7z.exe" PYGET=$(PYTHON) $(PWD)/pyget.py WGET=wget VIRUSSCAN=$(PYTHON) $(PWD)/virus-scan.py -WINRAR="/c/Program Files/WinRAR (x86)/WinRAR.exe" +WINRAR="/c/Program Files (x86)/WinRAR/WinRAR.exe" CC=gcc

1 0

[torbrowser/master] update recommended versions with 2.2.33-2 versions as well
by erinn＠torproject.org 23 Oct '11

23 Oct '11

commit 86862e38b1071c576f8760ce3bef31b5cb32c8ab Author: Erinn Clark <erinn(a)torproject.org> Date: Wed Oct 12 03:42:09 2011 +0100 update recommended versions with 2.2.33-2 versions as well --- build-scripts/recommended-versions | 7 ++++++- 1 files changed, 6 insertions(+), 1 deletions(-) diff --git a/build-scripts/recommended-versions b/build-scripts/recommended-versions index d04cab1..a508fcc 100644 --- a/build-scripts/recommended-versions +++ b/build-scripts/recommended-versions @@ -1,7 +1,12 @@ [ +"2.2.33-2-Linux-i686", +"2.2.33-2-Linux-x86_64", +"2.2.33-2-MacOS-i386", +"2.2.33-2-MacOS-x86_64", +"2.2.33-2-Windows-" "2.2.33-3-Linux-i686", "2.2.33-3-Linux-x86_64", "2.2.33-3-MacOS-i386", "2.2.33-3-MacOS-x86_64", -"2.2.32-3-Windows" +"2.2.33-3-Windows" ]

1 0

[torbrowser/master] add missing comma to recommended-versions
by erinn＠torproject.org 23 Oct '11

23 Oct '11

commit 151d30820965a42d1237fd034dcdab7f3b12709f Author: Erinn Clark <erinn(a)torproject.org> Date: Wed Oct 12 22:20:20 2011 +0100 add missing comma to recommended-versions --- build-scripts/recommended-versions | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/build-scripts/recommended-versions b/build-scripts/recommended-versions index a508fcc..8fb3ecd 100644 --- a/build-scripts/recommended-versions +++ b/build-scripts/recommended-versions @@ -3,7 +3,7 @@ "2.2.33-2-Linux-x86_64", "2.2.33-2-MacOS-i386", "2.2.33-2-MacOS-x86_64", -"2.2.33-2-Windows-" +"2.2.33-2-Windows-", "2.2.33-3-Linux-i686", "2.2.33-3-Linux-x86_64", "2.2.33-3-MacOS-i386",

1 0