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

[torbrowser/maint-2.2] Make sure that tor links libraries statically
by erinn＠torproject.org 23 Oct '11

23 Oct '11

commit 38bc5784b70128fb0b611e25f3149bfe23989ede Author: Sebastian Hahn <sebastian(a)torproject.org> Date: Mon Jan 17 23:56:45 2011 +0100 Make sure that tor links libraries statically Fixes the TBB part of bug 2406 --- README | 3 +++ build-scripts/osx.mk | 2 +- 2 files changed, 4 insertions(+), 1 deletions(-) diff --git a/README b/README index 7085c52..9730ead 100644 --- a/README +++ b/README @@ -320,3 +320,6 @@ Changelog 1.3.17: Released 2011-01-16 Update Tor to 0.2.1.29 + +1.3.18: Released 2011-??-?? + Update the OS X makefile to make sure that tor links zlib, libevent and openssl statically. Fixes bug #2406. diff --git a/build-scripts/osx.mk b/build-scripts/osx.mk index 47871d2..f5fd4de 100644 --- a/build-scripts/osx.mk +++ b/build-scripts/osx.mk @@ -148,7 +148,7 @@ build-libevent: TOR_DIR=$(FETCH_DIR)/tor-$(TOR_VER) TOR_CFLAGS="-O -g -mmacosx-version-min=10.4 -isysroot /Developer/SDKs/MacOSX10.4u.sdk -arch i386" TOR_LDFLAGS="-Wl,-syslibroot,/Developer/SDKs/MacOSX10.4u.sdk" -TOR_OPTS=--with-openssl-dir=$(BUILT_DIR) --with-zlib-dir=$(BUILT_DIR) --with-libevent-dir=$(BUILT_DIR)/lib --prefix=$(BUILT_DIR) CC="gcc-4.0" +TOR_OPTS=--enable-static-openssl --enable-static-zlib --enable-static-libevent --with-openssl-dir=$(BUILT_DIR) --with-zlib-dir=$(BUILT_DIR) --with-libevent-dir=$(BUILT_DIR)/lib --prefix=$(BUILT_DIR) CC="gcc-4.0" build-tor: cd $(TOR_DIR) && CFLAGS=$(TOR_CFLAGS) LDFLAGS=$(TOR_LDFLAGS) ./configure $(TOR_OPTS) cd $(TOR_DIR) && make $(MAKEFLAGS)

1 0

[torbrowser/maint-2.2] update changelog, comment out old dylib stuff in makefile 'til we're sure statically built tor works
by erinn＠torproject.org 23 Oct '11

23 Oct '11

