core: make GnuTLS a required dependency
This commit is contained in:
Sébastien Helleu
parent
80693dcea9
commit
e130ee7358
@ -9,7 +9,6 @@ compiler:
|
||||
env:
|
||||
- BUILDTOOL="cmake" BUILDARGS=""
|
||||
- BUILDTOOL="cmake" BUILDARGS="-DENABLE_PYTHON2=ON"
|
||||
- BUILDTOOL="cmake" BUILDARGS="-DENABLE_GNUTLS=OFF"
|
||||
- BUILDTOOL="cmake" BUILDARGS="-DENABLE_CODE_COVERAGE=ON" CODECOVERAGE="1"
|
||||
- BUILDTOOL="autotools" BUILDARGS=""
|
||||
- BUILDTOOL="autotools" BUILDARGS="--enable-python2"
|
||||
|
||||
@ -91,7 +91,6 @@ endif()
|
||||
option(ENABLE_NCURSES "Compile the Ncurses interface" ON)
|
||||
option(ENABLE_HEADLESS "Compile the headless binary (required for tests)" ON)
|
||||
option(ENABLE_NLS "Enable Native Language Support" ON)
|
||||
option(ENABLE_GNUTLS "Enable SSLv3/TLS support" ON)
|
||||
option(ENABLE_LARGEFILE "Enable Large File Support" ON)
|
||||
option(ENABLE_ALIAS "Enable Alias plugin" ON)
|
||||
option(ENABLE_BUFLIST "Enable Buflist plugin" ON)
|
||||
@ -199,18 +198,11 @@ add_definitions(-DHAVE_GCRYPT)
|
||||
list(APPEND EXTRA_LIBS ${GCRYPT_LDFLAGS})
|
||||
|
||||
# Check for GnuTLS
|
||||
if(ENABLE_GNUTLS)
|
||||
find_package(GnuTLS)
|
||||
if(GNUTLS_FOUND)
|
||||
string(REGEX REPLACE "/[^/]*$" "" GNUTLS_LIBRARY_PATH "${GNUTLS_LIBRARY}")
|
||||
add_definitions(-DHAVE_GNUTLS)
|
||||
include_directories(${GNUTLS_INCLUDE_PATH})
|
||||
set(CMAKE_C_LINK_FLAGS "${CMAKE_C_LINK_FLAGS} -L${GNUTLS_LIBRARY_PATH}")
|
||||
list(APPEND EXTRA_LIBS gnutls)
|
||||
else()
|
||||
message(SEND_ERROR "GnuTLS not found")
|
||||
endif()
|
||||
endif()
|
||||
find_package(GnuTLS REQUIRED)
|
||||
string(REGEX REPLACE "/[^/]*$" "" GNUTLS_LIBRARY_PATH "${GNUTLS_LIBRARY}")
|
||||
include_directories(${GNUTLS_INCLUDE_PATH})
|
||||
set(CMAKE_C_LINK_FLAGS "${CMAKE_C_LINK_FLAGS} -L${GNUTLS_LIBRARY_PATH}")
|
||||
list(APPEND EXTRA_LIBS gnutls)
|
||||
|
||||
# Check for zlib
|
||||
find_package(ZLIB REQUIRED)
|
||||
|
||||
@ -44,6 +44,7 @@ Tests::
|
||||
|
||||
Build::
|
||||
|
||||
* core: make GnuTLS a required dependency
|
||||
* core: fix build with CMake 3.17.0
|
||||
* core: fix build with cygport on Cygwin
|
||||
|
||||
|
||||
@ -20,6 +20,18 @@ https://weechat.org/files/changelog/ChangeLog-devel.html[ChangeLog]
|
||||
[[v2.9]]
|
||||
== Version 2.9 (under dev)
|
||||
|
||||
[[v2.9_remove_gnutls_build_option]]
|
||||
=== GnuTLS is not optional any more
|
||||
|
||||
The build options `ENABLE_GNUTLS` (in CMake) and `--disable-gnutls` (in autotools)
|
||||
have been removed. That means now GnuTLS is always compiled and used in WeeChat.
|
||||
|
||||
Motivations:
|
||||
|
||||
* communications encryption should be built-in, not optional
|
||||
* GnuTLS library should be available everywhere
|
||||
* reduce complexity of code and tests of builds.
|
||||
|
||||
[[v2.9_relay_weechat_protocol_handshake_nonce]]
|
||||
=== Add of handshake and nonce in weechat relay protocol
|
||||
|
||||
|
||||
@ -63,8 +63,8 @@ find_library(GNUTLS_LIBRARY
|
||||
PATHS GNUTLS_POSSIBLE_LIB_DIR
|
||||
)
|
||||
|
||||
if(GNUTLS_INCLUDE_PATH AND GNUTLS_LIBRARY)
|
||||
set(GNUTLS_FOUND TRUE)
|
||||
if(NOT GNUTLS_INCLUDE_PATH OR NOT GNUTLS_LIBRARY)
|
||||
message(FATAL_ERROR "GnuTLS was not found")
|
||||
endif()
|
||||
|
||||
mark_as_advanced(
|
||||
|
||||
46
configure.ac
46
configure.ac
@ -104,7 +104,6 @@ AC_CHECK_FUNCS([mallinfo])
|
||||
AH_VERBATIM([PREFIX], [#undef PREFIX])
|
||||
AH_VERBATIM([WEECHAT_LIBDIR], [#undef WEECHAT_LIBDIR])
|
||||
AH_VERBATIM([WEECHAT_SHAREDIR], [#undef WEECHAT_SHAREDIR])
|
||||
AH_VERBATIM([HAVE_GNUTLS], [#undef HAVE_GNUTLS])
|
||||
AH_VERBATIM([HAVE_FLOCK], [#undef HAVE_FLOCK])
|
||||
AH_VERBATIM([HAVE_EAT_NEWLINE_GLITCH], [#undef HAVE_EAT_NEWLINE_GLITCH])
|
||||
AH_VERBATIM([HAVE_ASPELL_VERSION_STRING], [#undef HAVE_ASPELL_VERSION_STRING])
|
||||
@ -141,7 +140,6 @@ AH_VERBATIM([CA_FILE], [#define CA_FILE "/etc/ssl/certs/ca-certificates.crt"])
|
||||
|
||||
AC_ARG_ENABLE(ncurses, [ --disable-ncurses turn off ncurses interface (default=compiled if found)],enable_ncurses=$enableval,enable_ncurses=yes)
|
||||
AC_ARG_ENABLE(headless, [ --disable-headless turn off headless binary (default=compiled), this is required for tests],enable_headless=$enableval,enable_headless=yes)
|
||||
AC_ARG_ENABLE(gnutls, [ --disable-gnutls turn off gnutls support (default=compiled if found)],enable_gnutls=$enableval,enable_gnutls=yes)
|
||||
AC_ARG_ENABLE(largefile, [ --disable-largefile turn off Large File Support (default=on)],enable_largefile=$enableval,enable_largefile=yes)
|
||||
AC_ARG_ENABLE(alias, [ --disable-alias turn off Alias plugin (default=compiled)],enable_alias=$enableval,enable_alias=yes)
|
||||
AC_ARG_ENABLE(buflist, [ --disable-buflist turn off Buflist plugin (default=compiled)],enable_buflist=$enableval,enable_buflist=yes)
|
||||
@ -1047,8 +1045,8 @@ AC_MSG_CHECKING(for gcrypt headers and libraries)
|
||||
if test "x$ac_found_gcrypt_header" = "xno" -o "x$ac_found_gcrypt_lib" = "xno" ; then
|
||||
AC_MSG_RESULT(no)
|
||||
AC_MSG_ERROR([
|
||||
*** libgcrypt was not found. You may want to get it from ftp://ftp.gnupg.org/gcrypt/libgcrypt/
|
||||
*** or try to install libgcrypt-dev with your software package manager.])
|
||||
*** libgcrypt was not found. You may want to get it from https://www.gnupg.org/ftp/gcrypt/libgcrypt/
|
||||
*** or try to install it with your software package manager.])
|
||||
else
|
||||
AC_MSG_RESULT(yes)
|
||||
GCRYPT_CFLAGS=`libgcrypt-config --cflags`
|
||||
@ -1061,29 +1059,21 @@ fi
|
||||
# gnutls
|
||||
# ------------------------------------------------------------------------------
|
||||
|
||||
if test "x$enable_gnutls" = "xyes" ; then
|
||||
AC_CHECK_HEADER(gnutls/gnutls.h,ac_found_gnutls_header="yes",ac_found_gnutls_header="no")
|
||||
AC_CHECK_LIB(gnutls,gnutls_global_init,ac_found_gnutls_lib="yes",ac_found_gnutls_lib="no")
|
||||
AC_CHECK_HEADER(gnutls/gnutls.h,ac_found_gnutls_header="yes",ac_found_gnutls_header="no")
|
||||
AC_CHECK_LIB(gnutls,gnutls_global_init,ac_found_gnutls_lib="yes",ac_found_gnutls_lib="no")
|
||||
|
||||
AC_MSG_CHECKING(for gnutls headers and libraries)
|
||||
if test "x$ac_found_gnutls_header" = "xno" -o "x$ac_found_gnutls_lib" = "xno" ; then
|
||||
AC_MSG_RESULT(no)
|
||||
AC_MSG_WARN([
|
||||
*** libgnutls was not found. You may want to get it from ftp://ftp.gnutls.org/pub/gnutls/
|
||||
*** WeeChat will be built without GnuTLS support.])
|
||||
enable_gnutls="no"
|
||||
not_found="$not_found gnutls"
|
||||
else
|
||||
AC_MSG_RESULT(yes)
|
||||
GNUTLS_CFLAGS=`pkg-config gnutls --cflags`
|
||||
GNUTLS_LFLAGS=`pkg-config gnutls --libs`
|
||||
AC_SUBST(GNUTLS_CFLAGS)
|
||||
AC_SUBST(GNUTLS_LFLAGS)
|
||||
AC_DEFINE(HAVE_GNUTLS)
|
||||
CFLAGS="$CFLAGS -DHAVE_GNUTLS"
|
||||
fi
|
||||
AC_MSG_CHECKING(for gnutls headers and libraries)
|
||||
if test "x$ac_found_gnutls_header" = "xno" -o "x$ac_found_gnutls_lib" = "xno" ; then
|
||||
AC_MSG_RESULT(no)
|
||||
AC_MSG_ERROR([
|
||||
*** libgnutls was not found. You may want to get it from https://www.gnupg.org/ftp/gcrypt/gnutls/
|
||||
*** or try to install it with your software package manager.])
|
||||
else
|
||||
not_asked="$not_asked gnutls"
|
||||
AC_MSG_RESULT(yes)
|
||||
GNUTLS_CFLAGS=`pkg-config gnutls --cflags`
|
||||
GNUTLS_LFLAGS=`pkg-config gnutls --libs`
|
||||
AC_SUBST(GNUTLS_CFLAGS)
|
||||
AC_SUBST(GNUTLS_LFLAGS)
|
||||
fi
|
||||
|
||||
# ------------------------------------------------------------------------------
|
||||
@ -1167,7 +1157,7 @@ if test "x$ac_found_zlib_header" = "xno" -o "x$ac_found_zlib_lib" = "xno" ; then
|
||||
AC_MSG_RESULT(no)
|
||||
AC_MSG_ERROR([
|
||||
*** zlib was not found. You may want to get it from https://zlib.net/
|
||||
*** or try to install zlib1g-dev with your software package manager.])
|
||||
*** or try to install it with your software package manager.])
|
||||
else
|
||||
AC_MSG_RESULT(yes)
|
||||
ZLIB_CFLAGS=`pkg-config zlib --cflags`
|
||||
@ -1358,7 +1348,6 @@ CXXFLAGS="$CXXFLAGS -DWEECHAT_VERSION=\\\"$VERSION\\\" -DWEECHAT_LICENSE=\\\"$LI
|
||||
# output Makefiles
|
||||
# ------------------------------------------------------------------------------
|
||||
|
||||
AM_CONDITIONAL(HAVE_GNUTLS, test "$enable_gnutls" = "yes")
|
||||
AM_CONDITIONAL(HAVE_FLOCK, test "$enable_flock" = "yes")
|
||||
AM_CONDITIONAL(HAVE_EAT_NEWLINE_GLITCH, test "$enable_eatnewlineglitch" = "yes")
|
||||
AM_CONDITIONAL(GUI_NCURSES, test "$enable_ncurses" = "yes")
|
||||
@ -1516,9 +1505,6 @@ if test "x$enable_xfer" = "xyes"; then
|
||||
fi
|
||||
|
||||
listoptional=""
|
||||
if test "x$enable_gnutls" = "xyes"; then
|
||||
listoptional="$listoptional gnutls"
|
||||
fi
|
||||
if test "x$enable_flock" = "xyes"; then
|
||||
listoptional="$listoptional flock"
|
||||
fi
|
||||
|
||||
@ -109,7 +109,7 @@ zu kompilieren und welche Pakete optional genutzt werden können.
|
||||
| libcurl4-gnutls-dev | | *ja* | URL Transfer.
|
||||
| zlib1g-dev | | *ja* | Kompression für Pakete, die mittels Relay- (WeeChat Protokoll), Script-Erweiterung übertragen werden.
|
||||
| libgcrypt20-dev | | *ja* | Geschützte Daten, IRC SASL Authentifikation (DH-BLOWFISH/DH-AES).
|
||||
| libgnutls28-dev | ≥ 2.2.0 ^(3)^ | | SSL Verbindung zu einem IRC Server, Unterstützung von SSL in der Relay-Erweiterung, IRC SASL Authentifikation (ECDSA-NIST256P-CHALLENGE).
|
||||
| libgnutls28-dev | ≥ 2.2.0 ^(3)^ | *ja* | SSL Verbindung zu einem IRC Server, Unterstützung von SSL in der Relay-Erweiterung, IRC SASL Authentifikation (ECDSA-NIST256P-CHALLENGE).
|
||||
| gettext | | | Internationalisierung (Übersetzung der Mitteilungen; Hauptsprache ist englisch).
|
||||
| ca-certificates | | | Zertifikate für SSL Verbindungen.
|
||||
| libaspell-dev
|
||||
@ -223,9 +223,6 @@ Liste von häufig verwendeten Optionen:
|
||||
| ENABLE_FSET | `ON`, `OFF` | ON |
|
||||
kompiliert <<fset_plugin,Fset Erweiterung>>.
|
||||
|
||||
| ENABLE_GNUTLS | `ON`, `OFF` | ON |
|
||||
kompiliert GnuTLS (für SSL).
|
||||
|
||||
| ENABLE_GUILE | `ON`, `OFF` | ON |
|
||||
kompiliert <<scripts_plugins,Guile Erweiterung>> (Scheme).
|
||||
|
||||
|
||||
@ -103,7 +103,7 @@ compile WeeChat.
|
||||
| libcurl4-gnutls-dev | | *yes* | URL transfer.
|
||||
| zlib1g-dev | | *yes* | Compression of packets in relay plugin (weechat protocol), script plugin.
|
||||
| libgcrypt20-dev | | *yes* | Secured data, IRC SASL authentication (DH-BLOWFISH/DH-AES).
|
||||
| libgnutls28-dev | ≥ 2.2.0 ^(3)^ | | SSL connection to IRC server, support of SSL in relay plugin, IRC SASL authentication (ECDSA-NIST256P-CHALLENGE).
|
||||
| libgnutls28-dev | ≥ 2.2.0 ^(3)^ | *yes* | SSL connection to IRC server, support of SSL in relay plugin, IRC SASL authentication (ECDSA-NIST256P-CHALLENGE).
|
||||
| gettext | | | Internationalization (translation of messages; base language is English).
|
||||
| ca-certificates | | | Certificates for SSL connections.
|
||||
| libaspell-dev
|
||||
@ -215,9 +215,6 @@ List of commonly used options:
|
||||
| ENABLE_FSET | `ON`, `OFF` | ON |
|
||||
Compile <<fset_plugin,Fset plugin>>.
|
||||
|
||||
| ENABLE_GNUTLS | `ON`, `OFF` | ON |
|
||||
Enable GnuTLS (for SSL).
|
||||
|
||||
| ENABLE_GUILE | `ON`, `OFF` | ON |
|
||||
Compile <<scripts_plugins,Guile plugin>> (Scheme).
|
||||
|
||||
|
||||
@ -106,7 +106,7 @@ compiler WeeChat.
|
||||
| libcurl4-gnutls-dev | | *oui* | Transfert d'URL.
|
||||
| zlib1g-dev | | *oui* | Compression des paquets dans l'extension relay (protocole weechat), extension script.
|
||||
| libgcrypt20-dev | | *oui* | Données sécurisées, authentification IRC SASL (DH-BLOWFISH/DH-AES).
|
||||
| libgnutls28-dev | ≥ 2.2.0 ^(3)^ | | Connexion SSL au serveur IRC, support SSL dans l'extension relay, authentification IRC SASL (ECDSA-NIST256P-CHALLENGE).
|
||||
| libgnutls28-dev | ≥ 2.2.0 ^(3)^ | *oui* | Connexion SSL au serveur IRC, support SSL dans l'extension relay, authentification IRC SASL (ECDSA-NIST256P-CHALLENGE).
|
||||
| gettext | | | Internationalisation (traduction des messages; la langue de base est l'anglais).
|
||||
| ca-certificates | | | Certificats pour les connexions SSL.
|
||||
| libaspell-dev
|
||||
@ -220,9 +220,6 @@ Liste des options couramment utilisées :
|
||||
| ENABLE_FSET | `ON`, `OFF` | ON |
|
||||
Compiler <<fset_plugin,l'extension Fset>>.
|
||||
|
||||
| ENABLE_GNUTLS | `ON`, `OFF` | ON |
|
||||
Activer GnuTLS (pour SSL).
|
||||
|
||||
| ENABLE_GUILE | `ON`, `OFF` | ON |
|
||||
Compiler <<scripts_plugins,l'extension Guile>> (Scheme).
|
||||
|
||||
|
||||
@ -125,7 +125,7 @@ compilare WeeChat.
|
||||
// TRANSLATION MISSING
|
||||
| libgcrypt20-dev | | *sì* | Secured data, IRC SASL authentication (DH-BLOWFISH/DH-AES).
|
||||
// TRANSLATION MISSING
|
||||
| libgnutls28-dev | ≥ 2.2.0 ^(3)^ | | Connessione SSL al server IRC, support of SSL in relay plugin, IRC SASL authentication (ECDSA-NIST256P-CHALLENGE).
|
||||
| libgnutls28-dev | ≥ 2.2.0 ^(3)^ | *sì* | Connessione SSL al server IRC, support of SSL in relay plugin, IRC SASL authentication (ECDSA-NIST256P-CHALLENGE).
|
||||
| gettext | | | Internazionalizzazione (traduzione dei messaggi; la lingua base è l'inglese).
|
||||
| ca-certificates | | | Certificati per le connessioni SSL.
|
||||
| libaspell-dev
|
||||
@ -250,9 +250,6 @@ List of commonly used options:
|
||||
| ENABLE_FSET | `ON`, `OFF` | ON |
|
||||
Compile <<fset_plugin,Fset plugin>>.
|
||||
|
||||
| ENABLE_GNUTLS | `ON`, `OFF` | ON |
|
||||
Enable GnuTLS (for SSL).
|
||||
|
||||
| ENABLE_GUILE | `ON`, `OFF` | ON |
|
||||
Compile <<scripts_plugins,Guile plugin>> (Scheme).
|
||||
|
||||
|
||||
@ -108,7 +108,7 @@ macOS では https://brew.sh/[Homebrew] を使ってください:
|
||||
| libcurl4-gnutls-dev | | *必須* | URL 転送
|
||||
| zlib1g-dev | | *必須* | relay プラグインでパケットを圧縮 (weechat プロトコル)、スクリプトプラグイン
|
||||
| libgcrypt20-dev | | *必須* | 保護データ、IRC SASL 認証 (DH-BLOWFISH/DH-AES)
|
||||
| libgnutls28-dev | 2.2.0 以上 ^(3)^ | | IRC サーバへの SSL 接続、IRC SASL 認証 (ECDSA-NIST256P-CHALLENGE)
|
||||
| libgnutls28-dev | 2.2.0 以上 ^(3)^ | *必須* | IRC サーバへの SSL 接続、IRC SASL 認証 (ECDSA-NIST256P-CHALLENGE)
|
||||
| gettext | | | 国際化 (メッセージの翻訳; ベース言語は英語です)
|
||||
| ca-certificates | | | SSL 接続に必要な証明書、relay プラグインで SSL サポート
|
||||
| libaspell-dev
|
||||
@ -221,9 +221,6 @@ CMake に対するオプションを指定するには、以下の書式を使
|
||||
| ENABLE_FSET | `ON`, `OFF` | ON |
|
||||
<<fset_plugin,Fset プラグイン>>のコンパイル。
|
||||
|
||||
| ENABLE_GNUTLS | `ON`, `OFF` | ON |
|
||||
GnuTLS の有効化 (SSL 用)。
|
||||
|
||||
| ENABLE_GUILE | `ON`, `OFF` | ON |
|
||||
<<scripts_plugins,Guile プラグイン>> (Scheme) のコンパイル。
|
||||
|
||||
|
||||
@ -109,7 +109,7 @@ WeeChat.
|
||||
| libcurl4-gnutls-dev | | *tak* | Transfer URL.
|
||||
| zlib1g-dev | | *tak* | Kompresja pakietów we wtyczce relay (protokół weechat), wtyczka script.
|
||||
| libgcrypt20-dev | | *tak* | Zabezpieczone dane, uwierzytelnianie IRC SASL (DH-BLOWFISH/DH-AES).
|
||||
| libgnutls28-dev | ≥ 2.2.0 ^(3)^ | | Połączenia SSL z serwerami IRC, wsparcie dla SSL we wtyczce relay, uwierzytelnianie IRC SASL (ECDSA-NIST256P-CHALLENGE).
|
||||
| libgnutls28-dev | ≥ 2.2.0 ^(3)^ | *tak* | Połączenia SSL z serwerami IRC, wsparcie dla SSL we wtyczce relay, uwierzytelnianie IRC SASL (ECDSA-NIST256P-CHALLENGE).
|
||||
| gettext | | | Internacjonalizacja (tłumaczenie wiadomości; język bazowy to Angielski).
|
||||
| ca-certificates | | | Certyfikaty dla połączeń SSL.
|
||||
| libaspell-dev
|
||||
@ -221,9 +221,6 @@ Lista popularnych opcji:
|
||||
| ENABLE_FSET | `ON`, `OFF` | ON |
|
||||
Kompilacja <<fset_plugin,wtyczki fset>>.
|
||||
|
||||
| ENABLE_GNUTLS | `ON`, `OFF` | ON |
|
||||
Włączenie GnuTLS (dla SSL).
|
||||
|
||||
| ENABLE_GUILE | `ON`, `OFF` | ON |
|
||||
Kompilacja <<scripts_plugins,wtyczki guile>> (Scheme).
|
||||
|
||||
|
||||
60
po/cs.po
60
po/cs.po
@ -21,8 +21,8 @@ msgid ""
|
||||
msgstr ""
|
||||
"Project-Id-Version: WeeChat\n"
|
||||
"Report-Msgid-Bugs-To: flashcode@flashtux.org\n"
|
||||
"POT-Creation-Date: 2020-04-14 21:29+0200\n"
|
||||
"PO-Revision-Date: 2020-03-08 14:22+0100\n"
|
||||
"POT-Creation-Date: 2020-04-18 11:30+0200\n"
|
||||
"PO-Revision-Date: 2020-04-18 11:34+0200\n"
|
||||
"Last-Translator: Ondřej Súkup <mimi.vx@gmail.com>\n"
|
||||
"Language-Team: weechat-dev <weechat-dev@nongnu.org>\n"
|
||||
"Language: cs\n"
|
||||
@ -9720,14 +9720,6 @@ msgstr "%s%s: chybí nastavení proxy, zkontrolujte volby pro proxy \"%s\""
|
||||
msgid "%s%s: nicks not defined for server \"%s\", cannot connect"
|
||||
msgstr "%s%s: přezdívka není definovaná pro server \"%s\", nelze se spojit"
|
||||
|
||||
#, c-format
|
||||
msgid ""
|
||||
"%s%s: cannot connect with SSL because WeeChat was not built with GnuTLS "
|
||||
"support"
|
||||
msgstr ""
|
||||
"%s%s: nemohu se připojit pomocí SSL, protže WeeChat nebyl sestaven s "
|
||||
"podporou GNUtls"
|
||||
|
||||
#, fuzzy, c-format
|
||||
msgid "%s%s: connecting to server %s/%d%s via %s proxy %s/%d%s..."
|
||||
msgstr "%s: připojuji se k serveru %s/%d%s%s přes %s proxy %s/%d%s..."
|
||||
@ -10943,12 +10935,6 @@ msgstr ""
|
||||
msgid "%s%s: error: path \"%s\" is already used"
|
||||
msgstr "%s%s: chyba: port \"%d\" je již používán"
|
||||
|
||||
#, fuzzy, c-format
|
||||
msgid "%s%s: cannot use SSL because WeeChat was not built with GnuTLS support"
|
||||
msgstr ""
|
||||
"%s%s: nemohu se připojit pomocí SSL, protže WeeChat nebyl sestaven s "
|
||||
"podporou GNUtls"
|
||||
|
||||
#, c-format
|
||||
msgid "%s%s: error: unknown protocol \"%s\""
|
||||
msgstr "%s%s: chyba: neznámý protokol \"%s\""
|
||||
@ -11019,20 +11005,6 @@ msgid ""
|
||||
"\"^(123\\.45\\.67\\.89|192\\.160\\..*)$\""
|
||||
msgstr ""
|
||||
|
||||
#, fuzzy
|
||||
msgid ""
|
||||
"comma separated list of hash algorithms used for password authentication in "
|
||||
"weechat protocol, among these values: \"plain\" (password in plain text, not "
|
||||
"hashed), \"sha256\", \"sha512\", \"pbkdf2+sha256\", \"pbkdf2+sha512\"), \"*"
|
||||
"\" means all algorithms, a name beginning with \"!\" is a negative value to "
|
||||
"prevent an algorithm from being used, wildcard \"*\" is allowed in names "
|
||||
"(examples: \"*\", \"pbkdf2*\", \"*,!plain\")"
|
||||
msgstr ""
|
||||
"čárkou rozdělený seznam pluginů pro automatické načtení při spuštění \"*\" "
|
||||
"znamená všechny nalezené pluginy, jméno začínající \"!\" je negativní "
|
||||
"hodnota k zabránění načtení pluginu, jména mohou začínat nebo končit \"*\" "
|
||||
"pro vybrání několika pluginů (příklady: \"*\" nebo \"*,!lua,!tcl\")"
|
||||
|
||||
msgid ""
|
||||
"timeout (in seconds) for client authentication: connection is closed if the "
|
||||
"client is still not authenticated after this delay and the client status is "
|
||||
@ -11057,13 +11029,6 @@ msgid ""
|
||||
"disable compression, 1 = low compression ... 9 = best compression)"
|
||||
msgstr ""
|
||||
|
||||
msgid ""
|
||||
"number of iterations asked to the client in weechat protocol when a hashed "
|
||||
"password with algorithm PBKDF2 is used for authentication; more iterations "
|
||||
"is better in term of security but is slower to compute; this number should "
|
||||
"not be too high if your CPU is slow"
|
||||
msgstr ""
|
||||
|
||||
msgid ""
|
||||
"listen on IPv6 socket by default (in addition to IPv4 which is default); "
|
||||
"protocols IPv4 and IPv6 can be forced (individually or together) in the "
|
||||
@ -11089,6 +11054,27 @@ msgstr ""
|
||||
"heslo vyžadované klienty pro přístup k tomuto přesměrováni (prázdná hodnota "
|
||||
"značí, že heslo není vyžadováno)"
|
||||
|
||||
#, fuzzy
|
||||
msgid ""
|
||||
"comma separated list of hash algorithms used for password authentication in "
|
||||
"weechat protocol, among these values: \"plain\" (password in plain text, not "
|
||||
"hashed), \"sha256\", \"sha512\", \"pbkdf2+sha256\", \"pbkdf2+sha512\"), \"*"
|
||||
"\" means all algorithms, a name beginning with \"!\" is a negative value to "
|
||||
"prevent an algorithm from being used, wildcard \"*\" is allowed in names "
|
||||
"(examples: \"*\", \"pbkdf2*\", \"*,!plain\")"
|
||||
msgstr ""
|
||||
"čárkou rozdělený seznam pluginů pro automatické načtení při spuštění \"*\" "
|
||||
"znamená všechny nalezené pluginy, jméno začínající \"!\" je negativní "
|
||||
"hodnota k zabránění načtení pluginu, jména mohou začínat nebo končit \"*\" "
|
||||
"pro vybrání několika pluginů (příklady: \"*\" nebo \"*,!lua,!tcl\")"
|
||||
|
||||
msgid ""
|
||||
"number of iterations asked to the client in weechat protocol when a hashed "
|
||||
"password with algorithm PBKDF2 is used for authentication; more iterations "
|
||||
"is better in term of security but is slower to compute; this number should "
|
||||
"not be too high if your CPU is slow"
|
||||
msgstr ""
|
||||
|
||||
msgid ""
|
||||
"file with SSL certificate and private key (for serving clients with SSL)"
|
||||
msgstr "soubor s SSL certifikátem a soukromý klíč (pro obsluhu klientů s SSL)"
|
||||
|
||||
74
po/de.po
74
po/de.po
@ -24,8 +24,8 @@ msgid ""
|
||||
msgstr ""
|
||||
"Project-Id-Version: WeeChat\n"
|
||||
"Report-Msgid-Bugs-To: flashcode@flashtux.org\n"
|
||||
"POT-Creation-Date: 2020-04-14 21:29+0200\n"
|
||||
"PO-Revision-Date: 2020-04-17 00:41+0200\n"
|
||||
"POT-Creation-Date: 2020-04-18 11:30+0200\n"
|
||||
"PO-Revision-Date: 2020-04-18 11:34+0200\n"
|
||||
"Last-Translator: Nils Görs <weechatter@arcor.de>\n"
|
||||
"Language-Team: German <kde-i18n-de@kde.org>\n"
|
||||
"Language: de\n"
|
||||
@ -11572,14 +11572,6 @@ msgstr ""
|
||||
"%s%s Nicknamen für den Server \"%s\" nicht definiert, kann keine Verbindung "
|
||||
"herstellen"
|
||||
|
||||
#, c-format
|
||||
msgid ""
|
||||
"%s%s: cannot connect with SSL because WeeChat was not built with GnuTLS "
|
||||
"support"
|
||||
msgstr ""
|
||||
"%s%s SSL-Verbindung nicht möglich da WeeChat nicht mit GNUtls-Support "
|
||||
"kompiliert wurde"
|
||||
|
||||
#, c-format
|
||||
msgid "%s%s: connecting to server %s/%d%s via %s proxy %s/%d%s..."
|
||||
msgstr "%s%s: verbinden zum Server %s/%d%s via %s Proxy %s/%d%s..."
|
||||
@ -12888,12 +12880,6 @@ msgstr "%s%sFehler: Pfad \"%s\" ist zu lang (Länge: %d ; Maximal: %d)"
|
||||
msgid "%s%s: error: path \"%s\" is already used"
|
||||
msgstr "%s%s: Fehler: Pfad \"%s\" wird schon genutzt"
|
||||
|
||||
#, c-format
|
||||
msgid "%s%s: cannot use SSL because WeeChat was not built with GnuTLS support"
|
||||
msgstr ""
|
||||
"%s%s SSL-Verbindung nicht möglich da WeeChat nicht mit GnuTLS-Unterstützung "
|
||||
"kompiliert wurde"
|
||||
|
||||
#, c-format
|
||||
msgid "%s%s: error: unknown protocol \"%s\""
|
||||
msgstr "%s%s: Unbekanntes Protokoll \"%s\""
|
||||
@ -12965,22 +12951,6 @@ msgstr ""
|
||||
"Kleinschreibung zu unterscheiden muss die Zeichenkette mit \"(?-i)\" "
|
||||
"eingeleitet werden), Beispiele: \"^(123\\.45\\.67\\.89|192\\.160\\..*)$\""
|
||||
|
||||
msgid ""
|
||||
"comma separated list of hash algorithms used for password authentication in "
|
||||
"weechat protocol, among these values: \"plain\" (password in plain text, not "
|
||||
"hashed), \"sha256\", \"sha512\", \"pbkdf2+sha256\", \"pbkdf2+sha512\"), \"*"
|
||||
"\" means all algorithms, a name beginning with \"!\" is a negative value to "
|
||||
"prevent an algorithm from being used, wildcard \"*\" is allowed in names "
|
||||
"(examples: \"*\", \"pbkdf2*\", \"*,!plain\")"
|
||||
msgstr ""
|
||||
"durch Kommata getrennte Liste der Hash-Algorithmen, die für die "
|
||||
"Kennwortauthentifizierung im Weechat-Protokoll verwendet werden, unter "
|
||||
"diesen Werten: \"plain\" (Kennwort im Klartext, nicht gehasht), \"sha256\", "
|
||||
"\"sha512\", \"pbkdf2 + sha256\", \"pbkdf2 + sha512\" ), \"*\" bedeutet alle "
|
||||
"Algorithmen, ein Name, der mit \"!\" beginnt ist ein negativer Wert, um die "
|
||||
"Verwendung eines Algorithmus zu vermeiden. Ein Platzhalter \"*\" im Namen "
|
||||
"ist zulässig (Beispiele: \"*\", \"pbkdf2 *\", \"*,! plain\")"
|
||||
|
||||
msgid ""
|
||||
"timeout (in seconds) for client authentication: connection is closed if the "
|
||||
"client is still not authenticated after this delay and the client status is "
|
||||
@ -13014,18 +12984,6 @@ msgstr ""
|
||||
"gesendet werden sollen (0 = Kompression deaktiviert, 1 = niedrige "
|
||||
"Kompression ... 9 = stärkste Kompression)"
|
||||
|
||||
msgid ""
|
||||
"number of iterations asked to the client in weechat protocol when a hashed "
|
||||
"password with algorithm PBKDF2 is used for authentication; more iterations "
|
||||
"is better in term of security but is slower to compute; this number should "
|
||||
"not be too high if your CPU is slow"
|
||||
msgstr ""
|
||||
"Anzahl der Iterationen, die im Weechat-Protokoll an den Client gesendet "
|
||||
"werden, wenn ein Hash-Passwort mit dem Algorithmus PBKDF2 zur "
|
||||
"Authentifizierung verwendet wird; Mehr Iterationen sind aus "
|
||||
"Sicherheitsgründen besser, aber langsamer zu berechnen. Diese Zahl sollte "
|
||||
"nicht zu hoch sein, wenn Ihre CPU langsam ist"
|
||||
|
||||
msgid ""
|
||||
"listen on IPv6 socket by default (in addition to IPv4 which is default); "
|
||||
"protocols IPv4 and IPv6 can be forced (individually or together) in the "
|
||||
@ -13061,6 +13019,34 @@ msgstr ""
|
||||
"network.allow_empty_password) (Hinweis: Inhalt wird evaluiert, siehe /help "
|
||||
"eval)"
|
||||
|
||||
msgid ""
|
||||
"comma separated list of hash algorithms used for password authentication in "
|
||||
"weechat protocol, among these values: \"plain\" (password in plain text, not "
|
||||
"hashed), \"sha256\", \"sha512\", \"pbkdf2+sha256\", \"pbkdf2+sha512\"), \"*"
|
||||
"\" means all algorithms, a name beginning with \"!\" is a negative value to "
|
||||
"prevent an algorithm from being used, wildcard \"*\" is allowed in names "
|
||||
"(examples: \"*\", \"pbkdf2*\", \"*,!plain\")"
|
||||
msgstr ""
|
||||
"durch Kommata getrennte Liste der Hash-Algorithmen, die für die "
|
||||
"Kennwortauthentifizierung im Weechat-Protokoll verwendet werden, unter "
|
||||
"diesen Werten: \"plain\" (Kennwort im Klartext, nicht gehasht), \"sha256\", "
|
||||
"\"sha512\", \"pbkdf2 + sha256\", \"pbkdf2 + sha512\" ), \"*\" bedeutet alle "
|
||||
"Algorithmen, ein Name, der mit \"!\" beginnt ist ein negativer Wert, um die "
|
||||
"Verwendung eines Algorithmus zu vermeiden. Ein Platzhalter \"*\" im Namen "
|
||||
"ist zulässig (Beispiele: \"*\", \"pbkdf2 *\", \"*,! plain\")"
|
||||
|
||||
msgid ""
|
||||
"number of iterations asked to the client in weechat protocol when a hashed "
|
||||
"password with algorithm PBKDF2 is used for authentication; more iterations "
|
||||
"is better in term of security but is slower to compute; this number should "
|
||||
"not be too high if your CPU is slow"
|
||||
msgstr ""
|
||||
"Anzahl der Iterationen, die im Weechat-Protokoll an den Client gesendet "
|
||||
"werden, wenn ein Hash-Passwort mit dem Algorithmus PBKDF2 zur "
|
||||
"Authentifizierung verwendet wird; Mehr Iterationen sind aus "
|
||||
"Sicherheitsgründen besser, aber langsamer zu berechnen. Diese Zahl sollte "
|
||||
"nicht zu hoch sein, wenn Ihre CPU langsam ist"
|
||||
|
||||
msgid ""
|
||||
"file with SSL certificate and private key (for serving clients with SSL)"
|
||||
msgstr ""
|
||||
|
||||
60
po/es.po
60
po/es.po
@ -22,8 +22,8 @@ msgid ""
|
||||
msgstr ""
|
||||
"Project-Id-Version: WeeChat\n"
|
||||
"Report-Msgid-Bugs-To: flashcode@flashtux.org\n"
|
||||
"POT-Creation-Date: 2020-04-14 21:29+0200\n"
|
||||
"PO-Revision-Date: 2020-03-08 14:22+0100\n"
|
||||
"POT-Creation-Date: 2020-04-18 11:30+0200\n"
|
||||
"PO-Revision-Date: 2020-04-18 11:34+0200\n"
|
||||
"Last-Translator: Elián Hanisch <lambdae2@gmail.com>\n"
|
||||
"Language-Team: weechat-dev <weechat-dev@nongnu.org>\n"
|
||||
"Language: es\n"
|
||||
@ -10027,14 +10027,6 @@ msgid "%s%s: nicks not defined for server \"%s\", cannot connect"
|
||||
msgstr ""
|
||||
"%s%s: apodos sin definir para el servidor \"%s\", no es posible conectarse"
|
||||
|
||||
#, c-format
|
||||
msgid ""
|
||||
"%s%s: cannot connect with SSL because WeeChat was not built with GnuTLS "
|
||||
"support"
|
||||
msgstr ""
|
||||
"%s%s: no es posible conectarse con SSL debido a que WeeChat no fue compilado "
|
||||
"con soporte GnuTLS"
|
||||
|
||||
# hard to guess what the %s are
|
||||
# example: "connecting to server address/port(IPv6)(SSL) via http proxy address/port(IPv6)..."
|
||||
#, c-format
|
||||
@ -11283,12 +11275,6 @@ msgstr ""
|
||||
msgid "%s%s: error: path \"%s\" is already used"
|
||||
msgstr "%s%s: error: puerto \"%d\" ya está en uso"
|
||||
|
||||
#, c-format
|
||||
msgid "%s%s: cannot use SSL because WeeChat was not built with GnuTLS support"
|
||||
msgstr ""
|
||||
"%s%s: no es posible usar SSL debido a que WeeChat no fue compilado con "
|
||||
"soporte GnuTLS"
|
||||
|
||||
#, c-format
|
||||
msgid "%s%s: error: unknown protocol \"%s\""
|
||||
msgstr "%s%s: error: protocolo desconocido \"%s\""
|
||||
@ -11364,20 +11350,6 @@ msgstr ""
|
||||
"mapeada a IPv6 (como: \"::ffff:127.0.0.1\"), ejemplo: \"^((::ffff:)?"
|
||||
"123\\.45\\.67\\.89|192\\.160\\..*)$\""
|
||||
|
||||
#, fuzzy
|
||||
msgid ""
|
||||
"comma separated list of hash algorithms used for password authentication in "
|
||||
"weechat protocol, among these values: \"plain\" (password in plain text, not "
|
||||
"hashed), \"sha256\", \"sha512\", \"pbkdf2+sha256\", \"pbkdf2+sha512\"), \"*"
|
||||
"\" means all algorithms, a name beginning with \"!\" is a negative value to "
|
||||
"prevent an algorithm from being used, wildcard \"*\" is allowed in names "
|
||||
"(examples: \"*\", \"pbkdf2*\", \"*,!plain\")"
|
||||
msgstr ""
|
||||
"lista de plugins separados por comas para cargar automáticamente al iniciar, "
|
||||
"\"*\" significa todos los plugins encontrados, un nombre empezando con \"!\" "
|
||||
"previene que el plugin se cargue, nombres pueden empezar o terminar con \"*"
|
||||
"\" para indicar varios plugins (ejemplo: \"*\" o \"*,!lua,!tcl\")"
|
||||
|
||||
msgid ""
|
||||
"timeout (in seconds) for client authentication: connection is closed if the "
|
||||
"client is still not authenticated after this delay and the client status is "
|
||||
@ -11404,13 +11376,6 @@ msgstr ""
|
||||
"nivel de compresión para paquetes enviados al cliente con el protocolo "
|
||||
"WeeChat (0 = sin compresión, 1 = baja compresión ... 9 = mejor compresión)"
|
||||
|
||||
msgid ""
|
||||
"number of iterations asked to the client in weechat protocol when a hashed "
|
||||
"password with algorithm PBKDF2 is used for authentication; more iterations "
|
||||
"is better in term of security but is slower to compute; this number should "
|
||||
"not be too high if your CPU is slow"
|
||||
msgstr ""
|
||||
|
||||
msgid ""
|
||||
"listen on IPv6 socket by default (in addition to IPv4 which is default); "
|
||||
"protocols IPv4 and IPv6 can be forced (individually or together) in the "
|
||||
@ -11436,6 +11401,27 @@ msgstr ""
|
||||
"los clientes requieren una clave para acceder este repetidor (sin valor "
|
||||
"significa que no se requiere clave)"
|
||||
|
||||
#, fuzzy
|
||||
msgid ""
|
||||
"comma separated list of hash algorithms used for password authentication in "
|
||||
"weechat protocol, among these values: \"plain\" (password in plain text, not "
|
||||
"hashed), \"sha256\", \"sha512\", \"pbkdf2+sha256\", \"pbkdf2+sha512\"), \"*"
|
||||
"\" means all algorithms, a name beginning with \"!\" is a negative value to "
|
||||
"prevent an algorithm from being used, wildcard \"*\" is allowed in names "
|
||||
"(examples: \"*\", \"pbkdf2*\", \"*,!plain\")"
|
||||
msgstr ""
|
||||
"lista de plugins separados por comas para cargar automáticamente al iniciar, "
|
||||
"\"*\" significa todos los plugins encontrados, un nombre empezando con \"!\" "
|
||||
"previene que el plugin se cargue, nombres pueden empezar o terminar con \"*"
|
||||
"\" para indicar varios plugins (ejemplo: \"*\" o \"*,!lua,!tcl\")"
|
||||
|
||||
msgid ""
|
||||
"number of iterations asked to the client in weechat protocol when a hashed "
|
||||
"password with algorithm PBKDF2 is used for authentication; more iterations "
|
||||
"is better in term of security but is slower to compute; this number should "
|
||||
"not be too high if your CPU is slow"
|
||||
msgstr ""
|
||||
|
||||
msgid ""
|
||||
"file with SSL certificate and private key (for serving clients with SSL)"
|
||||
msgstr ""
|
||||
|
||||
74
po/fr.po
74
po/fr.po
@ -21,8 +21,8 @@ msgid ""
|
||||
msgstr ""
|
||||
"Project-Id-Version: WeeChat\n"
|
||||
"Report-Msgid-Bugs-To: flashcode@flashtux.org\n"
|
||||
"POT-Creation-Date: 2020-04-14 21:29+0200\n"
|
||||
"PO-Revision-Date: 2020-04-14 21:29+0200\n"
|
||||
"POT-Creation-Date: 2020-04-18 11:30+0200\n"
|
||||
"PO-Revision-Date: 2020-04-18 11:34+0200\n"
|
||||
"Last-Translator: Sébastien Helleu <flashcode@flashtux.org>\n"
|
||||
"Language-Team: weechat-dev <weechat-dev@nongnu.org>\n"
|
||||
"Language: fr\n"
|
||||
@ -11304,14 +11304,6 @@ msgid "%s%s: nicks not defined for server \"%s\", cannot connect"
|
||||
msgstr ""
|
||||
"%s%s : pseudos non définis pour le serveur \"%s\", connexion impossible"
|
||||
|
||||
#, c-format
|
||||
msgid ""
|
||||
"%s%s: cannot connect with SSL because WeeChat was not built with GnuTLS "
|
||||
"support"
|
||||
msgstr ""
|
||||
"%s%s : impossible de se connecter avec SSL car WeeChat n'a pas été construit "
|
||||
"avec le support GnuTLS"
|
||||
|
||||
#, c-format
|
||||
msgid "%s%s: connecting to server %s/%d%s via %s proxy %s/%d%s..."
|
||||
msgstr "%s%s : connexion au serveur %s/%d%s via le proxy %s %s/%d%s..."
|
||||
@ -12616,12 +12608,6 @@ msgstr ""
|
||||
msgid "%s%s: error: path \"%s\" is already used"
|
||||
msgstr "%s%s : erreur : le chemin \"%s\" est déjà utilisé"
|
||||
|
||||
#, c-format
|
||||
msgid "%s%s: cannot use SSL because WeeChat was not built with GnuTLS support"
|
||||
msgstr ""
|
||||
"%s%s : impossible d'utiliser SSL car WeeChat n'a pas été construit avec le "
|
||||
"support GnuTLS"
|
||||
|
||||
#, c-format
|
||||
msgid "%s%s: error: unknown protocol \"%s\""
|
||||
msgstr "%s%s : erreur : protocole \"%s\" inconnu"
|
||||
@ -12693,22 +12679,6 @@ msgstr ""
|
||||
"(insensible à la casse, utilisez \"(?-i)\" en début de chaîne pour la rendre "
|
||||
"insensible à la casse), exemple : \"^(123\\.45\\.67\\.89|192\\.160\\..*)$\""
|
||||
|
||||
msgid ""
|
||||
"comma separated list of hash algorithms used for password authentication in "
|
||||
"weechat protocol, among these values: \"plain\" (password in plain text, not "
|
||||
"hashed), \"sha256\", \"sha512\", \"pbkdf2+sha256\", \"pbkdf2+sha512\"), \"*"
|
||||
"\" means all algorithms, a name beginning with \"!\" is a negative value to "
|
||||
"prevent an algorithm from being used, wildcard \"*\" is allowed in names "
|
||||
"(examples: \"*\", \"pbkdf2*\", \"*,!plain\")"
|
||||
msgstr ""
|
||||
"liste des algorithmes de hachage pour l'authentification par mot de passe "
|
||||
"dans le protocole relay, parmi ces valeurs : \"plain\" (mot de passe en "
|
||||
"clair, non haché), \"sha256\", \"sha512\", \"pbkdf2+sha256\", "
|
||||
"\"pbkdf2+sha512\" ; \"*\" signifie tous les algorithmes, un nom commençant "
|
||||
"par \"!\" est une valeur négative pour empêcher un algorithme d'être "
|
||||
"utilisé, le caractère joker \"*\" est autorisé dans les noms (exemples : \"*"
|
||||
"\", \"pbkdf2*\", \"*,!plain\")"
|
||||
|
||||
msgid ""
|
||||
"timeout (in seconds) for client authentication: connection is closed if the "
|
||||
"client is still not authenticated after this delay and the client status is "
|
||||
@ -12741,18 +12711,6 @@ msgstr ""
|
||||
"WeeChat (0 = désactiver la compression, 1 = peu de compression ... 9 = "
|
||||
"meilleure compression)"
|
||||
|
||||
msgid ""
|
||||
"number of iterations asked to the client in weechat protocol when a hashed "
|
||||
"password with algorithm PBKDF2 is used for authentication; more iterations "
|
||||
"is better in term of security but is slower to compute; this number should "
|
||||
"not be too high if your CPU is slow"
|
||||
msgstr ""
|
||||
"nombre d'itérations demandées au client dans le protocole weechat lorsqu'un "
|
||||
"mot de passe haché avec l'algorithme PBKDF2 est utilisé pour "
|
||||
"l'authentification ; plus d'itérations est mieux en terme de sécurité mais "
|
||||
"est plus lent à calculer ; ce nombre ne doit pas être trop élevé si votre "
|
||||
"micro-processeur est lent"
|
||||
|
||||
msgid ""
|
||||
"listen on IPv6 socket by default (in addition to IPv4 which is default); "
|
||||
"protocols IPv4 and IPv6 can be forced (individually or together) in the "
|
||||
@ -12784,6 +12742,34 @@ msgstr ""
|
||||
"indique que le mot de passe n'est pas nécessaire, voir l'option relay."
|
||||
"network.allow_empty_password) (note : le contenu est évalué, voir /help eval)"
|
||||
|
||||
msgid ""
|
||||
"comma separated list of hash algorithms used for password authentication in "
|
||||
"weechat protocol, among these values: \"plain\" (password in plain text, not "
|
||||
"hashed), \"sha256\", \"sha512\", \"pbkdf2+sha256\", \"pbkdf2+sha512\"), \"*"
|
||||
"\" means all algorithms, a name beginning with \"!\" is a negative value to "
|
||||
"prevent an algorithm from being used, wildcard \"*\" is allowed in names "
|
||||
"(examples: \"*\", \"pbkdf2*\", \"*,!plain\")"
|
||||
msgstr ""
|
||||
"liste des algorithmes de hachage pour l'authentification par mot de passe "
|
||||
"dans le protocole relay, parmi ces valeurs : \"plain\" (mot de passe en "
|
||||
"clair, non haché), \"sha256\", \"sha512\", \"pbkdf2+sha256\", "
|
||||
"\"pbkdf2+sha512\" ; \"*\" signifie tous les algorithmes, un nom commençant "
|
||||
"par \"!\" est une valeur négative pour empêcher un algorithme d'être "
|
||||
"utilisé, le caractère joker \"*\" est autorisé dans les noms (exemples : \"*"
|
||||
"\", \"pbkdf2*\", \"*,!plain\")"
|
||||
|
||||
msgid ""
|
||||
"number of iterations asked to the client in weechat protocol when a hashed "
|
||||
"password with algorithm PBKDF2 is used for authentication; more iterations "
|
||||
"is better in term of security but is slower to compute; this number should "
|
||||
"not be too high if your CPU is slow"
|
||||
msgstr ""
|
||||
"nombre d'itérations demandées au client dans le protocole weechat lorsqu'un "
|
||||
"mot de passe haché avec l'algorithme PBKDF2 est utilisé pour "
|
||||
"l'authentification ; plus d'itérations est mieux en terme de sécurité mais "
|
||||
"est plus lent à calculer ; ce nombre ne doit pas être trop élevé si votre "
|
||||
"micro-processeur est lent"
|
||||
|
||||
msgid ""
|
||||
"file with SSL certificate and private key (for serving clients with SSL)"
|
||||
msgstr ""
|
||||
|
||||
58
po/hu.po
58
po/hu.po
@ -20,8 +20,8 @@ msgid ""
|
||||
msgstr ""
|
||||
"Project-Id-Version: WeeChat\n"
|
||||
"Report-Msgid-Bugs-To: flashcode@flashtux.org\n"
|
||||
"POT-Creation-Date: 2020-04-14 21:29+0200\n"
|
||||
"PO-Revision-Date: 2020-03-08 14:22+0100\n"
|
||||
"POT-Creation-Date: 2020-04-18 11:30+0200\n"
|
||||
"PO-Revision-Date: 2020-04-18 11:34+0200\n"
|
||||
"Last-Translator: Andras Voroskoi <voroskoi@frugalware.org>\n"
|
||||
"Language-Team: weechat-dev <weechat-dev@nongnu.org>\n"
|
||||
"Language: hu\n"
|
||||
@ -9097,14 +9097,6 @@ msgstr "%s ismeretlen opció a \"%s\" parancsnak\n"
|
||||
msgid "%s%s: nicks not defined for server \"%s\", cannot connect"
|
||||
msgstr "%s név \"%s\" nem található a \"%s\" parancshoz\n"
|
||||
|
||||
#, fuzzy, c-format
|
||||
msgid ""
|
||||
"%s%s: cannot connect with SSL because WeeChat was not built with GnuTLS "
|
||||
"support"
|
||||
msgstr ""
|
||||
"%s nem sikerült SSL használattal kapcsolódni, mert a WeeChat GNUtls "
|
||||
"támogatás nélkül lett fordítva\n"
|
||||
|
||||
#, fuzzy, c-format
|
||||
msgid "%s%s: connecting to server %s/%d%s via %s proxy %s/%d%s..."
|
||||
msgstr ""
|
||||
@ -10285,12 +10277,6 @@ msgstr ""
|
||||
msgid "%s%s: error: path \"%s\" is already used"
|
||||
msgstr "%s az ignore már létezik\n"
|
||||
|
||||
#, fuzzy, c-format
|
||||
msgid "%s%s: cannot use SSL because WeeChat was not built with GnuTLS support"
|
||||
msgstr ""
|
||||
"%s nem sikerült SSL használattal kapcsolódni, mert a WeeChat GNUtls "
|
||||
"támogatás nélkül lett fordítva\n"
|
||||
|
||||
#, fuzzy, c-format
|
||||
msgid "%s%s: error: unknown protocol \"%s\""
|
||||
msgstr "%s ismeretlen billentyűparancs \"%s\"\n"
|
||||
@ -10365,19 +10351,6 @@ msgid ""
|
||||
"\"^(123\\.45\\.67\\.89|192\\.160\\..*)$\""
|
||||
msgstr ""
|
||||
|
||||
#, fuzzy
|
||||
msgid ""
|
||||
"comma separated list of hash algorithms used for password authentication in "
|
||||
"weechat protocol, among these values: \"plain\" (password in plain text, not "
|
||||
"hashed), \"sha256\", \"sha512\", \"pbkdf2+sha256\", \"pbkdf2+sha512\"), \"*"
|
||||
"\" means all algorithms, a name beginning with \"!\" is a negative value to "
|
||||
"prevent an algorithm from being used, wildcard \"*\" is allowed in names "
|
||||
"(examples: \"*\", \"pbkdf2*\", \"*,!plain\")"
|
||||
msgstr ""
|
||||
"automatikusan betöltendő modulok vesszővel elválasztott listája, \"*\" "
|
||||
"esetén az összes fellelt modul (az elnevezés lehet részleges, például a "
|
||||
"\"perl\" elegendő \"libperl.so\" helyett)"
|
||||
|
||||
msgid ""
|
||||
"timeout (in seconds) for client authentication: connection is closed if the "
|
||||
"client is still not authenticated after this delay and the client status is "
|
||||
@ -10399,13 +10372,6 @@ msgid ""
|
||||
"disable compression, 1 = low compression ... 9 = best compression)"
|
||||
msgstr ""
|
||||
|
||||
msgid ""
|
||||
"number of iterations asked to the client in weechat protocol when a hashed "
|
||||
"password with algorithm PBKDF2 is used for authentication; more iterations "
|
||||
"is better in term of security but is slower to compute; this number should "
|
||||
"not be too high if your CPU is slow"
|
||||
msgstr ""
|
||||
|
||||
msgid ""
|
||||
"listen on IPv6 socket by default (in addition to IPv4 which is default); "
|
||||
"protocols IPv4 and IPv6 can be forced (individually or together) in the "
|
||||
@ -10429,6 +10395,26 @@ msgid ""
|
||||
"content is evaluated, see /help eval)"
|
||||
msgstr ""
|
||||
|
||||
#, fuzzy
|
||||
msgid ""
|
||||
"comma separated list of hash algorithms used for password authentication in "
|
||||
"weechat protocol, among these values: \"plain\" (password in plain text, not "
|
||||
"hashed), \"sha256\", \"sha512\", \"pbkdf2+sha256\", \"pbkdf2+sha512\"), \"*"
|
||||
"\" means all algorithms, a name beginning with \"!\" is a negative value to "
|
||||
"prevent an algorithm from being used, wildcard \"*\" is allowed in names "
|
||||
"(examples: \"*\", \"pbkdf2*\", \"*,!plain\")"
|
||||
msgstr ""
|
||||
"automatikusan betöltendő modulok vesszővel elválasztott listája, \"*\" "
|
||||
"esetén az összes fellelt modul (az elnevezés lehet részleges, például a "
|
||||
"\"perl\" elegendő \"libperl.so\" helyett)"
|
||||
|
||||
msgid ""
|
||||
"number of iterations asked to the client in weechat protocol when a hashed "
|
||||
"password with algorithm PBKDF2 is used for authentication; more iterations "
|
||||
"is better in term of security but is slower to compute; this number should "
|
||||
"not be too high if your CPU is slow"
|
||||
msgstr ""
|
||||
|
||||
msgid ""
|
||||
"file with SSL certificate and private key (for serving clients with SSL)"
|
||||
msgstr ""
|
||||
|
||||
62
po/it.po
62
po/it.po
@ -20,8 +20,8 @@ msgid ""
|
||||
msgstr ""
|
||||
"Project-Id-Version: WeeChat\n"
|
||||
"Report-Msgid-Bugs-To: flashcode@flashtux.org\n"
|
||||
"POT-Creation-Date: 2020-04-14 21:29+0200\n"
|
||||
"PO-Revision-Date: 2020-03-08 14:22+0100\n"
|
||||
"POT-Creation-Date: 2020-04-18 11:30+0200\n"
|
||||
"PO-Revision-Date: 2020-04-18 11:34+0200\n"
|
||||
"Last-Translator: Esteban I. Ruiz Moreno <exio4.com@gmail.com>\n"
|
||||
"Language-Team: weechat-dev <weechat-dev@nongnu.org>\n"
|
||||
"Language: it\n"
|
||||
@ -10215,14 +10215,6 @@ msgstr ""
|
||||
msgid "%s%s: nicks not defined for server \"%s\", cannot connect"
|
||||
msgstr "%s%s: nick non definiti per il server\"%s\", impossibile connettersi"
|
||||
|
||||
#, c-format
|
||||
msgid ""
|
||||
"%s%s: cannot connect with SSL because WeeChat was not built with GnuTLS "
|
||||
"support"
|
||||
msgstr ""
|
||||
"%s%s: impossibile connettersi via SSL poiché WeeChat non è stato compilato "
|
||||
"con il supporto a GnuTLS"
|
||||
|
||||
#, c-format
|
||||
msgid "%s%s: connecting to server %s/%d%s via %s proxy %s/%d%s..."
|
||||
msgstr "%s%s: connessione al server %s/%d%s tramite proxy %s %s/%d%s..."
|
||||
@ -11485,12 +11477,6 @@ msgstr ""
|
||||
msgid "%s%s: error: path \"%s\" is already used"
|
||||
msgstr "%s%s: errore: la porta \"%d\" è già in uso"
|
||||
|
||||
#, c-format
|
||||
msgid "%s%s: cannot use SSL because WeeChat was not built with GnuTLS support"
|
||||
msgstr ""
|
||||
"%s%s: impossibile usare SSL poiché WeeChat non è stato compilato con il "
|
||||
"supporto a GnuTLS"
|
||||
|
||||
#, c-format
|
||||
msgid "%s%s: error: unknown protocol \"%s\""
|
||||
msgstr "%s%s: errore: protocollo \"%s\" sconosciuto"
|
||||
@ -11565,21 +11551,6 @@ msgstr ""
|
||||
"ffff:127.0.0.1\",come: \"::ffff:127.0.0.1\"), esempio: \"^((::ffff:)?"
|
||||
"123\\.45\\.67\\.89|192\\.160\\..*)$\""
|
||||
|
||||
#, fuzzy
|
||||
msgid ""
|
||||
"comma separated list of hash algorithms used for password authentication in "
|
||||
"weechat protocol, among these values: \"plain\" (password in plain text, not "
|
||||
"hashed), \"sha256\", \"sha512\", \"pbkdf2+sha256\", \"pbkdf2+sha512\"), \"*"
|
||||
"\" means all algorithms, a name beginning with \"!\" is a negative value to "
|
||||
"prevent an algorithm from being used, wildcard \"*\" is allowed in names "
|
||||
"(examples: \"*\", \"pbkdf2*\", \"*,!plain\")"
|
||||
msgstr ""
|
||||
"elenco separato da virgole di plugin da caricare automaticamente all'avvio, "
|
||||
"\"*\" equivale a tutti i plugin trovati. un nome che comincia con \"!\" è un "
|
||||
"valore negativo per impedire il caricamento di un plugin, i nomi possono "
|
||||
"iniziare o finire con \"*\" per corrispondere a più plugin (esempi: \"*\" "
|
||||
"oppure \"*,!lua,!tcl\")"
|
||||
|
||||
msgid ""
|
||||
"timeout (in seconds) for client authentication: connection is closed if the "
|
||||
"client is still not authenticated after this delay and the client status is "
|
||||
@ -11607,13 +11578,6 @@ msgstr ""
|
||||
"WeeChat (0 = disabilita compressione, 1 = compressione bassa ... 9 = "
|
||||
"compressione migliore)"
|
||||
|
||||
msgid ""
|
||||
"number of iterations asked to the client in weechat protocol when a hashed "
|
||||
"password with algorithm PBKDF2 is used for authentication; more iterations "
|
||||
"is better in term of security but is slower to compute; this number should "
|
||||
"not be too high if your CPU is slow"
|
||||
msgstr ""
|
||||
|
||||
msgid ""
|
||||
"listen on IPv6 socket by default (in addition to IPv4 which is default); "
|
||||
"protocols IPv4 and IPv6 can be forced (individually or together) in the "
|
||||
@ -11640,6 +11604,28 @@ msgstr ""
|
||||
"corrisponde a nessuna password richiesta) (nota: il contenuto viene "
|
||||
"valutato, consultare /help eval)"
|
||||
|
||||
#, fuzzy
|
||||
msgid ""
|
||||
"comma separated list of hash algorithms used for password authentication in "
|
||||
"weechat protocol, among these values: \"plain\" (password in plain text, not "
|
||||
"hashed), \"sha256\", \"sha512\", \"pbkdf2+sha256\", \"pbkdf2+sha512\"), \"*"
|
||||
"\" means all algorithms, a name beginning with \"!\" is a negative value to "
|
||||
"prevent an algorithm from being used, wildcard \"*\" is allowed in names "
|
||||
"(examples: \"*\", \"pbkdf2*\", \"*,!plain\")"
|
||||
msgstr ""
|
||||
"elenco separato da virgole di plugin da caricare automaticamente all'avvio, "
|
||||
"\"*\" equivale a tutti i plugin trovati. un nome che comincia con \"!\" è un "
|
||||
"valore negativo per impedire il caricamento di un plugin, i nomi possono "
|
||||
"iniziare o finire con \"*\" per corrispondere a più plugin (esempi: \"*\" "
|
||||
"oppure \"*,!lua,!tcl\")"
|
||||
|
||||
msgid ""
|
||||
"number of iterations asked to the client in weechat protocol when a hashed "
|
||||
"password with algorithm PBKDF2 is used for authentication; more iterations "
|
||||
"is better in term of security but is slower to compute; this number should "
|
||||
"not be too high if your CPU is slow"
|
||||
msgstr ""
|
||||
|
||||
msgid ""
|
||||
"file with SSL certificate and private key (for serving clients with SSL)"
|
||||
msgstr ""
|
||||
|
||||
58
po/ja.po
58
po/ja.po
@ -20,8 +20,8 @@ msgid ""
|
||||
msgstr ""
|
||||
"Project-Id-Version: WeeChat\n"
|
||||
"Report-Msgid-Bugs-To: flashcode@flashtux.org\n"
|
||||
"POT-Creation-Date: 2020-04-14 21:29+0200\n"
|
||||
"PO-Revision-Date: 2020-03-08 14:22+0100\n"
|
||||
"POT-Creation-Date: 2020-04-18 11:30+0200\n"
|
||||
"PO-Revision-Date: 2020-04-18 11:34+0200\n"
|
||||
"Last-Translator: AYANOKOUZI, Ryuunosuke <i38w7i3@yahoo.co.jp>\n"
|
||||
"Language-Team: Japanese <https://github.com/l/weechat/tree/master/"
|
||||
"translation/ja_JP>\n"
|
||||
@ -10853,14 +10853,6 @@ msgstr ""
|
||||
msgid "%s%s: nicks not defined for server \"%s\", cannot connect"
|
||||
msgstr "%s%s: サーバ \"%s\" のニックネームが設定されていません、接続できません"
|
||||
|
||||
#, c-format
|
||||
msgid ""
|
||||
"%s%s: cannot connect with SSL because WeeChat was not built with GnuTLS "
|
||||
"support"
|
||||
msgstr ""
|
||||
"%s%s: WeeChat は GnuTLS をサポートしてビルドされていないため、SSL で接続でき"
|
||||
"ません"
|
||||
|
||||
#, c-format
|
||||
msgid "%s%s: connecting to server %s/%d%s via %s proxy %s/%d%s..."
|
||||
msgstr "%s%s: サーバ %s/%d%s に %s プロキシ %s/%d%s で接続中..."
|
||||
@ -12121,12 +12113,6 @@ msgstr "%s%s: エラー: パス \"%s\" が長すぎます (長さ: %d; 最大: %
|
||||
msgid "%s%s: error: path \"%s\" is already used"
|
||||
msgstr "%s%s: エラー: パス \"%s\" は既に使われています"
|
||||
|
||||
#, c-format
|
||||
msgid "%s%s: cannot use SSL because WeeChat was not built with GnuTLS support"
|
||||
msgstr ""
|
||||
"%s%s: WeeChat は GnuTLS をサポートしてビルドされていないため、SSL は使えませ"
|
||||
"ん"
|
||||
|
||||
#, c-format
|
||||
msgid "%s%s: error: unknown protocol \"%s\""
|
||||
msgstr "%s%s: エラー: 不明なプロトコル \"%s\""
|
||||
@ -12196,19 +12182,6 @@ msgstr ""
|
||||
"し、最初に \"(?-i)\" をつければ区別有り)、例: \"^(123\\.45\\.67\\.89|"
|
||||
"192\\.160\\..*)$\""
|
||||
|
||||
#, fuzzy
|
||||
msgid ""
|
||||
"comma separated list of hash algorithms used for password authentication in "
|
||||
"weechat protocol, among these values: \"plain\" (password in plain text, not "
|
||||
"hashed), \"sha256\", \"sha512\", \"pbkdf2+sha256\", \"pbkdf2+sha512\"), \"*"
|
||||
"\" means all algorithms, a name beginning with \"!\" is a negative value to "
|
||||
"prevent an algorithm from being used, wildcard \"*\" is allowed in names "
|
||||
"(examples: \"*\", \"pbkdf2*\", \"*,!plain\")"
|
||||
msgstr ""
|
||||
"スタートアップ時にロードするプラグインのコンマ区切りリスト、\"*\" は見つかっ"
|
||||
"た全てのプラグイン、\"!\" から始まる名前はロードしないプラグイン、名前にワイ"
|
||||
"ルドカード \"*\" を使うことができます (例: \"*\" または \"*,!lua,!tcl\")"
|
||||
|
||||
msgid ""
|
||||
"timeout (in seconds) for client authentication: connection is closed if the "
|
||||
"client is still not authenticated after this delay and the client status is "
|
||||
@ -12236,13 +12209,6 @@ msgstr ""
|
||||
"WeeChat プロトコルでクライアントに送信するパケットの圧縮レベル (0 = 圧縮しな"
|
||||
"い、1 = 低圧縮 ... 9 = 高圧縮)"
|
||||
|
||||
msgid ""
|
||||
"number of iterations asked to the client in weechat protocol when a hashed "
|
||||
"password with algorithm PBKDF2 is used for authentication; more iterations "
|
||||
"is better in term of security but is slower to compute; this number should "
|
||||
"not be too high if your CPU is slow"
|
||||
msgstr ""
|
||||
|
||||
msgid ""
|
||||
"listen on IPv6 socket by default (in addition to IPv4 which is default); "
|
||||
"protocols IPv4 and IPv6 can be forced (individually or together) in the "
|
||||
@ -12270,6 +12236,26 @@ msgstr ""
|
||||
"なし、オプション relay.network.allow_empty_password を参照してください) (注"
|
||||
"意: 値は評価されます、/help eval を参照してください)"
|
||||
|
||||
#, fuzzy
|
||||
msgid ""
|
||||
"comma separated list of hash algorithms used for password authentication in "
|
||||
"weechat protocol, among these values: \"plain\" (password in plain text, not "
|
||||
"hashed), \"sha256\", \"sha512\", \"pbkdf2+sha256\", \"pbkdf2+sha512\"), \"*"
|
||||
"\" means all algorithms, a name beginning with \"!\" is a negative value to "
|
||||
"prevent an algorithm from being used, wildcard \"*\" is allowed in names "
|
||||
"(examples: \"*\", \"pbkdf2*\", \"*,!plain\")"
|
||||
msgstr ""
|
||||
"スタートアップ時にロードするプラグインのコンマ区切りリスト、\"*\" は見つかっ"
|
||||
"た全てのプラグイン、\"!\" から始まる名前はロードしないプラグイン、名前にワイ"
|
||||
"ルドカード \"*\" を使うことができます (例: \"*\" または \"*,!lua,!tcl\")"
|
||||
|
||||
msgid ""
|
||||
"number of iterations asked to the client in weechat protocol when a hashed "
|
||||
"password with algorithm PBKDF2 is used for authentication; more iterations "
|
||||
"is better in term of security but is slower to compute; this number should "
|
||||
"not be too high if your CPU is slow"
|
||||
msgstr ""
|
||||
|
||||
msgid ""
|
||||
"file with SSL certificate and private key (for serving clients with SSL)"
|
||||
msgstr "SSL 証明書と秘密鍵のファイル (SSL 接続を利用するクライアント用)"
|
||||
|
||||
60
po/pl.po
60
po/pl.po
@ -22,8 +22,8 @@ msgid ""
|
||||
msgstr ""
|
||||
"Project-Id-Version: WeeChat\n"
|
||||
"Report-Msgid-Bugs-To: flashcode@flashtux.org\n"
|
||||
"POT-Creation-Date: 2020-04-14 21:29+0200\n"
|
||||
"PO-Revision-Date: 2020-04-05 13:44+0200\n"
|
||||
"POT-Creation-Date: 2020-04-18 11:30+0200\n"
|
||||
"PO-Revision-Date: 2020-04-18 11:34+0200\n"
|
||||
"Last-Translator: Krzysztof Korościk <soltys@soltys.info>\n"
|
||||
"Language-Team: Polish <kde-i18n-doc@kde.org>\n"
|
||||
"Language: pl\n"
|
||||
@ -11052,14 +11052,6 @@ msgstr "%s%s: brakujące ustawienie proxy, sprawdź opcje proxy \"%s\""
|
||||
msgid "%s%s: nicks not defined for server \"%s\", cannot connect"
|
||||
msgstr "%s%s: nie zdefiniowano nicków dla serwera \"%s\", nie można połączyć"
|
||||
|
||||
#, c-format
|
||||
msgid ""
|
||||
"%s%s: cannot connect with SSL because WeeChat was not built with GnuTLS "
|
||||
"support"
|
||||
msgstr ""
|
||||
"%s%s: nie można połączyć używając SSL, ponieważ WeeChat został skompilowany "
|
||||
"bez wsparcia dla GnuTLS"
|
||||
|
||||
#, c-format
|
||||
msgid "%s%s: connecting to server %s/%d%s via %s proxy %s/%d%s..."
|
||||
msgstr "%s%s: łączę się z serwerem %s/%d%s przez %s proxy %s/%d%s..."
|
||||
@ -12338,12 +12330,6 @@ msgstr "%s%s: błąd: ścieżka \"%s\" jest za długa (długość: %d; max: %d)"
|
||||
msgid "%s%s: error: path \"%s\" is already used"
|
||||
msgstr "%s%s: błąd: ścieżka \"%s\" jest już w użyciu"
|
||||
|
||||
#, c-format
|
||||
msgid "%s%s: cannot use SSL because WeeChat was not built with GnuTLS support"
|
||||
msgstr ""
|
||||
"%s%s: nie można połączyć używając SSL, ponieważ WeeChat został skompilowany "
|
||||
"bez wsparcia dla GnuTLS"
|
||||
|
||||
#, c-format
|
||||
msgid "%s%s: error: unknown protocol \"%s\""
|
||||
msgstr "%s%s: błąd: nieznany protokół \"%s\""
|
||||
@ -12414,20 +12400,6 @@ msgstr ""
|
||||
"początku sprawi, że wielość znaków będzie miała znaczenie), przykład: "
|
||||
"\"^(123\\.45\\.67\\.89|192\\.160\\..*)$\""
|
||||
|
||||
#, fuzzy
|
||||
msgid ""
|
||||
"comma separated list of hash algorithms used for password authentication in "
|
||||
"weechat protocol, among these values: \"plain\" (password in plain text, not "
|
||||
"hashed), \"sha256\", \"sha512\", \"pbkdf2+sha256\", \"pbkdf2+sha512\"), \"*"
|
||||
"\" means all algorithms, a name beginning with \"!\" is a negative value to "
|
||||
"prevent an algorithm from being used, wildcard \"*\" is allowed in names "
|
||||
"(examples: \"*\", \"pbkdf2*\", \"*,!plain\")"
|
||||
msgstr ""
|
||||
"oddzielona przecinkami lista wtyczek do automatycznego załadowania podczas "
|
||||
"startu, \"*\" oznacza wszystkie znalezione wtyczki, nazwa zaczynająca się od "
|
||||
"\"!\" powoduje nie ładowanie tej wtyczki, wildcard \"*\" jest dozwolony w "
|
||||
"nazwach (przykłady: \"*\" lub \"*,!lua,!tcl\")"
|
||||
|
||||
msgid ""
|
||||
"timeout (in seconds) for client authentication: connection is closed if the "
|
||||
"client is still not authenticated after this delay and the client status is "
|
||||
@ -12456,13 +12428,6 @@ msgstr ""
|
||||
"stopień kompresji pakietów wysyłanych do klienta za pomocą protokołu WeeChat "
|
||||
"(0 = kompresja wyłączona, 1 = niska kompresja ... 9 = najwyższa kompresja)"
|
||||
|
||||
msgid ""
|
||||
"number of iterations asked to the client in weechat protocol when a hashed "
|
||||
"password with algorithm PBKDF2 is used for authentication; more iterations "
|
||||
"is better in term of security but is slower to compute; this number should "
|
||||
"not be too high if your CPU is slow"
|
||||
msgstr ""
|
||||
|
||||
msgid ""
|
||||
"listen on IPv6 socket by default (in addition to IPv4 which is default); "
|
||||
"protocols IPv4 and IPv6 can be forced (individually or together) in the "
|
||||
@ -12490,6 +12455,27 @@ msgstr ""
|
||||
"oznacza brak hasła, zobacz opcję relay.network.allow_empty_password) (uwaga: "
|
||||
"zawartość jest przetwarzana, zobacz /help eval)"
|
||||
|
||||
#, fuzzy
|
||||
msgid ""
|
||||
"comma separated list of hash algorithms used for password authentication in "
|
||||
"weechat protocol, among these values: \"plain\" (password in plain text, not "
|
||||
"hashed), \"sha256\", \"sha512\", \"pbkdf2+sha256\", \"pbkdf2+sha512\"), \"*"
|
||||
"\" means all algorithms, a name beginning with \"!\" is a negative value to "
|
||||
"prevent an algorithm from being used, wildcard \"*\" is allowed in names "
|
||||
"(examples: \"*\", \"pbkdf2*\", \"*,!plain\")"
|
||||
msgstr ""
|
||||
"oddzielona przecinkami lista wtyczek do automatycznego załadowania podczas "
|
||||
"startu, \"*\" oznacza wszystkie znalezione wtyczki, nazwa zaczynająca się od "
|
||||
"\"!\" powoduje nie ładowanie tej wtyczki, wildcard \"*\" jest dozwolony w "
|
||||
"nazwach (przykłady: \"*\" lub \"*,!lua,!tcl\")"
|
||||
|
||||
msgid ""
|
||||
"number of iterations asked to the client in weechat protocol when a hashed "
|
||||
"password with algorithm PBKDF2 is used for authentication; more iterations "
|
||||
"is better in term of security but is slower to compute; this number should "
|
||||
"not be too high if your CPU is slow"
|
||||
msgstr ""
|
||||
|
||||
msgid ""
|
||||
"file with SSL certificate and private key (for serving clients with SSL)"
|
||||
msgstr ""
|
||||
|
||||
62
po/pt.po
62
po/pt.po
@ -20,8 +20,8 @@ msgid ""
|
||||
msgstr ""
|
||||
"Project-Id-Version: WeeChat\n"
|
||||
"Report-Msgid-Bugs-To: flashcode@flashtux.org\n"
|
||||
"POT-Creation-Date: 2020-04-14 21:29+0200\n"
|
||||
"PO-Revision-Date: 2020-03-08 14:22+0100\n"
|
||||
"POT-Creation-Date: 2020-04-18 11:30+0200\n"
|
||||
"PO-Revision-Date: 2020-04-18 11:34+0200\n"
|
||||
"Last-Translator: Vasco Almeida <vascomalmeida@sapo.pt>\n"
|
||||
"Language-Team: Portuguese <>\n"
|
||||
"Language: pt\n"
|
||||
@ -10683,14 +10683,6 @@ msgid "%s%s: nicks not defined for server \"%s\", cannot connect"
|
||||
msgstr ""
|
||||
"%s%s: não há nicks definidos para o servidor \"%s\", não é possível conectar"
|
||||
|
||||
#, c-format
|
||||
msgid ""
|
||||
"%s%s: cannot connect with SSL because WeeChat was not built with GnuTLS "
|
||||
"support"
|
||||
msgstr ""
|
||||
"%s%s: não é possível conectar com SSL porque o WeeChat foi compilado sem "
|
||||
"suporte GnuTLS"
|
||||
|
||||
#, c-format
|
||||
msgid "%s%s: connecting to server %s/%d%s via %s proxy %s/%d%s..."
|
||||
msgstr "%s%s: a conectar ao servidor %s/%d%s pelo proxy %s %s/%d%s..."
|
||||
@ -11933,12 +11925,6 @@ msgstr ""
|
||||
msgid "%s%s: error: path \"%s\" is already used"
|
||||
msgstr "%s%s: erro: a porta \"%d\" já está a ser usada"
|
||||
|
||||
#, c-format
|
||||
msgid "%s%s: cannot use SSL because WeeChat was not built with GnuTLS support"
|
||||
msgstr ""
|
||||
"%s%s: não é possível usar SSL porque o WeeChat não foi compilado com suporte "
|
||||
"GnuTLS"
|
||||
|
||||
#, c-format
|
||||
msgid "%s%s: error: unknown protocol \"%s\""
|
||||
msgstr "%s%s: erro: protocolo desconhecido \"%s\""
|
||||
@ -12012,21 +11998,6 @@ msgstr ""
|
||||
"(não destinge maiúscula e minúscula, use \"(?-i)\" no início para "
|
||||
"distinguir), exemplo: \"^(123\\.45\\.67\\.89|192\\.160\\..*)$\""
|
||||
|
||||
#, fuzzy
|
||||
msgid ""
|
||||
"comma separated list of hash algorithms used for password authentication in "
|
||||
"weechat protocol, among these values: \"plain\" (password in plain text, not "
|
||||
"hashed), \"sha256\", \"sha512\", \"pbkdf2+sha256\", \"pbkdf2+sha512\"), \"*"
|
||||
"\" means all algorithms, a name beginning with \"!\" is a negative value to "
|
||||
"prevent an algorithm from being used, wildcard \"*\" is allowed in names "
|
||||
"(examples: \"*\", \"pbkdf2*\", \"*,!plain\")"
|
||||
msgstr ""
|
||||
"lista de plugins separados por vírgula para carregar automaticamente ao "
|
||||
"iniciar, \"*\" significa todos os plugins encontrados, um nome começado com "
|
||||
"\"!\" serve de valor negativo para impedir que o plugin seja carregado, pode-"
|
||||
"se usar o caráter universal \"*\" nos nomes (exemplos: \"*\" ou \"*,!lua,!tcl"
|
||||
"\")"
|
||||
|
||||
msgid ""
|
||||
"timeout (in seconds) for client authentication: connection is closed if the "
|
||||
"client is still not authenticated after this delay and the client status is "
|
||||
@ -12055,13 +12026,6 @@ msgstr ""
|
||||
"WeeChat (0 = desativar compressão, 1 = compressão reduzida ... 9 = "
|
||||
"compressão ótima)"
|
||||
|
||||
msgid ""
|
||||
"number of iterations asked to the client in weechat protocol when a hashed "
|
||||
"password with algorithm PBKDF2 is used for authentication; more iterations "
|
||||
"is better in term of security but is slower to compute; this number should "
|
||||
"not be too high if your CPU is slow"
|
||||
msgstr ""
|
||||
|
||||
msgid ""
|
||||
"listen on IPv6 socket by default (in addition to IPv4 which is default); "
|
||||
"protocols IPv4 and IPv6 can be forced (individually or together) in the "
|
||||
@ -12089,6 +12053,28 @@ msgstr ""
|
||||
"valor vazio significa que a palavra-passe não é necessária, ver opção relay."
|
||||
"network.allow_empty_password) (nota: o conteúdo é avaliado, ver /help eval)"
|
||||
|
||||
#, fuzzy
|
||||
msgid ""
|
||||
"comma separated list of hash algorithms used for password authentication in "
|
||||
"weechat protocol, among these values: \"plain\" (password in plain text, not "
|
||||
"hashed), \"sha256\", \"sha512\", \"pbkdf2+sha256\", \"pbkdf2+sha512\"), \"*"
|
||||
"\" means all algorithms, a name beginning with \"!\" is a negative value to "
|
||||
"prevent an algorithm from being used, wildcard \"*\" is allowed in names "
|
||||
"(examples: \"*\", \"pbkdf2*\", \"*,!plain\")"
|
||||
msgstr ""
|
||||
"lista de plugins separados por vírgula para carregar automaticamente ao "
|
||||
"iniciar, \"*\" significa todos os plugins encontrados, um nome começado com "
|
||||
"\"!\" serve de valor negativo para impedir que o plugin seja carregado, pode-"
|
||||
"se usar o caráter universal \"*\" nos nomes (exemplos: \"*\" ou \"*,!lua,!tcl"
|
||||
"\")"
|
||||
|
||||
msgid ""
|
||||
"number of iterations asked to the client in weechat protocol when a hashed "
|
||||
"password with algorithm PBKDF2 is used for authentication; more iterations "
|
||||
"is better in term of security but is slower to compute; this number should "
|
||||
"not be too high if your CPU is slow"
|
||||
msgstr ""
|
||||
|
||||
msgid ""
|
||||
"file with SSL certificate and private key (for serving clients with SSL)"
|
||||
msgstr ""
|
||||
|
||||
62
po/pt_BR.po
62
po/pt_BR.po
@ -21,8 +21,8 @@ msgid ""
|
||||
msgstr ""
|
||||
"Project-Id-Version: WeeChat\n"
|
||||
"Report-Msgid-Bugs-To: flashcode@flashtux.org\n"
|
||||
"POT-Creation-Date: 2020-04-14 21:29+0200\n"
|
||||
"PO-Revision-Date: 2019-11-03 08:38+0100\n"
|
||||
"POT-Creation-Date: 2020-04-18 11:30+0200\n"
|
||||
"PO-Revision-Date: 2020-04-18 11:34+0200\n"
|
||||
"Last-Translator: Eduardo Elias <camponez@gmail.com>\n"
|
||||
"Language-Team: weechat-dev <weechat-dev@nongnu.org>\n"
|
||||
"Language: pt_BR\n"
|
||||
@ -9545,14 +9545,6 @@ msgstr ""
|
||||
"%s%s: apelidos não definidos para o servidor \"%s\", não foi possível "
|
||||
"conectar"
|
||||
|
||||
#, c-format
|
||||
msgid ""
|
||||
"%s%s: cannot connect with SSL because WeeChat was not built with GnuTLS "
|
||||
"support"
|
||||
msgstr ""
|
||||
"%s%s: não foi possível conectar com SSL porque o WeeChat não foi compilado "
|
||||
"com suporte a GnuTLS"
|
||||
|
||||
#, fuzzy, c-format
|
||||
msgid "%s%s: connecting to server %s/%d%s via %s proxy %s/%d%s..."
|
||||
msgstr "%s: conectando ao servidor %s/%d%s%s via %s proxy %s/%d%s..."
|
||||
@ -10735,12 +10727,6 @@ msgstr ""
|
||||
msgid "%s%s: error: path \"%s\" is already used"
|
||||
msgstr "%s%s: erro: porta \"%d\" já está sendo utilizada"
|
||||
|
||||
#, fuzzy, c-format
|
||||
msgid "%s%s: cannot use SSL because WeeChat was not built with GnuTLS support"
|
||||
msgstr ""
|
||||
"%s%s: não foi possível conectar com SSL porque o WeeChat não foi compilado "
|
||||
"com suporte a GnuTLS"
|
||||
|
||||
#, c-format
|
||||
msgid "%s%s: error: unknown protocol \"%s\""
|
||||
msgstr "%s%s: erro: protocolo \"%s\" desconhecido"
|
||||
@ -10814,21 +10800,6 @@ msgstr ""
|
||||
"expressão regular com IPs permitidos a usar o relay, por exemplo: "
|
||||
"\"^(123\\.45\\.67\\.89|192\\.160\\..*)$\""
|
||||
|
||||
#, fuzzy
|
||||
msgid ""
|
||||
"comma separated list of hash algorithms used for password authentication in "
|
||||
"weechat protocol, among these values: \"plain\" (password in plain text, not "
|
||||
"hashed), \"sha256\", \"sha512\", \"pbkdf2+sha256\", \"pbkdf2+sha512\"), \"*"
|
||||
"\" means all algorithms, a name beginning with \"!\" is a negative value to "
|
||||
"prevent an algorithm from being used, wildcard \"*\" is allowed in names "
|
||||
"(examples: \"*\", \"pbkdf2*\", \"*,!plain\")"
|
||||
msgstr ""
|
||||
"lista separada por vírgulas dos plugins para carregar automaticamente "
|
||||
"nainicialização, \"*\" significa todos os plugins encontrados, um nome "
|
||||
"começando com \"!\" é um valor negativo para prevenir um plugin de ser "
|
||||
"carrgado, nomes podem começar ou terminar com \"*\" para casar com vários "
|
||||
"plugins (exemplos: \"*\" ou \"*,!lua,!tcl\")"
|
||||
|
||||
msgid ""
|
||||
"timeout (in seconds) for client authentication: connection is closed if the "
|
||||
"client is still not authenticated after this delay and the client status is "
|
||||
@ -10855,13 +10826,6 @@ msgstr ""
|
||||
"WeeChat (0 = desabilitar compressão, 1 = compressão baixa ... 9 = melhor "
|
||||
"compressão)"
|
||||
|
||||
msgid ""
|
||||
"number of iterations asked to the client in weechat protocol when a hashed "
|
||||
"password with algorithm PBKDF2 is used for authentication; more iterations "
|
||||
"is better in term of security but is slower to compute; this number should "
|
||||
"not be too high if your CPU is slow"
|
||||
msgstr ""
|
||||
|
||||
msgid ""
|
||||
"listen on IPv6 socket by default (in addition to IPv4 which is default); "
|
||||
"protocols IPv4 and IPv6 can be forced (individually or together) in the "
|
||||
@ -10887,6 +10851,28 @@ msgstr ""
|
||||
"senha necessária para clientes acessarem este relay (vazio significa que "
|
||||
"nenhuma senha é necessária)"
|
||||
|
||||
#, fuzzy
|
||||
msgid ""
|
||||
"comma separated list of hash algorithms used for password authentication in "
|
||||
"weechat protocol, among these values: \"plain\" (password in plain text, not "
|
||||
"hashed), \"sha256\", \"sha512\", \"pbkdf2+sha256\", \"pbkdf2+sha512\"), \"*"
|
||||
"\" means all algorithms, a name beginning with \"!\" is a negative value to "
|
||||
"prevent an algorithm from being used, wildcard \"*\" is allowed in names "
|
||||
"(examples: \"*\", \"pbkdf2*\", \"*,!plain\")"
|
||||
msgstr ""
|
||||
"lista separada por vírgulas dos plugins para carregar automaticamente "
|
||||
"nainicialização, \"*\" significa todos os plugins encontrados, um nome "
|
||||
"começando com \"!\" é um valor negativo para prevenir um plugin de ser "
|
||||
"carrgado, nomes podem começar ou terminar com \"*\" para casar com vários "
|
||||
"plugins (exemplos: \"*\" ou \"*,!lua,!tcl\")"
|
||||
|
||||
msgid ""
|
||||
"number of iterations asked to the client in weechat protocol when a hashed "
|
||||
"password with algorithm PBKDF2 is used for authentication; more iterations "
|
||||
"is better in term of security but is slower to compute; this number should "
|
||||
"not be too high if your CPU is slow"
|
||||
msgstr ""
|
||||
|
||||
msgid ""
|
||||
"file with SSL certificate and private key (for serving clients with SSL)"
|
||||
msgstr ""
|
||||
|
||||
58
po/ru.po
58
po/ru.po
@ -21,8 +21,8 @@ msgid ""
|
||||
msgstr ""
|
||||
"Project-Id-Version: WeeChat\n"
|
||||
"Report-Msgid-Bugs-To: flashcode@flashtux.org\n"
|
||||
"POT-Creation-Date: 2020-04-14 21:29+0200\n"
|
||||
"PO-Revision-Date: 2020-03-08 14:22+0100\n"
|
||||
"POT-Creation-Date: 2020-04-18 11:30+0200\n"
|
||||
"PO-Revision-Date: 2020-04-18 11:34+0200\n"
|
||||
"Last-Translator: Aleksey V Zapparov AKA ixti <ixti@member.fsf.org>\n"
|
||||
"Language-Team: weechat-dev <weechat-dev@nongnu.org>\n"
|
||||
"Language: ru\n"
|
||||
@ -9138,14 +9138,6 @@ msgstr "%s неизвестный параметр для команды \"%s\"\
|
||||
msgid "%s%s: nicks not defined for server \"%s\", cannot connect"
|
||||
msgstr "%s ник \"%s\" не найден для команды \"%s\"\n"
|
||||
|
||||
#, fuzzy, c-format
|
||||
msgid ""
|
||||
"%s%s: cannot connect with SSL because WeeChat was not built with GnuTLS "
|
||||
"support"
|
||||
msgstr ""
|
||||
"%s невозможно соединиться с использованием SSL, так как WeeChat собран без "
|
||||
"поддержки GNUtls\n"
|
||||
|
||||
#, fuzzy, c-format
|
||||
msgid "%s%s: connecting to server %s/%d%s via %s proxy %s/%d%s..."
|
||||
msgstr "%s: подключение к серверу %s:%d%s%s через %s proxy %s:%d%s...\n"
|
||||
@ -10321,12 +10313,6 @@ msgstr ""
|
||||
msgid "%s%s: error: path \"%s\" is already used"
|
||||
msgstr "%s игнорирование уже существует\n"
|
||||
|
||||
#, fuzzy, c-format
|
||||
msgid "%s%s: cannot use SSL because WeeChat was not built with GnuTLS support"
|
||||
msgstr ""
|
||||
"%s невозможно соединиться с использованием SSL, так как WeeChat собран без "
|
||||
"поддержки GNUtls\n"
|
||||
|
||||
#, fuzzy, c-format
|
||||
msgid "%s%s: error: unknown protocol \"%s\""
|
||||
msgstr "%s неизвестная функция клавиши \"%s\"\n"
|
||||
@ -10401,19 +10387,6 @@ msgid ""
|
||||
"\"^(123\\.45\\.67\\.89|192\\.160\\..*)$\""
|
||||
msgstr ""
|
||||
|
||||
#, fuzzy
|
||||
msgid ""
|
||||
"comma separated list of hash algorithms used for password authentication in "
|
||||
"weechat protocol, among these values: \"plain\" (password in plain text, not "
|
||||
"hashed), \"sha256\", \"sha512\", \"pbkdf2+sha256\", \"pbkdf2+sha512\"), \"*"
|
||||
"\" means all algorithms, a name beginning with \"!\" is a negative value to "
|
||||
"prevent an algorithm from being used, wildcard \"*\" is allowed in names "
|
||||
"(examples: \"*\", \"pbkdf2*\", \"*,!plain\")"
|
||||
msgstr ""
|
||||
"разделённый запятыми список автоматически загружаемых при запуске plug-"
|
||||
"in'ов , \"*\" означает все найденные plug-in'ы (имена могут быть не полными, "
|
||||
"например \"perl\" успешно загрузит \"libperl.so\")"
|
||||
|
||||
msgid ""
|
||||
"timeout (in seconds) for client authentication: connection is closed if the "
|
||||
"client is still not authenticated after this delay and the client status is "
|
||||
@ -10435,13 +10408,6 @@ msgid ""
|
||||
"disable compression, 1 = low compression ... 9 = best compression)"
|
||||
msgstr ""
|
||||
|
||||
msgid ""
|
||||
"number of iterations asked to the client in weechat protocol when a hashed "
|
||||
"password with algorithm PBKDF2 is used for authentication; more iterations "
|
||||
"is better in term of security but is slower to compute; this number should "
|
||||
"not be too high if your CPU is slow"
|
||||
msgstr ""
|
||||
|
||||
msgid ""
|
||||
"listen on IPv6 socket by default (in addition to IPv4 which is default); "
|
||||
"protocols IPv4 and IPv6 can be forced (individually or together) in the "
|
||||
@ -10464,6 +10430,26 @@ msgid ""
|
||||
"content is evaluated, see /help eval)"
|
||||
msgstr ""
|
||||
|
||||
#, fuzzy
|
||||
msgid ""
|
||||
"comma separated list of hash algorithms used for password authentication in "
|
||||
"weechat protocol, among these values: \"plain\" (password in plain text, not "
|
||||
"hashed), \"sha256\", \"sha512\", \"pbkdf2+sha256\", \"pbkdf2+sha512\"), \"*"
|
||||
"\" means all algorithms, a name beginning with \"!\" is a negative value to "
|
||||
"prevent an algorithm from being used, wildcard \"*\" is allowed in names "
|
||||
"(examples: \"*\", \"pbkdf2*\", \"*,!plain\")"
|
||||
msgstr ""
|
||||
"разделённый запятыми список автоматически загружаемых при запуске plug-"
|
||||
"in'ов , \"*\" означает все найденные plug-in'ы (имена могут быть не полными, "
|
||||
"например \"perl\" успешно загрузит \"libperl.so\")"
|
||||
|
||||
msgid ""
|
||||
"number of iterations asked to the client in weechat protocol when a hashed "
|
||||
"password with algorithm PBKDF2 is used for authentication; more iterations "
|
||||
"is better in term of security but is slower to compute; this number should "
|
||||
"not be too high if your CPU is slow"
|
||||
msgstr ""
|
||||
|
||||
msgid ""
|
||||
"file with SSL certificate and private key (for serving clients with SSL)"
|
||||
msgstr ""
|
||||
|
||||
44
po/tr.po
44
po/tr.po
@ -20,7 +20,7 @@ msgid ""
|
||||
msgstr ""
|
||||
"Project-Id-Version: WeeChat\n"
|
||||
"Report-Msgid-Bugs-To: flashcode@flashtux.org\n"
|
||||
"POT-Creation-Date: 2020-04-14 21:29+0200\n"
|
||||
"POT-Creation-Date: 2020-04-18 11:30+0200\n"
|
||||
"PO-Revision-Date: 2019-11-03 08:38+0100\n"
|
||||
"Last-Translator: Hasan Kiran <sunder67@hotmail.com>\n"
|
||||
"Language-Team: weechat-dev <weechat-dev@nongnu.org>\n"
|
||||
@ -8307,12 +8307,6 @@ msgstr ""
|
||||
msgid "%s%s: nicks not defined for server \"%s\", cannot connect"
|
||||
msgstr ""
|
||||
|
||||
#, c-format
|
||||
msgid ""
|
||||
"%s%s: cannot connect with SSL because WeeChat was not built with GnuTLS "
|
||||
"support"
|
||||
msgstr ""
|
||||
|
||||
#, c-format
|
||||
msgid "%s%s: connecting to server %s/%d%s via %s proxy %s/%d%s..."
|
||||
msgstr ""
|
||||
@ -9388,10 +9382,6 @@ msgstr ""
|
||||
msgid "%s%s: error: path \"%s\" is already used"
|
||||
msgstr "Filtre \"%s\" etkin"
|
||||
|
||||
#, c-format
|
||||
msgid "%s%s: cannot use SSL because WeeChat was not built with GnuTLS support"
|
||||
msgstr ""
|
||||
|
||||
#, c-format
|
||||
msgid "%s%s: error: unknown protocol \"%s\""
|
||||
msgstr ""
|
||||
@ -9453,15 +9443,6 @@ msgid ""
|
||||
"\"^(123\\.45\\.67\\.89|192\\.160\\..*)$\""
|
||||
msgstr ""
|
||||
|
||||
msgid ""
|
||||
"comma separated list of hash algorithms used for password authentication in "
|
||||
"weechat protocol, among these values: \"plain\" (password in plain text, not "
|
||||
"hashed), \"sha256\", \"sha512\", \"pbkdf2+sha256\", \"pbkdf2+sha512\"), \"*"
|
||||
"\" means all algorithms, a name beginning with \"!\" is a negative value to "
|
||||
"prevent an algorithm from being used, wildcard \"*\" is allowed in names "
|
||||
"(examples: \"*\", \"pbkdf2*\", \"*,!plain\")"
|
||||
msgstr ""
|
||||
|
||||
msgid ""
|
||||
"timeout (in seconds) for client authentication: connection is closed if the "
|
||||
"client is still not authenticated after this delay and the client status is "
|
||||
@ -9483,13 +9464,6 @@ msgid ""
|
||||
"disable compression, 1 = low compression ... 9 = best compression)"
|
||||
msgstr ""
|
||||
|
||||
msgid ""
|
||||
"number of iterations asked to the client in weechat protocol when a hashed "
|
||||
"password with algorithm PBKDF2 is used for authentication; more iterations "
|
||||
"is better in term of security but is slower to compute; this number should "
|
||||
"not be too high if your CPU is slow"
|
||||
msgstr ""
|
||||
|
||||
msgid ""
|
||||
"listen on IPv6 socket by default (in addition to IPv4 which is default); "
|
||||
"protocols IPv4 and IPv6 can be forced (individually or together) in the "
|
||||
@ -9511,6 +9485,22 @@ msgid ""
|
||||
"content is evaluated, see /help eval)"
|
||||
msgstr ""
|
||||
|
||||
msgid ""
|
||||
"comma separated list of hash algorithms used for password authentication in "
|
||||
"weechat protocol, among these values: \"plain\" (password in plain text, not "
|
||||
"hashed), \"sha256\", \"sha512\", \"pbkdf2+sha256\", \"pbkdf2+sha512\"), \"*"
|
||||
"\" means all algorithms, a name beginning with \"!\" is a negative value to "
|
||||
"prevent an algorithm from being used, wildcard \"*\" is allowed in names "
|
||||
"(examples: \"*\", \"pbkdf2*\", \"*,!plain\")"
|
||||
msgstr ""
|
||||
|
||||
msgid ""
|
||||
"number of iterations asked to the client in weechat protocol when a hashed "
|
||||
"password with algorithm PBKDF2 is used for authentication; more iterations "
|
||||
"is better in term of security but is slower to compute; this number should "
|
||||
"not be too high if your CPU is slow"
|
||||
msgstr ""
|
||||
|
||||
msgid ""
|
||||
"file with SSL certificate and private key (for serving clients with SSL)"
|
||||
msgstr ""
|
||||
|
||||
@ -21,7 +21,7 @@ msgid ""
|
||||
msgstr ""
|
||||
"Project-Id-Version: WeeChat\n"
|
||||
"Report-Msgid-Bugs-To: flashcode@flashtux.org\n"
|
||||
"POT-Creation-Date: 2020-04-14 21:29+0200\n"
|
||||
"POT-Creation-Date: 2020-04-18 11:30+0200\n"
|
||||
"PO-Revision-Date: 2014-08-16 10:27+0200\n"
|
||||
"Last-Translator: Sébastien Helleu <flashcode@flashtux.org>\n"
|
||||
"Language-Team: weechat-dev <weechat-dev@nongnu.org>\n"
|
||||
@ -8170,12 +8170,6 @@ msgstr ""
|
||||
msgid "%s%s: nicks not defined for server \"%s\", cannot connect"
|
||||
msgstr ""
|
||||
|
||||
#, c-format
|
||||
msgid ""
|
||||
"%s%s: cannot connect with SSL because WeeChat was not built with GnuTLS "
|
||||
"support"
|
||||
msgstr ""
|
||||
|
||||
#, c-format
|
||||
msgid "%s%s: connecting to server %s/%d%s via %s proxy %s/%d%s..."
|
||||
msgstr ""
|
||||
@ -9249,10 +9243,6 @@ msgstr ""
|
||||
msgid "%s%s: error: path \"%s\" is already used"
|
||||
msgstr ""
|
||||
|
||||
#, c-format
|
||||
msgid "%s%s: cannot use SSL because WeeChat was not built with GnuTLS support"
|
||||
msgstr ""
|
||||
|
||||
#, c-format
|
||||
msgid "%s%s: error: unknown protocol \"%s\""
|
||||
msgstr ""
|
||||
@ -9314,15 +9304,6 @@ msgid ""
|
||||
"\"^(123\\.45\\.67\\.89|192\\.160\\..*)$\""
|
||||
msgstr ""
|
||||
|
||||
msgid ""
|
||||
"comma separated list of hash algorithms used for password authentication in "
|
||||
"weechat protocol, among these values: \"plain\" (password in plain text, not "
|
||||
"hashed), \"sha256\", \"sha512\", \"pbkdf2+sha256\", \"pbkdf2+sha512\"), \"*"
|
||||
"\" means all algorithms, a name beginning with \"!\" is a negative value to "
|
||||
"prevent an algorithm from being used, wildcard \"*\" is allowed in names "
|
||||
"(examples: \"*\", \"pbkdf2*\", \"*,!plain\")"
|
||||
msgstr ""
|
||||
|
||||
msgid ""
|
||||
"timeout (in seconds) for client authentication: connection is closed if the "
|
||||
"client is still not authenticated after this delay and the client status is "
|
||||
@ -9344,13 +9325,6 @@ msgid ""
|
||||
"disable compression, 1 = low compression ... 9 = best compression)"
|
||||
msgstr ""
|
||||
|
||||
msgid ""
|
||||
"number of iterations asked to the client in weechat protocol when a hashed "
|
||||
"password with algorithm PBKDF2 is used for authentication; more iterations "
|
||||
"is better in term of security but is slower to compute; this number should "
|
||||
"not be too high if your CPU is slow"
|
||||
msgstr ""
|
||||
|
||||
msgid ""
|
||||
"listen on IPv6 socket by default (in addition to IPv4 which is default); "
|
||||
"protocols IPv4 and IPv6 can be forced (individually or together) in the "
|
||||
@ -9372,6 +9346,22 @@ msgid ""
|
||||
"content is evaluated, see /help eval)"
|
||||
msgstr ""
|
||||
|
||||
msgid ""
|
||||
"comma separated list of hash algorithms used for password authentication in "
|
||||
"weechat protocol, among these values: \"plain\" (password in plain text, not "
|
||||
"hashed), \"sha256\", \"sha512\", \"pbkdf2+sha256\", \"pbkdf2+sha512\"), \"*"
|
||||
"\" means all algorithms, a name beginning with \"!\" is a negative value to "
|
||||
"prevent an algorithm from being used, wildcard \"*\" is allowed in names "
|
||||
"(examples: \"*\", \"pbkdf2*\", \"*,!plain\")"
|
||||
msgstr ""
|
||||
|
||||
msgid ""
|
||||
"number of iterations asked to the client in weechat protocol when a hashed "
|
||||
"password with algorithm PBKDF2 is used for authentication; more iterations "
|
||||
"is better in term of security but is slower to compute; this number should "
|
||||
"not be too high if your CPU is slow"
|
||||
msgstr ""
|
||||
|
||||
msgid ""
|
||||
"file with SSL certificate and private key (for serving clients with SSL)"
|
||||
msgstr ""
|
||||
|
||||
@ -82,9 +82,7 @@ else()
|
||||
check_symbol_exists(backtrace "execinfo.h" HAVE_BACKTRACE)
|
||||
endif()
|
||||
|
||||
if(GNUTLS_FOUND)
|
||||
include_directories(${GNUTLS_INCLUDE_PATH})
|
||||
endif()
|
||||
include_directories(${GNUTLS_INCLUDE_PATH})
|
||||
|
||||
include_directories(${CURL_INCLUDE_DIRS})
|
||||
|
||||
|
||||
@ -57,14 +57,6 @@ hook_connect (struct t_weechat_plugin *plugin, const char *proxy,
|
||||
struct t_hook_connect *new_hook_connect;
|
||||
int i;
|
||||
|
||||
#ifndef HAVE_GNUTLS
|
||||
/* make C compiler happy */
|
||||
(void) gnutls_sess;
|
||||
(void) gnutls_cb;
|
||||
(void) gnutls_dhkey_size;
|
||||
(void) gnutls_priorities;
|
||||
#endif /* HAVE_GNUTLS */
|
||||
|
||||
if (!address || (port <= 0) || !callback)
|
||||
return NULL;
|
||||
|
||||
@ -89,13 +81,11 @@ hook_connect (struct t_weechat_plugin *plugin, const char *proxy,
|
||||
new_hook_connect->sock = -1;
|
||||
new_hook_connect->ipv6 = ipv6;
|
||||
new_hook_connect->retry = retry;
|
||||
#ifdef HAVE_GNUTLS
|
||||
new_hook_connect->gnutls_sess = gnutls_sess;
|
||||
new_hook_connect->gnutls_cb = gnutls_cb;
|
||||
new_hook_connect->gnutls_dhkey_size = gnutls_dhkey_size;
|
||||
new_hook_connect->gnutls_priorities = (gnutls_priorities) ?
|
||||
strdup (gnutls_priorities) : NULL;
|
||||
#endif /* HAVE_GNUTLS */
|
||||
new_hook_connect->local_hostname = (local_hostname) ?
|
||||
strdup (local_hostname) : NULL;
|
||||
new_hook_connect->child_read = -1;
|
||||
@ -129,7 +119,6 @@ hook_connect (struct t_weechat_plugin *plugin, const char *proxy,
|
||||
* Verifies certificates.
|
||||
*/
|
||||
|
||||
#ifdef HAVE_GNUTLS
|
||||
int
|
||||
hook_connect_gnutls_verify_certificates (gnutls_session_t tls_session)
|
||||
{
|
||||
@ -158,13 +147,11 @@ hook_connect_gnutls_verify_certificates (gnutls_session_t tls_session)
|
||||
|
||||
return rc;
|
||||
}
|
||||
#endif /* HAVE_GNUTLS */
|
||||
|
||||
/*
|
||||
* Sets certificates.
|
||||
*/
|
||||
|
||||
#ifdef HAVE_GNUTLS
|
||||
int
|
||||
hook_connect_gnutls_set_certificates (gnutls_session_t tls_session,
|
||||
const gnutls_datum_t *req_ca, int nreq,
|
||||
@ -201,7 +188,6 @@ hook_connect_gnutls_set_certificates (gnutls_session_t tls_session,
|
||||
|
||||
return rc;
|
||||
}
|
||||
#endif /* HAVE_GNUTLS */
|
||||
|
||||
/*
|
||||
* Frees data in a connect hook.
|
||||
@ -225,13 +211,11 @@ hook_connect_free_data (struct t_hook *hook)
|
||||
free (HOOK_CONNECT(hook, address));
|
||||
HOOK_CONNECT(hook, address) = NULL;
|
||||
}
|
||||
#ifdef HAVE_GNUTLS
|
||||
if (HOOK_CONNECT(hook, gnutls_priorities))
|
||||
{
|
||||
free (HOOK_CONNECT(hook, gnutls_priorities));
|
||||
HOOK_CONNECT(hook, gnutls_priorities) = NULL;
|
||||
}
|
||||
#endif /* HAVE_GNUTLS */
|
||||
if (HOOK_CONNECT(hook, local_hostname))
|
||||
{
|
||||
free (HOOK_CONNECT(hook, local_hostname));
|
||||
@ -336,14 +320,12 @@ hook_connect_add_to_infolist (struct t_infolist_item *item,
|
||||
return 0;
|
||||
if (!infolist_new_var_integer (item, "retry", HOOK_CONNECT(hook, retry)))
|
||||
return 0;
|
||||
#ifdef HAVE_GNUTLS
|
||||
if (!infolist_new_var_pointer (item, "gnutls_sess", HOOK_CONNECT(hook, gnutls_sess)))
|
||||
return 0;
|
||||
if (!infolist_new_var_pointer (item, "gnutls_cb", HOOK_CONNECT(hook, gnutls_cb)))
|
||||
return 0;
|
||||
if (!infolist_new_var_integer (item, "gnutls_dhkey_size", HOOK_CONNECT(hook, gnutls_dhkey_size)))
|
||||
return 0;
|
||||
#endif /* HAVE_GNUTLS */
|
||||
if (!infolist_new_var_string (item, "local_hostname", HOOK_CONNECT(hook, local_hostname)))
|
||||
return 0;
|
||||
if (!infolist_new_var_integer (item, "child_read", HOOK_CONNECT(hook, child_read)))
|
||||
@ -392,12 +374,10 @@ hook_connect_print_log (struct t_hook *hook)
|
||||
log_printf (" sock. . . . . . . . . : %d", HOOK_CONNECT(hook, sock));
|
||||
log_printf (" ipv6. . . . . . . . . : %d", HOOK_CONNECT(hook, ipv6));
|
||||
log_printf (" retry . . . . . . . . : %d", HOOK_CONNECT(hook, retry));
|
||||
#ifdef HAVE_GNUTLS
|
||||
log_printf (" gnutls_sess . . . . . : 0x%lx", HOOK_CONNECT(hook, gnutls_sess));
|
||||
log_printf (" gnutls_cb . . . . . . : 0x%lx", HOOK_CONNECT(hook, gnutls_cb));
|
||||
log_printf (" gnutls_dhkey_size . . : %d", HOOK_CONNECT(hook, gnutls_dhkey_size));
|
||||
log_printf (" gnutls_priorities . . : '%s'", HOOK_CONNECT(hook, gnutls_priorities));
|
||||
#endif /* HAVE_GNUTLS */
|
||||
log_printf (" local_hostname. . . . : '%s'", HOOK_CONNECT(hook, local_hostname));
|
||||
log_printf (" child_read. . . . . . : %d", HOOK_CONNECT(hook, child_read));
|
||||
log_printf (" child_write . . . . . : %d", HOOK_CONNECT(hook, child_write));
|
||||
|
||||
@ -21,9 +21,7 @@
|
||||
#ifndef WEECHAT_HOOK_CONNECT_H
|
||||
#define WEECHAT_HOOK_CONNECT_H
|
||||
|
||||
#ifdef HAVE_GNUTLS
|
||||
#include <gnutls/gnutls.h>
|
||||
#endif
|
||||
|
||||
struct t_weechat_plugin;
|
||||
struct t_infolist_item;
|
||||
@ -38,7 +36,6 @@ typedef int (t_hook_callback_connect)(const void *pointer, void *data,
|
||||
const char *error,
|
||||
const char *ip_address);
|
||||
|
||||
#ifdef HAVE_GNUTLS
|
||||
typedef int (gnutls_callback_t)(const void *pointer, void *data,
|
||||
gnutls_session_t tls_session,
|
||||
const gnutls_datum_t *req_ca, int nreq,
|
||||
@ -50,7 +47,6 @@ typedef int (gnutls_callback_t)(const void *pointer, void *data,
|
||||
gnutls_retr_st *answer,
|
||||
#endif /* LIBGNUTLS_VERSION_NUMBER >= 0x020b00 */
|
||||
int action);
|
||||
#endif /* HAVE_GNUTLS */
|
||||
|
||||
struct t_hook_connect
|
||||
{
|
||||
@ -61,12 +57,10 @@ struct t_hook_connect
|
||||
int ipv6; /* use IPv6 */
|
||||
int sock; /* socket (set when connected) */
|
||||
int retry; /* retry count */
|
||||
#ifdef HAVE_GNUTLS
|
||||
gnutls_session_t *gnutls_sess; /* GnuTLS session (SSL connection) */
|
||||
gnutls_callback_t *gnutls_cb; /* GnuTLS callback during handshake */
|
||||
int gnutls_dhkey_size; /* Diffie Hellman Key Exchange size */
|
||||
char *gnutls_priorities; /* GnuTLS priorities */
|
||||
#endif /* HAVE_GNUTLS */
|
||||
char *local_hostname; /* force local hostname (optional) */
|
||||
int child_read; /* to read data in pipe from child */
|
||||
int child_write; /* to write data in pipe for child */
|
||||
@ -94,7 +88,6 @@ extern struct t_hook *hook_connect (struct t_weechat_plugin *plugin,
|
||||
t_hook_callback_connect *callback,
|
||||
const void *callback_pointer,
|
||||
void *callback_data);
|
||||
#ifdef HAVE_GNUTLS
|
||||
extern int hook_connect_gnutls_verify_certificates (gnutls_session_t tls_session);
|
||||
extern int hook_connect_gnutls_set_certificates (gnutls_session_t tls_session,
|
||||
const gnutls_datum_t *req_ca, int nreq,
|
||||
@ -105,7 +98,6 @@ extern int hook_connect_gnutls_set_certificates (gnutls_session_t tls_session,
|
||||
#else
|
||||
gnutls_retr_st *answer);
|
||||
#endif /* LIBGNUTLS_VERSION_NUMBER >= 0x020b00 */
|
||||
#endif /* HAVE_GNUTLS */
|
||||
extern void hook_connect_free_data (struct t_hook *hook);
|
||||
extern int hook_connect_add_to_infolist (struct t_infolist_item *item,
|
||||
struct t_hook *hook);
|
||||
|
||||
@ -34,9 +34,7 @@
|
||||
#include <curl/curl.h>
|
||||
#include <zlib.h>
|
||||
|
||||
#ifdef HAVE_GNUTLS
|
||||
#include <gnutls/gnutls.h>
|
||||
#endif
|
||||
|
||||
#include "weechat.h"
|
||||
#include "wee-backtrace.h"
|
||||
@ -538,7 +536,6 @@ debug_libs_cb (const void *pointer, void *data,
|
||||
#endif /* GCRYPT_VERSION */
|
||||
|
||||
/* display gnutls version */
|
||||
#ifdef HAVE_GNUTLS
|
||||
#ifdef GNUTLS_VERSION
|
||||
gui_chat_printf (NULL, " gnutls: %s%s",
|
||||
GNUTLS_VERSION,
|
||||
@ -547,9 +544,6 @@ debug_libs_cb (const void *pointer, void *data,
|
||||
gui_chat_printf (NULL, " gnutls: (?)%s",
|
||||
(weechat_no_gnutls) ? " (not initialized)" : "");
|
||||
#endif /* GNUTLS_VERSION */
|
||||
#else
|
||||
gui_chat_printf (NULL, " gnutls: (not available)");
|
||||
#endif /* HAVE_GNUTLS */
|
||||
|
||||
/* display curl version */
|
||||
#ifdef LIBCURL_VERSION
|
||||
|
||||
@ -52,9 +52,7 @@
|
||||
#include <sys/uio.h>
|
||||
#endif
|
||||
|
||||
#ifdef HAVE_GNUTLS
|
||||
#include <gnutls/gnutls.h>
|
||||
#endif
|
||||
|
||||
#include "weechat.h"
|
||||
#include "wee-network.h"
|
||||
@ -68,9 +66,7 @@
|
||||
|
||||
int network_init_gnutls_ok = 0;
|
||||
|
||||
#ifdef HAVE_GNUTLS
|
||||
gnutls_certificate_credentials_t gnutls_xcred; /* GnuTLS client credentials */
|
||||
#endif /* HAVE_GNUTLS */
|
||||
|
||||
|
||||
/*
|
||||
@ -95,7 +91,6 @@ network_init_gcrypt ()
|
||||
void
|
||||
network_set_gnutls_ca_file ()
|
||||
{
|
||||
#ifdef HAVE_GNUTLS
|
||||
char *ca_path, *ca_path2;
|
||||
|
||||
if (weechat_no_gnutls)
|
||||
@ -113,7 +108,6 @@ network_set_gnutls_ca_file ()
|
||||
}
|
||||
free (ca_path);
|
||||
}
|
||||
#endif /* HAVE_GNUTLS */
|
||||
}
|
||||
|
||||
/*
|
||||
@ -123,7 +117,6 @@ network_set_gnutls_ca_file ()
|
||||
void
|
||||
network_init_gnutls ()
|
||||
{
|
||||
#ifdef HAVE_GNUTLS
|
||||
if (!weechat_no_gnutls)
|
||||
{
|
||||
gnutls_global_init ();
|
||||
@ -142,7 +135,6 @@ network_init_gnutls ()
|
||||
&hook_connect_gnutls_set_certificates);
|
||||
#endif /* LIBGNUTLS_VERSION_NUMBER >= 0x020b00 */
|
||||
}
|
||||
#endif /* HAVE_GNUTLS */
|
||||
|
||||
network_init_gnutls_ok = 1;
|
||||
}
|
||||
@ -156,13 +148,11 @@ network_end ()
|
||||
{
|
||||
if (network_init_gnutls_ok)
|
||||
{
|
||||
#ifdef HAVE_GNUTLS
|
||||
if (!weechat_no_gnutls)
|
||||
{
|
||||
gnutls_certificate_free_credentials (gnutls_xcred);
|
||||
gnutls_global_deinit ();
|
||||
}
|
||||
#endif /* HAVE_GNUTLS */
|
||||
network_init_gnutls_ok = 0;
|
||||
}
|
||||
}
|
||||
@ -1278,7 +1268,6 @@ network_connect_child_timer_cb (const void *pointer, void *data,
|
||||
* finish).
|
||||
*/
|
||||
|
||||
#ifdef HAVE_GNUTLS
|
||||
int
|
||||
network_connect_gnutls_handshake_fd_cb (const void *pointer, void *data,
|
||||
int fd)
|
||||
@ -1355,13 +1344,11 @@ network_connect_gnutls_handshake_fd_cb (const void *pointer, void *data,
|
||||
|
||||
return WEECHAT_RC_OK;
|
||||
}
|
||||
#endif /* HAVE_GNUTLS */
|
||||
|
||||
/*
|
||||
* Timer callback for timeout of handshake.
|
||||
*/
|
||||
|
||||
#ifdef HAVE_GNUTLS
|
||||
int
|
||||
network_connect_gnutls_handshake_timer_cb (const void *pointer,
|
||||
void *data,
|
||||
@ -1390,7 +1377,6 @@ network_connect_gnutls_handshake_timer_cb (const void *pointer,
|
||||
|
||||
return WEECHAT_RC_OK;
|
||||
}
|
||||
#endif /* HAVE_GNUTLS */
|
||||
|
||||
/*
|
||||
* Reads connection progress from child process.
|
||||
@ -1403,9 +1389,7 @@ network_connect_child_read_cb (const void *pointer, void *data, int fd)
|
||||
char buffer[1], buf_size[6], *cb_error, *cb_ip_address, *error;
|
||||
int num_read;
|
||||
long size_msg;
|
||||
#ifdef HAVE_GNUTLS
|
||||
int rc, direction;
|
||||
#endif /* HAVE_GNUTLS */
|
||||
int sock, i;
|
||||
struct msghdr msg;
|
||||
struct cmsghdr *cmsg;
|
||||
@ -1502,7 +1486,6 @@ network_connect_child_read_cb (const void *pointer, void *data, int fd)
|
||||
|
||||
HOOK_CONNECT(hook_connect, sock) = sock;
|
||||
|
||||
#ifdef HAVE_GNUTLS
|
||||
if (HOOK_CONNECT(hook_connect, gnutls_sess))
|
||||
{
|
||||
/*
|
||||
@ -1586,7 +1569,6 @@ network_connect_child_read_cb (const void *pointer, void *data, int fd)
|
||||
}
|
||||
#endif /* LIBGNUTLS_VERSION_NUMBER < 0x02090a */
|
||||
}
|
||||
#endif /* HAVE_GNUTLS */
|
||||
}
|
||||
else
|
||||
{
|
||||
@ -1650,12 +1632,9 @@ network_connect_with_fork (struct t_hook *hook_connect)
|
||||
{
|
||||
int child_pipe[2], child_socket[2], rc, i;
|
||||
char str_error[1024];
|
||||
#ifdef HAVE_GNUTLS
|
||||
const char *pos_error;
|
||||
#endif /* HAVE_GNUTLS */
|
||||
pid_t pid;
|
||||
|
||||
#ifdef HAVE_GNUTLS
|
||||
/* initialize GnuTLS if SSL asked */
|
||||
if (HOOK_CONNECT(hook_connect, gnutls_sess))
|
||||
{
|
||||
@ -1702,7 +1681,6 @@ network_connect_with_fork (struct t_hook *hook_connect)
|
||||
gnutls_transport_set_ptr (*HOOK_CONNECT(hook_connect, gnutls_sess),
|
||||
(gnutls_transport_ptr_t) ((unsigned long) HOOK_CONNECT(hook_connect, sock)));
|
||||
}
|
||||
#endif /* HAVE_GNUTLS */
|
||||
|
||||
/* create pipe for child process */
|
||||
if (pipe (child_pipe) < 0)
|
||||
|
||||
@ -48,10 +48,8 @@ set_target_properties(irc PROPERTIES PREFIX "")
|
||||
|
||||
set(LINK_LIBS)
|
||||
|
||||
if(GNUTLS_FOUND)
|
||||
include_directories(${GNUTLS_INCLUDE_PATH})
|
||||
list(APPEND LINK_LIBS ${GNUTLS_LIBRARY})
|
||||
endif()
|
||||
include_directories(${GNUTLS_INCLUDE_PATH})
|
||||
list(APPEND LINK_LIBS ${GNUTLS_LIBRARY})
|
||||
|
||||
list(APPEND LINK_LIBS ${GCRYPT_LDFLAGS})
|
||||
|
||||
|
||||
@ -986,7 +986,6 @@ irc_config_server_default_change_cb (const void *pointer, void *data,
|
||||
const char *
|
||||
irc_config_check_gnutls_priorities (const char *priorities)
|
||||
{
|
||||
#ifdef HAVE_GNUTLS
|
||||
gnutls_priority_t priority_cache;
|
||||
const char *pos_error;
|
||||
int rc;
|
||||
@ -1003,12 +1002,6 @@ irc_config_check_gnutls_priorities (const char *priorities)
|
||||
if (pos_error)
|
||||
return pos_error;
|
||||
return priorities;
|
||||
#else
|
||||
/* make C compiler happy */
|
||||
(void) priorities;
|
||||
|
||||
return NULL;
|
||||
#endif /* HAVE_GNUTLS */
|
||||
}
|
||||
|
||||
/*
|
||||
|
||||
@ -26,12 +26,10 @@
|
||||
#include <arpa/inet.h>
|
||||
#include <gcrypt.h>
|
||||
|
||||
#ifdef HAVE_GNUTLS
|
||||
#include <gnutls/gnutls.h>
|
||||
#if LIBGNUTLS_VERSION_NUMBER >= 0x020a01 /* 2.10.1 */
|
||||
#include <gnutls/abstract.h>
|
||||
#endif /* LIBGNUTLS_VERSION_NUMBER >= 0x020a01 */
|
||||
#endif /* HAVE_GNUTLS */
|
||||
|
||||
#include "../weechat-plugin.h"
|
||||
#include "irc.h"
|
||||
@ -144,7 +142,7 @@ irc_sasl_mechanism_ecdsa_nist256p_challenge (struct t_irc_server *server,
|
||||
const char *sasl_username,
|
||||
const char *sasl_key)
|
||||
{
|
||||
#if defined(HAVE_GNUTLS) && (LIBGNUTLS_VERSION_NUMBER >= 0x030015) /* 3.0.21 */
|
||||
#if LIBGNUTLS_VERSION_NUMBER >= 0x030015 /* 3.0.21 */
|
||||
char *data, *string, *answer_base64;
|
||||
int length_data, length_username, length, ret;
|
||||
char *str_privkey;
|
||||
@ -316,7 +314,7 @@ irc_sasl_mechanism_ecdsa_nist256p_challenge (struct t_irc_server *server,
|
||||
|
||||
return answer_base64;
|
||||
|
||||
#else /* no gnutls or gnutls < 3.0.21 */
|
||||
#else /* GnuTLS < 3.0.21 */
|
||||
|
||||
/* make C compiler happy */
|
||||
(void) data_base64;
|
||||
@ -329,7 +327,7 @@ irc_sasl_mechanism_ecdsa_nist256p_challenge (struct t_irc_server *server,
|
||||
weechat_prefix ("error"));
|
||||
|
||||
return NULL;
|
||||
#endif /* defined(HAVE_GNUTLS) && (LIBGNUTLS_VERSION_NUMBER >= 0x030015) */
|
||||
#endif /* LIBGNUTLS_VERSION_NUMBER >= 0x030015 */
|
||||
}
|
||||
|
||||
/*
|
||||
|
||||
@ -44,10 +44,8 @@
|
||||
#include <arpa/nameser.h>
|
||||
#include <resolv.h>
|
||||
|
||||
#ifdef HAVE_GNUTLS
|
||||
#include <gnutls/gnutls.h>
|
||||
#include <gnutls/x509.h>
|
||||
#endif /* HAVE_GNUTLS */
|
||||
|
||||
#include "../weechat-plugin.h"
|
||||
#include "irc.h"
|
||||
@ -133,14 +131,12 @@ char *irc_server_chanmodes_default = "beI,k,l";
|
||||
const char *irc_server_send_default_tags = NULL; /* default tags when */
|
||||
/* sending a message */
|
||||
|
||||
#ifdef HAVE_GNUTLS
|
||||
gnutls_digest_algorithm_t irc_fingerprint_digest_algos[IRC_FINGERPRINT_NUM_ALGOS] =
|
||||
{ GNUTLS_DIG_SHA1, GNUTLS_DIG_SHA256, GNUTLS_DIG_SHA512 };
|
||||
char *irc_fingerprint_digest_algos_name[IRC_FINGERPRINT_NUM_ALGOS] =
|
||||
{ "SHA-1", "SHA-256", "SHA-512" };
|
||||
int irc_fingerprint_digest_algos_size[IRC_FINGERPRINT_NUM_ALGOS] =
|
||||
{ 160, 256, 512 };
|
||||
#endif /* HAVE_GNUTLS */
|
||||
|
||||
|
||||
void irc_server_reconnect (struct t_irc_server *server);
|
||||
@ -398,7 +394,6 @@ irc_server_eval_expression (struct t_irc_server *server, const char *string)
|
||||
char *
|
||||
irc_server_eval_fingerprint (struct t_irc_server *server)
|
||||
{
|
||||
#ifdef HAVE_GNUTLS
|
||||
const char *ptr_fingerprint;
|
||||
char *fingerprint_eval, **fingerprints, *str_sizes;
|
||||
int i, j, rc, algo, length;
|
||||
@ -485,12 +480,6 @@ irc_server_eval_fingerprint (struct t_irc_server *server)
|
||||
return NULL;
|
||||
}
|
||||
return fingerprint_eval;
|
||||
#else
|
||||
/* make C compiler happy */
|
||||
(void) server;
|
||||
|
||||
return strdup ("");
|
||||
#endif /* HAVE_GNUTLS */
|
||||
}
|
||||
|
||||
/*
|
||||
@ -2311,16 +2300,13 @@ irc_server_send (struct t_irc_server *server, const char *buffer, int size_buf)
|
||||
return 0;
|
||||
}
|
||||
|
||||
#ifdef HAVE_GNUTLS
|
||||
if (server->ssl_connected)
|
||||
rc = gnutls_record_send (server->gnutls_sess, buffer, size_buf);
|
||||
else
|
||||
#endif /* HAVE_GNUTLS */
|
||||
rc = send (server->sock, buffer, size_buf, 0);
|
||||
|
||||
if (rc < 0)
|
||||
{
|
||||
#ifdef HAVE_GNUTLS
|
||||
if (server->ssl_connected)
|
||||
{
|
||||
weechat_printf (
|
||||
@ -2330,7 +2316,6 @@ irc_server_send (struct t_irc_server *server, const char *buffer, int size_buf)
|
||||
rc, gnutls_strerror (rc));
|
||||
}
|
||||
else
|
||||
#endif /* HAVE_GNUTLS */
|
||||
{
|
||||
weechat_printf (
|
||||
server->buffer,
|
||||
@ -3233,12 +3218,10 @@ irc_server_recv_cb (const void *pointer, void *data, int fd)
|
||||
{
|
||||
end_recv = 1;
|
||||
|
||||
#ifdef HAVE_GNUTLS
|
||||
if (server->ssl_connected)
|
||||
num_read = gnutls_record_recv (server->gnutls_sess, buffer,
|
||||
sizeof (buffer) - 2);
|
||||
else
|
||||
#endif /* HAVE_GNUTLS */
|
||||
num_read = recv (server->sock, buffer, sizeof (buffer) - 2, 0);
|
||||
|
||||
if (num_read > 0)
|
||||
@ -3246,7 +3229,6 @@ irc_server_recv_cb (const void *pointer, void *data, int fd)
|
||||
buffer[num_read] = '\0';
|
||||
irc_server_msgq_add_buffer (server, buffer);
|
||||
msgq_flush = 1; /* the flush will be done after the loop */
|
||||
#ifdef HAVE_GNUTLS
|
||||
if (server->ssl_connected
|
||||
&& (gnutls_record_check_pending (server->gnutls_sess) > 0))
|
||||
{
|
||||
@ -3256,11 +3238,9 @@ irc_server_recv_cb (const void *pointer, void *data, int fd)
|
||||
*/
|
||||
end_recv = 0;
|
||||
}
|
||||
#endif /* HAVE_GNUTLS */
|
||||
}
|
||||
else
|
||||
{
|
||||
#ifdef HAVE_GNUTLS
|
||||
if (server->ssl_connected)
|
||||
{
|
||||
if ((num_read == 0)
|
||||
@ -3282,7 +3262,6 @@ irc_server_recv_cb (const void *pointer, void *data, int fd)
|
||||
}
|
||||
}
|
||||
else
|
||||
#endif /* HAVE_GNUTLS */
|
||||
{
|
||||
if ((num_read == 0)
|
||||
|| ((errno != EAGAIN) && (errno != EWOULDBLOCK)))
|
||||
@ -3663,7 +3642,6 @@ irc_server_close_connection (struct t_irc_server *server)
|
||||
}
|
||||
else
|
||||
{
|
||||
#ifdef HAVE_GNUTLS
|
||||
/* close SSL connection */
|
||||
if (server->ssl_connected)
|
||||
{
|
||||
@ -3671,7 +3649,6 @@ irc_server_close_connection (struct t_irc_server *server)
|
||||
gnutls_bye (server->gnutls_sess, GNUTLS_SHUT_WR);
|
||||
gnutls_deinit (server->gnutls_sess);
|
||||
}
|
||||
#endif /* HAVE_GNUTLS */
|
||||
}
|
||||
if (server->sock != -1)
|
||||
{
|
||||
@ -4049,7 +4026,6 @@ irc_server_connect_cb (const void *pointer, void *data,
|
||||
_("%s%s: error: %s"),
|
||||
weechat_prefix ("error"), IRC_PLUGIN_NAME, error);
|
||||
}
|
||||
#ifdef HAVE_GNUTLS
|
||||
if (gnutls_rc == GNUTLS_E_DH_PRIME_UNACCEPTABLE)
|
||||
{
|
||||
weechat_printf (
|
||||
@ -4067,9 +4043,6 @@ irc_server_connect_cb (const void *pointer, void *data,
|
||||
IRC_SERVER_OPTION_INTEGER (
|
||||
server, IRC_SERVER_OPTION_SSL_DHKEY_SIZE) / 4);
|
||||
}
|
||||
#else
|
||||
(void) gnutls_rc;
|
||||
#endif /* HAVE_GNUTLS */
|
||||
irc_server_close_connection (server);
|
||||
server->current_retry++;
|
||||
irc_server_switch_address (server, 1);
|
||||
@ -4250,7 +4223,6 @@ irc_server_create_buffer (struct t_irc_server *server)
|
||||
* -1 if not found.
|
||||
*/
|
||||
|
||||
#ifdef HAVE_GNUTLS
|
||||
int
|
||||
irc_server_fingerprint_search_algo_with_size (int size)
|
||||
{
|
||||
@ -4265,7 +4237,6 @@ irc_server_fingerprint_search_algo_with_size (int size)
|
||||
/* digest algorithm not found */
|
||||
return -1;
|
||||
}
|
||||
#endif /* HAVE_GNUTLS */
|
||||
|
||||
/*
|
||||
* Returns a string with sizes of allowed fingerprint,
|
||||
@ -4276,7 +4247,6 @@ irc_server_fingerprint_search_algo_with_size (int size)
|
||||
* Note: result must be freed after use.
|
||||
*/
|
||||
|
||||
#ifdef HAVE_GNUTLS
|
||||
char *
|
||||
irc_server_fingerprint_str_sizes ()
|
||||
{
|
||||
@ -4297,7 +4267,6 @@ irc_server_fingerprint_str_sizes ()
|
||||
|
||||
return strdup (str_sizes);
|
||||
}
|
||||
#endif /* HAVE_GNUTLS */
|
||||
|
||||
/*
|
||||
* Compares two fingerprints: one hexadecimal (given by user), the second binary
|
||||
@ -4308,7 +4277,6 @@ irc_server_fingerprint_str_sizes ()
|
||||
* -1: fingerprints are different
|
||||
*/
|
||||
|
||||
#ifdef HAVE_GNUTLS
|
||||
int
|
||||
irc_server_compare_fingerprints (const char *fingerprint,
|
||||
const unsigned char *fingerprint_server,
|
||||
@ -4331,7 +4299,6 @@ irc_server_compare_fingerprints (const char *fingerprint,
|
||||
/* fingerprints are the same */
|
||||
return 0;
|
||||
}
|
||||
#endif /* HAVE_GNUTLS */
|
||||
|
||||
/*
|
||||
* Checks if a GnuTLS session uses the certificate with a given fingerprint.
|
||||
@ -4341,7 +4308,6 @@ irc_server_compare_fingerprints (const char *fingerprint,
|
||||
* 0: certificate does NOT have the good fingerprint
|
||||
*/
|
||||
|
||||
#ifdef HAVE_GNUTLS
|
||||
int
|
||||
irc_server_check_certificate_fingerprint (struct t_irc_server *server,
|
||||
gnutls_x509_crt_t certificate,
|
||||
@ -4432,7 +4398,6 @@ irc_server_check_certificate_fingerprint (struct t_irc_server *server,
|
||||
|
||||
return rc;
|
||||
}
|
||||
#endif /* HAVE_GNUTLS */
|
||||
|
||||
/*
|
||||
* GnuTLS callback called during handshake.
|
||||
@ -4442,7 +4407,6 @@ irc_server_check_certificate_fingerprint (struct t_irc_server *server,
|
||||
* -1: error in certificate
|
||||
*/
|
||||
|
||||
#ifdef HAVE_GNUTLS
|
||||
int
|
||||
irc_server_gnutls_callback (const void *pointer, void *data,
|
||||
gnutls_session_t tls_session,
|
||||
@ -4859,7 +4823,6 @@ end:
|
||||
|
||||
return rc;
|
||||
}
|
||||
#endif /* HAVE_GNUTLS */
|
||||
|
||||
/*
|
||||
* Connects to a server.
|
||||
@ -4980,17 +4943,6 @@ irc_server_connect (struct t_irc_server *server)
|
||||
return 0;
|
||||
}
|
||||
|
||||
#ifndef HAVE_GNUTLS
|
||||
if (IRC_SERVER_OPTION_BOOLEAN(server, IRC_SERVER_OPTION_SSL))
|
||||
{
|
||||
weechat_printf (
|
||||
server->buffer,
|
||||
_("%s%s: cannot connect with SSL because WeeChat was not built "
|
||||
"with GnuTLS support"),
|
||||
weechat_prefix ("error"), IRC_PLUGIN_NAME);
|
||||
return 0;
|
||||
}
|
||||
#endif /* HAVE_GNUTLS */
|
||||
if (proxy_type)
|
||||
{
|
||||
weechat_printf (
|
||||
@ -5050,7 +5002,6 @@ irc_server_connect (struct t_irc_server *server)
|
||||
|
||||
/* init SSL if asked and connect */
|
||||
server->ssl_connected = 0;
|
||||
#ifdef HAVE_GNUTLS
|
||||
if (IRC_SERVER_OPTION_BOOLEAN(server, IRC_SERVER_OPTION_SSL))
|
||||
server->ssl_connected = 1;
|
||||
if (!server->fake_server)
|
||||
@ -5070,22 +5021,6 @@ irc_server_connect (struct t_irc_server *server)
|
||||
server,
|
||||
NULL);
|
||||
}
|
||||
#else
|
||||
if (!server->fake_server)
|
||||
{
|
||||
server->hook_connect = weechat_hook_connect (
|
||||
proxy,
|
||||
server->current_address,
|
||||
server->current_port,
|
||||
proxy_type ? weechat_config_integer (proxy_ipv6) : IRC_SERVER_OPTION_BOOLEAN(server, IRC_SERVER_OPTION_IPV6),
|
||||
server->current_retry,
|
||||
NULL, NULL, 0, NULL,
|
||||
IRC_SERVER_OPTION_STRING(server, IRC_SERVER_OPTION_LOCAL_HOSTNAME),
|
||||
&irc_server_connect_cb,
|
||||
server,
|
||||
NULL);
|
||||
}
|
||||
#endif /* HAVE_GNUTLS */
|
||||
|
||||
/* send signal "irc_server_connecting" with server name */
|
||||
(void) weechat_hook_signal_send ("irc_server_connecting",
|
||||
@ -5786,11 +5721,9 @@ irc_server_hdata_server_cb (const void *pointer, void *data,
|
||||
WEECHAT_HDATA_VAR(struct t_irc_server, is_connected, INTEGER, 0, NULL, NULL);
|
||||
WEECHAT_HDATA_VAR(struct t_irc_server, ssl_connected, INTEGER, 0, NULL, NULL);
|
||||
WEECHAT_HDATA_VAR(struct t_irc_server, disconnected, INTEGER, 0, NULL, NULL);
|
||||
#ifdef HAVE_GNUTLS
|
||||
WEECHAT_HDATA_VAR(struct t_irc_server, gnutls_sess, OTHER, 0, NULL, NULL);
|
||||
WEECHAT_HDATA_VAR(struct t_irc_server, tls_cert, OTHER, 0, NULL, NULL);
|
||||
WEECHAT_HDATA_VAR(struct t_irc_server, tls_cert_key, OTHER, 0, NULL, NULL);
|
||||
#endif /* HAVE_GNUTLS */
|
||||
WEECHAT_HDATA_VAR(struct t_irc_server, unterminated_message, STRING, 0, NULL, NULL);
|
||||
WEECHAT_HDATA_VAR(struct t_irc_server, nicks_count, INTEGER, 0, NULL, NULL);
|
||||
WEECHAT_HDATA_VAR(struct t_irc_server, nicks_array, STRING, 0, "nicks_count", NULL);
|
||||
@ -6419,9 +6352,7 @@ irc_server_print_log ()
|
||||
weechat_log_printf (" is_connected . . . . : %d", ptr_server->is_connected);
|
||||
weechat_log_printf (" ssl_connected. . . . : %d", ptr_server->ssl_connected);
|
||||
weechat_log_printf (" disconnected . . . . : %d", ptr_server->disconnected);
|
||||
#ifdef HAVE_GNUTLS
|
||||
weechat_log_printf (" gnutls_sess. . . . . : 0x%lx", ptr_server->gnutls_sess);
|
||||
#endif /* HAVE_GNUTLS */
|
||||
weechat_log_printf (" unterminated_message : '%s'", ptr_server->unterminated_message);
|
||||
weechat_log_printf (" nicks_count. . . . . : %d", ptr_server->nicks_count);
|
||||
weechat_log_printf (" nicks_array. . . . . : 0x%lx", ptr_server->nicks_array);
|
||||
|
||||
@ -25,9 +25,7 @@
|
||||
#include <sys/time.h>
|
||||
#include <regex.h>
|
||||
|
||||
#ifdef HAVE_GNUTLS
|
||||
#include <gnutls/gnutls.h>
|
||||
#endif /* HAVE_GNUTLS */
|
||||
|
||||
#ifndef NI_MAXHOST
|
||||
#define NI_MAXHOST 256
|
||||
@ -188,11 +186,9 @@ struct t_irc_server
|
||||
int is_connected; /* 1 if WeeChat is connected to server */
|
||||
int ssl_connected; /* = 1 if connected with SSL */
|
||||
int disconnected; /* 1 if server has been disconnected */
|
||||
#ifdef HAVE_GNUTLS
|
||||
gnutls_session_t gnutls_sess; /* gnutls session (only if SSL is used) */
|
||||
gnutls_x509_crt_t tls_cert; /* certificate used if ssl_cert is set */
|
||||
gnutls_x509_privkey_t tls_cert_key; /* key used if ssl_cert is set */
|
||||
#endif /* HAVE_GNUTLS */
|
||||
char *unterminated_message; /* beginning of a message in input buf */
|
||||
int nicks_count; /* number of nicknames */
|
||||
char **nicks_array; /* nicknames (after split) */
|
||||
@ -267,7 +263,6 @@ struct t_irc_message
|
||||
|
||||
/* digest algorithms for fingerprint */
|
||||
|
||||
#ifdef HAVE_GNUTLS
|
||||
enum t_irc_fingerprint_digest_algo
|
||||
{
|
||||
IRC_FINGERPRINT_ALGO_SHA1 = 0,
|
||||
@ -276,13 +271,10 @@ enum t_irc_fingerprint_digest_algo
|
||||
/* number of digest algorithms */
|
||||
IRC_FINGERPRINT_NUM_ALGOS,
|
||||
};
|
||||
#endif /* HAVE_GNUTLS */
|
||||
|
||||
extern struct t_irc_server *irc_servers;
|
||||
#ifdef HAVE_GNUTLS
|
||||
extern const int gnutls_cert_type_prio[];
|
||||
extern const int gnutls_prot_prio[];
|
||||
#endif /* HAVE_GNUTLS */
|
||||
extern struct t_irc_message *irc_recv_msgq, *irc_msgq_last_msg;
|
||||
extern char *irc_server_sasl_fail_string[];
|
||||
extern char *irc_server_options[][2];
|
||||
@ -355,10 +347,8 @@ extern void irc_server_msgq_add_buffer (struct t_irc_server *server,
|
||||
extern void irc_server_msgq_flush ();
|
||||
extern void irc_server_set_buffer_title (struct t_irc_server *server);
|
||||
extern struct t_gui_buffer *irc_server_create_buffer (struct t_irc_server *server);
|
||||
#ifdef HAVE_GNUTLS
|
||||
int irc_server_fingerprint_search_algo_with_size (int size);
|
||||
char *irc_server_fingerprint_str_sizes ();
|
||||
#endif /* HAVE_GNUTLS */
|
||||
extern int irc_server_connect (struct t_irc_server *server);
|
||||
extern void irc_server_auto_connect (int auto_connect);
|
||||
extern void irc_server_autojoin_channels (struct t_irc_server *server);
|
||||
|
||||
@ -45,10 +45,8 @@ set(LINK_LIBS)
|
||||
|
||||
list(APPEND LINK_LIBS ${ZLIB_LIBRARY})
|
||||
|
||||
if(GNUTLS_FOUND)
|
||||
include_directories(${GNUTLS_INCLUDE_PATH})
|
||||
list(APPEND LINK_LIBS ${GNUTLS_LIBRARY})
|
||||
endif()
|
||||
include_directories(${GNUTLS_INCLUDE_PATH})
|
||||
list(APPEND LINK_LIBS ${GNUTLS_LIBRARY})
|
||||
|
||||
list(APPEND LINK_LIBS ${GCRYPT_LDFLAGS})
|
||||
|
||||
|
||||
@ -29,9 +29,7 @@
|
||||
#include <sys/types.h>
|
||||
#include <sys/socket.h>
|
||||
|
||||
#ifdef HAVE_GNUTLS
|
||||
#include <gnutls/gnutls.h>
|
||||
#endif
|
||||
|
||||
#include "../weechat-plugin.h"
|
||||
#include "relay.h"
|
||||
@ -233,7 +231,6 @@ relay_client_set_desc (struct t_relay_client *client)
|
||||
* Timer callback for handshake with client (for SSL connection only).
|
||||
*/
|
||||
|
||||
#ifdef HAVE_GNUTLS
|
||||
int
|
||||
relay_client_handshake_timer_cb (const void *pointer, void *data,
|
||||
int remaining_calls)
|
||||
@ -311,7 +308,6 @@ relay_client_handshake_timer_cb (const void *pointer, void *data,
|
||||
/* handshake in progress, we will try again on next call to timer */
|
||||
return WEECHAT_RC_OK;
|
||||
}
|
||||
#endif /* HAVE_GNUTLS */
|
||||
|
||||
/*
|
||||
* Reads text data from a client: splits data on '\n' and keeps a partial
|
||||
@ -602,12 +598,10 @@ relay_client_recv_cb (const void *pointer, void *data, int fd)
|
||||
return WEECHAT_RC_OK;
|
||||
}
|
||||
|
||||
#ifdef HAVE_GNUTLS
|
||||
if (client->ssl)
|
||||
num_read = gnutls_record_recv (client->gnutls_sess, buffer,
|
||||
sizeof (buffer) - 1);
|
||||
else
|
||||
#endif /* HAVE_GNUTLS */
|
||||
num_read = recv (client->sock, buffer, sizeof (buffer) - 1, 0);
|
||||
|
||||
if (num_read > 0)
|
||||
@ -693,7 +687,6 @@ relay_client_recv_cb (const void *pointer, void *data, int fd)
|
||||
}
|
||||
else
|
||||
{
|
||||
#ifdef HAVE_GNUTLS
|
||||
if (client->ssl)
|
||||
{
|
||||
if ((num_read == 0)
|
||||
@ -714,7 +707,6 @@ relay_client_recv_cb (const void *pointer, void *data, int fd)
|
||||
}
|
||||
}
|
||||
else
|
||||
#endif /* HAVE_GNUTLS */
|
||||
{
|
||||
if ((num_read == 0)
|
||||
|| ((errno != EAGAIN) && (errno != EWOULDBLOCK)))
|
||||
@ -972,11 +964,9 @@ relay_client_send (struct t_relay_client *client,
|
||||
}
|
||||
else
|
||||
{
|
||||
#ifdef HAVE_GNUTLS
|
||||
if (client->ssl)
|
||||
num_sent = gnutls_record_send (client->gnutls_sess, ptr_data, data_size);
|
||||
else
|
||||
#endif /* HAVE_GNUTLS */
|
||||
num_sent = send (client->sock, ptr_data, data_size, 0);
|
||||
|
||||
if (num_sent >= 0)
|
||||
@ -1005,7 +995,6 @@ relay_client_send (struct t_relay_client *client,
|
||||
}
|
||||
else
|
||||
{
|
||||
#ifdef HAVE_GNUTLS
|
||||
if (client->ssl)
|
||||
{
|
||||
if ((num_sent == GNUTLS_E_AGAIN)
|
||||
@ -1033,7 +1022,6 @@ relay_client_send (struct t_relay_client *client,
|
||||
}
|
||||
}
|
||||
else
|
||||
#endif /* HAVE_GNUTLS */
|
||||
{
|
||||
if ((errno == EAGAIN) || (errno == EWOULDBLOCK))
|
||||
{
|
||||
@ -1078,7 +1066,6 @@ relay_client_send_outqueue (struct t_relay_client *client)
|
||||
|
||||
while (client->outqueue)
|
||||
{
|
||||
#ifdef HAVE_GNUTLS
|
||||
if (client->ssl)
|
||||
{
|
||||
num_sent = gnutls_record_send (client->gnutls_sess,
|
||||
@ -1086,7 +1073,6 @@ relay_client_send_outqueue (struct t_relay_client *client)
|
||||
client->outqueue->data_size);
|
||||
}
|
||||
else
|
||||
#endif /* HAVE_GNUTLS */
|
||||
{
|
||||
num_sent = send (client->sock,
|
||||
client->outqueue->data,
|
||||
@ -1149,7 +1135,6 @@ relay_client_send_outqueue (struct t_relay_client *client)
|
||||
}
|
||||
else
|
||||
{
|
||||
#ifdef HAVE_GNUTLS
|
||||
if (client->ssl)
|
||||
{
|
||||
if ((num_sent == GNUTLS_E_AGAIN)
|
||||
@ -1175,7 +1160,6 @@ relay_client_send_outqueue (struct t_relay_client *client)
|
||||
}
|
||||
}
|
||||
else
|
||||
#endif /* HAVE_GNUTLS */
|
||||
{
|
||||
if ((errno == EAGAIN) || (errno == EWOULDBLOCK))
|
||||
{
|
||||
@ -1271,10 +1255,8 @@ relay_client_new (int sock, const char *address, struct t_relay_server *server)
|
||||
{
|
||||
struct t_relay_client *new_client;
|
||||
int plain_text_password;
|
||||
#ifdef HAVE_GNUTLS
|
||||
int bits;
|
||||
struct t_config_option *ptr_option;
|
||||
#endif /* HAVE_GNUTLS */
|
||||
|
||||
new_client = malloc (sizeof (*new_client));
|
||||
if (new_client)
|
||||
@ -1284,10 +1266,8 @@ relay_client_new (int sock, const char *address, struct t_relay_server *server)
|
||||
new_client->sock = sock;
|
||||
new_client->server_port = server->port;
|
||||
new_client->ssl = server->ssl;
|
||||
#ifdef HAVE_GNUTLS
|
||||
new_client->hook_timer_handshake = NULL;
|
||||
new_client->gnutls_handshake_ok = 0;
|
||||
#endif /* HAVE_GNUTLS */
|
||||
new_client->websocket = 0;
|
||||
new_client->http_headers = NULL;
|
||||
new_client->address = strdup ((address && address[0]) ?
|
||||
@ -1331,7 +1311,6 @@ relay_client_new (int sock, const char *address, struct t_relay_server *server)
|
||||
|
||||
relay_client_set_desc (new_client);
|
||||
|
||||
#ifdef HAVE_GNUTLS
|
||||
if (new_client->ssl)
|
||||
{
|
||||
if (!relay_network_init_ssl_cert_key_ok)
|
||||
@ -1382,7 +1361,6 @@ relay_client_new (int sock, const char *address, struct t_relay_server *server)
|
||||
new_client,
|
||||
NULL);
|
||||
}
|
||||
#endif /* HAVE_GNUTLS */
|
||||
|
||||
new_client->protocol_data = NULL;
|
||||
switch (new_client->protocol)
|
||||
@ -1490,11 +1468,9 @@ relay_client_new_with_infolist (struct t_infolist *infolist)
|
||||
new_client->sock = weechat_infolist_integer (infolist, "sock");
|
||||
new_client->server_port = weechat_infolist_integer (infolist, "server_port");
|
||||
new_client->ssl = weechat_infolist_integer (infolist, "ssl");
|
||||
#ifdef HAVE_GNUTLS
|
||||
new_client->gnutls_sess = NULL;
|
||||
new_client->hook_timer_handshake = NULL;
|
||||
new_client->gnutls_handshake_ok = 0;
|
||||
#endif /* HAVE_GNUTLS */
|
||||
new_client->websocket = weechat_infolist_integer (infolist, "websocket");
|
||||
new_client->http_headers = NULL;
|
||||
new_client->address = strdup (weechat_infolist_string (infolist, "address"));
|
||||
@ -1614,14 +1590,12 @@ relay_client_set_status (struct t_relay_client *client,
|
||||
|
||||
relay_client_outqueue_free_all (client);
|
||||
|
||||
#ifdef HAVE_GNUTLS
|
||||
if (client->hook_timer_handshake)
|
||||
{
|
||||
weechat_unhook (client->hook_timer_handshake);
|
||||
client->hook_timer_handshake = NULL;
|
||||
}
|
||||
client->gnutls_handshake_ok = 0;
|
||||
#endif /* HAVE_GNUTLS */
|
||||
if (client->hook_fd)
|
||||
{
|
||||
weechat_unhook (client->hook_fd);
|
||||
@ -1665,16 +1639,12 @@ relay_client_set_status (struct t_relay_client *client,
|
||||
|
||||
if (client->sock >= 0)
|
||||
{
|
||||
#ifdef HAVE_GNUTLS
|
||||
if (client->ssl && client->gnutls_handshake_ok)
|
||||
gnutls_bye (client->gnutls_sess, GNUTLS_SHUT_WR);
|
||||
#endif /* HAVE_GNUTLS */
|
||||
close (client->sock);
|
||||
client->sock = -1;
|
||||
#ifdef HAVE_GNUTLS
|
||||
if (client->ssl)
|
||||
gnutls_deinit (client->gnutls_sess);
|
||||
#endif /* HAVE_GNUTLS */
|
||||
}
|
||||
}
|
||||
|
||||
@ -1721,10 +1691,8 @@ relay_client_free (struct t_relay_client *client)
|
||||
free (client->protocol_args);
|
||||
if (client->nonce)
|
||||
free (client->nonce);
|
||||
#ifdef HAVE_GNUTLS
|
||||
if (client->hook_timer_handshake)
|
||||
weechat_unhook (client->hook_timer_handshake);
|
||||
#endif /* HAVE_GNUTLS */
|
||||
if (client->http_headers)
|
||||
weechat_hashtable_free (client->http_headers);
|
||||
if (client->hook_fd)
|
||||
@ -1833,12 +1801,10 @@ relay_client_add_to_infolist (struct t_infolist *infolist,
|
||||
return 0;
|
||||
if (!weechat_infolist_new_var_integer (ptr_item, "ssl", client->ssl))
|
||||
return 0;
|
||||
#ifdef HAVE_GNUTLS
|
||||
if (!weechat_infolist_new_var_pointer (ptr_item, "hook_timer_handshake", client->hook_timer_handshake))
|
||||
return 0;
|
||||
if (!weechat_infolist_new_var_integer (ptr_item, "gnutls_handshake_ok", client->gnutls_handshake_ok))
|
||||
return 0;
|
||||
#endif /* HAVE_GNUTLS */
|
||||
if (!weechat_infolist_new_var_integer (ptr_item, "websocket", client->websocket))
|
||||
return 0;
|
||||
if (!weechat_infolist_new_var_string (ptr_item, "address", client->address))
|
||||
@ -1920,11 +1886,9 @@ relay_client_print_log ()
|
||||
weechat_log_printf (" sock. . . . . . . . . . . : %d", ptr_client->sock);
|
||||
weechat_log_printf (" server_port . . . . . . . : %d", ptr_client->server_port);
|
||||
weechat_log_printf (" ssl . . . . . . . . . . . : %d", ptr_client->ssl);
|
||||
#ifdef HAVE_GNUTLS
|
||||
weechat_log_printf (" gnutls_sess . . . . . . . : 0x%lx", ptr_client->gnutls_sess);
|
||||
weechat_log_printf (" hook_timer_handshake. . . : 0x%lx", ptr_client->hook_timer_handshake);
|
||||
weechat_log_printf (" gnutls_handshake_ok . . . : 0x%lx", ptr_client->gnutls_handshake_ok);
|
||||
#endif /* HAVE_GNUTLS */
|
||||
weechat_log_printf (" websocket . . . . . . . . : %d", ptr_client->websocket);
|
||||
weechat_log_printf (" http_headers. . . . . . . : 0x%lx (hashtable: '%s')",
|
||||
ptr_client->http_headers,
|
||||
|
||||
@ -22,9 +22,7 @@
|
||||
|
||||
#include <time.h>
|
||||
|
||||
#ifdef HAVE_GNUTLS
|
||||
#include <gnutls/gnutls.h>
|
||||
#endif /* HAVE_GNUTLS */
|
||||
|
||||
struct t_relay_server;
|
||||
|
||||
@ -92,11 +90,9 @@ struct t_relay_client
|
||||
int sock; /* socket for connection */
|
||||
int server_port; /* port used for connection */
|
||||
int ssl; /* 1 if SSL is enabled */
|
||||
#ifdef HAVE_GNUTLS
|
||||
gnutls_session_t gnutls_sess; /* gnutls session (only if SSL used) */
|
||||
struct t_hook *hook_timer_handshake; /* timer for doing gnutls handshake*/
|
||||
int gnutls_handshake_ok; /* 1 if handshake was done and OK */
|
||||
#endif /* HAVE_GNUTLS */
|
||||
int websocket; /* 0=not a ws, 1=init ws, 2=ws ready */
|
||||
struct t_hashtable *http_headers; /* HTTP headers for websocket */
|
||||
char *address; /* string with IP address */
|
||||
|
||||
@ -318,7 +318,6 @@ relay_config_check_network_ssl_priorities (const void *pointer, void *data,
|
||||
struct t_config_option *option,
|
||||
const char *value)
|
||||
{
|
||||
#ifdef HAVE_GNUTLS
|
||||
gnutls_priority_t priority_cache;
|
||||
const char *pos_error;
|
||||
int rc;
|
||||
@ -347,15 +346,6 @@ relay_config_check_network_ssl_priorities (const void *pointer, void *data,
|
||||
(pos_error) ? pos_error : value);
|
||||
|
||||
return 0;
|
||||
#else
|
||||
/* make C compiler happy */
|
||||
(void) pointer;
|
||||
(void) data;
|
||||
(void) option;
|
||||
(void) value;
|
||||
|
||||
return 1;
|
||||
#endif /* HAVE_GNUTLS */
|
||||
}
|
||||
|
||||
/*
|
||||
@ -371,13 +361,11 @@ relay_config_change_network_ssl_priorities (const void *pointer, void *data,
|
||||
(void) data;
|
||||
(void) option;
|
||||
|
||||
#ifdef HAVE_GNUTLS
|
||||
if (relay_network_init_ok && relay_gnutls_priority_cache)
|
||||
{
|
||||
gnutls_priority_deinit (*relay_gnutls_priority_cache);
|
||||
relay_network_set_priority ();
|
||||
}
|
||||
#endif /* HAVE_GNUTLS */
|
||||
}
|
||||
|
||||
/*
|
||||
@ -762,17 +750,6 @@ relay_config_create_option_port_path (const void *pointer, void *data,
|
||||
relay_server_get_protocol_args (option_name, &ipv4, &ipv6, &ssl,
|
||||
&unix_socket, &protocol, &protocol_args);
|
||||
|
||||
#ifndef HAVE_GNUTLS
|
||||
if (ssl)
|
||||
{
|
||||
weechat_printf (NULL,
|
||||
_("%s%s: cannot use SSL because WeeChat was not built "
|
||||
"with GnuTLS support"),
|
||||
weechat_prefix ("error"), RELAY_PLUGIN_NAME);
|
||||
rc = WEECHAT_CONFIG_OPTION_SET_ERROR;
|
||||
}
|
||||
#endif /* HAVE_GNUTLS */
|
||||
|
||||
if (rc != WEECHAT_CONFIG_OPTION_SET_ERROR)
|
||||
{
|
||||
if (protocol)
|
||||
|
||||
@ -21,9 +21,7 @@
|
||||
|
||||
#include <stdlib.h>
|
||||
|
||||
#ifdef HAVE_GNUTLS
|
||||
#include <gnutls/gnutls.h>
|
||||
#endif /* HAVE_GNUTLS */
|
||||
|
||||
#include "../weechat-plugin.h"
|
||||
#include "relay.h"
|
||||
@ -34,11 +32,9 @@
|
||||
int relay_network_init_ok = 0;
|
||||
int relay_network_init_ssl_cert_key_ok = 0;
|
||||
|
||||
#ifdef HAVE_GNUTLS
|
||||
gnutls_certificate_credentials_t relay_gnutls_x509_cred;
|
||||
gnutls_priority_t *relay_gnutls_priority_cache = NULL;
|
||||
gnutls_dh_params_t *relay_gnutls_dh_params = NULL;
|
||||
#endif /* HAVE_GNUTLS */
|
||||
|
||||
|
||||
/*
|
||||
@ -51,7 +47,6 @@ gnutls_dh_params_t *relay_gnutls_dh_params = NULL;
|
||||
void
|
||||
relay_network_set_ssl_cert_key (int verbose)
|
||||
{
|
||||
#ifdef HAVE_GNUTLS
|
||||
char *certkey_path, *certkey_path2, *weechat_dir;
|
||||
int ret;
|
||||
|
||||
@ -99,10 +94,6 @@ relay_network_set_ssl_cert_key (int verbose)
|
||||
}
|
||||
free (certkey_path);
|
||||
}
|
||||
#else
|
||||
/* make C compiler happy */
|
||||
(void) verbose;
|
||||
#endif /* HAVE_GNUTLS */
|
||||
}
|
||||
|
||||
/*
|
||||
@ -112,7 +103,6 @@ relay_network_set_ssl_cert_key (int verbose)
|
||||
void
|
||||
relay_network_set_priority ()
|
||||
{
|
||||
#ifdef HAVE_GNUTLS
|
||||
if (gnutls_priority_init (relay_gnutls_priority_cache,
|
||||
weechat_config_string (
|
||||
relay_config_network_ssl_priorities),
|
||||
@ -124,7 +114,6 @@ relay_network_set_priority ()
|
||||
free (relay_gnutls_priority_cache);
|
||||
relay_gnutls_priority_cache = NULL;
|
||||
}
|
||||
#endif /* HAVE_GNUTLS */
|
||||
}
|
||||
|
||||
/*
|
||||
@ -134,8 +123,6 @@ relay_network_set_priority ()
|
||||
void
|
||||
relay_network_init ()
|
||||
{
|
||||
#ifdef HAVE_GNUTLS
|
||||
|
||||
/* credentials */
|
||||
gnutls_certificate_allocate_credentials (&relay_gnutls_x509_cred);
|
||||
relay_network_set_ssl_cert_key (0);
|
||||
@ -144,7 +131,7 @@ relay_network_init ()
|
||||
relay_gnutls_priority_cache = malloc (sizeof (*relay_gnutls_priority_cache));
|
||||
if (relay_gnutls_priority_cache)
|
||||
relay_network_set_priority ();
|
||||
#endif /* HAVE_GNUTLS */
|
||||
|
||||
relay_network_init_ok = 1;
|
||||
}
|
||||
|
||||
@ -157,7 +144,6 @@ relay_network_end ()
|
||||
{
|
||||
if (relay_network_init_ok)
|
||||
{
|
||||
#ifdef HAVE_GNUTLS
|
||||
if (relay_gnutls_priority_cache)
|
||||
{
|
||||
gnutls_priority_deinit (*relay_gnutls_priority_cache);
|
||||
@ -171,7 +157,7 @@ relay_network_end ()
|
||||
relay_gnutls_dh_params = NULL;
|
||||
}
|
||||
gnutls_certificate_free_credentials (relay_gnutls_x509_cred);
|
||||
#endif /* HAVE_GNUTLS */
|
||||
|
||||
relay_network_init_ok = 0;
|
||||
}
|
||||
}
|
||||
|
||||
@ -20,18 +20,14 @@
|
||||
#ifndef WEECHAT_PLUGIN_RELAY_NETWORK_H
|
||||
#define WEECHAT_PLUGIN_RELAY_NETWORK_H
|
||||
|
||||
#ifdef HAVE_GNUTLS
|
||||
#include <gnutls/gnutls.h>
|
||||
#endif /* HAVE_GNUTLS */
|
||||
|
||||
extern int relay_network_init_ok;
|
||||
extern int relay_network_init_ssl_cert_key_ok;
|
||||
|
||||
#ifdef HAVE_GNUTLS
|
||||
extern gnutls_certificate_credentials_t relay_gnutls_x509_cred;
|
||||
extern gnutls_priority_t *relay_gnutls_priority_cache;
|
||||
extern gnutls_dh_params_t *relay_gnutls_dh_params;
|
||||
#endif /* HAVE_GNUTLS */
|
||||
|
||||
extern void relay_network_set_ssl_cert_key (int verbose);
|
||||
extern void relay_network_set_priority ();
|
||||
|
||||
@ -21,9 +21,8 @@
|
||||
#define WEECHAT_PLUGIN_RELAY_SERVER_H
|
||||
|
||||
#include <time.h>
|
||||
#ifdef HAVE_GNUTLS
|
||||
|
||||
#define RELAY_SERVER_GNUTLS_DH_BITS 1024
|
||||
#endif /* HAVE_GNUTLS */
|
||||
|
||||
struct t_relay_server
|
||||
{
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user