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

[torbrowser/maint-2.2] use the right paths for adding tbb version in prefs.js on windows and linux
by erinn＠torproject.org 28 Aug '11

28 Aug '11

commit 1907b9e7455eaaa1fbd0aed614aeab55b2d6fdae Author: Erinn Clark <erinn(a)torproject.org> Date: Sun Aug 28 20:37:03 2011 +0100 use the right paths for adding tbb version in prefs.js on windows and linux --- build-scripts/linux.mk | 3 ++- build-scripts/windows.mk | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/build-scripts/linux.mk b/build-scripts/linux.mk index 85f8830..904aed7 100644 --- a/build-scripts/linux.mk +++ b/build-scripts/linux.mk @@ … [View More]

1 0

r24973: {website} update some of the vidalia macros (website/trunk/projects/en)
by Erinn Clark 28 Aug '11

28 Aug '11

Author: erinn Date: 2011-08-28 19:00:52 +0000 (Sun, 28 Aug 2011) New Revision: 24973 Modified: website/trunk/projects/en/vidalia.wml Log: update some of the vidalia macros Modified: website/trunk/projects/en/vidalia.wml =================================================================== --- website/trunk/projects/en/vidalia.wml 2011-08-28 16:59:59 UTC (rev 24972) +++ website/trunk/projects/en/vidalia.wml 2011-08-28 19:00:52 UTC (rev 24973) @@ -55,26 +55,26 @@ </p> <h4&… [View More]gt;Stable Releases</h4> - <p> The most recent stable release is: 0.2.12</p> + <p> The most recent stable release is: <version-vidalia-stable></p> <ul> <li> - <a href="../dist/vidalia-bundles/vidalia-bundle-0.2.2.30-rc-0.2.12.exe">Windows Installer</a> - (<a href="../dist/vidalia-bundles/vidalia-bundle-0.2.2.30-rc-0.2.12.exe.asc">sig</a>) + <a href="../dist/vidalia-bundles/vidalia-bundle-<version-stable>-<version-vidalia-stable>.exe">Windows Installer</a> + (<a href="../dist/vidalia-bundles/vidalia-bundle-<version-stable>-<version-vidalia-stable>.exe.asc">sig</a>) </li> <li> - <a href="../dist/vidalia-bundles/vidalia-bundle-0.2.2.30-rc-0.2.12-i386.dmg">Mac OS X x86 Only</a> - (<a href="../dist/vidalia-bundles/vidalia-bundle-0.2.2.30-rc-0.2.12-i386.dmg.asc">sig</a>) + <a href="../dist/vidalia-bundles/vidalia-bundle-<version-stable>-<version-vidalia-stable>-i386.dmg">Mac OS X x86 Only</a> + (<a href="../dist/vidalia-bundles/vidalia-bundle-<version-stable>-<version-vidalia-stable>-i386.dmg.asc">sig</a>) </li> <li> - <a href="../dist/vidalia-bundles/vidalia-bundle-0.2.2.30-rc-0.2.12-i386.dmg">Mac OS X PPC Only</a> - (<a href="../dist/vidalia-bundles/vidalia-bundle-0.2.2.30-rc-0.2.12-i386.dmg.asc">sig</a>) + <a href="../dist/vidalia-bundles/vidalia-bundle-<version-stable>-<version-vidalia-stable>-i386.dmg">Mac OS X PPC Only</a> + (<a href="../dist/vidalia-bundles/vidalia-bundle-<version-stable>-<version-vidalia-stable>-i386.dmg.asc">sig</a>) </li> <li> <a href="<page docs/debian-vidalia>">Instructions for Debian/Ubuntu/Knoppix Repositories</a> </li> <li> - <a href="../dist/vidalia/vidalia-0.2.12.tar.gz">Source Tarball</a> - (<a href="../dist/vidalia/vidalia-0.2.12.tar.gz.sig">sig</a>) + <a href="../dist/vidalia/vidalia-<version-vidalia-stable>.tar.gz">Source Tarball</a> + (<a href="../dist/vidalia/vidalia-<version-vidalia-stable>.tar.gz.asc">sig</a>) </li> </ul> [View Less]

