- tor-commits - lists.torproject.org

[torbrowser/maint-2.2] bump tbb osx to 1.0.18-dev, tor to 0.2.2.28-beta, and various other versions as well (libevent 2.0.12-stable, zlib 1.2.5, extensions)
by erinn＠torproject.org 23 Oct '11

23 Oct '11

commit bb70734bd0d166d80dbab4374144b871c6323ccf Author: Erinn Clark <erinn(a)torproject.org> Date: Sun Jun 5 22:08:17 2011 -0300 bump tbb osx to 1.0.18-dev, tor to 0.2.2.28-beta, and various other versions as well (libevent 2.0.12-stable, zlib 1.2.5, extensions) --- README.OSX | 13 ++++++++++--- build-scripts/osx.mk | 15 +++++++++------ 2 files changed, 19 insertions(+), 9 deletions(-) diff --git a/README.OSX b/README.OSX index 6e63c7c..000e7a4 100644 --- a/README.OSX +++ b/README.OSX @@ -5,13 +5,13 @@ Included applications --------------------- Vidalia 0.2.12 (with Qt 4.6.2) -Tor 0.2.2.27-beta (with libevent-2.0.10-stable, zlib-1.2.3 and openssl-0.9.8p) +Tor 0.2.2.28-beta (with libevent-2.0.12-stable, zlib-1.2.5 and openssl-0.9.8p) Polipo 1.0.4.1 Firefox 3.6.17 \_ Torbutton 1.2.5 - |_ NoScript 2.1.0.5 + |_ NoScript 2.1.1 |_ HTTPS-Everywhere 0.9.9.development.5 - |_ BetterPrivacy 1.50 + |_ BetterPrivacy 1.51 Usage ----- @@ -24,6 +24,13 @@ To exit, close Firefox and Vidalia. Changelog --------- +1.0.18: Released 2011-06-05 + Update Tor to 0.2.2.28-beta + Update Libevent to 2.0.12-stable + Update zlib to 1.2.5 + Update NoScript to 2.1.1 + Update BetterPrivacy to 1.51 + 1.0.17: Released 2011-05-19 Update Tor to 0.2.2.27-beta Update NoScript to 2.1.0.5 diff --git a/build-scripts/osx.mk b/build-scripts/osx.mk index e89159e..94fffde 100644 --- a/build-scripts/osx.mk +++ b/build-scripts/osx.mk @@ -43,18 +43,18 @@ TBB_FINAL=$(BUILT_DIR)/TBBL ## Versions for our source packages HTTPSEVERY_VER=0.9.9.development.5 FIREFOX_VER=3.6.17 -LIBEVENT_VER=2.0.10-stable +LIBEVENT_VER=2.0.12-stable LIBPNG_VER=1.4.3 -NOSCRIPT_VER=2.1.0.5 +NOSCRIPT_VER=2.1.1 OPENSSL_VER=0.9.8p 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.27-beta +TOR_VER=0.2.2.28-beta TORBUTTON_VER=1.2.5 VIDALIA_VER=0.2.12 -ZLIB_VER=1.2.3 +ZLIB_VER=1.2.5 ## Extension IDs FF_VENDOR_ID:=\{ec8030f7-c20a-464f-9b0e-13a3a9e97384\} @@ -101,10 +101,13 @@ unpack-source: source-dance: fetch-source unpack-source echo "We're ready for building now." + ZLIB_DIR=$(FETCH_DIR)/zlib-$(ZLIB_VER) ZLIB_OPTS=--prefix=$(BUILT_DIR) +ZLIB_CFLAGS="-mmacosx-version-min=10.4 -isysroot /Developer/SDKs/MacOSX10.4u.sdk -arch $(ARCH_TYPE)" +ZLIB_LDFLAGS="-Wl,-syslibroot,/Developer/SDKs/MacOSX10.4u.sdk" build-zlib: - cd $(ZLIB_DIR) && ./configure $(ZLIB_OPTS) + cd $(ZLIB_DIR) && CFLAGS=$(ZLIB_CFLAGS) LDFLAGS=$(ZLIB_LDFLAGS) ./configure $(ZLIB_OPTS) cd $(ZLIB_DIR) && make cd $(ZLIB_DIR) && make install @@ -208,7 +211,7 @@ NAME=TorBrowser DISTDIR=tbbosx-dist ## Version and name of the compressed bundle (also used for source) -VERSION=1.0.17-dev +VERSION=1.0.18-dev DEFAULT_COMPRESSED_BASENAME=TorBrowser-$(VERSION)-osx-$(ARCH_TYPE)- IM_COMPRESSED_BASENAME=TorBrowser-IM-$(VERSION)- DEFAULT_COMPRESSED_NAME=$(DEFAULT_COMPRESSED_BASENAME)

