- tor-commits - lists.torproject.org

[gettor/master] remove duplicate "Thank you for your request" line
by arma＠torproject.org 21 Aug '11

21 Aug '11

commit 80a5e94b13fc5d691b7f234d29a0eb3aa60da563 Author: Roger Dingledine <arma(a)torproject.org> Date: Sat Aug 20 16:07:39 2011 -0400 remove duplicate "Thank you for your request" line Fixes bug #3383 --- lib/gettor/i18n.py | 3 +-- 1 files changed, 1 insertions(+), 2 deletions(-) diff --git a/lib/gettor/i18n.py b/lib/gettor/i18n.py index 9fec331..6f40bd1 100644 --- a/lib/gettor/i18n.py +++ b/lib/gettor/i18n.py @@ -533,8 +533,7 @@ first file."""), _("""Packages might arrive out of order! Please make sure you received all packages before you attempt to unpack them!"""), # GETTOR_TEXT[38] -_("""Thank you for your request. -It was successfully understood. Your request is currently being processed. +_("""It was successfully understood. Your request is currently being processed. Your package should arrive within the next ten minutes."""), # GETTOR_TEXT[39] _("""If it doesn't arrive, the package might be too big for your mail provider.

1 0

r24958: {website} link to my new research item (website/trunk/getinvolved/en)
by Roger Dingledine 21 Aug '11

21 Aug '11

Author: arma Date: 2011-08-20 19:55:51 +0000 (Sat, 20 Aug 2011) New Revision: 24958 Modified: website/trunk/getinvolved/en/research.wml Log: link to my new research item Modified: website/trunk/getinvolved/en/research.wml =================================================================== --- website/trunk/getinvolved/en/research.wml 2011-08-19 03:29:40 UTC (rev 24957) +++ website/trunk/getinvolved/en/research.wml 2011-08-20 19:55:51 UTC (rev 24958) @@ -138,6 +138,13 @@ <ul> +<li>What algorithm should we use to assign Guard flags such that a) +we assign the flag to as many relays as possible, yet b) we minimize +the chance that Alice will use an attacker's node as a guard? See the +<a href="<blog>/research-problem-better-guard-rotation-parameters">blog +post</a> for details. +</li> + <li>For various diversity metrics, how has the diversity of the Tor network changed over time? How robust is it to change or attack? These results can help us make better design decisions. See the <a

1 0

[gettor/master] get my name out of the strings
by arma＠torproject.org 21 Aug '11

21 Aug '11

commit 1fbe14743b399134ee89ca9840d57a20adcec09a Author: Roger Dingledine <arma(a)torproject.org> Date: Sat Aug 20 15:43:35 2011 -0400 get my name out of the strings this should be a start at solving #3304. we still need all the translations to get fixed too. --- README.USER-HOWTO | 2 +- lib/gettor/responses.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/README.USER-HOWTO b/README.USER-HOWTO index 607c636..f068e02 100644 --- a/README.USER-HOWTO +++ b/README.USER-HOWTO @@ -57,7 +57,7 @@ example reply would look something like the following: The output should look somewhat like this: - gpg: Good signature from "Roger Dingledine <arma(a)mit.edu>" + gpg: Good signature from "Erinn Clark <...>" If you're not familiar with commandline tools, try looking for a graphical user interface for GnuPG on this website: diff --git a/lib/gettor/responses.py b/lib/gettor/responses.py index 4033a67..47bb7d3 100644 --- a/lib/gettor/responses.py +++ b/lib/gettor/responses.py @@ -64,7 +64,7 @@ def getPackageMsg(t): + t.gettext(i18n.GETTOR_TEXT[29]) + "\n\n" \ + t.gettext(i18n.GETTOR_TEXT[30]) + "\n\n" \ + t.gettext(i18n.GETTOR_TEXT[31]) + "\n\n" \ - + " gpg: Good signature from 'Roger Dingledine <arma(a)mit.edu>'" \ + + " gpg: Good signature from 'Erinn Clark <...>'" \ + "\n\n" \ + t.gettext(i18n.GETTOR_TEXT[32]) + "\n\n" \ + " http://www.gnupg.org/related_software/frontends.html" \

1 0

[torbrowser/maint-2.2] use the right mozconfig for linux
by erinn＠torproject.org 21 Aug '11