1 0

[torbrowser/maint-2.2] give windows an updated prefs.js as well
by erinn＠torproject.org 28 Aug '11

28 Aug '11

commit 0eddd4ad3c37bd8a49030e65bbff0367534b9865 Author: Erinn Clark <erinn(a)torproject.org> Date: Sun Aug 28 19:22:15 2011 +0100 give windows an updated prefs.js as well --- build-scripts/config/windows-4.0.js | 5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-) diff --git a/build-scripts/config/windows-4.0.js b/build-scripts/config/windows-4.0.js index 13fda1f..a9cbdc8 100644 --- a/build-scripts/config/windows-4.0.js +++ b/build-scripts/config/windows-4.0.js @@ -38,7 +… [View More]

1 0

[torbrowser/maint-2.2] update windows and linux to 2.2.32-1 as well
by erinn＠torproject.org 28 Aug '11

28 Aug '11

commit 17c0d034c0e078a9a4e6353a2e7a8279d4f3a72b Author: Erinn Clark <erinn(a)torproject.org> Date: Sun Aug 28 19:21:48 2011 +0100 update windows and linux to 2.2.32-1 as well --- README.LINUX-2.2 | 6 +++--- README.WIN-2.2 | 8 ++++---- build-scripts/windows.mk | 2 +- changelog.linux-2.2 | 9 +++++++++ changelog.win-2.2 | 11 ++++++++++- 5 files changed, 27 insertions(+), 9 deletions(-) diff --git a/README.LINUX-2.2 b/README.LINUX-2.2 … [View More]index 47f2684..176ee30 100644 --- a/README.LINUX-2.2 +++ b/README.LINUX-2.2 @@ -4,10 +4,10 @@ Tor Browser Bundle for GNU/Linux Included applications --------------------- -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-1.0.0d) +Vidalia 0.2.14 (with Qt 4.6.2) +Tor 0.2.2.32 (with libevent-2.0.13-stable, zlib-1.2.5 and openssl-1.0.0d) Firefox (Aurora) 6.0 - \_ Torbutton 1.4.0 + \_ Torbutton 1.4.1 |_ NoScript 2.1.2.6 |_ HTTPS-Everywhere 1.0.0development.5 diff --git a/README.WIN-2.2 b/README.WIN-2.2 index 519c64f..5ab55a0 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.12 (with Qt 4.6.2) -Tor 0.2.2.31-rc (with libevent-2.0.13-stable, zlib-1.2.5 and openssl-1.0.0d) -FirefoxPortable 5.0.1 +Vidalia 0.2.14 (with Qt 4.6.2) +Tor 0.2.2.32 (with libevent-2.0.13-stable, zlib-1.2.5 and openssl-1.0.0d) +FirefoxPortable 6.0 \_ Firefox (Aurora) 6.0 - \_ Torbutton 1.4.0 + \_ Torbutton 1.4.1 |_ NoScript 2.1.2.6 |_ HTTPS-Everywhere 1.0.0development.5 diff --git a/build-scripts/windows.mk b/build-scripts/windows.mk index 1a52f6a..294b2c6 100644 --- a/build-scripts/windows.mk +++ b/build-scripts/windows.mk @@ -138,7 +138,7 @@ NAME="Tor Browser" DISTDIR=tbbwin-alpha-dist ## Version and name of the compressed bundle (also used for source) -VERSION=$(RELEASE_VER)-2-alpha +VERSION=$(RELEASE_VER)-1-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 1d29228..6d49e4a 100644 --- a/changelog.linux-2.2 +++ b/changelog.linux-2.2 @@ -1,3 +1,12 @@ +Tor Browser Bundle (2.2.32-1) alpha; suite=linux + + * Update Tor to 0.2.2.32 + * Update Vidalia to 0.2.14 + * Update Torbutton to 1.4.1 + * Enable automatic port choosing (closes: #2264) + + -- Erinn Clark <erinn(a)torproject.org> Sun Aug 28 17:20:46 BST 2011 + Tor Browser Bundle (2.2.31-2) alpha; suite=linux * Fix x86_64 bundle to have the right libraries and binaries (closes: #3773) diff --git a/changelog.win-2.2 b/changelog.win-2.2 index bc070ec..96eae99 100644 --- a/changelog.win-2.2 +++ b/changelog.win-2.2 @@ -1,4 +1,13 @@ -Tor Browser Bundle (2.2.30-1) alpha; suite=windows +Tor Browser Bundle (2.2.32-1) alpha; suite=windows + + * Update Tor to 0.2.2.32 + * Update Vidalia to 0.2.14 + * Update Torbutton to 1.4.1 + * Enable automatic port choosing (closes: #2264) + + -- Erinn Clark <erinn(a)torproject.org> Sun Aug 28 17:20:46 BST 2011 + +Tor Browser Bundle (2.2.31-1) alpha; suite=windows * Update Tor to 0.2.2.31-rc * Update Firefox to 6.0 [View Less]

