August 2018 - tor-commits - lists.torproject.org

[tor/release-0.3.2] Merge branch 'maint-0.3.2' into release-0.3.2
by nickm＠torproject.org 08 Aug '18

08 Aug '18

commit 21da46f697dd0c5a21536e69986867c7dfff2b7c Merge: 920a7b37a 8e68fe7e1 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Aug 8 09:26:23 2018 -0400 Merge branch 'maint-0.3.2' into release-0.3.2 changes/bug25440 | 5 +++++ src/common/sandbox.c | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-)

1 0

[chutney/master] Detect tor build directories with src/app or src/or
by nickm＠torproject.org 08 Aug '18

08 Aug '18

commit 99ba2818d7e0dfcaf76ced26472257ac14309fd3 Author: teor <teor(a)torproject.org> Date: Wed Aug 8 13:02:21 2018 +1000 Detect tor build directories with src/app or src/or Supports Tor 0.3.5 and later. Fixes 27067. --- tools/test-network.sh | 30 +++++++++++++++++++++++------- 1 file changed, 23 insertions(+), 7 deletions(-) diff --git a/tools/test-network.sh b/tools/test-network.sh index 3aecfb1..16d8f78 100755 --- a/tools/test-network.sh +++ b/tools/test-network.sh @@ -187,19 +187,20 @@ fi # - if $PWD looks like a tor build directory, set it to $PWD, or # - unset $TOR_DIR, and let chutney fall back to finding tor binaries in # $CHUTNEY_TOR and $CHUTNEY_TOR_GENCERT, or $PATH +# +# Find the Tor build dir using the src/tools dir if [ ! -d "$TOR_DIR" ]; then - if [ -d "$BUILDDIR/src/or" -a -d "$BUILDDIR/src/tools" ]; then + if [ -d "$BUILDDIR/src/tools" ]; then # Choose the build directory # But only if it looks like one $ECHO "$myname: \$TOR_DIR not set, trying \$BUILDDIR" export TOR_DIR="$BUILDDIR" - elif [ -d "$PWD/src/or" -a -d "$PWD/src/tools" ]; then + elif [ -d "$PWD/src/tools" ]; then # Guess the tor directory is the current directory # But only if it looks like one $ECHO "$myname: \$TOR_DIR not set, trying \$PWD" export TOR_DIR="$PWD" - elif [ -d "$PWD/../tor" -a -d "$PWD/../tor/src/or" -a \ - -d "$PWD/../tor/src/tools" ]; then + elif [ -d "$PWD/../tor" -a -d "$PWD/../tor/src/tools" ]; then # Guess the tor directory is next to the current directory # But only if it looks like one $ECHO "$myname: \$TOR_DIR not set, trying \$PWD/../tor" @@ -210,10 +211,25 @@ if [ ! -d "$TOR_DIR" ]; then fi fi -# make TOR_DIR absolute -if [ -d "$PWD/$TOR_DIR" -a -d "$PWD/$TOR_DIR/src/or" -a \ +# Now find the name of the Tor app dir, which changed in Tor 0.3.5 +if [ -d "$TOR_DIR" ]; then + if [ -d "$TOR_DIR/src/app" ]; then + $ECHO "$myname: \$TOR_DIR is a Tor 0.3.5 or later build directory" + TOR_APP_DIR="$TOR_DIR/src/app" + elif [ -d "$TOR_DIR/src/or" ]; then + $ECHO "$myname: \$TOR_DIR is a Tor 0.3.4 or earlier build directory" + TOR_APP_DIR="$TOR_DIR/src/or" + else + $ECHO "$myname: \$TOR_DIR has no src/app or src/or, chutney will use \$CHUTNEY_TOR and \$CHUTNEY_TOR_GENCERT as tor binary paths, or search \$PATH for tor binary names" + unset TOR_DIR + fi +fi + +# make TOR_DIR and TOR_APP_DIR absolute +if [ -d "$PWD/$TOR_DIR" -a -d "$PWD/$TOR_APP_DIR" -a \ -d "$PWD/$TOR_DIR/src/tools" ]; then export TOR_DIR="$PWD/$TOR_DIR" + export TOR_APP_DIR="$PWD/$TOR_APP_DIR" fi # mandatory: $CHUTNEY_PATH is the path to the chutney launch script @@ -267,7 +283,7 @@ fi if [ -d "$TOR_DIR" ]; then $ECHO "$myname: Setting \$CHUTNEY_TOR and \$CHUTNEY_TOR_GENCERT based on TOR_DIR: '$TOR_DIR'" # TOR_DIR is absolute, so these are absolute paths - export CHUTNEY_TOR="$TOR_DIR/src/or/$tor_name" + export CHUTNEY_TOR="$TOR_APP_DIR/$tor_name" export CHUTNEY_TOR_GENCERT="$TOR_DIR/src/tools/$tor_gencert_name" else if [ -x "$CHUTNEY_TOR" ]; then