commit 630ef178b42b835f74ba7d543e679e07e8b03df4 Author: Erinn Clark <erinn(a)torproject.org> Date: Tue Jan 18 06:15:04 2011 +0100 update changelog, comment out old dylib stuff in makefile 'til we're sure statically built tor works --- README | 3 --- README.OSX | 4 ++++ build-scripts/osx.mk | 16 ++++++++-------- 3 files changed, 12 insertions(+), 11 deletions(-) diff --git a/README b/README index 9730ead..7085c52 100644 --- a/README +++ b/README @@ -320,6 +320,3 @@ Changelog 1.3.17: Released 2011-01-16 Update Tor to 0.2.1.29 - -1.3.18: Released 2011-??-?? - Update the OS X makefile to make sure that tor links zlib, libevent and openssl statically. Fixes bug #2406. diff --git a/README.OSX b/README.OSX index 38c1333..d643844 100644 --- a/README.OSX +++ b/README.OSX @@ -24,6 +24,10 @@ To exit, close Firefox and Vidalia. Changelog --------- +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.10: Released 2011-01-16 Update Tor to 0.2.2.21-alpha Update NoScript to 2.0.9.3 diff --git a/build-scripts/osx.mk b/build-scripts/osx.mk index d880226..32a0a31 100644 --- a/build-scripts/osx.mk +++ b/build-scripts/osx.mk @@ -208,7 +208,7 @@ NAME=TorBrowser DISTDIR=tbbosx-dist ## Version and name of the compressed bundle (also used for source) -VERSION=1.0.10-dev +VERSION=1.0.11-dev DEFAULT_COMPRESSED_BASENAME=TorBrowser-$(VERSION)-osx-$(ARCH_TYPE)- IM_COMPRESSED_BASENAME=TorBrowser-IM-$(VERSION)- DEFAULT_COMPRESSED_NAME=$(DEFAULT_COMPRESSED_BASENAME) @@ -297,7 +297,7 @@ generic-bundle: directory-structure install-binaries install-docs install-firefo touch generic-bundle.stamp APPDIR=$(DEST)/Contents/MacOS -LIBSDIR=$(DEST)/Contents/Frameworks +#LIBSDIR=$(DEST)/Contents/Frameworks DOCSDIR=$(DEST)/Contents/Resources/Docs DATADIR=$(DEST)/Contents/Resources/Data TB_TMPDIR=$(DEST)/Contents/SharedSupport @@ -308,7 +308,7 @@ directory-structure: mkdir -p $(APPDIR) mkdir -p $(APPDIR)/Firefox.app/Contents/MacOS/Data/profile mkdir -p $(APPDIR)/Firefox.app/Contents/MacOS/Data/plugins - mkdir -p $(LIBSDIR) + #mkdir -p $(LIBSDIR) mkdir -p $(DATADIR)/Tor mkdir -p $(DATADIR)/Vidalia mkdir -p $(DATADIR)/Polipo @@ -319,13 +319,13 @@ directory-structure: ## Firefox and Pidgin are installed in their own targets install-binaries: # zlib - cp -R $(ZLIB)/libz.1.2.3.dylib $(ZLIB)/libz.1.dylib $(ZLIB)/libz.dylib $(LIBSDIR) + #cp -R $(ZLIB)/libz.1.2.3.dylib $(ZLIB)/libz.1.dylib $(ZLIB)/libz.dylib $(LIBSDIR) # Libevent - cp -R $(LIBEVENT)/libevent.a $(LIBEVENT)/libevent_core.a $(LIBEVENT)/libevent_extra.a \ - $(LIBEVENT)/libevent.la $(LIBEVENT)/libevent_core.la $(LIBEVENT)/libevent_extra.la $(LIBSDIR) + #cp -R $(LIBEVENT)/libevent.a $(LIBEVENT)/libevent_core.a $(LIBEVENT)/libevent_extra.a \ + # $(LIBEVENT)/libevent.la $(LIBEVENT)/libevent_core.la $(LIBEVENT)/libevent_extra.la $(LIBSDIR) # OpenSSL - cp -R $(OPENSSL)/libcrypto.dylib $(OPENSSL)/libcrypto.0.9.8.dylib $(OPENSSL)/libssl.dylib \ - $(OPENSSL)/libssl.0.9.8.dylib $(LIBSDIR) + #cp -R $(OPENSSL)/libcrypto.dylib $(OPENSSL)/libcrypto.0.9.8.dylib $(OPENSSL)/libssl.dylib \ + # $(OPENSSL)/libssl.0.9.8.dylib $(LIBSDIR) #cp -R $(OPENSSL)/libcrypto* $(OPENSSL)/libssl* $(LIBSDIR) # Vidalia cp -R $(VIDALIA) $(APPDIR)/Vidalia.app

1 0

[torbrowser/maint-2.2] update some build options for zlib and openssl
by erinn＠torproject.org 23 Oct '11

23 Oct '11