1 0

[torbrowser/maint-2.2] give windows and linux the ability to write their tbb version into prefs.js too
by erinn＠torproject.org 28 Aug '11

28 Aug '11

commit 703a9aa38e53d4d043fe9c8d6c4566eca2ee8693 Author: Erinn Clark <erinn(a)torproject.org> Date: Sun Aug 28 19:24:58 2011 +0100 give windows and linux the ability to write their tbb version into prefs.js too --- build-scripts/linux.mk | 6 +++++- build-scripts/windows.mk | 6 +++++- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/build-scripts/linux.mk b/build-scripts/linux.mk index 659e3b0..85f8830 100644 --- a/build-scripts/linux.mk +++ b/build-scripts/… [View More]linux.mk @@ -392,7 +392,8 @@ compressed-bundle_%: LANGCODE=$* make -f linux.mk compressed-bundle-localized bundle-localized_%.stamp: - make -f linux.mk copy-files_$* install-extensions 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 write-tbb-version touch bundle-localized_$*.stamp bundle-localized: bundle-localized_$(LANGCODE).stamp @@ -466,3 +467,6 @@ update-extension-pref: ext_ver=$$(sed -n '/em:version/{s,.*="$.*$".*,\1,p;q}' $(BUNDLE)/Data/profile/extensions/langpack-$(LANGCODE)(a)firefox.mozilla.org/install.rdf) \ sed -i -e "s/SHPONKA/langpack-$(LANGCODE)@firefox.mozilla.org:$$ext_ver/g" $(BUNDLE)/Data/profile/prefs.js +write-tbb-version: + printf 'user_pref("torbrowser.version", "%s");\n' "$(RELEASE_VER)" >> $(BUNDLE)/Library/Application\ Support/Firefox/Profiles/profile/prefs.js + diff --git a/build-scripts/windows.mk b/build-scripts/windows.mk index 294b2c6..2016242 100644 --- a/build-scripts/windows.mk +++ b/build-scripts/windows.mk @@ -360,7 +360,8 @@ split-bundle_%: LANGCODE=$* make -f windows.mk split-bundle-localized bundle-localized_%.stamp: - make -f windows.mk copy-files_$* install-extensions install-torbutton install-httpseverywhere install-noscript patch-vidalia-language patch-firefox-language patch-pidgin-language + make -f windows.mk copy-files_$* install-extensions install-torbutton install-httpseverywhere install-noscript \ + patch-vidalia-language patch-firefox-language patch-pidgin-language write-tbb-version touch bundle-localized_$*.stamp bundle-localized: bundle-localized_$(LANGCODE).stamp @@ -439,6 +440,9 @@ patch-firefox-language: apply-prefs: cp $(DEST)/FirefoxPortable/Data/profile/prefs.js $(CONFIG_SRC) +write-tbb-version: + printf 'user_pref("torbrowser.version", "%s");\n' "$(RELEASE_VER)" >> $(BUNDLE)/Library/Application\ Support/Firefox/Profiles/profile/prefs.js + ## Export the source code of the bundle SRCNAME=$(COMPRESSED_NAME) SRCDEST=/tmp [View Less]

