December 2014 - tor-commits - lists.torproject.org

[translation/tor-launcher-properties] Update translations for tor-launcher-properties
by translation＠torproject.org 23 Dec '14

23 Dec '14

commit 6542040aee6a451f937e36cc43af706f930ff568 Author: Translation commit bot <translation(a)torproject.org> Date: Tue Dec 23 18:15:27 2014 +0000 Update translations for tor-launcher-properties --- eo/torlauncher.properties | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/eo/torlauncher.properties b/eo/torlauncher.properties index 8a3706c..d62e013 100644 --- a/eo/torlauncher.properties +++ b/eo/torlauncher.properties @@ -1,7 +1,7 @@ ### Copyright (c) 2014, The Tor Project, Inc. ### See LICENSE for licensing information. -torlauncher.error_title=Tor Launcher +torlauncher.error_title=Tor-startigilo torlauncher.tor_exited=Tor unexpectedly exited. This might be due to a bug in Tor itself, another program on your system, or faulty hardware. Until you restart Tor, the Tor Browser will not able to reach any websites. If the problem persists, please send a copy of your Tor Log to the support team. torlauncher.tor_exited2=Restarting Tor will not close your browser tabs. @@ -11,27 +11,27 @@ torlauncher.tor_control_failed=Failed to take control of Tor. torlauncher.tor_bootstrap_failed=Tor failed to establish a Tor network connection. torlauncher.tor_bootstrap_failed_details=%1$S failed (%2$S). -torlauncher.unable_to_start_tor=Unable to start Tor.\n\n%S +torlauncher.unable_to_start_tor=Ne eblas starti Tor.\n\n%S torlauncher.tor_missing=The Tor executable is missing. -torlauncher.torrc_missing=The torrc file is missing. -torlauncher.datadir_missing=The Tor data directory does not exist. +torlauncher.torrc_missing=Konfigura dosiero torrc mankas. +torlauncher.datadir_missing=Datuma dosierujo de Tor ne ekzistas. torlauncher.password_hash_missing=Failed to get hashed password. -torlauncher.failed_to_get_settings=Unable to retrieve Tor settings.\n\n%S -torlauncher.failed_to_save_settings=Unable to save Tor settings.\n\n%S -torlauncher.ensure_tor_is_running=Please ensure that Tor is running. +torlauncher.failed_to_get_settings=Ne eblas ricevi agordojn de Tor.\n\n%S +torlauncher.failed_to_save_settings=Ne eblas konservi agordojn de Tor.\n\n%S +torlauncher.ensure_tor_is_running=Bonvolu certiĝi ĉu Tor estas startigita. torlauncher.error_proxy_addr_missing=You must specify both an IP address or hostname and a port number to configure Tor to use a proxy to access the Internet. -torlauncher.error_proxy_type_missing=You must select the proxy type. +torlauncher.error_proxy_type_missing=Vi devas elekti tipon de prokurservilo. torlauncher.error_bridges_missing=You must specify one or more bridges. torlauncher.error_default_bridges_type_missing=You must select a transport type for the provided bridges. torlauncher.error_bridge_bad_default_type=No provided bridges that have the transport type %S are available. Please adjust your settings. torlauncher.recommended_bridge=(recommended) -torlauncher.connect=Connect +torlauncher.connect=Konekti torlauncher.restart_tor=Restart Tor -torlauncher.quit=Quit +torlauncher.quit=Eliri torlauncher.quit_win=Eliri torlauncher.done=Done

1 0

[tor/master] Fix Matthews code to actually use tmp
by nickm＠torproject.org 23 Dec '14

23 Dec '14

