November 2020 - tor-commits - lists.torproject.org

[tor/maint-0.4.5] config: Bridge line with a transport must have a ClientTransportPlugin
by ahf＠torproject.org 20 Nov '20

20 Nov '20

commit ea52705e4b1753a75aac77ec0bc828d70327a4ad Author: David Goulet <dgoulet(a)torproject.org> Date: Tue Sep 22 10:45:52 2020 -0400 config: Bridge line with a transport must have a ClientTransportPlugin Fixes #25528 Signed-off-by: David Goulet <dgoulet(a)torproject.org> --- changes/ticket25528 | 6 ++++++ src/app/config/config.c | 16 ++++++++++++++++ src/feature/client/bridges.c | 11 +++++++++++ src/feature/client/bridges.h | 1 + 4 files changed, 34 insertions(+) diff --git a/changes/ticket25528 b/changes/ticket25528 new file mode 100644 index 0000000000..cfc6c91fb7 --- /dev/null +++ b/changes/ticket25528 @@ -0,0 +1,6 @@ + o Minor bugfixes (client, bridge, configuration): + - Exit tor on a misconfiguration when the Bridge line has a transport but + no corresponding ClientTransportPlugin can be found. Prior to this fix, + tor would attempt to connect to the bridge directly without using the + transport leading to a possible leak on the wire. Fixes bug 25528; + bugfix on 0.2.6.1-alpha. diff --git a/src/app/config/config.c b/src/app/config/config.c index 04a82a5c43..79b67e7a90 100644 --- a/src/app/config/config.c +++ b/src/app/config/config.c @@ -2189,6 +2189,22 @@ options_act,(const or_options_t *old_options)) } } + /* Validate that we actually have a configured transport for a Bridge line + * that has one. This is done here because we require the bridge and + * transport to be added to the global list before doing the validation. + * + * In an ideal world, pt_parse_transport_line() would actually return a + * transport_t object so we could inspect it and thus do this step at + * validation time. */ + SMARTLIST_FOREACH_BEGIN(bridge_list_get(), const bridge_info_t *, bi) { + const char *bi_transport_name = bridget_get_transport_name(bi); + if (bi_transport_name && !transport_get_by_name(bi_transport_name)) { + log_warn(LD_CONFIG, "Bridge line with transport %s is missing a " + "ClientTransportPlugin line", bi_transport_name); + return -1; + } + } SMARTLIST_FOREACH_END(bi); + if (options_act_server_transport(old_options) < 0) return -1; diff --git a/src/feature/client/bridges.c b/src/feature/client/bridges.c index 6e10defa13..8e2bb01661 100644 --- a/src/feature/client/bridges.c +++ b/src/feature/client/bridges.c @@ -164,6 +164,17 @@ bridge_get_addr_port(const bridge_info_t *bridge) return &bridge->addrport_configured; } +/** + * Given a bridge, return the transport name. If none were configured, + * NULL is returned. + */ +const char * +bridget_get_transport_name(const bridge_info_t *bridge) +{ + tor_assert(bridge); + return bridge->transport_name; +} + /** If we have a bridge configured whose digest matches digest, or a * bridge with no known digest whose address matches any of the * tor_addr_port_t's in orports, return that bridge. Else return diff --git a/src/feature/client/bridges.h b/src/feature/client/bridges.h index 174149cf97..1b090e8649 100644 --- a/src/feature/client/bridges.h +++ b/src/feature/client/bridges.h @@ -23,6 +23,7 @@ void sweep_bridge_list(void); const smartlist_t *bridge_list_get(void); const uint8_t *bridge_get_rsa_id_digest(const bridge_info_t *bridge); const tor_addr_port_t * bridge_get_addr_port(const bridge_info_t *bridge); +const char *bridget_get_transport_name(const bridge_info_t *bridge); bridge_info_t *get_configured_bridge_by_addr_port_digest( const tor_addr_t *addr, uint16_t port,

1 0

[tor/master] config: Bridge line with a transport must have a ClientTransportPlugin
by ahf＠torproject.org 20 Nov '20

20 Nov '20

commit ea52705e4b1753a75aac77ec0bc828d70327a4ad Author: David Goulet <dgoulet(a)torproject.org> Date: Tue Sep 22 10:45:52 2020 -0400 config: Bridge line with a transport must have a ClientTransportPlugin Fixes #25528 Signed-off-by: David Goulet <dgoulet(a)torproject.org> --- changes/ticket25528 | 6 ++++++ src/app/config/config.c | 16 ++++++++++++++++ src/feature/client/bridges.c | 11 +++++++++++ src/feature/client/bridges.h | 1 + 4 files changed, 34 insertions(+) diff --git a/changes/ticket25528 b/changes/ticket25528 new file mode 100644 index 0000000000..cfc6c91fb7 --- /dev/null +++ b/changes/ticket25528 @@ -0,0 +1,6 @@ + o Minor bugfixes (client, bridge, configuration): + - Exit tor on a misconfiguration when the Bridge line has a transport but + no corresponding ClientTransportPlugin can be found. Prior to this fix, + tor would attempt to connect to the bridge directly without using the + transport leading to a possible leak on the wire. Fixes bug 25528; + bugfix on 0.2.6.1-alpha. diff --git a/src/app/config/config.c b/src/app/config/config.c index 04a82a5c43..79b67e7a90 100644 --- a/src/app/config/config.c +++ b/src/app/config/config.c @@ -2189,6 +2189,22 @@ options_act,(const or_options_t *old_options)) } } + /* Validate that we actually have a configured transport for a Bridge line + * that has one. This is done here because we require the bridge and + * transport to be added to the global list before doing the validation. + * + * In an ideal world, pt_parse_transport_line() would actually return a + * transport_t object so we could inspect it and thus do this step at + * validation time. */ + SMARTLIST_FOREACH_BEGIN(bridge_list_get(), const bridge_info_t *, bi) { + const char *bi_transport_name = bridget_get_transport_name(bi); + if (bi_transport_name && !transport_get_by_name(bi_transport_name)) { + log_warn(LD_CONFIG, "Bridge line with transport %s is missing a " + "ClientTransportPlugin line", bi_transport_name); + return -1; + } + } SMARTLIST_FOREACH_END(bi); + if (options_act_server_transport(old_options) < 0) return -1; diff --git a/src/feature/client/bridges.c b/src/feature/client/bridges.c index 6e10defa13..8e2bb01661 100644 --- a/src/feature/client/bridges.c +++ b/src/feature/client/bridges.c @@ -164,6 +164,17 @@ bridge_get_addr_port(const bridge_info_t *bridge) return &bridge->addrport_configured; } +/** + * Given a bridge, return the transport name. If none were configured, + * NULL is returned. + */ +const char * +bridget_get_transport_name(const bridge_info_t *bridge) +{ + tor_assert(bridge); + return bridge->transport_name; +} + /** If we have a bridge configured whose digest matches digest, or a * bridge with no known digest whose address matches any of the * tor_addr_port_t's in orports, return that bridge. Else return diff --git a/src/feature/client/bridges.h b/src/feature/client/bridges.h index 174149cf97..1b090e8649 100644 --- a/src/feature/client/bridges.h +++ b/src/feature/client/bridges.h @@ -23,6 +23,7 @@ void sweep_bridge_list(void); const smartlist_t *bridge_list_get(void); const uint8_t *bridge_get_rsa_id_digest(const bridge_info_t *bridge); const tor_addr_port_t * bridge_get_addr_port(const bridge_info_t *bridge); +const char *bridget_get_transport_name(const bridge_info_t *bridge); bridge_info_t *get_configured_bridge_by_addr_port_digest( const tor_addr_t *addr, uint16_t port,

1 0

[tor/master] Merge branch 'maint-0.4.5'
by ahf＠torproject.org 20 Nov '20

20 Nov '20

commit 6ce2550468b3ffdbe1c3bbbdaff39d8382622336 Merge: ad4a68bf35 ea52705e4b Author: Alexander Færøy <ahf(a)torproject.org> Date: Thu Nov 19 17:41:05 2020 +0000 Merge branch 'maint-0.4.5' changes/ticket25528 | 6 ++++++ src/app/config/config.c | 16 ++++++++++++++++ src/feature/client/bridges.c | 11 +++++++++++ src/feature/client/bridges.h | 1 + 4 files changed, 34 insertions(+)

1 0

[tor/release-0.4.5] config: Bridge line with a transport must have a ClientTransportPlugin
by ahf＠torproject.org 20 Nov '20

20 Nov '20

