From 030bc4b37c55675efa79b24bf2377fc50cd3935c Mon Sep 17 00:00:00 2001 From: ZNC-Jenkins Date: Sun, 25 Nov 2018 00:27:57 +0000 Subject: [PATCH 1/2] Update translations from Crowdin for pt_BR --- src/po/znc.pt_BR.po | 27 +++++++++++++++------------ 1 file changed, 15 insertions(+), 12 deletions(-) diff --git a/src/po/znc.pt_BR.po b/src/po/znc.pt_BR.po index 6d5b68d0..79a00b7e 100644 --- a/src/po/znc.pt_BR.po +++ b/src/po/znc.pt_BR.po @@ -73,7 +73,7 @@ msgstr "Porta inválida" #: znc.cpp:1822 ClientCommand.cpp:1629 msgid "Unable to bind: {1}" -msgstr "" +msgstr "Não foi possível vincular: {1}" #: IRCNetwork.cpp:235 msgid "Jumping servers because this server is no longer in the list" @@ -86,6 +86,7 @@ msgstr "Bem-vindo(a) ao ZNC" #: IRCNetwork.cpp:728 msgid "You are currently disconnected from IRC. Use 'connect' to reconnect." msgstr "" +"Você está desconectado do IRC no momento. Digite 'connect' para reconectar." #: IRCNetwork.cpp:758 msgid "This network is being deleted or moved to another user." @@ -165,11 +166,11 @@ msgstr "" #: IRCSock.cpp:1444 msgid "No free nick available" -msgstr "" +msgstr "Não há apelidos livres disponíveis" #: IRCSock.cpp:1452 msgid "No free nick found" -msgstr "" +msgstr "Nenhum apelido livre foi encontrado" #: Client.cpp:74 msgid "No such module {1}" @@ -235,7 +236,7 @@ msgstr "" #: Client.cpp:1181 msgid "Removing channel {1}" -msgstr "" +msgstr "Removendo canal {1}" #: Client.cpp:1257 msgid "Your message to {1} got lost, you are not connected to IRC!" @@ -243,11 +244,11 @@ msgstr "" #: Client.cpp:1310 Client.cpp:1316 msgid "Hello. How may I help you?" -msgstr "" +msgstr "Olá. Como posso ajudá-lo(a)?" #: Client.cpp:1330 msgid "Usage: /attach <#chans>" -msgstr "" +msgstr "Uso: /attach <#canais>" #: Client.cpp:1337 Client.cpp:1359 ClientCommand.cpp:129 ClientCommand.cpp:151 msgid "There was {1} channel matching [{2}]" @@ -277,12 +278,12 @@ msgstr "" #: Chan.cpp:676 msgid "Playback Complete." -msgstr "" +msgstr "Reprodução completa." #: Modules.cpp:528 msgctxt "modhelpcmd" msgid "" -msgstr "" +msgstr "" #: Modules.cpp:529 msgctxt "modhelpcmd" @@ -347,25 +348,27 @@ msgstr "" #: Modules.cpp:1778 msgid "Reloaded module {1}." -msgstr "" +msgstr "O módulo {1} foi reiniciado." #: Modules.cpp:1793 msgid "Unable to find module {1}." -msgstr "" +msgstr "Não foi possível encontrar o módulo {1}." #: Modules.cpp:1919 msgid "" "Module names can only contain letters, numbers and underscores, [{1}] is " "invalid" msgstr "" +"Os nomes de módulos podem conter apenas letras, números e underlines. [{1}] " +"é inválido" #: Modules.cpp:1943 msgid "Unknown error" -msgstr "" +msgstr "Erro desconhecido" #: Modules.cpp:1944 msgid "Unable to open module {1}: {2}" -msgstr "" +msgstr "Não foi possível abrir o módulo {1}: {2}" #: Modules.cpp:1953 msgid "Could not find ZNCModuleEntry in module {1}" From f6eb43673c9815d7a905e36b7b7c019e3c222b07 Mon Sep 17 00:00:00 2001 From: Rosen Penev Date: Fri, 23 Nov 2018 19:17:12 -0800 Subject: [PATCH 2/2] Fix compilation without deprecated APIs in OpenSSL 1.1 Prior commit was tested with 1.0.2. This one with 1.1. --- configure.ac | 2 +- src/Utils.cpp | 8 ++++++-- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/configure.ac b/configure.ac index a101a285..b755cfe8 100644 --- a/configure.ac +++ b/configure.ac @@ -370,7 +370,7 @@ if test "x$SSL" != "xno"; then #include #include ]], [[ - SSL_CTX* ctx = SSL_CTX_new(TLSv1_method()); + SSL_CTX* ctx = SSL_CTX_new(SSLv23_method()); SSL* ssl = SSL_new(ctx); DH* dh = DH_new(); DH_free(dh); diff --git a/src/Utils.cpp b/src/Utils.cpp index 425831ad..11f32121 100644 --- a/src/Utils.cpp +++ b/src/Utils.cpp @@ -29,6 +29,10 @@ #include #include #include +#if OPENSSL_VERSION_NUMBER < 0x10100000L +#define X509_getm_notBefore X509_get_notBefore +#define X509_getm_notAfter X509_get_notAfter +#endif #endif /* HAVE_LIBSSL */ #include #include @@ -95,8 +99,8 @@ void CUtils::GenerateCert(FILE* pOut, const CString& sHost) { X509_set_version(pCert.get(), 2); ASN1_INTEGER_set(X509_get_serialNumber(pCert.get()), serial); - X509_gmtime_adj(X509_get_notBefore(pCert.get()), 0); - X509_gmtime_adj(X509_get_notAfter(pCert.get()), + X509_gmtime_adj(X509_getm_notBefore(pCert.get()), 0); + X509_gmtime_adj(X509_getm_notAfter(pCert.get()), (long)60 * 60 * 24 * days * years); X509_set_pubkey(pCert.get(), pKey.get());