1 0

[torbrowser/maint-2.2] enable add-on updates. closes #3554.
by erinn＠torproject.org 23 Oct '11

23 Oct '11

commit 9088a2d0ce0e714d05b5c57a9805c4ca5674f67a Author: Erinn Clark <erinn(a)torproject.org> Date: Mon Jul 11 17:00:11 2011 -0300 enable add-on updates. closes #3554. --- build-scripts/config/prefs.js | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/build-scripts/config/prefs.js b/build-scripts/config/prefs.js index bff1602..78f3b48 100644 --- a/build-scripts/config/prefs.js +++ b/build-scripts/config/prefs.js @@ -59,7 +59,7 @@ user_pref("extensions.bprivacy.donotaskforfolder", true); user_pref("extensions.bprivacy.donotaskonexit", true); user_pref("extensions.bprivacy.initiated", true); user_pref("extensions.checkCompatibility", false); -user_pref("extensions.checkUpdateSecurity", false); +user_pref("extensions.checkUpdateSecurity", true); user_pref("extensions.lastAppVersion", "3.5.11"); user_pref("extensions.torbutton.fresh_install", false); user_pref("extensions.torbutton.http_port", 8118); @@ -79,8 +79,8 @@ user_pref("extensions.torbutton.socks_port", 9050); user_pref("extensions.torbutton.tor_enabled", true); user_pref("extensions.torbutton.tor_memory_jar", true); user_pref("extensions.torbutton.tz_string", "UTC+00:00"); -user_pref("extensions.update.enabled", false); -user_pref("extensions.update.notifyUser", false); +user_pref("extensions.update.enabled", true); +user_pref("extensions.update.notifyUser", true); user_pref("general.appname.override", "Netscape"); user_pref("general.appversion.override", "5.0 (Windows; en-US)"); user_pref("general.buildID.override", "0");

1 0

[torbrowser/maint-2.2] bump tbb osx to 1.0.21 to fix incorrect https-everywhere version
by erinn＠torproject.org 23 Oct '11

23 Oct '11

commit cd046bcb6796af6efb9823513ee0b64bcb7d0762 Author: Erinn Clark <erinn(a)torproject.org> Date: Tue Jul 12 19:24:28 2011 -0300 bump tbb osx to 1.0.21 to fix incorrect https-everywhere version --- README.OSX | 4 ++++ build-scripts/osx.mk | 2 +- 2 files changed, 5 insertions(+), 1 deletions(-) diff --git a/README.OSX b/README.OSX index 6cd757c..3a05c7a 100644 --- a/README.OSX +++ b/README.OSX @@ -24,6 +24,10 @@ To exit, close Firefox and Vidalia. Changelog --------- +1.0.21: Released 2011-07-12 + The new HTTPS-Everywhere was missing from the last release. Actually + add it this time. + 1.0.20: Released 2011-07-10 Update Tor to 0.2.2.30-rc Update Firefox to 3.6.18 diff --git a/build-scripts/osx.mk b/build-scripts/osx.mk index 2fa0a4d..9096537 100644 --- a/build-scripts/osx.mk +++ b/build-scripts/osx.mk @@ -211,7 +211,7 @@ NAME=TorBrowser DISTDIR=tbbosx-dist ## Version and name of the compressed bundle (also used for source) -VERSION=1.0.20-dev +VERSION=1.0.21-dev DEFAULT_COMPRESSED_BASENAME=TorBrowser-$(VERSION)-osx-$(ARCH_TYPE)- IM_COMPRESSED_BASENAME=TorBrowser-IM-$(VERSION)- DEFAULT_COMPRESSED_NAME=$(DEFAULT_COMPRESSED_BASENAME)

