- tor-commits - lists.torproject.org

[torbrowser/maint-2.2] chmod libssl* and libcrypto* so they can get stripped
by erinn＠torproject.org 02 Feb '12

02 Feb '12

commit 71fd5b8be39485f9e7eeb4559a644a97a1c087d8 Author: Sebastian Hahn <sebastian(a)torproject.org> Date: Tue Jan 31 02:14:38 2012 +0100 chmod libssl* and libcrypto* so they can get stripped --- build-scripts/linux.mk | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/build-scripts/linux.mk b/build-scripts/linux.mk index badb523..2981381 100644 --- a/build-scripts/linux.mk +++ b/build-scripts/linux.mk @@ -292,6 +292,8 @@ install-binaries: cp -d $(LIBPNG)/libpng14.so* $(LIBSDIR) # OpenSSL cp -d $(OPENSSL)/libssl.so* $(OPENSSL)/libcrypto.so* $(LIBSDIR) + chmod 644 $(LIBSDIR)/libssl.so* + chmod 644 $(LIBSDIR)/libcrypto.so* # Vidalia cp $(VIDALIA) $(APPDIR) cp $(TOR) $(APPDIR)

1 0

[torbrowser/maint-2.2] update changelogs to add update for zlib 1.2.6
by erinn＠torproject.org 02 Feb '12

02 Feb '12

commit 891c1f989b43075a751914559942ec806bd48c5e Author: Erinn Clark <erinn(a)torproject.org> Date: Fri Feb 3 01:25:36 2012 +0100 update changelogs to add update for zlib 1.2.6 --- changelog.linux-2.2 | 1 + changelog.osx-2.2 | 1 + changelog.windows-2.2 | 1 + 3 files changed, 3 insertions(+), 0 deletions(-) diff --git a/changelog.linux-2.2 b/changelog.linux-2.2 index cef8906..9a5fa6a 100644 --- a/changelog.linux-2.2 +++ b/changelog.linux-2.2 @@ -3,6 +3,7 @@ Tor Browser Bundle (2.2.35-5); suite=linux * Update Firefox to 10.0 * Update Qt to 4.7.4 * Update OpenSSL to 1.0.0g + * Update zlib to 1.2.6 * Update HTTPS Everywhere to 1.2.2 * Update NoScript to 2.2.8 * New Firefox patches diff --git a/changelog.osx-2.2 b/changelog.osx-2.2 index 80a7d10..d93db4a 100644 --- a/changelog.osx-2.2 +++ b/changelog.osx-2.2 @@ -3,6 +3,7 @@ Tor Browser Bundle (2.2.35-5); suite=osx * Update Firefox to 10.0 * Update Qt to 4.7.4 * Update OpenSSL to 1.0.0g + * Update zlib to 1.2.6 * Update HTTPS Everywhere to 1.2.2 * Update NoScript to 2.2.8 * New Firefox patches diff --git a/changelog.windows-2.2 b/changelog.windows-2.2 index c465b79..f53a1af 100644 --- a/changelog.windows-2.2 +++ b/changelog.windows-2.2 @@ -3,6 +3,7 @@ Tor Browser Bundle (2.2.35-5); suite=windows * Update Firefox to 10.0 * Update Qt to 4.7.4 * Update OpenSSL to 1.0.0g + * Update zlib to 1.2.6 * Update HTTPS Everywhere to 1.2.2 * Update NoScript to 2.2.8 * New Firefox patches

1 0

[torbrowser/maint-2.3] Update to zlib 1.2.6
by erinn＠torproject.org 02 Feb '12

02 Feb '12

