- tor-commits - lists.torproject.org

[torbrowser/maint-2.3] Remove trailing space so that Tor's 'make' can actually find openssl.
by erinn＠torproject.org 04 May '12

04 May '12

commit bd399fe290ae4519d611a16b66e8adeb69290b0b Author: Shondoit Walker <shondoit(a)gmail.com> Date: Fri May 4 00:15:20 2012 +0200 Remove trailing space so that Tor's 'make' can actually find openssl. --- build-scripts/windows.mk | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/build-scripts/windows.mk b/build-scripts/windows.mk index 8c74b7c..9d769dd 100644 --- a/build-scripts/windows.mk +++ b/build-scripts/windows.mk @@ -98,7 +98,7 @@ build-libevent: build-zlib build-openssl $(LIBEVENT_DIR) TOR_CFLAGS="-I$(BUILT_DIR)/include" TOR_LDFLAGS="-L$(BUILT_DIR)/lib -L$(BUILT_DIR)/bin" TOR_OPTS=--enable-static-libevent --with-libevent-dir=$(BUILT_DIR)/lib -build-tor:PATH+=:$(BUILT_DIR)/bin +build-tor:PATH+=:$(BUILT_DIR)/bin build-firefox: $(FIREFOX_DIR) config/dot_mozconfig $(MOZBUILD_DIR) $(MOZBUILD_DIR)/start-msvc$(MSVC_VER).bat | $(PYTHON) $(PYMAKE_DIR) cp config/dot_mozconfig $(FIREFOX_DIR)/mozconfig

1 0

[torbrowser/maint-2.3] Merge branch 'maint-2.2' into maint-2.3
by erinn＠torproject.org 04 May '12

04 May '12

commit 77262289bf4838ac8464724dc3a96c7c63dfc5ac Merge: 6cabf03 bd399fe Author: Erinn Clark <erinn(a)torproject.org> Date: Fri May 4 18:59:53 2012 -0300 Merge branch 'maint-2.2' into maint-2.3 build-scripts/windows.mk | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-)

1 0

[torbrowser/master] Remove trailing space so that Tor's 'make' can actually find openssl.
by erinn＠torproject.org 04 May '12

04 May '12

commit bd399fe290ae4519d611a16b66e8adeb69290b0b Author: Shondoit Walker <shondoit(a)gmail.com> Date: Fri May 4 00:15:20 2012 +0200 Remove trailing space so that Tor's 'make' can actually find openssl. --- build-scripts/windows.mk | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/build-scripts/windows.mk b/build-scripts/windows.mk index 8c74b7c..9d769dd 100644 --- a/build-scripts/windows.mk +++ b/build-scripts/windows.mk @@ -98,7 +98,7 @@ build-libevent: build-zlib build-openssl $(LIBEVENT_DIR) TOR_CFLAGS="-I$(BUILT_DIR)/include" TOR_LDFLAGS="-L$(BUILT_DIR)/lib -L$(BUILT_DIR)/bin" TOR_OPTS=--enable-static-libevent --with-libevent-dir=$(BUILT_DIR)/lib -build-tor:PATH+=:$(BUILT_DIR)/bin +build-tor:PATH+=:$(BUILT_DIR)/bin build-firefox: $(FIREFOX_DIR) config/dot_mozconfig $(MOZBUILD_DIR) $(MOZBUILD_DIR)/start-msvc$(MSVC_VER).bat | $(PYTHON) $(PYMAKE_DIR) cp config/dot_mozconfig $(FIREFOX_DIR)/mozconfig

1 0

[torbrowser/master] Merge branch 'maint-2.2' into maint-2.3
by erinn＠torproject.org 04 May '12

04 May '12

commit 77262289bf4838ac8464724dc3a96c7c63dfc5ac Merge: 6cabf03 bd399fe Author: Erinn Clark <erinn(a)torproject.org> Date: Fri May 4 18:59:53 2012 -0300 Merge branch 'maint-2.2' into maint-2.3 build-scripts/windows.mk | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-)

1 0

[torbrowser/maint-2.3] Merge branch 'maint-2.2', remote-tracking branch 'shondoit/fix-unpack-source' into maint-2.2
by erinn＠torproject.org 04 May '12

04 May '12

commit f4a85c4c2afe8dff254e5e5cf625cdbb67ada1f3 Merge: dd611d8 9c42b14 Author: Erinn Clark <erinn(a)torproject.org> Date: Fri May 4 18:58:15 2012 -0300 Merge branch 'maint-2.2', remote-tracking branch 'shondoit/fix-unpack-source' into maint-2.2 build-scripts/versions.mk | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-)

1 0

[torbrowser/maint-2.2] Fix a missing closing parenthesis in the unpack-source target
by erinn＠torproject.org 04 May '12

04 May '12