1 0

[torbrowser/maint-2.2] bump tbb linux to 1.1.13-dev, update tor to 0.2.2.31-rc, vidalia to 0.2.13, firefox to 3.6.20, libevent to 2.0.13-stable, remove betterprivacy, and update noscript and https-everywhere too
by erinn＠torproject.org 23 Oct '11

23 Oct '11

commit 1f6f8323165c1f1834855e9f0dae3d5447a1f2aa Author: Erinn Clark <erinn(a)torproject.org> Date: Fri Aug 19 15:46:53 2011 +0200 bump tbb linux to 1.1.13-dev, update tor to 0.2.2.31-rc, vidalia to 0.2.13, firefox to 3.6.20, libevent to 2.0.13-stable, remove betterprivacy, and update noscript and https-everywhere too --- README.Linux | 23 ++++++++++++++++------- build-scripts/linux.mk | 14 +++++++------- 2 files changed, 23 insertions(+), 14 deletions(-) diff --git a/README.Linux b/README.Linux index b5325b1..9dbee53 100644 --- a/README.Linux +++ b/README.Linux @@ -4,13 +4,12 @@ Tor Browser Bundle for GNU/Linux 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-0.9.8p) -Firefox 3.6.19 +Vidalia 0.2.13 (with Qt 4.6.2) +Tor 0.2.2.31-rc (with libevent-2.0.13-stable, zlib-1.2.5 and openssl-0.9.8p) +Firefox 3.6.20 \_ Torbutton 1.2.5 - |_ NoScript 2.1.1.2 - |_ BetterPrivacy 1.51 - |_ HTTPS Everywhere 1.0.0development.4 + |_ NoScript 2.1.2.6 + |_ HTTPS Everywhere 1.0.0development.5 Usage ----- @@ -29,9 +28,19 @@ To exit, close Firefox. Vidalia will automatically clean up and exit. Changelog --------- +1.1.13: Released 2011-08-19 + Update Tor to 0.2.2.31-rc + Update Vidalia to 0.2.13 + Update Firefox to 3.6.20 + Update Libevent to 2.0.13-stable + Update NoScript to 2.1.2.6 + Update HTTPS-Everywhere to 1.0.0development.5 + Remove BetterPrivacy until we can figure out how to make it safe in all + bundles (see #3597) + 1.1.12: Released 2011-07-13 Update Tor to 0.2.2.30-rc - Update Firefox to 3.6.1999999999 + Update Firefox to 3.6.19 Update NoScript to 2.1.1.2 Update HTTPS-Everywhere to 1.0.0development.4 diff --git a/build-scripts/linux.mk b/build-scripts/linux.mk index aa5c919..e007388 100644 --- a/build-scripts/linux.mk +++ b/build-scripts/linux.mk @@ -41,19 +41,19 @@ BUILT_DIR=$(FETCH_DIR)/built TBB_FINAL=$(BUILT_DIR)/TBBL ## Versions for our source packages -HTTPSEVERY_VER=1.0.0development.4 -FIREFOX_VER=3.6.19 -LIBEVENT_VER=2.0.12-stable +HTTPSEVERY_VER=1.0.0development.5 +FIREFOX_VER=3.6.20 +LIBEVENT_VER=2.0.13-stable LIBPNG_VER=1.4.3 -NOSCRIPT_VER=2.1.1.2 +NOSCRIPT_VER=2.1.2.6 OPENSSL_VER=0.9.8p 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.30-rc +TOR_VER=0.2.2.31-rc TORBUTTON_VER=1.2.5 -VIDALIA_VER=0.2.12 +VIDALIA_VER=0.2.13 ZLIB_VER=1.2.5 ## Extension IDs @@ -216,7 +216,7 @@ NAME=tor-browser DISTDIR=tbbl-dist ## Version and name of the compressed bundle (also used for source) -VERSION=1.1.12-dev +VERSION=1.1.13-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 to 1.0.23-dev, update tor to 0.2.2.31-rc, vidalia to 0.2.13, firefox to 3.6.20, libevent to 2.0.13-stable, remove betterprivacy, and update noscript and https-everywhere too
by erinn＠torproject.org 23 Oct '11

23 Oct '11

commit c1bc3353c0e74a59d896811e26cb9fb0cd6444ab Author: Erinn Clark <erinn(a)torproject.org> Date: Fri Aug 19 15:52:36 2011 +0200 bump tbb osx to 1.0.23-dev, update tor to 0.2.2.31-rc, vidalia to 0.2.13, firefox to 3.6.20, libevent to 2.0.13-stable, remove betterprivacy, and update noscript and https-everywhere too --- README.OSX | 21 +++++++++++++++------ build-scripts/osx.mk | 14 +++++++------- 2 files changed, 22 insertions(+), 13 deletions(-) diff --git a/README.OSX b/README.OSX index 08ca414..cea0edf 100644 --- a/README.OSX +++ b/README.OSX @@ -4,14 +4,13 @@ Tor Browser Bundle for Mac OS X 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-0.9.8p) +Vidalia 0.2.13 (with Qt 4.6.2) +Tor 0.2.2.31-rc (with libevent-2.0.13-stable, zlib-1.2.5 and openssl-0.9.8p) Polipo 1.0.4.1 -Firefox 3.6.19 +Firefox 3.6.20 \_ Torbutton 1.2.5 - |_ NoScript 2.1.1.2 - |_ HTTPS-Everywhere 1.0.0development.4 - |_ BetterPrivacy 1.51 + |_ NoScript 2.1.2.6 + |_ HTTPS-Everywhere 1.0.0development.5 Usage ----- @@ -24,6 +23,16 @@ To exit, close Firefox and Vidalia. Changelog --------- +1.0.23: Released 2011-08-19 + Update Tor to 0.2.2.31-rc + Update Vidalia to 0.2.13 + Update Firefox to 3.6.20 + Update Libevent to 2.0.13-stable + Update NoScript to 2.1.2.6 + Update HTTPS-Everywhere to 1.0.0development.5 + Remove BetterPrivacy until we can figure out how to make it safe in all + bundles (see #3597) + 1.0.22: Released 2011-07-13 Update Firefox to 3.6.19 diff --git a/build-scripts/osx.mk b/build-scripts/osx.mk index 0269494..bbcddb5 100644 --- a/build-scripts/osx.mk +++ b/build-scripts/osx.mk @@ -41,19 +41,19 @@ BUILT_DIR=$(FETCH_DIR)/built TBB_FINAL=$(BUILT_DIR)/TBBL ## Versions for our source packages -HTTPSEVERY_VER=1.0.0development.4 -FIREFOX_VER=3.6.19 -LIBEVENT_VER=2.0.12-stable +HTTPSEVERY_VER=1.0.0development.5 +FIREFOX_VER=3.6.20 +LIBEVENT_VER=2.0.13-stable LIBPNG_VER=1.4.3 -NOSCRIPT_VER=2.1.1.2 +NOSCRIPT_VER=2.1.2.6 OPENSSL_VER=0.9.8p 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.30-rc +TOR_VER=0.2.2.31-rc TORBUTTON_VER=1.2.5 -VIDALIA_VER=0.2.12 +VIDALIA_VER=0.2.13 ZLIB_VER=1.2.5 ## Extension IDs @@ -211,7 +211,7 @@ NAME=TorBrowser DISTDIR=tbbosx-dist ## Version and name of the compressed bundle (also used for source) -VERSION=1.0.22-dev +VERSION=1.0.23-dev DEFAULT_COMPRESSED_BASENAME=TorBrowser-$(VERSION)-osx-$(ARCH_TYPE)- IM_COMPRESSED_BASENAME=TorBrowser-IM-$(VERSION)- DEFAULT_COMPRESSED_NAME=$(DEFAULT_COMPRESSED_BASENAME)

1 0

[torbrowser/maint-2.2] bump tbb windows to 1.3.27, update firefox to 3.6.20
by erinn＠torproject.org 23 Oct '11

23 Oct '11

commit 2dbabab39d03002ffbbcc0cbaa3e828d4da305da Author: Erinn Clark <erinn(a)torproject.org> Date: Fri Aug 19 16:46:21 2011 +0200 bump tbb windows to 1.3.27, update firefox to 3.6.20 --- README | 13 +++++++++---- build-scripts/Makefile | 4 ++-- 2 files changed, 11 insertions(+), 6 deletions(-) diff --git a/README b/README index c9df4a1..d7e2cee 100644 --- a/README +++ b/README @@ -5,12 +5,12 @@ Included applications --------------------- Vidalia 0.2.12 (with Qt 4.6.2) -Tor 0.2.1.30 (with libevent-2.0.12-stable, zlib-1.2.5 and openssl-1.0.0d) +Tor 0.2.1.30 (with libevent-2.0.13-stable, zlib-1.2.5 and openssl-1.0.0d) Polipo 1.0.4.1 -FirefoxPortable 3.6.19 - \_ Firefox 3.6.19 +FirefoxPortable 3.6.20 + \_ Firefox 3.6.20 \_ Torbutton 1.2.5 - \_ HTTPS Everywhere 1.0.0development.4 + \_ HTTPS Everywhere 1.0.0development.5 PidginPortable 2.7.4 \_ Pidgin 2.7.5 \_ OTR 3.2 @@ -354,3 +354,8 @@ Changelog 1.3.26: Released 2011-07-13 Update Firefox to 3.6.19 + +1.3.27: Released 2011-08-19 + Update Firefox to 3.6.20 + Update Libevent to 2.0.13-stable + Update HTTPS-Everywhere to 1.0.0development.5 diff --git a/build-scripts/Makefile b/build-scripts/Makefile index 2d0f6b3..caecf1d 100644 --- a/build-scripts/Makefile +++ b/build-scripts/Makefile @@ -18,7 +18,7 @@ OPENSSL=/e/build/openssl-0.9.8p/ ## Versions TORBUTTON_VERSION=1.2.5 -FIREFOX_VERSION=3.6.19 +FIREFOX_VERSION=3.6.20 PIDGIN_VERSION=2.7.5 ## Location of bundle components @@ -49,7 +49,7 @@ DEST="Generic Bundle" NAME="Tor Browser" ## Version and name of the compressed bundle (also used for source) -VERSION=1.3.26 +VERSION=1.3.27 DEFAULT_COMPRESSED_BASENAME=tor-browser- IM_COMPRESSED_BASENAME=tor-im-browser- DEFAULT_COMPRESSED_NAME=$(DEFAULT_COMPRESSED_BASENAME)$(VERSION)

1 0

[torbrowser/maint-2.2] bump all tbb versions to firefox 3.6.19
by erinn＠torproject.org 23 Oct '11

23 Oct '11

commit 715c03a582523dfe89b64e1bd13a7f3859285796 Author: Erinn Clark <erinn(a)torproject.org> Date: Wed Jul 13 10:58:08 2011 -0300 bump all tbb versions to firefox 3.6.19 --- README | 9 ++++++--- README.Linux | 6 +++--- README.OSX | 5 ++++- build-scripts/Makefile | 4 ++-- build-scripts/linux.mk | 2 +- build-scripts/osx.mk | 4 ++-- 6 files changed, 18 insertions(+), 12 deletions(-) diff --git a/README b/README index 2afd038..c9df4a1 100644 --- a/README +++ b/README @@ -7,8 +7,8 @@ Included applications Vidalia 0.2.12 (with Qt 4.6.2) Tor 0.2.1.30 (with libevent-2.0.12-stable, zlib-1.2.5 and openssl-1.0.0d) Polipo 1.0.4.1 -FirefoxPortable 3.6.18 - \_ Firefox 3.6.18 +FirefoxPortable 3.6.19 + \_ Firefox 3.6.19 \_ Torbutton 1.2.5 \_ HTTPS Everywhere 1.0.0development.4 PidginPortable 2.7.4 @@ -347,7 +347,10 @@ Changelog Update zlib to 1.2.5 Update OpenSSL to 1.0.0d -1.3.25: Released 2011-06-11 +1.3.25: Released 2011-07-11 Update Firefox to 3.6.18 Update Libevent to 2.0.12-stable Update HTTPS-Everywhere to 1.0.0development.4 + +1.3.26: Released 2011-07-13 + Update Firefox to 3.6.19 diff --git a/README.Linux b/README.Linux index 850608c..b5325b1 100644 --- a/README.Linux +++ b/README.Linux @@ -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-0.9.8p) -Firefox 3.6.18 +Firefox 3.6.19 \_ Torbutton 1.2.5 |_ NoScript 2.1.1.2 |_ BetterPrivacy 1.51 @@ -29,9 +29,9 @@ To exit, close Firefox. Vidalia will automatically clean up and exit. Changelog --------- -1.1.12: Released 2011-07-11 +1.1.12: Released 2011-07-13 Update Tor to 0.2.2.30-rc - Update Firefox to 3.6.18 + Update Firefox to 3.6.1999999999 Update NoScript to 2.1.1.2 Update HTTPS-Everywhere to 1.0.0development.4 diff --git a/README.OSX b/README.OSX index 3a05c7a..08ca414 100644 --- a/README.OSX +++ b/README.OSX @@ -7,7 +7,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-0.9.8p) Polipo 1.0.4.1 -Firefox 3.6.18 +Firefox 3.6.19 \_ Torbutton 1.2.5 |_ NoScript 2.1.1.2 |_ HTTPS-Everywhere 1.0.0development.4 @@ -24,6 +24,9 @@ To exit, close Firefox and Vidalia. Changelog --------- +1.0.22: Released 2011-07-13 + Update Firefox to 3.6.19 + 1.0.21: Released 2011-07-12 The new HTTPS-Everywhere was missing from the last release. Actually add it this time. diff --git a/build-scripts/Makefile b/build-scripts/Makefile index 97085bb..2d0f6b3 100644 --- a/build-scripts/Makefile +++ b/build-scripts/Makefile @@ -18,7 +18,7 @@ OPENSSL=/e/build/openssl-0.9.8p/ ## Versions TORBUTTON_VERSION=1.2.5 -FIREFOX_VERSION=3.6.18 +FIREFOX_VERSION=3.6.19 PIDGIN_VERSION=2.7.5 ## Location of bundle components @@ -49,7 +49,7 @@ DEST="Generic Bundle" NAME="Tor Browser" ## Version and name of the compressed bundle (also used for source) -VERSION=1.3.25 +VERSION=1.3.26 DEFAULT_COMPRESSED_BASENAME=tor-browser- IM_COMPRESSED_BASENAME=tor-im-browser- DEFAULT_COMPRESSED_NAME=$(DEFAULT_COMPRESSED_BASENAME)$(VERSION) diff --git a/build-scripts/linux.mk b/build-scripts/linux.mk index cc185be..aa5c919 100644 --- a/build-scripts/linux.mk +++ b/build-scripts/linux.mk @@ -42,7 +42,7 @@ TBB_FINAL=$(BUILT_DIR)/TBBL ## Versions for our source packages HTTPSEVERY_VER=1.0.0development.4 -FIREFOX_VER=3.6.18 +FIREFOX_VER=3.6.19 LIBEVENT_VER=2.0.12-stable LIBPNG_VER=1.4.3 NOSCRIPT_VER=2.1.1.2 diff --git a/build-scripts/osx.mk b/build-scripts/osx.mk index 9096537..0269494 100644 --- a/build-scripts/osx.mk +++ b/build-scripts/osx.mk @@ -42,7 +42,7 @@ TBB_FINAL=$(BUILT_DIR)/TBBL ## Versions for our source packages HTTPSEVERY_VER=1.0.0development.4 -FIREFOX_VER=3.6.18 +FIREFOX_VER=3.6.19 LIBEVENT_VER=2.0.12-stable LIBPNG_VER=1.4.3 NOSCRIPT_VER=2.1.1.2 @@ -211,7 +211,7 @@ NAME=TorBrowser DISTDIR=tbbosx-dist ## Version and name of the compressed bundle (also used for source) -VERSION=1.0.21-dev +VERSION=1.0.22-dev DEFAULT_COMPRESSED_BASENAME=TorBrowser-$(VERSION)-osx-$(ARCH_TYPE)- IM_COMPRESSED_BASENAME=TorBrowser-IM-$(VERSION)- DEFAULT_COMPRESSED_NAME=$(DEFAULT_COMPRESSED_BASENAME)