commit a4e3feca42f13e696d387a368147fff8b70c75e4 Author: Sebastian Hahn <sebastian(a)torproject.org> Date: Mon Jan 30 21:31:37 2012 +0100 Update to zlib 1.2.6 Looks like nothing we need to urgently fix, but the download would fail otherwise --- README.LINUX-2.2 | 2 +- README.OSX-2.2 | 2 +- README.WIN-2.2 | 2 +- build-scripts/linux.mk | 2 +- build-scripts/versions.mk | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/README.LINUX-2.2 b/README.LINUX-2.2 index 3466964..8f0323f 100644 --- a/README.LINUX-2.2 +++ b/README.LINUX-2.2 @@ -5,7 +5,7 @@ Included applications --------------------- Vidalia 0.2.15 (with Qt 4.7.4) -Tor 0.2.2.35 (with libevent-2.0.16-stable, zlib-1.2.5 and openssl-1.0.0g) +Tor 0.2.2.35 (with libevent-2.0.16-stable, zlib-1.2.6 and openssl-1.0.0g) Firefox 10.0 \_ Torbutton 1.4.5.1 |_ NoScript 2.2.8 diff --git a/README.OSX-2.2 b/README.OSX-2.2 index 56fb53a..c208895 100644 --- a/README.OSX-2.2 +++ b/README.OSX-2.2 @@ -5,7 +5,7 @@ Included applications --------------------- Vidalia 0.2.15 (with Qt 4.7.4) -Tor 0.2.2.35 (with libevent-2.0.16-stable, zlib-1.2.5 and openssl-1.0.0g) +Tor 0.2.2.35 (with libevent-2.0.16-stable, zlib-1.2.6 and openssl-1.0.0g) Firefox 10.0 \_ Torbutton 1.4.5.1 |_ NoScript 2.2.8 diff --git a/README.WIN-2.2 b/README.WIN-2.2 index b586bd5..9d466c1 100644 --- a/README.WIN-2.2 +++ b/README.WIN-2.2 @@ -5,7 +5,7 @@ Included applications --------------------- Vidalia 0.2.15 (with Qt 4.7.4) -Tor 0.2.2.35 (with libevent-2.0.16-stable, zlib-1.2.5 and openssl-1.0.0g) +Tor 0.2.2.35 (with libevent-2.0.16-stable, zlib-1.2.6 and openssl-1.0.0g) Firefox 10.0 \_ Torbutton 1.4.5.1 |_ NoScript 2.2.8 diff --git a/build-scripts/linux.mk b/build-scripts/linux.mk index 6bf7391..badb523 100644 --- a/build-scripts/linux.mk +++ b/build-scripts/linux.mk @@ -282,7 +282,7 @@ install-binaries: cp -d $(QT)/libQtNetwork.so* $(LIBSDIR) cp -d $(QT)/libQtXml.so* $(LIBSDIR) # zlib - cp -d $(ZLIB)/libz.so $(ZLIB)/libz.so.1 $(ZLIB)/libz.so.1.2.5 $(LIBSDIR)/libz + cp -d $(ZLIB)/libz.so $(ZLIB)/libz.so.1 $(ZLIB)/libz.so.1.2.6 $(LIBSDIR)/libz # Libevent cp -d $(LIBEVENT)/libevent-2.0.so.5 $(LIBEVENT)/libevent-2.0.so.5.1.4 $(LIBEVENT)/libevent_core.so \ $(LIBEVENT)/libevent_core-2.0.so.5 $(LIBEVENT)/libevent_core-2.0.so.5.1.4 \ diff --git a/build-scripts/versions.mk b/build-scripts/versions.mk index 1de9ad5..3fc350c 100644 --- a/build-scripts/versions.mk +++ b/build-scripts/versions.mk @@ -14,7 +14,7 @@ QT_VER=4.7.4 TOR_VER=0.2.2.35 TORBUTTON_VER=1.4.5.1 VIDALIA_VER=0.2.15 -ZLIB_VER=1.2.5 +ZLIB_VER=1.2.6 ## Extension IDs FF_VENDOR_ID:=\{ec8030f7-c20a-464f-9b0e-13a3a9e97384\}

1 0

[torbrowser/maint-2.3] Provide an unpack-qt target
by erinn＠torproject.org 02 Feb '12

02 Feb '12

