- tor-commits - lists.torproject.org

[torbrowser/maint-2.2] bump recommended-versions to 2.2.35-5
by erinn＠torproject.org 03 Feb '12

03 Feb '12

commit 85b5eee824bd96c9114b31a1c6dd137367005a1d Author: Erinn Clark <erinn(a)torproject.org> Date: Fri Feb 3 07:39:03 2012 +0100 bump recommended-versions to 2.2.35-5 --- build-scripts/recommended-versions | 10 +++++----- 1 files changed, 5 insertions(+), 5 deletions(-) diff --git a/build-scripts/recommended-versions b/build-scripts/recommended-versions index f1e681b..c713d85 100644 --- a/build-scripts/recommended-versions +++ b/build-scripts/recommended-versions @@ -1,7 +1,7 @@ [ -"2.2.35-4-Linux-i686", -"2.2.35-4-Linux-x86_64", -"2.2.35-4-MacOS-i386", -"2.2.35-4-MacOS-x86_64", -"2.2.35-4-Windows" +"2.2.35-5-Linux-i686", +"2.2.35-5-Linux-x86_64", +"2.2.35-5-MacOS-i386", +"2.2.35-5-MacOS-x86_64", +"2.2.35-5-Windows" ]

1 0

[torbrowser/maint-2.3] bump recommended-versions to 2.2.35-5
by erinn＠torproject.org 03 Feb '12

03 Feb '12

commit 85b5eee824bd96c9114b31a1c6dd137367005a1d Author: Erinn Clark <erinn(a)torproject.org> Date: Fri Feb 3 07:39:03 2012 +0100 bump recommended-versions to 2.2.35-5 --- build-scripts/recommended-versions | 10 +++++----- 1 files changed, 5 insertions(+), 5 deletions(-) diff --git a/build-scripts/recommended-versions b/build-scripts/recommended-versions index f1e681b..c713d85 100644 --- a/build-scripts/recommended-versions +++ b/build-scripts/recommended-versions @@ -1,7 +1,7 @@ [ -"2.2.35-4-Linux-i686", -"2.2.35-4-Linux-x86_64", -"2.2.35-4-MacOS-i386", -"2.2.35-4-MacOS-x86_64", -"2.2.35-4-Windows" +"2.2.35-5-Linux-i686", +"2.2.35-5-Linux-x86_64", +"2.2.35-5-MacOS-i386", +"2.2.35-5-MacOS-x86_64", +"2.2.35-5-Windows" ]

1 0

[torbrowser/master] bump recommended-versions to 2.2.35-5
by erinn＠torproject.org 03 Feb '12

03 Feb '12

commit 85b5eee824bd96c9114b31a1c6dd137367005a1d Author: Erinn Clark <erinn(a)torproject.org> Date: Fri Feb 3 07:39:03 2012 +0100 bump recommended-versions to 2.2.35-5 --- build-scripts/recommended-versions | 10 +++++----- 1 files changed, 5 insertions(+), 5 deletions(-) diff --git a/build-scripts/recommended-versions b/build-scripts/recommended-versions index f1e681b..c713d85 100644 --- a/build-scripts/recommended-versions +++ b/build-scripts/recommended-versions @@ -1,7 +1,7 @@ [ -"2.2.35-4-Linux-i686", -"2.2.35-4-Linux-x86_64", -"2.2.35-4-MacOS-i386", -"2.2.35-4-MacOS-x86_64", -"2.2.35-4-Windows" +"2.2.35-5-Linux-i686", +"2.2.35-5-Linux-x86_64", +"2.2.35-5-MacOS-i386", +"2.2.35-5-MacOS-x86_64", +"2.2.35-5-Windows" ]

1 0

r25372: {website} bump tbbs to 2.2.35-5 (website/trunk/include)
by Erinn Clark 03 Feb '12

03 Feb '12