1 0

[torbrowser/maint-2.2] downgrade to vidalia 0.2.12, 0.2.13 isn't ready for stable bundles
by erinn＠torproject.org 23 Oct '11

23 Oct '11

commit bf2032f077487acfbdfbe673b4d9f970bc9a034f Author: Erinn Clark <erinn(a)torproject.org> Date: Fri Aug 19 20:30:19 2011 +0200 downgrade to vidalia 0.2.12, 0.2.13 isn't ready for stable bundles --- README.Linux | 3 +-- README.OSX | 3 +-- build-scripts/linux.mk | 2 +- build-scripts/osx.mk | 2 +- 4 files changed, 4 insertions(+), 6 deletions(-) diff --git a/README.Linux b/README.Linux index 9dbee53..60b8bce 100644 --- a/README.Linux +++ b/README.Linux @@ -4,7 +4,7 @@ Tor Browser Bundle for GNU/Linux Included applications --------------------- -Vidalia 0.2.13 (with Qt 4.6.2) +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-0.9.8p) Firefox 3.6.20 \_ Torbutton 1.2.5 @@ -30,7 +30,6 @@ Changelog 1.1.13: Released 2011-08-19 Update Tor to 0.2.2.31-rc - Update Vidalia to 0.2.13 Update Firefox to 3.6.20 Update Libevent to 2.0.13-stable Update NoScript to 2.1.2.6 diff --git a/README.OSX b/README.OSX index cea0edf..a5c6673 100644 --- a/README.OSX +++ b/README.OSX @@ -4,7 +4,7 @@ Tor Browser Bundle for Mac OS X Included applications --------------------- -Vidalia 0.2.13 (with Qt 4.6.2) +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-0.9.8p) Polipo 1.0.4.1 Firefox 3.6.20 @@ -25,7 +25,6 @@ Changelog 1.0.23: Released 2011-08-19 Update Tor to 0.2.2.31-rc - Update Vidalia to 0.2.13 Update Firefox to 3.6.20 Update Libevent to 2.0.13-stable Update NoScript to 2.1.2.6 diff --git a/build-scripts/linux.mk b/build-scripts/linux.mk index e007388..d725dd0 100644 --- a/build-scripts/linux.mk +++ b/build-scripts/linux.mk @@ -53,7 +53,7 @@ POLIPO_VER=1.0.4.1 QT_VER=4.6.2 TOR_VER=0.2.2.31-rc TORBUTTON_VER=1.2.5 -VIDALIA_VER=0.2.13 +VIDALIA_VER=0.2.12 ZLIB_VER=1.2.5 ## Extension IDs diff --git a/build-scripts/osx.mk b/build-scripts/osx.mk index bbcddb5..f4a25e1 100644 --- a/build-scripts/osx.mk +++ b/build-scripts/osx.mk @@ -53,7 +53,7 @@ POLIPO_VER=1.0.4.1 QT_VER=4.6.2 TOR_VER=0.2.2.31-rc TORBUTTON_VER=1.2.5 -VIDALIA_VER=0.2.13 +VIDALIA_VER=0.2.12 ZLIB_VER=1.2.5 ## Extension IDs