commit c83f18011697d3b3c3434464280271697f79d20a Author: Francisco Blas Izquierdo Riera (klondike) <klondike(a)gentoo.org> Date: Tue Dec 23 12:55:48 2014 -0500 Fix Matthews code to actually use tmp Matthew's autoaddr code returned an undecorated address when trying to check that the code didn't insert an undecorated one into the map. This patch fixes this by actually storing the undecorated address in tmp instead of buf as it was originally intended. This patch is released under the same license as the original file as long as the author iscredited. Signed-off-by: Francisco Blas Izquierdo Riera (klondike) <klondike(a)gentoo.org> --- src/or/addressmap.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/or/addressmap.c b/src/or/addressmap.c index 998770a..9062d76 100644 --- a/src/or/addressmap.c +++ b/src/or/addressmap.c @@ -888,7 +888,7 @@ addressmap_get_virtual_address(int type) /* XXXX This code is to make sure I didn't add an undecorated version * by mistake. I hope it's needless. */ char tmp[TOR_ADDR_BUF_LEN]; - tor_addr_to_str(buf, &addr, sizeof(tmp), 0); + tor_addr_to_str(tmp, &addr, sizeof(tmp), 0); if (strmap_get(addressmap, tmp)) { log_warn(LD_BUG, "%s wasn't in the addressmap, but %s was.", buf, tmp);

1 0

[tor/master] Changes file for 13811
by nickm＠torproject.org 23 Dec '14

23 Dec '14

commit c10ff2626502531a3d87989236e932c656e86801 Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Dec 23 13:00:21 2014 -0500 Changes file for 13811 --- changes/bug13811 | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/changes/bug13811 b/changes/bug13811 new file mode 100644 index 0000000..1b9bd9c --- /dev/null +++ b/changes/bug13811 @@ -0,0 +1,6 @@ + o Major bugfixes (client, automap): + - Repair automapping with IPv6 addresses; this automapping should + have worked previously, but one piece of debugging code that we + inserted to detect a regression actually caused the regression + to manifest itself again. Fixes bug 13811; bugfix on + 0.2.4.7-alpha. Diagnosed and fixed by Francisco Blas Izquierdo Riera. \ No newline at end of file

1 0

[tor/master] Merge remote-tracking branch 'public/bug13811_025'
by nickm＠torproject.org 23 Dec '14

23 Dec '14

commit d7776315df8ec12a496127a5d5c3c9fcbec9c092 Merge: 45b911b c10ff26 Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Dec 23 13:02:37 2014 -0500 Merge remote-tracking branch 'public/bug13811_025' changes/bug13811 | 6 ++++++ src/or/addressmap.c | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-)

1 0

[translation/tails-misc] Update translations for tails-misc
by translation＠torproject.org 23 Dec '14

23 Dec '14

