tor-commits July 2012

tor-commits@lists.torproject.org

14 participants
949 discussions

[metrics-tasks/master] Graph comparison between the current Tor network and an ideal Tor network.
by karsten＠torproject.org 26 Jul '12

26 Jul '12

commit 131f94f6a424301daa126a80aa4285343113b978 Author: George Kadianakis <desnacked(a)riseup.net> Date: Wed Jul 25 17:19:50 2012 +0300 Graph comparison between the current Tor network and an ideal Tor network. --- task-6232/plot-entropy.R | 24 ++++++++++++++++++++++++ 1 files changed, 24 insertions(+), 0 deletions(-) diff --git a/task-6232/plot-entropy.R b/task-6232/plot-entropy.R index 0ed4bac..abcd808 100644 --- a/task-6232/plot-entropy.R +++ b/task-6232/plot-entropy.R @@ -54,3 +54,27 @@ scale_y_continuous(name = "Entropy and maximum entropy\n", opts(legend.position = "none") ggsave("entropy.png", width = 8, height = 6, dpi = 100) + +g <- aggregate(list(all = d$all, max_all = d$max_all, exit = d$exit, + max_exit = d$max_exit, guard = d$guard, max_guard = d$max_guard, + country = d$country, max_country = d$max_country, as = d$as, + max_as = d$max_as), + by = list(date = as.Date(d$validafter, origin = "1970-01-01 00:00:00")), + FUN = median) +g <- rbind( + data.frame(date = g$date, entropy = 2^g$all, max = 2^g$max_all, + type = "All relays"), + data.frame(date = g$date, entropy = 2^g$exit, max = 2^g$max_exit, + type = "All exits"), + data.frame(date = g$date, entropy = 2^g$guard, max = 2^g$max_guard, + type = "All guards")) +g <- melt(g, c("date", "type")) +ggplot(g, aes(x = date, y = value, colour = variable)) + +geom_line() + +facet_wrap(~ type) + +scale_x_date(name = "\nDate") + +scale_y_continuous(name = "Number of relays and Number of fair relays\n", + limits = c(0, max(g$value))) + +opts(legend.position = "none") +ggsave("relays_fair.png", width = 8, height = 6, dpi = 100) +

1 0

[metrics-tasks/master] Tweak asn's #6232 graph a bit.
by karsten＠torproject.org 26 Jul '12

26 Jul '12

commit 1b4dbaea54d4e32ab89cc1d860ca54db2b7bf5d7 Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Thu Jul 26 11:32:46 2012 +0200 Tweak asn's #6232 graph a bit. --- task-6232/plot-entropy.R | 8 +++----- 1 files changed, 3 insertions(+), 5 deletions(-) diff --git a/task-6232/plot-entropy.R b/task-6232/plot-entropy.R index abcd808..1f41824 100644 --- a/task-6232/plot-entropy.R +++ b/task-6232/plot-entropy.R @@ -54,7 +54,6 @@ scale_y_continuous(name = "Entropy and maximum entropy\n", opts(legend.position = "none") ggsave("entropy.png", width = 8, height = 6, dpi = 100) - g <- aggregate(list(all = d$all, max_all = d$max_all, exit = d$exit, max_exit = d$max_exit, guard = d$guard, max_guard = d$max_guard, country = d$country, max_country = d$max_country, as = d$as, @@ -71,10 +70,9 @@ g <- rbind( g <- melt(g, c("date", "type")) ggplot(g, aes(x = date, y = value, colour = variable)) + geom_line() + -facet_wrap(~ type) + +facet_grid(type ~ ., scales = "free_y") + scale_x_date(name = "\nDate") + -scale_y_continuous(name = "Number of relays and Number of fair relays\n", - limits = c(0, max(g$value))) + +scale_y_continuous(name = "Number of relays and number of fair relays\n") + opts(legend.position = "none") -ggsave("relays_fair.png", width = 8, height = 6, dpi = 100) +ggsave("relays-fair.png", width = 8, height = 6, dpi = 100)

1 0

[metrics-tasks/master] Add exit probability based on advertised bw (#6443).
by karsten＠torproject.org 26 Jul '12

26 Jul '12

commit 23f0121a659c520de35865da61a6080e30fed04d Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Wed Jul 25 20:23:11 2012 +0200 Add exit probability based on advertised bw (#6443). --- task-6443/cumulated-weights.R | 9 ++- task-6443/run.sh | 3 + .../src/CalculatePathSelectionProbabilities.java | 93 +++++++++++++------- 3 files changed, 71 insertions(+), 34 deletions(-) diff --git a/task-6443/cumulated-weights.R b/task-6443/cumulated-weights.R index c324acb..811564b 100755 --- a/task-6443/cumulated-weights.R +++ b/task-6443/cumulated-weights.R @@ -3,7 +3,9 @@ require(scales) require(reshape) cw <- read.csv("cumulated-weights.csv", stringsAsFactors = FALSE) -v <- sort(as.POSIXlt(unique(cw$validafter), tz = "UTC"), +v <- cw +v <- v[v$weight_type == "consensus weights", c(1, 3, 4)] +v <- sort(as.POSIXlt(unique(v$validafter), tz = "UTC"), decreasing = TRUE) now <- week <- month <- threemonths <- year <- v[1] week$mday <- week$mday - 7 @@ -32,6 +34,7 @@ opts(title = paste("Probability of selecting one of the top-x relays for", ggsave("exit-probability-cdf-a.png", width = 8, height = 5, dpi = 100) c <- cw +c <- c[c$weight_type == "consensus weights", c(1, 3, 4)] c <- c[c$top_relays %in% c(1, 2, 5, 10, 20, 50), ] c <- aggregate(list(total_exit_probability = c$total_exit_probability), by = list(date = as.Date(cut.Date(as.Date(c$validafter, @@ -48,7 +51,9 @@ opts(title = paste("Probability of selecting one of the top-x relays for", "the exit position\n"), legend.position = "bottom") ggsave("exit-probability-cdf-b.png", width = 8, height = 5, dpi = 100) -i <- read.csv("inverse-cumulated-weights.csv", stringsAsFactors = FALSE) +iw <- read.csv("inverse-cumulated-weights.csv", stringsAsFactors = FALSE) +i <- iw +i <- i[i$weight_type == "consensus weights", c(1, 3, 4)] i <- i[i$total_exit_probability %in% factor(c(0.3, 0.4, 0.5, 0.6, 0.7)), ] i <- aggregate(list(top_relays = i$top_relays), by = list(date = as.Date(cut.Date(as.Date(i$validafter, diff --git a/task-6443/run.sh b/task-6443/run.sh new file mode 100755 index 0000000..8ea016e --- /dev/null +++ b/task-6443/run.sh @@ -0,0 +1,3 @@ +#!/bin/bash +javac -d bin -cp lib/descriptor.jar src/CalculatePathSelectionProbabilities.java && java -cp bin:lib/descriptor.jar:lib/commons-codec-1.6.jar:lib/commons-compress-1.4.1.jar CalculatePathSelectionProbabilities + diff --git a/task-6443/src/CalculatePathSelectionProbabilities.java b/task-6443/src/CalculatePathSelectionProbabilities.java index 67bb200..f819d3e 100644 --- a/task-6443/src/CalculatePathSelectionProbabilities.java +++ b/task-6443/src/CalculatePathSelectionProbabilities.java @@ -4,7 +4,6 @@ import java.io.FileWriter; import java.text.SimpleDateFormat; import java.util.ArrayList; import java.util.Arrays; -import java.util.Collections; import java.util.HashMap; import java.util.Iterator; import java.util.List; @@ -24,8 +23,8 @@ import org.torproject.descriptor.RelayNetworkStatusConsensus; import org.torproject.descriptor.ServerDescriptor; /* - * Calculate five path-selection probabilities for relays based on - * consensus weights and advertised bandwidths: + * Calculate path-selection probabilities for relays based on consensus + * weights and advertised bandwidths: * * - advertised_bandwidth_fraction: Relative advertised bandwidth of * this relay compared to the total advertised bandwidth in the @@ -54,6 +53,10 @@ import org.torproject.descriptor.ServerDescriptor; * weights, relay flags, directory ports, and bandwidth weights in the * consensus. Path selection depends on more factors, so that this * probability can only be an approximation. + * + * - exit_probability_advbw: Probability of this relay to be selected for + * the exit position under the assumption that clients would use + * advertised bandwidth for path selection. */ public class CalculatePathSelectionProbabilities { public static void main(String[] args) throws Exception { @@ -99,14 +102,17 @@ public class CalculatePathSelectionProbabilities { bw = new BufferedWriter(new FileWriter("weights.csv")); bw.write("validafter,fingerprint,advertised_bandwidth_fraction," + "consensus_weight_fraction,guard_probability," - + "middle_probability,exit_probability\n"); + + "middle_probability,exit_probability," + + "exit_probability_advbw\n"); } BufferedWriter bw2 = new BufferedWriter(new FileWriter( "cumulated-weights.csv")); - bw2.write("validafter,top_relays,total_exit_probability\n"); + bw2.write("validafter,weight_type,top_relays," + + "total_exit_probability\n"); BufferedWriter bw3 = new BufferedWriter(new FileWriter( "inverse-cumulated-weights.csv")); - bw3.write("validafter,total_exit_probability,top_relays\n"); + bw3.write("validafter,weight_type,total_exit_probability," + + "top_relays\n"); while (descriptorFiles.hasNext()) { DescriptorFile descriptorFile = descriptorFiles.next(); for (Descriptor descriptor : descriptorFile.getDescriptors()) { @@ -155,12 +161,14 @@ public class CalculatePathSelectionProbabilities { consensusWeights = new TreeMap<String, Double>(), guardWeights = new TreeMap<String, Double>(), middleWeights = new TreeMap<String, Double>(), - exitWeights = new TreeMap<String, Double>(); + exitWeights = new TreeMap<String, Double>(), + exitWeightsAdvBw = new TreeMap<String, Double>(); double totalAdvertisedBandwidth = 0.0; double totalConsensusWeight = 0.0; double totalGuardWeight = 0.0; double totalMiddleWeight = 0.0; double totalExitWeight = 0.0; + double totalExitWeightAdvBw = 0.0; for (NetworkStatusEntry relay : consensus.getStatusEntries().values()) { String fingerprint = relay.getFingerprint(); @@ -183,6 +191,7 @@ public class CalculatePathSelectionProbabilities { double guardWeight = (double) relay.getBandwidth(); double middleWeight = (double) relay.getBandwidth(); double exitWeight = (double) relay.getBandwidth(); + double exitWeightAdvBw = advertisedBandwidth; /* Case 1: relay has both Guard and Exit flag and could be * selected for either guard, middle, or exit position. Apply @@ -191,6 +200,7 @@ public class CalculatePathSelectionProbabilities { guardWeight *= wgd; middleWeight *= wmd; exitWeight *= wed; + exitWeightAdvBw *= wed; /* Case 2: relay only has the Guard flag, not the Exit flag. * While, in theory, the relay could also be picked for the exit @@ -203,6 +213,7 @@ public class CalculatePathSelectionProbabilities { guardWeight *= wgg; middleWeight *= wmg; exitWeight = 0.0; + exitWeightAdvBw = 0.0; /* Case 3: relay only has the Exit flag, not the Guard flag. It * cannot be picked for the guard position, so set Wge to 0. @@ -211,6 +222,7 @@ public class CalculatePathSelectionProbabilities { guardWeight = 0.0; middleWeight *= wme; exitWeight *= wee; + exitWeightAdvBw *= wee; /* Case 4: relay has neither Exit nor Guard flag. Similar to * case 2, this relay *could* have a weird exit policy and be @@ -221,6 +233,7 @@ public class CalculatePathSelectionProbabilities { guardWeight = 0.0; middleWeight *= wmm; exitWeight = 0.0; + exitWeightAdvBw = 0.0; } /* Store calculated weights and update totals. */ @@ -229,11 +242,13 @@ public class CalculatePathSelectionProbabilities { guardWeights.put(fingerprint, guardWeight); middleWeights.put(fingerprint, middleWeight); exitWeights.put(fingerprint, exitWeight); + exitWeightsAdvBw.put(fingerprint, exitWeightAdvBw); totalAdvertisedBandwidth += advertisedBandwidth; totalConsensusWeight += consensusWeight; totalGuardWeight += guardWeight; totalMiddleWeight += middleWeight; totalExitWeight += exitWeight; + totalExitWeightAdvBw += exitWeightAdvBw; } /* Write calculated path-selection probabilities to the output @@ -242,7 +257,8 @@ public class CalculatePathSelectionProbabilities { for (NetworkStatusEntry relay : consensus.getStatusEntries().values()) { String fingerprint = relay.getFingerprint(); - bw.write(String.format("%s,%s,%.9f,%.9f,%.9f,%.9f,%.9f%n", + bw.write(String.format("%s,%s,%.9f,%.9f,%.9f,%.9f,%.9f," + + "%.9f%n", validAfter, fingerprint, advertisedBandwidths.get(fingerprint) @@ -250,35 +266,48 @@ public class CalculatePathSelectionProbabilities { consensusWeights.get(fingerprint) / totalConsensusWeight, guardWeights.get(fingerprint) / totalGuardWeight, middleWeights.get(fingerprint) / totalMiddleWeight, - exitWeights.get(fingerprint) / totalExitWeight)); + exitWeights.get(fingerprint) / totalExitWeight, + exitWeightsAdvBw.get(fingerprint) + / totalExitWeightAdvBw)); } } /* Write exit probabilities for top-x relays to the second and * third output files. */ - List<Double> sortedExitWeights = new ArrayList<Double>( - exitWeights.values()); - Collections.sort(sortedExitWeights); - Collections.reverse(sortedExitWeights); - int topRelays = 0; - double totalExitProbability = 0.0; - List<Double> inverseProbabilities = new ArrayList<Double>( - Arrays.asList(new Double[] { 0.1, 0.2, 0.3, 0.4, 0.5, 0.6, - 0.7, 0.8, 0.9 })); - for (double exitWeight : sortedExitWeights) { - topRelays++; - totalExitProbability += exitWeight / totalExitWeight; - if (topRelays <= 50) { - bw2.write(String.format("%s,%d,%.9f%n", validAfter, topRelays, - totalExitProbability)); - } - while (!inverseProbabilities.isEmpty() && - totalExitProbability > inverseProbabilities.get(0)) { - bw3.write(String.format("%s,%.1f,%d%n", validAfter, - inverseProbabilities.remove(0), topRelays)); - } - if (inverseProbabilities.isEmpty() && topRelays > 50) { - break; + String[] weightTypes = new String[] { "consensus weights", + "advertised bandwidth" }; + Double[][] sortedExitWeightsArray = new Double[][] { + exitWeights.values().toArray(new Double[exitWeights.size()]), + exitWeightsAdvBw.values().toArray( + new Double[exitWeightsAdvBw.size()]) }; + double[] totalWeights = new double[] { totalExitWeight, + totalExitWeightAdvBw }; + for (int i = 0; i < weightTypes.length; i++) { + String weightType = weightTypes[i]; + Double[] sortedExitWeights = sortedExitWeightsArray[i]; + double totalWeight = totalWeights[i]; + Arrays.sort(sortedExitWeights); + int topRelays = 0; + double totalExitProbability = 0.0; + List<Double> inverseProbabilities = new ArrayList<Double>( + Arrays.asList(new Double[] { 0.1, 0.2, 0.3, 0.4, 0.5, 0.6, + 0.7, 0.8, 0.9 })); + for (int j = sortedExitWeights.length - 1; j >= 0; j--) { + double exitWeight = sortedExitWeights[j]; + topRelays++; + totalExitProbability += exitWeight / totalWeight; + if (topRelays <= 50) { + bw2.write(String.format("%s,%s,%d,%.9f%n", validAfter, + weightType, topRelays, totalExitProbability)); + } + while (!inverseProbabilities.isEmpty() && + totalExitProbability > inverseProbabilities.get(0)) { + bw3.write(String.format("%s,%s,%.1f,%d%n", validAfter, + weightType, inverseProbabilities.remove(0), topRelays)); + } + if (inverseProbabilities.isEmpty() && topRelays > 50) { + break; + } } } }

1 0

[torbrowser/maint-2.3] make sure the build number is right for the osx bundles
by erinn＠torproject.org 25 Jul '12

25 Jul '12

commit c39ea088c47026b4e16c676f1ca21651f6fb1e49 Author: Erinn Clark <erinn(a)torproject.org> Date: Wed Jul 25 18:06:44 2012 +0100 make sure the build number is right for the osx bundles --- build-scripts/linux-alpha.mk | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/build-scripts/linux-alpha.mk b/build-scripts/linux-alpha.mk index 21977fe..96d715d 100644 --- a/build-scripts/linux-alpha.mk +++ b/build-scripts/linux-alpha.mk @@ -15,7 +15,7 @@ ## Architecture ARCH_TYPE=$(shell uname -m) -BUILD_NUM=2 +BUILD_NUM=1 PLATFORM=Linux ## Build machine specific settings

1 0

[torbrowser/master] make sure the build number is right for the osx bundles
by erinn＠torproject.org 25 Jul '12

25 Jul '12

1 0

[torbrowser/maint-2.3] update to noscript 2.4.9 and https-everywhere 3.0development.5 in alpha bundles
by erinn＠torproject.org 25 Jul '12

25 Jul '12

commit f2d7e4a6a4f54096e7c553e4f01e9fcadc6d004b Author: Erinn Clark <erinn(a)torproject.org> Date: Wed Jul 25 17:59:28 2012 +0100 update to noscript 2.4.9 and https-everywhere 3.0development.5 in alpha bundles --- build-scripts/versions-alpha.mk | 4 ++-- changelog.linux-2.3 | 2 +- changelog.osx-2.3 | 2 +- changelog.windows-2.3 | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/build-scripts/versions-alpha.mk b/build-scripts/versions-alpha.mk index 461ebc5..c5c23d2 100644 --- a/build-scripts/versions-alpha.mk +++ b/build-scripts/versions-alpha.mk @@ -14,8 +14,8 @@ FIREFOX_VER=14.0.1 MOZBUILD_VER=1.5.1 PYMAKE_VER=87d436cd8974 TORBUTTON_VER=1.4.6 -NOSCRIPT_VER=2.4.8 -HTTPSEVERYWHERE_VER=3.0development.4 +NOSCRIPT_VER=2.4.9 +HTTPSEVERYWHERE_VER=3.0development.5 OBFSPROXY_VER=0.1.4 OTR_VER=3.2.0 diff --git a/changelog.linux-2.3 b/changelog.linux-2.3 index f3c2b24..5073d69 100644 --- a/changelog.linux-2.3 +++ b/changelog.linux-2.3 @@ -6,7 +6,7 @@ Tor Browser Bundle (2.3.19-alpha-2); suite=linux * Update OpenSSL to 1.0.1c * Update zlib to 1.2.7 * Update Torbutton to 1.4.6 - * Update NoScript to 2.4.8 + * Update NoScript to 2.4.9 * Update HTTPS Everywhere to 3.0development.5 * Downgrade Vidalia to 0.2.20 * Update libpng to 1.5.12 diff --git a/changelog.osx-2.3 b/changelog.osx-2.3 index fc6ad07..cd4c54a 100644 --- a/changelog.osx-2.3 +++ b/changelog.osx-2.3 @@ -6,7 +6,7 @@ Tor Browser Bundle (2.3.19-alpha-1); suite=osx * Update OpenSSL to 1.0.1c * Update zlib to 1.2.7 * Update Torbutton to 1.4.6 - * Update NoScript to 2.4.8 + * Update NoScript to 2.4.9 * Update HTTPS Everywhere to 3.0development.5 * Downgrade Vidalia to 0.2.20 diff --git a/changelog.windows-2.3 b/changelog.windows-2.3 index c6440db..815f0db 100644 --- a/changelog.windows-2.3 +++ b/changelog.windows-2.3 @@ -6,7 +6,7 @@ Tor Browser Bundle (2.3.19-alpha-1); suite=windows * Update OpenSSL to 1.0.1c * Update zlib to 1.2.7 * Update Torbutton to 1.4.6 - * Update NoScript to 2.4.8 + * Update NoScript to 2.4.9 * Update HTTPS Everywhere to 3.0development.5 * Downgrade Vidalia to 0.2.20

1 0

[torbrowser/maint-2.3] update alpha linux makefile with Sebastian's stable TBB logic
by erinn＠torproject.org 25 Jul '12

25 Jul '12

commit 9bb4a20da14accf5fff1775925498355271b1c77 Author: Erinn Clark <erinn(a)torproject.org> Date: Wed Jul 25 18:04:18 2012 +0100 update alpha linux makefile with Sebastian's stable TBB logic --- build-scripts/linux-alpha.mk | 257 +++++++++++++----------------------------- 1 files changed, 79 insertions(+), 178 deletions(-) diff --git a/build-scripts/linux-alpha.mk b/build-scripts/linux-alpha.mk index 0eacd15..21977fe 100644 --- a/build-scripts/linux-alpha.mk +++ b/build-scripts/linux-alpha.mk @@ -5,87 +5,63 @@ ### Copyright 2009 Jacob Appelbaum <jacob(a)appelbaum.net> ### Copyright 2010 Erinn Clark <erinn(a)torproject.org> ### -### You want to do the following currently supported activities: -# This downloads and compiles everything -### make -f linux-alpha.mk build-all-binaries -# This makes a generic bundle -### make -f linux-alpha.mk generic-bundle -# This makes the English bundle -### make -f linux-alpha.mk bundle_en-US -# This makes the German bundle -### make -f linux-alpha.mk bundle_de -# This makes the German compressed bundle -### make -f linux-alpha.mk compressed-bundle_de -# It's possible you may also want to do: -### make -f linux-alpha.mk build-all-binaries -### make -f linux-alpha.mk all-compressed-bundles -### ... -### Look in tbbl-dist/ for your files. ### ### See LICENSE for licensing information ### -### $Id: Makefile 19973 2009-07-12 02:26:03Z phobos $ -### ##################### ### Configuration ### ##################### -## Include versions -include $(PWD)/versions-alpha.mk - ## Architecture ARCH_TYPE=$(shell uname -m) BUILD_NUM=2 PLATFORM=Linux -## Location of directory for source unpacking -FETCH_DIR=/srv/build-trees/build-alpha-$(ARCH_TYPE) +## Build machine specific settings +# Number of cpu cores used to build in parallel +NUM_CORES=2 + +## Location of directory for source downloading +FETCH_DIR=/srv/build-trees/build-experimental +## Location of directory for source unpacking/building +BUILD_DIR=$(FETCH_DIR)/$(ARCH_TYPE) ## Location of directory for prefix/destdir/compiles/etc -BUILT_DIR=$(FETCH_DIR)/built +BUILT_DIR=$(BUILD_DIR)/built TBB_FINAL=$(BUILT_DIR)/TBBL -source-dance: fetch-source unpack-source - echo "We're ready for building now." +## Include versions (must happen after variable definitions above +include $(PWD)/versions-alpha.mk -ZLIB_DIR=$(FETCH_DIR)/zlib-$(ZLIB_VER) ZLIB_OPTS=--shared --prefix=$(BUILT_DIR) -build-zlib: +build-zlib: $(ZLIB_DIR) cd $(ZLIB_DIR) && ./configure $(ZLIB_OPTS) - cd $(ZLIB_DIR) && make + cd $(ZLIB_DIR) && make -j $(NUM_CORES) cd $(ZLIB_DIR) && make install + touch $(STAMP_DIR)/build-zlib + +LIBPNG_OPTS=--prefix=$(BUILT_DIR) +build-libpng: $(LIBPNG_DIR) + cd $(LIBPNG_DIR) && ./configure $(LIBPNG_OPTS) + cd $(LIBPNG_DIR) && make + cd $(LIBPNG_DIR) && make install + touch $(STAMP_DIR)/build-libpng -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)/include -L$(BUILT_DIR)/lib -build-openssl: +build-openssl: build-zlib $(OPENSSL_DIR) cd $(OPENSSL_DIR) && ./config $(OPENSSL_OPTS) cd $(OPENSSL_DIR) && make depend cd $(OPENSSL_DIR) && make - cd $(OPENSSL_DIR) && make install + cd $(OPENSSL_DIR) && make install_sw + touch $(STAMP_DIR)/build-openssl -QT_DIR=$(FETCH_DIR)/qt-everywhere-opensource-src-$(QT_VER) -QT_BUILD_PREFS=-system-zlib -confirm-license -opensource -openssl-linked -no-qt3support -fast -release -nomake demos -nomake examples +QT_BUILD_PREFS=-system-zlib -confirm-license -opensource -openssl-linked -no-webkit -no-qt3support -fast -release -nomake demos -nomake examples QT_OPTS=$(QT_BUILD_PREFS) -prefix $(BUILT_DIR) -I $(BUILT_DIR)/include -I $(BUILT_DIR)/include/openssl/ -L$(BUILT_DIR)/lib -build-qt: +build-qt: build-zlib build-openssl $(QT_DIR) cd $(QT_DIR) && ./configure $(QT_OPTS) - cd $(QT_DIR) && make + cd $(QT_DIR) && make -j $(NUM_CORES) cd $(QT_DIR) && make install - -QTSCRIPT_DIR=$(FETCH_DIR)/qtscriptgenerator -QTSCRIPT_OPTS= -build-qtscript: - cd $(QTSCRIPT_DIR)/generator && $(BUILT_DIR)/bin/qmake - cd $(QTSCRIPT_DIR)/generator && make -j4 - cd $(QTSCRIPT_DIR)/generator && ./generator --include-paths=/usr/include/ - cp ../src/current-patches/qt/000* $(QTSCRIPT_DIR)/qtbindings/qtscript_uitools - cp patch-any-src.sh $(QTSCRIPT_DIR)/qtbindings/qtscript_uitools - cd $(QTSCRIPT_DIR)/qtbindings/qtscript_uitools && ./patch-any-src.sh - cd $(QTSCRIPT_DIR)/generator && $(BUILT_DIR)/bin/qmake - cd $(QTSCRIPT_DIR)/generator && make -j4 - cd $(QTSCRIPT_DIR)/qtbindings && $(BUILT_DIR)/bin/qmake -recursive CONFIG+="release" INCLUDEPATH+=/srv/build-trees/build-alpha-i686/built/include -build-qtfoo: - cd $(QTSCRIPT_DIR)/qtbindings && for i in $(ls -d qtscript_*); do make -C $i release; done - + touch $(STAMP_DIR)/build-qt VIDALIA_OPTS=-DCMAKE_BUILD_TYPE=debug -DQT_QMAKE_EXECUTABLE=$(BUILT_DIR)/bin/qmake .. build-vidalia: build-qt $(VIDALIA_DIR) @@ -94,55 +70,31 @@ build-vidalia: build-qt $(VIDALIA_DIR) cd $(VIDALIA_DIR)/build && DESTDIR=$(BUILT_DIR) make install touch $(STAMP_DIR)/build-vidalia -LIBEVENT_DIR=$(FETCH_DIR)/libevent-$(LIBEVENT_VER) LIBEVENT_OPTS=--prefix=$(BUILT_DIR) -build-libevent: +build-libevent: build-zlib build-openssl $(LIBEVENT_DIR) cd $(LIBEVENT_DIR) && ./configure $(LIBEVENT_OPTS) - cd $(LIBEVENT_DIR) && make -j2 + cd $(LIBEVENT_DIR) && make -j $(NUM_CORES) cd $(LIBEVENT_DIR) && make install + touch $(STAMP_DIR)/build-libevent -LIBPNG_DIR=$(FETCH_DIR)/libpng-$(LIBPNG_VER) -LIBPNG_OPTS=--prefix=$(BUILT_DIR) -build-libpng: - cd $(LIBPNG_DIR) && ./configure $(LIBPNG_OPTS) - cd $(LIBPNG_DIR) && make - cd $(LIBPNG_DIR) && make install - -TOR_DIR=$(FETCH_DIR)/tor-$(TOR_VER) -TOR_OPTS=--enable-gcc-warnings --with-openssl-dir=$(BUILT_DIR) --with-zlib-dir=$(BUILT_DIR) --with-libevent-dir=$(BUILT_DIR)/lib --prefix=$(BUILT_DIR) -build-tor: - cd $(TOR_DIR) && ./configure $(TOR_OPTS) - cd $(TOR_DIR) && make -j2 - #cd $(TOR_DIR) && make install - -## Polipo doesn't use autoconf, so we just have to hack their Makefile -## This probably needs to be updated if Polipo ever updates their Makefile -POLIPO_DIR=$(FETCH_DIR)/polipo-$(POLIPO_VER) -POLIPO_MAKEFILE=$(CONFIG_SRC)/polipo-Makefile -build-polipo: - cp $(POLIPO_MAKEFILE) $(POLIPO_DIR)/Makefile - cd $(POLIPO_DIR) && make && PREFIX=$(FETCH_DIR)/built/ make install.binary +TOR_OPTS=--with-openssl-dir=$(BUILT_DIR) --with-zlib-dir=$(BUILT_DIR) --with-libevent-dir=$(BUILT_DIR)/lib build-pidgin: echo "We're not building pidgin yet!" -FIREFOX_DIR=$(FETCH_DIR)/mozilla-release -build-firefox: - cp ../src/current-patches/firefox/* $(FIREFOX_DIR) - cp patch-any-src.sh $(FIREFOX_DIR) - cp $(CONFIG_SRC)/dot_mozconfig $(FIREFOX_DIR)/mozconfig - cd $(FIREFOX_DIR) && ./patch-any-src.sh +build-firefox: config/dot_mozconfig $(FIREFOX_DIR) + cp config/dot_mozconfig $(FIREFOX_DIR)/mozconfig + cp branding/* $(FIREFOX_DIR)/browser/branding/official cd $(FIREFOX_DIR) && make -f client.mk build + cd $(FIREFOX_DIR) && make -C obj-$(ARCH_TYPE)-* package INNER_MAKE_PACKAGE=true + touch $(STAMP_DIR)/build-firefox 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)-*/ package - cp $(FIREFOX_DIR)/obj-$(ARCH_TYPE)-*/dist/*bz2 $(FETCH_DIR) - cd $(FETCH_DIR) && tar -xvjf firefox-$(FIREFOX_VER).en-US.linux-$(ARCH_TYPE).tar.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-firefox + -rm -rf $(BUILD_DIR)/Firefox + mkdir -p $(BUILD_DIR)/Firefox + cp -r $(FIREFOX_DIR)/obj-$(ARCH_TYPE)-*/dist/firefox/* $(BUILD_DIR)/Firefox + +build-all-binaries: source-dance build-zlib build-openssl build-libpng build-qt build-vidalia build-libevent build-tor build-firefox copy-firefox echo "If we're here, we've done something right." ## Location of compiled libraries @@ -158,24 +110,15 @@ QT=$(COMPILED_LIBS) ZLIB=$(COMPILED_LIBS) ## Location of binary bundle components -POLIPO=$(COMPILED_BINS)/polipo -#TOR=$(COMPILED_BINS)/tor -#VIDALIA=$(BUILT_DIR)/usr/local/bin/vidalia -TOR=$(FETCH_DIR)/tor-$(TOR_VER)/src/or/tor -VIDALIA=$(FETCH_DIR)/vidalia-$(VIDALIA_VER)/build/src/vidalia/vidalia +TOR=$(COMPILED_BINS)/tor +VIDALIA=$(BUILT_DIR)/usr/local/bin/vidalia ## Someday, this will be our custom Firefox -FIREFOX=$(FETCH_DIR)/Firefox +FIREFOX=$(BUILD_DIR)/Firefox PIDGIN=$(COMPILED_BINS)/pidgin ## Location of utility applications WGET:=$(shell which wget) -## Size of split archive volumes for WinRAR -SPLITSIZE=1440k - -## Location of config files -CONFIG_SRC=config - ## Destination for the generic bundle DEST=generic-bundle @@ -202,7 +145,7 @@ endif DEFAULT_EXTENSIONS=torbutton.xpi noscript.xpi httpseverywhere.xpi ## Where to download Mozilla language packs -MOZILLA_LANGUAGE=http://releases.mozilla.org/pub/mozilla.org/firefox/releases/$(FIREFOX_VER)/linux-i686/xpi +MOZILLA_LANGUAGE=https://ftp.mozilla.org/pub/mozilla.org/firefox/releases/$(FIREFOX_VER)/linux-i686/xpi ## Put more extensions here EXTENSIONS_DIR=extensions @@ -235,13 +178,14 @@ all-compressed-bundles: compressed-bundle_ar \ compressed-bundle_es-ES \ compressed-bundle_fa \ compressed-bundle_fr \ + compressed-bundle_it \ + compressed-bundle_ko \ compressed-bundle_nl \ compressed-bundle_pl \ compressed-bundle_pt-PT \ compressed-bundle_ru \ - compressed-bundle_zh-CN \ - compressed-bundle_it \ - compressed-bundle_vi + compressed-bundle_vi \ + compressed-bundle_zh-CN ## ## Cleanup @@ -253,6 +197,7 @@ clean: rm -f *~ rm -fr *.xpi *.jar *.zip rm -fr $(NAME)_* + rm -f $(STAMP_DIR)/*.stamp cd ../src/RelativeLink/ && $(MAKE) clean ## @@ -271,7 +216,7 @@ generic-bundle: directory-structure \ launcher \ strip-it-stripper \ remove-bundle-shared-lib-symlinks - touch generic-bundle.stamp + touch $(STAMP_DIR)/generic-bundle.stamp APPDIR=$(DEST)/App LIBSDIR=$(DEST)/Lib @@ -280,7 +225,7 @@ DATADIR=$(DEST)/Data TB_TMPDIR=$(DEST)/tmp ## Build directory structure -directory-structure: +directory-structure: rm -fr $(DEST) mkdir -p $(APPDIR) mkdir -p $(LIBSDIR) @@ -299,19 +244,20 @@ install-binaries: cp -d $(QT)/libQtGui.so* $(LIBSDIR) cp -d $(QT)/libQtNetwork.so* $(LIBSDIR) cp -d $(QT)/libQtXml.so* $(LIBSDIR) - cp -d $(QT)/libQtScript.so* $(LIBSDIR) - #rm $(LIBSDIR)/libQt*.so*.debug # zlib - cp -d $(ZLIB)/libz.so $(ZLIB)/libz.so.1 $(ZLIB)/libz.so.1.2.6 $(LIBSDIR)/libz + cp -d $(ZLIB)/libz.so $(ZLIB)/libz.so.1 $(ZLIB)/libz.so.1.2.7 $(LIBSDIR)/libz # Libevent - cp -d $(LIBEVENT)/libevent-2.0.so.5 $(LIBEVENT)/libevent-2.0.so.5.1.5 $(LIBEVENT)/libevent_core.so \ - $(LIBEVENT)/libevent_core-2.0.so.5 $(LIBEVENT)/libevent_core-2.0.so.5.1.5 \ - $(LIBEVENT)/libevent_extra-2.0.so.5 $(LIBEVENT)/libevent_extra-2.0.so.5.1.5 \ + cp -d $(LIBEVENT)/libevent-2.0.so.5 $(LIBEVENT)/libevent-2.0.so.5.1.7 $(LIBEVENT)/libevent_core.so \ + $(LIBEVENT)/libevent_core-2.0.so.5 $(LIBEVENT)/libevent_core-2.0.so.5.1.7 \ + $(LIBEVENT)/libevent_extra-2.0.so.5 $(LIBEVENT)/libevent_extra-2.0.so.5.1.7 \ $(LIBEVENT)/libevent_extra.so $(LIBEVENT)/libevent.so $(LIBSDIR) + # libpng cp -d $(LIBPNG)/libpng15.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) @@ -342,32 +288,26 @@ ifeq ($(USE_PIDGIN),1) cp -R $(PIDGIN) $(APPDIR) endif -## Configure Firefox, Vidalia, Polipo and Tor +## Configure Firefox, Vidalia, and Tor configure-apps: ## Configure Firefox preferences mkdir -p $(DEST)/Data/profile/extensions - cp -R $(CONFIG_SRC)/firefox-profiles.ini $(DEST)/Data/profiles.ini - cp $(CONFIG_SRC)/bookmarks.html $(DEST)/Data/profile - cp $(CONFIG_SRC)/no-polipo-4.0.js $(DEST)/Data/profile/prefs.js + cp -R config/firefox-profiles.ini $(DEST)/Data/profiles.ini + cp config/bookmarks.html $(DEST)/Data/profile + cp config/prefs.js $(DEST)/Data/profile/prefs.js ## Configure Pidgin ifeq ($(USE_PIDGIN),1) mkdir -p $(DEST)/PidginPortable/Data/settings/.purple - cp $(CONFIG_SRC)/prefs.xml $(DEST)/PidginPortable/Data/settings/.purple + cp config/prefs.xml $(DEST)/PidginPortable/Data/settings/.purple endif ## Configure Vidalia - mkdir -p $(DEST)/Data/Vidalia/plugins - cp -r $(FETCH_DIR)/vidalia-plugins/tbb $(DEST)/Data/Vidalia/plugins - mkdir -p $(DEST)/App/script - cp $(FETCH_DIR)/qtscriptgenerator/plugins/script/* $(DEST)/App/script ifeq ($(USE_PIDGIN),1) - cp $(CONFIG_SRC)/alpha/vidalia.conf.ff+pidgin-linux $(DEST)/Data/Vidalia/vidalia.conf + cp config/vidalia.conf.ff+pidgin-linux $(DEST)/Data/Vidalia/vidalia.conf else - cp $(CONFIG_SRC)/alpha/vidalia.conf.ff-linux $(DEST)/Data/Vidalia/vidalia.conf + cp config/alpha/vidalia.conf.ff-linux $(DEST)/Data/Vidalia/vidalia.conf endif - ## Configure Polipo - #cp $(CONFIG_SRC)/polipo.conf $(DEST)/Data/Polipo/polipo.conf ## Configure Tor - cp $(CONFIG_SRC)/torrc-linux $(DEST)/Data/Tor/torrc + cp config/alpha/torrc-linux $(DEST)/Data/Tor/torrc cp $(TOR_DIR)/src/config/geoip $(DEST)/Data/Tor/geoip chmod 700 $(DEST)/Data/Tor @@ -378,7 +318,6 @@ launcher: strip-it-stripper: strip $(APPDIR)/tor - #strip $(APPDIR)/polipo strip $(APPDIR)/vidalia strip $(LIBSDIR)/*.so* strip $(LIBSDIR)/libz/*.so* @@ -386,35 +325,6 @@ strip-it-stripper: remove-bundle-shared-lib-symlinks: ./remove-shared-lib-symlinks $(LIBSDIR) ./remove-shared-lib-symlinks $(LIBSDIR)/libz - ./remove-shared-lib-symlinks $(APPDIR)/script - -## -## How to create required extensions -## - -## Torbutton development version -torbutton.xpi: - $(WGET) -O $@ $(TORBUTTON) - -## NoScript development version -noscript.xpi: - $(WGET) -O $@ $(NOSCRIPT) - -## BetterPrivacy -betterprivacy.xpi: - $(WGET) -O $@ $(BETTERPRIVACY) - -## HTTPS Everywhere -httpseverywhere.xpi: - $(WGET) -O $@ --no-check-certificate $(HTTPSEVERYWHERE) - -## Generic language pack rule -langpack_%.xpi: - $(WGET) -O $@ $(MOZILLA_LANGUAGE)/$*.xpi - -## English comes as default -#langpack_en-US.xpi: -# touch $@ ## ## Customize the bundle @@ -426,9 +336,9 @@ compressed-bundle_%: LANGCODE=$* make -f linux-alpha.mk compressed-bundle-localized bundle-localized_%.stamp: - make -f linux-alpha.mk copy-files_$* install-extensions install-lang-extensions patch-vidalia-language patch-firefox-language \ + make -f linux-alpha.mk copy-files_$* install-extensions install-torbutton install-lang-extensions patch-vidalia-language patch-firefox-language \ patch-pidgin-language update-extension-pref write-tbb-version - touch bundle-localized_$*.stamp + touch $(STAMP_DIR)/bundle-localized_$*.stamp bundle-localized: bundle-localized_$(LANGCODE).stamp @@ -449,7 +359,7 @@ DUMMYPROFILE=$(BUNDLE)/.mozilla/ ## This is a little overcomplicated, but I'm keeping it here in case there are ## extensions we want to use in the future install-extensions: $(DEFAULT_EXTENSIONS) - for extension in *.xpi; \ + for extension in httpseverywhere.xpi noscript.xpi; \ do \ cp $$extension $$extension.zip; \ ext_id=$$(unzip -p $$extension.zip install.rdf | sed -n '/<em:id>/{s#[^<]*<em:id>$.*$</em:id>#\1#p;q}'); \ @@ -458,20 +368,11 @@ install-extensions: $(DEFAULT_EXTENSIONS) (cd $(BUNDLE)/Data/profile/extensions/$$ext_id/ && unzip *.zip && rm *.zip); \ done -install-betterprivacy: betterprivacy.xpi - mkdir -p $(BUNDLE)/Data/profile/extensions/\{d40f5e7b-d2cf-4856-b441-cc613eeffbe3\} - cp betterprivacy.xpi $(BUNDLE)/Data/profile/extensions/\{d40f5e7b-d2cf-4856-b441-cc613eeffbe3\}/betterprivacy.zip - (cd $(BUNDLE)/Data/profile/extensions/\{d40f5e7b-d2cf-4856-b441-cc613eeffbe3\}/ && unzip *.zip && rm *.zip); - +install-torbutton: torbutton.xpi + mkdir -p $(BUNDLE)/Data/profile/extensions/ + cp torbutton.xpi $(BUNDLE)/Data/profile/extensions/{e0204bd5-9d31-402b-a99d-a6aa8ffebdca}.xpi ## Language extensions need to be handled differently from other extensions -fix-install-rdf: $(filter-out langpack_en-US.xpi,langpack_$(LANGCODE).xpi) -ifneq ($(LANGCODE), en-US) - rm -fr xx - mkdir xx - (cd xx && unzip ../langpack_$(LANGCODE).xpi && sed -i -e "s/em:maxVersion>6.0.1/em:maxVersion>6.0.*/" install.rdf && zip -r ../langpack_$(LANGCODE).xpi .) -endif - install-lang-extensions: $(filter-out langpack_en-US.xpi,langpack_$(LANGCODE).xpi) ifneq ($(LANGCODE), en-US) mkdir -p $(BUNDLE)/Data/profile/extensions @@ -494,12 +395,12 @@ endif patch-firefox-language: ## Patch the default Firefox prefs.js - ## Don't use {} because they aren't always interpreted correctly. Thanks, sh. + ## Don't use {} because they aren't always interpreted correctly. Thanks, sh. mkdir -p $(BUNDLE)/App/Firefox/defaults/profile/ - cp $(CONFIG_SRC)/bookmarks.html $(BUNDLE)/App/Firefox/defaults/profile/ - cp $(CONFIG_SRC)/no-polipo-4.0.js $(BUNDLE)/App/Firefox/defaults/profile/prefs.js - cp $(CONFIG_SRC)/bookmarks.html $(BUNDLE)/Data/profile - cp $(CONFIG_SRC)/no-polipo-4.0.js $(BUNDLE)/Data/profile/prefs.js + cp config/bookmarks.html $(BUNDLE)/App/Firefox/defaults/profile/ + cp config/prefs.js $(BUNDLE)/App/Firefox/defaults/profile/prefs.js + cp config/bookmarks.html $(BUNDLE)/Data/profile + cp config/prefs.js $(BUNDLE)/Data/profile/prefs.js ./patch-firefox-language.sh $(BUNDLE)/App/Firefox/defaults/profile/prefs.js $(LANGCODE) -e ./patch-firefox-language.sh $(BUNDLE)/Data/profile/prefs.js $(LANGCODE) -e

1 0

[torbrowser/maint-2.3] comment out remnants of vidalia alpha configuration until we're ready to use it again
by erinn＠torproject.org 25 Jul '12

25 Jul '12

commit a0720259bc362a822cc8910b34821f5e8be778dc Author: Erinn Clark <erinn(a)torproject.org> Date: Wed Jul 25 18:04:40 2012 +0100 comment out remnants of vidalia alpha configuration until we're ready to use it again --- build-scripts/osx-alpha.mk | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/build-scripts/osx-alpha.mk b/build-scripts/osx-alpha.mk index 6d5c53b..4c6a1a4 100644 --- a/build-scripts/osx-alpha.mk +++ b/build-scripts/osx-alpha.mk @@ -308,7 +308,7 @@ configure-apps: ## Configure Vidalia mkdir -p $(DEST)/Library/Vidalia/plugins - cp -r $(BUILD_DIR)/vidalia-plugins/tbb $(DEST)/Library/Vidalia/plugins + #cp -r $(BUILD_DIR)/vidalia-plugins/tbb $(DEST)/Library/Vidalia/plugins mkdir -p $(DEST)/Library/Vidalia ifeq ($(USE_SANDBOX),1) cp config/vidalia.conf.ff-osx-sandbox $(DEST)/Library/Vidalia/vidalia.conf

1 0

[torbrowser/master] update to noscript 2.4.9 and https-everywhere 3.0development.5 in alpha bundles
by erinn＠torproject.org 25 Jul '12

25 Jul '12

1 0

[torbrowser/master] update alpha linux makefile with Sebastian's stable TBB logic
by erinn＠torproject.org 25 Jul '12

25 Jul '12

1 0

← Newer
1
...
8
9
10
11
12
13
14
...
95
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

tor-commits July 2012