commit c10708230444eb869bfd49b858bda3f1bc790131 Author: Sebastian Hahn <sebastian(a)torproject.org> Date: Mon Jan 30 21:49:12 2012 +0100 Provide an unpack-qt target --- build-scripts/versions.mk | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) diff --git a/build-scripts/versions.mk b/build-scripts/versions.mk index 3fc350c..c8e3d98 100644 --- a/build-scripts/versions.mk +++ b/build-scripts/versions.mk @@ -93,6 +93,10 @@ unpack-libpng: -rm -rf $(FETCH_DIR)/libpng-$(LIBPNG_VER) cd $(FETCH_DIR) && tar -xvjf $(LIBPNG_PACKAGE) +unpack-qt: + -rm -rf $(FETCH_DIR/qt-$(QT_VER) + cd $(FETCH_DIR) && tar -xvzf $(QT_PACKAGE) + unpack-openssl: -rm -rf $(FETCH_DIR)/openssl-$(OPENSSL_VER) cd $(FETCH_DIR) && tar -xvzf $(OPENSSL_PACKAGE)

1 0

[torbrowser/maint-2.2] update qt to 4.7.4 in versions file too
by erinn＠torproject.org 02 Feb '12

02 Feb '12

commit a5dbb9dff15bd8473d5f388856d3cc70a9bbbf71 Author: Erinn Clark <erinn(a)torproject.org> Date: Fri Feb 3 01:15:15 2012 +0100 update qt to 4.7.4 in versions file too --- build-scripts/versions.mk | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/build-scripts/versions.mk b/build-scripts/versions.mk index 5eac8db..1de9ad5 100644 --- a/build-scripts/versions.mk +++ b/build-scripts/versions.mk @@ -10,7 +10,7 @@ NOSCRIPT_VER=2.2.8 OPENSSL_VER=1.0.0g OTR_VER=3.2.0 PIDGIN_VER=2.6.4 -QT_VER=4.6.2 +QT_VER=4.7.4 TOR_VER=0.2.2.35 TORBUTTON_VER=1.4.5.1 VIDALIA_VER=0.2.15

1 0

[torbrowser/maint-2.3] update qt to 4.7.4 in versions file too
by erinn＠torproject.org 02 Feb '12

02 Feb '12

commit a5dbb9dff15bd8473d5f388856d3cc70a9bbbf71 Author: Erinn Clark <erinn(a)torproject.org> Date: Fri Feb 3 01:15:15 2012 +0100 update qt to 4.7.4 in versions file too --- build-scripts/versions.mk | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/build-scripts/versions.mk b/build-scripts/versions.mk index 5eac8db..1de9ad5 100644 --- a/build-scripts/versions.mk +++ b/build-scripts/versions.mk @@ -10,7 +10,7 @@ NOSCRIPT_VER=2.2.8 OPENSSL_VER=1.0.0g OTR_VER=3.2.0 PIDGIN_VER=2.6.4 -QT_VER=4.6.2 +QT_VER=4.7.4 TOR_VER=0.2.2.35 TORBUTTON_VER=1.4.5.1 VIDALIA_VER=0.2.15

1 0

[torbrowser/master] update qt to 4.7.4 in versions file too
by erinn＠torproject.org 02 Feb '12

02 Feb '12

commit a5dbb9dff15bd8473d5f388856d3cc70a9bbbf71 Author: Erinn Clark <erinn(a)torproject.org> Date: Fri Feb 3 01:15:15 2012 +0100 update qt to 4.7.4 in versions file too --- build-scripts/versions.mk | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/build-scripts/versions.mk b/build-scripts/versions.mk index 5eac8db..1de9ad5 100644 --- a/build-scripts/versions.mk +++ b/build-scripts/versions.mk @@ -10,7 +10,7 @@ NOSCRIPT_VER=2.2.8 OPENSSL_VER=1.0.0g OTR_VER=3.2.0 PIDGIN_VER=2.6.4 -QT_VER=4.6.2 +QT_VER=4.7.4 TOR_VER=0.2.2.35 TORBUTTON_VER=1.4.5.1 VIDALIA_VER=0.2.15

1 0

[torbrowser/maint-2.2] we no longer have debug libs for Qt on linux
by erinn＠torproject.org 02 Feb '12

02 Feb '12

commit 1e893547c24687fff74c5a1e706095b0c01099d8 Author: Erinn Clark <erinn(a)torproject.org> Date: Fri Feb 3 01:13:55 2012 +0100 we no longer have debug libs for Qt on linux --- build-scripts/linux.mk | 1 - 1 files changed, 0 insertions(+), 1 deletions(-) diff --git a/build-scripts/linux.mk b/build-scripts/linux.mk index c8cfc88..6bf7391 100644 --- a/build-scripts/linux.mk +++ b/build-scripts/linux.mk @@ -281,7 +281,6 @@ install-binaries: cp -d $(QT)/libQtGui.so* $(LIBSDIR) cp -d $(QT)/libQtNetwork.so* $(LIBSDIR) cp -d $(QT)/libQtXml.so* $(LIBSDIR) - rm $(LIBSDIR)/libQt*.so*.debug # zlib cp -d $(ZLIB)/libz.so $(ZLIB)/libz.so.1 $(ZLIB)/libz.so.1.2.5 $(LIBSDIR)/libz # Libevent

1 0

[torbrowser/maint-2.3] remote extraneous build options from the i386 mozconfig since they slow down build time
by erinn＠torproject.org 02 Feb '12

02 Feb '12

commit 6b19e7ed92d606b06e6552cc7b4e150c75264bb0 Author: Erinn Clark <erinn(a)torproject.org> Date: Fri Feb 3 01:12:11 2012 +0100 remote extraneous build options from the i386 mozconfig since they slow down build time --- build-scripts/config/mozconfig-osx-i386 | 4 ---- 1 files changed, 0 insertions(+), 4 deletions(-) diff --git a/build-scripts/config/mozconfig-osx-i386 b/build-scripts/config/mozconfig-osx-i386 index ffc90c5..11a8789 100644 --- a/build-scripts/config/mozconfig-osx-i386 +++ b/build-scripts/config/mozconfig-osx-i386 @@ -1,8 +1,4 @@ -CPU=`sysctl -a hw 2>&1 | grep 'hw.availcpu' | sed 's|hw.availcpu = *||'` -let J=$CPU*4 - # Options for client.mk. -mk_add_options MOZ_MAKE_FLAGS=-j${J} mk_add_options MOZ_OBJDIR=@TOPSRCDIR@/obj-@CONFIG_GUESS@ mk_add_options AUTOCONF=autoconf213

1 0

[torbrowser/maint-2.3] we no longer have debug libs for Qt on linux
by erinn＠torproject.org 02 Feb '12

02 Feb '12

commit 1e893547c24687fff74c5a1e706095b0c01099d8 Author: Erinn Clark <erinn(a)torproject.org> Date: Fri Feb 3 01:13:55 2012 +0100 we no longer have debug libs for Qt on linux --- build-scripts/linux.mk | 1 - 1 files changed, 0 insertions(+), 1 deletions(-) diff --git a/build-scripts/linux.mk b/build-scripts/linux.mk index c8cfc88..6bf7391 100644 --- a/build-scripts/linux.mk +++ b/build-scripts/linux.mk @@ -281,7 +281,6 @@ install-binaries: cp -d $(QT)/libQtGui.so* $(LIBSDIR) cp -d $(QT)/libQtNetwork.so* $(LIBSDIR) cp -d $(QT)/libQtXml.so* $(LIBSDIR) - rm $(LIBSDIR)/libQt*.so*.debug # zlib cp -d $(ZLIB)/libz.so $(ZLIB)/libz.so.1 $(ZLIB)/libz.so.1.2.5 $(LIBSDIR)/libz # Libevent

1 0