commit 096b0db4971b9353b50119fb3204617f7957e385 Author: Erinn Clark <erinn(a)torproject.org> Date: Tue Jan 18 05:33:33 2011 +0100 update some build options for zlib and openssl --- build-scripts/osx.mk | 8 +++----- 1 files changed, 3 insertions(+), 5 deletions(-) diff --git a/build-scripts/osx.mk b/build-scripts/osx.mk index f5fd4de..d880226 100644 --- a/build-scripts/osx.mk +++ b/build-scripts/osx.mk @@ -102,20 +102,18 @@ source-dance: fetch-source unpack-source echo "We're ready for building now." ZLIB_DIR=$(FETCH_DIR)/zlib-$(ZLIB_VER) -ZLIB_OPTS=--shared --prefix=$(BUILT_DIR) +ZLIB_OPTS=--prefix=$(BUILT_DIR) build-zlib: cd $(ZLIB_DIR) && ./configure $(ZLIB_OPTS) cd $(ZLIB_DIR) && make cd $(ZLIB_DIR) && make install OPENSSL_DIR=$(FETCH_DIR)/openssl-$(OPENSSL_VER) -OPENSSL_OPTS=-no-idea -no-rc5 -no-md2 shared zlib --prefix=$(BUILT_DIR) --openssldir=$(BUILT_DIR) -I$(BUILT_DIR)/lib +OPENSSL_OPTS=-no-idea -no-rc5 -no-md2 no-shared zlib -mmacosx-version-min=10.4 -isysroot /Developer/SDKs/MacOSX10.4u.sdk -Wl,-syslibroot,/Developer/SDKs/MacOSX10.4u.sdk --prefix=$(BUILT_DIR) --openssldir=$(BUILT_DIR) -I$(BUILT_DIR)/lib build-openssl: cd $(OPENSSL_DIR) && ./config $(OPENSSL_OPTS) cd $(OPENSSL_DIR) && make depend - cd $(OPENSSL_DIR) && CC=/usr/bin/gcc-4.0 \ - CFLAGS="-isysroot /Developer/SDKs/MacOSX10.5.sdk" \ - LDFLAGS="-syslibroot /Developer/SDKs/MacOSX10.5.sdk" make + cd $(OPENSSL_DIR) && CC=/usr/bin/gcc-4.0 make cd $(OPENSSL_DIR) && make install QT_DIR=$(FETCH_DIR)/qt-everywhere-opensource-src-$(QT_VER)

1 0

[torbrowser/maint-2.2] update tbb linux tor to 0.2.2.22-alpha and remove polipo and privoxy check from launch script
by erinn＠torproject.org 23 Oct '11

23 Oct '11

commit f0f11640ad1d96a650ddff794727bc00f462b489 Author: Erinn Clark <erinn(a)torproject.org> Date: Tue Jan 25 08:22:42 2011 +0100 update tbb linux tor to 0.2.2.22-alpha and remove polipo and privoxy check from launch script --- README.Linux | 6 +++++- src/RelativeLink/RelativeLink.sh | 2 +- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/README.Linux b/README.Linux index e2774b0..24fb022 100644 --- a/README.Linux +++ b/README.Linux @@ -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) Firefox 3.6.13 \_ Torbutton 1.2.5 |_ NoScript 2.0.9.3 @@ -29,6 +29,10 @@ To exit, close Firefox. Vidalia will automatically clean up and exit. Changelog --------- +1.1.4: Released 2011-01-27 + Update Tor to 0.2.2.22-alpha + Remove useless polipo and privoxy check from shell script + 1.1.3-1: Released 2011-01-18 32-bit only fix: put actual Tor 0.2.2.21-alpha in the tarball diff --git a/src/RelativeLink/RelativeLink.sh b/src/RelativeLink/RelativeLink.sh index e7b7be4..5b83305 100755 --- a/src/RelativeLink/RelativeLink.sh +++ b/src/RelativeLink/RelativeLink.sh @@ -44,7 +44,7 @@ export DYLD_PRINT_LIBRARIES # if any relevant processes are running, inform the user and exit cleanly RUNNING=0 -for process in tor vidalia polipo privoxy +for process in tor vidalia do pid=`pidof $process` if [ -n "$pid" ]; then printf "\n$process is already running as PID $pid\n\n"

1 0

[torbrowser/maint-2.2] Merge branches 'bug2406' and 'master'
by erinn＠torproject.org 23 Oct '11

23 Oct '11

commit e37f7ee0808ce49f7ec3b5fb374cc94c312cce5e Author: Erinn Clark <erinn(a)torproject.org> Date: Tue Jan 18 06:15:13 2011 +0100 Merge branches 'bug2406' and 'master'

1 0

[torbrowser/maint-2.2] make new bundles with the right tor in them for 64bit linux
by erinn＠torproject.org 23 Oct '11

23 Oct '11