1 0

[chutney/master] Only use ${} when required
by nickm＠torproject.org 08 Aug '18

08 Aug '18

commit e0d4b180acf17000474af17da0d49f6551a8b6c6 Author: teor <teor(a)torproject.org> Date: Wed Aug 8 13:00:21 2018 +1000 Only use ${} when required Preparation for 27067. --- tools/test-network.sh | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/tools/test-network.sh b/tools/test-network.sh index b4448e2..3aecfb1 100755 --- a/tools/test-network.sh +++ b/tools/test-network.sh @@ -267,8 +267,8 @@ fi if [ -d "$TOR_DIR" ]; then $ECHO "$myname: Setting \$CHUTNEY_TOR and \$CHUTNEY_TOR_GENCERT based on TOR_DIR: '$TOR_DIR'" # TOR_DIR is absolute, so these are absolute paths - export CHUTNEY_TOR="${TOR_DIR}/src/or/${tor_name}" - export CHUTNEY_TOR_GENCERT="${TOR_DIR}/src/tools/${tor_gencert_name}" + export CHUTNEY_TOR="$TOR_DIR/src/or/$tor_name" + export CHUTNEY_TOR_GENCERT="$TOR_DIR/src/tools/$tor_gencert_name" else if [ -x "$CHUTNEY_TOR" ]; then $ECHO "$myname: Assuming \$CHUTNEY_TOR is a path to a binary" @@ -276,7 +276,7 @@ else $ECHO "$myname: Assuming \$CHUTNEY_TOR is a binary name in PATH" else $ECHO "$myname: Setting \$CHUTNEY_TOR to the standard binary name in PATH" - export CHUTNEY_TOR="${tor_name}" + export CHUTNEY_TOR="$tor_name" fi if [ -x "$CHUTNEY_TOR_GENCERT" ]; then $ECHO "$myname: Assuming \$CHUTNEY_TOR_GENCERT is a path to a binary" @@ -284,7 +284,7 @@ else $ECHO "$myname: Assuming \$CHUTNEY_TOR_GENCERT is a binary name in PATH" else $ECHO "$myname: Setting \$CHUTNEY_TOR_GENCERT to the standard binary name in PATH" - export CHUTNEY_TOR_GENCERT="${tor_gencert_name}" + export CHUTNEY_TOR_GENCERT="$tor_gencert_name" fi fi $ECHO "$myname: Using \$CHUTNEY_TOR: '$CHUTNEY_TOR' and \$CHUTNEY_TOR_GENCERT: '$CHUTNEY_TOR_GENCERT'" @@ -322,7 +322,7 @@ export CHUTNEY_STOP_TIME=${CHUTNEY_STOP_TIME:-0} CHUTNEY="$CHUTNEY_PATH/chutney" if [ "$CHUTNEY_START_TIME" -ge 0 ]; then - $ECHO "Waiting ${CHUTNEY_START_TIME} seconds for a consensus containing relays to be generated..." + $ECHO "Waiting $CHUTNEY_START_TIME seconds for a consensus containing relays to be generated..." sleep "$CHUTNEY_START_TIME" else $ECHO "Chutney network launched and running. To stop the network, use:" @@ -353,7 +353,7 @@ fi if [ "$CHUTNEY_STOP_TIME" -ge 0 ]; then if [ "$CHUTNEY_STOP_TIME" -gt 0 ]; then - $ECHO "Waiting ${CHUTNEY_STOP_TIME} seconds before stopping the network..." + $ECHO "Waiting $CHUTNEY_STOP_TIME seconds before stopping the network..." fi sleep "$CHUTNEY_STOP_TIME" # work around a bug/feature in make -j2 (or more)

1 0

[chutney/master] Actually use CHUTNEY_TOR as a binary path, rather than just searching PATH
by nickm＠torproject.org 08 Aug '18

08 Aug '18

