October 2019 - tor-commits - lists.torproject.org

[translation/support-portal] https://gitweb.torproject.org/translation.git/commit/?h=support-portal
by translation＠torproject.org 07 Oct '19

07 Oct '19

commit 1f7bd45d0dfc2bc45276bf4ed6d22a68225516ea Author: Translation commit bot <translation(a)torproject.org> Date: Mon Oct 7 14:23:30 2019 +0000 https://gitweb.torproject.org/translation.git/commit/?h=support-portal --- contents+ca.po | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/contents+ca.po b/contents+ca.po index 7bd25b2dd..bcd53fa59 100644 --- a/contents+ca.po +++ b/contents+ca.po @@ -2,9 +2,9 @@ # Marc Ripoll <markripesp(a)gmail.com>, 2019 # Aleix Vidal i Gaya <aleix.vidal(a)gmail.com>, 2019 # Emma Peel, 2019 -# Ecron <ecron_89(a)hotmail.com>, 2019 # jmontane, 2019 # erinm, 2019 +# Ecron <ecron_89(a)hotmail.com>, 2019 # msgid "" msgstr "" @@ -12,7 +12,7 @@ msgstr "" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2019-09-26 17:56+CET\n" "PO-Revision-Date: 2018-10-02 22:41+0000\n" -"Last-Translator: erinm, 2019\n" +"Last-Translator: Ecron <ecron_89(a)hotmail.com>, 2019\n" "Language-Team: Catalan (https://www.transifex.com/otf/teams/1519/ca/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -4313,6 +4313,9 @@ msgid "" "us improve our software and resources, so your feedback is extremely " "valuable to us (and to all Tor users)." msgstr "" +"El Tor es recolza en el suport d'usuaris i voluntaris d'arreu del món per a " +"ajudar-nos a millorar el nostre programari i recursos. Així doncs, apreciem " +"molt els vostres comentaris (nosaltres i tots els usuaris del Tor)." #: https//support.torproject.org/misc/bug-or-feedback/ #: (content/misc/bug-or-feedback/contents+en.lrquestion.description)

1 0

[torspec/master] control-spec: ADD_ONION NEW:BEST is now ED25519-V3
by nickm＠torproject.org 07 Oct '19

07 Oct '19

commit bf318ccb042757cc47e47e19a63d1d825dcf222b Author: David Goulet <dgoulet(a)torproject.org> Date: Thu Oct 3 15:46:47 2019 -0400 control-spec: ADD_ONION NEW:BEST is now ED25519-V3 Signed-off-by: David Goulet <dgoulet(a)torproject.org> --- control-spec.txt | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/control-spec.txt b/control-spec.txt index 97bee17..e95bec1 100644 --- a/control-spec.txt +++ b/control-spec.txt @@ -1610,7 +1610,8 @@ KeyBlob = "BEST" / ; The server should generate a key using the "best" - supported algorithm (KeyType == "NEW") + supported algorithm (KeyType == "NEW"). + [As of 0.4.2.3-alpha, ED25519-V3 is used] "RSA1024" / ; The server should generate a 1024 bit RSA key (KeyType == "NEW") "ED25519-V3"; The server should generate an ed25519 private key @@ -1709,10 +1710,6 @@ PRF secret, and just pay the cost of recomputing the public key when importing an ED25519-V3 key.] - (The "NEW:BEST" option obeys the HiddenServiceVersion torrc option default - value. Since 0.3.5.1-alpha, it is 3. For Tor versions before 0.3.5.1-alpha, - default HiddenServiceVersion is 2.) - Examples: C: ADD_ONION NEW:BEST Flags=DiscardPK Port=80 S: 250-ServiceID=exampleonion1234

1 0

[translation/tpo-web] https://gitweb.torproject.org/translation.git/commit/?h=tpo-web
by translation＠torproject.org 07 Oct '19

07 Oct '19