1 0

[torbrowser/maint-2.2] update prefs.js (closes: #3545, #3818, #3339)
by erinn＠torproject.org 28 Aug '11

28 Aug '11

commit 80578211b0031a47c429105ed2d8c3c4dc92ae65 Author: Erinn Clark <erinn(a)torproject.org> Date: Sun Aug 28 17:36:11 2011 +0100 update prefs.js (closes: #3545, #3818, #3339) --- build-scripts/config/no-polipo-4.0.js | 5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-) diff --git a/build-scripts/config/no-polipo-4.0.js b/build-scripts/config/no-polipo-4.0.js index 2437752..bea5d44 100644 --- a/build-scripts/config/no-polipo-4.0.js +++ b/build-scripts/config/no-polipo-4.… [View More]

1 0

[torbrowser/maint-2.2] enable auto port choosing (closes: #2264)
by erinn＠torproject.org 28 Aug '11

28 Aug '11

commit 1e3792839c3bdb1f11755a32faa3e122d9c038ba Author: Erinn Clark <erinn(a)torproject.org> Date: Sun Aug 28 17:36:48 2011 +0100 enable auto port choosing (closes: #2264) --- build-scripts/config/torrc-osx | 3 ++- build-scripts/config/vidalia.conf.ff-osx | 2 ++ 2 files changed, 4 insertions(+), 1 deletions(-) diff --git a/build-scripts/config/torrc-osx b/build-scripts/config/torrc-osx index 9d32985..4c7f0d9 100644 --- a/build-scripts/config/torrc-osx +++ b/… [View More]

1 0

[torbrowser/maint-2.2] make tbb write its version into the prefs.js file (closes: #3654)
by erinn＠torproject.org 28 Aug '11

28 Aug '11

commit 017ca6774ee2defa22e93fbbe00f3bf7000c9111 Author: Erinn Clark <erinn(a)torproject.org> Date: Sun Aug 28 17:37:29 2011 +0100 make tbb write its version into the prefs.js file (closes: #3654) --- build-scripts/osx.mk | 6 ++++-- 1 files changed, 4 insertions(+), 2 deletions(-) diff --git a/build-scripts/osx.mk b/build-scripts/osx.mk index 0b07e67..2e8b290 100644 --- a/build-scripts/osx.mk +++ b/build-scripts/osx.mk @@ -351,9 +351,8 @@ bundle_%: compressed-bundle_%: … [View More]

1 0

[torbrowser/maint-2.2] [Linux] Add UI improvements to complain suggested by velope
by erinn＠torproject.org 28 Aug '11

28 Aug '11

commit 2887bae388b663de2f6f3d1ccec6b5c8e0295d9b Author: Robert Ransom <rransom.8774(a)gmail.com> Date: Thu Aug 25 23:09:20 2011 -0400 [Linux] Add UI improvements to complain suggested by velope (cherry picked from commit a8243193ec3930329fa6e3928a2b2a8a42eafff1) --- src/RelativeLink/RelativeLink.sh | 19 ++++++++++++++++--- 1 files changed, 16 insertions(+), 3 deletions(-) diff --git a/src/RelativeLink/RelativeLink.sh b/src/RelativeLink/RelativeLink.sh index 462ca98..… [View More]

1 0

[torbrowser/maint-2.2] [Linux] Accept -debug instead of --debug in RelativeLink.sh
by erinn＠torproject.org 28 Aug '11

28 Aug '11

commit 0d007d4789ac142d5929529de3b1a0cf2082d385 Author: Robert Ransom <rransom.8774(a)gmail.com> Date: Thu Aug 25 23:11:27 2011 -0400 [Linux] Accept -debug instead of --debug in RelativeLink.sh Suggested by velope. (cherry picked from commit 52458db5b9a108d81c4869f10c4ee2bee4aeac18) --- src/RelativeLink/RelativeLink.sh | 8 ++++++-- 1 files changed, 6 insertions(+), 2 deletions(-) diff --git a/src/RelativeLink/RelativeLink.sh b/src/RelativeLink/RelativeLink.sh … [View More]

1 0