commit a5eae0b6d94d1e5bf3cf17ed721a9334bc3e85fb Author: teor <teor(a)torproject.org> Date: Wed Aug 8 12:17:55 2018 +1000 Actually use CHUTNEY_TOR as a binary path, rather than just searching PATH Also: * Use CHUTNEY_TOR as a binary name, rather than just using the standard name * Do the same for CHUTNEY_TOR_GENCERT * Tell the user how chutney is trying to find tor binaries * Document chutney's binary search order better Fixes 27068. --- README | 18 ++++++++++++------ tools/test-network.sh | 26 +++++++++++++++++++++----- 2 files changed, 33 insertions(+), 11 deletions(-) diff --git a/README b/README index d845e6b..23c6ed2 100644 --- a/README +++ b/README @@ -9,12 +9,18 @@ It is supposed to be a good tool for: Right now it only sorta does these things. -You will need, at the moment: - - Tor installed somewhere in your path, or - - The location of the 'tor' and 'tor-gencert' binaries specified through the - environment variables CHUTNEY_TOR and CHUTNEY_TOR_GENCERT, respectively, or - - To run chutney's tools/test-network.sh from a tor build directory, and - - Python 2.7 or later (Python 3 support is an ongoing work) +You will need: + - Python 2.7 or later (Python 3 support is an ongoing work), and + - Tor binaries. + +Chutney checks for Tor binaries in this order: + - If you run chutney's tools/test-network.sh from a tor build directory, + (or set the environment variable $TOR_DIR to a tor build directory,) + chutney will automatically detect the tor binaries, or + - If you put the location of the 'tor' and 'tor-gencert' binaries in the + environment variables $CHUTNEY_TOR and $CHUTNEY_TOR_GENCERT, respectively, + chutney will use those binaries, or + - You will need tor and tor-gencert installed somewhere in your path. Stuff to try: diff --git a/tools/test-network.sh b/tools/test-network.sh index 97a7374..b4448e2 100755 --- a/tools/test-network.sh +++ b/tools/test-network.sh @@ -185,7 +185,8 @@ fi # if it's not set: # - set it to $BUILDDIR, or # - if $PWD looks like a tor build directory, set it to $PWD, or -# - unset $TOR_DIR, and let chutney fall back to finding tor binaries in $PATH +# - unset $TOR_DIR, and let chutney fall back to finding tor binaries in +# $CHUTNEY_TOR and $CHUTNEY_TOR_GENCERT, or $PATH if [ ! -d "$TOR_DIR" ]; then if [ -d "$BUILDDIR/src/or" -a -d "$BUILDDIR/src/tools" ]; then # Choose the build directory @@ -204,7 +205,7 @@ if [ ! -d "$TOR_DIR" ]; then $ECHO "$myname: \$TOR_DIR not set, trying \$PWD/../tor" export TOR_DIR="$PWD/../tor" else - $ECHO "$myname: no \$TOR_DIR, chutney will use \$PATH for tor binaries" + $ECHO "$myname: no \$TOR_DIR, chutney will use \$CHUTNEY_TOR and \$CHUTNEY_TOR_GENCERT as tor binary paths, or search \$PATH for tor binary names" unset TOR_DIR fi fi @@ -264,14 +265,29 @@ fi # using $CHUTNEY_TOR and $CHUTNEY_TOR_GENCERT, and then falls back to # looking for tor and tor-gencert in $PATH if [ -d "$TOR_DIR" ]; then + $ECHO "$myname: Setting \$CHUTNEY_TOR and \$CHUTNEY_TOR_GENCERT based on TOR_DIR: '$TOR_DIR'" # TOR_DIR is absolute, so these are absolute paths export CHUTNEY_TOR="${TOR_DIR}/src/or/${tor_name}" export CHUTNEY_TOR_GENCERT="${TOR_DIR}/src/tools/${tor_gencert_name}" else - # these are binary names, they will be searched for in $PATH - export CHUTNEY_TOR="${tor_name}" - export CHUTNEY_TOR_GENCERT="${tor_gencert_name}" + if [ -x "$CHUTNEY_TOR" ]; then + $ECHO "$myname: Assuming \$CHUTNEY_TOR is a path to a binary" + elif [ ! -z "$CHUTNEY_TOR" ]; then + $ECHO "$myname: Assuming \$CHUTNEY_TOR is a binary name in PATH" + else + $ECHO "$myname: Setting \$CHUTNEY_TOR to the standard binary name in PATH" + export CHUTNEY_TOR="${tor_name}" + fi + if [ -x "$CHUTNEY_TOR_GENCERT" ]; then + $ECHO "$myname: Assuming \$CHUTNEY_TOR_GENCERT is a path to a binary" + elif [ ! -z "$CHUTNEY_TOR_GENCERT" ]; then + $ECHO "$myname: Assuming \$CHUTNEY_TOR_GENCERT is a binary name in PATH" + else + $ECHO "$myname: Setting \$CHUTNEY_TOR_GENCERT to the standard binary name in PATH" + export CHUTNEY_TOR_GENCERT="${tor_gencert_name}" + fi fi +$ECHO "$myname: Using \$CHUTNEY_TOR: '$CHUTNEY_TOR' and \$CHUTNEY_TOR_GENCERT: '$CHUTNEY_TOR_GENCERT'" # Set the variables for the chutney network flavour export NETWORK_FLAVOUR=${NETWORK_FLAVOUR:-"bridges+hs"}