commit 9c42b14b619e8f401c3fc4411cb90053ba6de0d9 Author: Shondoit Walker <shondoit(a)gmail.com> Date: Thu May 3 15:48:42 2012 +0200 Fix a missing closing parenthesis in the unpack-source target --- 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 91e3aa7..7920977 100644 --- a/build-scripts/versions.mk +++ b/build-scripts/versions.mk @@ -161,7 +161,7 @@ langpack_en-US.xpi: $(FETCH_DIR)/$(OBFSPROXY_PACKAGE): | $(FETCH_DIR) $(WGET) --no-check-certificate --directory-prefix=$(FETCH_DIR) $(OBFSPROXY_URL) -unpack-source: $(ZLIB_DIR) $(OPENSSL_DIR) $(LIBPNG_DIR $(QT_DIR) $(VIDALIA_DIR) $(LIBEVENT_DIR) $(TOR_DIR) $(FIREFOX_DIR) $(OBFSPROXY_DIR) +unpack-source: $(ZLIB_DIR) $(OPENSSL_DIR) $(LIBPNG_DIR) $(QT_DIR) $(VIDALIA_DIR) $(LIBEVENT_DIR) $(TOR_DIR) $(FIREFOX_DIR) $(OBFSPROXY_DIR) $(ZLIB_DIR): $(FETCH_DIR)/$(ZLIB_PACKAGE) | $(BUILD_DIR)

1 0

[torbrowser/maint-2.2] Merge branch 'maint-2.2', remote-tracking branch 'shondoit/fix-unpack-source' into maint-2.2
by erinn＠torproject.org 04 May '12

04 May '12

commit f4a85c4c2afe8dff254e5e5cf625cdbb67ada1f3 Merge: dd611d8 9c42b14 Author: Erinn Clark <erinn(a)torproject.org> Date: Fri May 4 18:58:15 2012 -0300 Merge branch 'maint-2.2', remote-tracking branch 'shondoit/fix-unpack-source' into maint-2.2 build-scripts/versions.mk | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-)

1 0

[torbrowser/maint-2.3] Merge branch 'maint-2.2' into maint-2.3
by erinn＠torproject.org 04 May '12

04 May '12

commit 6cabf03b3039040554bba11de5b96f733be8bcda Merge: b3787e1 f4a85c4 Author: Erinn Clark <erinn(a)torproject.org> Date: Fri May 4 18:58:31 2012 -0300 Merge branch 'maint-2.2' into maint-2.3 build-scripts/versions.mk | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-)

1 0

[torbrowser/maint-2.3] Fix a missing closing parenthesis in the unpack-source target
by erinn＠torproject.org 04 May '12

04 May '12

commit 9c42b14b619e8f401c3fc4411cb90053ba6de0d9 Author: Shondoit Walker <shondoit(a)gmail.com> Date: Thu May 3 15:48:42 2012 +0200 Fix a missing closing parenthesis in the unpack-source target --- 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 91e3aa7..7920977 100644 --- a/build-scripts/versions.mk +++ b/build-scripts/versions.mk @@ -161,7 +161,7 @@ langpack_en-US.xpi: $(FETCH_DIR)/$(OBFSPROXY_PACKAGE): | $(FETCH_DIR) $(WGET) --no-check-certificate --directory-prefix=$(FETCH_DIR) $(OBFSPROXY_URL) -unpack-source: $(ZLIB_DIR) $(OPENSSL_DIR) $(LIBPNG_DIR $(QT_DIR) $(VIDALIA_DIR) $(LIBEVENT_DIR) $(TOR_DIR) $(FIREFOX_DIR) $(OBFSPROXY_DIR) +unpack-source: $(ZLIB_DIR) $(OPENSSL_DIR) $(LIBPNG_DIR) $(QT_DIR) $(VIDALIA_DIR) $(LIBEVENT_DIR) $(TOR_DIR) $(FIREFOX_DIR) $(OBFSPROXY_DIR) $(ZLIB_DIR): $(FETCH_DIR)/$(ZLIB_PACKAGE) | $(BUILD_DIR)

1 0

[torbrowser/master] Fix a missing closing parenthesis in the unpack-source target
by erinn＠torproject.org 04 May '12

04 May '12

commit 9c42b14b619e8f401c3fc4411cb90053ba6de0d9 Author: Shondoit Walker <shondoit(a)gmail.com> Date: Thu May 3 15:48:42 2012 +0200 Fix a missing closing parenthesis in the unpack-source target --- 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 91e3aa7..7920977 100644 --- a/build-scripts/versions.mk +++ b/build-scripts/versions.mk @@ -161,7 +161,7 @@ langpack_en-US.xpi: $(FETCH_DIR)/$(OBFSPROXY_PACKAGE): | $(FETCH_DIR) $(WGET) --no-check-certificate --directory-prefix=$(FETCH_DIR) $(OBFSPROXY_URL) -unpack-source: $(ZLIB_DIR) $(OPENSSL_DIR) $(LIBPNG_DIR $(QT_DIR) $(VIDALIA_DIR) $(LIBEVENT_DIR) $(TOR_DIR) $(FIREFOX_DIR) $(OBFSPROXY_DIR) +unpack-source: $(ZLIB_DIR) $(OPENSSL_DIR) $(LIBPNG_DIR) $(QT_DIR) $(VIDALIA_DIR) $(LIBEVENT_DIR) $(TOR_DIR) $(FIREFOX_DIR) $(OBFSPROXY_DIR) $(ZLIB_DIR): $(FETCH_DIR)/$(ZLIB_PACKAGE) | $(BUILD_DIR)

1 0