commit ea52705e4b1753a75aac77ec0bc828d70327a4ad Author: David Goulet <dgoulet(a)torproject.org> Date: Tue Sep 22 10:45:52 2020 -0400 config: Bridge line with a transport must have a ClientTransportPlugin Fixes #25528 Signed-off-by: David Goulet <dgoulet(a)torproject.org> --- changes/ticket25528 | 6 ++++++ src/app/config/config.c | 16 ++++++++++++++++ src/feature/client/bridges.c | 11 +++++++++++ src/feature/client/bridges.h | 1 + 4 files changed, 34 insertions(+) diff --git a/changes/ticket25528 b/changes/ticket25528 new file mode 100644 index 0000000000..cfc6c91fb7 --- /dev/null +++ b/changes/ticket25528 @@ -0,0 +1,6 @@ + o Minor bugfixes (client, bridge, configuration): + - Exit tor on a misconfiguration when the Bridge line has a transport but + no corresponding ClientTransportPlugin can be found. Prior to this fix, + tor would attempt to connect to the bridge directly without using the + transport leading to a possible leak on the wire. Fixes bug 25528; + bugfix on 0.2.6.1-alpha. diff --git a/src/app/config/config.c b/src/app/config/config.c index 04a82a5c43..79b67e7a90 100644 --- a/src/app/config/config.c +++ b/src/app/config/config.c @@ -2189,6 +2189,22 @@ options_act,(const or_options_t *old_options)) } } + /* Validate that we actually have a configured transport for a Bridge line + * that has one. This is done here because we require the bridge and + * transport to be added to the global list before doing the validation. + * + * In an ideal world, pt_parse_transport_line() would actually return a + * transport_t object so we could inspect it and thus do this step at + * validation time. */ + SMARTLIST_FOREACH_BEGIN(bridge_list_get(), const bridge_info_t *, bi) { + const char *bi_transport_name = bridget_get_transport_name(bi); + if (bi_transport_name && !transport_get_by_name(bi_transport_name)) { + log_warn(LD_CONFIG, "Bridge line with transport %s is missing a " + "ClientTransportPlugin line", bi_transport_name); + return -1; + } + } SMARTLIST_FOREACH_END(bi); + if (options_act_server_transport(old_options) < 0) return -1; diff --git a/src/feature/client/bridges.c b/src/feature/client/bridges.c index 6e10defa13..8e2bb01661 100644 --- a/src/feature/client/bridges.c +++ b/src/feature/client/bridges.c @@ -164,6 +164,17 @@ bridge_get_addr_port(const bridge_info_t *bridge) return &bridge->addrport_configured; } +/** + * Given a bridge, return the transport name. If none were configured, + * NULL is returned. + */ +const char * +bridget_get_transport_name(const bridge_info_t *bridge) +{ + tor_assert(bridge); + return bridge->transport_name; +} + /** If we have a bridge configured whose digest matches digest, or a * bridge with no known digest whose address matches any of the * tor_addr_port_t's in orports, return that bridge. Else return diff --git a/src/feature/client/bridges.h b/src/feature/client/bridges.h index 174149cf97..1b090e8649 100644 --- a/src/feature/client/bridges.h +++ b/src/feature/client/bridges.h @@ -23,6 +23,7 @@ void sweep_bridge_list(void); const smartlist_t *bridge_list_get(void); const uint8_t *bridge_get_rsa_id_digest(const bridge_info_t *bridge); const tor_addr_port_t * bridge_get_addr_port(const bridge_info_t *bridge); +const char *bridget_get_transport_name(const bridge_info_t *bridge); bridge_info_t *get_configured_bridge_by_addr_port_digest( const tor_addr_t *addr, uint16_t port,

1 0

[translation/communitytpo-contentspot] https://gitweb.torproject.org/translation.git/commit/?h=communitytpo-contentspot
by translation＠torproject.org 20 Nov '20

20 Nov '20

commit a6414802972ee98cb2bcad46cd8f86a1aca70247 Author: Translation commit bot <translation(a)torproject.org> Date: Thu Nov 19 17:15:11 2020 +0000 https://gitweb.torproject.org/translation.git/commit/?h=communitytpo-conten… --- contents+pt-BR.po | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/contents+pt-BR.po b/contents+pt-BR.po index a69d4c9155..2d82cb5124 100644 --- a/contents+pt-BR.po +++ b/contents+pt-BR.po @@ -3035,6 +3035,9 @@ msgid "" "However, one of the ways Tor can be blocked by governments or ISPs is by " "blocklisting the IP addresses of these public Tor nodes." msgstr "" +"Entretanto, uma das maneiras que o Tor pode ser bloqueado por governos ou " +"provedores de internet se dá ao bloquear os endereços de IP desses nós " +"públicos do Tor em uma lista negra." #: https//community.torproject.org/relay/types-of-relays/ #: (content/relay-operations/types-of-relays/contents+en.lrpage.body) @@ -3042,6 +3045,9 @@ msgid "" "Tor bridges are nodes in the network that are not listed in the public Tor " "directory, which makes it harder for ISPs and governments to block them." msgstr "" +"Pontes Tor são nós na rede que não são listadas em um diretório público do " +"Tor, o que torna mais difícil para provedores de internet e governos os " +"bloquear." #: https//community.torproject.org/relay/types-of-relays/ #: (content/relay-operations/types-of-relays/contents+en.lrpage.body) @@ -3071,6 +3077,9 @@ msgid "" "special kind of bridge, address this by adding an additional layer of " "obfuscation." msgstr "" +"[Transporte plugáveis](https://tb-manual.torproject.org/circumvention/), um " +"tipo especial de ponte, resolve isso adicionando uma camada adicional de " +"ofuscação." #: https//community.torproject.org/relay/types-of-relays/ #: (content/relay-operations/types-of-relays/contents+en.lrpage.body)

1 0

[tor/master] Mention bug number in changes file.
by nickm＠torproject.org 19 Nov '20

19 Nov '20

commit ad4a68bf35784e92570b5bad39a73de89f8ceb9f Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Nov 19 10:46:29 2020 -0500 Mention bug number in changes file. --- changes/ticket32102 | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/changes/ticket32102 b/changes/ticket32102 index 131eb6321d..5aa2ed24fb 100644 --- a/changes/ticket32102 +++ b/changes/ticket32102 @@ -1,3 +1,3 @@ - o Minor features (build informations): + o Minor features (build information): - Add build informations to `tor --version` in order to ease reproducible - builds + builds. Closes ticket 32102.

1 0

[tor/master] Merge remote-tracking branch 'tor-gitlab/mr/214' into master
by nickm＠torproject.org 19 Nov '20

19 Nov '20

commit c4e0b28ecb90657eba1aaee8a590b408aaaad19a Merge: 6fcb94bead 4382e977f7 Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Nov 19 10:42:04 2020 -0500 Merge remote-tracking branch 'tor-gitlab/mr/214' into master changes/ticket32102 | 3 + configure.ac | 13 ++ m4/ax_compiler_vendor.m4 | 88 ++++++++ m4/ax_compiler_version.m4 | 529 ++++++++++++++++++++++++++++++++++++++++++++++ src/app/config/config.c | 19 ++ 5 files changed, 652 insertions(+)

1 0

[tor/master] Add the compiler name, version and libs used to compile
by nickm＠torproject.org 19 Nov '20

19 Nov '20