commit 8727539d4a5d5a93e8d46e8829cae43f130b0f4c Author: Translation commit bot <translation(a)torproject.org> Date: Mon Oct 7 14:22:47 2019 +0000 https://gitweb.torproject.org/translation.git/commit/?h=tpo-web --- contents+ca.po | 50 ++++++++++++++++++++++++++++++++++++-------------- 1 file changed, 36 insertions(+), 14 deletions(-) diff --git a/contents+ca.po b/contents+ca.po index 248b8b105..79e949fba 100644 --- a/contents+ca.po +++ b/contents+ca.po @@ -709,7 +709,7 @@ msgstr "" #: templates/contact.html:11 msgid "Get in touch with other translators" -msgstr "" +msgstr "Entreu en contacte amb altres traductors" #: templates/contact.html:12 msgid "Watch or join publicly logged team meetings." @@ -719,6 +719,8 @@ msgstr "Mireu o uniu-vos a les nostres reunions públiques." msgid "" "Discuss organization and community related topics: meetups and outreach." msgstr "" +"Discutiu sobre temes relacionats amb l'organització i la comunitat: trobades" +" i participació." #: templates/contact.html:14 msgid "Discuss running a Tor relay." @@ -726,15 +728,15 @@ msgstr "Discutiu sobre mantenir un node Tor." #: templates/contact.html:15 msgid "Talk with Tor's global south community." -msgstr "Parleu amb la comunitat del Tor global del sur." +msgstr "Parleu amb la comunitat Tor global del sud." #: templates/contact.html:16 msgid "Talk with us about improvements on our websites." -msgstr "" +msgstr "Comenteu-nos millores per als nostres llocs web." #: templates/contact.html:17 msgid "Discuss UX related ideas." -msgstr "" +msgstr "Discutiu idees relacionades amb l'UX." #: templates/contact.html:23 msgid "Find us on Social Media" @@ -759,10 +761,14 @@ msgid "" "our support portal, you can ask the appropriate list. You're welcome to " "subscribe and just watch, too :)" msgstr "" +"Els nostres equips col·laboren en canals oberts, incloses llistes de correu;" +" us animem a unir-vos-hi. Si teniu una pregunta per a un equip en concret " +"que no es troba resolta en el portal d'assistència, podeu preguntar-la en la" +" llista corresponent. També us hi podeu subscriure i observar :)" #: templates/contact.html:63 msgid "Report a bug or give feedback." -msgstr "" +msgstr "Informeu d'un error o envieu comentaris." #: templates/contact.html:64 msgid "" @@ -770,20 +776,26 @@ msgid "" "us improve our software and resources, so your feedback is extremely " "valuable to us (and to all Tor users)." msgstr "" +"El Tor es recolza en el suport d'usuaris i voluntaris d'arreu del món per a " +"ajudar-nos a millorar el nostre programari i recursos. Així doncs, apreciem " +"molt els vostres comentaris (nosaltres i tots els usuaris del Tor)." #: templates/contact.html:70 msgid "Tell us about a bad relay." -msgstr "" +msgstr "Aviseu-nos sobre un node dolent." #: templates/contact.html:71 msgid "" "If you find a relay that you think is malicious, misconfigured, or otherwise" " broken, please check out our wiki page and blog post on how to report it." msgstr "" +"Si trobeu un node que penseu que és maliciós, no està ben configurat, o " +"quelcom trencat, llegiu la pàgina de la wiki i l'entrada del blog sobre com " +"informar-hi." #: templates/contact.html:79 msgid "Report a security issue." -msgstr "" +msgstr "Informeu d'un problema de seguretat." #: templates/contact.html:80 msgid "" @@ -793,10 +805,15 @@ msgid "" "contacting tor-security-sendkey(a)lists.torproject.org or from pool.sks-" "keyservers.net. Here is the fingerprint:" msgstr "" +"Si heu trobat un problema de seguretat en un dels nostres projectes o " +"infraestructura, envieu-nos un correu a tor-security(a)lists.torproject.org. " +"Si voleu xifrar el correu, podeu obtenir la clau pública GPG de la llista si" +" contacteu amb tor-security-sendkey(a)lists.torproject.org o des de pool.sks-" +"keyservers.net. Aquesta és l'empremta:" #: templates/contact.html:100 msgid "Email us" -msgstr "" +msgstr "Envieu-nos un correu" #: templates/contact.html:101 msgid "" @@ -805,30 +822,35 @@ msgid "" "email frontdesk(a)rt.torproject.org. For donor-related questions, contact " "giving(a)torproject.org" msgstr "" +"Per a preguntes i comentaris sobre l'organització sense afany de lucre Tor: " +"qüestions sobre la marca, afiliació i coordinació, consultes sobre " +"contractes, etc., envieu-nos un correu electrònic a " +"frontdesk(a)rt.torproject.org. Per a qüestions relacionades amb donacions, " +"contacteu amb giving(a)torproject.org" #: templates/contact.html:107 msgid "Send us Mail" -msgstr "" +msgstr "Correu postal" #: templates/download-android.html:12 msgid "Get Tor Browser for Android." -msgstr "" +msgstr "Baixeu el Navegador Tor per a l'Android." #: templates/download-android.html:15 templates/hero-download.html:5 msgid "Protect yourself against tracking, surveillance, and censorship." -msgstr "" +msgstr "Protegiu-vos del seguiment, la vigilància i la censura." #: templates/download-android.html:20 templates/download-android.html:22 msgid "Download .apk" -msgstr "" +msgstr "Baixa l'APK" #: templates/download-android.html:24 msgid "Go to Google Play" -msgstr "" +msgstr "Vés al Google Play" #: templates/download-android.html:26 msgid "Go to F-Droid" -msgstr "" +msgstr "Vés a l'F-Droid" #: templates/download-android.html:36 msgid "Are you an iOS user? We encourage you to try Onion Browser."