1 0

[torbrowser/maint-2.2] stop calling the install-betteprivacy target in makefiles too
by erinn＠torproject.org 23 Oct '11

23 Oct '11

commit 57bd70de17606df28526ad9524f22f64849f66af Author: Erinn Clark <erinn(a)torproject.org> Date: Fri Aug 19 20:31:12 2011 +0200 stop calling the install-betteprivacy target in makefiles too --- build-scripts/linux.mk | 2 +- build-scripts/osx.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/build-scripts/linux.mk b/build-scripts/linux.mk index d725dd0..deba909 100644 --- a/build-scripts/linux.mk +++ b/build-scripts/linux.mk @@ -449,7 +449,7 @@ compressed-bundle_%: LANGCODE=$* make -f linux.mk compressed-bundle-localized bundle-localized_%.stamp: - 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 + make -f linux.mk copy-files_$* install-extensions 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 diff --git a/build-scripts/osx.mk b/build-scripts/osx.mk index f4a25e1..d101ec1 100644 --- a/build-scripts/osx.mk +++ b/build-scripts/osx.mk @@ -443,7 +443,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 bundle-localized: bundle-localized_$(LANGCODE).stamp

1 0

[torbrowser/maint-2.2] [2824 Linux] Set UID:GID of files in TBB-Linux tarball to 0:0 (root:wheel)
by erinn＠torproject.org 23 Oct '11