commit 9da61a2fa0f42b2e7f4afbb1c2ac8d58912a6af9 Author: Translation commit bot <translation(a)torproject.org> Date: Tue Dec 23 17:45:43 2014 +0000 Update translations for tails-misc --- eo.po | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/eo.po b/eo.po index 760f1b3..83c5986 100644 --- a/eo.po +++ b/eo.po @@ -9,8 +9,8 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2014-12-02 11:29+0100\n" -"PO-Revision-Date: 2014-12-04 08:50+0000\n" -"Last-Translator: runasand <runa.sandvik(a)gmail.com>\n" +"PO-Revision-Date: 2014-12-23 17:41+0000\n" +"Last-Translator: Leopoldo Sabbatini <leosabbat(a)hmamail.com>\n" "Language-Team: Esperanto (http://www.transifex.com/projects/p/torproject/language/eo/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -80,7 +80,7 @@ msgstr "La tondujo ne enhavas validajn datumojn." #: config/chroot_local-includes/usr/local/bin/gpgApplet:297 #: config/chroot_local-includes/usr/local/bin/gpgApplet:299 msgid "Unknown Trust" -msgstr "" +msgstr "Nekonata fido" #: config/chroot_local-includes/usr/local/bin/gpgApplet:301 msgid "Marginal Trust" @@ -88,7 +88,7 @@ msgstr "" #: config/chroot_local-includes/usr/local/bin/gpgApplet:303 msgid "Full Trust" -msgstr "" +msgstr "Plena fido" #: config/chroot_local-includes/usr/local/bin/gpgApplet:305 msgid "Ultimate Trust" @@ -100,7 +100,7 @@ msgstr "Nomo" #: config/chroot_local-includes/usr/local/bin/gpgApplet:359 msgid "Key ID" -msgstr "" +msgstr "Ŝlosila identigilo" #: config/chroot_local-includes/usr/local/bin/gpgApplet:360 msgid "Status" @@ -183,7 +183,7 @@ msgstr "GnuPG eraro" #: config/chroot_local-includes/usr/local/bin/gpgApplet:764 msgid "Therefore the operation cannot be performed." -msgstr "" +msgstr "Tial la operacio ne povis esti farita." #: config/chroot_local-includes/usr/local/bin/gpgApplet:814 msgid "GnuPG results" @@ -195,7 +195,7 @@ msgstr "Eligo de GnuPG:" #: config/chroot_local-includes/usr/local/bin/gpgApplet:845 msgid "Other messages provided by GnuPG:" -msgstr "" +msgstr "Aliaj mesaĝoj de GnuPG:" #: config/chroot_local-includes/usr/local/lib/shutdown-helper-applet:39 msgid "Shutdown Immediately" @@ -223,7 +223,7 @@ msgstr "The Amnesic Incognito Live System" msgid "" "Build information:\n" "%s" -msgstr "" +msgstr "Informoj de muntado:\n%s" #: config/chroot_local-includes/usr/local/bin/tails-about:27 #: ../config/chroot_local-includes/usr/share/applications/tails-about.desktop.in.h:1 @@ -374,7 +374,7 @@ msgstr "_Ŝalti" #: config/chroot_local-includes/usr/local/sbin/unsafe-browser:76 msgid "_Exit" -msgstr "" +msgstr "_Eliri" #: config/chroot_local-includes/usr/local/sbin/unsafe-browser:86 msgid "Starting the Unsafe Browser..."

1 0

[translation/https_everywhere] Update translations for https_everywhere
by translation＠torproject.org 23 Dec '14

23 Dec '14

commit c493d597c03be39d1fe1325d68c52ce708eb519f Author: Translation commit bot <translation(a)torproject.org> Date: Tue Dec 23 17:45:19 2014 +0000 Update translations for https_everywhere --- eo/ssl-observatory.dtd | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/eo/ssl-observatory.dtd b/eo/ssl-observatory.dtd index d481fd3..a7d65d0 100644 --- a/eo/ssl-observatory.dtd +++ b/eo/ssl-observatory.dtd @@ -1,6 +1,6 @@  <!ENTITY ssl-observatory.popup.details "Details and Privacy Information"> -<!ENTITY ssl-observatory.popup.later "Ask Me Later"> +<!ENTITY ssl-observatory.popup.later "Demandu min pli poste"> <!ENTITY ssl-observatory.popup.no "Ne"> <!ENTITY ssl-observatory.popup.text "HTTPS Everywhere can detect attacks @@ -32,9 +32,9 @@ intrusive corporate network:"> <!ENTITY ssl-observatory.prefs.alt_roots_tooltip "It is safe (and a good idea) to enable this option, unless you use an intrusive corporate network or Kaspersky antivirus software that monitors your browsing with a TLS proxy and a private root Certificate Authority. If enabled on such a network, this option might publish evidence of which https:// domains were being visited through that proxy, because of the unique certificates it would produce. So we leave it off by default."> -<!ENTITY ssl-observatory.prefs.anonymous "Check certificates using Tor for anonymity"> +<!ENTITY ssl-observatory.prefs.anonymous "Kontroli certigilojn per Tor por anonimeco"> <!ENTITY ssl-observatory.prefs.anonymous_unavailable -"Check certificates using Tor for anonymity (requires Tor)"> +"Kontroli certigilojn per Tor por anonimeco (bezonas Tor)"> <!ENTITY ssl-observatory.prefs.anonymous_tooltip "This option requires Tor to be installed and running"> @@ -73,7 +73,7 @@ looked at. Mouseover the options for further details:"> <!ENTITY ssl-observatory.prefs.hide "Hide advanced options"> <!ENTITY ssl-observatory.prefs.nonanon -"Check certificates even if Tor is not available"> +"Kontroli certigilojn ankaŭ se Tor ne uzeblas"> <!ENTITY ssl-observatory.prefs.nonanon_tooltip "We will still try to keep the data anonymous, but this option is less secure"> @@ -91,7 +91,7 @@ looked at. Mouseover the options for further details:"> <!ENTITY ssl-observatory.prefs.use "Use the Observatory?"> <!ENTITY ssl-observatory.warning.title "WARNING from EFF's SSL Observatory"> <!ENTITY ssl-observatory.warning.showcert "Show the certificate chain"> -<!ENTITY ssl-observatory.warning.okay "I understand"> +<!ENTITY ssl-observatory.warning.okay "Mi komprenas"> <!ENTITY ssl-observatory.warning.text "EFF's SSL Observatory has issued a warning about the HTTPS certificiate(s) for this site:"> <!ENTITY ssl-observatory.warning.defense "If you are logged in to this site, it may be advisable to change your password once you have a safe connection. (These warnings can be disabled in the "SSL Observatory" tab of the HTTPS Everywhere preferences dialog.)">

1 0

[translation/torcheck_completed] Update translations for torcheck_completed
by translation＠torproject.org 23 Dec '14

23 Dec '14

commit 812dc42d74ea053df6d2f77204629ad50a505e41 Author: Translation commit bot <translation(a)torproject.org> Date: Tue Dec 23 17:45:12 2014 +0000 Update translations for torcheck_completed --- eo/torcheck.po | 18 +++++++++++------- 1 file changed, 11 insertions(+), 7 deletions(-) diff --git a/eo/torcheck.po b/eo/torcheck.po index 6453a91..3b5d531 100644 --- a/eo/torcheck.po +++ b/eo/torcheck.po @@ -2,15 +2,16 @@ # Copyright (C) 2008-2013 The Tor Project, Inc # # Translators: -# naza_loligo <cjk34(a)cam.ac.uk>, 2013 -# etrapani <etrapani(a)gmail.com>, 2014 -# Michael Moroni <michael.moroni(a)mailoo.org>, 2013 +# Chris Kerr <cjk34(a)cam.ac.uk>, 2013 +# Eduardo Trápani <etrapani(a)gmail.com>, 2014 +# Leopoldo Sabbatini <leosabbat(a)hmamail.com>, 2014 +# Michael Moroni <michael.moroni(a)openmailbox.org>, 2013 msgid "" msgstr "" "Project-Id-Version: The Tor Project\n" "POT-Creation-Date: 2012-02-16 20:28+PDT\n" -"PO-Revision-Date: 2014-03-10 19:11+0000\n" -"Last-Translator: etrapani <etrapani(a)gmail.com>\n" +"PO-Revision-Date: 2014-12-23 17:31+0000\n" +"Last-Translator: Leopoldo Sabbatini <leosabbat(a)hmamail.com>\n" "Language-Team: Esperanto (http://www.transifex.com/projects/p/torproject/language/eo/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -37,7 +38,7 @@ msgid "" msgstr "<a href=\"https://www.torproject.org/download/download-easy.html\">Klaku ĉi tie por iri al la paĝo de elŝutoj</a>" msgid "Sorry. You are not using Tor." -msgstr "Pardonu. Vi ne estas uzanta Tor." +msgstr "Pardonu. Vi ne uzas Tor." msgid "" "If you are attempting to use a Tor client, please refer to the <a " @@ -58,7 +59,7 @@ msgid "Your IP address appears to be: " msgstr "Via adreso IP ŝajnas esti: " msgid "Are you using Tor?" -msgstr "Ĉu vi estas uzanta Tor?" +msgstr "Ĉu vi uzas Tor?" msgid "This page is also available in the following languages:" msgstr "Tiu ĉi paĝo ankaŭ haveblas en la jenaj lingvoj:" @@ -94,3 +95,6 @@ msgstr "JavaScript estas aktiva" msgid "JavaScript is disabled." msgstr "JavaScript estas malaktiva" + +msgid "However, it does not appear to be the Tor Browser Bundle." +msgstr "Tamen, ŝajnas ke vi ne uzas Tor Browser Bundle."

1 0

[translation/torcheck] Update translations for torcheck
by translation＠torproject.org 23 Dec '14

23 Dec '14

commit c16ccfb49e45d265c48dd3babbcf273584a65dfc Author: Translation commit bot <translation(a)torproject.org> Date: Tue Dec 23 17:45:08 2014 +0000 Update translations for torcheck --- eo/torcheck.po | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/eo/torcheck.po b/eo/torcheck.po index 9f8fb5a..3b5d531 100644 --- a/eo/torcheck.po +++ b/eo/torcheck.po @@ -4,13 +4,14 @@ # Translators: # Chris Kerr <cjk34(a)cam.ac.uk>, 2013 # Eduardo Trápani <etrapani(a)gmail.com>, 2014 +# Leopoldo Sabbatini <leosabbat(a)hmamail.com>, 2014 # Michael Moroni <michael.moroni(a)openmailbox.org>, 2013 msgid "" msgstr "" "Project-Id-Version: The Tor Project\n" "POT-Creation-Date: 2012-02-16 20:28+PDT\n" -"PO-Revision-Date: 2014-10-15 17:11+0000\n" -"Last-Translator: runasand <runa.sandvik(a)gmail.com>\n" +"PO-Revision-Date: 2014-12-23 17:31+0000\n" +"Last-Translator: Leopoldo Sabbatini <leosabbat(a)hmamail.com>\n" "Language-Team: Esperanto (http://www.transifex.com/projects/p/torproject/language/eo/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -37,7 +38,7 @@ msgid "" msgstr "<a href=\"https://www.torproject.org/download/download-easy.html\">Klaku ĉi tie por iri al la paĝo de elŝutoj</a>" msgid "Sorry. You are not using Tor." -msgstr "Pardonu. Vi ne estas uzanta Tor." +msgstr "Pardonu. Vi ne uzas Tor." msgid "" "If you are attempting to use a Tor client, please refer to the <a " @@ -58,7 +59,7 @@ msgid "Your IP address appears to be: " msgstr "Via adreso IP ŝajnas esti: " msgid "Are you using Tor?" -msgstr "Ĉu vi estas uzanta Tor?" +msgstr "Ĉu vi uzas Tor?" msgid "This page is also available in the following languages:" msgstr "Tiu ĉi paĝo ankaŭ haveblas en la jenaj lingvoj:" @@ -96,4 +97,4 @@ msgid "JavaScript is disabled." msgstr "JavaScript estas malaktiva" msgid "However, it does not appear to be the Tor Browser Bundle." -msgstr "" +msgstr "Tamen, ŝajnas ke vi ne uzas Tor Browser Bundle."

1 0

[tor/master] Add pkg.m4 to use pkgconfig macros
by nickm＠torproject.org 23 Dec '14

23 Dec '14

commit 45b911b79b66d5df700cd3cae0c7c1dcb9cec843 Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Dec 23 11:39:48 2014 -0500 Add pkg.m4 to use pkgconfig macros --- LICENSE | 31 ++++++++- m4/pkg.m4 | 214 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 244 insertions(+), 1 deletion(-) diff --git a/LICENSE b/LICENSE index 7e50947..d0fb43a 100644 --- a/LICENSE +++ b/LICENSE @@ -191,7 +191,7 @@ ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT DATABASE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. =============================================================================== m4/pc_from_ucontext.m4 is available under the following license. Note that -it is *not* built into the Tor license. +it is *not* built into the Tor software. Copyright (c) 2005, Google Inc. All rights reserved. @@ -223,6 +223,35 @@ THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. =============================================================================== +m4/pkg.m4 is available under the following license. Note that +it is *not* built into the Tor software. + +pkg.m4 - Macros to locate and utilise pkg-config. -*- Autoconf -*- +serial 1 (pkg-config-0.24) + +Copyright © 2004 Scott James Remnant <scott(a)netsplit.com>. + +This program is free software; you can redistribute it and/or modify +it under the terms of the GNU General Public License as published by +the Free Software Foundation; either version 2 of the License, or +(at your option) any later version. + +This program is distributed in the hope that it will be useful, but +WITHOUT ANY WARRANTY; without even the implied warranty of +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +General Public License for more details. + +You should have received a copy of the GNU General Public License +along with this program; if not, write to the Free Software +Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + +As a special exception to the GNU General Public License, if you +distribute this file as part of a program that contains a +configuration script generated by Autoconf, you may include it under +the same distribution terms that you use for the rest of that program. + + +=============================================================================== If you got Tor as a static binary with OpenSSL included, then you should know: "This product includes software developed by the OpenSSL Project for use in the OpenSSL Toolkit (http://www.openssl.org/)" diff --git a/m4/pkg.m4 b/m4/pkg.m4 new file mode 100644 index 0000000..c5b26b5 --- /dev/null +++ b/m4/pkg.m4 @@ -0,0 +1,214 @@ +# pkg.m4 - Macros to locate and utilise pkg-config. -*- Autoconf -*- +# serial 1 (pkg-config-0.24) +# +# Copyright © 2004 Scott James Remnant <scott(a)netsplit.com>. +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2 of the License, or +# (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +# General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +# +# As a special exception to the GNU General Public License, if you +# distribute this file as part of a program that contains a +# configuration script generated by Autoconf, you may include it under +# the same distribution terms that you use for the rest of that program. + +# PKG_PROG_PKG_CONFIG([MIN-VERSION]) +# ---------------------------------- +AC_DEFUN([PKG_PROG_PKG_CONFIG], +[m4_pattern_forbid([^_?PKG_[A-Z_]+$]) +m4_pattern_allow([^PKG_CONFIG(_(PATH|LIBDIR|SYSROOT_DIR|ALLOW_SYSTEM_(CFLAGS|LIBS)))?$]) +m4_pattern_allow([^PKG_CONFIG_(DISABLE_UNINSTALLED|TOP_BUILD_DIR|DEBUG_SPEW)$]) +AC_ARG_VAR([PKG_CONFIG], [path to pkg-config utility]) +AC_ARG_VAR([PKG_CONFIG_PATH], [directories to add to pkg-config's search path]) +AC_ARG_VAR([PKG_CONFIG_LIBDIR], [path overriding pkg-config's built-in search path]) + +if test "x$ac_cv_env_PKG_CONFIG_set" != "xset"; then + AC_PATH_TOOL([PKG_CONFIG], [pkg-config]) +fi +if test -n "$PKG_CONFIG"; then + _pkg_min_version=m4_default([$1], [0.9.0]) + AC_MSG_CHECKING([pkg-config is at least version $_pkg_min_version]) + if $PKG_CONFIG --atleast-pkgconfig-version $_pkg_min_version; then + AC_MSG_RESULT([yes]) + else + AC_MSG_RESULT([no]) + PKG_CONFIG="" + fi +fi[]dnl +])# PKG_PROG_PKG_CONFIG + +# PKG_CHECK_EXISTS(MODULES, [ACTION-IF-FOUND], [ACTION-IF-NOT-FOUND]) +# +# Check to see whether a particular set of modules exists. Similar +# to PKG_CHECK_MODULES(), but does not set variables or print errors. +# +# Please remember that m4 expands AC_REQUIRE([PKG_PROG_PKG_CONFIG]) +# only at the first occurence in configure.ac, so if the first place +# it's called might be skipped (such as if it is within an "if", you +# have to call PKG_CHECK_EXISTS manually +# -------------------------------------------------------------- +AC_DEFUN([PKG_CHECK_EXISTS], +[AC_REQUIRE([PKG_PROG_PKG_CONFIG])dnl +if test -n "$PKG_CONFIG" && \ + AC_RUN_LOG([$PKG_CONFIG --exists --print-errors "$1"]); then + m4_default([$2], [:]) +m4_ifvaln([$3], [else + $3])dnl +fi]) + +# _PKG_CONFIG([VARIABLE], [COMMAND], [MODULES]) +# --------------------------------------------- +m4_define([_PKG_CONFIG], +[if test -n "$$1"; then + pkg_cv_[]$1="$$1" + elif test -n "$PKG_CONFIG"; then + PKG_CHECK_EXISTS([$3], + [pkg_cv_[]$1=`$PKG_CONFIG --[]$2 "$3" 2>/dev/null` + test "x$?" != "x0" && pkg_failed=yes ], + [pkg_failed=yes]) + else + pkg_failed=untried +fi[]dnl +])# _PKG_CONFIG + +# _PKG_SHORT_ERRORS_SUPPORTED +# ----------------------------- +AC_DEFUN([_PKG_SHORT_ERRORS_SUPPORTED], +[AC_REQUIRE([PKG_PROG_PKG_CONFIG]) +if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then + _pkg_short_errors_supported=yes +else + _pkg_short_errors_supported=no +fi[]dnl +])# _PKG_SHORT_ERRORS_SUPPORTED + + +# PKG_CHECK_MODULES(VARIABLE-PREFIX, MODULES, [ACTION-IF-FOUND], +# [ACTION-IF-NOT-FOUND]) +# +# +# Note that if there is a possibility the first call to +# PKG_CHECK_MODULES might not happen, you should be sure to include an +# explicit call to PKG_PROG_PKG_CONFIG in your configure.ac +# +# +# -------------------------------------------------------------- +AC_DEFUN([PKG_CHECK_MODULES], +[AC_REQUIRE([PKG_PROG_PKG_CONFIG])dnl +AC_ARG_VAR([$1][_CFLAGS], [C compiler flags for $1, overriding pkg-config])dnl +AC_ARG_VAR([$1][_LIBS], [linker flags for $1, overriding pkg-config])dnl + +pkg_failed=no +AC_MSG_CHECKING([for $1]) + +_PKG_CONFIG([$1][_CFLAGS], [cflags], [$2]) +_PKG_CONFIG([$1][_LIBS], [libs], [$2]) + +m4_define([_PKG_TEXT], [Alternatively, you may set the environment variables $1[]_CFLAGS +and $1[]_LIBS to avoid the need to call pkg-config. +See the pkg-config man page for more details.]) + +if test $pkg_failed = yes; then + AC_MSG_RESULT([no]) + _PKG_SHORT_ERRORS_SUPPORTED + if test $_pkg_short_errors_supported = yes; then + $1[]_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "$2" 2>&1` + else + $1[]_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "$2" 2>&1` + fi + # Put the nasty error message in config.log where it belongs + echo "$$1[]_PKG_ERRORS" >&AS_MESSAGE_LOG_FD + + m4_default([$4], [AC_MSG_ERROR( +[Package requirements ($2) were not met: + +$$1_PKG_ERRORS + +Consider adjusting the PKG_CONFIG_PATH environment variable if you +installed software in a non-standard prefix. + +_PKG_TEXT])[]dnl + ]) +elif test $pkg_failed = untried; then + AC_MSG_RESULT([no]) + m4_default([$4], [AC_MSG_FAILURE( +[The pkg-config script could not be found or is too old. Make sure it +is in your PATH or set the PKG_CONFIG environment variable to the full +path to pkg-config. + +_PKG_TEXT + +To get pkg-config, see <http://pkg-config.freedesktop.org/>.])[]dnl + ]) +else + $1[]_CFLAGS=$pkg_cv_[]$1[]_CFLAGS + $1[]_LIBS=$pkg_cv_[]$1[]_LIBS + AC_MSG_RESULT([yes]) + $3 +fi[]dnl +])# PKG_CHECK_MODULES + + +# PKG_INSTALLDIR(DIRECTORY) +# ------------------------- +# Substitutes the variable pkgconfigdir as the location where a module +# should install pkg-config .pc files. By default the directory is +# $libdir/pkgconfig, but the default can be changed by passing +# DIRECTORY. The user can override through the --with-pkgconfigdir +# parameter. +AC_DEFUN([PKG_INSTALLDIR], +[m4_pushdef([pkg_default], [m4_default([$1], ['${libdir}/pkgconfig'])]) +m4_pushdef([pkg_description], + [pkg-config installation directory @<:@]pkg_default[@:>@]) +AC_ARG_WITH([pkgconfigdir], + [AS_HELP_STRING([--with-pkgconfigdir], pkg_description)],, + [with_pkgconfigdir=]pkg_default) +AC_SUBST([pkgconfigdir], [$with_pkgconfigdir]) +m4_popdef([pkg_default]) +m4_popdef([pkg_description]) +]) dnl PKG_INSTALLDIR + + +# PKG_NOARCH_INSTALLDIR(DIRECTORY) +# ------------------------- +# Substitutes the variable noarch_pkgconfigdir as the location where a +# module should install arch-independent pkg-config .pc files. By +# default the directory is $datadir/pkgconfig, but the default can be +# changed by passing DIRECTORY. The user can override through the +# --with-noarch-pkgconfigdir parameter. +AC_DEFUN([PKG_NOARCH_INSTALLDIR], +[m4_pushdef([pkg_default], [m4_default([$1], ['${datadir}/pkgconfig'])]) +m4_pushdef([pkg_description], + [pkg-config arch-independent installation directory @<:@]pkg_default[@:>@]) +AC_ARG_WITH([noarch-pkgconfigdir], + [AS_HELP_STRING([--with-noarch-pkgconfigdir], pkg_description)],, + [with_noarch_pkgconfigdir=]pkg_default) +AC_SUBST([noarch_pkgconfigdir], [$with_noarch_pkgconfigdir]) +m4_popdef([pkg_default]) +m4_popdef([pkg_description]) +]) dnl PKG_NOARCH_INSTALLDIR + + +# PKG_CHECK_VAR(VARIABLE, MODULE, CONFIG-VARIABLE, +# [ACTION-IF-FOUND], [ACTION-IF-NOT-FOUND]) +# ------------------------------------------- +# Retrieves the value of the pkg-config variable for the given module. +AC_DEFUN([PKG_CHECK_VAR], +[AC_REQUIRE([PKG_PROG_PKG_CONFIG])dnl +AC_ARG_VAR([$1], [value of $3 for $2, overriding pkg-config])dnl + +_PKG_CONFIG([$1], [variable="][$3]["], [$2]) +AS_VAR_COPY([$1], [pkg_cv_][$1]) + +AS_VAR_IF([$1], [""], [$5], [$4])dnl +])# PKG_CHECK_VAR

1 0

[tor/master] Fix compilation on platforms without IP6T_SO_ORIGINAL_DST
by nickm＠torproject.org 23 Dec '14

23 Dec '14

commit 6285d9bdcf7f210c56abd25f75133e30d05a7473 Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Dec 23 11:36:27 2014 -0500 Fix compilation on platforms without IP6T_SO_ORIGINAL_DST --- src/or/connection_edge.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/or/connection_edge.c b/src/or/connection_edge.c index 5ab9af5..6c87285 100644 --- a/src/or/connection_edge.c +++ b/src/or/connection_edge.c @@ -55,9 +55,11 @@ #ifdef HAVE_LINUX_NETFILTER_IPV6_IP6_TABLES_H #include <linux/netfilter_ipv6/ip6_tables.h> +#if defined(IP6T_SO_ORIGINAL_DST) #define TRANS_NETFILTER #define TRANS_NETFILTER_IPV6 #endif +#endif #if defined(HAVE_NET_IF_H) && defined(HAVE_NET_PFVAR_H) #include <net/if.h>

1 0