commit 4382e977f74e41f65170b4d9292678859c9e521f Author: Guinness <guinness(a)crans.org> Date: Tue Nov 17 10:43:00 2020 +0100 Add the compiler name, version and libs used to compile This changes the behaviour of `tor --version` in such a way. ```console src/app/tor --version Tor version 0.4.5.1-alpha-dev (git-46ccde66a97d7985). Tor is running on Linux with Libevent 2.1.12-stable, OpenSSL 1.1.1h, Zlib 1.2.11, Liblzma 5.2.4, Libzstd 1.4.5 and Glibc 2.31 as libc. Tor compiled with GCC version 10.2.0 ``` Fixes #32102 --- changes/ticket32102 | 3 + configure.ac | 13 ++ m4/ax_compiler_vendor.m4 | 88 ++++++++ m4/ax_compiler_version.m4 | 529 ++++++++++++++++++++++++++++++++++++++++++++++ src/app/config/config.c | 19 ++ 5 files changed, 652 insertions(+) diff --git a/changes/ticket32102 b/changes/ticket32102 new file mode 100644 index 0000000000..131eb6321d --- /dev/null +++ b/changes/ticket32102 @@ -0,0 +1,3 @@ + o Minor features (build informations): + - Add build informations to `tor --version` in order to ease reproducible + builds diff --git a/configure.ac b/configure.ac index c880375988..0a1e7b9e02 100644 --- a/configure.ac +++ b/configure.ac @@ -9,6 +9,8 @@ AC_CONFIG_SRCDIR([src/app/main/tor_main.c]) AC_CONFIG_MACRO_DIR([m4]) configure_flags="$*" +AC_DEFINE_UNQUOTED([CONFIG_FLAGS], ["$configure_flags"], [Flags passed to configure]) + # DO NOT EDIT THIS DEFINITION BY HAND UNLESS YOU KNOW WHAT YOU'RE DOING. # @@ -421,6 +423,17 @@ AC_PROG_MAKE_SET AC_PROG_RANLIB AC_PROG_SED +AX_COMPILER_VERSION +AX_COMPILER_VENDOR + +AC_DEFINE_UNQUOTED([COMPILER_VERSION],["$ax_cv_c_compiler_version"], [Compiler version]) +AC_DEFINE_UNQUOTED([COMPILER_VENDOR],["$ax_cv_c_compiler_vendor"], [Compiler vendor]) + +AS_CASE($ax_cv_c_compiler_vendor, + [gnu], AC_DEFINE([COMPILER],["GCC"],[Compiler name]), + AC_DEFINE([COMPILER],[],[Compiler name]) +) + AC_ARG_VAR([PERL], [path to Perl binary]) AC_CHECK_PROGS([PERL], [perl]) AM_CONDITIONAL(USE_PERL, [test "x$ac_cv_prog_PERL" != "x"]) diff --git a/m4/ax_compiler_vendor.m4 b/m4/ax_compiler_vendor.m4 new file mode 100644 index 0000000000..73efdb0055 --- /dev/null +++ b/m4/ax_compiler_vendor.m4 @@ -0,0 +1,88 @@ +# =========================================================================== +# https://www.gnu.org/software/autoconf-archive/ax_compiler_vendor.html +# =========================================================================== +# +# SYNOPSIS +# +# AX_COMPILER_VENDOR +# +# DESCRIPTION +# +# Determine the vendor of the C/C++ compiler, e.g., gnu, intel, ibm, sun, +# hp, borland, comeau, dec, cray, kai, lcc, metrowerks, sgi, microsoft, +# watcom, etc. The vendor is returned in the cache variable +# $ax_cv_c_compiler_vendor for C and $ax_cv_cxx_compiler_vendor for C++. +# +# LICENSE +# +# Copyright (c) 2008 Steven G. Johnson <stevenj(a)alum.mit.edu> +# Copyright (c) 2008 Matteo Frigo +# +# 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 3 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, see <https://www.gnu.org/licenses/>. +# +# As a special exception, the respective Autoconf Macro's copyright owner +# gives unlimited permission to copy, distribute and modify the configure +# scripts that are the output of Autoconf when processing the Macro. You +# need not follow the terms of the GNU General Public License when using +# or distributing such scripts, even though portions of the text of the +# Macro appear in them. The GNU General Public License (GPL) does govern +# all other use of the material that constitutes the Autoconf Macro. +# +# This special exception to the GPL applies to versions of the Autoconf +# Macro released by the Autoconf Archive. When you make and distribute a +# modified version of the Autoconf Macro, you may extend this special +# exception to the GPL to apply to your modified version as well. + +#serial 17 + +AC_DEFUN([AX_COMPILER_VENDOR], +[AC_CACHE_CHECK([for _AC_LANG compiler vendor], ax_cv_[]_AC_LANG_ABBREV[]_compiler_vendor, + dnl Please add if possible support to ax_compiler_version.m4 + [# note: don't check for gcc first since some other compilers define __GNUC__ + vendors="intel: __ICC,__ECC,__INTEL_COMPILER + ibm: __xlc__,__xlC__,__IBMC__,__IBMCPP__ + pathscale: __PATHCC__,__PATHSCALE__ + clang: __clang__ + cray: _CRAYC + fujitsu: __FUJITSU + sdcc: SDCC, __SDCC + gnu: __GNUC__ + sun: __SUNPRO_C,__SUNPRO_CC + hp: __HP_cc,__HP_aCC + dec: __DECC,__DECCXX,__DECC_VER,__DECCXX_VER + borland: __BORLANDC__,__CODEGEARC__,__TURBOC__ + comeau: __COMO__ + kai: __KCC + lcc: __LCC__ + sgi: __sgi,sgi + microsoft: _MSC_VER + metrowerks: __MWERKS__ + watcom: __WATCOMC__ + portland: __PGI + tcc: __TINYC__ + unknown: UNKNOWN" + for ventest in $vendors; do + case $ventest in + *:) vendor=$ventest; continue ;; + *) vencpp="defined("`echo $ventest | sed 's/,/) || defined(/g'`")" ;; + esac + AC_COMPILE_IFELSE([AC_LANG_PROGRAM(,[ + #if !($vencpp) + thisisanerror; + #endif + ])], [break]) + done + ax_cv_[]_AC_LANG_ABBREV[]_compiler_vendor=`echo $vendor | cut -d: -f1` + ]) +]) diff --git a/m4/ax_compiler_version.m4 b/m4/ax_compiler_version.m4 new file mode 100644 index 0000000000..0581d1bc0f --- /dev/null +++ b/m4/ax_compiler_version.m4 @@ -0,0 +1,529 @@ +# =========================================================================== +# https://www.gnu.org/software/autoconf-archive/ax_compiler_version.html +# =========================================================================== +# +# SYNOPSIS +# +# AX_COMPILER_VERSION +# +# DESCRIPTION +# +# This macro retrieves the compiler version and returns it in the cache +# variable $ax_cv_c_compiler_version for C and $ax_cv_cxx_compiler_version +# for C++. +# +# Version is returned as epoch:major.minor.patchversion +# +# Epoch is used in order to have an increasing version number in case of +# marketing change. +# +# Epoch use: * borland compiler use chronologically 0turboc for turboc +# era, +# +# 1borlanc BORLANDC++ before 5, 2cppbuilder for cppbuilder era, +# 3borlancpp for return of BORLANDC++ (after version 5.5), +# 4cppbuilder for cppbuilder with year version, +# and 5xe for XE era. +# +# An empty string is returned otherwise. +# +# LICENSE +# +# Copyright (c) 2014 Bastien ROUCARIES <roucaries.bastien+autoconf(a)gmail.com> +# +# Copying and distribution of this file, with or without modification, are +# permitted in any medium without royalty provided the copyright notice +# and this notice are preserved. This file is offered as-is, without any +# warranty. + +#serial 12 + +# for intel +AC_DEFUN([_AX_COMPILER_VERSION_INTEL], + [ dnl + AC_COMPUTE_INT(_ax_[]_AC_LANG_ABBREV[]_compiler_version_major, + [__INTEL_COMPILER/100],, + AC_MSG_FAILURE([[[$0]] unknown intel compiler version])) + AC_COMPUTE_INT(_ax_[]_AC_LANG_ABBREV[]_compiler_version_minor, + [(__INTEL_COMPILER%100)/10],, + AC_MSG_FAILURE([[[$0]] unknown intel compiler version])) + AC_COMPUTE_INT(_ax_[]_AC_LANG_ABBREV[]_compiler_version_patch, + [(__INTEL_COMPILER%10)],, + AC_MSG_FAILURE([[[$0]] unknown intel compiler version])) + ax_cv_[]_AC_LANG_ABBREV[]_compiler_version="$_ax_[]_AC_LANG_ABBREV[]_compiler_version_major.$_ax_[]_AC_LANG_ABBREV[]_compiler_version_minor.$_ax_[]_AC_LANG_ABBREV[]_compiler_version_patch" + ]) + +# for IBM +AC_DEFUN([_AX_COMPILER_VERSION_IBM], + [ dnl + dnl check between z/OS C/C++ and XL C/C++ + AC_COMPILE_IFELSE([ + AC_LANG_PROGRAM([], + [ + #if defined(__COMPILER_VER__) + choke me; + #endif + ])], + [ + AC_COMPUTE_INT(_ax_[]_AC_LANG_ABBREV[]_compiler_version_major, + [__xlC__/100],, + AC_MSG_FAILURE([[[$0]] unknown IBM compiler major version])) + AC_COMPUTE_INT(_ax_[]_AC_LANG_ABBREV[]_compiler_version_minor, + [__xlC__%100],, + AC_MSG_FAILURE([[[$0]] unknown IBM compiler minor version])) + AC_COMPUTE_INT(_ax_[]_AC_LANG_ABBREV[]_compiler_version_patch, + [__xlC_ver__/0x100],, + AC_MSG_FAILURE([[[$0]] unknown IBM compiler patch version])) + AC_COMPUTE_INT(_ax_[]_AC_LANG_ABBREV[]_compiler_version_build, + [__xlC_ver__%0x100],, + AC_MSG_FAILURE([[[$0]] unknown IBM compiler build version])) + ax_cv_[]_AC_LANG_ABBREV[]_compiler_version="$_ax_[]_AC_LANG_ABBREV[]_compiler_version_major.$_ax_[]_AC_LANG_ABBREV[]_compiler_version_minor.$_ax_[]_AC_LANG_ABBREV[]_compiler_version_patch.$_ax_[]_AC_LANG_ABBREV[]_compiler_version_build" + ], + [ + AC_COMPUTE_INT(_ax_[]_AC_LANG_ABBREV[]_compiler_version_patch, + [__xlC__%1000],, + AC_MSG_FAILURE([[[$0]] unknown IBM compiler patch version])) + AC_COMPUTE_INT(_ax_[]_AC_LANG_ABBREV[]_compiler_version_minor, + [(__xlC__/10000)%10],, + AC_MSG_FAILURE([[[$0]] unknown IBM compiler minor version])) + AC_COMPUTE_INT(_ax_[]_AC_LANG_ABBREV[]_compiler_version_major, + [(__xlC__/100000)%10],, + AC_MSG_FAILURE([[[$0]] unknown IBM compiler major version])) + ax_cv_[]_AC_LANG_ABBREV[]_compiler_version="$_ax_[]_AC_LANG_ABBREV[]_compiler_version_major.$_ax_[]_AC_LANG_ABBREV[]_compiler_version_minor.$_ax_[]_AC_LANG_ABBREV[]_compiler_version_patch" + ]) +]) + +# for pathscale +AC_DEFUN([_AX_COMPILER_VERSION_PATHSCALE],[ + AC_COMPUTE_INT(_ax_[]_AC_LANG_ABBREV[]_compiler_version_major, + __PATHCC__,, + AC_MSG_FAILURE([[[$0]] unknown pathscale major])) + AC_COMPUTE_INT(_ax_[]_AC_LANG_ABBREV[]_compiler_version_minor, + __PATHCC_MINOR__,, + AC_MSG_FAILURE([[[$0]] unknown pathscale minor])) + AC_COMPUTE_INT(_ax_[]_AC_LANG_ABBREV[]_compiler_version_patch, + [__PATHCC_PATCHLEVEL__],, + AC_MSG_FAILURE([[[$0]] unknown pathscale patch level])) + ax_cv_[]_AC_LANG_ABBREV[]_compiler_version="$_ax_[]_AC_LANG_ABBREV[]_compiler_version_major.$_ax_[]_AC_LANG_ABBREV[]_compiler_version_minor.$_ax_[]_AC_LANG_ABBREV[]_compiler_version_patch" + ]) + +# for clang +AC_DEFUN([_AX_COMPILER_VERSION_CLANG],[ + AC_COMPUTE_INT(_ax_[]_AC_LANG_ABBREV[]_compiler_version_major, + __clang_major__,, + AC_MSG_FAILURE([[[$0]] unknown clang major])) + AC_COMPUTE_INT(_ax_[]_AC_LANG_ABBREV[]_compiler_version_minor, + __clang_minor__,, + AC_MSG_FAILURE([[[$0]] unknown clang minor])) + AC_COMPUTE_INT(_ax_[]_AC_LANG_ABBREV[]_compiler_version_patch, + [__clang_patchlevel__],,0) + ax_cv_[]_AC_LANG_ABBREV[]_compiler_version="$_ax_[]_AC_LANG_ABBREV[]_compiler_version_major.$_ax_[]_AC_LANG_ABBREV[]_compiler_version_minor.$_ax_[]_AC_LANG_ABBREV[]_compiler_version_patch" + ]) + +# for crayc +AC_DEFUN([_AX_COMPILER_VERSION_CRAY],[ + AC_COMPUTE_INT(_ax_[]_AC_LANG_ABBREV[]_compiler_version_major, + _RELEASE,, + AC_MSG_FAILURE([[[$0]] unknown crayc release])) + AC_COMPUTE_INT(_ax_[]_AC_LANG_ABBREV[]_compiler_version_minor, + _RELEASE_MINOR,, + AC_MSG_FAILURE([[[$0]] unknown crayc minor])) + ax_cv_[]_AC_LANG_ABBREV[]_compiler_version="$_ax_[]_AC_LANG_ABBREV[]_compiler_version_major.$_ax_[]_AC_LANG_ABBREV[]_compiler_version_minor" + ]) + +# for fujitsu +AC_DEFUN([_AX_COMPILER_VERSION_FUJITSU],[ + AC_COMPUTE_INT(ax_cv_[]_AC_LANG_ABBREV[]_compiler_version, + __FCC_VERSION,, + AC_MSG_FAILURE([[[$0]]unknown fujitsu release])) + ]) + +# for GNU +AC_DEFUN([_AX_COMPILER_VERSION_GNU],[ + AC_COMPUTE_INT(_ax_[]_AC_LANG_ABBREV[]_compiler_version_major, + __GNUC__,, + AC_MSG_FAILURE([[[$0]] unknown gcc major])) + AC_COMPUTE_INT(_ax_[]_AC_LANG_ABBREV[]_compiler_version_minor, + __GNUC_MINOR__,, + AC_MSG_FAILURE([[[$0]] unknown gcc minor])) + AC_COMPUTE_INT(_ax_[]_AC_LANG_ABBREV[]_compiler_version_patch, + [__GNUC_PATCHLEVEL__],, + AC_MSG_FAILURE([[[$0]] unknown gcc patch level])) + ax_cv_[]_AC_LANG_ABBREV[]_compiler_version="$_ax_[]_AC_LANG_ABBREV[]_compiler_version_major.$_ax_[]_AC_LANG_ABBREV[]_compiler_version_minor.$_ax_[]_AC_LANG_ABBREV[]_compiler_version_patch" + ]) + +# For sun +AC_DEFUN([_AX_COMPILER_VERSION_SUN],[ + m4_define([_AX_COMPILER_VERSION_SUN_NUMBER], + [ + #if defined(__SUNPRO_CC) + __SUNPRO_CC + #else + __SUNPRO_C + #endif + ]) + AC_COMPUTE_INT(_ax_[]_AC_LANG_ABBREV[]_compiler_version_until59, + !!(_AX_COMPILER_VERSION_SUN_NUMBER < 0x1000),, + AC_MSG_FAILURE([[[$0]] unknown sun release version])) + AS_IF([test "X$_ax_[]_AC_LANG_ABBREV[]_compiler_version_until59" = X1], + [dnl + AC_COMPUTE_INT(_ax_[]_AC_LANG_ABBREV[]_compiler_version_patch, + _AX_COMPILER_VERSION_SUN_NUMBER % 0x10,, + AC_MSG_FAILURE([[[$0]] unknown sun patch version])) + AC_COMPUTE_INT(_ax_[]_AC_LANG_ABBREV[]_compiler_version_minor, + (_AX_COMPILER_VERSION_SUN_NUMBER / 0x10) % 0x10,, + AC_MSG_FAILURE([[[$0]] unknown sun minor version])) + AC_COMPUTE_INT(_ax_[]_AC_LANG_ABBREV[]_compiler_version_major, + (_AX_COMPILER_VERSION_SUN_NUMBER / 0x100),, + AC_MSG_FAILURE([[[$0]] unknown sun major version])) + ], + [dnl + AC_COMPUTE_INT(_ax_[]_AC_LANG_ABBREV[]_compiler_version_patch, + _AX_COMPILER_VERSION_SUN_NUMBER % 0x10,, + AC_MSG_FAILURE([[[$0]] unknown sun patch version])) + AC_COMPUTE_INT(_ax_[]_AC_LANG_ABBREV[]_compiler_version_minor, + (_AX_COMPILER_VERSION_SUN_NUMBER / 0x100) % 0x100,, + AC_MSG_FAILURE([[[$0]] unknown sun minor version])) + AC_COMPUTE_INT(_ax_[]_AC_LANG_ABBREV[]_compiler_version_major, + (_AX_COMPILER_VERSION_SUN_NUMBER / 0x1000),, + AC_MSG_FAILURE([[[$0]] unknown sun major version])) + ]) + ax_cv_[]_AC_LANG_ABBREV[]_compiler_version="$_ax_[]_AC_LANG_ABBREV[]_compiler_version_major.$_ax_[]_AC_LANG_ABBREV[]_compiler_version_minor.$_ax_[]_AC_LANG_ABBREV[]_compiler_version_patch" +]) + +AC_DEFUN([_AX_COMPILER_VERSION_HP],[ + m4_define([_AX_COMPILER_VERSION_HP_NUMBER], + [ + #if defined(__HP_cc) + __HP_cc + #else + __HP_aCC + #endif + ]) + AC_COMPUTE_INT(_ax_[]_AC_LANG_ABBREV[]_compiler_version_untilA0121, + !!(_AX_COMPILER_VERSION_HP_NUMBER <= 1),, + AC_MSG_FAILURE([[[$0]] unknown hp release version])) + AS_IF([test "X$_ax_[]_AC_LANG_ABBREV[]_compiler_version_untilA0121" = X1], + [dnl By default output last version with this behavior. + dnl it is so old + ax_cv_[]_AC_LANG_ABBREV[]_compiler_version="01.21.00" + ], + [dnl + AC_COMPUTE_INT(_ax_[]_AC_LANG_ABBREV[]_compiler_version_patch, + (_AX_COMPILER_VERSION_HP_NUMBER % 100),, + AC_MSG_FAILURE([[[$0]] unknown hp release version])) + AC_COMPUTE_INT(_ax_[]_AC_LANG_ABBREV[]_compiler_version_minor, + ((_AX_COMPILER_VERSION_HP_NUMBER / 100)%100),, + AC_MSG_FAILURE([[[$0]] unknown hp minor version])) + AC_COMPUTE_INT(_ax_[]_AC_LANG_ABBREV[]_compiler_version_major, + ((_AX_COMPILER_VERSION_HP_NUMBER / 10000)%100),, + AC_MSG_FAILURE([[[$0]] unknown hp major version])) + ax_cv_[]_AC_LANG_ABBREV[]_compiler_version="$_ax_[]_AC_LANG_ABBREV[]_compiler_version_major.$_ax_[]_AC_LANG_ABBREV[]_compiler_version_minor.$_ax_[]_AC_LANG_ABBREV[]_compiler_version_patch" + ]) +]) + +AC_DEFUN([_AX_COMPILER_VERSION_DEC],[dnl + m4_define([_AX_COMPILER_VERSION_DEC_NUMBER], + [ + #if defined(__DECC_VER) + __DECC_VER + #else + __DECCXX_VER + #endif + ]) + AC_COMPUTE_INT(_ax_[]_AC_LANG_ABBREV[]_compiler_version_patch, + (_AX_COMPILER_VERSION_DEC_NUMBER % 10000),, + AC_MSG_FAILURE([[[$0]] unknown dec release version])) + AC_COMPUTE_INT(_ax_[]_AC_LANG_ABBREV[]_compiler_version_minor, + ((_AX_COMPILER_VERSION_DEC_NUMBER / 100000UL)%100),, + AC_MSG_FAILURE([[[$0]] unknown dec minor version])) + AC_COMPUTE_INT(_ax_[]_AC_LANG_ABBREV[]_compiler_version_major, + ((_AX_COMPILER_VERSION_DEC_NUMBER / 10000000UL)%100),, + AC_MSG_FAILURE([[[$0]] unknown dec major version])) + ax_cv_[]_AC_LANG_ABBREV[]_compiler_version="$_ax_[]_AC_LANG_ABBREV[]_compiler_version_major.$_ax_[]_AC_LANG_ABBREV[]_compiler_version_minor.$_ax_[]_AC_LANG_ABBREV[]_compiler_version_patch" + ]) + +# borland +AC_DEFUN([_AX_COMPILER_VERSION_BORLAND],[dnl + m4_define([_AX_COMPILER_VERSION_TURBOC_NUMBER], + [ + #if defined(__TURBOC__) + __TURBOC__ + #else + choke me + #endif + ]) + m4_define([_AX_COMPILER_VERSION_BORLANDC_NUMBER], + [ + #if defined(__BORLANDC__) + __BORLANDC__ + #else + __CODEGEARC__ + #endif + ]) + AC_COMPILE_IFELSE( + [AC_LANG_PROGRAM(, + _AX_COMPILER_VERSION_TURBOC_NUMBER)], + [dnl TURBOC + AC_COMPUTE_INT( + _ax_[]_AC_LANG_ABBREV[]_compiler_version_turboc_raw, + _AX_COMPILER_VERSION_TURBOC_NUMBER,, + AC_MSG_FAILURE([[[$0]] unknown turboc version])) + AS_IF( + [test $_ax_[]_AC_LANG_ABBREV[]_compiler_version_turboc_raw -lt 661 || test $_ax_[]_AC_LANG_ABBREV[]_compiler_version_turboc_raw -gt 1023], + [dnl compute normal version + AC_COMPUTE_INT( + _ax_[]_AC_LANG_ABBREV[]_compiler_version_minor, + _AX_COMPILER_VERSION_TURBOC_NUMBER % 0x100,, + AC_MSG_FAILURE([[[$0]] unknown turboc minor version])) + AC_COMPUTE_INT( + _ax_[]_AC_LANG_ABBREV[]_compiler_version_major, + (_AX_COMPILER_VERSION_TURBOC_NUMBER/0x100)%0x100,, + AC_MSG_FAILURE([[[$0]] unknown turboc major version])) + ax_cv_[]_AC_LANG_ABBREV[]_compiler_version="0turboc:$_ax_[]_AC_LANG_ABBREV[]_compiler_version_major.$_ax_[]_AC_LANG_ABBREV[]_compiler_version_minor"], + [dnl special version + AS_CASE([$_ax_[]_AC_LANG_ABBREV[]_compiler_version_turboc_raw], + [661],[ax_cv_[]_AC_LANG_ABBREV[]_compiler_version="0turboc:1.00"], + [662],[ax_cv_[]_AC_LANG_ABBREV[]_compiler_version="0turboc:1.01"], + [663],[ax_cv_[]_AC_LANG_ABBREV[]_compiler_version="0turboc:2.00"], + [ + AC_MSG_WARN([[[$0]] unknown turboc version between 0x295 and 0x400 please report bug]) + ax_cv_[]_AC_LANG_ABBREV[]_compiler_version="" + ]) + ]) + ], + # borlandc + [ + AC_COMPUTE_INT( + _ax_[]_AC_LANG_ABBREV[]_compiler_version_borlandc_raw, + _AX_COMPILER_VERSION_BORLANDC_NUMBER,, + AC_MSG_FAILURE([[[$0]] unknown borlandc version])) + AS_CASE([$_ax_[]_AC_LANG_ABBREV[]_compiler_version_borlandc_raw], + dnl BORLANDC++ before 5.5 + [512] ,[ax_cv_[]_AC_LANG_ABBREV[]_compiler_version="1borlanc:2.00"], + [1024],[ax_cv_[]_AC_LANG_ABBREV[]_compiler_version="1borlanc:3.00"], + [1024],[ax_cv_[]_AC_LANG_ABBREV[]_compiler_version="1borlanc:3.00"], + [1040],[ax_cv_[]_AC_LANG_ABBREV[]_compiler_version="1borlanc:3.1"], + [1106],[ax_cv_[]_AC_LANG_ABBREV[]_compiler_version="1borlanc:4.0"], + [1280],[ax_cv_[]_AC_LANG_ABBREV[]_compiler_version="1borlanc:5.0"], + [1312],[ax_cv_[]_AC_LANG_ABBREV[]_compiler_version="1borlanc:5.02"], + dnl C++ Builder era + [1328],[ax_cv_[]_AC_LANG_ABBREV[]_compiler_version="2cppbuilder:3.0"], + [1344],[ax_cv_[]_AC_LANG_ABBREV[]_compiler_version="2cppbuilder:4.0"], + dnl BORLANDC++ after 5.5 + [1360],[ax_cv_[]_AC_LANG_ABBREV[]_compiler_version="3borlancpp:5.5"], + [1361],[ax_cv_[]_AC_LANG_ABBREV[]_compiler_version="3borlancpp:5.51"], + [1378],[ax_cv_[]_AC_LANG_ABBREV[]_compiler_version="3borlancpp:5.6.4"], + dnl C++ Builder with year number + [1392],[ax_cv_[]_AC_LANG_ABBREV[]_compiler_version="4cppbuilder:2006"], + [1424],[ax_cv_[]_AC_LANG_ABBREV[]_compiler_version="4cppbuilder:2007"], + [1555],[ax_cv_[]_AC_LANG_ABBREV[]_compiler_version="4cppbuilder:2009"], + [1569],[ax_cv_[]_AC_LANG_ABBREV[]_compiler_version="4cppbuilder:2010"], + dnl XE version + [1584],[ax_cv_[]_AC_LANG_ABBREV[]_compiler_version="5xe"], + [1600],[ax_cv_[]_AC_LANG_ABBREV[]_compiler_version="5xe:2"], + [1616],[ax_cv_[]_AC_LANG_ABBREV[]_compiler_version="5xe:3"], + [1632],[ax_cv_[]_AC_LANG_ABBREV[]_compiler_version="5xe:4"], + [ + AC_MSG_WARN([[[$0]] Unknown borlandc compiler version $_ax_[]_AC_LANG_ABBREV[]_compiler_version_borlandc_raw please report bug]) + ]) + ]) + ]) + +# COMO +AC_DEFUN([_AX_COMPILER_VERSION_COMEAU], + [ dnl + AC_COMPUTE_INT(_ax_[]_AC_LANG_ABBREV[]_compiler_version_minor, + [__COMO_VERSION__%100],, + AC_MSG_FAILURE([[[$0]] unknown comeau compiler minor version])) + AC_COMPUTE_INT(_ax_[]_AC_LANG_ABBREV[]_compiler_version_major, + [(__COMO_VERSION__/100)%10],, + AC_MSG_FAILURE([[[$0]] unknown comeau compiler major version])) + ax_cv_[]_AC_LANG_ABBREV[]_compiler_version="$_ax_[]_AC_LANG_ABBREV[]_compiler_version_major.$_ax_[]_AC_LANG_ABBREV[]_compiler_version_minor" + ]) + +# KAI +AC_DEFUN([_AX_COMPILER_VERSION_KAI],[ + AC_COMPUTE_INT(_ax_[]_AC_LANG_ABBREV[]_compiler_version_patch, + [__KCC_VERSION%100],, + AC_MSG_FAILURE([[[$0]] unknown kay compiler patch version])) + AC_COMPUTE_INT(_ax_[]_AC_LANG_ABBREV[]_compiler_version_minor, + [(__KCC_VERSION/100)%10],, + AC_MSG_FAILURE([[[$0]] unknown kay compiler minor version])) + AC_COMPUTE_INT(_ax_[]_AC_LANG_ABBREV[]_compiler_version_major, + [(__KCC_VERSION/1000)%10],, + AC_MSG_FAILURE([[[$0]] unknown kay compiler major version])) + ax_cv_[]_AC_LANG_ABBREV[]_compiler_version="$_ax_[]_AC_LANG_ABBREV[]_compiler_version_major.$_ax_[]_AC_LANG_ABBREV[]_compiler_version_minor.$_ax_[]_AC_LANG_ABBREV[]_compiler_version_patch" + ]) + +dnl LCC +dnl LCC does not output version... + +# SGI +AC_DEFUN([_AX_COMPILER_VERSION_SGI],[ + m4_define([_AX_COMPILER_VERSION_SGI_NUMBER], + [ + #if defined(_COMPILER_VERSION) + _COMPILER_VERSION + #else + _SGI_COMPILER_VERSION + #endif + ]) + AC_COMPUTE_INT(_ax_[]_AC_LANG_ABBREV[]_compiler_version_patch, + [_AX_COMPILER_VERSION_SGI_NUMBER%10],, + AC_MSG_FAILURE([[[$0]] unknown SGI compiler patch version])) + AC_COMPUTE_INT(_ax_[]_AC_LANG_ABBREV[]_compiler_version_minor, + [(_AX_COMPILER_VERSION_SGI_NUMBER/10)%10],, + AC_MSG_FAILURE([[[$0]] unknown SGI compiler minor version])) + AC_COMPUTE_INT(_ax_[]_AC_LANG_ABBREV[]_compiler_version_major, + [(_AX_COMPILER_VERSION_SGI_NUMBER/100)%10],, + AC_MSG_FAILURE([[[$0]] unknown SGI compiler major version])) + ax_cv_[]_AC_LANG_ABBREV[]_compiler_version="$_ax_[]_AC_LANG_ABBREV[]_compiler_version_major.$_ax_[]_AC_LANG_ABBREV[]_compiler_version_minor.$_ax_[]_AC_LANG_ABBREV[]_compiler_version_patch" + ]) + +# microsoft +AC_DEFUN([_AX_COMPILER_VERSION_MICROSOFT],[ + AC_COMPUTE_INT(_ax_[]_AC_LANG_ABBREV[]_compiler_version_minor, + _MSC_VER%100,, + AC_MSG_FAILURE([[[$0]] unknown microsoft compiler minor version])) + AC_COMPUTE_INT(_ax_[]_AC_LANG_ABBREV[]_compiler_version_major, + (_MSC_VER/100)%100,, + AC_MSG_FAILURE([[[$0]] unknown microsoft compiler major version])) + dnl could be overridden + _ax_[]_AC_LANG_ABBREV[]_compiler_version_patch=0 + _ax_[]_AC_LANG_ABBREV[]_compiler_version_build=0 + # special case for version 6 + AS_IF([test "X$_ax_[]_AC_LANG_ABBREV[]_compiler_version_major" = "X12"], + [AC_COMPUTE_INT(_ax_[]_AC_LANG_ABBREV[]_compiler_version_patch, + _MSC_FULL_VER%1000,, + _ax_[]_AC_LANG_ABBREV[]_compiler_version_patch=0)]) + # for version 7 + AS_IF([test "X$_ax_[]_AC_LANG_ABBREV[]_compiler_version_major" = "X13"], + [AC_COMPUTE_INT(_ax_[]_AC_LANG_ABBREV[]_compiler_version_patch, + _MSC_FULL_VER%1000,, + AC_MSG_FAILURE([[[$0]] unknown microsoft compiler patch version])) + ]) + # for version > 8 + AS_IF([test $_ax_[]_AC_LANG_ABBREV[]_compiler_version_major -ge 14], + [AC_COMPUTE_INT(_ax_[]_AC_LANG_ABBREV[]_compiler_version_patch, + _MSC_FULL_VER%10000,, + AC_MSG_FAILURE([[[$0]] unknown microsoft compiler patch version])) + ]) + AS_IF([test $_ax_[]_AC_LANG_ABBREV[]_compiler_version_major -ge 15], + [AC_COMPUTE_INT(_ax_[]_AC_LANG_ABBREV[]_compiler_version_build, + _MSC_BUILD,, + AC_MSG_FAILURE([[[$0]] unknown microsoft compiler build version])) + ]) + ax_cv_[]_AC_LANG_ABBREV[]_compiler_version="$_ax_[]_AC_LANG_ABBREV[]_compiler_version_major.$_ax_[]_AC_LANG_ABBREV[]_compiler_version_minor.$_ax_[]_AC_LANG_ABBREV[]_compiler_version_patch.$_ax_[]_AC_LANG_ABBREV[]_compiler_version_build" + ]) + +# for metrowerks +AC_DEFUN([_AX_COMPILER_VERSION_METROWERKS],[dnl + AC_COMPUTE_INT(_ax_[]_AC_LANG_ABBREV[]_compiler_version_patch, + __MWERKS__%0x100,, + AC_MSG_FAILURE([[[$0]] unknown metrowerks compiler patch version])) + AC_COMPUTE_INT(_ax_[]_AC_LANG_ABBREV[]_compiler_version_minor, + (__MWERKS__/0x100)%0x10,, + AC_MSG_FAILURE([[[$0]] unknown metrowerks compiler minor version])) + AC_COMPUTE_INT(_ax_[]_AC_LANG_ABBREV[]_compiler_version_major, + (__MWERKS__/0x1000)%0x10,, + AC_MSG_FAILURE([[[$0]] unknown metrowerks compiler major version])) + ax_cv_[]_AC_LANG_ABBREV[]_compiler_version="$_ax_[]_AC_LANG_ABBREV[]_compiler_version_major.$_ax_[]_AC_LANG_ABBREV[]_compiler_version_minor.$_ax_[]_AC_LANG_ABBREV[]_compiler_version_patch" + ]) + +# for watcom +AC_DEFUN([_AX_COMPILER_VERSION_WATCOM],[dnl + AC_COMPUTE_INT(_ax_[]_AC_LANG_ABBREV[]_compiler_version_minor, + __WATCOMC__%100,, + AC_MSG_FAILURE([[[$0]] unknown watcom compiler minor version])) + AC_COMPUTE_INT(_ax_[]_AC_LANG_ABBREV[]_compiler_version_major, + (__WATCOMC__/100)%100,, + AC_MSG_FAILURE([[[$0]] unknown watcom compiler major version])) + ax_cv_[]_AC_LANG_ABBREV[]_compiler_version="$_ax_[]_AC_LANG_ABBREV[]_compiler_version_major.$_ax_[]_AC_LANG_ABBREV[]_compiler_version_minor" + ]) + +# for PGI +AC_DEFUN([_AX_COMPILER_VERSION_PORTLAND],[ + AC_COMPUTE_INT(_ax_[]_AC_LANG_ABBREV[]_compiler_version_major, + __PGIC__,, + AC_MSG_FAILURE([[[$0]] unknown pgi major])) + AC_COMPUTE_INT(_ax_[]_AC_LANG_ABBREV[]_compiler_version_minor, + __PGIC_MINOR__,, + AC_MSG_FAILURE([[[$0]] unknown pgi minor])) + AC_COMPUTE_INT(_ax_[]_AC_LANG_ABBREV[]_compiler_version_patch, + [__PGIC_PATCHLEVEL__],, + AC_MSG_FAILURE([[[$0]] unknown pgi patch level])) + ax_cv_[]_AC_LANG_ABBREV[]_compiler_version="$_ax_[]_AC_LANG_ABBREV[]_compiler_version_major.$_ax_[]_AC_LANG_ABBREV[]_compiler_version_minor.$_ax_[]_AC_LANG_ABBREV[]_compiler_version_patch" + ]) + +# tcc +AC_DEFUN([_AX_COMPILER_VERSION_TCC],[ + ax_cv_[]_AC_LANG_ABBREV[]_compiler_version=[`tcc -v | $SED 's/^[ ]*tcc[ ]\+version[ ]\+$[0-9.]\+$.*/\1/g'`] + ]) + +# for GNU +AC_DEFUN([_AX_COMPILER_VERSION_SDCC],[ + AC_COMPUTE_INT(_ax_[]_AC_LANG_ABBREV[]_compiler_version_major, + /* avoid parse error with comments */ + #if(defined(__SDCC_VERSION_MAJOR)) + __SDCC_VERSION_MAJOR + #else + SDCC/100 + #endif + ,, + AC_MSG_FAILURE([[[$0]] unknown sdcc major])) + AC_COMPUTE_INT(_ax_[]_AC_LANG_ABBREV[]_compiler_version_minor, + /* avoid parse error with comments */ + #if(defined(__SDCC_VERSION_MINOR)) + __SDCC_VERSION_MINOR + #else + (SDCC%100)/10 + #endif + ,, + AC_MSG_FAILURE([[[$0]] unknown sdcc minor])) + AC_COMPUTE_INT(_ax_[]_AC_LANG_ABBREV[]_compiler_version_patch, + [ + /* avoid parse error with comments */ + #if(defined(__SDCC_VERSION_PATCH)) + __SDCC_VERSION_PATCH + #elsif(defined(_SDCC_VERSION_PATCHLEVEL)) + __SDCC_VERSION_PATCHLEVEL + #else + SDCC%10 + #endif + ],, + AC_MSG_FAILURE([[[$0]] unknown sdcc patch level])) + ax_cv_[]_AC_LANG_ABBREV[]_compiler_version="$_ax_[]_AC_LANG_ABBREV[]_compiler_version_major.$_ax_[]_AC_LANG_ABBREV[]_compiler_version_minor.$_ax_[]_AC_LANG_ABBREV[]_compiler_version_patch" + ]) + +# main entry point +AC_DEFUN([AX_COMPILER_VERSION],[dnl + AC_REQUIRE([AX_COMPILER_VENDOR]) + AC_REQUIRE([AC_PROG_SED]) + AC_CACHE_CHECK([for _AC_LANG compiler version], + ax_cv_[]_AC_LANG_ABBREV[]_compiler_version, + [ dnl + AS_CASE([$ax_cv_[]_AC_LANG_ABBREV[]_compiler_vendor], + [intel],[_AX_COMPILER_VERSION_INTEL], + [ibm],[_AX_COMPILER_VERSION_IBM], + [pathscale],[_AX_COMPILER_VERSION_PATHSCALE], + [clang],[_AX_COMPILER_VERSION_CLANG], + [cray],[_AX_COMPILER_VERSION_CRAY], + [fujitsu],[_AX_COMPILER_VERSION_FUJITSU], + [gnu],[_AX_COMPILER_VERSION_GNU], + [sun],[_AX_COMPILER_VERSION_SUN], + [hp],[_AX_COMPILER_VERSION_HP], + [dec],[_AX_COMPILER_VERSION_DEC], + [borland],[_AX_COMPILER_VERSION_BORLAND], + [comeau],[_AX_COMPILER_VERSION_COMEAU], + [kai],[_AX_COMPILER_VERSION_KAI], + [sgi],[_AX_COMPILER_VERSION_SGI], + [microsoft],[_AX_COMPILER_VERSION_MICROSOFT], + [metrowerks],[_AX_COMPILER_VERSION_METROWERKS], + [watcom],[_AX_COMPILER_VERSION_WATCOM], + [portland],[_AX_COMPILER_VERSION_PORTLAND], + [tcc],[_AX_COMPILER_VERSION_TCC], + [sdcc],[_AX_COMPILER_VERSION_SDCC], + [ax_cv_[]_AC_LANG_ABBREV[]_compiler_version=""]) + ]) +]) diff --git a/src/app/config/config.c b/src/app/config/config.c index 458067af4d..d9cc4c8fa8 100644 --- a/src/app/config/config.c +++ b/src/app/config/config.c @@ -4485,6 +4485,25 @@ options_init_from_torrc(int argc, char **argv) if (config_line_find(cmdline_only_options, "--version")) { printf("Tor version %s.\n",get_version()); + printf("Tor is running on %s with Libevent %s, " + "%s %s, Zlib %s, Liblzma %s, Libzstd %s and %s %s as libc.\n", + get_uname(), + tor_libevent_get_version_str(), + crypto_get_library_name(), + crypto_get_library_version_string(), + tor_compress_supports_method(ZLIB_METHOD) ? + tor_compress_version_str(ZLIB_METHOD) : "N/A", + tor_compress_supports_method(LZMA_METHOD) ? + tor_compress_version_str(LZMA_METHOD) : "N/A", + tor_compress_supports_method(ZSTD_METHOD) ? + tor_compress_version_str(ZSTD_METHOD) : "N/A", + tor_libc_get_name() ? + tor_libc_get_name() : "Unknown", + tor_libc_get_version_str()); + printf("Tor compiled with %s version %s\n", + strcmp(COMPILER_VENDOR, "gnu") == 0? + COMPILER:COMPILER_VENDOR, COMPILER_VERSION); + return 1; }