1 0

[tor/master] hs-v3: Make service pick the exact amount of intro points
by nickm＠torproject.org 07 Oct '19

07 Oct '19

commit 984a28f3e502c6df9e28057c3e934b98df83d8e9 Author: David Goulet <dgoulet(a)torproject.org> Date: Thu Aug 29 10:46:24 2019 -0400 hs-v3: Make service pick the exact amount of intro points When encoding introduction points, we were not checking if that intro points had an established circuit. When botting up, the service will pick, by default, 3 + 2 intro points and the first 3 that establish, we use them and upload the descriptor. However, the intro point is removed from the service descriptor list only when the circuit has opened and we see that we have already enough intro points, it is then removed. But it is possible that the service establishes 3 intro points successfully before the other(s) have even opened yet. This lead to the service encoding extra intro points in the descriptor even though the circuit is not opened or might never establish (#31561). Fixes #31548 Signed-off-by: David Goulet <dgoulet(a)torproject.org> --- changes/ticket31548 | 7 +++++++ src/feature/hs/hs_service.c | 9 +++++++++ 2 files changed, 16 insertions(+) diff --git a/changes/ticket31548 b/changes/ticket31548 new file mode 100644 index 000000000..fef0b5d01 --- /dev/null +++ b/changes/ticket31548 @@ -0,0 +1,7 @@ + o Major bugfixes (hidden service v3): + - Make onion service always use the exact amount of configured intro points + (or less due to node exlusion). Before, a service could sometimes pick + more intro points than configured with the + HiddenServiceNumIntroductionPoints option. Fixes bug 31548; bugfix on + 0.3.2.1-alpha. + diff --git a/src/feature/hs/hs_service.c b/src/feature/hs/hs_service.c index 402929036..4d0d92645 100644 --- a/src/feature/hs/hs_service.c +++ b/src/feature/hs/hs_service.c @@ -1686,6 +1686,15 @@ build_desc_intro_points(const hs_service_t *service, DIGEST256MAP_FOREACH(desc->intro_points.map, key, const hs_service_intro_point_t *, ip) { + if (!ip->circuit_established) { + /* Ignore un-established intro points. They can linger in that list + * because their circuit has not opened and they haven't been removed + * yet even though we have enough intro circuits. + * + * Due to #31561, it can stay in that list until rotation so this check + * prevents to publish an intro point without a circuit. */ + continue; + } hs_desc_intro_point_t *desc_ip = hs_desc_intro_point_new(); if (setup_desc_intro_point(&desc->signing_kp, ip, now, desc_ip) < 0) { hs_desc_intro_point_free(desc_ip);

1 0

[tor/master] Merge branch 'ticket31548_035_01_squashed'
by nickm＠torproject.org 07 Oct '19

07 Oct '19

commit 56e8d84ea3e5110c676c165882570b5cc37e946d Merge: 58b87a2c5 984a28f3e Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Oct 7 10:21:40 2019 -0400 Merge branch 'ticket31548_035_01_squashed' changes/ticket31548 | 7 +++++++ src/feature/hs/hs_service.c | 9 +++++++++ 2 files changed, 16 insertions(+)

1 0

[tor-browser-build/master] Bug 31981: Remove require-api.patch
by gk＠torproject.org 07 Oct '19

07 Oct '19

commit 3d9ec24a04131ce0a4030e068cfc3c3f90d1286f Author: sisbell <shane.isbell(a)gmail.com> Date: Mon Oct 7 00:46:58 2019 -0700 Bug 31981: Remove require-api.patch --- projects/tor-android-service/build | 1 - projects/tor-android-service/config | 1 - projects/tor-android-service/require-api.patch | 28 -------------------------- 3 files changed, 30 deletions(-) diff --git a/projects/tor-android-service/build b/projects/tor-android-service/build index 69f6147..4f5ac9b 100644 --- a/projects/tor-android-service/build +++ b/projects/tor-android-service/build @@ -14,7 +14,6 @@ mkdir -p /var/tmp/build $output_dir tar -C /var/tmp/build -xf [% project %]-[% c('version') %].tar.gz cd /var/tmp/build/[% project %]-[% c('version') %] -patch -p1 < $rootdir/require-api.patch patch -p1 < $rootdir/remove-native-build.patch patch -p1 < $rootdir/disable-daemon.patch patch -p1 < $rootdir/maven-local.patch diff --git a/projects/tor-android-service/config b/projects/tor-android-service/config index db8f5ac..1ca2cac 100644 --- a/projects/tor-android-service/config +++ b/projects/tor-android-service/config @@ -28,7 +28,6 @@ input_files: exec: '[% INCLUDE "fetch-gradle-dependencies" %]' - project: tor-onion-proxy-library name: topl - - filename: require-api.patch - filename: remove-native-build.patch - filename: disable-daemon.patch - filename: maven-local.patch diff --git a/projects/tor-android-service/require-api.patch b/projects/tor-android-service/require-api.patch deleted file mode 100644 index 43b7842..0000000 --- a/projects/tor-android-service/require-api.patch +++ /dev/null @@ -1,28 +0,0 @@ -diff --git a/service/src/main/java/org/torproject/android/service/TorService.java b/service/src/main/java/org/torproject/android/service/TorService.java -index d280a29..beb2b02 100644 ---- a/service/src/main/java/org/torproject/android/service/TorService.java -+++ b/service/src/main/java/org/torproject/android/service/TorService.java -@@ -12,7 +12,10 @@ import android.net.ConnectivityManager; - import android.net.NetworkInfo; - import android.os.Build; - import android.os.IBinder; --import android.support.annotation.RequiresApi; -+// Not available in 23.4.0 -+// https://developer.android.com/reference/android/support/annotation/Requires… -+//import android.support.annotation.RequiresApi; -+import android.annotation.TargetApi; - import android.text.TextUtils; - import android.util.Log; - import com.msopentech.thali.android.toronionproxy.AndroidOnionProxyManager; -@@ -93,7 +96,10 @@ public final class TorService extends Service implements TorServiceConstants, Or - startService(intentVpn); - } - -- @RequiresApi(api = Build.VERSION_CODES.O) -+ // Use TargetApi until we use a support library version that adds the -+ // RequriesApi annotation -+ //@RequiresApi(api = Build.VERSION_CODES.O) -+ @TargetApi(value = Build.VERSION_CODES.O) - private void createNotificationChannel(String appName, String appDescription) { - int importance = NotificationManager.IMPORTANCE_LOW; - NotificationChannel mChannel = new NotificationChannel(NOTIFICATION_CHANNEL_ID, appName,

1 0

[tor/master] err: Remove a duplicate header in backtrace.c
by nickm＠torproject.org 07 Oct '19

07 Oct '19

commit 56d0655ed85b98592201ddba0f46905b29388a6f Author: teor <teor(a)torproject.org> Date: Mon Sep 30 23:13:32 2019 +1000 err: Remove a duplicate header in backtrace.c --- src/lib/err/backtrace.c | 1 - 1 file changed, 1 deletion(-) diff --git a/src/lib/err/backtrace.c b/src/lib/err/backtrace.c index 4e881b979..8f26f8f4c 100644 --- a/src/lib/err/backtrace.c +++ b/src/lib/err/backtrace.c @@ -56,7 +56,6 @@ #define EXPOSE_CLEAN_BACKTRACE #include "lib/err/backtrace.h" -#include "lib/err/torerr.h" #if defined(HAVE_EXECINFO_H) && defined(HAVE_BACKTRACE) && \ defined(HAVE_BACKTRACE_SYMBOLS_FD) && defined(HAVE_SIGACTION) && \

1 0

[tor/master] err: Always lock the backtrace buffer before it is used
by nickm＠torproject.org 07 Oct '19

07 Oct '19

commit c23986246b970bd01d887fa151a5312a6dc7db04 Author: teor <teor(a)torproject.org> Date: Mon Sep 30 23:12:54 2019 +1000 err: Always lock the backtrace buffer before it is used Fixes bug 31734; bugfix on 0.2.5.3-alpha. --- changes/bug31734 | 3 +++ src/lib/err/backtrace.c | 47 ++++++++++++++++++++++++++++++++++++++++++----- 2 files changed, 45 insertions(+), 5 deletions(-) diff --git a/changes/bug31734 b/changes/bug31734 new file mode 100644 index 000000000..ce989ea5d --- /dev/null +++ b/changes/bug31734 @@ -0,0 +1,3 @@ + o Minor bugfixes (error handling): + - Always lock the backtrace buffer before it is used. + Fixes bug 31734; bugfix on 0.2.5.3-alpha. diff --git a/src/lib/err/backtrace.c b/src/lib/err/backtrace.c index 8bc7e6965..4e881b979 100644 --- a/src/lib/err/backtrace.c +++ b/src/lib/err/backtrace.c @@ -52,6 +52,8 @@ #include <pthread.h> #endif +#include "lib/cc/ctassert.h" + #define EXPOSE_CLEAN_BACKTRACE #include "lib/err/backtrace.h" #include "lib/err/torerr.h" @@ -73,15 +75,40 @@ static char bt_version[128] = ""; #ifdef USE_BACKTRACE + /** Largest stack depth to try to dump. */ #define MAX_DEPTH 256 -/** Static allocation of stack to dump. This is static so we avoid stack - * pressure. */ -static void *cb_buf[MAX_DEPTH]; +/** The size of the callback buffer, so we can clear it in unlock_cb_buf(). */ +#define SIZEOF_CB_BUF (MAX_DEPTH * sizeof(void *)) /** Protects cb_buf from concurrent access. Pthreads, since this code * is Unix-only, and since this code needs to be lowest-level. */ static pthread_mutex_t cb_buf_mutex = PTHREAD_MUTEX_INITIALIZER; +/** Lock and return a static stack pointer buffer that can hold up to + * MAX_DEPTH function pointers. */ +static void * +lock_cb_buf(void) +{ + /* Lock the mutex first, before even declaring the buffer. */ + pthread_mutex_lock(&cb_buf_mutex); + + /** Static allocation of stack to dump. This is static so we avoid stack + * pressure. */ + static void *cb_buf[MAX_DEPTH]; + CTASSERT(SIZEOF_CB_BUF == sizeof(cb_buf)); + memset(cb_buf, 0, SIZEOF_CB_BUF); + + return cb_buf; +} + +/** Unlock the static stack pointer buffer. */ +static void +unlock_cb_buf(void *cb_buf) +{ + memset(cb_buf, 0, SIZEOF_CB_BUF); + pthread_mutex_unlock(&cb_buf_mutex); +} + /** Change a stacktrace in stack of depth depth so that it will * log the correct function from which a signal was received with context * ctx. (When we get a signal, the current function will not have @@ -123,7 +150,7 @@ log_backtrace_impl(int severity, log_domain_mask_t domain, const char *msg, char **symbols; size_t i; - pthread_mutex_lock(&cb_buf_mutex); + void *cb_buf = lock_cb_buf(); depth = backtrace(cb_buf, MAX_DEPTH); symbols = backtrace_symbols(cb_buf, (int)depth); @@ -141,7 +168,7 @@ log_backtrace_impl(int severity, log_domain_mask_t domain, const char *msg, raw_free(symbols); done: - pthread_mutex_unlock(&cb_buf_mutex); + unlock_cb_buf(cb_buf); } static void crash_handler(int sig, siginfo_t *si, void *ctx_) @@ -157,6 +184,8 @@ crash_handler(int sig, siginfo_t *si, void *ctx_) int n_fds, i; const int *fds = NULL; + void *cb_buf = lock_cb_buf(); + (void) si; depth = backtrace(cb_buf, MAX_DEPTH); @@ -173,6 +202,8 @@ crash_handler(int sig, siginfo_t *si, void *ctx_) for (i=0; i < n_fds; ++i) backtrace_symbols_fd(cb_buf, (int)depth, fds[i]); + unlock_cb_buf(cb_buf); + tor_raw_abort_(); } @@ -184,11 +215,15 @@ dump_stack_symbols_to_error_fds(void) const int *fds = NULL; size_t depth; + void *cb_buf = lock_cb_buf(); + depth = backtrace(cb_buf, MAX_DEPTH); n_fds = tor_log_get_sigsafe_err_fds(&fds); for (i=0; i < n_fds; ++i) backtrace_symbols_fd(cb_buf, (int)depth, fds[i]); + + unlock_cb_buf(cb_buf); } /* The signals that we want our backtrace handler to trap */ @@ -222,10 +257,12 @@ install_bt_handler(void) * libc has pre-loaded the symbols we need to dump things, so that later * reads won't be denied by the sandbox code */ char **symbols; + void *cb_buf = lock_cb_buf(); size_t depth = backtrace(cb_buf, MAX_DEPTH); symbols = backtrace_symbols(cb_buf, (int) depth); if (symbols) raw_free(symbols); + unlock_cb_buf(cb_buf); } return rv;

1 0

[tor/master] Merge remote-tracking branch 'tor-github/pr/1379'
by nickm＠torproject.org 07 Oct '19

07 Oct '19

commit 58b87a2c596185b2b7ef84d49fecbc603b5467d0 Merge: 52194c868 56d0655ed Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Oct 7 10:15:46 2019 -0400 Merge remote-tracking branch 'tor-github/pr/1379' changes/bug31734 | 3 +++ src/lib/err/backtrace.c | 48 ++++++++++++++++++++++++++++++++++++++++++------ 2 files changed, 45 insertions(+), 6 deletions(-)

1 0

[tor/master] configure: Give a more useful message when pkg-config fails
by nickm＠torproject.org 07 Oct '19

07 Oct '19

commit f0993d3831b6132e342fb192820fc04902c98b38 Author: teor <teor(a)torproject.org> Date: Thu Oct 3 16:31:20 2019 +1000 configure: Give a more useful message when pkg-config fails When pkg-config is not installed, or a library that depends on pkg-config is not found, tell the user what to do to fix the problem. Fixes bug 31922; bugfix on 0.3.1.1-alpha. --- changes/bug31922 | 4 ++++ configure.ac | 19 +++++++++++++------ 2 files changed, 17 insertions(+), 6 deletions(-) diff --git a/changes/bug31922 b/changes/bug31922 new file mode 100644 index 000000000..e6f31ce66 --- /dev/null +++ b/changes/bug31922 @@ -0,0 +1,4 @@ + o Minor bugfixes (configuration): + - When pkg-config is not installed, or a library that depends on + pkg-config is not found, tell the user what to do to fix the + problem. Fixes bug 31922; bugfix on 0.3.1.1-alpha. diff --git a/configure.ac b/configure.ac index bd12e6167..dbcb51d47 100644 --- a/configure.ac +++ b/configure.ac @@ -29,6 +29,13 @@ AC_USE_SYSTEM_EXTENSIONS AC_CANONICAL_HOST PKG_PROG_PKG_CONFIG +if test "x$PKG_CONFIG" = "x" ; then + pkg_config_user_action="install pkg-config, and check the PKG_CONFIG_PATH environment variable." + AC_MSG_NOTICE([Some libraries need pkg-config, including systemd, nss, lzma, zstd, and custom mallocs.]) + AC_MSG_NOTICE([To use those libraries, $pkg_config_user_action]) +else + pkg_config_user_action="check the PKG_CONFIG_PATH environment variable." +fi AC_ARG_ENABLE(openbsd-malloc, AS_HELP_STRING(--enable-openbsd-malloc, [use malloc code from OpenBSD. Linux only. Deprecated: see --with-malloc])) @@ -166,7 +173,7 @@ AC_SUBST(TOR_SYSTEMD_CFLAGS) AC_SUBST(TOR_SYSTEMD_LIBS) if test "x$enable_systemd" = "xyes" -a "x$have_systemd" != "xyes" ; then - AC_MSG_ERROR([Explicitly requested systemd support, but systemd not found]) + AC_MSG_ERROR([Explicitly requested systemd support, but systemd not found, $pkg_config_user_action]) fi case "$host" in @@ -870,7 +877,7 @@ if test "x$enable_nss" = "xyes"; then PKG_CHECK_MODULES(NSS, [nss], [have_nss=yes], - [have_nss=no; AC_MSG_ERROR([You asked for NSS but I can't find it.])]) + [have_nss=no; AC_MSG_ERROR([You asked for NSS but I can't find it, $pkg_config_user_action])]) AC_SUBST(NSS_CFLAGS) AC_SUBST(NSS_LIBS) fi @@ -1076,7 +1083,7 @@ else have_lzma=no) if test "x$have_lzma" = "xno" ; then - AC_MSG_WARN([Unable to find liblzma.]) + AC_MSG_WARN([Unable to find liblzma, $pkg_config_user_action]) fi fi @@ -1108,7 +1115,7 @@ else have_zstd=no) if test "x$have_zstd" = "xno" ; then - AC_MSG_WARN([Unable to find libzstd.]) + AC_MSG_WARN([Unable to find libzstd, $pkg_config_user_action]) fi fi @@ -1915,7 +1922,7 @@ AS_CASE([$malloc], have_tcmalloc=no) if test "x$have_tcmalloc" = "xno" ; then - AC_MSG_ERROR([Unable to find tcmalloc requested by --with-malloc.]) + AC_MSG_ERROR([Unable to find tcmalloc requested by --with-malloc, $pkg_config_user_action]) fi CFLAGS="$CFLAGS $TCMALLOC_CFLAGS" @@ -1929,7 +1936,7 @@ AS_CASE([$malloc], have_jemalloc=no) if test "x$have_tcmalloc" = "xno" ; then - AC_MSG_ERROR([Unable to find jemalloc requested by --with-malloc.]) + AC_MSG_ERROR([Unable to find jemalloc requested by --with-malloc, $pkg_config_user_action]) fi CFLAGS="$CFLAGS $JEMALLOC_CFLAGS"

1 0