Author: erinn Date: 2012-02-03 06:07:00 +0000 (Fri, 03 Feb 2012) New Revision: 25372 Modified: website/trunk/include/versions.wmi Log: bump tbbs to 2.2.35-5 Modified: website/trunk/include/versions.wmi =================================================================== --- website/trunk/include/versions.wmi 2012-02-02 04:25:38 UTC (rev 25371) +++ website/trunk/include/versions.wmi 2012-02-03 06:07:00 UTC (rev 25372) @@ -27,28 +27,28 @@ <define-tag version-osx-ppc-stable whitespace=delete>0.2.2.35</define-tag> <define-tag version-osx-ppc-alpha whitespace=delete>0.2.3.10-alpha</define-tag> -<define-tag version-torbrowserbundle whitespace=delete>2.2.35-4</define-tag> +<define-tag version-torbrowserbundle whitespace=delete>2.2.35-5</define-tag> <define-tag version-torbrowser-tor whitespace=delete>0.2.2.35</define-tag> -<define-tag version-torbrowser-tor-components whitespace=delete>libevent-2.0.16-stable, zlib-1.2.5, openssl-1.0.0f</define-tag> -<define-tag version-torbrowser-firefox whitespace=delete>9.0.1</define-tag> +<define-tag version-torbrowser-tor-components whitespace=delete>libevent-2.0.16-stable, zlib-1.2.6, openssl-1.0.0g</define-tag> +<define-tag version-torbrowser-firefox whitespace=delete>10.0</define-tag> <define-tag version-torbrowser-torbutton whitespace=delete>1.4.5.1</define-tag> <define-tag version-torbrowser-pidgin whitespace=delete>2.7.5</define-tag> <define-tag version-torbrowser-otr whitespace=delete>3.2</define-tag> <define-tag version-torbrowser-vidalia whitespace=delete>0.2.15</define-tag> <define-tag version-torimbrowserbundle whitespace=delete>1.3.21</define-tag> -<define-tag version-torbrowserbundlelinux32 whitespace=delete>2.2.35-4</define-tag> -<define-tag version-torbrowserbundlelinux64 whitespace=delete>2.2.35-4</define-tag> +<define-tag version-torbrowserbundlelinux32 whitespace=delete>2.2.35-5</define-tag> +<define-tag version-torbrowserbundlelinux64 whitespace=delete>2.2.35-5</define-tag> <define-tag version-gnu-torbrowser-tor whitespace=delete>0.2.2.35</define-tag> -<define-tag version-gnu-torbrowser-tor-components whitespace=delete>libevent-2.0.16-stable, zlib-1.2.5, openssl-1.0.0f</define-tag> -<define-tag version-gnu-torbrowser-firefox whitespace=delete>9.0.1</define-tag> +<define-tag version-gnu-torbrowser-tor-components whitespace=delete>libevent-2.0.16-stable, zlib-1.2.6, openssl-1.0.0g</define-tag> +<define-tag version-gnu-torbrowser-firefox whitespace=delete>10.0</define-tag> <define-tag version-gnu-torbrowser-torbutton whitespace=delete>1.4.5.1</define-tag> <define-tag version-gnu-torbrowser-vidalia whitespace=delete>0.2.15</define-tag> -<define-tag version-torbrowserbundleosx32 whitespace=delete>2.2.35-4</define-tag> -<define-tag version-torbrowserbundleosx64 whitespace=delete>2.2.35-4</define-tag> +<define-tag version-torbrowserbundleosx32 whitespace=delete>2.2.35-5</define-tag> +<define-tag version-torbrowserbundleosx64 whitespace=delete>2.2.35-5</define-tag> <define-tag version-osx-torbrowser-tor whitespace=delete>0.2.2.35</define-tag> -<define-tag version-osx-torbrowser-firefox whitespace=delete>9.0.1</define-tag> +<define-tag version-osx-torbrowser-firefox whitespace=delete>10.0</define-tag> <define-tag version-osx-torbrowser-torbutton whitespace=delete>1.4.5.1</define-tag> <define-tag version-osx-torbrowser-vidalia whitespace=delete>0.2.15</define-tag>

1 0

[torbrowser/maint-2.2] Remove the zlib patch, specify env variables instead
by erinn＠torproject.org 03 Feb '12

03 Feb '12