commit 12d07a6fd5987de78bb4e858dd4f10579237a76e Author: Erinn Clark <erinn(a)torproject.org> Date: Wed Jan 19 20:10:59 2011 -0800 make new bundles with the right tor in them for 64bit linux --- README.Linux | 3 +++ build-scripts/linux.mk | 2 +- 2 files changed, 4 insertions(+), 1 deletions(-) diff --git a/README.Linux b/README.Linux index 66f78d7..e2774b0 100644 --- a/README.Linux +++ b/README.Linux @@ -29,6 +29,9 @@ To exit, close Firefox. Vidalia will automatically clean up and exit. Changelog --------- +1.1.3-1: Released 2011-01-18 + 32-bit only fix: put actual Tor 0.2.2.21-alpha in the tarball + 1.1.3: Released 2011-01-16 Update Tor to 0.2.2.21-alpha Update NoScript to 2.0.9.3 diff --git a/build-scripts/linux.mk b/build-scripts/linux.mk index 7939411..2fec9d4 100644 --- a/build-scripts/linux.mk +++ b/build-scripts/linux.mk @@ -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-dev +VERSION=1.1.3-1-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] be more optimistic about release dates
by erinn＠torproject.org 23 Oct '11

23 Oct '11

commit ac4849785f323e7e98f567e0623bd7d7e71d5dec Author: Erinn Clark <erinn(a)torproject.org> Date: Wed Jan 26 07:18:50 2011 +0100 be more optimistic about release dates --- README.Linux | 2 +- README.OSX | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/README.Linux b/README.Linux index 24fb022..99d9773 100644 --- a/README.Linux +++ b/README.Linux @@ -29,7 +29,7 @@ To exit, close Firefox. Vidalia will automatically clean up and exit. Changelog --------- -1.1.4: Released 2011-01-27 +1.1.4: Released 2011-01-26 Update Tor to 0.2.2.22-alpha Remove useless polipo and privoxy check from shell script diff --git a/README.OSX b/README.OSX index 95802b6..bc96149 100644 --- a/README.OSX +++ b/README.OSX @@ -24,7 +24,7 @@ To exit, close Firefox and Vidalia. Changelog --------- -1.0.12: Released 2011-01-27 +1.0.12: Released 2011-01-26 Update Tor to 0.2.2.22-alpha 1.0.11: Released 2011-01-17

1 0

[torbrowser/maint-2.2] bump tbb windows to 1.3.19 for firefox 3.6.14
by erinn＠torproject.org 23 Oct '11

23 Oct '11

commit 4a8fe511f6f8ef4f574348405ad899307b8ef506 Author: Erinn Clark <erinn(a)torproject.org> Date: Sat Mar 5 19:45:30 2011 +0100 bump tbb windows to 1.3.19 for firefox 3.6.14 --- README | 5 ++++- build-scripts/Makefile | 6 +++--- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/README b/README index da25ca4..b0fb5ec 100644 --- a/README +++ b/README @@ -7,7 +7,7 @@ Included applications Vidalia 0.2.10 (with Qt 4.6.2) Tor 0.2.1.30 (with libevent-1.4.13, zlib-1.2.3 and openssl-0.9.8p) Polipo 1.0.4.1 -FirefoxPortable 3.6.13 +FirefoxPortable 3.6.14 \_ Firefox 3.6.13 \_ Torbutton 1.2.5 \_ HTTPS Everywhere 0.9.9.development.3 @@ -324,3 +324,6 @@ Changelog 1.3.18: Released 2011-02-25 Update Tor to 0.2.1.30 Update HTTPS-Everywhere to 0.9.9.development.3 + +1.3.19: Released 2011-03-03 + Update Firefox to 3.6.14 diff --git a/build-scripts/Makefile b/build-scripts/Makefile index 5c4f69f..e88d212 100644 --- a/build-scripts/Makefile +++ b/build-scripts/Makefile @@ -18,14 +18,14 @@ OPENSSL=/e/build/openssl-0.9.8p/ ## Versions TORBUTTON_VERSION=1.2.5 -FIREFOX_VERSION=3.6.13 +FIREFOX_VERSION=3.6.14 PIDGIN_VERSION=2.7.5 ## Location of bundle components VIDALIA=/e/build/vidalia-0.2.10 TOR=/e/build/tor-0.2.1.30 POLIPO=/e/build/polipo-1.0.4.1 -FIREFOX_SRC=/e/build/FirefoxPortable-3.6.13 +FIREFOX_SRC=/e/build/FirefoxPortable-3.6.14 PIDGIN_SRC=/e/build/PidginPortable-2.7.5 ## Location of utility applications @@ -49,7 +49,7 @@ DEST="Generic Bundle" NAME="Tor Browser" ## Version and name of the compressed bundle (also used for source) -VERSION=1.3.18 +VERSION=1.3.19 DEFAULT_COMPRESSED_BASENAME=tor-browser- IM_COMPRESSED_BASENAME=tor-im-browser- DEFAULT_COMPRESSED_NAME=$(DEFAULT_COMPRESSED_BASENAME)$(VERSION)