23 Oct '11

commit 037f07b7008643793704af280a847a82296591f7 Author: Robert Ransom <rransom.8774(a)gmail.com> Date: Tue Aug 23 01:36:33 2011 -0400 [2824 Linux] Set UID:GID of files in TBB-Linux tarball to 0:0 (root:wheel) As a result of this change, the build process for TBB for Linux now requires 'Tardy' (http://tardy.sourceforge.net/ ; Debian package 'tardy'). (I tested this Tardy command line with version 1.12 from Debian Squeeze, but not as part of the TBB build process.) --- 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 deba909..2c3b7b8 100644 --- a/build-scripts/linux.mk +++ b/build-scripts/linux.mk @@ -457,7 +457,7 @@ bundle-localized: bundle-localized_$(LANGCODE).stamp compressed-bundle-localized: bundle-localized_$(LANGCODE).stamp -rm -f $(DISTDIR)/$(COMPRESSED_NAME)_$(LANGCODE).tar.gz -mkdir $(DISTDIR) - tar -cvzf $(DISTDIR)/$(DEFAULT_COMPRESSED_BASENAME)$(LANGCODE).tar.gz $(NAME)_$(LANGCODE); + tar -cvf - $(NAME)_$(LANGCODE) |tardy -unu 0 -una root -gnu 0 -gna wheel |gzip -c9 >$(DISTDIR)/$(DEFAULT_COMPRESSED_BASENAME)$(LANGCODE).tar.gz rm *.zip *.xpi cp test/torbutton.xpi torbutton.xpi

1 0