commit 298be30fce26ad1fa620ddd831922136f7931fc5 Author: Sebastian Hahn <sebastian(a)torproject.org> Date: Fri Feb 3 05:27:58 2012 +0100 Remove the zlib patch, specify env variables instead --- build-scripts/windows.mk | 7 +--- .../zlib/0001-zlib-update-Makefile.patch | 38 -------------------- 2 files changed, 2 insertions(+), 43 deletions(-) diff --git a/build-scripts/windows.mk b/build-scripts/windows.mk index a8ddb91..143d82c 100644 --- a/build-scripts/windows.mk +++ b/build-scripts/windows.mk @@ -71,12 +71,9 @@ source-dance: fetch-source unpack-source ZLIB_DIR=$(FETCH_DIR)/zlib-$(ZLIB_VER) build-zlib: - cp ../src/current-patches/zlib/* $(ZLIB_DIR) - cp patch-any-src.sh $(ZLIB_DIR) - cd $(ZLIB_DIR) && ./patch-any-src.sh cd $(ZLIB_DIR) && sed -i -e "s%prefix = /usr/local%prefix = ${BUILT_DIR}%" win32/Makefile.gcc - cd $(ZLIB_DIR) && make -f win32/Makefile.gcc - cd $(ZLIB_DIR) && make -f win32/Makefile.gcc install + cd $(ZLIB_DIR) && LDFLAGS="-Wl,--nxcompat -Wl,--dynamicbase" make -f win32/Makefile.gcc + cd $(ZLIB_DIR) && BINARY_PATH="$(BUILT_DIR)/bin" INCLUDE_PATH="$(BUILT_DIR)/include" LIBRARY_PATH="$(BUILT_DIR)/lib" make -f win32/Makefile.gcc install OPENSSL_DIR=$(FETCH_DIR)/openssl-$(OPENSSL_VER) OPENSSL_OPTS=-no-idea -no-rc5 -no-md2 shared zlib --prefix=$(BUILT_DIR) --openssldir=$(BUILT_DIR) -L$(BUILT_DIR)/lib -Wl,--nxcompat -Wl,--dynamicbase -I$(BUILT_DIR)/include diff --git a/src/current-patches/zlib/0001-zlib-update-Makefile.patch b/src/current-patches/zlib/0001-zlib-update-Makefile.patch deleted file mode 100644 index 07b9d48..0000000 --- a/src/current-patches/zlib/0001-zlib-update-Makefile.patch +++ /dev/null @@ -1,38 +0,0 @@ -From b45561038c1819c5d6264b025e872c82b7adf94f Mon Sep 17 00:00:00 2001 -From: Erinn Clark <erinn(a)torproject.org> -Date: Sat, 29 Oct 2011 01:59:59 +0100 -Subject: [PATCH] update zlib Makefile.gcc - -zlib's Makefile is inadequate for building TBB from source, so patch it to use -DEP/ASLR build options and have some actually working include and library -paths. - ---- - win32/Makefile.gcc | 4 +++- - 1 files changed, 3 insertions(+), 1 deletions(-) - -diff --git a/win32/Makefile.gcc b/win32/Makefile.gcc -index 0a33bf6..79cad54 100644 ---- a/win32/Makefile.gcc -+++ b/win32/Makefile.gcc -@@ -44,7 +44,7 @@ AS = $(CC) - ASFLAGS = $(LOC) -Wall - - LD = $(CC) --LDFLAGS = $(LOC) -+LDFLAGS = $(LOC) -Wl,--nxcompat -Wl,--dynamicbase - - AR = $(PREFIX)ar - ARFLAGS = rcs -@@ -113,6 +113,8 @@ zlibrc.o: win32/zlib1.rc - - - # BINARY_PATH, INCLUDE_PATH and LIBRARY_PATH must be set. -+INCLUDE_PATH=$(prefix)/include -+LIBRARY_PATH=$(prefix)/lib - - .PHONY: install uninstall clean - --- -1.7.5.4 -

1 0

[torbrowser/master] Remove the zlib patch, specify env variables instead
by erinn＠torproject.org 03 Feb '12

03 Feb '12

commit 298be30fce26ad1fa620ddd831922136f7931fc5 Author: Sebastian Hahn <sebastian(a)torproject.org> Date: Fri Feb 3 05:27:58 2012 +0100 Remove the zlib patch, specify env variables instead --- build-scripts/windows.mk | 7 +--- .../zlib/0001-zlib-update-Makefile.patch | 38 -------------------- 2 files changed, 2 insertions(+), 43 deletions(-) diff --git a/build-scripts/windows.mk b/build-scripts/windows.mk index a8ddb91..143d82c 100644 --- a/build-scripts/windows.mk +++ b/build-scripts/windows.mk @@ -71,12 +71,9 @@ source-dance: fetch-source unpack-source ZLIB_DIR=$(FETCH_DIR)/zlib-$(ZLIB_VER) build-zlib: - cp ../src/current-patches/zlib/* $(ZLIB_DIR) - cp patch-any-src.sh $(ZLIB_DIR) - cd $(ZLIB_DIR) && ./patch-any-src.sh cd $(ZLIB_DIR) && sed -i -e "s%prefix = /usr/local%prefix = ${BUILT_DIR}%" win32/Makefile.gcc - cd $(ZLIB_DIR) && make -f win32/Makefile.gcc - cd $(ZLIB_DIR) && make -f win32/Makefile.gcc install + cd $(ZLIB_DIR) && LDFLAGS="-Wl,--nxcompat -Wl,--dynamicbase" make -f win32/Makefile.gcc + cd $(ZLIB_DIR) && BINARY_PATH="$(BUILT_DIR)/bin" INCLUDE_PATH="$(BUILT_DIR)/include" LIBRARY_PATH="$(BUILT_DIR)/lib" make -f win32/Makefile.gcc install OPENSSL_DIR=$(FETCH_DIR)/openssl-$(OPENSSL_VER) OPENSSL_OPTS=-no-idea -no-rc5 -no-md2 shared zlib --prefix=$(BUILT_DIR) --openssldir=$(BUILT_DIR) -L$(BUILT_DIR)/lib -Wl,--nxcompat -Wl,--dynamicbase -I$(BUILT_DIR)/include diff --git a/src/current-patches/zlib/0001-zlib-update-Makefile.patch b/src/current-patches/zlib/0001-zlib-update-Makefile.patch deleted file mode 100644 index 07b9d48..0000000 --- a/src/current-patches/zlib/0001-zlib-update-Makefile.patch +++ /dev/null @@ -1,38 +0,0 @@ -From b45561038c1819c5d6264b025e872c82b7adf94f Mon Sep 17 00:00:00 2001 -From: Erinn Clark <erinn(a)torproject.org> -Date: Sat, 29 Oct 2011 01:59:59 +0100 -Subject: [PATCH] update zlib Makefile.gcc - -zlib's Makefile is inadequate for building TBB from source, so patch it to use -DEP/ASLR build options and have some actually working include and library -paths. - ---- - win32/Makefile.gcc | 4 +++- - 1 files changed, 3 insertions(+), 1 deletions(-) - -diff --git a/win32/Makefile.gcc b/win32/Makefile.gcc -index 0a33bf6..79cad54 100644 ---- a/win32/Makefile.gcc -+++ b/win32/Makefile.gcc -@@ -44,7 +44,7 @@ AS = $(CC) - ASFLAGS = $(LOC) -Wall - - LD = $(CC) --LDFLAGS = $(LOC) -+LDFLAGS = $(LOC) -Wl,--nxcompat -Wl,--dynamicbase - - AR = $(PREFIX)ar - ARFLAGS = rcs -@@ -113,6 +113,8 @@ zlibrc.o: win32/zlib1.rc - - - # BINARY_PATH, INCLUDE_PATH and LIBRARY_PATH must be set. -+INCLUDE_PATH=$(prefix)/include -+LIBRARY_PATH=$(prefix)/lib - - .PHONY: install uninstall clean - --- -1.7.5.4 -

1 0

[torbrowser/maint-2.3] Remove the zlib patch, specify env variables instead
by erinn＠torproject.org 03 Feb '12

03 Feb '12

commit 298be30fce26ad1fa620ddd831922136f7931fc5 Author: Sebastian Hahn <sebastian(a)torproject.org> Date: Fri Feb 3 05:27:58 2012 +0100 Remove the zlib patch, specify env variables instead --- build-scripts/windows.mk | 7 +--- .../zlib/0001-zlib-update-Makefile.patch | 38 -------------------- 2 files changed, 2 insertions(+), 43 deletions(-) diff --git a/build-scripts/windows.mk b/build-scripts/windows.mk index a8ddb91..143d82c 100644 --- a/build-scripts/windows.mk +++ b/build-scripts/windows.mk @@ -71,12 +71,9 @@ source-dance: fetch-source unpack-source ZLIB_DIR=$(FETCH_DIR)/zlib-$(ZLIB_VER) build-zlib: - cp ../src/current-patches/zlib/* $(ZLIB_DIR) - cp patch-any-src.sh $(ZLIB_DIR) - cd $(ZLIB_DIR) && ./patch-any-src.sh cd $(ZLIB_DIR) && sed -i -e "s%prefix = /usr/local%prefix = ${BUILT_DIR}%" win32/Makefile.gcc - cd $(ZLIB_DIR) && make -f win32/Makefile.gcc - cd $(ZLIB_DIR) && make -f win32/Makefile.gcc install + cd $(ZLIB_DIR) && LDFLAGS="-Wl,--nxcompat -Wl,--dynamicbase" make -f win32/Makefile.gcc + cd $(ZLIB_DIR) && BINARY_PATH="$(BUILT_DIR)/bin" INCLUDE_PATH="$(BUILT_DIR)/include" LIBRARY_PATH="$(BUILT_DIR)/lib" make -f win32/Makefile.gcc install OPENSSL_DIR=$(FETCH_DIR)/openssl-$(OPENSSL_VER) OPENSSL_OPTS=-no-idea -no-rc5 -no-md2 shared zlib --prefix=$(BUILT_DIR) --openssldir=$(BUILT_DIR) -L$(BUILT_DIR)/lib -Wl,--nxcompat -Wl,--dynamicbase -I$(BUILT_DIR)/include diff --git a/src/current-patches/zlib/0001-zlib-update-Makefile.patch b/src/current-patches/zlib/0001-zlib-update-Makefile.patch deleted file mode 100644 index 07b9d48..0000000 --- a/src/current-patches/zlib/0001-zlib-update-Makefile.patch +++ /dev/null @@ -1,38 +0,0 @@ -From b45561038c1819c5d6264b025e872c82b7adf94f Mon Sep 17 00:00:00 2001 -From: Erinn Clark <erinn(a)torproject.org> -Date: Sat, 29 Oct 2011 01:59:59 +0100 -Subject: [PATCH] update zlib Makefile.gcc - -zlib's Makefile is inadequate for building TBB from source, so patch it to use -DEP/ASLR build options and have some actually working include and library -paths. - ---- - win32/Makefile.gcc | 4 +++- - 1 files changed, 3 insertions(+), 1 deletions(-) - -diff --git a/win32/Makefile.gcc b/win32/Makefile.gcc -index 0a33bf6..79cad54 100644 ---- a/win32/Makefile.gcc -+++ b/win32/Makefile.gcc -@@ -44,7 +44,7 @@ AS = $(CC) - ASFLAGS = $(LOC) -Wall - - LD = $(CC) --LDFLAGS = $(LOC) -+LDFLAGS = $(LOC) -Wl,--nxcompat -Wl,--dynamicbase - - AR = $(PREFIX)ar - ARFLAGS = rcs -@@ -113,6 +113,8 @@ zlibrc.o: win32/zlib1.rc - - - # BINARY_PATH, INCLUDE_PATH and LIBRARY_PATH must be set. -+INCLUDE_PATH=$(prefix)/include -+LIBRARY_PATH=$(prefix)/lib - - .PHONY: install uninstall clean - --- -1.7.5.4 -

1 0

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

03 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/master] Provide an unpack-qt target
by erinn＠torproject.org 03 Feb '12

03 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/master] Update to zlib 1.2.6
by erinn＠torproject.org 03 Feb '12

03 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