1 0

[torbrowser/maint-2.2] update linux makefile
by erinn＠torproject.org 23 Oct '11

23 Oct '11

commit 12da9f625360cee87812c4a06be4db7fe3e30c1d Author: Erinn Clark <erinn(a)torproject.org> Date: Tue Jan 25 08:31:30 2011 +0100 update linux makefile --- 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 2fec9d4..acbf68c 100644 --- a/build-scripts/linux.mk +++ b/build-scripts/linux.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

1 0

[torbrowser/maint-2.2] bump tbb windows to 1.3.18 for tor 0.2.1.30
by erinn＠torproject.org 23 Oct '11

23 Oct '11

commit e1622f5efdb8ad46559772b72bab62fd39b0241c Author: Erinn Clark <erinn(a)torproject.org> Date: Sun Feb 27 03:21:58 2011 +0100 bump tbb windows to 1.3.18 for tor 0.2.1.30 --- README | 8 ++++++-- build-scripts/Makefile | 4 ++-- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/README b/README index 7085c52..da25ca4 100644 --- a/README +++ b/README @@ -5,12 +5,12 @@ Included applications --------------------- Vidalia 0.2.10 (with Qt 4.6.2) -Tor 0.2.1.29 (with libevent-1.4.13, zlib-1.2.3 and openssl-0.9.8p) +Tor 0.2.1.30 (with libevent-1.4.13, zlib-1.2.3 and openssl-0.9.8p) Polipo 1.0.4.1 FirefoxPortable 3.6.13 \_ Firefox 3.6.13 \_ Torbutton 1.2.5 - \_ HTTPS Everywhere 0.9.9.development.2 + \_ HTTPS Everywhere 0.9.9.development.3 PidginPortable 2.7.4 \_ Pidgin 2.7.5 \_ OTR 3.2 @@ -320,3 +320,7 @@ Changelog 1.3.17: Released 2011-01-16 Update Tor to 0.2.1.29 + +1.3.18: Released 2011-02-25 + Update Tor to 0.2.1.30 + Update HTTPS-Everywhere to 0.9.9.development.3 diff --git a/build-scripts/Makefile b/build-scripts/Makefile index e6d416f..5c4f69f 100644 --- a/build-scripts/Makefile +++ b/build-scripts/Makefile @@ -23,7 +23,7 @@ PIDGIN_VERSION=2.7.5 ## Location of bundle components VIDALIA=/e/build/vidalia-0.2.10 -TOR=/e/build/tor-0.2.1.29 +TOR=/e/build/tor-0.2.1.30 POLIPO=/e/build/polipo-1.0.4.1 FIREFOX_SRC=/e/build/FirefoxPortable-3.6.13 PIDGIN_SRC=/e/build/PidginPortable-2.7.5 @@ -49,7 +49,7 @@ DEST="Generic Bundle" NAME="Tor Browser" ## Version and name of the compressed bundle (also used for source) -VERSION=1.3.17 +VERSION=1.3.18 DEFAULT_COMPRESSED_BASENAME=tor-browser- IM_COMPRESSED_BASENAME=tor-im-browser- DEFAULT_COMPRESSED_NAME=$(DEFAULT_COMPRESSED_BASENAME)$(VERSION)

1 0