1 0

[tor/master] Fix typo in control_event_hs_descriptor_content()
by nickm＠torproject.org 08 Aug '18

08 Aug '18

commit 3a2b5a5bcbb35cdedfb63a00391bbf15df69cd9b Author: Neel Chauhan <neel(a)neelc.org> Date: Wed Aug 8 00:12:00 2018 -0400 Fix typo in control_event_hs_descriptor_content() --- src/feature/control/control.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/feature/control/control.c b/src/feature/control/control.c index f22df30e1..da4b48fab 100644 --- a/src/feature/control/control.c +++ b/src/feature/control/control.c @@ -7702,11 +7702,11 @@ control_event_hsv3_descriptor_failed(const char *onion_address, tor_free(desc_id_field); } -/** Send HS_DESC_CONTENT event after completion of a successful fetch from hs - * directory. If hsdir_id_digest is NULL, it is replaced by "UNKNOWN". - * If content is NULL, it is replaced by an empty string. The - * onion_address or desc_id set to NULL will no trigger the - * control event. */ +/** Send HS_DESC_CONTENT event after completion of a successful fetch + * from hs directory. If hsdir_id_digest is NULL, it is replaced + * by "UNKNOWN". If content is NULL, it is replaced by an empty + * string. The onion_address or desc_id set to NULL will + * not trigger the control event. */ void control_event_hs_descriptor_content(const char *onion_address, const char *desc_id,

1 0

[tor-browser-build/master] Fix typo in README.MAKEFILE
by boklm＠torproject.org 08 Aug '18

08 Aug '18

commit 3788a45e3dc53d310a52b4262d1ceb7615a12e50 Author: Nicolas Vigier <boklm(a)torproject.org> Date: Wed Aug 8 12:17:43 2018 +0200 Fix typo in README.MAKEFILE --- README.MAKEFILE | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.MAKEFILE b/README.MAKEFILE index 8094651..7fd05e9 100644 --- a/README.MAKEFILE +++ b/README.MAKEFILE @@ -47,7 +47,7 @@ testbuild --------- Build a Tor Browser test build. To make the build faster, only the en-US locale is created, without mar files. By default it is based on the -alpha channel, but you can change that by editing rbm.conf.local. +alpha channel, but you can change that by editing rbm.local.conf. The resulting build can be found in directory testbuild. {release,alpha,nightly,testbuild}-linux-x86_64-debug

1 0

[tor-browser-build/master] Bug 25485: Fix libstdc++.so.6 compatibility for Tor Browser
by boklm＠torproject.org 08 Aug '18

08 Aug '18

commit 6a89049c0d1200302a59f74e71151466ddae5582 Author: Sukhbir Singh <sukhbir(a)torproject.org> Date: Tue Aug 7 10:08:30 2018 -0400 Bug 25485: Fix libstdc++.so.6 compatibility for Tor Browser We ship our version of libstdc++.so.6 for backward compatibility of Tor Browser on older systems like Ubuntu 16.04. However, a newer version of the library may be installed on the user's system and we should detect and use that. This commit adds support for detecting the library using a C++ program that uses the latest ABI; if the program executes, we should use the system library, and if not (for the older systems), we add our libstdc++.so.6 to LD_LIBRARY_PATH. --- projects/firefox/abicheck.cc | 35 ++++++++++++++++++++++ projects/firefox/build | 4 +++ projects/firefox/config | 2 ++ .../tor-browser/RelativeLink/start-tor-browser | 7 +++++ projects/tor/build | 4 ++- 5 files changed, 51 insertions(+), 1 deletion(-) diff --git a/projects/firefox/abicheck.cc b/projects/firefox/abicheck.cc new file mode 100644 index 0000000..cbecafa --- /dev/null +++ b/projects/firefox/abicheck.cc @@ -0,0 +1,35 @@ +/* + * Bug 25485: Browser/TorBrowser/Tor/libstdc++.so.6: version `CXXABI_1.3.11' not found + * This program is borrowed from + * https://en.cppreference.com/w/cpp/error/uncaught_exception and is useful in + * determining the latest C++ ABI. Specifically this program requires + * `GLIBCXX_3.4.22` which we use to compare the version of the installed + * libstdc++.so.6 and the bundled version. If the program executes + * successfully, that means we should use the system version of libstdc++.so.6 + * and if not, that means we should use the bundled version. + */ + +#include <iostream> +#include <exception> +#include <stdexcept> + +struct Foo { + int count = std::uncaught_exceptions(); + ~Foo() { + std::cout << (count == std::uncaught_exceptions() + ? "~Foo() called normally\n" + : "~Foo() called during stack unwinding\n"); + } +}; + +int main() +{ + Foo f; + try { + Foo f; + std::cout << "Exception thrown\n"; + throw std::runtime_error("test exception"); + } catch (const std::exception& e) { + std::cout << "Exception caught: " << e.what() << '\n'; + } +} diff --git a/projects/firefox/build b/projects/firefox/build index da1e71b..4dd0945 100644 --- a/projects/firefox/build +++ b/projects/firefox/build @@ -237,6 +237,10 @@ ELSE; END; %] +[% IF c("var/linux") %] + /var/tmp/dist/gcc/bin/g++ $rootdir/abicheck.cc -o Browser/abicheck +[% END %] + [% c('tar', { tar_src => [ browserdir ], tar_args => '-czf ' _ dest_dir _ '/' _ c('filename') _ '/tor-browser.tar.gz', diff --git a/projects/firefox/config b/projects/firefox/config index 3284ed4..02a380d 100644 --- a/projects/firefox/config +++ b/projects/firefox/config @@ -116,3 +116,5 @@ input_files: - project: fxc2 name: fxc2 enable: '[% c("var/windows") %]' + - filename: abicheck.cc + enable: '[% c("var/linux") %]' diff --git a/projects/tor-browser/RelativeLink/start-tor-browser b/projects/tor-browser/RelativeLink/start-tor-browser index 6639f44..47fbdef 100755 --- a/projects/tor-browser/RelativeLink/start-tor-browser +++ b/projects/tor-browser/RelativeLink/start-tor-browser @@ -274,7 +274,14 @@ if [ $SYSARCHITECTURE -ne $TORARCHITECTURE ]; then fi LD_LIBRARY_PATH="${HOME}/TorBrowser/Tor/" +# Check if the system has a more recent version of libstdc++.so.6; if yes, use +# that instead of the bundled version. +./abicheck >/dev/null 2>&1 +if [ $? -ne 0 ]; then + LD_LIBRARY_PATH="$LD_LIBRARY_PATH:${HOME}/TorBrowser/Tor/libstdc++/" +fi export LD_LIBRARY_PATH + [% IF ! c("var/release") %] export SELFRANDO_write_layout_file= [% END %] diff --git a/projects/tor/build b/projects/tor/build index 8f129d6..89a5418 100644 --- a/projects/tor/build +++ b/projects/tor/build @@ -47,12 +47,14 @@ openssldir=/var/tmp/dist/openssl # LD_LIBRARY_PATH value to the Tor Browser with the newer one. Thus, we copy # the libstdc++ into the directory with the libs tor depends on, too. See bug # 13359 for further details. - cp /var/tmp/dist/gcc/[% c("var/libdir") %]/libstdc++.so.6 "$distdir/Tor/" + mkdir -p "$distdir/Tor/libstdc++" + cp /var/tmp/dist/gcc/[% c("var/libdir") %]/libstdc++.so.6 "$distdir/Tor/libstdc++/" [% IF c("var/asan") -%] cp /var/tmp/dist/gcc/[% c("var/libdir") %]/libasan.so.3 "$distdir/Tor/" cp /var/tmp/dist/gcc/[% c("var/libdir") %]/libubsan.so.0 "$distdir/Tor/" [% END -%] chmod 700 "$distdir"/Tor/*.so* + chmod 700 "$distdir"/Tor/libstdc++/*.so* # This is needed to make RPATH unavailable. See bug 9150. export LD_LIBRARY_PATH="$distdir/Tor/" [% END %]

1 0

[metrics-web/master] Remove stray console.log
by karsten＠torproject.org 08 Aug '18

08 Aug '18

commit 07520b1c3e07e0968162134d6297442acd034513 Author: Iain R. Learmonth <irl(a)fsfe.org> Date: Tue Aug 7 12:20:31 2018 +0100 Remove stray console.log --- src/main/resources/web/js/rs/views/search/do.js | 1 - 1 file changed, 1 deletion(-) diff --git a/src/main/resources/web/js/rs/views/search/do.js b/src/main/resources/web/js/rs/views/search/do.js index 5383580..53c80e6 100644 --- a/src/main/resources/web/js/rs/views/search/do.js +++ b/src/main/resources/web/js/rs/views/search/do.js @@ -52,7 +52,6 @@ define([ $(".tip").tooltip({'html':true}); }, "footerCallback": function( tfoot, data, start, end, display ) { - console.log(relays); var sumAdvertisedBandwidths = 0; for (var i = 0; i < relays.length; i++) { sumAdvertisedBandwidths += relays[i].get("advertised_bandwidth");

1 0

[metrics-web/master] Assume relays have recommended versions if unknown
by karsten＠torproject.org 08 Aug '18

08 Aug '18

commit e60d669690c85677321fdd41398864294679a860 Author: Iain R. Learmonth <irl(a)fsfe.org> Date: Tue Aug 7 13:54:29 2018 +0100 Assume relays have recommended versions if unknown Fixes: #27042 --- src/main/resources/web/js/rs/models/relay.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/resources/web/js/rs/models/relay.js b/src/main/resources/web/js/rs/models/relay.js index ad23b15..a3b0d42 100644 --- a/src/main/resources/web/js/rs/models/relay.js +++ b/src/main/resources/web/js/rs/models/relay.js @@ -239,7 +239,7 @@ define([ /* Synthetic Additional Flags */ var additional_flags = [] - if (!((typeof relay.recommended_version !== 'undefined') ? relay.recommended_version : false) && relay.version_consistent) additional_flags.push("Not Recommended"); + if (!((typeof relay.recommended_version !== 'undefined') ? relay.recommended_version : true) && relay.version_consistent) additional_flags.push("Not Recommended"); if (!((typeof relay.measured !== 'undefined') ? relay.measured : true)) additional_flags.push("Unmeasured"); if (((typeof relay.hibernating !== 'undefined') ? relay.hibernating : false)) additional_flags.push("Hibernating"); if (IsFallbackDir(relay.fingerprint)) additional_flags.push("FallbackDir");

1 0

[metrics-web/master] Fixes loading JSON for aggregated map plotting
by karsten＠torproject.org 08 Aug '18

08 Aug '18

commit 629a828e5296a999270edcecd8e8b2d7f0c81051 Author: Iain R. Learmonth <irl(a)fsfe.org> Date: Tue Aug 7 14:57:01 2018 +0100 Fixes loading JSON for aggregated map plotting --- build.xml | 2 +- src/main/resources/web/js/rs/views/aggregate/map.js | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/build.xml b/build.xml index 77ab672..2f06209 100644 --- a/build.xml +++ b/build.xml @@ -182,7 +182,7 @@ includes="logback.xml" /> <zipfileset dir="${resources}/web" prefix="" - includes="css/* images/** js/** fonts/** templates/**" /> + includes="css/* images/** js/** fonts/** templates/** json/countries.topo.json" /> <zipfileset dir="${resources}/web/jsps" prefix="WEB-INF" includes="*.jsp"/> diff --git a/src/main/resources/web/js/rs/views/aggregate/map.js b/src/main/resources/web/js/rs/views/aggregate/map.js index c77ec10..fe69bc0 100644 --- a/src/main/resources/web/js/rs/views/aggregate/map.js +++ b/src/main/resources/web/js/rs/views/aggregate/map.js @@ -121,7 +121,7 @@ define([ return text; } - d3.json("/rs/json/countries.topo.json", function(error, us) { + d3.json("/json/countries.topo.json", function(error, us) { g.append("g") .attr("id", "countries") .style("fill","#fff")

1 0