1 0

[translation/tpo-web_completed] https://gitweb.torproject.org/translation.git/commit/?h=tpo-web_completed
by translation＠torproject.org 19 Nov '20

19 Nov '20

commit 8b204b3f83cb54a0a005ce2ebf348084ffc2d147 Author: Translation commit bot <translation(a)torproject.org> Date: Thu Nov 19 15:19:09 2020 +0000 https://gitweb.torproject.org/translation.git/commit/?h=tpo-web_completed --- contents+es-AR.po | 113 ++++++++++++++++++++++++++++++++++-------------------- 1 file changed, 72 insertions(+), 41 deletions(-) diff --git a/contents+es-AR.po b/contents+es-AR.po index f737c8f24d..95cb0770d4 100644 --- a/contents+es-AR.po +++ b/contents+es-AR.po @@ -1267,7 +1267,7 @@ msgstr "¿Cómo puedo verificar la firma del Navegador Tor?" #: templates/download.html:54 msgid "Stand up for privacy and freedom online." -msgstr "" +msgstr "Plantate por la privacidad y libertad en línea." #: templates/download.html:55 msgid "" @@ -1330,7 +1330,7 @@ msgstr "Defendete en contra del rastreo y la vigilancia. Evadí la censura." #: templates/home.html:7 msgid "Block Trackers" -msgstr "" +msgstr "Bloqueá a los Rastreadores" #: templates/home.html:11 msgid "BLOCK TRACKERS" @@ -1352,7 +1352,7 @@ msgstr "Defendete Contra la Vigilancia" #: templates/home.html:28 msgid "DEFEND AGAINST SURVEILLANCE" -msgstr "" +msgstr "DEFENDETE CONTRA LA VIGILANCIA" #: templates/home.html:29 msgid "" @@ -1360,28 +1360,34 @@ msgid "" "websites you visit. All anyone monitoring your browsing habits can see is " "that you're using Tor." msgstr "" +"El Navegador Tor evita que alguien observando tu conexión conozca qué sitios" +" web visitás. Todo lo que puede ver cualquiera que esté monitoreando tus " +"hábitos de navegación es que estás usando Tor." #: templates/home.html:41 msgid "Resist Fingerprinting" -msgstr "" +msgstr "Resistí la Determinación de la Huella Digital" #: templates/home.html:45 msgid "RESIST FINGERPRINTING" -msgstr "" +msgstr "RESISTÍ LA DETERMINACIÓN DE LA HUELLA DIGITAL" #: templates/home.html:46 msgid "" "Tor Browser aims to make all users look the same, making it difficult for " "you to be fingerprinted based on your browser and device information." msgstr "" +"El Navegador Tor apunta a hacer que todos los usuarios parezcan iguales, " +"haciendo difícil la determinación de tu huella digital basándose en la " +"información de tu navegador y dispositivo." #: templates/home.html:58 msgid "Multi-layered Encryption" -msgstr "" +msgstr "Encriptación multicapa" #: templates/home.html:62 msgid "MULTI-LAYERED ENCRYPTION" -msgstr "" +msgstr "ENCRIPTACIÓN MULTICAPA" #: templates/home.html:63 msgid "" @@ -1389,48 +1395,58 @@ msgid "" "network. The network is comprised of thousands of volunteer-run servers " "known as Tor relays." msgstr "" +"Tu tráfico es retransmitido y encriptado tres veces a medida que pasa a " +"través de la red Tor, que está coformada por miles de servidores, conocidos " +"como repetidores Tor, corridos por voluntarios." #: templates/home.html:75 msgid "Browse Freely" -msgstr "" +msgstr "Navegá Libremente." #: templates/home.html:79 msgid "BROWSE FREELY" -msgstr "" +msgstr "NAVEGÁ LIBREMENTE" #: templates/home.html:80 msgid "" "With Tor Browser, you are free to access sites your home network may have " "blocked." msgstr "" +"Con el Navegador Tor, sos libre de acceder sitios a los que tu red doméstica" +" podría haber bloqueado." #: templates/jobs.html:2 msgid "Current Openings" -msgstr "" +msgstr "Puestos de Trabajo pendientes" #: templates/jobs.html:13 msgid "" "At the moment, we don't have any official open positions. Please check back " "soon, though!" msgstr "" +"Por el momento, no tenemos ningún puesto oficial de trabajo pendiente. Por " +"favor, ¡volvé a chequear pronto!" #: templates/jobs.html:18 templates/projects.html:5 msgid "Previous Openings" -msgstr "" +msgstr "Puestos de Trabajo previos" #: templates/jobs.html:32 templates/projects.html:33 msgid "" "Think you could help us in a position that's not listed? We also rely on a " "vast community of volunteer contributors and many have become paid staff." msgstr "" +"¿Pensás que podrías ayudarnos en una posición que no está listada? También " +"nos apoyamos en una vasta comunidad de contribuyentes voluntarios, y muchos " +"se han vuelto personal rentado." #: templates/jobs.html:32 templates/projects.html:33 msgid "We invite you to join us on IRC to find how you can get involved." -msgstr "" +msgstr "Te invitamos a unírtenos en IRC para ver cómo podés involucrarte." #: templates/meta.html:11 msgid "The Tor Project | Privacy & Freedom Online" -msgstr "" +msgstr "Tor Project | Privacidad y Libertad En Línea" #: templates/meta.html:20 msgid "Tor Project" @@ -1438,15 +1454,15 @@ msgstr "Proyecto Tor" #: templates/people.html:2 msgid "Board of Directors" -msgstr "" +msgstr "Directorio" #: templates/people.html:3 templates/people.html:15 msgid "Core Tor" -msgstr "" +msgstr "Tor Principal" #: templates/people.html:28 msgid "Join Our Team" -msgstr "" +msgstr "Unite a Nuestro Equipo" #: templates/people.html:29 msgid "" @@ -1454,34 +1470,38 @@ msgid "" "and studies to improve Tor software. If you're a developer, we welcome you " "to sign up for our dev mailing list to see what we're up to." msgstr "" +"Aunque no estamos contratando, podés contribuir a Tor. Estamos abiertos a " +"ideas y estudios para mejorar el software Tor. Si sos un desarrollador, te " +"damos la bienvenida para suscribirte a nuestra lista de correo dev, para que" +" veas en qué estamos." #: templates/people.html:31 msgid "Sign up for tor-dev" -msgstr "" +msgstr "Suscribite a tor-dev" #: templates/press.html:7 msgid "Get support" -msgstr "" +msgstr "Obtené soporte" #: templates/press.html:9 msgid "Visit our Support Portal" -msgstr "" +msgstr "Visitá nuestro Portal de Soporte" #: templates/press.html:12 msgid "Ask us on #tor" -msgstr "" +msgstr "Preguntanos en #tor" #: templates/press.html:15 msgid "Write to a mailing list" -msgstr "" +msgstr "Escribí a una lista de correo" #: templates/press.html:22 msgid "Brand Assets" -msgstr "" +msgstr "Activos de la Marca" #: templates/press.html:27 msgid "The Tor Browser" -msgstr "" +msgstr "El Navegador Tor" #: templates/press.html:30 msgid "Onion Services" @@ -1489,11 +1509,11 @@ msgstr "Servicios Onion" #: templates/press.html:40 msgid "Press Releases" -msgstr "" +msgstr "Comunicados de Prensa" #: templates/press.html:54 msgid "Coverage" -msgstr "" +msgstr "Cobertura" #: templates/press.html:61 msgid "Date" @@ -1501,15 +1521,15 @@ msgstr "Fecha" #: templates/press.html:62 msgid "Publication" -msgstr "" +msgstr "Publicación" #: templates/press.html:63 msgid "Topic" -msgstr "" +msgstr "Tópico" #: templates/reports.html:2 msgid "Founding Documents" -msgstr "" +msgstr "Documentos Fundacionales" #: templates/reports.html:16 msgid "Reports" @@ -1517,15 +1537,15 @@ msgstr "Reportes" #: templates/reports.html:22 msgid "Year" -msgstr "" +msgstr "Año" #: templates/reports.html:23 msgid "Type" -msgstr "" +msgstr "Tipo" #: templates/reports.html:24 msgid "Title" -msgstr "" +msgstr "Título" #: templates/sidenav.html:4 templates/sidenav.html:35 msgid "Topics" @@ -1538,52 +1558,63 @@ msgid "" "financial contributions: coding, testing, documenting, translating, " "educating, researching, and running the relays that make up the Tor network." msgstr "" +"Gracias a toda la gente y grupos que han hecho posible a Tor hasta ahora, y " +"gracias especialmente a los voluntarios individuales que han hecho " +"contribuciones no monetarias: programación, prueba, documentación, " +"traducción, educación, investigación y operación de los repetidores que " +"constituyen la red Tor." #: templates/sponsors.html:5 msgid "Active Sponsors" -msgstr "" +msgstr "Patrocinadores Activos" #: templates/sponsors.html:17 msgid "Past Sponsors" -msgstr "" +msgstr "Patrocinadores Anteriores" #: templates/sponsors.html:35 msgid "" "This sponsors page is based upon un-audited and un-reviewed financial and " "in-kind donations, contract, and other data." msgstr "" +"Esta página de patrocinadores está basada sobre donaciones financieras y en " +"especie no auditadas ni revistas, contratos, y otros datos." #: templates/sponsors.html:36 msgid "" "Further details about our audited and reviewed funding can be found with our" " Financial Reports." msgstr "" +"Mayores detalles acerca de nuestro financiamiento auditado y revisto pueden " +"ser encontrados en nuestros Informes Financieros." #: templates/thank-you.html:6 msgid "Want to join our community? Getting involved with Tor is easy." -msgstr "" +msgstr "¿Querés unirte a nuestra comunidad? Involucrarse con Tor es fácil." #: templates/thank-you.html:13 msgid "" "Sign up for Tor News and get updates and opportunities from across the " "organization and community." msgstr "" +"Suscribite a Noticias Tor y obtené actualizaciones y oportunidades a través " +"de la organización y la comunidad." #: templates/thank-you.html:17 msgid "Run a relay to make the network faster and more decentralized." -msgstr "" +msgstr "Corré un repetidor para hacer a la red más rápida y descentralizada." #: templates/thank-you.html:21 msgid "Use your skills to volunteer." -msgstr "" +msgstr "Usá tus habilidades para ser voluntario." #: templates/macros/downloads.html:68 msgid "Tor Browser manual" -msgstr "" +msgstr "Manual del Navegador Tor" #: templates/macros/jobs.html:11 msgid "Read more." -msgstr "" +msgstr "Leer más" #: templates/macros/question.html:12 msgid "Contributors to this page:" @@ -1603,12 +1634,12 @@ msgstr "Vínculo permanente" #: templates/macros/reports.html:5 templates/macros/reports.html:19 msgid "View PDF" -msgstr "" +msgstr "Ver PDF" #: lego/templates/banner.html:11 templates/banner.html:11 msgid "Use a Mask, Use Tor." -msgstr "" +msgstr "Usá un tapaboca, Usá Tor." #: lego/templates/banner.html:20 templates/banner.html:20 msgid "Resist the surveillance pandemic." -msgstr "" +msgstr "Resistí a la pandemia de vigilancia."