21 Aug '11

commit 830a8850ee2a288005c318a4449916c72536cc32 Author: Erinn Clark <erinn(a)torproject.org> Date: Sat Aug 20 21:42:22 2011 +0200 use the right mozconfig for linux --- 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 1a70edb..7d3bab0 100644 --- a/build-scripts/linux.mk +++ b/build-scripts/linux.mk @@ -112,7 +112,7 @@ FIREFOX_DIR=$(FETCH_DIR)/mozilla-release build-firefox: cp ../src/current-patches/*Firefox* $(FIREFOX_DIR) cp patch-firefox-src.sh $(FIREFOX_DIR) - cp $(CONFIG_SRC)/mozconfig-osx-$(ARCH_TYPE) $(FIREFOX_DIR)/mozconfig + cp $(CONFIG_SRC)/dot_mozconfig $(FIREFOX_DIR)/mozconfig cd $(FIREFOX_DIR) && ./patch-firefox-src.sh cd $(FIREFOX_DIR) && make -f client.mk build

1 0

[torbrowser/maint-2.2] Merge branches 'ff6-minimal' and 'maint-2.2' into maint-2.2
by erinn＠torproject.org 21 Aug '11

21 Aug '11

commit 47c49cd1a98edf4dee0cfb72a2183c02cd43ca82 Author: Erinn Clark <erinn(a)torproject.org> Date: Sat Aug 20 16:14:28 2011 +0200 Merge branches 'ff6-minimal' and 'maint-2.2' into maint-2.2

1 0

[torbrowser/maint-2.2] update firefox-build target
by erinn＠torproject.org 21 Aug '11

21 Aug '11

commit a818cff3a7d842ebcab7ca9efc7fb191f16e419e Author: Erinn Clark <erinn(a)torproject.org> Date: Sat Aug 20 16:41:12 2011 +0200 update firefox-build target --- build-scripts/osx.mk | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/build-scripts/osx.mk b/build-scripts/osx.mk index 1a59db4..7151ddf 100644 --- a/build-scripts/osx.mk +++ b/build-scripts/osx.mk @@ -103,7 +103,7 @@ build-tor: FIREFOX_DIR=$(FETCH_DIR)/mozilla-release build-firefox: - cp ../src/current-patches/*Firefox5* $(FIREFOX_DIR) + cp ../src/current-patches/*Firefox* $(FIREFOX_DIR) cp patch-firefox-src.sh $(FIREFOX_DIR) cp $(CONFIG_SRC)/mozconfig-osx-$(ARCH_TYPE) $(FIREFOX_DIR)/mozconfig cd $(FIREFOX_DIR) && ./patch-firefox-src.sh

1 0

[torbrowser/maint-2.2] Fix the 3rd firefox patch.
by erinn＠torproject.org 21 Aug '11

21 Aug '11

commit f799f2a0b743a185b4aa6b1cb5b058c7a51f5670 Author: Mike Perry <mikeperry-git(a)fscked.org> Date: Sat Aug 20 10:23:09 2011 -0700 Fix the 3rd firefox patch. --- ...-Make-Intermediate-Cert-Store-memory-only.patch | 18 +++++++++--------- 1 files changed, 9 insertions(+), 9 deletions(-) diff --git a/src/current-patches/0003-Firefox6-Make-Intermediate-Cert-Store-memory-only.patch b/src/current-patches/0003-Firefox6-Make-Intermediate-Cert-Store-memory-only.patch index 9c568a0..68d426d 100644 --- a/src/current-patches/0003-Firefox6-Make-Intermediate-Cert-Store-memory-only.patch +++ b/src/current-patches/0003-Firefox6-Make-Intermediate-Cert-Store-memory-only.patch @@ -1,4 +1,4 @@ -From 2bdee82990bbda960d23d6122bf89d422bb63211 Mon Sep 17 00:00:00 2001 +From c50f65a9f11e09332c2c97678b685d2bdcad7d62 Mon Sep 17 00:00:00 2001 From: Mike Perry <mikeperry-git(a)fscked.org> Date: Fri, 19 Aug 2011 17:58:23 -0700 Subject: [PATCH 3/3] Firefox6: Make Intermediate Cert Store memory-only. @@ -8,17 +8,18 @@ This patch makes the intermediate SSL cert store exist in memory only. The pref must be set before startup in prefs.js. https://trac.torproject.org/projects/tor/ticket/2949 --- - security/manager/ssl/src/nsNSSComponent.cpp | 16 ++++++++++++++++ - 1 files changed, 16 insertions(+), 0 deletions(-) + security/manager/ssl/src/nsNSSComponent.cpp | 15 ++++++++++++++- + 1 files changed, 14 insertions(+), 1 deletions(-) diff --git a/security/manager/ssl/src/nsNSSComponent.cpp b/security/manager/ssl/src/nsNSSComponent.cpp -index 7a8569b..5261c5e 100644 +index 7a8569b..828c3eb 100644 --- a/security/manager/ssl/src/nsNSSComponent.cpp +++ b/security/manager/ssl/src/nsNSSComponent.cpp -@@ -1729,6 +1729,22 @@ nsNSSComponent::InitializeNSS(PRBool showWarningBox) +@@ -1729,8 +1729,21 @@ nsNSSComponent::InitializeNSS(PRBool showWarningBox) // Ubuntu 8.04, which loads any nonexistent "<configdir>/libnssckbi.so" as // "/usr/lib/nss/libnssckbi.so". PRUint32 init_flags = NSS_INIT_NOROOTINIT | NSS_INIT_OPTIMIZESPACE; +- SECStatus init_rv = ::NSS_Initialize(profileStr.get(), "", "", + PRBool nocertdb = false; + mPrefBranch->GetBoolPref("security.nocertdb", &nocertdb); + @@ -32,12 +33,11 @@ index 7a8569b..5261c5e 100644 + init_rv = ::NSS_NoDB_Init(NULL); + } else { + init_rv = ::NSS_Initialize(profileStr.get(), "", "", -+ SECMOD_DB, init_flags); -+ } -+ - SECStatus init_rv = ::NSS_Initialize(profileStr.get(), "", "", SECMOD_DB, init_flags); ++ } + if (init_rv != SECSuccess) { + PR_LOG(gPIPNSSLog, PR_LOG_DEBUG, ("can not init NSS r/w in %s\n", profileStr.get())); -- 1.7.3.4

1 0

[torbrowser/maint-2.2] bump experimental TBBs to 2.2.31, tor to 0.2.2.31-rc, Firefox to 6.0, update other versions too
by erinn＠torproject.org 21 Aug '11

21 Aug '11

commit cdc9067b126c9cf6e9ea5c62e16d816b83e8e8e9 Author: Erinn Clark <erinn(a)torproject.org> Date: Sat Aug 20 21:02:03 2011 +0200 bump experimental TBBs to 2.2.31, tor to 0.2.2.31-rc, Firefox to 6.0, update other versions too --- README.LINUX-2.2 | 9 ++++----- README.OSX-2.2 | 9 ++++----- README.WIN-2.2 | 9 ++++----- build-scripts/versions.mk | 14 +++++++------- changelog.linux-2.2 | 12 ++++++++++++ changelog.osx-2.2 | 14 +++++++++++++- changelog.win-2.2 | 14 +++++++++++++- 7 files changed, 57 insertions(+), 24 deletions(-) diff --git a/README.LINUX-2.2 b/README.LINUX-2.2 index c871c74..47f2684 100644 --- a/README.LINUX-2.2 +++ b/README.LINUX-2.2 @@ -5,12 +5,11 @@ Included applications --------------------- Vidalia 0.2.12 (with Qt 4.6.2) -Tor 0.2.2.30-rc (with libevent-2.0.12-stable, zlib-1.2.5 and openssl-1.0.0d) -Firefox (Aurora) 5.0.1 +Tor 0.2.2.31-rc (with libevent-2.0.13-stable, zlib-1.2.5 and openssl-1.0.0d) +Firefox (Aurora) 6.0 \_ Torbutton 1.4.0 - |_ NoScript 2.1.1.2 - |_ HTTPS-Everywhere 1.0.0development.4 - |_ BetterPrivacy 1.51 + |_ NoScript 2.1.2.6 + |_ HTTPS-Everywhere 1.0.0development.5 Usage ----- diff --git a/README.OSX-2.2 b/README.OSX-2.2 index 88564a6..750e540 100644 --- a/README.OSX-2.2 +++ b/README.OSX-2.2 @@ -5,12 +5,11 @@ Included applications --------------------- Vidalia 0.2.12 (with Qt 4.6.2) -Tor 0.2.2.30-rc (with libevent-2.0.12-stable, zlib-1.2.5 and openssl-1.0.0d) -Firefox (Aurora) 5.0.1 +Tor 0.2.2.31-rc (with libevent-2.0.13-stable, zlib-1.2.5 and openssl-1.0.0d) +Firefox (Aurora) 6.0 \_ Torbutton 1.4.0 - |_ NoScript 2.1.1.2 - |_ HTTPS-Everywhere 1.0.0development.4 - |_ BetterPrivacy 1.51 + |_ NoScript 2.1.2.6 + |_ HTTPS-Everywhere 1.0.0development.5 Usage ----- diff --git a/README.WIN-2.2 b/README.WIN-2.2 index dbe8ffb..519c64f 100644 --- a/README.WIN-2.2 +++ b/README.WIN-2.2 @@ -5,13 +5,12 @@ Included applications --------------------- Vidalia 0.2.12 (with Qt 4.6.2) -Tor 0.2.2.30-rc (with libevent-2.0.12-stable, zlib-1.2.5 and openssl-1.0.0d) +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 - \_ Firefox (Aurora) 5.0.1 + \_ Firefox (Aurora) 6.0 \_ Torbutton 1.4.0 - |_ NoScript 2.1.1.2 - |_ HTTPS-Everywhere 1.0.0development.4 - |_ BetterPrivacy 1.51 + |_ NoScript 2.1.2.6 + |_ HTTPS-Everywhere 1.0.0development.5 Usage ----- diff --git a/build-scripts/versions.mk b/build-scripts/versions.mk index af23c30..e116326 100644 --- a/build-scripts/versions.mk +++ b/build-scripts/versions.mk @@ -1,21 +1,21 @@ #!/usr/bin/make -RELEASE_VER=2.2.30 +RELEASE_VER=2.2.31 -HTTPSEVERY_VER=1.0.0development.4 -FIREFOX_VER=5.0.1 -LIBEVENT_VER=2.0.12-stable +HTTPSEVERY_VER=1.0.0development.5 +FIREFOX_VER=6.0 +LIBEVENT_VER=2.0.13-stable LIBPNG_VER=1.4.3 -NOSCRIPT_VER=2.1.1.2 +NOSCRIPT_VER=2.1.2.6 OPENSSL_VER=1.0.0d 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.30-rc +TOR_VER=0.2.2.31-rc TORBUTTON_VER=1.4.0 VIDALIA_VER=0.2.12 -ZLIB_VER=1.2.5 +ZLIB_VER=1.4.0 ## Extension IDs FF_VENDOR_ID:=\{ec8030f7-c20a-464f-9b0e-13a3a9e97384\} diff --git a/changelog.linux-2.2 b/changelog.linux-2.2 index f9119c5..20d8bc5 100644 --- a/changelog.linux-2.2 +++ b/changelog.linux-2.2 @@ -1,3 +1,15 @@ +Tor Browser Bundle (2.2.30-1) alpha; suite=osx + + * Update Tor to 0.2.2.31-rc + * Update Firefox to 6.0 + * Update Libevent to 2.0.13-stable + * Update NoScript to 2.1.2.6 + * Update HTTPS Everywhere to 1.0.0development.5 + * Remove BetterPrivacy until we can figure out how to make it safe in all + bundles (see #3597) + + -- Erinn Clark <erinn(a)torproject.org> Sat Aug 20 20:40:52 CEST 2011 + Tor Browser Bundle (2.2.30-1) alpha; suite=linux * Update Tor to 0.2.2.30-rc diff --git a/changelog.osx-2.2 b/changelog.osx-2.2 index 888aaf5..ff6763d 100644 --- a/changelog.osx-2.2 +++ b/changelog.osx-2.2 @@ -1,8 +1,20 @@ +Tor Browser Bundle (2.2.30-1) alpha; suite=osx + + * Update Tor to 0.2.2.31-rc + * Update Firefox to 6.0 + * Update Libevent to 2.0.13-stable + * Update NoScript to 2.1.2.6 + * Update HTTPS Everywhere to 1.0.0development.5 + * Remove BetterPrivacy until we can figure out how to make it safe in all + bundles (see #3597) + + -- Erinn Clark <erinn(a)torproject.org> Sat Aug 20 20:40:52 CEST 2011 + Tor Browser Bundle (2.2.30-2) alpha; suite=osx * Update Firefox to 5.0.1 - - Erinn Clark <erinn(a)torproject.org> Wed Jul 13 09:07:41 ART 2011 + -- Erinn Clark <erinn(a)torproject.org> Wed Jul 13 09:07:41 ART 2011 Tor Browser Bundle (2.2.30-1) alpha; suite=osx diff --git a/changelog.win-2.2 b/changelog.win-2.2 index ee916bc..bde8ad4 100644 --- a/changelog.win-2.2 +++ b/changelog.win-2.2 @@ -1,8 +1,20 @@ +Tor Browser Bundle (2.2.30-1) alpha; suite=osx + + * Update Tor to 0.2.2.31-rc + * Update Firefox to 6.0 + * Update Libevent to 2.0.13-stable + * Update NoScript to 2.1.2.6 + * Update HTTPS Everywhere to 1.0.0development.5 + * Remove BetterPrivacy until we can figure out how to make it safe in all + bundles (see #3597) + + -- Erinn Clark <erinn(a)torproject.org> Sat Aug 20 20:40:52 CEST 2011 + Tor Browser Bundle (2.2.30-2) alpha; suite=windows * Update Firefox to 5.0.1 - - Erinn Clark <erinn(a)torproject.org> Wed Jul 13 09:07:41 ART 2011 + -- Erinn Clark <erinn(a)torproject.org> Wed Jul 13 09:07:41 ART 2011 Tor Browser Bundle (2.2.30-1) alpha; suite=windows

1 0

[torbrowser/maint-2.2] remove betterprivacy from osx bundles
by erinn＠torproject.org 21 Aug '11

21 Aug '11

commit a0e3aa031694051815911f74d71c37e5f779e48d Author: Erinn Clark <erinn(a)torproject.org> Date: Sat Aug 20 21:36:03 2011 +0200 remove betterprivacy from osx bundles --- build-scripts/osx.mk | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/build-scripts/osx.mk b/build-scripts/osx.mk index 1ab3a77..e1f005d 100644 --- a/build-scripts/osx.mk +++ b/build-scripts/osx.mk @@ -351,7 +351,7 @@ bundle_%: compressed-bundle_%: LANGCODE=$* make -f osx.mk compressed-bundle-localized bundle-localized_%.stamp: - make -f osx.mk copy-files_$* install-extensions install-betterprivacy install-httpseverywhere install-noscript install-lang-extensions patch-vidalia-language patch-firefox-language patch-pidgin-language update-extension-pref final + make -f osx.mk copy-files_$* install-extensions install-httpseverywhere install-noscript install-lang-extensions patch-vidalia-language patch-firefox-language patch-pidgin-language update-extension-pref final touch bundle-localized_$*.stamp cp extensions/torbutton.xpi .

1 0

[torbrowser/maint-2.2] update lots and lots of build targets for building firefox, fixing tabs, and making it easier to download & unpack all of the tarballs
by erinn＠torproject.org 21 Aug '11

21 Aug '11

commit a5f7328004ffef76cb954719f0f3749dc8e3b45f Author: Erinn Clark <erinn(a)torproject.org> Date: Sat Aug 20 21:35:01 2011 +0200 update lots and lots of build targets for building firefox, fixing tabs, and making it easier to download & unpack all of the tarballs --- build-scripts/config/dot_mozconfig | 3 --- build-scripts/linux.mk | 24 ++++++++++++++++++------ build-scripts/osx.mk | 4 ++++ build-scripts/versions.mk | 35 +++++++++++++++++++++++++++++++---- build-scripts/windows.mk | 2 +- 5 files changed, 54 insertions(+), 14 deletions(-) diff --git a/build-scripts/config/dot_mozconfig b/build-scripts/config/dot_mozconfig index 7ba5ca6..934e4f4 100755 --- a/build-scripts/config/dot_mozconfig +++ b/build-scripts/config/dot_mozconfig @@ -3,9 +3,6 @@ mk_add_options MOZ_OBJDIR=@TOPSRCDIR@/obj-@CONFIG_GUESS@ mk_add_options MOZ_APP_DISPLAYNAME=TorBrowser -ac_add_options --enable-static -ac_add_options --disable-shared -ac_add_options --disable-libxul ac_add_options --enable-optimize ac_add_options --disable-tests ac_add_options --disable-debug diff --git a/build-scripts/linux.mk b/build-scripts/linux.mk index aaeb11d..1a70edb 100644 --- a/build-scripts/linux.mk +++ b/build-scripts/linux.mk @@ -108,8 +108,20 @@ build-polipo: build-pidgin: echo "We're not building pidgin yet!" +FIREFOX_DIR=$(FETCH_DIR)/mozilla-release build-firefox: - # XXX: add directions ASAP + cp ../src/current-patches/*Firefox* $(FIREFOX_DIR) + cp patch-firefox-src.sh $(FIREFOX_DIR) + cp $(CONFIG_SRC)/mozconfig-osx-$(ARCH_TYPE) $(FIREFOX_DIR)/mozconfig + cd $(FIREFOX_DIR) && ./patch-firefox-src.sh + cd $(FIREFOX_DIR) && make -f client.mk build + +copy-firefox: + -rm -rf $(FETCH_DIR)/Firefox + ## This is so ugly. Update it to use cool tar --transform soon. + cd $(FIREFOX_DIR) && make -C obj-$(ARCH_TYPE)-pc-linux-gnu/ package + cp $(FIREFOX_DIR)/obj-$(ARCH_TYPE)-pc-linux-gnu/*bz2 $(FETCH_DIR) + cd $(FETCH_DIR) && tar -xvjf firefox-$(FIREFOX_VER).en-US.bz2 && mv firefox Firefox # source-dance unpack-source build-all-binaries: source-dance build-zlib build-openssl build-libpng build-qt build-vidalia build-libevent build-tor build-polipo @@ -269,9 +281,9 @@ install-binaries: cp -d $(ZLIB)/libz.so $(ZLIB)/libz.so.1 $(ZLIB)/libz.so.1.2.5 $(LIBSDIR)/libz # Libevent cp -d $(LIBEVENT)/libevent-2.0.so.5 $(LIBEVENT)/libevent-2.0.so.5.0.1 $(LIBEVENT)/libevent_core.so \ - $(LIBEVENT)/libevent_core-2.0.so.5 $(LIBEVENT)/libevent_core-2.0.so.5.0.1 \ - $(LIBEVENT)/libevent_extra-2.0.so.5 $(LIBEVENT)/libevent_extra-2.0.so.5.0.1 \ - $(LIBEVENT)/libevent_extra.so $(LIBEVENT)/libevent.so $(LIBSDIR) + $(LIBEVENT)/libevent_core-2.0.so.5 $(LIBEVENT)/libevent_core-2.0.so.5.0.1 \ + $(LIBEVENT)/libevent_extra-2.0.so.5 $(LIBEVENT)/libevent_extra-2.0.so.5.0.1 \ + $(LIBEVENT)/libevent_extra.so $(LIBEVENT)/libevent.so $(LIBSDIR) # libpng cp -d $(LIBPNG)/libpng14.so* $(LIBSDIR) # OpenSSL @@ -436,8 +448,8 @@ patch-pidgin-language: ## Patch Pidgin ifeq ($(USE_PIDGIN),1) ./patch-pidgin-language.sh $(BUNDLE)/PidginPortable/Data/settings/PidginPortableSettings.ini $(LANGCODE) \ - $(BUNDLE)/PidginPortable/App/Pidgin/locale \ - $(BUNDLE)/PidginPortable/App/GTK/share/locale + $(BUNDLE)/PidginPortable/App/Pidgin/locale \ + $(BUNDLE)/PidginPortable/App/GTK/share/locale endif patch-firefox-language: diff --git a/build-scripts/osx.mk b/build-scripts/osx.mk index 7151ddf..1ab3a77 100644 --- a/build-scripts/osx.mk +++ b/build-scripts/osx.mk @@ -109,6 +109,10 @@ build-firefox: cd $(FIREFOX_DIR) && ./patch-firefox-src.sh cd $(FIREFOX_DIR) && make -f client.mk build +copy-firefox: + -rm -rf $(FETCH_DIR)/Firefox.app + cp -r $(FIREFOX_DIR)/obj*/dist/*.app $(FETCH_DIR)/Firefox.app + build-all-binaries: build-zlib build-openssl build-vidalia build-libevent build-tor echo "If we're here, we've done something right." diff --git a/build-scripts/versions.mk b/build-scripts/versions.mk index e116326..e8991a2 100644 --- a/build-scripts/versions.mk +++ b/build-scripts/versions.mk @@ -35,28 +35,55 @@ ZLIB_URL=http://www.zlib.net/$(ZLIB_PACKAGE) OPENSSL_URL=http://www.openssl.org/source/$(OPENSSL_PACKAGE) QT_URL=ftp://ftp.qt.nokia.com/qt/source/$(QT_PACKAGE) VIDALIA_URL=http://www.torproject.org/dist/vidalia/$(VIDALIA_PACKAGE) -LIBEVENT_URL=http://www.monkey.org/~provos/$(LIBEVENT_PACKAGE) +LIBEVENT_URL=http://archive.torproject.org/tor-package-archive/libevent/$(LIBEVENT_PACKAGE) TOR_URL=http://www.torproject.org/dist/$(TOR_PACKAGE) PIDGIN_URL=http://sourceforge.net/projects/pidgin/files/Pidgin/$(PIDGIN_PAC… FIREFOX_URL=http://releases.mozilla.org/pub/mozilla.org/firefox/releases/$(… -fetch-source: +fetch-source: fetch-zlib fetch-openssl fetch-vidalia fetch-libevent fetch-tor fetch-firefox -mkdir $(FETCH_DIR) + +fetch-zlib: $(WGET) --no-check-certificate --directory-prefix=$(FETCH_DIR) $(ZLIB_URL) + +fetch-openssl: $(WGET) --no-check-certificate --directory-prefix=$(FETCH_DIR) $(OPENSSL_URL) + +fetch-vidalia: $(WGET) --no-check-certificate --directory-prefix=$(FETCH_DIR) $(VIDALIA_URL) + +fetch-libevent: $(WGET) --no-check-certificate --directory-prefix=$(FETCH_DIR) $(LIBEVENT_URL) + +fetch-tor: $(WGET) --no-check-certificate --directory-prefix=$(FETCH_DIR) $(TOR_URL) fetch-firefox: -rm -rf $(FETCH_DIR)/mozilla-release $(WGET) --no-check-certificate --directory-prefix=$(FETCH_DIR) $(FIREFOX_URL) -unpack-source: +unpack-source: unpack-zlib unpack-openssl unpack-vidalia unpack-libevent unpack-tor unpack-firefox + +unpack-zlib: + -rm -rf $(FETCH_DIR)/zlib-$(ZLIB_VER) cd $(FETCH_DIR) && tar -xvzf $(ZLIB_PACKAGE) + +unpack-openssl: + -rm -rf $(FETCH_DIR)/openssl-$(OPENSSL_VER) cd $(FETCH_DIR) && tar -xvzf $(OPENSSL_PACKAGE) + +unpack-vidalia: + -rm -rf $(FETCH_DIR)/vidalia-$(VIDALIA_VER) cd $(FETCH_DIR) && tar -xvzf $(VIDALIA_PACKAGE) + +unpack-libevent: + -rm -rf $(FETCH_DIR)/libevent-$(LIBEVENT_VER) cd $(FETCH_DIR) && tar -xvzf $(LIBEVENT_PACKAGE) - cd $(FETCH_DIR) && tar -xvzf $(TOR_PACKAGE) +unpack-tor: + -rm -rf $(FETCH_DIR)/tor-$(TOR-VER) + cd $(FETCH_DIR) && tar -xvzf $(TOR_PACKAGE) +unpack-firefox: + -rm -rf $(FETCH_DIR)/mozilla-release + cd $(FETCH_DIR) && tar -xvjf $(FIREFOX_PACKAGE) diff --git a/build-scripts/windows.mk b/build-scripts/windows.mk index 1836741..da5dda1 100644 --- a/build-scripts/windows.mk +++ b/build-scripts/windows.mk @@ -359,7 +359,7 @@ 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-betterprivacy 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 touch bundle-localized_$*.stamp bundle-localized: bundle-localized_$(LANGCODE).stamp

1 0