1 0

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

19 Nov '20

commit 5025c62934ef9d046f78f7f9310285d03229f67a Author: Translation commit bot <translation(a)torproject.org> Date: Thu Nov 19 15:19:01 2020 +0000 https://gitweb.torproject.org/translation.git/commit/?h=tpo-web --- contents+es-AR.po | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/contents+es-AR.po b/contents+es-AR.po index 2df4bb597f..95cb0770d4 100644 --- a/contents+es-AR.po +++ b/contents+es-AR.po @@ -1361,7 +1361,7 @@ msgid "" "that you're using Tor." msgstr "" "El Navegador Tor evita que alguien observando tu conexión conozca qué sitios" -" web visitás. Todo los que puede ver cualquiera que esté monitoreando tus " +" web visitás. Todo lo que puede ver cualquiera que esté monitoreando tus " "hábitos de navegación es que estás usando Tor." #: templates/home.html:41 @@ -1577,7 +1577,7 @@ msgid "" "This sponsors page is based upon un-audited and un-reviewed financial and " "in-kind donations, contract, and other data." msgstr "" -"Esta página de patrociantes está basada sobre donaciones financieras y en " +"Esta página de patrocinadores está basada sobre donaciones financieras y en " "especie no auditadas ni revistas, contratos, y otros datos." #: templates/sponsors.html:36

1 0